Remove auto selection of certain parts
This commit is contained in:
parent
6a337a6d55
commit
bf45d5d51f
@ -8,7 +8,7 @@
|
||||
# Some ideas and code has been taken from other installers
|
||||
# AIF, Cnichi, Calamares, The Arch Wiki.. Credit where credit is due
|
||||
|
||||
VER="1.8.0" # Installer version
|
||||
VER="1.8.1" # Installer version
|
||||
DIST="ArchLabs" # Installer distributor
|
||||
MNT="/mnt" # Installer mountpoint
|
||||
ERR="/tmp/errlog" # error log used internally
|
||||
@ -1021,9 +1021,7 @@ mnt_menu()
|
||||
find_partitions 'part|lvm|crypt' || return 1
|
||||
select_root_partition || return 1
|
||||
|
||||
if [[ $BOOT_PART ]]; then
|
||||
infobox "$_PrepMount" "\nUsing boot partition: $BOOT_PART\n" 1
|
||||
elif [[ $SYS == "UEFI" ]]; then
|
||||
if [[ $SYS == "UEFI" ]]; then
|
||||
select_efi_partition || { BOOT_PART=""; return 1; }
|
||||
elif (( COUNT > 0 )); then
|
||||
select_boot_partition || { BOOT_PART=""; return 1; }
|
||||
@ -1498,25 +1496,14 @@ lvm_create()
|
||||
GROUP_PARTS=""
|
||||
VOL_GROUP_MB=0
|
||||
umount_dir $MNT
|
||||
|
||||
if [[ $LUKS && $LUKS_NAME ]]; then
|
||||
GROUP_PARTS="/dev/mapper/$LUKS_NAME"
|
||||
infobox "$_LvmCreateVG" "\nUsing encrypted partition created earlier: $GROUP_PARTS\n" 1
|
||||
else
|
||||
lvm_partitions || return 1
|
||||
fi
|
||||
|
||||
lvm_create_group || return 1 # create the volume group we'll be using
|
||||
lvm_volume_count || return 1 # how many logical volumes to create on the group
|
||||
lvm_extra_lvs || return 1 # if we chose more than one logical volume create all but the last
|
||||
|
||||
# last or only logical volume
|
||||
lvm_create_group || return 1
|
||||
lvm_volume_count || return 1
|
||||
lvm_extra_lvs || return 1
|
||||
lvm_volume_name "$_LvmLvNameBody1 $_LvmLvNameBody2 (${VOL_GROUP_MB}MB)" || return 1
|
||||
lvcreate -l +100%FREE "$VOLUME_GROUP" -n "$VOLUME_NAME" >/dev/null 2>$ERR
|
||||
errshow "lvcreate -l +100%FREE $VOLUME_GROUP -n $VOLUME_NAME"
|
||||
|
||||
LVM=' logical volume'
|
||||
|
||||
tput civis
|
||||
sleep 0.5
|
||||
local msg="${_Done}$_LvmPvDoneBody1 $VOLUME_GROUP-$VOLUME_NAME (${VOLUME_SIZE:-${VOL_GROUP_MB}MB}) $_LvmPvDoneBody2."
|
||||
|
Reference in New Issue
Block a user