summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTollef Fog Heen <tfheen@err.no>2011-04-26 21:54:07 +0200
committerTollef Fog Heen <tfheen@err.no>2011-04-26 21:54:07 +0200
commita3328de25baad87a43690d35335a917b0e763d39 (patch)
tree69120169e613a668e76f36142da63476ee3da5ef
parent93b03d51076569980cc8388060a3838b9e19e142 (diff)
downloadsystemd-a3328de25baad87a43690d35335a917b0e763d39.tar.gz
Remove diversion of init-functions on downgrade
-rw-r--r--debian/changelog7
-rw-r--r--debian/systemd.postrm2
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 0ffe278934..8683aee32d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+systemd (25-2) experimental; urgency=low
+
+ * Handle downgrades more gracefully by removing diversion of
+ /lib/lsb/init-functions on downgrades to << 25-1.
+
+ --
+
systemd (25-1) experimental; urgency=low
* New upstream release, target experimental due to initscripts
diff --git a/debian/systemd.postrm b/debian/systemd.postrm
index 0565e8c06f..b38a9db572 100644
--- a/debian/systemd.postrm
+++ b/debian/systemd.postrm
@@ -2,7 +2,7 @@
set -e
-if [ "$1" = remove ]; then
+if [ "$1" = remove ] || [ "$1" = upgrade ] && dpkg --compare-versions "$2" lt 25-1; then
dpkg-divert --remove --package systemd --rename \
--divert /lib/lsb/init-functions.systemd /lib/lsb/init-functions
fi