Index: trunk/packages/sipb-xen-remctl-auto/debian/changelog
===================================================================
--- trunk/packages/sipb-xen-remctl-auto/debian/changelog	(revision 1064)
+++ trunk/packages/sipb-xen-remctl-auto/debian/changelog	(revision 1066)
@@ -1,2 +1,8 @@
+sipb-xen-remctl-auto (1.1) unstable; urgency=low
+
+  * Explicitly lock a volume before deleting it
+
+ -- Evan Broder <broder@mit.edu>  Sun, 05 Oct 2008 18:01:34 -0400
+
 sipb-xen-remctl-auto (1.0.21) unstable; urgency=low
 
Index: trunk/packages/sipb-xen-remctl-auto/files/usr/sbin/sipb-xen-lvm
===================================================================
--- trunk/packages/sipb-xen-remctl-auto/files/usr/sbin/sipb-xen-lvm	(revision 1064)
+++ trunk/packages/sipb-xen-remctl-auto/files/usr/sbin/sipb-xen-lvm	(revision 1066)
@@ -42,9 +42,17 @@
     lvpath = "/dev/" + vg + "/" + lvname
 if subcommand == "lvremove":
+    def error():
+        print >>sys.stderr, "Error removing LV %s\n" % lvname
+        sys.exit(1)
+    rv = call(["/sbin/lvchange", "-a", "n", lvpath])
+    if rv != 0:
+        error()
+    rv = call(["/sbin/lvchange", "-a", "ey", lvpath])
+    if rv != 0:
+        error()
     rv = call(["/sbin/lvremove", "--force", lvpath])
+    if rv != 0:
+        error()
     ensureoff(machine)
-    if rv != 0:
-        print >>sys.stderr, "Error removing LV %s\n" %(lvname,)
-        sys.exit(1)
 elif subcommand == "lvresize":
     size = sys.argv[4]