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 937)
+++ /trunk/packages/sipb-xen-autoinstaller/common/usr/sbin/sipb-xen-create-image	(revision 938)
@@ -3,5 +3,5 @@
 # "arguments" come in environment:
 #  TARGET a device filename
-#  IMAGESIZE the desired filesystem size in megabytes (rest will be swap)
+#  FSSIZE the desired filesystem size in megabytes (rest will be swap)
 #  ARCH, DIST, MIRROR
 #  HOSTNAME, IP
@@ -9,5 +9,5 @@
 set -e
 
-echo ,"${IMAGESIZE}"$',L,*\n,,S\n;\n;' | sfdisk -uM -H 255 -S 63 "$TARGET"
+echo ,"${FSSIZE}"$',L,*\n,,S\n;\n;' | sfdisk -uM -H 255 -S 63 "$TARGET"
 
 kpartx -a "$TARGET"    # should be no-op in guest
@@ -17,5 +17,5 @@
  --arch "$ARCH" --dist "$DIST" --mirror "$MIRROR" --cache=yes
 
-kpartx -d $VOLUME
+kpartx -d "$TARGET"
 
 exit 0
Index: /trunk/packages/sipb-xen-autoinstaller/guest/etc/init.d/rcS.sipb-xen
===================================================================
--- /trunk/packages/sipb-xen-autoinstaller/guest/etc/init.d/rcS.sipb-xen	(revision 937)
+++ /trunk/packages/sipb-xen-autoinstaller/guest/etc/init.d/rcS.sipb-xen	(revision 938)
@@ -15,5 +15,5 @@
 	;;
 	imagesize=*)
-	export IMAGESIZE=${x#imagesize=}
+	export FSSIZE=${x#imagesize=}
 	;;
 	noinstall)
Index: /trunk/packages/sipb-xen-autoinstaller/host/usr/sbin/sipb-xen-install
===================================================================
--- /trunk/packages/sipb-xen-autoinstaller/host/usr/sbin/sipb-xen-install	(revision 937)
+++ /trunk/packages/sipb-xen-autoinstaller/host/usr/sbin/sipb-xen-install	(revision 938)
@@ -5,14 +5,18 @@
 # Unmount it, then kpartx -d $TARGET to clean up.
 
+set -e
+
 export PATH #WTF?
 
-LVNAME="$1"
+NAME="$1"
 export HOSTNAME="$2"
 export DIST="$3"
 export MIRROR="$4"
-export IMAGESIZE="$5"  # in megabytes
-export IP="$6"
+export FSSIZE="$5"    # in megabytes
+SWAPSIZE="$6"  # in megabytes
+export IP="$7"
 
 export ARCH=amd64
+VGNAME=xenvg
 
 #LVSIZE=`lvs --noheadings --units M --nosuffix -o Size /dev/xenvg/d_foobar_hda | sed 's/\..*//'`
@@ -22,6 +26,7 @@
 fi
 
-export TARGET=/dev/mapper/xenvg-$(echo "$LVNAME" | sed -e 's/-/--/g')_hda
+/sbin/lvcreate -L $(($FSSIZE+$SWAPSIZE))M -n "${NAME}_hda" $VGNAME
+
+export TARGET=/dev/mapper/xenvg-"$(echo "${NAME}_hda" | sed -e 's/-/--/g')"
 
 /usr/sbin/sipb-xen-create-image
-