diff options
Diffstat (limited to 'src/core/procedures')
| -rw-r--r-- | src/core/procedures/automatic | 4 | ||||
| -rw-r--r-- | src/core/procedures/base | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/core/procedures/automatic b/src/core/procedures/automatic index 407a35b..ce773e1 100644 --- a/src/core/procedures/automatic +++ b/src/core/procedures/automatic @@ -102,8 +102,8 @@ worker_install_packages () worker_set_clock () { - #TODO implement this - true + # uses $TIMEZONE, clock itself remains untouched. + copy_timezone_file } diff --git a/src/core/procedures/base b/src/core/procedures/base index 6f8ed0c..1f9e6a8 100644 --- a/src/core/procedures/base +++ b/src/core/procedures/base @@ -11,6 +11,7 @@ var_UI_TYPE="cli" # set to cli or dia for dialog var_ARCH=`uname -m` #i686 or x86_64. NOTE: this assumes you want to install the same arch as the installation environment you're using. maybe we could decouple those someday.. [ -z "$var_ARCH" ] && die_error "Could not determine your architecture" grubmenu="$var_TARGET_DIR$grubmenu" +syslinuxmenu="$var_TARGET_DIR$syslinuxmenu" ###### Phases ( can be overridden by more specific procedures) ###### phase_preparation=(\ @@ -104,13 +105,14 @@ worker_runtime_packages () worker_set_clock () { local default=no + local timezone_file_copied=0 while true; do ask_option $default "Date/time configuration" '' required \ "1" "Select region and timezone" \ "2" "Set time and date" \ "3" "Return to Main Menu" || return 1 case $ANSWER_OPTION in - "1") execute worker interactive_timezone && default=2 || return 1 ;; + "1") execute worker interactive_timezone && copy_timezone_file && timezone_file_copied=1 && default=2 || return 1 ;; "2") if check_depend worker interactive_timezone then execute worker interactive_time && default=3 || return 1 @@ -118,6 +120,7 @@ worker_set_clock () "3") break ;; esac done + [ $timezone_file_copied -eq 1 ] || copy_timezone_file || return 1 return 0 } |