diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-08-16 21:03:12 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-08-16 21:03:12 -0300 |
| commit | 4f2c12cb85411e4702e3a6b29f847b08447ef0f0 (patch) | |
| tree | 703eb04e60160c82fb3d3a2fc4af64dd8d67222d /src/core/procedures/base | |
| parent | 74eb858cd962a3178724b83cefa8f43baaffa1ef (diff) | |
| parent | 13c8c0813328eb8f52b03b3c53a32f1f40558021 (diff) | |
Merge branch 'master' of https://projects.archlinux.org/git/aif
Conflicts:
doc/official_installation_guide_en
Diffstat (limited to 'src/core/procedures/base')
| -rw-r--r-- | src/core/procedures/base | 5 |
1 files changed, 4 insertions, 1 deletions
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 } |