From bfeaf3ce4bd3dafdfddb6327e2650b4c4b2960d9 Mon Sep 17 00:00:00 2001 From: Jan Macku Date: Mon, 26 Feb 2024 08:28:57 +0100 Subject: [PATCH] systemd-252-29 Resolves: RHEL-16952 --- ...n-Condition-in-systemd-boot-system-t.patch | 31 +++++++++++++++++++ systemd.spec | 6 +++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 0703-units-fix-typo-in-Condition-in-systemd-boot-system-t.patch diff --git a/0703-units-fix-typo-in-Condition-in-systemd-boot-system-t.patch b/0703-units-fix-typo-in-Condition-in-systemd-boot-system-t.patch new file mode 100644 index 0000000..f061591 --- /dev/null +++ b/0703-units-fix-typo-in-Condition-in-systemd-boot-system-t.patch @@ -0,0 +1,31 @@ +From 1db73293a8a69372a0cc020855f2402ab49600dd Mon Sep 17 00:00:00 2001 +From: Luca Boccassi +Date: Thu, 24 Nov 2022 10:01:59 +0000 +Subject: [PATCH] units: fix typo in Condition in systemd-boot-system-token + +/lib/systemd/system/systemd-boot-system-token.service:20: Unknown key name 'ConditionPathExists|' in section 'Unit', ignoring + +Follow-up for 0a1d8ac77a21ae0741bdf4af08f3a71354805ff1 + +(cherry picked from commit 0f6d54ca47662f1386ada65ed179a1afd6e727e4) + +Related: RHEL-16952 +--- + units/systemd-boot-system-token.service | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/units/systemd-boot-system-token.service b/units/systemd-boot-system-token.service +index 63e523bb3e..ef5577549e 100644 +--- a/units/systemd-boot-system-token.service ++++ b/units/systemd-boot-system-token.service +@@ -17,8 +17,8 @@ Conflicts=shutdown.target initrd-switch-root.target + Before=shutdown.target initrd-switch-root.target + + # Only run this if the boot loader can support random seed initialization. +-ConditionPathExists|=/sys/firmware/efi/efivars/LoaderFeatures-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f +-ConditionPathExists|=/sys/firmware/efi/efivars/StubFeatures-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f ++ConditionPathExists=|/sys/firmware/efi/efivars/LoaderFeatures-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f ++ConditionPathExists=|/sys/firmware/efi/efivars/StubFeatures-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f + + # Only run this if there is no system token defined yet + ConditionPathExists=!/sys/firmware/efi/efivars/LoaderSystemToken-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f diff --git a/systemd.spec b/systemd.spec index 0e91ee6..ac21760 100644 --- a/systemd.spec +++ b/systemd.spec @@ -21,7 +21,7 @@ Name: systemd Url: https://systemd.io Version: 252 -Release: 28%{?dist} +Release: 29%{?dist} # For a breakdown of the licensing, see README License: LGPLv2+ and MIT and GPLv2+ Summary: System and Service Manager @@ -785,6 +785,7 @@ Patch0699: 0699-ukify-use-empty-stub-for-addons.patch Patch0700: 0700-stub-allow-loading-and-verifying-cmdline-addons.patch Patch0701: 0701-TODO-remove-fixed-item.patch Patch0702: 0702-fix-do-not-check-verify-slice-units-if-recursive-err.patch +Patch0703: 0703-units-fix-typo-in-Condition-in-systemd-boot-system-t.patch # Downstream-only patches (9000–9999) @@ -1650,6 +1651,9 @@ systemd-hwdb update &>/dev/null || : %{_prefix}/lib/dracut/modules.d/70rhel-net-naming-sysattrs/* %changelog +* Mon Feb 26 2024 systemd maintenance team - 252-29 +- units: fix typo in Condition in systemd-boot-system-token (RHEL-16952) + * Tue Feb 20 2024 systemd maintenance team - 252-28 - random-seed: shorten a bit may_credit() (RHEL-16952) - random-seed: make one more use of random_write_entropy() (RHEL-16952)