pool/systemd-rpm-macros
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- %service_del_preun doesn't accept -f/-n options anymore

Browse Source 
The few package calling %service_del_preun with '-f' or '-n' option
  have been fixed. These options are not needed anymore.

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=54
This commit is contained in:
Franck Bui 2020-11-23 17:29:55 +00:00 committed by Git OBS Bridge
parent 221719424c
commit 991b3b62db
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
macros.systemd
View File

@ -84,6 +84,7 @@ fi \
%{nil}
# On install, tell systemd to reload its unit files
#
%service_add_post() \
if [ -x /usr/bin/systemctl ]; then \
# FIXME: why is this needed ? \
@ -105,10 +106,7 @@ fi \
# On uninstall, disable and stop services
#
# Note: '-n' and '-f' options are still allowed to keep backward compatibility
# with SLE
#
%service_del_preun(fn) \
%service_del_preun() \
if [ $1 -eq 0 -a -x /usr/bin/systemctl ]; then \
# Package removal, not upgrade \
/usr/bin/systemctl --no-reload disable --now %{?*} || : \
@ -172,7 +170,7 @@ fi \
%systemd_user_post() %{expand:%systemd_post \\--global %%{?*}}
%systemd_preun(fn) \
%systemd_preun() \
if [ $1 -eq 0 -a -x /usr/bin/systemctl ]; then \
# Package removal, not upgrade \
/usr/bin/systemctl --no-reload disable --now %{?*} || : \

8
systemd-rpm-macros.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Nov 19 15:53:43 UTC 2020 - Franck Bui <fbui@suse.com>
- %service_del_preun doesn't accept -f/-n options anymore
The few package calling %service_del_preun with '-f' or '-n' option
have been fixed. These options are not needed anymore.
-------------------------------------------------------------------
Tue Nov 10 11:21:44 UTC 2020 - Franck Bui <fbui@suse.com>