[Piuparts-commits] [piuparts] 01/02: scripts: rework systemd-sysv and upstart exceptions
Holger Levsen
holger at moszumanska.debian.org
Wed Nov 19 16:31:56 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 faa8b5562d2a3c47786c744caf7158243b44437a
Author: Andreas Beckmann <anbe at debian.org>
Date: Wed Nov 19 15:06:05 2014 +0100
scripts: rework systemd-sysv and upstart exceptions
Signed-off-by: Andreas Beckmann <anbe at debian.org>
---
custom-scripts/scripts/pre_install_exceptions | 27 +++++++++++++++++++++------
debian/changelog | 1 +
2 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/custom-scripts/scripts/pre_install_exceptions b/custom-scripts/scripts/pre_install_exceptions
index 48ef281..ae89cb0 100755
--- a/custom-scripts/scripts/pre_install_exceptions
+++ b/custom-scripts/scripts/pre_install_exceptions
@@ -17,8 +17,6 @@ case ${PIUPARTS_OBJECTS%%=*} in
;;
live-config-upstart|\
netscript-2.4-upstart|\
- upstart-dconf-bridge|\
- upstart-monitor|\
upstart)
case "$PIUPARTS_DISTRIBUTION" in
squeeze*|wheezy*)
@@ -28,8 +26,29 @@ case ${PIUPARTS_OBJECTS%%=*} in
;;
esac
;;
+ upstart-dconf-bridge|\
+ upstart-monitor)
+ # switch init to upstart before installation
+ apt-get install upstart
+ ;;
+ systemd-sysv)
+ case "$PIUPARTS_DISTRIBUTION" in
+ wheezy*)
+ # force installation and removal of essential package sysvinit
+ log_debug
+ yes 'Yes, do as I say!' | apt-get -y --force-yes install systemd-sysv
+ ;;
+ esac
+ ;;
esac
+#
+# the remaining exceptions are only for the initial package installation
+#
+if [ "$PIUPARTS_PHASE" != "install" ]; then
+ exit 0
+fi
+
case ${PIUPARTS_OBJECTS%%=*} in
samhain) log_debug
# work around #749602
@@ -46,10 +65,6 @@ case ${PIUPARTS_OBJECTS%%=*} in
# ltsp-client-core refuses installation unless this file exist
touch /etc/ltsp_chroot
;;
- systemd-sysv) log_debug
- # force installation and removal of essential package sysvinit
- yes 'Yes, do as I say!' | apt-get -y --force-yes install systemd-sysv
- ;;
bugzilla3)
# checksetup.pl goes into infinite loop asking for them
log_debug
diff --git a/debian/changelog b/debian/changelog
index 21cf29d..248915d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,7 @@ piuparts (0.61) UNRELEASED; urgency=medium
example, so that logfiles are displayed as UTF-8.
* pre_install_foreign_architecture: New script to enable foreign
architectures for testing cross toolchain packages.
+ * Rework the file-rc/sysvinit/upstart/systemd specific exceptions.
-- Holger Levsen <holger at debian.org> Sun, 26 Oct 2014 20:19:35 +0100
--
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