- up to 2017c

[packages/tzdata.git] / timezone.init

diff --git a/timezone.init b/timezone.init
index 5b52348c2529fa8822e86fd27e8f1e856e159067..716a1fd6c7bcf47eb24219430105ad6ec369086b 100755 (executable)
--- a/timezone.init
+++ b/timezone.init
@@ -10,8 +10,6 @@
 # Source function library.
 . /etc/rc.d/init.d/functions
 
-upstart_controlled --except status disable
-
 . /etc/sysconfig/timezone
 
 ZONE_FILE="$ZONE_INFO_DIR"
@@ -35,7 +33,11 @@ start() {
 
                MESSAGE=$(nls 'Setting time zone information (%s)' "$TIMEZONE")
 
-               run_cmd "$MESSAGE" cp -af "$ZONE_FILE" /etc/localtime
+               if [ -n "$(awk '$2 == "/usr" { print $2 }' /proc/mounts 2> /dev/null)" ]; then
+                       run_cmd "$MESSAGE" cp -af "$ZONE_FILE" /etc/localtime
+               else
+                       run_cmd "$MESSAGE" ln -sf "$ZONE_FILE" /etc/localtime
+               fi
                RETVAL=$?
                restorecon /etc/localtime >/dev/null 2>&1
        else