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

diff --git a/debian/changelog b/debian/changelog
index e28cc0af91177394d13a615e345ef9ac08cb25b6..943d2c985708305cc00fb1ebedd3e20540089284 100644 (file)
--- 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 14cde7f661289377a640498f9902df2f314d93ee..cce8239647e777d57ac04c00277271c6ab4d18ed 100644 (file)
--- 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 5a9f0b0c60c4f2185c32885329507a8bfe964535..b3110f80a056e0e0663609cdab65df58cdf58a77 100755 (executable)
--- 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