[Debian-live-changes] r1110 - in dists/trunk/live-helper: doc helpers

[Daniel Baumann]

Author: daniel
Date: 2007-04-20 13:17:26 +0000 (Fri, 20 Apr 2007)
New Revision: 1110

Modified:
   dists/trunk/live-helper/doc/ChangeLog
   dists/trunk/live-helper/helpers/lh_binary_iso
   dists/trunk/live-helper/helpers/lh_binary_rootfs
Log:


Modified: dists/trunk/live-helper/doc/ChangeLog
===================================================================
--- dists/trunk/live-helper/doc/ChangeLog	2007-04-20 12:32:41 UTC (rev 1109)
+++ dists/trunk/live-helper/doc/ChangeLog	2007-04-20 13:17:26 UTC (rev 1110)
@@ -1,3 +1,8 @@
+2007-04-20  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/lh_binary_rootfs, lh_binary_iso:
+	  - Added mksquashfs/genisoimage quiet/verbose options.
+
 2007-04-19  Daniel Baumann  <daniel at debian.org>
 
 	* helpers/lh_binary_grub, lh_binary_syslinux:

Modified: dists/trunk/live-helper/helpers/lh_binary_iso
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_iso	2007-04-20 12:32:41 UTC (rev 1109)
+++ dists/trunk/live-helper/helpers/lh_binary_iso	2007-04-20 13:17:26 UTC (rev 1110)
@@ -74,6 +74,11 @@
 			rm -f binary.iso
 		fi
 
+		if [ "${LH_VERBOSE}" = "enabled" ]
+		then
+			GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -i"
+		fi
+
 		# Moving image
 		mv binary chroot
 
@@ -82,19 +87,19 @@
 		then
 			case "${LIVE_BOOTLOADER}" in
 				grub)
-					Chroot "${LH_GENISOIMAGE} -o binary.iso -r -J -l -b boot/grub/stage2_eltorito -m boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table binary"
+					Chroot "${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -o binary.iso -r -J -l -b boot/grub/stage2_eltorito -m boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table binary"
 					;;
 
 				syslinux)
 					#Chroot "${LH_GENISOIMAGE} -A \"Debian Live\" -p \"Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel at lists.alioth.debian.org\" -publisher \"Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel at lists.alioth.debian.org\" -o binary.iso -r -J -l -V \"${LIVE_ISO_VOLUME}\" -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table binary"
-					Chroot "${LH_GENISOIMAGE} -o binary.iso -r -J -l -b isolinux/isolinux.bin -m isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table binary"
+					Chroot "${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -o binary.iso -r -J -l -b isolinux/isolinux.bin -m isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table binary"
 					;;
 			esac
 		else
 			Echo_warning "Bootloader on your architecture not yet supported (Continuing in 5 seconds)."
 			sleep 5
 			#Chroot "${LH_GENISOIMAGE} -A 'Debian Live' -p 'Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel at lists.alioth.debian.org' -publisher 'Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel at lists.alioth.debian.org' -o binary.iso -r -J -l -V \"${LIVE_ISO_VOLUME}\" binary"
-			Chroot "${LH_GENISOIMAGE} -o binary.iso -r -J -l binary"
+			Chroot "${LH_GENISOIMAGE} ${GENISOIMAGE} -o binary.iso -r -J -l binary"
 		fi
 
 		# Move image

Modified: dists/trunk/live-helper/helpers/lh_binary_rootfs
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_rootfs	2007-04-20 12:32:41 UTC (rev 1109)
+++ dists/trunk/live-helper/helpers/lh_binary_rootfs	2007-04-20 13:17:26 UTC (rev 1110)
@@ -138,12 +138,22 @@
 			rm -f binary/casper/filesystem.squashfs
 		fi
 
+		if [ "${LH_QUIET}" = "enabled" ]
+		then
+			MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -no-progress"
+		fi
+
+		if [ "${LH_VERBOSE}" = "enabled" ]
+		then
+			MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -i"
+		fi
+
 		# Create image
 		if [ "${LIVE_PACKAGES_LISTS}" != "minimal" ] && [ "${LIVE_PACKAGES_LISTS}" != "mini" ]
 		then
-			Chroot "mksquashfs chroot filesystem.squashfs"
+			Chroot "mksquashfs ${MKSQUASHFS_OPTIONS} chroot filesystem.squashfs"
 		else
-			Chroot "mksquashfs chroot filesystem.squashfs -e chroot/boot/vmlinuz* chroot/boot/initrd.img* chroot/vmlinuz* chroot/initrd.img* chroot/boot/config-* chroot/boot/System.map-*"
+			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-*"
 		fi
 
 		# Move image