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

Fix: lvm_create() calling dlg() with invalid argument list

Browse Source
This commit is contained in:
natemaia 2019-08-27 00:24:03 -07:00
parent 63fb701354
commit 0e7257b119
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
archlabs-installer
View File

@ -15,7 +15,7 @@
: ${DIST="ArchLabs"} : ${DIST="ArchLabs"}
VER="2.0.60" # installer version VER="2.0.61" # installer version
MNT="/mnt" # install mountpoint MNT="/mnt" # install mountpoint
ANS="/tmp/ans" # dialog answer file ANS="/tmp/ans" # dialog answer file
@ -1935,17 +1935,19 @@ lvm_menu()
is_bg_install || return 1 is_bg_install || return 1
lvm_detect lvm_detect
local choice local choice
dlg choice menu "Logical Volume Management" "$_lvmmenu" \ while :; do
"$_lvmnew" "vgcreate -f, lvcreate -L -n" \ dlg choice menu "Logical Volume Management" "$_lvmmenu" \
"$_lvmdel" "vgremove -f" \ "$_lvmnew" "vgcreate -f, lvcreate -L -n" \
"$_lvmdelall" "lvrmeove, vgremove, pvremove -f" \ "$_lvmdel" "vgremove -f" \
"back" "return to the main menu" "$_lvmdelall" "lvrmeove, vgremove, pvremove -f" \
"back" "return to the main menu"
case "$choice" in case "$choice" in
"$_lvmnew") lvm_create || return 1 ;; "$_lvmnew") lvm_create ;;
"$_lvmdel") lvm_delgroup && yesno "$_lvmdel" "$_lvmdelask" && vgremove -f "$DEL_VG" >/dev/null 2>&1 ;; "$_lvmdel") lvm_delgroup && yesno "$_lvmdel" "$_lvmdelask" && vgremove -f "$DEL_VG" >/dev/null 2>&1 ;;
"$_lvmdelall") lvm_del_all ;; "$_lvmdelall") lvm_del_all ;;
esac *) break ;;
esac
done
return 0 return 0
} }
@ -1972,7 +1974,7 @@ lvm_create()
umount_dir $MNT umount_dir $MNT
lvm_mkgroup || return 1 lvm_mkgroup || return 1
local txt="\nThe last (or only) logical volume will automatically use all remaining space in the volume group." local txt="\nThe last (or only) logical volume will automatically use all remaining space in the volume group."
dlg VOL_COUNT menu "$_lvmnew" "\nSelect the number of logical volumes (LVs) to create in: $VGROUP\n$txt" 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 dlg VOL_COUNT menu "$_lvmnew" "\nSelect the number of logical volumes (LVs) to create in: $VGROUP\n$txt" 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 -
[[ $VOL_COUNT ]] || return 1 [[ $VOL_COUNT ]] || return 1
lvm_extra_lvs || return 1 lvm_extra_lvs || return 1
lvm_volume_name "$_lvmlvname\nNOTE: This LV will use up all remaining space in the volume group (${VGROUP_MB}MB)" || return 1 lvm_volume_name "$_lvmlvname\nNOTE: This LV will use up all remaining space in the volume group (${VGROUP_MB}MB)" || return 1
@ -2034,7 +2036,7 @@ lvm_mkgroup()
yesno "$_lvmnew" "\nConfirm creation of volume group: $VGROUP\n\nwith the following partition(s): $LVM_PARTS\n" && named=true yesno "$_lvmnew" "\nConfirm creation of volume group: $VGROUP\n\nwith the following partition(s): $LVM_PARTS\n" && named=true
done done
msg "$_lvmnew" "\nCreating group: $VGROUP (${SIZE}$SIZE_UNIT)\n" 0 msg "$_lvmnew" "\nCreating group: $VGROUP\n" 0
vgcreate -f "$VGROUP" $LVM_PARTS >/dev/null 2>$ERR vgcreate -f "$VGROUP" $LVM_PARTS >/dev/null 2>$ERR
errshow "vgcreate -f $VGROUP $LVM_PARTS" || return 1 errshow "vgcreate -f $VGROUP $LVM_PARTS" || return 1
@ -2048,7 +2050,6 @@ lvm_mkgroup()
fi fi
msg "$_lvmnew" "\nVolume group: $VGROUP (${SIZE}$SIZE_UNIT) has been created\n" msg "$_lvmnew" "\nVolume group: $VGROUP (${SIZE}$SIZE_UNIT) has been created\n"
return 0
} }
lvm_del_all() lvm_del_all()
@ -2079,6 +2080,7 @@ lvm_delgroup()
for i in $(lvs --noheadings | awk '{print $2}' | uniq); do for i in $(lvs --noheadings | awk '{print $2}' | uniq); do
VOL_GROUP_LIST+="$i $(vgdisplay "$i" | awk '/VG Size/ {print $3$4}') " VOL_GROUP_LIST+="$i $(vgdisplay "$i" | awk '/VG Size/ {print $3$4}') "
done done
[[ $VOL_GROUP_LIST ]] || { msg "No Groups" "\nNo volume groups found."; return 1; } [[ $VOL_GROUP_LIST ]] || { msg "No Groups" "\nNo volume groups found."; return 1; }
dlg DEL_VG menu "Logical Volume Management" "\nSelect volume group to delete.\n\nAll logical volumes within will also be deleted." $VOL_GROUP_LIST dlg DEL_VG menu "Logical Volume Management" "\nSelect volume group to delete.\n\nAll logical volumes within will also be deleted." $VOL_GROUP_LIST