Accepting request 227735 from home:fcrozat:branches:Base:System

- Add support to not restart services if running in YaST2 or
  if DISABLE_RESTART_ON_UPDATE is set to yes [bnc#858429]

OBS-URL: https://build.opensuse.org/request/show/227735
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=3
This commit is contained in:
Dr. Werner Fink 2014-03-27 12:38:37 +00:00 committed by Git OBS Bridge
parent e12a204700
commit 8a679bc650
3 changed files with 9 additions and 2 deletions

View File

@ -106,7 +106,9 @@ fi \
test -n "$FIRST_ARG" || FIRST_ARG=$1 \
if [ $FIRST_ARG -ge 1 ]; then \
# Package upgrade, not uninstall \
/usr/bin/systemctl try-restart %{?*} >/dev/null 2>&1 || : \
if test "$YAST_IS_RUNNING" != "instsys" -a "$DISABLE_RESTART_ON_UPDATE" != yes ; then \
/usr/bin/systemctl try-restart %{?*} >/dev/null 2>&1 || : \
fi \
else # package uninstall \
for service in %{?*} ; do \
sysv_service=${service%.*} \

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Mar 27 12:22:11 UTC 2014 - fcrozat@suse.com
- Add support to not restart services if running in YaST2 or
if DISABLE_RESTART_ON_UPDATE is set to yes [bnc#858429]
-------------------------------------------------------------------
Fri Feb 28 10:10:24 UTC 2014 - werner@suse.de

View File

@ -26,7 +26,6 @@ License: LGPL-2.1+
Group: System/Base
Url: http://en.opensuse.org/openSUSE:Systemd_packaging_guidelines
Source0: macros.systemd
Requires: coreutils
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch