tools/livecd-iso-to-disk.sh | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-)
New commits: commit a3227625a1317026fbbd331fcbca560716b6cfa8 Author: Jason Farrell <[email protected]> Date: Wed Jun 17 19:53:15 2009 -0400 small fix for --multi mode One other tiny patch for the mostly unused "--multi" mode. The "initrd=" in isolinux.cfg wasn't getting replaced, and, it's easier if the $LIVEOS/$SYSLINUXPATH paths are absolute when editing the "main" /syslinux/syslinux.cfg or /syslinux/extlinux.conf menu entries to add them for multibooting. diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh index 01dadb3..672e6db 100755 --- a/tools/livecd-iso-to-disk.sh +++ b/tools/livecd-iso-to-disk.sh @@ -696,8 +696,8 @@ if [ -z "$multi" ]; then fi else # we need to do some more config file tweaks for multi-image mode - sed -i -e "s;kernel vm;kernel $LIVEOS/syslinux/vm;" $USBMNT/$SYSLINUXPATH/isolinux.cfg - sed -i -e "s;initrd i;initrd $LIVEOS/syslinux/i;" $USBMNT/$SYSLINUXPATH/isolinux.cfg + sed -i -e "s;kernel vm;kernel /$LIVEOS/syslinux/vm;" $USBMNT/$SYSLINUXPATH/isolinux.cfg + sed -i -e "s;initrd=i;initrd=/$LIVEOS/syslinux/i;" $USBMNT/$SYSLINUXPATH/isolinux.cfg mv $USBMNT/$SYSLINUXPATH/isolinux.cfg $USBMNT/$SYSLINUXPATH/syslinux.cfg cleanup fi commit dd2f7eccd287932b1d84287877997a9cf94a0d33 Author: Jason Farrell <[email protected]> Date: Wed Jun 17 19:28:54 2009 -0400 Make overlay space requirements clearer My biggest annoyance with the livecd-iso-to-disk script has simply been having to do a little math in my head when trying to fit the largest possible overlay combo onto my liveusb. The script should be doing this work - it should tell you by how much you're over so you can free it and/or quickly adjust your sizes. diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh index de439d5..01dadb3 100755 --- a/tools/livecd-iso-to-disk.sh +++ b/tools/livecd-iso-to-disk.sh @@ -476,13 +476,18 @@ if [ -n "$skipcompress" ]; then fi free=$(df -B1M $USBDEV |tail -n 1 |awk {'print $4;'}) -if [ $(($overlaysizemb + $homesizemb + $livesize + $swapsizemb)) -gt $(($free + $tbd)) ]; then + tba=$(($overlaysizemb + $homesizemb + $livesize + $swapsizemb)) +if [ $tba -gt $(($free + $tbd)) ]; then echo "Unable to fit live image + overlay on available space on USB stick" - echo "Size of live image: $livesize" - [ "$overlaysizemb" -gt 0 ] && echo "Overlay size: $overlaysizemb" - [ "$homesizemb" -gt 0 ] && echo "Home overlay size: $homesizemb" - [ "$swapsizemb" -gt 0 ] && echo "Home overlay size: $swapsizemb" - echo "Available space: $(($free + $tbd))" + echo "+ Size of live image: $livesize" + [ "$overlaysizemb" -gt 0 ] && echo "+ Overlay size: $overlaysizemb" + [ "$homesizemb" -gt 0 ] && echo "+ Home overlay size: $homesizemb" + [ "$swapsizemb" -gt 0 ] && echo "+ Swap overlay size: $swapsizemb" + echo "---------------------------" + echo "= Requested: $tba" + echo "- Available: $(($free + $tbd))" + echo "---------------------------" + echo "= To fit, free or decrease requested size total by: $(($tba - $free + $tbd))" exitclean fi -- Fedora-livecd-list mailing list [email protected] https://www.redhat.com/mailman/listinfo/fedora-livecd-list
