diff options
| author | Chris Lamb <chris@chris-lamb.co.uk> | 2008-06-15 16:48:47 +0100 |
|---|---|---|
| committer | Chris Lamb <chris@chris-lamb.co.uk> | 2008-06-15 16:48:47 +0100 |
| commit | 0c46e9185bf7be741429b0823fe04e8cc8303494 (patch) | |
| tree | 5af6d40f493b39f4d9b4e0f1f00b7eef1c17a7f5 | |
| parent | be0f6ae8a4d482c2ddf326a16677c7c4ad960e1c (diff) | |
| download | vyos-live-build-0c46e9185bf7be741429b0823fe04e8cc8303494.tar.gz vyos-live-build-0c46e9185bf7be741429b0823fe04e8cc8303494.zip | |
Add support for ext2 and ext3 to lh_source_usb-hdd.
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
| -rwxr-xr-x | helpers/lh_source_usb-hdd | 30 |
1 files changed, 26 insertions, 4 deletions
diff --git a/helpers/lh_source_usb-hdd b/helpers/lh_source_usb-hdd index 3913f9b78..15d6b346e 100755 --- a/helpers/lh_source_usb-hdd +++ b/helpers/lh_source_usb-hdd @@ -78,26 +78,48 @@ then find /dev | cpio -dmpu chroot fi +case "${LH_BINARY_FILESYSTEM}" in + ext2|ext3) + PARTITION_TYPE="ext2" + ;; + + fat16|fat32) + PARTITION_TYPE="${LH_BINARY_FILESYSTEM}" + ;; + + *) + Echo_error "Unsupported binary filesystem ${LH_BINARY_FILESYSTEM}" + exit 1 + ;; +esac + echo "!!! The following error/warning messages can be ignored !!!" Losetup $FREELO source.img 0 Chroot "parted -s ${FREELO} mklabel msdos" || true -Chroot "parted -s ${FREELO} mkpart primary ${LH_BINARY_FILESYSTEM} 0.0 100%" || true +Chroot "parted -s ${FREELO} mkpart primary ${PARTITION_TYPE} 0.0 100%" || true Chroot "parted -s ${FREELO} set 1 lba off" || true ${LH_LOSETUP} -d ${FREELO} Losetup $FREELO source.img 1 case "${LH_BINARY_FILESYSTEM}" in + ext2|ext3) + MKFS="${LH_BINARY_FILESYSTEM}" + MKFS_OPTIONS="-L DEBIAN_LIVE -m 0" + ;; + 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 -Chroot " mkfs.vfat ${MKFS_OPTIONS} -n DEBIAN_LIVE ${FREELO}" +Chroot "mkfs.${MKFS} ${MKFS_OPTIONS} ${FREELO}" mkdir -p source.tmp ${LH_ROOT_COMMAND} mount ${FREELO} source.tmp |