3
0

- Fix %systemd_post(): it's never called during package removal

Also make it useful by restoring its original implementation.

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=28
This commit is contained in:
Franck Bui 2018-02-14 14:07:02 +00:00 committed by Git OBS Bridge
parent 1f25658464
commit 3adc1714da
2 changed files with 11 additions and 12 deletions

View File

@ -192,18 +192,10 @@ else # package uninstall \
fi \
%{nil}
#
# Options used if not in an installation systems
# -f that is fore service stop in removal
# -n that do not touch active service
# the default is to check for DISABLE_STOP_ON_REMOVAL environment
# variable if not found use the value read from /etc/sysconfig/services
#
%systemd_post(fn) \
if [ "$1" -eq 0 -a -x /usr/bin/systemctl ]; then \
# Package removal, not upgrade \
/usr/bin/systemctl --no-reload disable %{?*} || : \
%{expand:%%_stop_on_removal%{-f:_force}%{!-f:%{-n:_never}} %{?*}} \
%systemd_post() \
if [ $1 -eq 1 -a -x /usr/bin/systemctl ] ; then \
# Initial installation \
/usr/bin/systemctl --no-reload preset %{?*} || : \
fi \
%{nil}

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Feb 14 14:04:19 UTC 2018 - fbui@suse.com
- Fix %systemd_post(): it's never called during package removal
Also make it useful by restoring its original implementation.
-------------------------------------------------------------------
Mon Feb 12 16:56:37 UTC 2018 - fbui@suse.com