- rel 3; java relies on /etc/localtime being symlink for timezone detection, so make...

diff --git a/timezone.init b/timezone.init
index 5b52348c2529fa8822e86fd27e8f1e856e159067..ba0931be147d573fc6a9acc4e9fa4f8975821748 100755 (executable)
--- a/timezone.init
+++ b/timezone.init
@@ -35,7 +35,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

diff --git a/tzdata.spec b/tzdata.spec
index 7fd19c27496350e93514dd0e629cc0a7d9ba68f7..5b687a06b8562adfae5d1672ebfa72f66e3e5f7a 100644 (file)
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -15,7 +15,7 @@ Summary:      Timezone data
 Summary(pl.UTF-8):     Dane o strefach czasowych
 Name:          tzdata
 Version:       %{tzdata_ver}
-Release:       2
+Release:       3
 License:       Public Domain (database), BSD/LGPL v2.1+ (code/test suite)
 Group:         Base
 # The tzdata-base-0.tar.bz2 is a simple building infrastructure and