summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps_interactive.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-07-03 13:25:40 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-07-03 13:25:40 +0000
commitefd1a3220085f5317b8daac3372b28b79381c5c9 (patch)
tree903b768355aae9578ebd3b46206f766eae09c772 /perl-install/install_steps_interactive.pm
parentdedeabe506d093314b7be2e03fd046e4d5f492fa (diff)
downloaddrakx-backup-do-not-use-efd1a3220085f5317b8daac3372b28b79381c5c9.tar
drakx-backup-do-not-use-efd1a3220085f5317b8daac3372b28b79381c5c9.tar.gz
drakx-backup-do-not-use-efd1a3220085f5317b8daac3372b28b79381c5c9.tar.bz2
drakx-backup-do-not-use-efd1a3220085f5317b8daac3372b28b79381c5c9.tar.xz
drakx-backup-do-not-use-efd1a3220085f5317b8daac3372b28b79381c5c9.zip
add ntp handling
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
-rw-r--r--perl-install/install_steps_interactive.pm15
1 files changed, 14 insertions, 1 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 6a020f0e6..4fda58db6 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -775,7 +775,19 @@ sub configureTimezone {
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;
+
+ my $ntp = bool($o->{timezone}{ntp});
+ $o->ask_from_entries_refH('', '', [
+ { text => _("Hardware clock set to GMT"), val => \$o->{timezone}{UTC}, type => 'bool' },
+ { text => _("Automatic time synchronization (using NTP)"), val => \$ntp, type => 'bool' },
+ ]) or goto &configureTimezone
+ if $::expert || $clicked;
+ if ($ntp) {
+ $o->ask_from_entries_refH('', '',
+ [ { label => _("NTP Server"), val => \$o->{timezone}{ntp} } ]) or goto &configureTimezone;
+ } else {
+ $o->{timezone}{ntp} = '';
+ }
install_steps::configureTimezone($o);
}
@@ -789,6 +801,7 @@ sub configureServices {
sub summary {
my ($o, $first_time) = @_;
+ require pkgs;
if ($first_time) {
#- auto-detection