diff options
| author | Dieter Plaetinck <dieter@plaetinck.be> | 2008-12-09 16:31:29 +0100 |
|---|---|---|
| committer | Dieter Plaetinck <dieter@plaetinck.be> | 2008-12-09 16:31:29 +0100 |
| commit | 28a30437a766edfadbf0befee8701e803febd9e9 (patch) | |
| tree | 455af5b24aa486c258983ce5afe4ffc82a4fa797 /src/core | |
| parent | 6edf983eef653bb64cbd6370e806eb069cc1219a (diff) | |
endless loop fix
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/libs/lib-ui-interactive.sh | 2 | ||||
| -rw-r--r-- | src/core/libs/lib-ui.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh index 3652610..4f32338 100644 --- a/src/core/libs/lib-ui-interactive.sh +++ b/src/core/libs/lib-ui-interactive.sh @@ -139,7 +139,7 @@ interactive_autoprepare() CHOSEN_FS="" while [ "$CHOSEN_FS" = "" ] do - ask_option "Select a filesystem for / and /home:" $FSOPTS || return 1 + ask_option no "Select a filesystem for / and /home:" $FSOPTS || return 1 FSTYPE=$ANSWER_OPTION ask_yesno "$FSTYPE will be used for / and /home. Is this OK?" yes && CHOSEN_FS=1 done diff --git a/src/core/libs/lib-ui.sh b/src/core/libs/lib-ui.sh index eb3f727..f056583 100644 --- a/src/core/libs/lib-ui.sh +++ b/src/core/libs/lib-ui.sh @@ -441,7 +441,7 @@ _cli_ask_option () #TODO: strip out color codes #TODO: if user entered incorrect choice, ask him again DEFAULT="" - [ "$1" != 'no' ] && DEFAULT=$1 + [ "$1" != 'no' ] && DEFAULT=$1 #TODO: if user forgot to specify a default (eg all args are 1 pos to the left, we can end up in an endless loop :s) [ -z "$2" ] && die_error "ask_option \$2 must be the title" [ -z "$6" ] && debug "_cli_ask_option args: $@" && die_error "ask_option makes only sense if you specify at least 2 things (with tag and name)" |