diff options
| author | Vratislav Podzimek <vpodzime@redhat.com> | 2012-09-05 13:44:42 +0200 |
|---|---|---|
| committer | Vratislav Podzimek <vpodzime@redhat.com> | 2012-09-06 15:58:54 +0200 |
| commit | 7b1f083925ca5e24806df3187df9c1ed461ca063 (patch) | |
| tree | 06bcc30a43c48e4d60d5f24ec1cb531ae853824e | |
| parent | 4a20cad63d48bba319e6f0fb6365f7755bf377f7 (diff) | |
| download | anaconda-7b1f083925ca5e24806df3187df9c1ed461ca063.tar.gz anaconda-7b1f083925ca5e24806df3187df9c1ed461ca063.tar.xz anaconda-7b1f083925ca5e24806df3187df9c1ed461ca063.zip | |
Mark ksdata.*.execute invocations as another step
| -rw-r--r-- | pyanaconda/install.py | 40 |
1 files changed, 21 insertions, 19 deletions
diff --git a/pyanaconda/install.py b/pyanaconda/install.py index 36f483134..982ffc424 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, instClass) - # 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) |