I've been looking at the code more closely and found a way to make the
patch less intrusive and more efficient.
Attached are new patches for both anaconda-11.1.2.155 (RHEL 5.3 Beta)
(tested) and anaconda-11.4.1.57-1-1-gc6cf36a (not tested).
Jeff
--- anaconda-11.1.2.155/iw/account_gui.py.ORIG 2008-11-11 01:56:39.000000000 -0600
+++ anaconda-11.1.2.155/iw/account_gui.py 2008-11-12 12:51:53.000000000 -0600
@@ -33,6 +33,9 @@
if not self.__dict__.has_key("pw"): return None
+ # check if we already have a crypted password from kickstart
+ if self.rootPassword["isCrypted"]: return None
+
pw = self.pw.get_text()
confirm = self.confirm.get_text()
@@ -139,5 +142,8 @@
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")
return box
diff --git a/iw/account_gui.py b/iw/account_gui.py
index 45f396b..035ebab 100644
--- a/iw/account_gui.py
+++ b/iw/account_gui.py
@@ -59,9 +59,15 @@ class AccountWindow (InstallWindow):
lambda w, e: self.handleCapsLockRelease(w, e, self.capslock))
# we might have a root password already
+ # 1. if it's not encrypted, just use it
+ # 2. if it is encrypted, set text in password fields to "xxxxxxxx"
+ # for use in autostep screenshots
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")
# make sure pw has the focus when we enter the screen
vbox = self.xml.get_widget("account_box")
@@ -100,6 +106,9 @@ class AccountWindow (InstallWindow):
self.capslock.set_text("")
def getNext (self):
+ # check if we already have a crypted root password from kickstart
+ if self.rootPassword["isCrypted"]: return None
+
pw = self.pw.get_text()
confirm = self.confirm.get_text()
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
