summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-03-19 18:42:27 +0000
committerOlivier Blin <oblin@mandriva.com>2008-03-19 18:42:27 +0000
commit4f441032f26c8334c49969ac7eaa37752c1250ee (patch)
tree8949e038668cff81e3a1b9616b28be1401ecd63c /perl-install
parent50720ff0e76d0ccfdb49089aef64d8c97de52740 (diff)
downloaddrakx-4f441032f26c8334c49969ac7eaa37752c1250ee.tar
drakx-4f441032f26c8334c49969ac7eaa37752c1250ee.tar.gz
drakx-4f441032f26c8334c49969ac7eaa37752c1250ee.tar.bz2
drakx-4f441032f26c8334c49969ac7eaa37752c1250ee.tar.xz
drakx-4f441032f26c8334c49969ac7eaa37752c1250ee.zip
allow to use a simplified time step (no timezone selection, ntp settings as advanced)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS2
-rwxr-xr-xperl-install/standalone/finish-install6
2 files changed, 7 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 91452f175..9488b9252 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -2,6 +2,8 @@
- finish-install:
o write modprobe.conf after configuring network
o do not configure network if already up
+ o allow to use a simplified time step
+ (no timezone selection, ntp settings as advanced)
Version 10.16.1 - 18 March 2008
diff --git a/perl-install/standalone/finish-install b/perl-install/standalone/finish-install
index d817c8fda..80700a4b6 100755
--- a/perl-install/standalone/finish-install
+++ b/perl-install/standalone/finish-install
@@ -58,7 +58,11 @@ sub ask_timezone() {
require timezone;
my $t = timezone::read();
$t->{timezone} = timezone::bestTimezone($locale->{country}) if $locale->{country};
- any::configure_timezone($in, $t, 'ask_gmt');
+ if (lc($conf{TIMEZONE}) eq 'simplified') {
+ any::configure_time_more($in, $t, 'hide_ntp');
+ } else {
+ any::configure_timezone($in, $t, 'ask_gmt');
+ }
timezone::write($t);
#- reload sys clock from hc once we know the real timezone
timezone::reload_sys_clock($t);