From 20f523215f19bdb28854d879283f9e0f538525cb Mon Sep 17 00:00:00 2001 From: shechenglong Date: Wed, 27 Dec 2023 11:19:22 +0800 Subject: [PATCH] Fix Anaconda module startup upstream:https://github.com/rhinstaller/initial-setup/commit/5e3c55df519bc66ab9018bf23504ef3260560517 Signed-off-by: shechenglong --- Fix-Anaconda-module-startup.patch | 52 +++++++++++++++++++++++++++++++ initial-setup.spec | 6 +++- 2 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 Fix-Anaconda-module-startup.patch diff --git a/Fix-Anaconda-module-startup.patch b/Fix-Anaconda-module-startup.patch new file mode 100644 index 0000000..b4f8be9 --- /dev/null +++ b/Fix-Anaconda-module-startup.patch @@ -0,0 +1,52 @@ +From 5e3c55df519bc66ab9018bf23504ef3260560517 Mon Sep 17 00:00:00 2001 +From: Martin Kolman +Date: Mon, 2 Oct 2023 17:35:25 +0200 +Subject: [PATCH] Fix Anaconda module startup + +Adjust Initial Setup to properly use the new Anaconda config file keys +to configure which modules should be started and which not. + +This should also fix an issue on real world ARM hardware, where +Initial Setup in reconfig mode failed to start due to extra modules +being started unexpectedly. + +Resolves: rhbz#2241274 +--- + data/10-initial-setup.conf | 23 ++++++++++++++++------- + 1 file changed, 16 insertions(+), 7 deletions(-) + +diff --git a/data/10-initial-setup.conf b/data/10-initial-setup.conf +index f38cfd9..715c518 100644 +--- a/data/10-initial-setup.conf ++++ b/data/10-initial-setup.conf +@@ -4,14 +4,23 @@ + + [Anaconda] + # List of enabled kickstart modules. +-kickstart_modules = +- org.fedoraproject.Anaconda.Modules.Timezone +- org.fedoraproject.Anaconda.Modules.Network +- org.fedoraproject.Anaconda.Modules.Localization +- org.fedoraproject.Anaconda.Modules.Security +- org.fedoraproject.Anaconda.Modules.Users +- org.fedoraproject.Anaconda.Modules.Services ++activatable_modules = ++ org.fedoraproject.Anaconda.Modules.Timezone ++ org.fedoraproject.Anaconda.Modules.Network ++ org.fedoraproject.Anaconda.Modules.Localization ++ org.fedoraproject.Anaconda.Modules.Security ++ org.fedoraproject.Anaconda.Modules.Users ++ org.fedoraproject.Anaconda.Modules.Services + ++# Make sure modules that are not supported on installed ++# system are not run. ++forbidden_modules = ++ org.fedoraproject.Anaconda.Modules.Subscription ++ org.fedoraproject.Anaconda.Modules.Storage ++ org.fedoraproject.Anaconda.Modules.Payloads ++ ++optional_modules = ++ org.fedoraproject.Anaconda.Addons.* + + [Installation System] + # Type of the installation system. diff --git a/initial-setup.spec b/initial-setup.spec index 40e12c4..4f2f0e5 100644 --- a/initial-setup.spec +++ b/initial-setup.spec @@ -1,6 +1,6 @@ Name: initial-setup Version: 0.3.83 -Release: 7 +Release: 8 Summary: Initialize system configuration for a newly installed computer License: GPLv2+ URL: https://github.com/rhinstaller/initial-setup @@ -12,6 +12,7 @@ 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 Patch9006: Make-sure-the-output-from-custom_getpass-is-serializ.patch +Patch9007: Fix-Anaconda-module-startup.patch %define debug_package %{nil} @@ -69,6 +70,9 @@ rm -rf %{buildroot} %changelog +* Wed Dec 27 2023 shechenglong - 0.3.83-8 +- Fix Anaconda module startup + * Thu Jul 27 2023 shechenglong - 0.3.83-7 - Make sure the output from custom_getpass() is serialized after stdout -- Gitee