Merge branch 'master' of ssh://git.fedorahosted.org/git/anaconda

1 files changed, 7 insertions, 1 deletions

diff --git a/rescue.py b/rescue.py
index 1f981ea9c..58a6d1753 100644
--- a/rescue.py
+++ b/rescue.py
@@ -23,7 +23,7 @@
 import upgrade
 from snack import *
 from constants_text import *
-from text import WaitWindow, OkCancelWindow, ProgressWindow, stepToClasses
+from text import WaitWindow, OkCancelWindow, ProgressWindow, PassphraseEntryWindow, stepToClasses
 from flags import flags
 import sys
 import os
@@ -78,6 +78,12 @@ class RescueInterface:
 	else:
 	    return OkCancelWindow(self.screen, title, text)
 
+    def passphraseEntryWindow(self, device):
+        w = PassphraseEntryWindow(self.screen, device)
+        (passphrase, isglobal) = w.run()
+        w.pop()
+        return (passphrase, isglobal)
+
     def __init__(self, screen):
         self.screen = screen