From 01d34e6d1d9be1edf6d39777c7347bd0da5b1cbe Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Fri, 16 Nov 2007 23:01:03 +0100
Subject: Adding binary filesystem option, currently only supporting fat16 and
 fat32.

---
 helpers/lh_binary_usb-hdd | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'helpers/lh_binary_usb-hdd')

diff --git a/helpers/lh_binary_usb-hdd b/helpers/lh_binary_usb-hdd
index e6682eb14..429e4196d 100755
--- a/helpers/lh_binary_usb-hdd
+++ b/helpers/lh_binary_usb-hdd
@@ -99,7 +99,7 @@ Losetup $FREELO chroot/binary.img 0
 case "${LH_CHROOT_BUILD}" in
 	enabled)
 		Chroot "parted -s ${FREELO} mklabel msdos" || true
-		Chroot "parted -s ${FREELO} mkpart primary 0.0 100%" || true
+		Chroot "parted -s ${FREELO} mkpart ${LH_BINARY_FILESYSTEM} primary 0.0 100%" || true
 		Chroot "parted -s ${FREELO} set 1 boot on" || true
 		Chroot "parted -s ${FREELO} set 1 lba off" || true
 
@@ -111,7 +111,7 @@ case "${LH_CHROOT_BUILD}" in
 
 	disabled)
 		parted -s ${FREELO} mklabel msdos || true
-		parted -s ${FREELO} mkpart primary 0.0 100% || true
+		parted -s ${FREELO} mkpart ${LH_BINARY_FILESYSTEM} primary 0.0 100% || true
 		parted -s ${FREELO} set 1 boot on || true
 		parted -s ${FREELO} set 1 lba off || true
 
@@ -127,13 +127,23 @@ ${LH_LOSETUP} -d ${FREELO}
 FREELO="$(${LH_LOSETUP} -f)"
 Losetup $FREELO chroot/binary.img 1
 
+case "${LH_BINARY_FILESYSTEM}" in
+	fat16)
+		MKFS_OPTIONS="-F 16"
+		;;
+
+	fat32)
+		MKFS_OPTIONS="-F 32"
+		;;
+esac
+
 case "${LH_CHROOT_BUILD}" in
 	enabled)
-		Chroot "mkfs.vfat -F 16 -n DEBIAN_LIVE ${FREELO}"
+		Chroot "mkfs.vfat ${MKFS_OPTIONS} -n DEBIAN_LIVE ${FREELO}"
 		;;
 
 	disabled)
-		mkfs.vfat -F 16 -n DEBIAN_LIVE ${FREELO}
+		mkfs.vfat ${MKFS_OPTIONS} -n DEBIAN_LIVE ${FREELO}
 		;;
 esac
 
-- 
cgit v1.2.3