final version with locking

diff --git a/debian/changelog b/debian/changelog
index 3383baa8dc778a4750cd704ea4428b8f077af18b..32f0d221291fc307b543d834a107768d69e88cb9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-autopkgtest (1.0.0~) unstable; urgency=low
+autopkgtest (1.0.0) gutsy; urgency=low
 
   * Locking: <play>.lock (unlinkable fcntl style) plus <play>/good
     sentinel file.  This will avoid conflicts between simultaneous calls
@@ -6,9 +6,9 @@ autopkgtest (1.0.0~) unstable; urgency=low
     target is enhanced so that the caller can take out the lock and hold
     it will starting and discarding the testbed more than once.
 
- -- Ian Jackson <ian@davenant.greenend.org.uk>  Thu, 12 Jul 2007 15:01:35 +0100
+ -- Ian Jackson <iwj@ubuntu.com>  Thu, 12 Jul 2007 15:01:35 +0100
 
-autopkgtest (0.9.2~) unstable; urgency=low
+autopkgtest (0.9.2) unreleased; urgency=low
 
   * Really discard stderr from our ought-to-be-unnecessary
     modprobe dm-snapshot.

diff --git a/xen/userv-target b/xen/userv-target
index c6a80c55b884a164ca6d77c5fd66a34768fe30c2..f0a7ff707251adce695bf4a1e29870b537b80c53 100755 (executable)
--- a/xen/userv-target
+++ b/xen/userv-target
@@ -43,7 +43,7 @@ case "$1" in
 pon0)  run adt-xenlvm-on-testbed -- --print0-command ;;
 console) xm console "$nd" ;;
 with)
-       ADT_LOCKED="$nddir/lock" with-lock-ex -w "$nddir/lock" sh -ec '
+       ADT_LOCKED="$nddir.lock" with-lock-ex -w "$nddir.lock" sh -ec '
                while adt-xenlvm-with-testbed \
                        --adt-distro="$1" --adt-nominum="$2" \
                      sh -c "echo y && read again" && \