Permalink
Browse files

Improve the text-installer front-end, add a new "edit" menu, and make

the install the first option, so you can just hit "Enter" the whole way
through for defaults.
  • Loading branch information...
1 parent 62ae807 commit 9e560f7e0102462002e39a2529502e28d76f4bc4 @kmoore134 kmoore134 committed Nov 25, 2013
Showing with 25 additions and 5 deletions.
  1. +25 −5 src-sh/pc-installdialog/pc-installdialog.sh
@@ -603,20 +603,17 @@ change_networking() {
gen_pc-sysinstall_cfg
}
-start_menu_loop()
+start_edit_menu_loop()
{
while :
do
- dialog --title "PC-BSD Text Install" --menu "Please select from the following options:" 18 40 10 wizard "Run install wizard" disk "Change disk ($SYSDISK)" zfs "Change ZFS layout" network "Change networking" view "View install script" edit "Edit install script" install "Start the installation" quit "Quit install wizard" 2>/tmp/answer
+ dialog --title "PC-BSD Text Install - Edit Menu" --menu "Please select from the following options:" 18 40 10 disk "Change disk ($SYSDISK)" zfs "Change ZFS layout" network "Change networking" view "View install script" edit "Edit install script" back "Back to main menu" 2>/tmp/answer
if [ $? -ne 0 ] ; then break ; fi
ANS="`cat /tmp/answer`"
case $ANS in
- wizard) start_full_wizard
- rtn
- ;;
disk) change_disk_selection
rtn
;;
@@ -630,6 +627,29 @@ start_menu_loop()
edit) vi ${CFGFILE}
rtn
;;
+ back) break ;;
+ *) ;;
+ esac
+ done
+
+}
+
+start_menu_loop()
+{
+
+ while :
+ do
+ dialog --title "PC-BSD Text Install" --menu "Please select from the following options:" 18 40 10 install "Start the installation" wizard "Re-run install wizard" edit "Edit install options" quit "Quit install wizard" 2>/tmp/answer
+ if [ $? -ne 0 ] ; then break ; fi
+
+ ANS="`cat /tmp/answer`"
+
+ case $ANS in
+ wizard) start_full_wizard
+ rtn
+ ;;
+ edit) start_edit_menu_loop
+ ;;
install) echo "This will begin the installation, continue?"
echo -e "(y/n)\c"
read tmp

0 comments on commit 9e560f7

Please sign in to comment.