tools/livecd-iso-to-disk.sh | 15 +++++++++++++++ tools/livecd-iso-to-pxeboot.sh | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) New commits: commit c5527ec56bfa7a8dda73983c7dcb60df7f8be7a7 Author: Alan Pevec <apevec(a)redhat.com&gt; Date: Wed Sep 17 09:55:17 2008 +0200 fix extracting boot parameters from isolinux.cfg Signed-off-by: Alan Pevec <apevec(a)redhat.com&gt; diff --git a/tools/livecd-iso-to-pxeboot.sh b/tools/livecd-iso-to-pxeboot.sh index 8b5571a..280d354 100755 --- a/tools/livecd-iso-to-pxeboot.sh +++ b/tools/livecd-iso-to-pxeboot.sh @@ -103,7 +103,7 @@ fi # Get boot append line from original cd image. if [ -f $CDMNT/isolinux/isolinux.cfg ]; then - APPEND=$(grep -m1 append isolinux.cfg | sed -e "s#CDLABEL=[^ ]*#/$ISOBASENAME#" -e "s/ *append *//") + APPEND=$(grep -m1 append $CDMNT/isolinux/isolinux.cfg | sed -e "s#CDLABEL=[^ ]*#/$ISOBASENAME#" -e "s/ *append *//") fi # pxelinux configuration. commit 251b35fe8906817749c5ac3e0dedaa2952cb9039 Author: Jeremy Katz <katzj(a)redhat.com&gt; Date: Wed Sep 10 13:18:57 2008 -0400 Allow setting the default XO boot target Using --xosd or --xousb will set up a boot/olpc.fth defaulting to booting from the SD or the USB, respectively, for use with the XO auto-boot diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh index f3667d1..b9b877b 100755 --- a/tools/livecd-iso-to-disk.sh +++ b/tools/livecd-iso-to-disk.sh @@ -257,6 +257,14 @@ while [ $# -gt 2 ]; do --xo) xo=1 ;; + --xo-sd) + xo=1 + xosd=1 + ;; + --xo-usb) + xo=1 + xousb=1 + ;; --extra-kernel-args) kernelargs=$2 shift @@ -505,6 +513,13 @@ unfreeze boot sd:\syslinux\vmlinuz0 EOF + if [ -n "$xosd" ]; then + mkdir $USBMNT/boot + cp $USBMNT/olpc-sd.fth $USBMNT/boot/olpc.fth + elif [ -n "$xousb" ]; then + mkdir $USBMNT/boot + cp $USBMNT/olpc-usb.fth $USBMNT/boot/olpc.fth + fi fi echo "Installing boot loader"