diff options
| author | Chris Lumens <clumens@redhat.com> | 2009-04-24 13:28:45 -0400 |
|---|---|---|
| committer | Chris Lumens <clumens@redhat.com> | 2009-04-24 13:35:53 -0400 |
| commit | cd4e72f1710fc82e4c8b35658a6fdbb93d8a2d06 (patch) | |
| tree | bf01b6a8f0aeaf9eb860776c14a3fbc44dbb2821 /storage/__init__.py | |
| parent | daeccf205342a82022d2676b0d0eca9737df4ae1 (diff) | |
| download | anaconda-cd4e72f1710fc82e4c8b35658a6fdbb93d8a2d06.tar.gz anaconda-cd4e72f1710fc82e4c8b35658a6fdbb93d8a2d06.tar.xz anaconda-cd4e72f1710fc82e4c8b35658a6fdbb93d8a2d06.zip | |
Apply the global passphrase when doing kickstart autopart (#497533).
Diffstat (limited to 'storage/__init__.py')
| -rw-r--r-- | storage/__init__.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/storage/__init__.py b/storage/__init__.py index 6f063d457..ff18d3187 100644 --- a/storage/__init__.py +++ b/storage/__init__.py @@ -131,9 +131,6 @@ def storageComplete(anaconda): if passphrase: anaconda.id.storage.encryptionPassphrase = passphrase anaconda.id.storage.retrofitPassphrase = retrofit - for dev in anaconda.id.storage.devices: - if dev.format.type == "luks" and not dev.format.exists: - dev.format.passphrase = passphrase break else: rc = anaconda.intf.messageWindow(_("Encrypt device?"), @@ -152,6 +149,11 @@ def storageComplete(anaconda): anaconda.id.storage.encryptedAutoPart = False break + if anaconda.id.storage.encryptionPassphrase: + for dev in anaconda.id.storage.devices: + if dev.format.type == "luks" and not dev.format.exists: + dev.format.passphrase = anaconda.id.storage.encryptionPassphrase + if anaconda.isKickstart: return |