various needed lvm fixups

1 files changed, 17 insertions, 5 deletions

diff --git a/fsset.py b/fsset.py
index f9e3e69f5..91552a38f 100644
--- a/fsset.py
+++ b/fsset.py
@@ -1076,7 +1076,7 @@ class FileSystemSet:
                                         stderr = "/tmp/lvmout",
                                         searchPath = 1)
             
-            rootDev = root.device.getDevice()
+            rootDev = "/dev/%s" % (root.device.getDevice(),)
             os.makedirs(instPath + rootDev[:string.rfind(rootDev, "/")])
             iutil.copyDeviceNode(rootDev, instPath + rootDev)
 
@@ -1385,7 +1385,7 @@ class VolumeGroupDevice(Device):
                                         stderr = "/tmp/lvmout",
                                         searchPath = 1)
             if rc:
-                raise SystemError
+                raise SystemError, "vgscan failed"
             
             nodes = []
             for volume in self.physicalVolumes:
@@ -1404,10 +1404,19 @@ class VolumeGroupDevice(Device):
                                             stderr = "/tmp/lvmout",
                                             searchPath = 1)
                 if rc:
-                    raise SystemError
+                    raise SystemError, "pvcreate failed for %s" % (volume,)
 
                 nodes.append(node)
 
+            # rescan now that we've recreated pvs.  ugh.
+            rc = iutil.execWithRedirect("/usr/sbin/vgscan",
+                                        ["vgscan", "-v"],
+                                        stdout = "/tmp/lvmout",
+                                        stderr = "/tmp/lvmout",
+                                        searchPath = 1)
+            if rc:
+                raise SystemError, "vgscan failed"
+
 
             args = [ "/usr/sbin/vgcreate", "-v", self.name ]
             args.extend(nodes)
@@ -1416,6 +1425,9 @@ class VolumeGroupDevice(Device):
                                         stderr = "/tmp/lvmout",
                                         searchPath = 1)
 
+            if rc:
+                raise SystemError, "vgcreate failed for %s" %(self.name,)
+
             self.isSetup = 1
             
         return "/dev/%s" % (self.name,)
@@ -1450,11 +1462,11 @@ class LogicalVolumeDevice(Device):
                                         stderr = "/tmp/lvmout",
                                         searchPath = 1)
             if rc:
-                raise SystemError
+                raise SystemError, "lvcreate failed for %s" %(self.name,)
             
             self.isSetup = 1
 
-        return self.getDevice()
+        return "/dev/%s" % (self.getDevice(),)
 
     def getDevice(self, asBoot = 0):
         return "%s/%s" % (self.volumeGroup, self.name)