Index: /trunk/packages/sipb-xen-autoinstaller/debian/changelog
===================================================================
--- /trunk/packages/sipb-xen-autoinstaller/debian/changelog	(revision 759)
+++ /trunk/packages/sipb-xen-autoinstaller/debian/changelog	(revision 760)
@@ -1,2 +1,8 @@
+sipb-xen-autoinstaller (2.4) unstable; urgency=low
+
+  * Switch to using just sipb-database options on the host
+
+ -- Eric Price <ecprice@sipb-xen-dev.mit.edu>  Mon, 28 Jul 2008 03:18:00 -0400
+
 sipb-xen-autoinstaller (2.3) unstable; urgency=low
 
Index: /trunk/packages/sipb-xen-autoinstaller/debian/control.in
===================================================================
--- /trunk/packages/sipb-xen-autoinstaller/debian/control.in	(revision 759)
+++ /trunk/packages/sipb-xen-autoinstaller/debian/control.in	(revision 760)
@@ -14,8 +14,2 @@
 Description: SIPB Xen automatic guest-image installer system (guest)
  This is our automatic guest-image installer system.
-
-Package: sipb-xen-autoinstaller-host
-Architecture: all
-Depends: ${misc:Depends}, sipb-xen-host-master
-Description: SIPB Xen automatic guest-image installer system (host)
- This is our automatic guest-image installer system.
Index: unk/packages/sipb-xen-autoinstaller/debian/sipb-xen-autoinstaller-host.install
===================================================================
--- /trunk/packages/sipb-xen-autoinstaller/debian/sipb-xen-autoinstaller-host.install	(revision 759)
+++ 	(revision )
@@ -1,1 +1,0 @@
-host/* .
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 759)
+++ /trunk/packages/sipb-xen-autoinstaller/guest/etc/init.d/rcS.sipb-xen	(revision 760)
@@ -1,16 +1,38 @@
-#!/bin/sh
+#!/bin/bash
 for x in $(cat /proc/cmdline); do
     case $x in
-    ip=*)
-      /usr/lib/klibc/bin/ipconfig -d ${x#ip=}
-      ;;
-    noinstall)
-      exit 0
-      ;;
+	ip=*)
+	/usr/lib/klibc/bin/ipconfig -d ${x#ip=}
+	;;
+	mirror=*)
+	MIRROR=${x#mirror=}
+	;;
+	dist=*)
+	DIST=${x#dist=}
+	;;
+	arch=*)
+	ARCH=${x#arch=}
+	;;
+	imagesize=*)
+	IMAGESIZE=${x#imagesize=}
+	;;
+	noinstall)
+	exit 0
+	;;
     esac
 done
 mount -t tmpfs none /var/log
 mount -t tmpfs none /tmp
-sipb-xen-install
+
+
+TARGET=/dev/hda
+ARCH=${ARCH-amd64}
+IP=$(ifconfig eth0 | sed -n 's/.*inet addr:\([0-9\.]*\).*/\1/p')
+HOSTNAME=$(hostname)
+
+echo ,${IMAGESIZE}$',L,*\n,,S\n;\n;' | sfdisk -uM -H 255 -S 63 $TARGET
+
+xen-create-image --image-dev ${TARGET}1 --swap-dev ${TARGET}2 --fs ext3 --ide --arch $ARCH --dist $DIST --hostname $HOSTNAME --mirror $MIRROR --ip=$IP --netmask=255.255.0.0 --gateway=18.181.0.1 --cache=yes
+
 busybox poweroff
 exit 0