From d18c31d59f378a79b7a49fbaee08621b5c0ae3f3 Mon Sep 17 00:00:00 2001 From: Vladimír Slávik Date: Sep 15 2020 15:37:31 +0000 Subject: Merge pull request #2852 from VladimirSlavik/rhel8-root-mandatory-fix Make locked root be completed only for kickstart --- diff --git a/pyanaconda/ui/gui/spokes/root_password.py b/pyanaconda/ui/gui/spokes/root_password.py index ca1060b..03cf223 100644 --- a/pyanaconda/ui/gui/spokes/root_password.py +++ b/pyanaconda/ui/gui/spokes/root_password.py @@ -169,7 +169,6 @@ class PasswordSpoke(FirstbootSpokeMixIn, NormalSpoke, GUISpokeInputCheckHandler) # value from the kickstart changed # NOTE: yet again, this stops to be valid once multiple # commands are supported by a single DBUS module - #self._users_module.SetRootpwKickstarted(False) # !!!! self.password_kickstarted = False self._users_module.SetRootAccountLocked(False) @@ -190,7 +189,10 @@ class PasswordSpoke(FirstbootSpokeMixIn, NormalSpoke, GUISpokeInputCheckHandler) @property def completed(self): - return bool(self._users_module.IsRootPasswordSet or self._users_module.IsRootAccountLocked) + return bool( + self._users_module.IsRootPasswordSet or + (self._users_module.IsRootAccountLocked and flags.automatedInstall) + ) @property def sensitive(self): diff --git a/pyanaconda/ui/tui/spokes/root_password.py b/pyanaconda/ui/tui/spokes/root_password.py index 77be03f..bbd1cf1 100644 --- a/pyanaconda/ui/tui/spokes/root_password.py +++ b/pyanaconda/ui/tui/spokes/root_password.py @@ -53,7 +53,10 @@ class PasswordSpoke(FirstbootSpokeMixIn, NormalTUISpoke): @property def completed(self): - return bool(self._users_module.IsRootPasswordSet or self._users_module.IsRootAccountLocked) + return bool( + self._users_module.IsRootPasswordSet or + (self._users_module.IsRootAccountLocked and flags.automatedInstall) + ) @property def showable(self):