diff options
| author | Daniel Baumann <daniel@debian.org> | 2008-08-26 23:50:57 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:03:40 +0100 |
| commit | 98cb61600c623995ea56d359c74358a37c6af975 (patch) | |
| tree | f994ee2347b70b215b10c58906652d9e67b9f2c2 | |
| parent | dbcc5dc8b3faa4257ecac366d536ac2d3086eadc (diff) | |
| download | vyos-live-build-98cb61600c623995ea56d359c74358a37c6af975.tar.gz vyos-live-build-98cb61600c623995ea56d359c74358a37c6af975.zip | |
Passing -wildcards to mksquashfs call when having excludes, thanks to Phillip Lougher <phillip@lougher.demon.co.uk>.
| -rwxr-xr-x | helpers/lh_binary_rootfs | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/helpers/lh_binary_rootfs b/helpers/lh_binary_rootfs index ed0c98c20..387bf8096 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} |