From: Ian Jackson <ian@liberator>
Date: Wed, 11 Jul 2007 15:54:58 +0000 (+0100)
Subject: * New `console' mode for userv service.
X-Git-Tag: converted-from-bzr~52
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=72a195977961112e531d25a80e205a11a2405cf9;p=autopkgtest.git

* New `console' mode for userv service.
---

diff --git a/debian/changelog b/debian/changelog
index 72cee70..618980e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ autopkgtest (0.9.1) gutsy; urgency=low
 
   * autopkgtest-xenlvm declares that it Depends on dmsetup.
   * Discard stderr from our ought-to-be-unnecessary modprobe dm-snapshot.
+  * New `console' mode for userv service.
 
  --
 
diff --git a/doc/README.userv b/doc/README.userv
index 8ab93aa..0f3bed2 100644
--- a/doc/README.userv
+++ b/doc/README.userv
@@ -32,7 +32,7 @@ The service is as invoked as
   userv [-Ddistro=<distro> -Dnominum=<nominum>] \
         [-Dssh_privkey=...|-Dssh_keyident_args=...] \
 	root adt-xenlvm-testbed <act>
-where <act> is either
+where <act> is one of
   with
 	Starts adt-xenlvm-with-testbed, prints `y', waits for
 	eof on stdin, and then exits adt-xenlvm-with-testbed.
@@ -43,3 +43,10 @@ where <act> is either
 	be put into an array of strings and passed to exec,
 	with the actual command to be run added as a final
 	argument (in sh syntax).
+  console
+	Runs  xm console <name-of-guest>
+	(NB without a pty).
+
+Only guests for which
+  /var/lib/autopkgtest/xenlvm/<nominum>_<distro>
+exists and is a directory are allowed.
diff --git a/xen/userv-target b/xen/userv-target
index 37c2c4e..362d5cf 100755
--- a/xen/userv-target
+++ b/xen/userv-target
@@ -42,5 +42,6 @@ run () {
 case "$1" in
 with)	run adt-xenlvm-with-testbed sh -c 'echo y && exec cat' ;;
 pon0)	run adt-xenlvm-on-testbed -- --print0-command ;;
+console) xm console "$nd" ;;
 *)	fail 'unknown mode'
 esac