Generate config files for sysvms in invirt-xen-config

svn path=/trunk/packages/invirt-xen-config/; revision=1452

diff --git a/config.todo b/config.todo
index 874b866..1f0572b 100644 (file)
--- a/config.todo
+++ b/config.todo
@@ -1,3 +1,3 @@
-xend-config.sxp: isolate patch
-files/etc/xen/scripts/vif-sipbroute: isolate patch
-files/etc/xen/scripts/vif-sipbroute: gateway, interface (for arpspoof)
+sysvms/*: MAC addresses
+vif-sipbroute: isolate patch
+vif-sipbroute: gateway, interface (for arpspoof)

diff --git a/debian/changelog b/debian/changelog
index 3c635c5..9ea54c4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+invirt-xen-config (0.0.10) unstable; urgency=low
+
+  * Generate config files for sysvms
+
+ -- Evan Broder <broder@mit.edu>  Fri, 31 Oct 2008 07:40:13 -0400
+
 invirt-xen-config (0.0.9) unstable; urgency=low
 
   * don't try to disable tx checksums for HVMs; it errors out

diff --git a/debian/invirt-xen-config.init b/debian/invirt-xen-config.init
index cfd3fac..007abb1 100755 (executable)
--- a/debian/invirt-xen-config.init
+++ b/debian/invirt-xen-config.init
@@ -13,7 +13,12 @@ PACKAGE=invirt-xen-config
 NAME="$PACKAGE"
 DESC="Invirt Xen host"
 PARENTPACKAGE=xend
-GEN_FILES=/etc/xen/xend-config.sxp.invirt
+GEN_FILES=(
+    /etc/xen/xend-config.sxp.invirt
+    /etc/xen/sysvms/s_master
+    /etc/xen/sysvms/s_remote
+    /etc/xen/sysvms/s_console
+    )
 
 dpkg -s "$PACKAGE" >/dev/null 2>/dev/null || exit 0
 

diff --git a/debian/invirt-xen-config.install b/debian/invirt-xen-config.install
index c1d0e25..50da8c2 100644 (file)
--- a/debian/invirt-xen-config.install
+++ b/debian/invirt-xen-config.install
@@ -2,5 +2,6 @@ qemu-dm-invirt usr/sbin
 qemu-ifup.invirt etc/xen
 invirt-database etc/xen
 vif-invirtroute etc/xen/scripts
+sysvms etc/xen
 
 debian/xend-config.sxp.invirt.mako etc/xen

diff --git a/sysvms/s_console.mako b/sysvms/s_console.mako
new file mode 100644 (file)
index 0000000..b10212c
--- /dev/null
+++ b/sysvms/s_console.mako
@@ -0,0 +1,22 @@
+<%
+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'

diff --git a/sysvms/s_master.mako b/sysvms/s_master.mako
new file mode 100644 (file)
index 0000000..192f249
--- /dev/null
+++ b/sysvms/s_master.mako
@@ -0,0 +1,23 @@
+<%
+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'

diff --git a/sysvms/s_remote.mako b/sysvms/s_remote.mako
new file mode 100644 (file)
index 0000000..d710e46
--- /dev/null
+++ b/sysvms/s_remote.mako
@@ -0,0 +1,22 @@
+<%
+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'