From: Ian Jackson <ian@davenant.greenend.org.uk>
Date: Fri, 26 Oct 2007 13:57:56 +0000 (+0100)
Subject: * adt-xenlvm-setup: new hooks for xmdomain config file.
X-Git-Tag: converted-from-bzr~14^2~1
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=83a002cdf544f7ea5759ff0c6a04ee3b2c63d89a;p=autopkgtest.git

* adt-xenlvm-setup: new hooks for xmdomain config file.
---

diff --git a/debian/changelog b/debian/changelog
index e28cc0a..943d2c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,13 @@
 autopkgtest (1.1.1~) unstable; urgency=low
 
+  * adt-xenlvm-setup: new hooks for xmdomain config file.
   * hosts/cadmium/update-suppression: really do not install empty file.
   * allow suppresspackages and blacklist lists to contain more
     information after some whitespace
   * adt-openbugs-*: new machinery works with debbugs
   * hosts/magrathea/*: work-in-progress configuration
 
- --
+ -- Ian Jackson <ian@davenant.greenend.org.uk>  Fri, 26 Oct 2007 14:57:49 +0100
 
 autopkgtest (1.1.0) unreleased; urgency=low
 
diff --git a/xen/README b/xen/README
index 14cde7f..cce8239 100644
--- a/xen/README
+++ b/xen/README
@@ -292,3 +292,17 @@ adt_fslink_name		<nominum>_<distro>_fs
 
 adt_xmname		<nominum>_<distro>
 	Xen virtual machine name, as passed to xm create.
+
+adt_xmhook_disk		<empty>
+adt_xmhook_vif		<empty>
+adt_xmhook_extra	<empty>
+adt_xmhook_config	<empty>
+	The values of these variables are inserted into the Xen domU
+	configuration file.  _disk and _vif should contain zero or
+	more comma-prefixed double-quoted stanzas - they are
+	substituted inside the [ ] after the primary filesystem and
+	network devices set up by the adt-xenlvm tools.  _extra
+	contains additional space-separated kernel command-line
+	options and is substituted inside the double-quotes.  _config
+	should contain whole configuration lines.  See
+	xmdomain.cfg(5).
diff --git a/xen/setup b/xen/setup
index 5a9f0b0..b3110f8 100755
--- a/xen/setup
+++ b/xen/setup
@@ -43,12 +43,13 @@ cat <<END >$adt_xmconfig
 kernel = "$adt_kernel"
 memory = $adt_testbed_ram
 root = "/dev/hda1"
-extra = "ro console=tty0"
-disk = [ "phy:$lvm_fslink_ptrrhs,hda1,w" ]
-vif = [ "bridge=none,mac=$adt_guest_macaddr,ip=${adt_guest_ipaddr},script=${adt_net_vifscript}" ]
+extra = "ro console=tty0 $adt_xmhook_extra"
+disk = [ "phy:$lvm_fslink_ptrrhs,hda1,w" $adt_xmhook_disk ]
+vif = [ "bridge=none,mac=$adt_guest_macaddr,ip=${adt_guest_ipaddr},script=${adt_net_vifscript}" $adt_xmhook_vif ]
 on_crash = "preserve"
 on_reboot = "preserve"
 on_shutdown = "preserve"
+$adt_xmhook_config
 END
 
 if [ "x$adt_ramdisk" != x ]; then