mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-19 19:40:37 +02:00
'added correct menu order'
This commit is contained in:
parent
7a7cb41dc8
commit
12525c1aee
1 changed files with 21 additions and 6 deletions
|
@ -1535,10 +1535,11 @@ select_source()
|
||||||
else
|
else
|
||||||
DEFAULT=""
|
DEFAULT=""
|
||||||
fi
|
fi
|
||||||
|
CANCEL=""
|
||||||
DIALOG $DEFAULT --menu "FTP Installation" 10 35 3 \
|
DIALOG $DEFAULT --menu "FTP Installation" 10 35 3 \
|
||||||
"0" "Setup Network" \
|
"0" "Setup Network" \
|
||||||
"1" "Choose Mirror" \
|
"1" "Choose Mirror" \
|
||||||
"2" "Return to Main Menu" 2>$ANSWER
|
"2" "Return to Main Menu" 2>$ANSWER || CANCEL="1"
|
||||||
|
|
||||||
case "$(cat $ANSWER)" in
|
case "$(cat $ANSWER)" in
|
||||||
"0")
|
"0")
|
||||||
|
@ -1550,7 +1551,11 @@ select_source()
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
if [ "$CANCEL" = "1" ]; then
|
||||||
|
NEXTITEM="3"
|
||||||
|
else
|
||||||
NEXTITEM="4"
|
NEXTITEM="4"
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
set_clock()
|
set_clock()
|
||||||
|
@ -1607,11 +1612,12 @@ prepare_harddrive()
|
||||||
else
|
else
|
||||||
DEFAULT=""
|
DEFAULT=""
|
||||||
fi
|
fi
|
||||||
|
CANCEL=""
|
||||||
dialog $DEFAULT --backtitle "$TITLE" --menu "Prepare Hard Drive" 12 60 5 \
|
dialog $DEFAULT --backtitle "$TITLE" --menu "Prepare Hard Drive" 12 60 5 \
|
||||||
"1" "Auto-Prepare (erases the ENTIRE hard drive)" \
|
"1" "Auto-Prepare (erases the ENTIRE hard drive)" \
|
||||||
"2" "Partition Hard Drives" \
|
"2" "Partition Hard Drives" \
|
||||||
"3" "Set Filesystem Mountpoints" \
|
"3" "Set Filesystem Mountpoints" \
|
||||||
"4" "Return to Main Menu" 2>$ANSWER
|
"4" "Return to Main Menu" 2>$ANSWER || CANCEL="1"
|
||||||
NEXTITEM="$(cat $ANSWER)"
|
NEXTITEM="$(cat $ANSWER)"
|
||||||
[ "$S_MKFSAUTO" = "1" ] && DONE=1
|
[ "$S_MKFSAUTO" = "1" ] && DONE=1
|
||||||
case $(cat $ANSWER) in
|
case $(cat $ANSWER) in
|
||||||
|
@ -1628,7 +1634,11 @@ prepare_harddrive()
|
||||||
DONE=1 ;;
|
DONE=1 ;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
if [ "$CANCEL" = "1" ]; then
|
||||||
|
NEXTITEM="2"
|
||||||
|
else
|
||||||
NEXTITEM="3"
|
NEXTITEM="3"
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
do_pacmanmirror()
|
do_pacmanmirror()
|
||||||
|
@ -1859,15 +1869,20 @@ configure_system()
|
||||||
|
|
||||||
install_bootloader()
|
install_bootloader()
|
||||||
{
|
{
|
||||||
|
CANCEL=""
|
||||||
DIALOG --menu "Which bootloader would you like to use? Grub is the Arch default.\n\n" \
|
DIALOG --menu "Which bootloader would you like to use? Grub is the Arch default.\n\n" \
|
||||||
10 55 2 \
|
10 55 2 \
|
||||||
"GRUB" "Use the GRUB bootloader (default)" \
|
"GRUB" "Use the GRUB bootloader (default)" \
|
||||||
"LILO" "Use the LILO bootloader" 2>$ANSWER
|
"LILO" "Use the LILO bootloader" 2>$ANSWER || CANCEL=1
|
||||||
case $(cat $ANSWER) in
|
case $(cat $ANSWER) in
|
||||||
"GRUB") dogrub ;;
|
"GRUB") dogrub ;;
|
||||||
"LILO") dolilo ;;
|
"LILO") dolilo ;;
|
||||||
esac
|
esac
|
||||||
|
if [ "$CANCEL" = "1" ]; then
|
||||||
|
NEXTITEM="7"
|
||||||
|
else
|
||||||
NEXTITEM="8"
|
NEXTITEM="8"
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
mainmenu() {
|
mainmenu() {
|
||||||
|
|
Loading…
Reference in a new issue