From 280201b185ec2f09e22775d532b2088689f1712d Mon Sep 17 00:00:00 2001 From: shechenglong Date: Wed, 27 Dec 2023 17:00:29 +0800 Subject: [PATCH] Adjust to logging command changes in Anaconda (#1891621) Signed-off-by: shechenglong --- ...-logging-command-changes-in-Anaconda.patch | 26 +++++++++++++++++++ initial-setup.spec | 6 ++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 Adjust-to-logging-command-changes-in-Anaconda.patch diff --git a/Adjust-to-logging-command-changes-in-Anaconda.patch b/Adjust-to-logging-command-changes-in-Anaconda.patch new file mode 100644 index 0000000..b63fb5f --- /dev/null +++ b/Adjust-to-logging-command-changes-in-Anaconda.patch @@ -0,0 +1,26 @@ +From 4baedc326ae1e42ba2fb97772e970a696ca9caad Mon Sep 17 00:00:00 2001 +From: Martin Kolman +Date: Tue, 27 Oct 2020 17:37:50 +0100 +Subject: [PATCH] Adjust to logging command changes in Anaconda (#1891621) + +The logic for the logging command changed in Anaconda and we need to +adjust accordingly. As we don't really need to handle the logging +command, we can do this by just dropping it from the list. + +Resolves: rhbz#1891621 +--- + initial_setup/__init__.py | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/initial_setup/__init__.py b/initial_setup/__init__.py +index a418cbe..80b3a93 100644 +--- a/initial_setup/__init__.py ++++ b/initial_setup/__init__.py +@@ -34,7 +34,6 @@ class InitialSetupError(Exception): + "lang", + "rootpw", + "timezone", +- "logging", + "selinux", + "firewall"] + \ No newline at end of file diff --git a/initial-setup.spec b/initial-setup.spec index f622ea0..0e52156 100644 --- a/initial-setup.spec +++ b/initial-setup.spec @@ -1,11 +1,12 @@ Name: initial-setup Version: 0.3.83 -Release: 2 +Release: 3 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 Patch9001: initial-setup-add-support-openeuler.patch +Patch9002: Adjust-to-logging-command-changes-in-Anaconda.patch %define debug_package %{nil} @@ -62,6 +63,9 @@ rm -rf %{buildroot} %config %{_sysconfdir}/%{name}/conf.d/* %changelog +* Wed Dec 27 2023 shechenglong - 0.3.83-3 +- Adjust to logging command changes in Anaconda (#1891621) + * Tue Dec 14 2021 wangkai - 0.3.83-2 - Remove old failing pre scriptlet -- Gitee