Changeset 175 for trunk/packages

Timestamp:

Oct 10, 2007, 1:50:54 AM (17 years ago)

Author:

ecprice

Message:

Fix errors on lvresize to equal or smaller value.

File:

• trunk/packages/sipb-xen-remctl-auto/sipb-xen-remctl-auto/files/usr/sbin/sipb-xen-lvm (modified) (3 diffs)

trunk/packages/sipb-xen-remctl-auto/sipb-xen-remctl-auto/files/usr/sbin/sipb-xen-lvm

@@ -3 +3 @@
 import sys
 import os.path
-from subprocess import call, PIPE
+from subprocess import call, PIPE, Popen
 
 def check(b):
@@ -16 +16 @@
 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], stderr=PIPE)
+    rv = call(["/usr/sbin/xm", "destroy", prefix + machine],
+              stderr=PIPE)
 
 if subcommand == "lvcreate-all":
@@ -48 +49 @@
     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]