Index: trunk/packages/xvm-prodconfig/debian/changelog
===================================================================
--- trunk/packages/xvm-prodconfig/debian/changelog	(revision 2088)
+++ trunk/packages/xvm-prodconfig/debian/changelog	(revision 2089)
@@ -1,2 +1,8 @@
+xvm-prodconfig (1.1.9) unstable; urgency=low
+
+  * Ship the sysvm Xen config files themselves, rather than Mako templates.
+
+ -- Greg Price <price@mit.edu>  Tue, 03 Feb 2009 01:20:16 -0500
+
 xvm-prodconfig (1.1.8) unstable; urgency=low
 
Index: trunk/packages/xvm-prodconfig/sysvms/s_console
===================================================================
--- trunk/packages/xvm-prodconfig/sysvms/s_console	(revision 2089)
+++ trunk/packages/xvm-prodconfig/sysvms/s_console	(revision 2089)
@@ -0,0 +1,21 @@
+
+import os
+
+release     = os.uname()[2]
+kernel      = '/boot/vmlinuz-%s' % release
+ramdisk     = '/boot/initrd.img-%s' % release
+memory      = '256'
+
+disk        = ['phy:xenvg/s_console_hda,hda,w']
+
+name        = 's_console'
+
+vif         = [ 'ip=18.181.0.134,mac=00:16:3E:7E:E4:DE' ]
+
+on_poweroff = 'destroy'
+on_reboot   = 'restart'
+on_crash    = 'restart'
+
+root = '/dev/hda1 ro'
+extra = '2 console=xvc0'
+
Index: trunk/packages/xvm-prodconfig/sysvms/s_console.mako
===================================================================
--- trunk/packages/xvm-prodconfig/sysvms/s_console.mako	(revision 2088)
+++ 	(revision )
@@ -1,22 +1,0 @@
-<%
-from invirt.config import structs as cfg
-%>
-import os
-
-release     = os.uname()[2]
-kernel      = '/boot/vmlinuz-%s' % release
-ramdisk     = '/boot/initrd.img-%s' % release
-memory      = '256'
-
-disk        = ['phy:xenvg/s_console_hda,hda,w']
-
-name        = 's_console'
-
-vif         = [ 'ip=${cfg.console.ip},mac=00:16:3E:7E:E4:DE' ]
-
-on_poweroff = 'destroy'
-on_reboot   = 'restart'
-on_crash    = 'restart'
-
-root = '/dev/hda1 ro'
-extra = '2 console=xvc0'
Index: trunk/packages/xvm-prodconfig/sysvms/s_master
===================================================================
--- trunk/packages/xvm-prodconfig/sysvms/s_master	(revision 2089)
+++ trunk/packages/xvm-prodconfig/sysvms/s_master	(revision 2089)
@@ -0,0 +1,22 @@
+
+import os
+
+release     = os.uname()[2]
+kernel      = '/boot/vmlinuz-%s' % release
+ramdisk     = '/boot/initrd.img-%s' % release
+memory      = '1024'
+
+disk        = ['phy:xenvg/s_master_hda,hda,w',
+               'phy:xenvg/s_master_hdb,hdb,w']
+
+name        = 's_master'
+
+vif         = [ 'ip=18.181.0.62,mac=00:16:3E:5F:C1:D4' ]
+
+on_poweroff = 'destroy'
+on_reboot   = 'restart'
+on_crash    = 'restart'
+
+root 	    = '/dev/hda1 ro'
+extra = '2 console=xvc0'
+
Index: trunk/packages/xvm-prodconfig/sysvms/s_master.mako
===================================================================
--- trunk/packages/xvm-prodconfig/sysvms/s_master.mako	(revision 2088)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<%
-from invirt.config import structs as cfg
-%>
-import os
-
-release     = os.uname()[2]
-kernel      = '/boot/vmlinuz-%s' % release
-ramdisk     = '/boot/initrd.img-%s' % release
-memory      = '1024'
-
-disk        = ['phy:xenvg/s_master_hda,hda,w',
-               'phy:xenvg/s_master_hdb,hdb,w']
-
-name        = 's_master'
-
-vif         = [ 'ip=${cfg.db.ip},mac=00:16:3E:5F:C1:D4' ]
-
-on_poweroff = 'destroy'
-on_reboot   = 'restart'
-on_crash    = 'restart'
-
-root 	    = '/dev/hda1 ro'
-extra = '2 console=xvc0'
Index: trunk/packages/xvm-prodconfig/sysvms/s_remote
===================================================================
--- trunk/packages/xvm-prodconfig/sysvms/s_remote	(revision 2089)
+++ trunk/packages/xvm-prodconfig/sysvms/s_remote	(revision 2089)
@@ -0,0 +1,21 @@
+
+import os
+
+release     = os.uname()[2]
+kernel      = '/boot/vmlinuz-%s' % release
+ramdisk     = '/boot/initrd.img-%s' % release
+memory      = '512'
+
+disk        = ['phy:xenvg/s_remote_hda,hda,w']
+
+name        = 's_remote'
+
+vif         = [ 'ip=18.181.0.188,mac=00:16:3E:7F:C2:55' ]
+
+on_poweroff = 'destroy'
+on_reboot   = 'restart'
+on_crash    = 'restart'
+
+root = "/dev/hda1 ro"
+extra = '2 console=xvc0'
+
Index: trunk/packages/xvm-prodconfig/sysvms/s_remote.mako
===================================================================
--- trunk/packages/xvm-prodconfig/sysvms/s_remote.mako	(revision 2088)
+++ 	(revision )
@@ -1,22 +1,0 @@
-<%
-from invirt.config import structs as cfg
-%>
-import os
-
-release     = os.uname()[2]
-kernel      = '/boot/vmlinuz-%s' % release
-ramdisk     = '/boot/initrd.img-%s' % release
-memory      = '512'
-
-disk        = ['phy:xenvg/s_remote_hda,hda,w']
-
-name        = 's_remote'
-
-vif         = [ 'ip=${cfg.remote.ip},mac=00:16:3E:7F:C2:55' ]
-
-on_poweroff = 'destroy'
-on_reboot   = 'restart'
-on_crash    = 'restart'
-
-root = "/dev/hda1 ro"
-extra = '2 console=xvc0'