[PATCH 1/2] Do not refer to kickstart in the root password spoke (#963968)

Vratislav Podzimek vpodzime at redhat.com
Thu Jun 6 12:25:46 UTC 2013


It is not necessary to specify which way the password was set and complicate
things for the Initial Setup.

Signed-off-by: Vratislav Podzimek <vpodzime at redhat.com>
---
 pyanaconda/ui/gui/spokes/password.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pyanaconda/ui/gui/spokes/password.py b/pyanaconda/ui/gui/spokes/password.py
index b902fb3..f181cf7 100644
--- a/pyanaconda/ui/gui/spokes/password.py
+++ b/pyanaconda/ui/gui/spokes/password.py
@@ -60,8 +60,8 @@ class PasswordSpoke(FirstbootSpokeMixIn, NormalSpoke):
 
         self._kickstarted = self.data.rootpw.seen
         if self._kickstarted:
-            self.pw.set_placeholder_text(_("The password was set by kickstart."))
-            self.confirm.set_placeholder_text(_("The password was set by kickstart."))
+            self.pw.set_placeholder_text(_("The password is set."))
+            self.confirm.set_placeholder_text(_("The password is set."))
 
         # set up passphrase quality checker
         self._pwq = pwquality.PWQSettings()
@@ -87,8 +87,6 @@ class PasswordSpoke(FirstbootSpokeMixIn, NormalSpoke):
     def status(self):
         if self._error:
             return _("Error setting root password")
-        elif self._kickstarted:
-            return _("Root password was set by kickstart")
         elif self.data.rootpw.password:
             return _("Root password is set")
         elif self.data.rootpw.lock:
-- 
1.7.11.7



More information about the anaconda-patches mailing list