Don't confuse {KB, MB, GB} with {KiB, MiB, GiB}.

svn path=/trunk/packages/invirt-autoinstaller/; revision=2161

diff --git a/common/usr/sbin/invirt-create-image b/common/usr/sbin/invirt-create-image
index 2e71fde..a813e75 100644 (file)
--- a/common/usr/sbin/invirt-create-image
+++ b/common/usr/sbin/invirt-create-image
@@ -2,7 +2,7 @@
 # Usage: no command-line args.
 # "arguments" come in environment:
 #  TARGET a device filename
 # Usage: no command-line args.
 # "arguments" come in environment:
 #  TARGET a device filename

-#  FSSIZE the desired filesystem size in megabytes (rest will be swap)
+#  FSSIZE the desired filesystem size in mebibytes (rest will be swap)

 #  ARCH, DIST, MIRROR
 #  HOSTNAME, IP
 
 #  ARCH, DIST, MIRROR
 #  HOSTNAME, IP
 

diff --git a/debian/changelog b/debian/changelog
index b37b148..ae392cd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+invirt-autoinstaller (0.0.14) jaunty; urgency=low
+
+  * Don't confuse MB with MiB.
+
+ -- Anders Kaseorg <andersk@mit.edu>  Tue, 17 Feb 2009 04:56:38 -0500
+

 invirt-autoinstaller (0.0.13) unstable; urgency=low
 
   * Don't hang indefinitely waiting for input from a user that can't talk
 invirt-autoinstaller (0.0.13) unstable; urgency=low
 
   * Don't hang indefinitely waiting for input from a user that can't talk

diff --git a/host/usr/sbin/invirt-install b/host/usr/sbin/invirt-install
index 5a9e8a9..2f982cd 100644 (file)
--- a/host/usr/sbin/invirt-install
+++ b/host/usr/sbin/invirt-install
@@ -12,20 +12,20 @@ NAME="$1"
 export HOSTNAME="$2"
 export DIST="$3"
 export MIRROR="$4"
 export HOSTNAME="$2"
 export DIST="$3"
 export MIRROR="$4"

-export FSSIZE="$5"    # in megabytes
-SWAPSIZE="$6"  # in megabytes
+export FSSIZE="$5"    # in mebibytes
+SWAPSIZE="$6"  # in mebibytes

 export IP="$7"
 
 export ARCH=amd64
 VGNAME=xenvg
 
 export IP="$7"
 
 export ARCH=amd64
 VGNAME=xenvg
 

-#LVSIZE=`lvs --noheadings --units M --nosuffix -o Size /dev/xenvg/d_foobar_hda | sed 's/\..*//'`
+#LVSIZE=`lvs --noheadings --units m --nosuffix -o Size /dev/xenvg/d_foobar_hda | sed 's/\..*//'`

 
 if [ -z "$IP" ]; then
     IP=`host $HOSTNAME.xvm.mit.edu | sed 's/.* //' | head -n 1`
 fi
 
 
 if [ -z "$IP" ]; then
     IP=`host $HOSTNAME.xvm.mit.edu | sed 's/.* //' | head -n 1`
 fi
 

-/sbin/lvcreate -L $(($FSSIZE+$SWAPSIZE))M -n "${NAME}_hda" $VGNAME
+/sbin/lvcreate -L $(($FSSIZE+$SWAPSIZE))m -n "${NAME}_hda" $VGNAME

 
 export TARGET=/dev/mapper/xenvg-"$(echo "${NAME}_hda" | sed -e 's/-/--/g')"
 
 
 export TARGET=/dev/mapper/xenvg-"$(echo "${NAME}_hda" | sed -e 's/-/--/g')"