Cleanup hwclock-save.service symlinks when upgrading from the jessie version

diff --git a/debian/changelog b/debian/changelog
index 027d50662a735988f351af03804fef5bbc67a862..c1db177515baf817a5627056b262b57722a23584 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ systemd (219-8) UNRELEASED; urgency=medium
     dependency via Build-Depends-Package.
   * Revert "Make apparmor run before networking". This causes dependency
     cycles while apparmor still depends on $remote_fs.
+  * Cleanup hwclock-save.service symlinks when upgrading from the jessie
+    version.
 
   [ Martin Pitt ]
   * cryptsetup: Implement offset and skip options. (Closes: #751707,

diff --git a/debian/systemd.postinst b/debian/systemd.postinst
index cec2c53aaf11acdb36af82a4ffcdc4fe5f871235..325edc5156c6cf7b474d7ade9fea8cc323e26756 100644 (file)
--- a/debian/systemd.postinst
+++ b/debian/systemd.postinst
@@ -168,4 +168,11 @@ if dpkg --compare-versions "$2" lt-nl "219-4" && \
     fi
 fi
 
+# Cleanup hwclock-save.service, which was shipped in jessie.
+if dpkg --compare-versions "$2" lt-nl "219-8"; then
+   for t in reboot halt poweroff ; do
+       rm -f /etc/systemd/system/${t}.target.wants/hwclock-save.service
+       rmdir --ignore-fail-on-non-empty /etc/systemd/system/${t}.target.wants 2> /dev/null || true
+   done
+fi
 #DEBHELPER#