From 9122fac5108ce3e2fecce88fa57a2f5ad82ea063f6ee799c3cb5e467e7b1b65b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Schr=C3=B6der?= Date: Thu, 22 May 2014 14:41:57 +0000 Subject: [PATCH] - adapt restart_on_update and stop_on_removal to use systemctl [bnc#878255] OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=331 --- rpm-suse_macros | 4 ++-- rpm.changes | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/rpm-suse_macros b/rpm-suse_macros index 71296ef..4b0d795 100644 --- a/rpm-suse_macros +++ b/rpm-suse_macros @@ -31,7 +31,7 @@ if test "$YAST_IS_RUNNING" != "instsys" -a "$DISABLE_RESTART_ON_UPDATE" != yes ; then \ test -x /bin/systemctl && /bin/systemctl daemon-reload >/dev/null 2>&1 || : \ for service in %{?*} ; do \ - /etc/init.d/$service try-restart > /dev/null || : \ + test -x /bin/systemctl && /bin/systemctl try-restart $service >/dev/null 2>&1 || : \ done \ fi \ fi \ @@ -46,7 +46,7 @@ test -f /etc/sysconfig/services && . /etc/sysconfig/services \ if test "$YAST_IS_RUNNING" != "instsys" -a "$DISABLE_STOP_ON_REMOVAL" != yes ; then \ for service in %{?*} ; do \ - /etc/init.d/$service stop > /dev/null \ + test -x /bin/systemctl && /bin/systemctl stop $service >/dev/null 2>&1 || : \ done \ fi \ fi \ diff --git a/rpm.changes b/rpm.changes index 89fc8c4..d5aa483 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu May 22 16:40:35 CEST 2014 - mls@suse.de + +- adapt restart_on_update and stop_on_removal to use + systemctl [bnc#878255] + ------------------------------------------------------------------- Fri May 9 13:33:09 CEST 2014 - mls@suse.de