[SCM] debian-live branch, master, updated. 1.0.0-2-3-ga4a2eda

Daniel Baumann daniel at debian.org
Mon Sep 1 12:01:13 UTC 2008


The following commit has been merged in the master branch:
commit a4a2edaeacd6bab28620fecf59b68a804aa3cbc7
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Mon Sep 1 12:44:00 2008 +0100

    mksquashfs in Lenny supports -no-progress, so remove (broken) check.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/helpers/lh_binary_rootfs b/helpers/lh_binary_rootfs
index 419b264..718f79f 100755
--- a/helpers/lh_binary_rootfs
+++ b/helpers/lh_binary_rootfs
@@ -244,7 +244,7 @@ case "${LH_CHROOT_FILESYSTEM}" in
 		# Remove stale squashfs image
 		rm -f chroot/filesystem.squashfs
 
-		if [ "${LH_QUIET}" = "enabled" ] && [ "${LH_DISTRIBUTION}" != "etch" ] && [ "${LH_DISTRIBUTION}" != "testing" ]
+		if [ "${LH_QUIET}" = "enabled" ] && [ "${LH_DISTRIBUTION}" != "etch" ]
 		then
 			MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -no-progress"
 		fi

-- 
debian-live



More information about the debian-live-changes mailing list