From 123d956682a5a0392af1c68135c8bd036026d0fa Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Wed, 10 Sep 2008 15:51:33 +0000
Subject: always ask timezone (#23303, #42368)

---
 perl-install/NEWS                      | 1 +
 perl-install/standalone/finish-install | 6 +-----
 2 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/NEWS b/perl-install/NEWS
index a5b204018..6869bf680 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -4,6 +4,7 @@
   o fix nolapic/lapic logic due to altered kernel settings
 - fix input devices detection in rpmsrate (broken for 3 years, #43721)
 - finish-install:
+  o always ask timezone (#23303, #42368)
   o behave nicely when a window manager is running (for debugging)
 
 Version 11.38 - 8 September 2008
diff --git a/perl-install/standalone/finish-install b/perl-install/standalone/finish-install
index 52c37ca54..bc8295d15 100755
--- a/perl-install/standalone/finish-install
+++ b/perl-install/standalone/finish-install
@@ -68,11 +68,7 @@ sub ask_timezone() {
     require timezone;
     my $t = timezone::read();
     $t->{timezone} = timezone::bestTimezone($locale->{country}) if $locale->{country};
-    if (lc(get_conf('TIMEZONE')) eq 'simplified') {
-       any::configure_time_more($in, $t, 'hide_ntp');
-    } else {
-       any::configure_timezone($in, $t, 'ask_gmt');
-    }
+    any::configure_timezone($in, $t, 'ask_gmt', lc(get_conf('TIMEZONE')) eq 'simplified');
     timezone::write($t);
     #- reload sys clock from hc once we know the real timezone
     timezone::reload_sys_clock($t);
-- 
cgit v1.2.1