diff options
| author | Chris Lamb <chris@chris-lamb.co.uk> | 2008-06-15 16:25:34 +0100 |
|---|---|---|
| committer | Chris Lamb <chris@chris-lamb.co.uk> | 2008-06-15 16:25:34 +0100 |
| commit | 343497ad9865d9b8971229948f5d45f2a4cc60ac (patch) | |
| tree | 61ada7f13bd3a5ee3d81391b6b5b922ae0668073 | |
| parent | d522b02fc1ce52670d28cfa84f07cef7b745859a (diff) | |
| download | vyos-live-build-343497ad9865d9b8971229948f5d45f2a4cc60ac.tar.gz vyos-live-build-343497ad9865d9b8971229948f5d45f2a4cc60ac.zip | |
Refactor mkfs handling.
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
| -rwxr-xr-x | helpers/lh_binary_usb-hdd | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/helpers/lh_binary_usb-hdd b/helpers/lh_binary_usb-hdd index 4b2ba8152..a1343b5f3 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 |