[SCM] debian-live branch, master, updated. 1.0_a47-1-43-g30bafda
Chris Lamb
chris at chris-lamb.co.uk
Thu Jun 19 18:07:46 UTC 2008
The following commit has been merged in the master branch:
commit 3ddecb18c8cc8bdb8cc2157f2635b773f5603aa2
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Thu Jun 19 18:58:09 2008 +0100
Replace another unweildy "if P1 || P2" statement with its "case" equivalent.
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/helpers/lh_binary_rootfs b/helpers/lh_binary_rootfs
index de634be..abd26ac 100755
--- a/helpers/lh_binary_rootfs
+++ b/helpers/lh_binary_rootfs
@@ -223,10 +223,11 @@ case "${LH_CHROOT_FILESYSTEM}" in
MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -info"
fi
- if [ "${LH_PACKAGES_LISTS}" = "stripped" ] || [ "${LH_PACKAGES_LISTS}" = "minimal" ]
- then
- MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -e $(ls chroot/boot/${LINUX}* chroot/boot/initrd.img* chroot/${LINUX}* chroot/initrd.img* | sed 's|chroot/||g')"
- fi
+ case "${LH_PACKAGES_LISTS}" in
+ stripped|minimal)
+ MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -e $(ls chroot/boot/${LINUX}* chroot/boot/initrd.img* chroot/${LINUX}* chroot/initrd.img* | sed 's|chroot/||g')"
+ ;;
+ esac
if [ -f config/binary_rootfs/squashfs.sort ]
then
--
debian-live
More information about the debian-live-changes
mailing list