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
This commit is contained in:
parent
7f0c965653
commit
1e5f5bfc47
@ -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<systemd_preset-states.rpm-tmp
|
||||
read -u3 PAD
|
||||
@ -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 "$SERVICE" || :
|
||||
/usr/bin/systemctl preset "$GLOBAL" "$SERVICE" || :
|
||||
fi
|
||||
done
|
||||
exec 3<&-
|
||||
@ -107,7 +107,13 @@ apply_preset_state_changes () {
|
||||
}
|
||||
|
||||
|
||||
cd /usr/lib/systemd/system-preset
|
||||
if test "$2" == "user" ; then
|
||||
cd /usr/lib/systemd/user-preset
|
||||
GLOBAL="--global"
|
||||
else
|
||||
cd /usr/lib/systemd/system-preset
|
||||
GLOBAL=""
|
||||
fi
|
||||
|
||||
case $1 in
|
||||
apply-changes)
|
||||
|
@ -1,3 +1,12 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 14 09:25:09 UTC 2022 - Antonio Larrosa <alarrosa@suse.com>
|
||||
|
||||
- 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 <songchuan.kang@suse.com>
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user