diff options
| author | Dieter Plaetinck <dieter@plaetinck.be> | 2009-04-04 12:54:29 +0200 |
|---|---|---|
| committer | Dieter Plaetinck <dieter@plaetinck.be> | 2009-04-04 12:54:29 +0200 |
| commit | 254504decd68cbbd30c14eaacc4a821c08628524 (patch) | |
| tree | ba36a9eaa14c8cacaa320daa8481d8dcd7869f16 | |
| parent | c9aa3f0e3c496e02fa81cef17ff97607dd1c6b7e (diff) | |
fix for nextitem and also hopefully for ntp stuff
| -rw-r--r-- | src/core/libs/lib-ui-interactive.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh index 5a8a076..1c58e8d 100644 --- a/src/core/libs/lib-ui-interactive.sh +++ b/src/core/libs/lib-ui-interactive.sh @@ -86,17 +86,19 @@ interactive_time () { HARDWARECLOCK=$ANSWER_OPTION [ -e /etc/localtime ] && rm -f /etc/localtime + NEXTITEM= while true; do dohwclock $HARDWARECLOCK hctosys current=`date` default=no [ -n "$NEXTITEM" ] && default="$NEXTITEM" - EXTRA= + EXTRA_1= + EXTRA_2= #TODO: only propose if network ok - which ntpdate &>/dev/null && EXTRA="'ntp' 'Set time and date using ntp'" + which ntpdate &>/dev/null && EXTRA_1='ntp' && EXTRA_2='Set time and date using ntp' ask_option $default "Date/time configuration" "According to your settings and your hardwareclock, the date should now be $current. If this is incorrect, you can correct this now" required \ - $EXTRA "manual" "Set time and date manually" "return" "Looks good. back to main menu" + $EXTRA_1 $EXTRA_2 "manual" "Set time and date manually" "return" "Looks good. back to main menu" if [ "$ANSWER_OPTION" = ntp ] then if ntpdate pool.ntp.org >/dev/null |