- %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. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=54
This commit is contained in:
parent
221719424c
commit
991b3b62db
@ -84,6 +84,7 @@ fi \
|
|||||||
%{nil}
|
%{nil}
|
||||||
|
|
||||||
# On install, tell systemd to reload its unit files
|
# On install, tell systemd to reload its unit files
|
||||||
|
#
|
||||||
%service_add_post() \
|
%service_add_post() \
|
||||||
if [ -x /usr/bin/systemctl ]; then \
|
if [ -x /usr/bin/systemctl ]; then \
|
||||||
# FIXME: why is this needed ? \
|
# FIXME: why is this needed ? \
|
||||||
@ -105,10 +106,7 @@ fi \
|
|||||||
|
|
||||||
# On uninstall, disable and stop services
|
# On uninstall, disable and stop services
|
||||||
#
|
#
|
||||||
# Note: '-n' and '-f' options are still allowed to keep backward compatibility
|
%service_del_preun() \
|
||||||
# with SLE
|
|
||||||
#
|
|
||||||
%service_del_preun(fn) \
|
|
||||||
if [ $1 -eq 0 -a -x /usr/bin/systemctl ]; then \
|
if [ $1 -eq 0 -a -x /usr/bin/systemctl ]; then \
|
||||||
# Package removal, not upgrade \
|
# Package removal, not upgrade \
|
||||||
/usr/bin/systemctl --no-reload disable --now %{?*} || : \
|
/usr/bin/systemctl --no-reload disable --now %{?*} || : \
|
||||||
@ -172,7 +170,7 @@ fi \
|
|||||||
|
|
||||||
%systemd_user_post() %{expand:%systemd_post \\--global %%{?*}}
|
%systemd_user_post() %{expand:%systemd_post \\--global %%{?*}}
|
||||||
|
|
||||||
%systemd_preun(fn) \
|
%systemd_preun() \
|
||||||
if [ $1 -eq 0 -a -x /usr/bin/systemctl ]; then \
|
if [ $1 -eq 0 -a -x /usr/bin/systemctl ]; then \
|
||||||
# Package removal, not upgrade \
|
# Package removal, not upgrade \
|
||||||
/usr/bin/systemctl --no-reload disable --now %{?*} || : \
|
/usr/bin/systemctl --no-reload disable --now %{?*} || : \
|
||||||
|
@ -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>
|
Tue Nov 10 11:21:44 UTC 2020 - Franck Bui <fbui@suse.com>
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user