summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lamb <chris@chris-lamb.co.uk>2008-06-15 16:25:34 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:03:35 +0100
commitc96228be81fcf23eb7a50e1dbba59bd6f5455627 (patch)
tree61ada7f13bd3a5ee3d81391b6b5b922ae0668073
parent36f737b75668e5f597891f6b333c0b613c15cc1a (diff)
downloadlive-build-c96228be81fcf23eb7a50e1dbba59bd6f5455627.zip
live-build-c96228be81fcf23eb7a50e1dbba59bd6f5455627.tar.gz
Refactor mkfs handling.
-rwxr-xr-xhelpers/lh_binary_usb-hdd10
1 files changed, 6 insertions, 4 deletions
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