diff options
| author | Paul Nasrat <pnasrat@redhat.com> | 2006-07-07 17:05:56 +0000 |
|---|---|---|
| committer | Paul Nasrat <pnasrat@redhat.com> | 2006-07-07 17:05:56 +0000 |
| commit | e93c3ef69b9ff4bfe55dafb7816186b76ade0ec5 (patch) | |
| tree | b5e246ed269825877599c4e27dd92f05be1e9b35 | |
| parent | db2bdab2ed860338a01b481cd4e56d479e67ce58 (diff) | |
| download | anaconda-e93c3ef69b9ff4bfe55dafb7816186b76ade0ec5.tar.gz anaconda-e93c3ef69b9ff4bfe55dafb7816186b76ade0ec5.tar.xz anaconda-e93c3ef69b9ff4bfe55dafb7816186b76ade0ec5.zip | |
PSU, PSU wherefore art though...
rescue.py (runRescue): Move label reading to partedUtils.py.
partedUtils.py (DiskSet.findExistingRootPartitions): Look up
filesystem labels as we find root partitions, as we won't have LVM
active if we wait until later (#196345).
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | partedUtils.py | 21 | ||||
| -rw-r--r-- | rescue.py | 7 |
3 files changed, 26 insertions, 9 deletions
@@ -1,3 +1,10 @@ +2006-07-07 Chris Lumens <clumens@redhat.com> + + * rescue.py (runRescue): Move label reading to partedUtils.py. + * partedUtils.py (DiskSet.findExistingRootPartitions): Look up + filesystem labels as we find root partitions, as we won't have LVM + active if we wait until later (#196345). + 2006-07-06 Chris Lumens <clumens@redhat.com> * vnc.py (startVNCServer): Use the configured interface for VNC diff --git a/partedUtils.py b/partedUtils.py index 772d8670a..b7b40d875 100644 --- a/partedUtils.py +++ b/partedUtils.py @@ -669,7 +669,12 @@ class DiskSet: if ((upgradeany == 1) or (productMatches(relstr, productName))): - rootparts.append ((dev, fs, relstr)) + try: + label = isys.readFSLabel(dev, makeDevNode=0) + except: + label = None + + rootparts.append ((dev, fs, relstr, label)) isys.umount(anaconda.rootPath) # now, look for candidate lvm roots @@ -695,7 +700,12 @@ class DiskSet: if ((upgradeany == 1) or (productMatches(relstr, productName))): - rootparts.append ((dev, fs, relstr)) + try: + label = isys.readFSLabel(dev, makeDevNode=0) + except: + label = None + + rootparts.append ((dev, fs, relstr, label)) isys.umount(anaconda.rootPath) lvm.vgdeactivate() @@ -740,8 +750,13 @@ class DiskSet: if ((upgradeany == 1) or (productMatches(relstr, productName))): + try: + label = isys.readFSLabel("/dev/%s" % node, makeDevNode=0) + except: + label = None + rootparts.append ((node, part.fs_type.name, - relstr)) + relstr, label)) isys.umount(anaconda.rootPath) part = disk.next_partition(part) @@ -310,12 +310,7 @@ def runRescue(anaconda): scroll = 0 partList = [] - for (drive, fs, relstr) in disks: - try: - label = isys.readFSLabel(drive, makeDevNode=0) - except: - label = None - + for (drive, fs, relstr, label) in disks: if label: partList.append("%s (%s)" % (drive, label)) else: |