[SCM] debian-live branch, master, updated. 1.0.0-1-10-g83204a5

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 83204a5bd571ca4ad0f89fe550d67dbf93d93643
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Aug 26 23:50:57 2008 +0200

    Passing -wildcards to mksquashfs call when having excludes, thanks to Phillip Lougher <phillip at lougher.demon.co.uk>.

diff --git a/helpers/lh_binary_rootfs b/helpers/lh_binary_rootfs
index ed0c98c..387bf80 100755
--- a/helpers/lh_binary_rootfs
+++ b/helpers/lh_binary_rootfs
@@ -273,7 +273,20 @@ case "${LH_CHROOT_FILESYSTEM}" in
 			disabled)
 				if [ -f config/binary_rootfs/excludes ]
 				then
-					MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -ef config/binary_rootfs/excludes"
+					case "${LH_DISTRIBUTION}" in
+						etch)
+							MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -ef config/binary_rootfs/excludes"
+
+							if grep '*' config/binary_rootfs/excludes > /dev/null
+							then
+								Echo_warning "etch squashfs does not support wildcard excludes in config/binary_rootfs/excludes and are ignored. Please build in chrooted mode or adjust your exclude file."
+							fi
+							;;
+
+						lenny|sid)
+							MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -wildcards -ef config/binary_rootfs/excludes"
+							;;
+					esac
 				fi
 
 				mksquashfs chroot binary/${INITFS}/filesystem.squashfs ${MKSQUASHFS_OPTIONS}

-- 
debian-live