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

- DISABLE_RESTART_ON_UDPATE is no more read from the (build) environment

Browse Source 
%service_del_postun_without_restart is the interface that should be
  used by packages that need to prevent theirs services from being
  restarted.

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=42
This commit is contained in:
Franck Bui 2020-11-02 14:40:43 +00:00 committed by Git OBS Bridge
parent 4dd7db0039
commit 6873a04f30
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
macros.systemd
View File

@ -58,10 +58,14 @@ OrderWithRequires(postun): systemd \
%_restart_on_update_never() : # Restart of %{*} skipped %{nil}
%_restart_on_update() \
test -z "$DISABLE_RESTART_ON_UPDATE" -a -f /etc/sysconfig/services &&\\\
if [ -e /etc/sysconfig/services]; then \
DISABLE_RESTART_ON_UPDATE= \
. /etc/sysconfig/services \
test "$DISABLE_RESTART_ON_UPDATE" != yes -a "$DISABLE_RESTART_ON_UPDATE" != 1 &&\\\
/usr/bin/systemctl try-restart %{*} || : \
case "$DISABLE_RESTART_ON_UPDATE" in \
yes|1) ;; \
*) /usr/bin/systemctl try-restart %{*} || : \
esac \
fi \
%{nil}
%service_add_pre() \
@ -164,10 +168,9 @@ fi \
#
# Options used if not in an installation systems
# -f : force service restart on update
# -n : do not touch active service (deprecated)
# -n : do not touch active service (deprecated, replaced by %service_del_postun_without_restart)
#
# the default is to check for DISABLE_RESTART_ON_UPDATE environment
# variable if not found use the value read from /etc/sysconfig/services
# The default is to read DISABLE_RESTART_ON_UPDATE from /etc/sysconfig/services
#
%service_del_postun(fn) \
%service_del_postun_without_restart %{?*} \

9
systemd-rpm-macros.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Mon Nov 2 14:36:43 UTC 2020 - Franck Bui <fbui@suse.com>
- DISABLE_RESTART_ON_UDPATE is no more read from the (build) environment
%service_del_postun_without_restart is the interface that should be
used by packages that need to prevent theirs services from being
restarted.
-------------------------------------------------------------------
Fri Oct 30 17:37:54 UTC 2020 - Franck Bui <fbui@suse.com>