Index: trunk/packages/sipb-xen-autoinstaller/common/usr/sbin/sipb-xen-create-image
===================================================================
--- trunk/packages/sipb-xen-autoinstaller/common/usr/sbin/sipb-xen-create-image	(revision 936)
+++ trunk/packages/sipb-xen-autoinstaller/common/usr/sbin/sipb-xen-create-image	(revision 937)
@@ -2,7 +2,10 @@
 # Usage: no command-line args.
 # "arguments" come in environment:
-#  TARGET a device filename, IMAGESIZE its size in XXXX what unit?
+#  TARGET a device filename
+#  IMAGESIZE the desired filesystem size in megabytes (rest will be swap)
 #  ARCH, DIST, MIRROR
 #  HOSTNAME, IP
+
+set -e
 
 echo ,"${IMAGESIZE}"$',L,*\n,,S\n;\n;' | sfdisk -uM -H 255 -S 63 "$TARGET"
Index: trunk/packages/sipb-xen-autoinstaller/host/usr/sbin/sipb-xen-install
===================================================================
--- trunk/packages/sipb-xen-autoinstaller/host/usr/sbin/sipb-xen-install	(revision 936)
+++ trunk/packages/sipb-xen-autoinstaller/host/usr/sbin/sipb-xen-install	(revision 937)
@@ -7,8 +7,9 @@
 export PATH #WTF?
 
+LVNAME="$1"
 export HOSTNAME="$2"
 export DIST="$3"
 export MIRROR="$4"
-export IMAGESIZE="$5"
+export IMAGESIZE="$5"  # in megabytes
 export IP="$6"
 
@@ -21,5 +22,5 @@
 fi
 
-export TARGET=/dev/mapper/xenvg-d_$(echo "$HOSTNAME" | sed -e 's/-/--/g')_hda
+export TARGET=/dev/mapper/xenvg-$(echo "$LVNAME" | sed -e 's/-/--/g')_hda
 
 /usr/sbin/sipb-xen-create-image