diff --git a/Don-t-run-installation-tasks-of-add-ons-in-a-meta-ta.patch b/Don-t-run-installation-tasks-of-add-ons-in-a-meta-ta.patch new file mode 100644 index 0000000000000000000000000000000000000000..1681ea451d8285250f25517c67194f6110a46c70 --- /dev/null +++ b/Don-t-run-installation-tasks-of-add-ons-in-a-meta-ta.patch @@ -0,0 +1,44 @@ +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 +@@ -332,9 +335,9 @@ class InitialSetup(object): + self.data.addons.execute(storage=None, ksdata=self.data, users=None, payload=None) + + 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 + diff --git a/initial-setup.spec b/initial-setup.spec index fd34283766c58c315c7927f6d52f93499e782abb..703fb7ca32a3ab57b2ea9ab5d5eb91661b9282e3 100644 --- a/initial-setup.spec +++ b/initial-setup.spec @@ -1,13 +1,13 @@ Name: initial-setup Version: 0.3.83 -Release: 1 +Release: 2 Summary: Initialize system configuration for a newly installed computer License: GPLv2+ URL: https://github.com/rhinstaller/initial-setup Source0: https://github.com/rhinstaller/initial-setup/archive/r0.3.83-1.tar.gz Patch0001: Drop-python-nose-from-the-dependencies.patch Patch9001: initial-setup-add-support-openeuler.patch - +Patch9002: Don-t-run-installation-tasks-of-add-ons-in-a-meta-ta.patch %define debug_package %{nil} @@ -82,6 +82,9 @@ fi %changelog +* Tue Jul 25 2023 shechenglong - 0.3.83-2 +- Don't run installation tasks of add-ons in a meta task + * Fri Apr 29 2022 yangping - 0.3.83-1 - Upgrade to 0.3.83