diff options
| author | David Lehman <dlehman@redhat.com> | 2009-08-27 20:54:27 -0500 |
|---|---|---|
| committer | David Lehman <dlehman@redhat.com> | 2009-08-28 10:29:43 -0500 |
| commit | 7f7c80bcddd5210bc4935e178623bd4d363791db (patch) | |
| tree | 7b9d62e34806518383bce133f7c079040fd40b17 /iw/raid_dialog_gui.py | |
| parent | 41dfe25f46784bfcb89bc00910d1bb7a2cbd5648 (diff) | |
| download | anaconda-7f7c80bcddd5210bc4935e178623bd4d363791db.tar.gz anaconda-7f7c80bcddd5210bc4935e178623bd4d363791db.tar.xz anaconda-7f7c80bcddd5210bc4935e178623bd4d363791db.zip | |
Fix handling of locked preexisting LUKS devices. (#502310)
Fix lookup of LUKS device for partitions to not traceback on failure
and allow reformat w/ encryption for all device types.
Diffstat (limited to 'iw/raid_dialog_gui.py')
| -rw-r--r-- | iw/raid_dialog_gui.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/iw/raid_dialog_gui.py b/iw/raid_dialog_gui.py index 863400ed4..02a452ea9 100644 --- a/iw/raid_dialog_gui.py +++ b/iw/raid_dialog_gui.py @@ -234,7 +234,9 @@ class RaidEditor: format = fmt_class(mountpoint=mountpoint) if self.fsoptionsDict.has_key("lukscb") and \ self.fsoptionsDict["lukscb"].get_active() and \ - self.origrequest.format.type != "luks": + (self.origrequest.format.type != "luks" or + (self.origrequest.format.exists and + not self.origrequest.format.hasKey)): luksdev = LUKSDevice("luks-%s" % self.origrequest.name, format=format, parents=self.origrequest) |