[PATCH][rhel6, f15, master] Only apply global passphrase to devices with no passphrase. (#679223)

[David Lehman <dlehman@xxxxxxxxxx>]

---
 pyanaconda/storage/__init__.py |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/pyanaconda/storage/__init__.py b/pyanaconda/storage/__init__.py
index ddac09c..ca43673 100644
--- a/pyanaconda/storage/__init__.py
+++ b/pyanaconda/storage/__init__.py
@@ -175,7 +175,8 @@ def storageComplete(anaconda):
 
     if anaconda.storage.encryptionPassphrase:
         for dev in anaconda.storage.devices:
-            if dev.format.type == "luks" and not dev.format.exists:
+            if dev.format.type == "luks" and not dev.format.exists and \
+               not device.format.hasKey:
                 dev.format.passphrase = anaconda.storage.encryptionPassphrase
 
     map(lambda d: anaconda.storage.services.update(d.services),
-- 
1.7.3.4

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list