xstefen/al-installer
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove auto selection of certain parts

Browse Source
This commit is contained in:
natemaia 2018-12-17 22:46:40 -08:00
parent 6a337a6d55
commit bf45d5d51f
1 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/archlabs-installer
View File

@ -8,7 +8,7 @@
# Some ideas and code has been taken from other installers # Some ideas and code has been taken from other installers
# AIF, Cnichi, Calamares, The Arch Wiki.. Credit where credit is due # 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 DIST="ArchLabs" # Installer distributor
MNT="/mnt" # Installer mountpoint MNT="/mnt" # Installer mountpoint
ERR="/tmp/errlog" # error log used internally ERR="/tmp/errlog" # error log used internally
@ -1021,9 +1021,7 @@ mnt_menu()
find_partitions 'part|lvm|crypt' || return 1 find_partitions 'part|lvm|crypt' || return 1
select_root_partition || return 1 select_root_partition || return 1
if [[ $BOOT_PART ]]; then if [[ $SYS == "UEFI" ]]; then
infobox "$_PrepMount" "\nUsing boot partition: $BOOT_PART\n" 1
elif [[ $SYS == "UEFI" ]]; then
select_efi_partition || { BOOT_PART=""; return 1; } select_efi_partition || { BOOT_PART=""; return 1; }
elif (( COUNT > 0 )); then elif (( COUNT > 0 )); then
select_boot_partition || { BOOT_PART=""; return 1; } select_boot_partition || { BOOT_PART=""; return 1; }
@ -1498,25 +1496,14 @@ lvm_create()
GROUP_PARTS="" GROUP_PARTS=""
VOL_GROUP_MB=0 VOL_GROUP_MB=0
umount_dir $MNT umount_dir $MNT
lvm_partitions || return 1
if [[ $LUKS && $LUKS_NAME ]]; then lvm_create_group || return 1
GROUP_PARTS="/dev/mapper/$LUKS_NAME" lvm_volume_count || return 1
infobox "$_LvmCreateVG" "\nUsing encrypted partition created earlier: $GROUP_PARTS\n" 1 lvm_extra_lvs || return 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_volume_name "$_LvmLvNameBody1 $_LvmLvNameBody2 (${VOL_GROUP_MB}MB)" || 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 lvcreate -l +100%FREE "$VOLUME_GROUP" -n "$VOLUME_NAME" >/dev/null 2>$ERR
errshow "lvcreate -l +100%FREE $VOLUME_GROUP -n $VOLUME_NAME" errshow "lvcreate -l +100%FREE $VOLUME_GROUP -n $VOLUME_NAME"
LVM=' logical volume' LVM=' logical volume'
tput civis tput civis
sleep 0.5 sleep 0.5
local msg="${_Done}$_LvmPvDoneBody1 $VOLUME_GROUP-$VOLUME_NAME (${VOLUME_SIZE:-${VOL_GROUP_MB}MB}) $_LvmPvDoneBody2." local msg="${_Done}$_LvmPvDoneBody1 $VOLUME_GROUP-$VOLUME_NAME (${VOLUME_SIZE:-${VOL_GROUP_MB}MB}) $_LvmPvDoneBody2."