From 0c547805c3a6572d6995b4a6cec5e122adcb083cedbb2a235d288b183c48afdb Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 22 Jun 2022 09:47:59 +0000 Subject: [PATCH] Accepting request 982585 from home:alarrosa:branches:Base:System - Modify branding-preset-states to fix systemd-presets-common-SUSE not enabling new user systemd service preset configuration just as it handles system service presets. By passing an (optional) second parameter "user", the save/apply-changes commands now work with user services instead of system ones (boo#1200485) OBS-URL: https://build.opensuse.org/request/show/982585 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-presets-common-SUSE?expand=0&rev=47 --- branding-preset-states | 12 +++++++++--- systemd-presets-common-SUSE.changes | 9 +++++++++ systemd-presets-common-SUSE.spec | 4 +++- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/branding-preset-states b/branding-preset-states index a593de1..d5499d6 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 + /usr/bin/systemctl list-unit-files "$GLOBAL" fi >systemd_preset-states.rpm-tmp exec 3 + +- Modify branding-preset-states to fix systemd-presets-common-SUSE + not enabling new user systemd service preset configuration just + as it handles system service presets. By passing an (optional) + second parameter "user", the save/apply-changes commands now + work with user services instead of system ones (boo#1200485) + ------------------------------------------------------------------- Mon Apr 11 07:45:59 UTC 2022 - Jonathan Kang diff --git a/systemd-presets-common-SUSE.spec b/systemd-presets-common-SUSE.spec index 01a7a14..5ad62fa 100644 --- a/systemd-presets-common-SUSE.spec +++ b/systemd-presets-common-SUSE.spec @@ -1,7 +1,7 @@ # # spec file for package systemd-presets-common-SUSE # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -68,6 +68,7 @@ if [ $1 -gt 1 -a -x %{_prefix}/lib/%{generic_name}/branding-preset-states ] ; th # Note: the old version of the script is used here. # %{_prefix}/lib/%{generic_name}/branding-preset-states save + %{_prefix}/lib/%{generic_name}/branding-preset-states save user elif [ $1 -eq 1 ]; then touch /run/rpm-%{name}-preset-all fi @@ -79,6 +80,7 @@ if [ $1 -gt 1 ] ; then # that have been changed and apply "systemct preset" on them. # %{_prefix}/lib/%{generic_name}/branding-preset-states apply-changes + %{_prefix}/lib/%{generic_name}/branding-preset-states apply-changes user fi %posttrans