[SCM] debian-live branch, master, updated. 1.0_a47-1-36-gbe0f6ae
Chris Lamb
chris at chris-lamb.co.uk
Sun Jun 15 15:31:42 UTC 2008
The following commit has been merged in the master branch:
commit 343497ad9865d9b8971229948f5d45f2a4cc60ac
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Sun Jun 15 16:25:34 2008 +0100
Refactor mkfs handling.
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/helpers/lh_binary_usb-hdd b/helpers/lh_binary_usb-hdd
index 4b2ba81..a1343b5 100755
--- a/helpers/lh_binary_usb-hdd
+++ b/helpers/lh_binary_usb-hdd
@@ -141,21 +141,23 @@ Losetup $FREELO chroot/binary.img 1
case "${LH_BINARY_FILESYSTEM}" in
fat16)
- MKFS_OPTIONS="-F 16"
+ MKFS="vfat"
+ MKFS_OPTIONS="-F 16 -n DEBIAN_LIVE"
;;
fat32)
- MKFS_OPTIONS="-F 32"
+ MKFS="vfat"
+ MKFS_OPTIONS="-F 32 -n DEBIAN_LIVE"
;;
esac
case "${LH_CHROOT_BUILD}" in
enabled)
- Chroot "mkfs.vfat ${MKFS_OPTIONS} -n DEBIAN_LIVE ${FREELO}"
+ Chroot "mkfs.${MKFS} ${MKFS_OPTIONS} ${FREELO}"
;;
disabled)
- mkfs.vfat ${MKFS_OPTIONS} -n DEBIAN_LIVE ${FREELO}
+ mkfs.${MKFS} ${MKFS_OPTIONS} ${FREELO}
;;
esac
--
debian-live
More information about the debian-live-changes
mailing list