diff options
| author | David Lehman <dlehman@redhat.com> | 2009-10-08 15:01:08 -0500 |
|---|---|---|
| committer | David Lehman <dlehman@redhat.com> | 2009-10-09 13:55:51 -0500 |
| commit | 299519d4a0693330ff6a50f3111d61feefabb0da (patch) | |
| tree | 1ae4f72be9e3ad2ec05d4d5af98405307cb7fd37 | |
| parent | 9ac905d22515d012a1e89f482258fce60452d7a3 (diff) | |
| download | anaconda-299519d4a0693330ff6a50f3111d61feefabb0da.tar.gz anaconda-299519d4a0693330ff6a50f3111d61feefabb0da.tar.xz anaconda-299519d4a0693330ff6a50f3111d61feefabb0da.zip | |
Consider encryption when checking for duplicate mountpoint. (#526697)
| -rw-r--r-- | iw/lvm_dialog_gui.py | 5 | ||||
| -rw-r--r-- | iw/partition_dialog_gui.py | 5 | ||||
| -rw-r--r-- | iw/raid_dialog_gui.py | 5 |
3 files changed, 12 insertions, 3 deletions
diff --git a/iw/lvm_dialog_gui.py b/iw/lvm_dialog_gui.py index d98a0bd22..923222cdf 100644 --- a/iw/lvm_dialog_gui.py +++ b/iw/lvm_dialog_gui.py @@ -638,9 +638,12 @@ class VolumeGroupEditor: # we checked this VG's LVs above; now check the rest of # the devices in the tree mountdevs = self.lvs.values() + full_name = "%s-%s" % (self.vg.name, lv['name']) for (mp,d) in self.storage.mountpoints.iteritems(): if (d.type != "lvmlv" or d.vg.id != self.vg.id) and \ - mp == mountpoint: + mp == mountpoint and \ + not (isinstance(d, LUKSDevice) and + full_name in [d.name for d in dev.parents]): used = True break diff --git a/iw/partition_dialog_gui.py b/iw/partition_dialog_gui.py index 5a9c19d64..80affbd69 100644 --- a/iw/partition_dialog_gui.py +++ b/iw/partition_dialog_gui.py @@ -115,7 +115,10 @@ class PartitionEditor: if mountpoint: used = False for (mp, dev) in self.storage.mountpoints.iteritems(): - if mp == mountpoint and dev.id != self.origrequest.id: + if mp == mountpoint and \ + dev.id != self.origrequest.id and \ + not (self.origrequest.format.type == "luks" and + self.origrequest in dev.parents): used = True break diff --git a/iw/raid_dialog_gui.py b/iw/raid_dialog_gui.py index f2a8a2830..76beca796 100644 --- a/iw/raid_dialog_gui.py +++ b/iw/raid_dialog_gui.py @@ -169,7 +169,10 @@ class RaidEditor: if mountpoint: used = False for (mp, dev) in self.storage.mountpoints.iteritems(): - if mp == mountpoint and dev.id != self.origrequest.id: + if mp == mountpoint and \ + dev.id != self.origrequest.id and \ + not (self.origrequest.format.type == "luks" and + self.origrequest in dev.parents): used = True break |