Index: trunk/packages/invirt-autoinstaller/common/usr/sbin/invirt-create-image
===================================================================
--- trunk/packages/invirt-autoinstaller/common/usr/sbin/invirt-create-image	(revision 2843)
+++ trunk/packages/invirt-autoinstaller/common/usr/sbin/invirt-create-image	(revision 2844)
@@ -6,6 +6,16 @@
 #  ARCH, DIST, MIRROR
 #  HOSTNAME, IP
+#
+# Optional: GATEWAY, NETMASK.  These default to values in invirt-getconf, if installed
 
 set -e
+
+if [ "$GATEWAY" = "" ]; then
+    GATEWAY=$(invirt-getconf autoinstaller.gateway)
+fi
+
+if [ "$NETMASK" = "" ]; then
+    NETMASK=$(invirt-getconf autoinstaller.netmask)
+fi
 
 echo ,"${FSSIZE}"$',L,*\n,,S\n;\n;' | sfdisk -uM -H 255 -S 63 "$TARGET"
@@ -14,5 +24,5 @@
 
 xen-create-image --image-dev "${TARGET}1" --swap-dev "${TARGET}2" --fs ext3 --ide \
- --hostname "$HOSTNAME" --ip="$IP" --netmask=255.255.0.0 --gateway=18.181.0.1 \
+ --hostname "$HOSTNAME" --ip="$IP" --netmask="$NETMASK" --gateway="$GATEWAY" \
  --arch "$ARCH" --dist "$DIST" --mirror "$MIRROR" --cache=yes --verbose
 
Index: trunk/packages/invirt-autoinstaller/debian/changelog
===================================================================
--- trunk/packages/invirt-autoinstaller/debian/changelog	(revision 2843)
+++ trunk/packages/invirt-autoinstaller/debian/changelog	(revision 2844)
@@ -1,2 +1,8 @@
+invirt-autoinstaller (0.0.33) unstable; urgency=low
+
+  * Don't hardcode netmask and gateway
+
+ -- Greg Brockman <gdb@mit.edu>  Fri, 01 Jan 2010 23:31:55 -0500
+
 invirt-autoinstaller (0.0.32) unstable; urgency=low
 
Index: trunk/packages/invirt-autoinstaller/debian/control
===================================================================
--- trunk/packages/invirt-autoinstaller/debian/control	(revision 2843)
+++ trunk/packages/invirt-autoinstaller/debian/control	(revision 2844)
@@ -18,5 +18,5 @@
 Provides: ${diverted-files}
 Conflicts: ${diverted-files}, sysvinit, upstart, xen-hypervisor
-Depends: ${misc:Depends}, patch, xen-tools, busybox-static, lvm2, kpartx, aptitude
+Depends: ${misc:Depends}, patch, xen-tools, busybox-static, lvm2, kpartx, aptitude, invirt-base
 Description: SIPB Xen automatic guest-image installer system (guest)
  This is our automatic guest-image installer system.