From df7b3d934f2b31f9e8a783bd1653ab06521a2547 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sat, 11 Jun 2011 19:36:46 +0200
Subject: Moving installation of live packages to second pass.

---
 scripts/build/lb_chroot_linux-image | 31 ++-----------------------------
 1 file changed, 2 insertions(+), 29 deletions(-)

(limited to 'scripts/build/lb_chroot_linux-image')

diff --git a/scripts/build/lb_chroot_linux-image b/scripts/build/lb_chroot_linux-image
index 39ee0fae5..e060ff3e6 100755
--- a/scripts/build/lb_chroot_linux-image
+++ b/scripts/build/lb_chroot_linux-image
@@ -52,34 +52,7 @@ then
 			echo ${PACKAGE}-${FLAVOUR} >> chroot/root/chroot_packages
 		done
 	done
-fi
-
-# Queue installation of linux-image and ${LB_INITRAMFS}
-if [ "${LB_INITRAMFS}" != "none" ]
-then
-	echo ${LB_INITRAMFS} >> chroot/root/chroot_packages
-fi
 
-# Queue installation of live-config
-if [ "${LB_INITSYSTEM}" != "none" ]
-then
-	echo "live-config live-config-${LB_INITSYSTEM}" >> chroot/root/chroot_packages
+	# Creating stage file
+	Create_stagefile .stage/chroot_linux-image
 fi
-
-# Do initsystem specific hacks
-if [ "${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
-
-# Creating stage file
-Create_stagefile .stage/chroot_linux-image
-- 
cgit v1.2.3