* New `console' mode for userv service.

diff --git a/debian/changelog b/debian/changelog
index 72cee70920b6ed10b5e5aac38004bdb07fa30eb5..618980ef5ad44df4c716041f94f864f82fc26108 100644 (file)
--- 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 8ab93aaf8543dea578a966ca4f6129f23ebe0127..0f3bed2b5659dd1f3cce3bb50dc5161563c59c4e 100644 (file)
--- 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 37c2c4e8d708c69df8c4147a36c367f497e6c88c..362d5cf5f0e827223795e33e3a0555cb8de4230d 100755 (executable)
--- 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