- merged ZONE_INFO_AREA and TIME_ZONE into TIMEZONE

Changed files:
    timezone.init -> 1.13
    timezone.sysconfig -> 1.3

diff --git a/timezone.init b/timezone.init
index ffdece513795bf8554df82a795490226a2943ff9..58085a150a83ce57ef4fa1c5160b9c60dd283339 100644 (file)
--- a/timezone.init
+++ b/timezone.init
@@ -20,11 +20,7 @@ if [ -n "$ZONE_INFO_SCHEME" -a "$ZONE_INFO_SCHEME" != "posix" ]; then
        ZONE_FILE="$ZONE_FILE/$ZONE_INFO_SCHEME"
 fi
 
-if [ -n "$ZONE_INFO_AREA" ]; then
-       ZONE_FILE="$ZONE_FILE/$ZONE_INFO_AREA"
-fi
-
-ZONE_FILE="$ZONE_FILE/$TIME_ZONE"
+ZONE_FILE="$ZONE_FILE/$TIMEZONE"
 
 [ -L /etc/localtime ] && [ "$(resolvesymlink /etc/localtime)" = "$ZONE_FILE" ] && exit 0
 
@@ -33,11 +29,8 @@ start() {
                if [ -f "$ZONE_FILE" ]; then
                        rm -f /etc/localtime
 
-                       if [ -n "$ZONE_INFO_AREA" ]; then
-                               MESSAGE="`nls 'Setting time zone information (%s, %s)' "$ZONE_INFO_AREA" "$TIME_ZONE"`"
-                       else
-                               MESSAGE="`nls 'Setting time zone information (%s)' "$TIME_ZONE"`"
-                       fi
+                       MESSAGE="`nls 'Setting time zone information (%s)' "$TIMEZONE"`"
+
                        run_cmd "$MESSAGE" cp -af $ZONE_FILE /etc/localtime
                        RETVAL=$?
                        restorecon /etc/localtime >/dev/null 2>&1
@@ -74,11 +67,7 @@ case "$1" in
        disable
        ;;
   status)
-       if [ -n "$ZONE_INFO_AREA" ]; then
-               nls 'Time zone configured to (%s, %s)' "$ZONE_INFO_AREA" "$TIME_ZONE"
-       else
-               nls 'Time zone configured to (%s)' "$TIME_ZONE"
-       fi
+       nls 'Time zone configured to (%s)' "$TIMEZONE"
        ;;
   *)
        msg_usage "$0 {start|stop|restart|try-restart|reload|force-reload|disable|status}"

diff --git a/timezone.sysconfig b/timezone.sysconfig
index 7b3386e2937a00bfef2172ecbfe2c00d3ac5d5c7..0cb4592df44e74810eb683ff5b5938583214c1e2 100644 (file)
--- a/timezone.sysconfig
+++ b/timezone.sysconfig
@@ -6,8 +6,5 @@ ZONE_INFO_DIR="/usr/share/zoneinfo"
 # Scheme you would like to use in your system.
 ZONE_INFO_SCHEME="posix"
 
-# Area (sometimes may be empty)
-ZONE_INFO_AREA="Europe"
-
 # Name of the time zone for your system.
-TIME_ZONE="Warsaw"
+TIMEZONE="Europe/Warsaw"