From cbcb382f13f4a17cd0fa515410f50404e24dbf59 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sun, 18 Nov 2007 11:33:46 +0100
Subject: Fixing wrong parted call.
---
helpers/lh_binary_usb-hdd | 4 ++--
helpers/lh_source_usb-hdd | 16 ++++++++++++++--
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/helpers/lh_binary_usb-hdd b/helpers/lh_binary_usb-hdd
index 429e419..3875cae 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 ${LH_BINARY_FILESYSTEM} primary 0.0 100%" || true
+ Chroot "parted -s ${FREELO} mkpart primary ${LH_BINARY_FILESYSTEM} 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 ${LH_BINARY_FILESYSTEM} primary 0.0 100% || true
+ parted -s ${FREELO} mkpart primary ${LH_BINARY_FILESYSTEM} 0.0 100% || true
parted -s ${FREELO} set 1 boot on || true
parted -s ${FREELO} set 1 lba off || true
diff --git a/helpers/lh_source_usb-hdd b/helpers/lh_source_usb-hdd
index 59ef267..14b32d8 100755
--- a/helpers/lh_source_usb-hdd
+++ b/helpers/lh_source_usb-hdd
@@ -86,12 +86,24 @@ fi
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 0.0 100%" || true
+Chroot "parted -s ${FREELO} mkpart primary ${LH_BINARY_FILESYSTEM} 0.0 100%" || true
Chroot "parted -s ${FREELO} set 1 lba off" || true
${LH_LOSETUP} -d ${FREELO}
Losetup $FREELO source.img 1
-Chroot " mkfs.vfat -F 16 -n DEBIAN_LIVE ${FREELO}"
+
+case "${LH_BINARY_FILESYSTEM}" in
+ fat16)
+ MKFS_OPTIONS="-F 16"
+ ;;
+
+ fat32)
+ MKFS_OPTIONS="-F 32"
+ ;;
+esac
+
+Chroot " mkfs.vfat ${MKFS_OPTIONS} -n DEBIAN_LIVE ${FREELO}"
+
mkdir -p source.tmp
${LH_ROOT_COMMAND} mount ${FREELO} source.tmp
cp -r source/* source.tmp
--
cgit v1.0