[Piuparts-commits] [piuparts] 03/05: scripts-jessie: make init-system-helpers fake-essential

Holger Levsen holger at moszumanska.debian.org
Tue Dec 2 10:29:34 UTC 2014


This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch develop
in repository piuparts.

commit 2da1941a44430fc25f35610c609cbbfe74218214
Author: Andreas Beckmann <anbe at debian.org>
Date:   Tue Dec 2 01:05:15 2014 +0100

    scripts-jessie: make init-system-helpers fake-essential
    
    to allow proper cleanup of systemd service symlinks
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
---
 .../scripts-jessie/post_setup_jessie-fake-essential        | 14 ++++++++++++--
 debian/changelog                                           |  1 +
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/custom-scripts/scripts-jessie/post_setup_jessie-fake-essential b/custom-scripts/scripts-jessie/post_setup_jessie-fake-essential
index 98dc3e3..240bd9a 100755
--- a/custom-scripts/scripts-jessie/post_setup_jessie-fake-essential
+++ b/custom-scripts/scripts-jessie/post_setup_jessie-fake-essential
@@ -6,17 +6,27 @@ set -e
 # so add these packages to the "fake" essential set.
 USED_DURING_PURGE="ucf"
 
+# For purging configuration from /var/lib/systemd/
+INITSYSTEMHELPERS="init-system-helpers"
+
+case ${PIUPARTS_DISTRIBUTION} in
+	lenny*|squeeze*|wheezy*)
+		# package does not exist
+		INITSYSTEMHELPERS=""
+		;;
+esac
+
 
 case ${PIUPARTS_OBJECTS%%=*} in
 	dpkg)
 		# don't install fake essential packages while creating the tarball
 		exit 0
 		;;
-	ucf)
+	ucf|init-system-helpers)
 		# allow testing of the fake essential packages
 		exit 0
 		;;
 esac
 
 echo "*** Adding fake essential packages ***"
-apt-get install -yf $USED_DURING_PURGE
+apt-get install -yf $USED_DURING_PURGE $INITSYSTEMHELPERS
diff --git a/debian/changelog b/debian/changelog
index e55cf6d..a364875 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -43,6 +43,7 @@ piuparts (0.61) UNRELEASED; urgency=medium
   * post_distupgrade_exceptions: Handle libdb5.1 removal in jessie.
   * scripts-jessie/post_setup_jessie-fake-essential: New custom script.
     - Make ucf fake-essential. (ucf may be used unconditionally during purge.)
+    - Make init-system-helpers fake-essential. (Systemd service link cleanup.)
   * Rework the file-rc/sysvinit/upstart/systemd specific exceptions.
   * Update custom scripts handling databases, experimental, ... and some more.
   * Update bug templates.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/piuparts/piuparts.git



More information about the Piuparts-commits mailing list