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

- Drop $YAST_IS_RUNNING in favor of $SYSTEMD_OFFLINE (bsc#1117489)

Browse Source 
libzypp now kindly defines SYSTEMD_OFFLINE when appropriate (see
  bsc#1118758). Therefore we don't need to rely on YAST_IS_RUNNING
  anymore. It's a tiny step to make the SUSE macros closer to their
  upstream counterparts.

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=31
This commit is contained in:
Franck Bui 2019-02-21 18:00:10 +00:00 committed by Git OBS Bridge
parent 1137f6cb2b
commit c541c9ec39
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
macros.systemd
View File

@ -51,12 +51,10 @@ OrderWithRequires(postun): systemd \
%{nil}
%_restart_on_update_force() (\
test "$YAST_IS_RUNNING" = instsys && exit 0 \
%{?*:/usr/bin/systemctl try-restart %{*}} \
) || : %{nil}
%_restart_on_update_never() %{?*:# Restart of %{*} skipped} %{nil}
%_restart_on_update() (\
test "$YAST_IS_RUNNING" = instsys && exit 0\
test -f /etc/sysconfig/services -a \\\
-z "$DISABLE_RESTART_ON_UPDATE" && . /etc/sysconfig/services\
test "$DISABLE_RESTART_ON_UPDATE" = yes -o \\\
@ -65,12 +63,10 @@ OrderWithRequires(postun): systemd \
) || : %{nil}
%_stop_on_removal_force() ( \
test "$YAST_IS_RUNNING" = instsys && exit 0\
%{?*:/usr/bin/systemctl stop %{*}}\
) || : %{nil}
%_stop_on_removal_never() %{?*:# Stop of %{*} skipped} %{nil}
%_stop_on_removal() (\
test "$YAST_IS_RUNNING" = instsys && exit 0\
test -f /etc/sysconfig/services -a \\\
-z "$DISABLE_STOP_ON_REMOVAL" && . /etc/sysconfig/services\
test "$DISABLE_STOP_ON_REMOVAL" = yes -o \\\
@ -115,9 +111,6 @@ fi \
test -n "$FIRST_ARG" || FIRST_ARG="$1" \
[ -d /var/lib/systemd/migrated ] || mkdir -p /var/lib/systemd/migrated || : \
\
if [ "$YAST_IS_RUNNING" != "instsys" -a -x /usr/bin/systemctl ]; then \
/usr/bin/systemctl daemon-reload || : \
fi \
if [ "$FIRST_ARG" -eq 1 ]; then \
if [ -x /usr/bin/systemctl ]; then \
/usr/bin/systemctl preset %{?*} || : \

10
systemd-rpm-macros.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Thu Feb 21 17:53:18 UTC 2019 - Franck Bui <fbui@suse.com>
- Drop $YAST_IS_RUNNING in favor of $SYSTEMD_OFFLINE (bsc#1117489)
libzypp now kindly defines SYSTEMD_OFFLINE when appropriate (see
bsc#1118758). Therefore we don't need to rely on YAST_IS_RUNNING
anymore. It's a tiny step to make the SUSE macros closer to their
upstream counterparts.
-------------------------------------------------------------------
Fri Nov 23 12:08:30 UTC 2018 - Franck Bui <fbui@suse.com>

2
systemd-rpm-macros.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package systemd-rpm-macros
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed