summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2009-11-17 16:29:39 +0000
committerobrien <obrien@FreeBSD.org>2009-11-17 16:29:39 +0000
commit7a582e36614baf11e09a8f5fc8444c3297de67e6 (patch)
tree83c8cf717055e05458495eb19c8e815cf9a60d2d
parentee88dde1cb193dd055765cf54b3558e2853e11fa (diff)
downloadFreeBSD-src-7a582e36614baf11e09a8f5fc8444c3297de67e6.zip
FreeBSD-src-7a582e36614baf11e09a8f5fc8444c3297de67e6.tar.gz
Catch up with r130332 which changed the default timezone from GMT to UTC.
Otherwise the tzload() (when called by gmtload()) fails to locate the UTC file and loads the posixrules.
-rw-r--r--lib/libc/gen/tzset.34
-rw-r--r--share/zoneinfo/etcetera4
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/libc/gen/tzset.3 b/lib/libc/gen/tzset.3
index 34ca238..8d37fca 100644
--- a/lib/libc/gen/tzset.3
+++ b/lib/libc/gen/tzset.3
@@ -310,14 +310,14 @@ time zone directory
rules for
.Tn POSIX Ns -style
.Tn TZ Ns 's
-.It Pa /usr/share/zoneinfo/GMT
+.It Pa /usr/share/zoneinfo/Etc/GMT
for
.Tn UTC
leap seconds
.El
.Pp
If the file
-.Pa /usr/share/zoneinfo/GMT
+.Pa /usr/share/zoneinfo/UTC
does not exist,
.Tn UTC
leap seconds are loaded from
diff --git a/share/zoneinfo/etcetera b/share/zoneinfo/etcetera
index 5c93682..8f69280 100644
--- a/share/zoneinfo/etcetera
+++ b/share/zoneinfo/etcetera
@@ -16,9 +16,9 @@ Zone Etc/UCT 0 - UCT
# The following link uses older naming conventions,
# but it belongs here, not in the file `backward',
-# as functions like gmtime load the "GMT" file to handle leap seconds properly.
+# as functions like gmtime load the "UTC" file to handle leap seconds properly.
# We want this to work even on installations that omit the other older names.
-Link Etc/GMT GMT
+Link Etc/UTC UTC
Link Etc/UTC Etc/Universal
Link Etc/UTC Etc/Zulu
OpenPOWER on IntegriCloud