diff --git a/src/installer b/src/installer index 121fd25..25e9072 100755 --- a/src/installer +++ b/src/installer @@ -15,7 +15,7 @@ # immutable variables { readonly DIST="Archlabs" # Linux distributor -readonly VER="1.6.10" # Installer version +readonly VER="1.6.11" # Installer version readonly LIVE="liveuser" # Live session user name readonly TRN="/installer" # Translation path readonly MNT="/mnt/install" # Install mountpoint @@ -1027,11 +1027,14 @@ select_root_partition() { if (( LUKS == 1 && LVM == 0 )); then ROOT_PART="/dev/mapper/$LUKS_NAME" decrease_part_count "$LUKS_PART" + elif (( LUKS == 1 && LVM == 1 )); then + decrease_part_count "$LUKS_PART" + decrease_part_count "/dev/mapper/$LUKS_NAME" fi - if (( COUNT == 1 )); then + if (( COUNT == 1 )) && [[ $ROOT_PART == "" ]]; then ROOT_PART="$(awk 'NF > 0 {print $1}' <<< "$PARTS")" - infobox "$_PrepMount" "\nOnly one partition available: $ROOT_PART\n" + infobox "$_PrepMount" "\nOnly one partition available for root (/): $ROOT_PART\n" elif [[ $ROOT_PART == "" || $LVM -eq 1 ]]; then tput civis ROOT_PART="$(dialog --cr-wrap --stdout --backtitle "$BT" --title "$_PrepMount" \ diff --git a/trans/english.trans b/trans/english.trans index f1b68bf..85c4bc2 100644 --- a/trans/english.trans +++ b/trans/english.trans @@ -147,7 +147,7 @@ _MntTitle="Mount Status" _MntSucc="\nMount Successful!\n" _MntFail="\nMount Failed!\n" _WarnMount="\nIMPORTANT: Please choose carefully during mounting and formatting.\n\nPartitions can be mounted without formatting them by selecting the '$_Skip' option from the menu, otherwise the partition will be formatted.\n" -_MntBody="\nUse [Space] to de/select the desired mount options.\n\nKernel default: relatime\n\nFor SSD's the 'discard' option provides active TRIM support.\n\nChoosing none will result in an automatic mount with system applied options." +_MntBody="\nUse [Space] to de/select the desired mount options.\n\nFor SSD's the 'discard' option provides active TRIM support.\n\nChoosing none will result in an automatic mount with system applied options." _MntConfBody="\nConfirm the following mount options:" # Select Device