diff options
Diffstat (limited to 'perl-install/install/any.pm')
| -rw-r--r-- | perl-install/install/any.pm | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm index 8772879ac..19bd157cb 100644 --- a/perl-install/install/any.pm +++ b/perl-install/install/any.pm @@ -123,23 +123,6 @@ sub getAvailableSpace { fs::any::getAvailableSpace($o->{fstab}); } -sub preConfigureTimezone { - my ($o) = @_; - require timezone; - - #- cannot be done in install cuz' timeconfig %post creates funny things - add2hash($o->{timezone}, timezone::read()) if $o->{isUpgrade}; - - $o->{timezone}{timezone} ||= timezone::bestTimezone($o->{locale}{country}); - - my $utc = every { !isFat_or_NTFS($_) } @{$o->{fstab}}; - my $ntp = timezone::ntp_pool(); - add2hash_($o->{timezone}, { UTC => $utc, ntp => $ntp }); - - #- Make the timezone available to urpm::mirrors. - write_installer_timezone($o->{timezone}); -} - =item write_installer_timezone($timezone) Writes a minimal version of $timezone to /etc/sysconfig/clock for use by urpm::mirrors @@ -229,7 +212,6 @@ sub ask_suppl_media_url { my ($o, $method, $o_url) = @_; if (member($method, qw(ftp http))) { - preConfigureTimezone($o); any::ask_mirror_and_downloader($o, $o->{options}, 'downloader_only'); $o->{packages}{options}{downloader} = $o->{options}{downloader}; any::ask_mirror($o, 'distrib', $o_url); |
