summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps_interactive.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-07-30 15:11:26 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-07-30 15:11:26 +0000
commitc7801904b0dbb2017d1d88cebc3060f75d7a2f10 (patch)
treef5f45e9001557837dbfd358ab54da70c7eabee67 /perl-install/install_steps_interactive.pm
parent5de3a863fe9e504df02e99dff66f93483695babb (diff)
downloaddrakx-backup-do-not-use-c7801904b0dbb2017d1d88cebc3060f75d7a2f10.tar
drakx-backup-do-not-use-c7801904b0dbb2017d1d88cebc3060f75d7a2f10.tar.gz
drakx-backup-do-not-use-c7801904b0dbb2017d1d88cebc3060f75d7a2f10.tar.bz2
drakx-backup-do-not-use-c7801904b0dbb2017d1d88cebc3060f75d7a2f10.tar.xz
drakx-backup-do-not-use-c7801904b0dbb2017d1d88cebc3060f75d7a2f10.zip
- cleanup
- add pool.ntp.org (and make it the default) (cf bug #4197)
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
-rw-r--r--perl-install/install_steps_interactive.pm9
1 files changed, 5 insertions, 4 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index e2f01cf95..3c9107c84 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -830,12 +830,13 @@ sub configureTimezone {
]) or goto &configureTimezone
if $::expert || $clicked;
if ($ntp) {
- my @servers = split("\n", timezone::ntp_servers());
+ my $servers = timezone::ntp_servers();
+ $o->{timezone}{ntp} ||= 'pool.ntp.org';
- $o->ask_from_({},
- [ { label => N("NTP Server"), val => \$o->{timezone}{ntp}, list => \@servers, not_edit => 0 } ]
+ $in->ask_from_({},
+ [ { label => N("NTP Server"), val => \$o->{timezone}{ntp}, list => [ keys %$servers ], not_edit => 0,
+ format => sub { $servers->{$_[0]} ? "$servers->{$_[0]} ($_[0])" : $_[0] } } ]
) or goto &configureTimezone;
- $o->{timezone}{ntp} =~ s/.*\((.+)\)/$1/;
} else {
$o->{timezone}{ntp} = '';
}