From b7abcb0c01724f3da9f17899008be98f14edef2d Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sun, 28 Oct 2012 11:46:01 +0100
Subject: Shortening initsystem specific hacks for wheezy, systemd on squeeze
 never was really supported anyway.

---
 scripts/build/chroot_live-packages | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

(limited to 'scripts/build')

diff --git a/scripts/build/chroot_live-packages b/scripts/build/chroot_live-packages
index 057e423f6..75bf4fb29 100755
--- a/scripts/build/chroot_live-packages
+++ b/scripts/build/chroot_live-packages
@@ -49,18 +49,11 @@ then
 fi
 
 # Do initsystem specific hacks
-if [ -n "${LB_INITSYSTEM}" ] && [ "${LB_INITSYSTEM}" != "sysvinit" ]
-then
-	# lets see if we still need the squeeze's "pre init system policy discussion" hack:
-	IS_SYSVINIT_ESSENTIAL="$(Chroot chroot dpkg-query --show --showformat='${Essential}\n' sysvinit)"
-	RC="$?"
-
-	if [ "${IS_SYSVINIT_ESSENTIAL}" != "no" ] && [ "${RC}" = "0" ]
-	then
-		# sysvinit is both installed and essential, ugly hack to remove it
-		Chroot chroot dpkg --force-remove-essential --remove sysvinit || true
-	fi
-fi
+case "${LB_INITSYSTEM}" in
+	systemd)
+		_PACKAGES="${_PACKAGES} systemd-sysv"
+		;;
+esac
 
 # Install live packages
 if [ -n "${_PACKAGES}" ]
-- 
cgit v1.2.3