From bb1da458e8dceb0b48bc8962c35122cd5b739baaa5aaf1a9c0cda1589b6a3cf6 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Thu, 27 Mar 2014 12:38:37 +0000 Subject: [PATCH] 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 --- macros.systemd | 4 +++- systemd-rpm-macros.changes | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/macros.systemd b/macros.systemd index 1a00395..d8746ee 100644 --- a/macros.systemd +++ b/macros.systemd @@ -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%.*} \ diff --git a/systemd-rpm-macros.changes b/systemd-rpm-macros.changes index 317e04e..477ab75 100644 --- a/systemd-rpm-macros.changes +++ b/systemd-rpm-macros.changes @@ -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