[Debian-live-changes] r1367 - dists/trunk/live-helper/helpers

[Daniel Baumann]

Author: daniel
Date: 2007-05-07 16:51:20 +0000 (Mon, 07 May 2007)
New Revision: 1367

Modified:
   dists/trunk/live-helper/helpers/lh_binary_rootfs
Log:


Modified: dists/trunk/live-helper/helpers/lh_binary_rootfs
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_rootfs	2007-05-07 16:47:05 UTC (rev 1366)
+++ dists/trunk/live-helper/helpers/lh_binary_rootfs	2007-05-07 16:51:20 UTC (rev 1367)
@@ -122,14 +122,14 @@
 			MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -i"
 		fi
 
-		# Create image
 		if [ "${LIVE_PACKAGES_LISTS}" != "minimal" ] && [ "${LIVE_PACKAGES_LISTS}" != "mini" ]
 		then
-			Chroot "mksquashfs chroot filesystem.squashfs ${MKSQUASHFS_OPTIONS}"
-		else
-			Chroot "mksquashfs chroot filesystem.squashfs ${MKSQUASHFS_OPTIONS} -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