summaryrefslogtreecommitdiffstats
path: root/iw/lvm_dialog_gui.py
diff options
context:
space:
mode:
authorDavid Lehman <dlehman@redhat.com>2009-08-27 20:54:27 -0500
committerDavid Lehman <dlehman@redhat.com>2009-08-28 10:29:43 -0500
commit7f7c80bcddd5210bc4935e178623bd4d363791db (patch)
tree7b9d62e34806518383bce133f7c079040fd40b17 /iw/lvm_dialog_gui.py
parent41dfe25f46784bfcb89bc00910d1bb7a2cbd5648 (diff)
downloadanaconda-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/lvm_dialog_gui.py')
-rw-r--r--iw/lvm_dialog_gui.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/iw/lvm_dialog_gui.py b/iw/lvm_dialog_gui.py
index 18e140a8e..e22665053 100644
--- a/iw/lvm_dialog_gui.py
+++ b/iw/lvm_dialog_gui.py
@@ -691,7 +691,8 @@ class VolumeGroupEditor:
format = fmt_class(mountpoint=mountpoint)
if self.lukscb and self.lukscb.get_active() and \
- templv.format.type != "luks":
+ (templv.format.type != "luks" or
+ (templv.format.exists and not templv.format.hasKey)):
newluks = format
format = getFormat("luks",
passphrase=self.storage.encryptionPassphrase)