summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDieter Plaetinck <dieter@plaetinck.be>2009-03-08 16:58:11 +0100
committerDieter Plaetinck <dieter@plaetinck.be>2009-03-08 16:58:11 +0100
commit383a16d3358ab0b06a63960bf49bad22c558b128 (patch)
tree4e8cd0ba5390c9832c686c43f5770cd4548b1e31
parentccff2e8c4ae4f0ee487b55fe708dced85d829f68 (diff)
fix some return code incorrectness in interactive_configure_system
-rw-r--r--src/core/libs/lib-ui-interactive.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh
index c013bb0..5442e1b 100644
--- a/src/core/libs/lib-ui-interactive.sh
+++ b/src/core/libs/lib-ui-interactive.sh
@@ -40,10 +40,10 @@ interactive_configure_system()
"/etc/locale.gen" "Glibc Locales" \
"$var_MIRRORLIST" "Pacman Mirror List" \
"Root-Password" "Set the root password" \
- "Return" "Return to Main Menu" || FILE="Return"
+ "Done" "Return to Main Menu" || return 1
FILE=$ANSWER_OPTION
- if [ "$FILE" = "Return" -o -z "$FILE" ]; then # exit
+ if [ "$FILE" = "Done" ]; then # exit
break
elif [ "$FILE" = "Root-Password" ]; then # non-file
while true; do
@@ -56,6 +56,7 @@ interactive_configure_system()
# temporary backup files are not useful anymore past this point.
find "${var_TARGET_DIR}/etc/" -name '*~' -delete &>/dev/null
+ return 0
}