summaryrefslogtreecommitdiffstats
path: root/perl-install/any.pm
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-03-19 18:35:03 +0000
committerOlivier Blin <oblin@mandriva.com>2008-03-19 18:35:03 +0000
commit598c9ddc46a73435743bf5006d11ed434f2ab0d8 (patch)
tree0c93cf46178beea82c33bf7259d7dc7679acaa61 /perl-install/any.pm
parent3dd38fc0df608e7275ab024bf7ad677ee344d3f8 (diff)
downloaddrakx-backup-do-not-use-598c9ddc46a73435743bf5006d11ed434f2ab0d8.tar
drakx-backup-do-not-use-598c9ddc46a73435743bf5006d11ed434f2ab0d8.tar.gz
drakx-backup-do-not-use-598c9ddc46a73435743bf5006d11ed434f2ab0d8.tar.bz2
drakx-backup-do-not-use-598c9ddc46a73435743bf5006d11ed434f2ab0d8.tar.xz
drakx-backup-do-not-use-598c9ddc46a73435743bf5006d11ed434f2ab0d8.zip
split out configure_time_more (for next commit)
Diffstat (limited to 'perl-install/any.pm')
-rw-r--r--perl-install/any.pm11
1 files changed, 10 insertions, 1 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 0955ea526..d58e6ed10 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -1343,6 +1343,15 @@ sub configure_timezone {
my $selected_timezone = $in->ask_from_treelist(N("Timezone"), N("Which is your timezone?"), '/', [ timezone::getTimeZones() ], $timezone->{timezone}) or return;
$timezone->{timezone} = $selected_timezone;
+ configure_time_more($in, $timezone)
+ or goto &configure_timezone if $ask_gmt || to_bool($timezone->{ntp});
+
+ 1;
+}
+
+sub configure_time_more {
+ my ($in, $timezone) = @_;
+
my $ntp = to_bool($timezone->{ntp});
my $servers = timezone::ntp_servers();
$timezone->{ntp} ||= 'pool.ntp.org';
@@ -1368,7 +1377,7 @@ sub configure_timezone {
{ val => \$timezone->{ntp}, disabled => sub { !$ntp },
type => "list", separator => '|',
list => [ keys %$servers ], format => sub { $servers->{$_[0]} } },
- ]) or goto &configure_timezone if $ask_gmt || $ntp;
+ ]) or return;
$timezone->{ntp} = '' if !$ntp;