Migrate hwclock configuration.

Do a one-time migration of the hwclock configuration. If UTC is set to "no" in
/etc/default/rcS, create /etc/adjtime and add the "LOCAL" setting.

diff --git a/debian/changelog b/debian/changelog
index 6aab765964629b3f8ab5b993d586fa025b8efdff..d55870fe42573ecc0bd81f64a4a40bfaf8c247fd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ systemd (35-1) UNRELEASED; urgency=low
   * As autoreconf doesn't like intltool, override dh_autoreconf and call
     intltoolize and autoreconf ourselves.
   * Add Build-Depends on intltool.
+  * Do a one-time migration of the hwclock configuration. If UTC is set to
+    "no" in /etc/default/rcS, create /etc/adjtime and add the "LOCAL" setting.
 
  -- Tollef Fog Heen <tfheen@debian.org>  Wed, 14 Sep 2011 08:25:17 +0200
 

diff --git a/debian/systemd.postinst b/debian/systemd.postinst
index 5efbfe6dcc4e7dfef5f897be709dc5bbb22dfc1a..6071df40b60ff72f16c4d3456961aae3897a5d27 100644 (file)
--- a/debian/systemd.postinst
+++ b/debian/systemd.postinst
@@ -16,6 +16,13 @@ if [ -n "$2" ]; then
             rmdir --ignore-fail-on-non-empty /cgroup
         fi
     fi
+    # Do a one-time migration of the local time setting
+    if dpkg --compare-versions "$2" lt "33-1"; then
+        . /etc/default/rcS
+        if [ $UTC ="no" ] && [ ! -e /etc/adjtime ]; then
+            echo "0 0 0\0\0LOCAL" > /etc/adjtime
+        fi
+    fi
 fi
 
 systemd-machine-id-setup