Return to main() after successful creation of an LVM setup

This commit is contained in:
natemaia 2019-08-27 01:07:54 -07:00
parent 7b5e1bc035
commit 5ebf34f4d6

View File

@ -1939,9 +1939,9 @@ lvm_menu()
"$_lvmnew" "vgcreate -f, lvcreate -L -n" \ "$_lvmnew" "vgcreate -f, lvcreate -L -n" \
"$_lvmdel" "vgremove -f" \ "$_lvmdel" "vgremove -f" \
"$_lvmdelall" "lvrmeove, vgremove, pvremove -f" \ "$_lvmdelall" "lvrmeove, vgremove, pvremove -f" \
"back" "return to the main menu" "Back" "Return to the main menu"
case "$choice" in case "$choice" in
"$_lvmnew") lvm_create ;; "$_lvmnew") lvm_create && break ;;
"$_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 ;;
*) break ;; *) break ;;
@ -1959,7 +1959,7 @@ lvm_detect()
VGROUP="$(vgs -o vg_name --noheading 2>/dev/null)" VGROUP="$(vgs -o vg_name --noheading 2>/dev/null)"
if [[ $VGROUP && $v && $pv ]]; then if [[ $VGROUP && $v && $pv ]]; then
msg "Logical Volume Management" "\nActivating existing logical volume management (LVM).\n\n" 1 msg "LVM Setup" "\nActivating existing logical volume management.\n" 0
modprobe dm-mod >/dev/null 2>$ERR modprobe dm-mod >/dev/null 2>$ERR
errshow 'modprobe dm-mod' errshow 'modprobe dm-mod'
vgscan >/dev/null 2>&1 vgscan >/dev/null 2>&1
@ -2151,7 +2151,7 @@ luks_menu()
"$_luksnew" "cryptsetup -q luksFormat" \ "$_luksnew" "cryptsetup -q luksFormat" \
"$_luksopen" "cryptsetup open --type luks" \ "$_luksopen" "cryptsetup open --type luks" \
"$_luksadv" "cryptsetup -q -s -c luksFormat" \ "$_luksadv" "cryptsetup -q -s -c luksFormat" \
"back" "Return to the main menu" "Back" "Return to the main menu"
case "$choice" in case "$choice" in
"$_luksnew") luks_basic || return 1 ;; "$_luksnew") luks_basic || return 1 ;;