From: Ian Jackson <ian@davenant.greenend.org.uk>
Date: Fri, 26 Oct 2007 14:42:35 +0000 (+0100)
Subject: wip on magrathea
X-Git-Tag: converted-from-bzr~18
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=50dbb2bf6bc2ca357489ae5f9325e829d3142fd0;p=autopkgtest.git

wip on magrathea
---

diff --git a/hosts/magrathea/cfg b/hosts/magrathea/cfg
index 1777e94..a61e762 100644
--- 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
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 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