[Fedora-livecd-list] 3 commits - tools/livecd-iso-to-disk.sh

[Jeremy Katz]

 tools/livecd-iso-to-disk.sh |   12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

New commits:
commit 33c94391bdc8cfcc38ec65e5c9d78f06b5e1fa81
Author: Jeremy Katz <katzj at redhat.com>
Date:   Fri Mar 6 14:38:52 2009 -0500

    Handle varying syslinux dirs for --xo mode also

diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index ea6cb58..7ab1d86 100755
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -612,6 +612,7 @@ if [ -n "$xo" ]; then
 	args="$args persistenthome=mtd0"
     fi
     args="$args reset_overlay"
+    xosyspath=$(echo $SYSLINUXPATH | sed -e 's;/;\;')
     if [ ! -d $USBMNT/boot ]; then mkdir -p $USBMNT/boot ; fi
     cat > $USBMNT/boot/olpc.fth <<EOF
 \ Boot script for USB boot
@@ -645,8 +646,8 @@ hex  rom-pa fffc7 + 4 \$number drop  h# 2e19 < [if]
 
 set-bootpath-dev
 " $args" to boot-file
-" \${BOOTPATHDEV}\syslinux\initrd0.img" expand$ to ramdisk
-" \${BOOTPATHDEV}\syslinux\vmlinuz0" expand$ to boot-device
+" \${BOOTPATHDEV}\$xosyspath\initrd0.img" expand$ to ramdisk
+" \${BOOTPATHDEV}\$xosyspath\vmlinuz0" expand$ to boot-device
 unfreeze
 boot
 EOF


commit 0066fc2223ba4990d673e621914bc4647c77ecf3
Author: Jeremy Katz <katzj at redhat.com>
Date:   Fri Mar 6 14:21:42 2009 -0500

    Fix up syslinuxpath for extlinux
    
    Inspired by something Warren sent, but we should always be listening to $SYSLINUXPATH
    for extlinux too

diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index d7aa536..ea6cb58 100755
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -673,7 +673,7 @@ elif [ "$USBFS" = "ext2" -o "$USBFS" = "ext3" ]; then
     # extlinux expects the config to be named extlinux.conf
     # and has to be run with the file system mounted
     mv $USBMNT/$SYSLINUXPATH/isolinux.cfg $USBMNT/$SYSLINUXPATH/extlinux.conf
-    extlinux -i $USBMNT/syslinux
+    extlinux -i $USBMNT/$SYSLINUXPATH
     cleanup
 fi
 


commit b2ee33d0d9b7a1ef17a8ca30eb137c8867e2ba34
Author: Jeremy Katz <katzj at redhat.com>
Date:   Fri Mar 6 14:21:11 2009 -0500

    Remove legacy cases without LiveOS dir

diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index c310936..d7aa536 100755
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -488,19 +488,14 @@ if [ -z "$skipcopy" ];then
   echo "Copying live image to USB stick"
   [ ! -d $USBMNT/LiveOS ] && mkdir $USBMNT/LiveOS
   [ -n "$keephome" -a -f "$USBMNT/$HOMEFILE" ] && mv $USBMNT/$HOMEFILE $USBMNT/LiveOS/$HOMEFILE
-  # cases without /LiveOS are legacy detection, remove for F10
   if [ -n "$skipcompress" -a -f $CDMNT/LiveOS/squashfs.img ]; then
       mount -o loop $CDMNT/LiveOS/squashfs.img $CDMNT
       cp $CDMNT/LiveOS/ext3fs.img $USBMNT/LiveOS/ext3fs.img || (umount $CDMNT ; exitclean)
       umount $CDMNT
   elif [ -f $CDMNT/LiveOS/squashfs.img ]; then
       cp $CDMNT/LiveOS/squashfs.img $USBMNT/LiveOS/squashfs.img || exitclean
-  elif [ -f $CDMNT/squashfs.img ]; then
-      cp $CDMNT/squashfs.img $USBMNT/LiveOS/squashfs.img || exitclean 
   elif [ -f $CDMNT/LiveOS/ext3fs.img ]; then
       cp $CDMNT/LiveOS/ext3fs.img $USBMNT/LiveOS/ext3fs.img || exitclean
-  elif [ -f $CDMNT/ext3fs.img ]; then
-      cp $CDMNT/ext3fs.img $USBMNT/LiveOS/ext3fs.img || exitclean 
   fi
   if [ -f $CDMNT/LiveOS/osmin.img ]; then
       cp $CDMNT/LiveOS/osmin.img $USBMNT/LiveOS/osmin.img || exitclean