- merged ZONE_INFO_AREA and TIME_ZONE into TIMEZONE

[packages/tzdata.git] / timezone.init

diff --git a/timezone.init b/timezone.init
index 58c1e634b3bf8c20cf7f3e4934048e6f877ed461..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,13 +29,11 @@ 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
-                       run_cmd "$MESSAGE" cp -afc $ZONE_FILE /etc/localtime
+                       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
                fi
 
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/timezone
@@ -65,7 +59,7 @@ case "$1" in
   stop)
        stop
        ;;
-  restart|reload)
+  restart|try-restart|reload|force-reload)
        stop
        start
        ;;
@@ -73,14 +67,10 @@ 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|reload|disable|status}"
+       msg_usage "$0 {start|stop|restart|try-restart|reload|force-reload|disable|status}"
        exit 3
 esac