From 0f71fde6752462413a6eff7c20c6700f5d9f1b333f6a3a8f3ebef5ff6819a26c Mon Sep 17 00:00:00 2001 From: Johannes Segitz Date: Mon, 19 Jun 2023 13:03:53 +0000 Subject: [PATCH 1/2] Accepting request 1093778 from home:kukuk:branches:Base:System - Don't call systemctl list-unit-files with an empty argument, this will break enabling of system unit files [bsc#1212496] OBS-URL: https://build.opensuse.org/request/show/1093778 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-presets-common-SUSE?expand=0&rev=60 --- branding-preset-states | 2 +- systemd-presets-common-SUSE.changes | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/branding-preset-states b/branding-preset-states index d5499d6..865da64 100644 --- a/branding-preset-states +++ b/branding-preset-states @@ -69,7 +69,7 @@ apply_preset_state_changes () { exec 3<&- done if test -x /usr/bin/systemctl ; then - /usr/bin/systemctl list-unit-files "$GLOBAL" + /usr/bin/systemctl list-unit-files $GLOBAL fi >systemd_preset-states.rpm-tmp exec 3 + +- Don't call systemctl list-unit-files with an empty argument, + this will break enabling of system unit files [bsc#1212496] + ------------------------------------------------------------------- Fri Jun 9 14:22:41 UTC 2023 - Thorsten Kukuk From dbbe1ac7c83d10e638e1c8a93aeb1bbf2926ba3279e13220c07a2a98f95f1518 Mon Sep 17 00:00:00 2001 From: Johannes Segitz Date: Tue, 20 Jun 2023 09:38:41 +0000 Subject: [PATCH 2/2] Accepting request 1093930 from home:alarrosa:branches:Base:System - Fix another case of systemctl being called with an empty argument. This if a preemptive fix for a similar issue to bsc#1212496. OBS-URL: https://build.opensuse.org/request/show/1093930 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-presets-common-SUSE?expand=0&rev=61 --- branding-preset-states | 2 +- systemd-presets-common-SUSE.changes | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/branding-preset-states b/branding-preset-states index 865da64..3a8f04a 100644 --- a/branding-preset-states +++ b/branding-preset-states @@ -99,7 +99,7 @@ apply_preset_state_changes () { fi if test "$ENABLE_OLD" != "$ENABLE_NEW" ; then echo "Resetting $SERVICE to the new default: $ENABLE_NEW" - /usr/bin/systemctl preset "$GLOBAL" "$SERVICE" || : + /usr/bin/systemctl preset $GLOBAL "$SERVICE" || : fi done exec 3<&- diff --git a/systemd-presets-common-SUSE.changes b/systemd-presets-common-SUSE.changes index 110fd2e..956e1ef 100644 --- a/systemd-presets-common-SUSE.changes +++ b/systemd-presets-common-SUSE.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jun 20 08:42:27 UTC 2023 - Antonio Larrosa + +- Fix another case of systemctl being called with an empty + argument. This if a preemptive fix for a similar issue to + bsc#1212496. + ------------------------------------------------------------------- Mon Jun 19 12:48:36 UTC 2023 - Thorsten Kukuk