fix bug in the lvcreate-all script.

[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 bc375a7..304e08d 100755 (executable)
--- a/files/usr/sbin/sipb-xen-lvm
+++ b/files/usr/sbin/sipb-xen-lvm
@@ -19,7 +19,7 @@ lvpath = "/dev/" + vg + "/" + lvname
 
 def ensureoff(machine):
     # Make sure the machine is off, but we don't care about errors if it is already off.
-    rv = call(["/usr/sbin/xm", "destroy", prefix + machine]
+    rv = call(["/usr/sbin/xm", "destroy", prefix + machine])
 
 if subcommand == "lvremove":
     rv = call(["/sbin/lvremove", "--force", lvpath])
@@ -27,14 +27,14 @@ if subcommand == "lvremove":
     if rv != 0:
         print >>sys.stderr, "Error removing LV %s\n" %(lvname,)
         sys.exit(1)
-else if subcommand == "lvresize":
+elif subcommand == "lvresize":
     size = sys.argv[4]
     ensureoff(machine)
     rv = call(["/sbin/lvresize", "-L", size + "M", lvpath])
     if rv != 0:
         print >>sys.stderr, "Error resizing LV %s\n" %(lvname,)
         sys.exit(1)
-else if subcommand == "lvrename":
+elif subcommand == "lvrename":
     newmachine = sys.argv[4]
     newlvname = prefix + newmachine + "_" + disk
     ensureoff(machine)
@@ -43,14 +43,14 @@ else if subcommand == "lvrename":
     if rv != 0:
         print >>sys.stderr, "Error renaming LV %s\n" %(lvname,)
         sys.exit(1)
-else if subcommand == "lvcreate":
+elif subcommand == "lvcreate":
     size = sys.argv[4]
     rv = call(["/sbin/lvcreate", "-L", size + "M", "-n", lvname, vg])
     if rv != 0:
         print >>sys.stderr, "Error creating LV %s\n" %(lvname,)
         sys.exit(1)
     
-else if subcommand == "lvcreate-all":
+elif subcommand == "lvcreate-all":
     from sipb_xen_database import *
     import re
     connect('postgres://sipb-xen@sipb-xen-dev.mit.edu/sipb_xen')
@@ -58,7 +58,7 @@ else if subcommand == "lvcreate-all":
         check(re.match('^[A-Za-z0-9]+$', d.guest_device_name))
         machine = Machine.get(d.machine_id)
         check(re.match('^[A-Za-z0-9][A-Za-z0-9._-]*$', machine.name))
-        lvname = machine.name + "_" + d.guest_device_name
+        lvname = prefix + machine.name + "_" + d.guest_device_name
         if not os.path.exists("/dev/%s/%s" % (vg, lvname)):
             # LV doesn't exist
             print >>sys.stderr, "Creating LV %s..." % (lvname,)