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..fe93cddfbd07307a05f8b36bec5c2d722565c8a2 --- /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 +@@ -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 + diff --git a/initial-setup.spec b/initial-setup.spec index ae46e84e765d81db5ffaefcbee9b4ea7be29e935..1b9116f175593332d37a9b942cd0a7fce11fa40d 100644 --- a/initial-setup.spec +++ b/initial-setup.spec @@ -1,6 +1,6 @@ Name: initial-setup Version: 0.3.83 -Release: 5 +Release: 6 Summary: Initialize system configuration for a newly installed computer License: GPLv2+ URL: https://github.com/rhinstaller/initial-setup @@ -10,6 +10,7 @@ Patch9001: initial-setup-add-support-openeuler.patch Patch9002: Adapt-to-category-title-translation-fix-in-Anaconda.patch Patch9003: Add-Packit-support-for-initial-setup.patch Patch9004: Remove-deprecated-support-for-add-ons.patch +Patch9005: Don-t-run-installation-tasks-of-add-ons-in-a-meta-ta.patch %define debug_package %{nil} @@ -68,6 +69,12 @@ rm -rf %{buildroot} %changelog +* Thu Jun 15 2023 yueyuankun - 0.3.83-6 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:Don't run installation tasks of add-ons in a meta task + * Mon Jun 12 2023 chenchen - 0.3.83-5 - Remove old failing pre scriptlet