From 96e86b96d8b0c38cfcbef4201c5de112030d0326 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Fri, 30 Sep 2011 00:56:49 +0200
Subject: Adding --system option to define the resulting image type to be a
 live system or a normal, non-live system.

---
 scripts/build/lb_chroot_live-packages | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'scripts/build/lb_chroot_live-packages')

diff --git a/scripts/build/lb_chroot_live-packages b/scripts/build/lb_chroot_live-packages
index 31734a8d8..ef8292e09 100755
--- a/scripts/build/lb_chroot_live-packages
+++ b/scripts/build/lb_chroot_live-packages
@@ -36,25 +36,22 @@ Check_lockfile .lock
 # Creating lock file
 Create_lockfile .lock
 
-_PACKAGES=""
-
-# Queue installation of linux-image and ${LB_INITRAMFS}
-if [ "${LB_INITRAMFS}" != "none" ]
+# Queue installation of live-boot
+if [ -n "${LB_INITRAMFS}" ] && [ "${LB_INITRAMFS}" != "none" ]
 then
 	_PACKAGES="${LB_INITRAMFS}"
 fi
 
 # Queue installation of live-config
-if [ "${LB_INITSYSTEM}" != "none" ]
+if [ -n "${LB_INITSYSTEM}" ] && [ "${LB_INITSYSTEM}" != "none" ]
 then
 	_PACKAGES="${_PACKAGES} live-config live-config-${LB_INITSYSTEM}"
 fi
 
 # Do initsystem specific hacks
-if [ "${LB_INITSYSTEM}" != "sysvinit" ]
+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="$?"
 
-- 
cgit v1.2.3