summaryrefslogtreecommitdiffstats
path: root/pyanaconda/rescue.py
diff options
context:
space:
mode:
authorDavid Lehman <dlehman@redhat.com>2011-03-11 12:52:48 -0600
committerDavid Lehman <dlehman@redhat.com>2011-03-14 20:59:39 -0500
commit3758ccd5cfd67ffe8799633c4025d0a8fb75f90f (patch)
tree786149f0b4b9b68dd9dfaef35b23c0f93f85d0d2 /pyanaconda/rescue.py
parentbb3d69dafd1cc4c03a5f48ccaa8c70ec6ae07728 (diff)
downloadanaconda-3758ccd5cfd67ffe8799633c4025d0a8fb75f90f.tar.gz
anaconda-3758ccd5cfd67ffe8799633c4025d0a8fb75f90f.tar.xz
anaconda-3758ccd5cfd67ffe8799633c4025d0a8fb75f90f.zip
Collect LUKS passphrases to avoid making users enter them repeatedly.
This pretty much makes us behave like plymouth: We try every passphrase we know until one works. If we have none, or none works, we prompt for a passphrase. If that passphrase works, we add it to our list. Resolves: rhbz#588942
Diffstat (limited to 'pyanaconda/rescue.py')
-rw-r--r--pyanaconda/rescue.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pyanaconda/rescue.py b/pyanaconda/rescue.py
index bb21bf3e7..f6e55dc30 100644
--- a/pyanaconda/rescue.py
+++ b/pyanaconda/rescue.py
@@ -103,9 +103,9 @@ class RescueInterface(InstallInterfaceBase):
def passphraseEntryWindow(self, device):
w = PassphraseEntryWindow(self.screen, device)
- (passphrase, isglobal) = w.run()
+ passphrase = w.run()
w.pop()
- return (passphrase, isglobal)
+ return passphrase
def resetInitializeDiskQuestion(self):
self._initLabelAnswers = {}