From 2bab62255d81a85e3c2c3fa4a4fd27c4f476ce97 Mon Sep 17 00:00:00 2001 From: Vojtech Trefny Date: Thu, 11 Feb 2021 10:39:00 +0800 Subject: [PATCH] Don't run installation tasks of add-ons in a meta task The UI should be able to handle a failure of an installation task and possibly continue with the installation if the user allows it. That is not possible if we run all installation tasks in one meta task. --- initial_setup/__init__.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/initial_setup/__init__.py b/initial_setup/__init__.py index 5273a91..9e5e429 100644 --- a/initial_setup/__init__.py +++ b/initial_setup/__init__.py @@ -8,8 +8,11 @@ import logging import argparse import traceback import atexit + from initial_setup.product import eula_available from initial_setup import initial_setup_log + +from pyanaconda.core.dbus import DBus from pyanaconda.localization import setup_locale_environment, setup_locale from pyanaconda.core.constants import FIRSTBOOT_ENVIRON, SETUP_ON_BOOT_RECONFIG, \ SETUP_ON_BOOT_DEFAULT @@ -331,9 +334,9 @@ class InitialSetup(object): log.info("executing addons") boss_proxy = BOSS.get_proxy() - task_path = boss_proxy.InstallSystemWithTask() - task_proxy = BOSS.get_proxy(task_path) - sync_run_task(task_proxy) + for service_name, object_path in boss_proxy.CollectInstallSystemTasks(): + task_proxy = DBus.get_proxy(service_name, object_path) + sync_run_task(task_proxy) if self.external_reconfig: # prevent the reconfig flag from being written out -- 2.33.0