summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rwxr-xr-xtime-conf.in4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0989a53..d24b194 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
* 0.4 RELEASE
+2001-05-09 Hans Petter Jansson <hpj@ximian.com>
+
+ * time-conf.in: Red Hat 7.0 timezone fix from Arturo.
+
2001-05-09 Arturo Espinosa Aldama <arturo@ximian.com>
* report.pl.in (xst_report): We're sending report strings into debug
diff --git a/time-conf.in b/time-conf.in
index 20a0457..f3286f0 100755
--- a/time-conf.in
+++ b/time-conf.in
@@ -160,8 +160,7 @@ sub xml_print
{
my $h = $_[0];
my @sync;
-
- @scalar_keys = qw (timezone ntpinstalled);
+ my @scalar_keys = qw (timezone ntpinstalled);
$sync = $$h{"sync"};
@@ -411,6 +410,7 @@ sub conf_get_parse_table
{
NTP_CONF => "/etc/ntp.conf",
STEP_TICKERS => "/etc/ntp/step-tickers",
+ ZONEINFO => "/usr/share/zoneinfo",
LOCAL_TIME => "/etc/localtime"
},
table =>