[anaconda][rhel7-branch/master/f23-branch][PATCH] Only show the user spoke if no users are specified in kickstart (#1253672)

Martin Kolman mkolman at redhat.com
Thu Sep 10 15:57:49 UTC 2015


As we don't support editing of existing users don't show the user
spoke if user/-s have been specified in kickstart.

This fixes the issue that the user spoke has been previously
unconditionally shown in the Initial Setup reconfig mode
even though it could not actually work.

Resolves: rhbz#1253672
Signed-off-by: Martin Kolman <mkolman at redhat.com>
---
 pyanaconda/ui/gui/spokes/user.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pyanaconda/ui/gui/spokes/user.py b/pyanaconda/ui/gui/spokes/user.py
index 653f107..35bdf2e 100644
--- a/pyanaconda/ui/gui/spokes/user.py
+++ b/pyanaconda/ui/gui/spokes/user.py
@@ -224,9 +224,7 @@ class UserSpoke(FirstbootSpokeMixIn, NormalSpoke, GUISpokeInputCheckHandler):
             # cannot decide, stay in the game and let another call with data
             # available (will come) decide
             return True
-        elif environment == FIRSTBOOT_ENVIRON and data and \
-                (data.firstboot.firstboot == FIRSTBOOT_RECONFIG or \
-                     len(data.user.userList) == 0):
+        elif environment == FIRSTBOOT_ENVIRON and data and len(data.user.userList) == 0:
             return True
         else:
             return False
-- 
2.4.3



More information about the anaconda-patches mailing list