[anaconda][PATCH 2/2] Run firstboot-only spokes on first boot by default

Vratislav Podzimek vpodzime at redhat.com
Tue Sep 3 14:17:36 UTC 2013


Spokes that should appear in both the installer and the initial-setup during the
first boot should run only if 'firstboot --reconfig' is specified in the
kickstart. But firstboot-only spokes should always run by default during the
first boot, because otherwise they wouldn't be shown at all. The should_run
classmethod can be overriden if needed, of course.

Related: rhbz#1000409

Signed-off-by: Vratislav Podzimek <vpodzime at redhat.com>
---
 pyanaconda/ui/common.py | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pyanaconda/ui/common.py b/pyanaconda/ui/common.py
index 937171a..91d878f 100644
--- a/pyanaconda/ui/common.py
+++ b/pyanaconda/ui/common.py
@@ -168,13 +168,8 @@ class FirstbootOnlySpokeMixIn(object):
            the data argument.
         """
 
-        if environment == FIRSTBOOT_ENVIRON and data is None:
-            # 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:
-            # generally run spokes in firstboot only if doing reconfig, spokes
+        if environment == FIRSTBOOT_ENVIRON:
+            # firstboot only spokes should run in firstboot by default, spokes
             # that should run even if not doing reconfig should override this
             # method
             return True
-- 
1.7.11.7



More information about the anaconda-patches mailing list