diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2001-02-09 16:27:47 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2001-02-09 16:27:47 +0000 |
| commit | 5b81add84d6f69ad60226abd75a5773b2284e5f6 (patch) | |
| tree | 2e801b00018cc6e8ce187531ddb29e36272ae1ca /perl-install | |
| parent | 047a962872257cf096d5fb5063bcc185df97951a (diff) | |
| download | drakx-5b81add84d6f69ad60226abd75a5773b2284e5f6.tar drakx-5b81add84d6f69ad60226abd75a5773b2284e5f6.tar.gz drakx-5b81add84d6f69ad60226abd75a5773b2284e5f6.tar.bz2 drakx-5b81add84d6f69ad60226abd75a5773b2284e5f6.tar.xz drakx-5b81add84d6f69ad60226abd75a5773b2284e5f6.zip | |
configureTimezone doesn't take parameter /etc/sysconfig/clock
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/install2.pm | 2 | ||||
| -rw-r--r-- | perl-install/install_steps.pm | 4 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 4 | ||||
| -rw-r--r-- | perl-install/timezone.pm | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm index c3670c5ec..eb2be4e7e 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -383,7 +383,7 @@ sub configureTimezone { } $o->{timezone}{timezone} ||= timezone::bestTimezone(lang::lang2text($o->{lang})); $o->{timezone}{UTC} = $::expert && !grep { isFat($_) || isNT($_) } @{$o->{fstab}} unless exists $o->{timezone}{UTC}; - $o->configureTimezone($f, $clicked); + $o->configureTimezone($clicked); } #------------------------------------------------------------------------------ sub configureServices { $::expert and $o->configureServices } diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index a0a6b3119..a3fb7f72f 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -499,9 +499,9 @@ sub installCrypto { #------------------------------------------------------------------------------ sub configureTimezone { - my ($o, $f) = @_; + my ($o) = @_; require timezone; - timezone::write($o->{prefix}, $o->{timezone}, $f); + timezone::write($o->{prefix}, $o->{timezone}); } #------------------------------------------------------------------------------ diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 9da7f7a4d..b1d070c5d 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -674,13 +674,13 @@ USA")) || return; #------------------------------------------------------------------------------ sub configureTimezone { - my ($o, $f, $clicked) = @_; + my ($o, $clicked) = @_; require timezone; $o->{timezone}{timezone} = $o->ask_from_treelist('', _("Which is your timezone?"), '/', [ timezone::getTimeZones($::g_auto_install ? '' : $o->{prefix}) ], $o->{timezone}{timezone}); $o->set_help('configureTimezoneGMT'); $o->{timezone}{UTC} = $o->ask_yesorno('', _("Is your hardware clock set to GMT?"), $o->{timezone}{UTC}) if $::expert || $clicked; - install_steps::configureTimezone($o, $f); + install_steps::configureTimezone($o); } #------------------------------------------------------------------------------ diff --git a/perl-install/timezone.pm b/perl-install/timezone.pm index 559c6dbe8..96fb0510e 100644 --- a/perl-install/timezone.pm +++ b/perl-install/timezone.pm @@ -24,12 +24,12 @@ sub read ($) { ("timezone", $t{ZONE}, "UTC", text2bool($t{UTC})); } -sub write($$$) { - my ($prefix, $t, $f) = @_; +sub write { + my ($prefix, $t) = @_; eval { commands::cp("-f", "$prefix/usr/share/zoneinfo/$t->{timezone}", "$prefix/etc/localtime") }; $@ and log::l("installing /etc/localtime failed"); - setVarsInSh($f, { + setVarsInSh("$prefix/etc/sysconfig/clock", { ZONE => $t->{timezone}, UTC => bool2text($t->{UTC}), ARC => "false", |