[PATCH 2/2] Mark ksdata.*.execute invocations as another step

Vratislav Podzimek vpodzime at redhat.com
Wed Sep 5 13:20:21 UTC 2012


Signed-off-by: Vratislav Podzimek <vpodzime at redhat.com>
---
 pyanaconda/install.py | 40 +++++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/pyanaconda/install.py b/pyanaconda/install.py
index d639df3..88ec29c 100644
--- a/pyanaconda/install.py
+++ b/pyanaconda/install.py
@@ -55,7 +55,8 @@ def doInstall(storage, payload, ksdata, instClass):
     steps = len(storage.devicetree.findActions(type="create", object="format")) + \
             len(storage.devicetree.findActions(type="resize", object="format")) + \
             len(storage.devicetree.findActions(type="migrate", object="format"))
-    steps += 4  # packages setup, packages, bootloader, post install
+    steps += 5  # packages setup, packages, bootloader, post install,
+                # configuring
     progress.send_init(steps)
 
     # Do partitioning.
@@ -78,24 +79,25 @@ def doInstall(storage, payload, ksdata, instClass):
     with progress_report(_("Installing bootloader")):
         writeBootLoader(storage, payload)
 
-    # Now run the execute methods of ksdata that require an installed system
-    # to be present first.
-    ksdata.authconfig.execute(storage, ksdata, instClass)
-    ksdata.selinux.execute(storage, ksdata, instClass)
-    ksdata.firstboot.execute(storage, ksdata, instClass)
-    ksdata.services.execute(storage, ksdata, instClass)
-    ksdata.keyboard.execute(storage, ksdata, instClass)
-    ksdata.timezone.execute(storage, ksdata, instClass)
-    ksdata.lang.execute(storage, ksdata, instClass)
-
-    writeNetworkConf(storage, ksdata, instClass)
-
-    # Creating users and groups requires some pre-configuration.
-    u = Users()
-    createLuserConf(ROOT_PATH, algoname=u.getPassAlgo(ksdata.authconfig.authconfig))
-    ksdata.rootpw.execute(storage, ksdata, instClass, u)
-    ksdata.group.execute(storage, ksdata, instClass, u)
-    ksdata.user.execute(storage, ksdata, instClass, u)
+    with progress_report(_("Configuring installed system")):
+        # Now run the execute methods of ksdata that require an installed system
+        # to be present first.
+        ksdata.authconfig.execute(storage, ksdata, instClass)
+        ksdata.selinux.execute(storage, ksdata, instClass)
+        ksdata.firstboot.execute(storage, ksdata, instClass)
+        ksdata.services.execute(storage, ksdata, instClass)
+        ksdata.keyboard.execute(storage, ksdata, instClass)
+        ksdata.timezone.execute(storage, ksdata, instClass)
+        ksdata.lang.execute(storage, ksdata, instClass)
+
+        writeNetworkConf(storage, ksdata, instClass)
+
+        # Creating users and groups requires some pre-configuration.
+        u = Users()
+        createLuserConf(ROOT_PATH, algoname=u.getPassAlgo(ksdata.authconfig.authconfig))
+        ksdata.rootpw.execute(storage, ksdata, instClass, u)
+        ksdata.group.execute(storage, ksdata, instClass, u)
+        ksdata.user.execute(storage, ksdata, instClass, u)
 
     runPostScripts(ksdata.scripts)
 
-- 
1.7.11.4



More information about the anaconda-patches mailing list