From: Evan Broder <broder@mit.edu>
Date: Mon, 10 Nov 2008 08:58:08 +0000 (-0500)
Subject: Fix the sysvm startup lock cleanup
X-Git-Tag: 0.0.14^0
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-xen-config.git/commitdiff_plain/746734fd421a00663ac091f0c107e720a740e14f

Fix the sysvm startup lock cleanup

svn path=/trunk/packages/invirt-xen-config/; revision=1591
---

diff --git a/debian/changelog b/debian/changelog
index 67ae9e7..e7906b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+invirt-xen-config (0.0.14) unstable; urgency=low
+
+  * Throw away any output from LVM commands while starting sysvms
+  * Correctly delete the lock LVs
+
+ -- Evan Broder <broder@mit.edu>  Mon, 10 Nov 2008 03:57:09 -0500
+
 invirt-xen-config (0.0.13) unstable; urgency=low
 
   * Use a lock LV when attempting to start sysvms since exclusive LV
diff --git a/debian/invirt-xen-config.init b/debian/invirt-xen-config.init
index d0d8582..3b76a54 100755
--- a/debian/invirt-xen-config.init
+++ b/debian/invirt-xen-config.init
@@ -56,8 +56,9 @@ start_sysvm() {
         lvchange -a y "$DISK" >/dev/null 2>&1
     
         # Cleanup the lock, regardless of whether we started the LV
-        lvchange -a n "/dev/xenvg/lock_${LV}"
-        lvremove -f "/dev/xenvg/lock_${LV}"
+        lvchange -a n "/dev/xenvg/lock_${LV}" >/dev/null 2>&1
+        lvchange -a ey "/dev/xenvg/lock_${LV}" >/dev/null 2>&1
+        lvremove -f "/dev/xenvg/lock_${LV}" >/dev/null 2>&1
     fi
     
     return $RET