[PATCH rhel6-branch] On interactive kickstart installs, still get the password from the ks file.

Chris Lumens clumens at redhat.com
Fri Feb 27 19:13:14 UTC 2015


...unless the user enters a new password in the UI.  In that case, use whatever
they enter.

Resolves: rhbz#995531
---
 iw/account_gui.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/iw/account_gui.py b/iw/account_gui.py
index 7d5d292..2da1b5e 100644
--- a/iw/account_gui.py
+++ b/iw/account_gui.py
@@ -62,6 +62,9 @@ class AccountWindow (InstallWindow):
         if not self.rootPassword['isCrypted']:
             self.pw.set_text(self.rootPassword['password'])
             self.confirm.set_text(self.rootPassword['password'])
+        else:
+            self.pw.set_text("xxxxxxxx")
+            self.confirm.set_text("xxxxxxxx")
 
         # pressing Enter in confirm == clicking Next
         vbox = self.xml.get_widget("account_box")
@@ -95,6 +98,10 @@ class AccountWindow (InstallWindow):
             self.capslock.set_text("")
 
     def getNext (self):
+        # check if we already have an encrypted password from kickstart
+        if self.rootPassword["isCrypted"] and self.pw.get_text() == "xxxxxxxx":
+            return None
+
         pw = self.pw.get_text()
         confirm = self.confirm.get_text()
 
-- 
2.2.2



More information about the anaconda-patches mailing list