[debhelper-devel] [debhelper] 02/02: Revert "dh_installinit: Disable init scripts on removal"
Niels Thykier
nthykier at moszumanska.debian.org
Thu Nov 26 17:05:02 UTC 2015
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch master
in repository debhelper.
commit caec2b5112bc2e975f1badaaba03099f925b2358
Author: Niels Thykier <niels at thykier.net>
Date: Thu Nov 26 18:03:46 2015 +0100
Revert "dh_installinit: Disable init scripts on removal"
This reverts commit 0f09b1f88b36eeb99d0b7df8ae2702442e03b45f.
---
autoscripts/postrm-init | 11 ++---------
debian/changelog | 3 +++
2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/autoscripts/postrm-init b/autoscripts/postrm-init
index 9881b1c..6f5bb09 100644
--- a/autoscripts/postrm-init
+++ b/autoscripts/postrm-init
@@ -1,17 +1,10 @@
-if [ "$1" = "remove" ] ; then
- # Attempt to disable but ignore failures as it is not
- # required (and the script must be a able to handle
- # being called while the package is removed, but not
- # yet purged)
- update-rc.d #SCRIPT# disable >/dev/null || true
-fi
if [ "$1" = "purge" ] ; then
update-rc.d #SCRIPT# remove >/dev/null
fi
-# In case this system is running systemd, we make systemd reload the
-# unit files to pick up changes.
+# In case this system is running systemd, we make systemd reload the unit files
+# to pick up changes.
if [ -d /run/systemd/system ] ; then
systemctl --system daemon-reload >/dev/null || true
fi
diff --git a/debian/changelog b/debian/changelog
index 41ab32a..947d2ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ debhelper (9.20151117+unreleased) UNRELEASED; urgency=medium
* dh_compress: Apply patch from Michael Biebl to skip
compression of .devhelp2 files. (Closes: #789153)
+ * dh_installinit: Undo "Disable initscripts when a package is
+ removed (but not yet purged)". (Reopens #749400,
+ Closes: #806276)
-- Niels Thykier <niels at thykier.net> Sat, 21 Nov 2015 00:33:52 +0100
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git
More information about the debhelper-devel
mailing list