<font color="#000099"><font size="2"><font face="trebuchet ms,sans-serif"><meta http-equiv="content-type" content="text/html; charset=utf-8"><a href="https://bugzilla.redhat.com/show_bug.cgi?id=656154#c2">https://bugzilla.redhat.com/show_bug.cgi?id=656154#c2</a></font></font></font><div>
<font color="#000099"><font size="2"><font face="trebuchet ms,sans-serif"><a href="https://bugzilla.redhat.com/show_bug.cgi?id=656154#c2"></a></font></font></font><font class="Apple-style-span" color="#000099" face="'trebuchet ms', sans-serif"><br>
</font><div><div><font class="Apple-style-span" face="'courier new', monospace">Author: Frederick Grose <<a href="mailto:fgrose@gmail.com">fgrose@gmail.com</a>></font></div><div><font class="Apple-style-span" face="'courier new', monospace">Date: Tue Mar 8 17:28:18 2011 -0500</font></div>
<div><font class="Apple-style-span" face="'courier new', monospace"><br></font></div><div><font class="Apple-style-span" face="'courier new', monospace"> Trap oversized ext3fs.img request with --skipcompress on VFAT devices</font></div>
<div><font class="Apple-style-span" face="'courier new', monospace"> </font></div><div><font class="Apple-style-span" face="'courier new', monospace"> Also, include /boot/olpc.fth in the install size estimate for the</font></div>
<div><font class="Apple-style-span" face="'courier new', monospace"> --xo option.</font></div><div><font class="Apple-style-span" face="'courier new', monospace"><br></font></div><div><font class="Apple-style-span" face="'courier new', monospace">diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh</font></div>
<div><font class="Apple-style-span" face="'courier new', monospace">index b7cee72..d90c354 100755</font></div><div><font class="Apple-style-span" face="'courier new', monospace">--- a/tools/livecd-iso-to-disk.sh</font></div>
<div><font class="Apple-style-span" face="'courier new', monospace">+++ b/tools/livecd-iso-to-disk.sh</font></div><div><font class="Apple-style-span" face="'courier new', monospace">@@ -872,6 +872,15 @@ if [[ -n $skipcompress ]] && [[ -s $SRCMNT/LiveOS/squashfs.img ]]; then</font></div>
<div><font class="Apple-style-span" face="'courier new', monospace"> if mount -o loop $SRCMNT/LiveOS/squashfs.img $SRCMNT; then</font></div><div><font class="Apple-style-span" face="'courier new', monospace"> livesize=($(du -B 1M --apparent-size $SRCMNT/LiveOS/ext3fs.img))</font></div>
<div><font class="Apple-style-span" face="'courier new', monospace"> umount $SRCMNT</font></div><div><font class="Apple-style-span" face="'courier new', monospace">+ if ((livesize > 2048)) && [[ vfat == $TGTFS ]]; then</font></div>
<div><font class="Apple-style-span" face="'courier new', monospace">+ echo "</font></div><div><font class="Apple-style-span" face="'courier new', monospace">+ An uncompressed image size greater than 2048 MB is not suitable</font></div>
<div><font class="Apple-style-span" face="'courier new', monospace">+ for a VFAT-formatted device. The compressed SquashFS will be</font></div><div><font class="Apple-style-span" face="'courier new', monospace">+ copied to the target device.</font></div>
<div><font class="Apple-style-span" face="'courier new', monospace">+ "</font></div><div><font class="Apple-style-span" face="'courier new', monospace">+ skipcompress=""</font></div>
<div><font class="Apple-style-span" face="'courier new', monospace">+ livesize=0</font></div><div><font class="Apple-style-span" face="'courier new', monospace">+ fi</font></div><div><font class="Apple-style-span" face="'courier new', monospace"> else</font></div>
<div><font class="Apple-style-span" face="'courier new', monospace"> echo "WARNING: --skipcompress or --xo was specified but the</font></div><div><font class="Apple-style-span" face="'courier new', monospace"> currently-running kernel can not mount the SquashFS from the source</font></div>
<div><font class="Apple-style-span" face="'courier new', monospace">@@ -886,6 +895,7 @@ if [[ live == $srctype ]]; then</font></div><div><font class="Apple-style-span" face="'courier new', monospace"> [[ -z $skipcompress ]] && sources+=" $SRCMNT/LiveOS/squashfs.img"</font></div>
<div><font class="Apple-style-span" face="'courier new', monospace"> sources+=" $SRCMNT/isolinux $SRCMNT/syslinux"</font></div><div><font class="Apple-style-span" face="'courier new', monospace"> [[ -n $efi ]] && sources+=" $SRCMNT/EFI/boot"</font></div>
<div><font class="Apple-style-span" face="'courier new', monospace">+ [[ -n $xo ]] && sources+=" $SRCMNT/boot/olpc.fth"</font></div><div><font class="Apple-style-span" face="'courier new', monospace"> duTable=($(du -c -B 1M "$thisScriptpath" $sources 2> /dev/null))</font></div>
<div><font class="Apple-style-span" face="'courier new', monospace"> ((livesize += ${duTable[*]: -2:1}))</font></div><div><font class="Apple-style-span" face="'courier new', monospace"> fi</font></div>
</div></div>