wip - need to think about locking

diff --git a/debian/rules b/debian/rules
index e3e98f3d6400fabe697a7e7a7b8614ab96d25c06..a6b18b1e0604ad8723d2c7dc5f342ebf95961326 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -46,8 +46,8 @@ binary binary-indep: checkdir
                sharedir_lnfrom=/usr/share/$p/$x \
                sharedir=$(topdir)/debian/$p-$x/usr/share/$p/$x \
                etcdir=$(topdir)/debian/$p-$x/etc cfg_suffix=''
-       cd debian/$p-$x/etc/userv/rules.d && \
-               mv -f adt-xenlvm-testbed adt-xenlvm-testbed:dist
+       cd debian/$p-$x/etc/userv/services.d && \
+               mv -f adt-xenlvm-testbed:dist adt-xenlvm-testbed
 
        set -e; for f in $p $p-$x; do \
                cat CREDITS debian/copyright.suffix \

diff --git a/doc/README.userv b/doc/README.userv
new file mode 100644 (file)
index 0000000..9db81e3
--- /dev/null
+++ b/doc/README.userv
@@ -0,0 +1,21 @@
+Virtualisation service for use via userv
+----------------------------------------
+
+adt-virt-xenlvm supports use of Xen virtual machines and LVM COW via
+the userv `security boundary tool'.  By default the files
+corresponding to this setup are installed but not enabled.
+
+What is provided to non-root accounts is the ability to start the
+testbed and run commands on it (functionality equivalent to
+adt-xenlvm-with-testbed and adt-xenlvm-on-testbed) but not the ability
+to create new testbeds.
+
+To make this feature available:
+ * Install userv
+ * Create a group named AdtXenUs containing the users which should
+   be able to manipulate and use the testbed.  (This group can start
+   out empty but should exist before setting up the testbed for
+   the first time.)
+ * 
+
+The configuration as supplied does not make it 

diff --git a/xen/Makefile b/xen/Makefile
index 853db49d312569c99ae362650621f7d215b9c66c..37050c558ef7e3890e96eedda35929b88fc00fae 100644 (file)
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -32,7 +32,7 @@ all:          readconfig
 
 install:       all
        $(INSTALL_DIRS) $(bindir) $(docdir) $(man1dir) $(etcconfdir) \
-               $(sharedir) $(etcinitddir) $(xenscripts)
+               $(sharedir) $(etcinitddir) $(xenscripts) $(uservsvcdir)
        set -e; for f in $(programs) $(shareprograms); do \
                $(INSTALL_PROGRAM) $$f $(sharedir); \
                done

diff --git a/xen/userv-target b/xen/userv-target
index 1b874f340c45ee3cd41936e0914f64e92ab25aea..9c9ec02261eeba6d439d78c01e5a5710bdefdf4e 100755 (executable)
--- a/xen/userv-target
+++ b/xen/userv-target
@@ -13,7 +13,8 @@ adt*) ;;
 *)     fail 'userv adtxenlvm only supports nominums starting with adt' ;;
 esac
 
-test -d /var/lib/autopkgtest/xenlvm/"$dn" || fail 'unknown distro or nominum'
+dndir=/var/lib/autopkgtest/xenlvm/"$dn"
+test -d "$dndir" || fail 'unknown distro or nominum'
 
 run () {
        base="$1"; shift
@@ -21,7 +22,7 @@ run () {
 }
 
 case "$1" in
-with)  run adt-xenlvm-with-testbed sh -c 'echo y && exec cat' ;;
+with)  adt-xenlvm-with-testbed sh -c 'echo y && exec cat' ;;
 pon0)  run adt-xenlvm-on-testbed -- --print0-command ;;
 *)     fail 'unknown mode'
 esac