diff options
| author | Dieter Plaetinck <dieter@plaetinck.be> | 2009-02-28 15:17:45 +0100 |
|---|---|---|
| committer | Dieter Plaetinck <dieter@plaetinck.be> | 2009-02-28 15:17:45 +0100 |
| commit | d2223b6d9806427c50d5fab4ee7bf919c98d0fd1 (patch) | |
| tree | 1b757bf8e0fddfdac55c9a7557b42b7b14a0ee0d /src/core/procedures | |
| parent | 805b28608f764f84f6a3a50fb4ebf5aa4a9c9b24 (diff) | |
ask_option now supports optional (skippable) and required menus. labels and exit codes are applied differently
Diffstat (limited to 'src/core/procedures')
| -rw-r--r-- | src/core/procedures/base | 2 | ||||
| -rw-r--r-- | src/core/procedures/interactive | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/core/procedures/base b/src/core/procedures/base index 845ce2d..88bd9c3 100644 --- a/src/core/procedures/base +++ b/src/core/procedures/base @@ -104,7 +104,7 @@ worker_set_clock () while true; do default=no [ -n "$NEXTITEM" ] && default="$NEXTITEM" - ask_option $default "Date/time configuration" '' \ + ask_option $default "Date/time configuration" '' required \ "1" "Select region and timezone" \ "2" "Set time and date" \ "3" "Return to Main Menu" diff --git a/src/core/procedures/interactive b/src/core/procedures/interactive index 46bd6d7..ec9185a 100644 --- a/src/core/procedures/interactive +++ b/src/core/procedures/interactive @@ -53,7 +53,7 @@ mainmenu() [ -n "$NEXTITEM" ] && default="$NEXTITEM" #TODO: why does a '2' appear instead of '' ?? - ask_option $default "MAIN MENU" '' \ + ask_option $default "MAIN MENU" '' required \ "1" "$worker_select_source_title" \ "2" "$worker_set_clock_title" \ "3" "$worker_prepare_disks_title" \ @@ -96,7 +96,7 @@ mainmenu() select_source_extras_menu () { while true; do - ask_option no "FTP Installation" 'Make sure the network is ok before continuing the installer' \ + ask_option no "FTP Installation" 'Make sure the network is ok before continuing the installer' required \ "1" "$worker_runtime_network_title" \ "2" "$worker_select_mirror_title" \ "3" "Return to Main Menu" @@ -147,7 +147,7 @@ worker_prepare_disks() default=no [ -n "$NEXTITEM" ] && default="$NEXTITEM" - ask_option $default "Prepare Hard Drive" '' \ + ask_option $default "Prepare Hard Drive" '' required \ "1" "Auto-Prepare (erases the ENTIRE hard drive and sets up partitions and filesystems)" \ "2" "Partition Hard Drives" \ "3" "Configure block devices, filesystems and mountpoints" \ @@ -246,7 +246,7 @@ worker_select_mirror () worker_install_bootloader () { - ask_option Grub "Choose bootloader" "Which bootloader would you like to use? Grub is the Arch default." \ + ask_option Grub "Choose bootloader" "Which bootloader would you like to use? Grub is the Arch default." required \ "Grub" "Use the GRUB bootloader (default)" \ "None" "\Zb\Z1Warning\Z0\ZB: you must install your own bootloader!" |