X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-remote.git/blobdiff_plain/4d5a090ff15267db03697a074944a1b0687e94e3..2cfee565a20a17fc0cb6e3b90d807e222cd302a0:/files/usr/sbin/sipb-xen-lvm

diff --git a/files/usr/sbin/sipb-xen-lvm b/files/usr/sbin/sipb-xen-lvm
index f69c2a6..15965cd 100755
--- a/files/usr/sbin/sipb-xen-lvm
+++ b/files/usr/sbin/sipb-xen-lvm
@@ -2,7 +2,8 @@
 
 import sys
 import os.path
-from subprocess import call
+from subprocess import call, PIPE, Popen
+from invirt.config import structs as config
 
 def check(b):
     if not b:
@@ -15,15 +16,13 @@ subcommand = sys.argv[1]
 
 def ensureoff(machine):
     # Make sure the machine is off, but we don't care about errors if it is already off.
-    try:
-        rv = call(["/usr/sbin/xm", "destroy", prefix + machine])
-    except:
-        pass
+    rv = call(["/usr/sbin/xm", "destroy", prefix + machine],
+              stderr=PIPE)
 
 if subcommand == "lvcreate-all":
     from sipb_xen_database import *
     import re
-    connect('postgres://sipb-xen@sipb-xen-dev.mit.edu/sipb_xen')
+    connect(config.db.uri)
     for d in Disk.select():
         check(re.match('^[A-Za-z0-9]+$', d.guest_device_name))
         machine = Machine.get(d.machine_id)
@@ -50,10 +49,15 @@ if subcommand == "lvremove":
 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,)
+    p = Popen(["/sbin/lvresize", "-L", size + "M", lvpath],
+              stdin=PIPE, stderr=PIPE)
+    print >> p.stdin, 'y'
+    err = p.stderr.read()
+    if p.wait() != 0 and 'matches existing size' not in err:
+        print >> sys.stderr, "Error resizing LV %s:\n" %(lvname,)
+        print >> sys.stderr, err
         sys.exit(1)
+    print >> sys.stderr, err
 elif subcommand == "lvrename":
     newmachine = sys.argv[4]
     newlvname = prefix + newmachine + "_" + disk