summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Lumens <clumens@redhat.com>2006-12-01 21:12:37 +0000
committerChris Lumens <clumens@redhat.com>2006-12-01 21:12:37 +0000
commita139bb5230e0cffd68ded6253be04215a22eb39e (patch)
tree501a57c43ab13f338a61c949f21a6648dcc02e4a
parentd6e010bb76e0fcf4bd52dcc26275e5c911e1b17e (diff)
downloadanaconda-a139bb5230e0cffd68ded6253be04215a22eb39e.tar.gz
anaconda-a139bb5230e0cffd68ded6253be04215a22eb39e.tar.xz
anaconda-a139bb5230e0cffd68ded6253be04215a22eb39e.zip
Scan for labels on logical volumes during upgrades (#217191).
-rw-r--r--ChangeLog3
-rw-r--r--partedUtils.py13
2 files changed, 16 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 0329a4893..fe6c22b52 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
* fsset.py (FileSystemSet.add): Make sure / is mounted before /boot
(#217292).
+ * partedUtils.py (DiskSet.getLabels): Scan for labels on logical
+ volumes during upgrades (#217191).
+
* iw/lvm_dialog_gui.py (VolumeGroupEditor.run): Remove unused code.
Make sure to copy volume group format attribute to the new request
(#217585).
diff --git a/partedUtils.py b/partedUtils.py
index 050552f29..bb05f7b06 100644
--- a/partedUtils.py
+++ b/partedUtils.py
@@ -686,6 +686,19 @@ class DiskSet:
if label:
labels[dev] = label
+ lvm.vgscan()
+ lvm.vgactivate()
+
+ for (vg, lv, size, lvorigin) in lvm.lvlist():
+ if lvorigin:
+ continue
+ node = "%s/%s" % (vg, lv)
+ label = isys.readFSLabel("/dev/" + node, makeDevNode=0)
+ if label:
+ labels[node] = label
+
+ lvm.vgdeactivate()
+
return labels
def findExistingRootPartitions(self, anaconda, upgradeany = 0):