fix cancel set_timezone

merge-requests/273/head
Bernhard Landauer 7 years ago
parent b88fe1cacf
commit 8d48648842

@ -415,7 +415,7 @@ set_timezone() {
ZONE="$ZONE ${i} -"
done
DIALOG " $_ConfBseTimeHC " --menu "$_TimeZBody" 0 0 10 ${ZONE} 2>${ANSWER} || return 0
DIALOG " $_ConfBseTimeHC " --menu "$_TimeZBody" 0 0 10 ${ZONE} 2>${ANSWER} || return 1
ZONE=$(cat ${ANSWER})
SUBZONE=""
@ -423,13 +423,15 @@ set_timezone() {
SUBZONE="$SUBZONE ${i} -"
done
DIALOG " $_ConfBseTimeHC " --menu "$_TimeSubZBody" 0 0 11 ${SUBZONE} 2>${ANSWER} || return 0
DIALOG " $_ConfBseTimeHC " --menu "$_TimeSubZBody" 0 0 11 ${SUBZONE} 2>${ANSWER} || return 1
SUBZONE=$(cat ${ANSWER})
DIALOG " $_ConfBseTimeHC " --yesno "\n$_TimeZQ ${ZONE}/${SUBZONE}?\n\n" 0 0
if (( $? == 0 )); then
arch_chroot "ln -sf /usr/share/zoneinfo/${ZONE}/${SUBZONE} /etc/localtime" 2>$ERR
check_for_error "$FUNCNAME ${ZONE}/${SUBZONE}" $?
else
return 1
fi
}

@ -148,8 +148,7 @@ config_base_menu() {
;;
"3") set_locale
;;
"4") set_timezone
set_hw_clock
"4") set_timezone && set_hw_clock
;;
"5") set_root_password
;;

Loading…
Cancel
Save