From 598c9ddc46a73435743bf5006d11ed434f2ab0d8 Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Wed, 19 Mar 2008 18:35:03 +0000 Subject: split out configure_time_more (for next commit) --- perl-install/any.pm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'perl-install/any.pm') 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; -- cgit v1.2.1