[Fedora-livecd-list] [PATCH] Fix incomplete rename of freespace variable (#656154)

Frederick Grose fgrose at gmail.com
Thu Dec 2 05:02:57 UTC 2010


>From  <https://bugzilla.redhat.com/show_bug.cgi?id=656154#c1>Bug
656154<https://bugzilla.redhat.com/show_bug.cgi?id=656154>
 - Fix disk space estimation errors in livecd-iso-to-disk:

Fix incomplete rename of freespace variable


I neglected to update a few uses of a renamed variable.  This patch should fix
it.

Sorry for the omission and disruption.

---
 tools/livecd-iso-to-disk.sh |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index 628822c..51abc0c 100755
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -635,7 +635,7 @@ if [ "$isotype" = "live" ]; then
         (($swapsizemb > 0)) && \
             printf "  + Swap overlay size: %11s\n" $swapsizemb
         printf "  = Total requested space:  %6s  MiB\n" $tba
-        printf "  - Space available:  %12s\n" $(($free + $tbd))
+        printf "  - Space available:  %12s\n" $((freespace + tbd))
         printf "    ==============================\n"
         printf "    Space needed:  %15s  MiB\n\n" $needed
         printf "  To fit the installation on this device,
@@ -658,8 +658,8 @@ if [ "$isotype" = "installer" ]; then
     fi
     echo "Size of DVD image: $isosize"
     echo "Size of install.img: $installimgsize"
-    echo "Available space: $(($free + $tbd))"
-    if [ $(($isosize + $installimgsize)) -gt $(($free + $tbd)) ]; then
+    echo "Available space: $((freespace + tbd))"
+    if (( ((isosize + installimgsize)) > ((freespace + tbd)) )); then
         echo "ERROR: Unable to fit DVD image + install.img on available
space on USB stick"
         exitclean
     fi
-- 
1.7.3.2
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.fedoraproject.org/pipermail/livecd/attachments/20101202/a7d98d0a/attachment.html 


More information about the livecd mailing list