fix our copyright files

[invirt/packages/invirt-remote.git] / files / usr / sbin / sipb-xen-lvm

diff --git a/files/usr/sbin/sipb-xen-lvm b/files/usr/sbin/sipb-xen-lvm
index f42804e..00766f6 100755 (executable)
--- a/files/usr/sbin/sipb-xen-lvm
+++ b/files/usr/sbin/sipb-xen-lvm
@@ -41,11 +41,19 @@ else:
     lvname = prefix + machine + "_" + disk
     lvpath = "/dev/" + vg + "/" + lvname
 if subcommand == "lvremove":
     lvname = prefix + machine + "_" + disk
     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])
     rv = call(["/sbin/lvremove", "--force", lvpath])

-    ensureoff(machine)

     if rv != 0:
     if rv != 0:

-        print >>sys.stderr, "Error removing LV %s\n" %(lvname,)
-        sys.exit(1)
+        error()
+    ensureoff(machine)

 elif subcommand == "lvresize":
     size = sys.argv[4]
     ensureoff(machine)
 elif subcommand == "lvresize":
     size = sys.argv[4]
     ensureoff(machine)