From 97c3a13dcc9becf93cb7c2aa89ea3e00f06b9179 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sun, 23 Sep 2007 10:05:09 +0200
Subject: Adding live-helper 1.0~a10-1.

---
 helpers/lh_binary_rootfs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'helpers/lh_binary_rootfs')

diff --git a/helpers/lh_binary_rootfs b/helpers/lh_binary_rootfs
index ce93038dc..47529a297 100755
--- a/helpers/lh_binary_rootfs
+++ b/helpers/lh_binary_rootfs
@@ -63,7 +63,7 @@ then
 	mkdir -p binary/${INITFS}
 fi
 
-case "${LIVE_FILESYSTEM}" in
+case "${LIVE_CHROOT_FILESYSTEM}" in
 	ext2)
 		# Checking depends
 		Check_package chroot/usr/bin/genext2fs genext2fs
@@ -119,17 +119,17 @@ case "${LIVE_FILESYSTEM}" in
 
 		if [ "${LH_VERBOSE}" = "enabled" ]
 		then
-			MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -i"
+			MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -info"
 		fi
 
-		# Create image
 		if [ "${LIVE_PACKAGES_LISTS}" != "minimal" ] && [ "${LIVE_PACKAGES_LISTS}" != "mini" ]
 		then
-			Chroot "mksquashfs ${MKSQUASHFS_OPTIONS} chroot filesystem.squashfs"
-		else
-			Chroot "mksquashfs ${MKSQUASHFS_OPTIONS} chroot filesystem.squashfs -e chroot/boot/vmlinuz* chroot/boot/initrd.img* chroot/vmlinuz* chroot/initrd.img* chroot/boot/config-* chroot/boot/System.map-*"
+			MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -e chroot/boot/vmlinuz* chroot/boot/initrd.img* chroot/vmlinuz* chroot/initrd.img* chroot/boot/config-* chroot/boot/System.map-*"
 		fi
 
+		# Create image
+		Chroot "mksquashfs chroot filesystem.squashfs ${MKSQUASHFS_OPTIONS}"
+
 		# Move image
 		${LH_ROOT_COMMAND} mv chroot/filesystem.squashfs binary/${INITFS}
 		${LH_ROOT_COMMAND} rm -rf chroot/chroot
-- 
cgit v1.2.3