/etc/zsh/zshenv: source /etc/timezone if present

diff --git a/debian/changelog b/debian/changelog
index a8bd3a8..36cdef0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+grml-etc-core (0.2.32) unstable; urgency=low
+
+  * /etc/zsh/zshenv: source /etc/timezone if present
+    (We don't want to set TZ via /etc/default/locale any longer.)
+
+ -- Michael Prokop <mika@grml.org>  Sat, 17 Mar 2007 12:18:38 +0100
+
 grml-etc-core (0.2.31) unstable; urgency=low
 
   * /etc/zsh/zshrc: update swspeak alias:

diff --git a/etc/zsh/zshenv b/etc/zsh/zshenv
index 0f12462..b29d249 100644 (file)
--- a/etc/zsh/zshenv
+++ b/etc/zsh/zshenv
@@ -3,7 +3,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Sam Feb 24 18:59:11 CET 2007 [mika]
+# Latest change: Sam Mär 17 12:18:26 CET 2007 [mika]
 ################################################################################
 # This file is sourced on all invocations of the shell.
 # It is the 1st file zsh reads; it's read for every shell,
@@ -34,6 +34,7 @@
   [ -n "$LC_MESSAGES" ]   && export LC_MESSAGES
 
   [ -r /etc/sysconfig/keyboard ] && source /etc/sysconfig/keyboard
+  [ -r /etc/timezone ] && source /etc/timezone
 
 # set environment variables (important for autologin on tty)
   [ -z "$HOSTNAME" ]      && export HOSTNAME=`hostname`