wip on magrathea

diff --git a/hosts/magrathea/cfg b/hosts/magrathea/cfg
index 1777e942e38f66da3840ef9ea370d6065402c189..a61e7622e38e09ab486f5bad8180a0139535bf26 100644 (file)
--- a/hosts/magrathea/cfg
+++ b/hosts/magrathea/cfg
@@ -27,6 +27,8 @@ very few other packages.  Most autopkgtest reports are FTBFS problems.
 #maintainer_email_override="new@bugs.launchpad.net"
 maintainer_email_override="$administrator_email"
 
+adt_xmhook_disk="phy:/home/iwj/adt-play/swap,hda2,w"
+
 email_sourcepackage_header=\
 "Source: @p
 Version: @v

diff --git a/hosts/magrathea/crontab b/hosts/magrathea/crontab
new file mode 100644 (file)
index 0000000..885709b
--- /dev/null
+++ b/hosts/magrathea/crontab
@@ -0,0 +1,8 @@
+# m h dom mon dow       command
+4-59/5 * * * *         autopkgtest/runner/adt-testreport-cronjob adt-play cfg
+22 0 * * Mon           savelog -n7 adt-play/var/log adt-play/var/overall.log
+58 7 * * *             adt-play/cleanup
+
+MAILTO=iwj@ubuntu.com
+# m h dom mon dow       command
+6-46/20 * * * *        autopkgtest/runner/adt-openbugs-update adt-play cfg >/dev/null

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