summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-09-10 16:01:31 +0000
committerOlivier Blin <oblin@mandriva.com>2008-09-10 16:01:31 +0000
commita499c29545a2b31071b0e9350dc61d6044de9265 (patch)
tree043b83da990c52a3ce7d4e46575accc3052031df
parent41fb912fb2310f76796df5aef3628589805103d7 (diff)
downloaddrakx-backup-do-not-use-a499c29545a2b31071b0e9350dc61d6044de9265.tar
drakx-backup-do-not-use-a499c29545a2b31071b0e9350dc61d6044de9265.tar.gz
drakx-backup-do-not-use-a499c29545a2b31071b0e9350dc61d6044de9265.tar.bz2
drakx-backup-do-not-use-a499c29545a2b31071b0e9350dc61d6044de9265.tar.xz
drakx-backup-do-not-use-a499c29545a2b31071b0e9350dc61d6044de9265.zip
extract and rename timezone variable
-rwxr-xr-xperl-install/standalone/finish-install11
1 files changed, 6 insertions, 5 deletions
diff --git a/perl-install/standalone/finish-install b/perl-install/standalone/finish-install
index 72f3155f3..f7d100201 100755
--- a/perl-install/standalone/finish-install
+++ b/perl-install/standalone/finish-install
@@ -19,6 +19,7 @@ my $authentication = authentication::get();
my $security = security::level::get();
my $net = {};
my $locale;
+my $timezone;
network::network::read_net_conf($net);
$::isWizard = 1;
@@ -66,12 +67,12 @@ sub ask_keyboard() {
#- TIMEZONE=simplified: do not ask timezone and make ntp settings advanced
sub ask_timezone() {
require timezone;
- my $t = timezone::read();
- $t->{timezone} = timezone::bestTimezone($locale->{country}) if $locale->{country};
- any::configure_timezone($in, $t, 'ask_gmt', lc(get_conf('TIMEZONE')) eq 'simplified');
- timezone::write($t);
+ $timezone = timezone::read();
+ $timezone->{timezone} = timezone::bestTimezone($locale->{country}) if $locale->{country};
+ any::configure_timezone($in, $timezone, 'ask_gmt', lc(get_conf('TIMEZONE')) eq 'simplified');
+ timezone::write($timezone);
#- reload sys clock from hc once we know the real timezone
- timezone::reload_sys_clock($t);
+ timezone::reload_sys_clock($timezone);
}
sub ask_country() {