r2619 - dists/trunk/live-helper/helpers
daniel at alioth.debian.org
daniel at alioth.debian.org
Sat Jul 28 20:15:56 UTC 2007
Author: daniel
Date: 2007-07-28 20:15:56 +0000 (Sat, 28 Jul 2007)
New Revision: 2619
Modified:
dists/trunk/live-helper/helpers/lh_binary_usb-hdd
Log:
Modified: dists/trunk/live-helper/helpers/lh_binary_usb-hdd
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_usb-hdd 2007-07-28 20:11:28 UTC (rev 2618)
+++ dists/trunk/live-helper/helpers/lh_binary_usb-hdd 2007-07-28 20:15:56 UTC (rev 2619)
@@ -94,16 +94,33 @@
echo "!!! The following error/warning messages can be ignored !!!"
lh_losetup $FREELO chroot/binary.img 0
-Chroot "parted -s ${FREELO} mklabel msdos" || true
-Chroot "parted -s ${FREELO} mkpartfs primary fat16 0.0 100%" || true
-Chroot "parted -s ${FREELO} set 1 boot on" || true
-Chroot "parted -s ${FREELO} set 1 lba off" || true
-if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
-then
- cat chroot/usr/lib/syslinux/mbr.bin > ${FREELO}
-fi
+case "${LIVE_CHROOT_BUILD}" in
+ enabled)
+ Chroot "parted -s ${FREELO} mklabel msdos" || true
+ Chroot "parted -s ${FREELO} mkpartfs primary fat16 0.0 100%" || true
+ Chroot "parted -s ${FREELO} set 1 boot on" || true
+ Chroot "parted -s ${FREELO} set 1 lba off" || true
+ if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
+ then
+ cat chroot/usr/lib/syslinux/mbr.bin > ${FREELO}
+ fi
+ ;;
+
+ disabled)
+ parted -s ${FREELO} mklabel msdos || true
+ parted -s ${FREELO} mkpartfs primary fat16 0.0 100% || true
+ parted -s ${FREELO} set 1 boot on || true
+ parted -s ${FREELO} set 1 lba off || true
+
+ if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
+ then
+ cat /usr/lib/syslinux/mbr.bin > ${FREELO}
+ fi
+ ;;
+esac
+
${LH_LOSETUP} -d ${FREELO}
FREELO="`${LH_LOSETUP} -f`"
@@ -149,7 +166,15 @@
if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
then
- Chroot "syslinux ${FREELO}"
+ case "${LIVE_CHROOT_BUILD}" in
+ enabled)
+ Chroot "syslinux ${FREELO}"
+ ;;
+
+ disabled)
+ syslinux ${FREELO}
+ ;;
+ esac
fi
${LH_LOSETUP} -d ${FREELO}
More information about the debian-live-changes
mailing list