From 34f074503f4f9dff3c90e1a0f6ba7c536386e47734e5419c703d638036cdb3e2 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 29 Feb 2016 07:00:30 +0000 Subject: [PATCH] Accepting request 362153 from home:dimstar:Factory - Also honor DISABLE_STOP_ON_REMOVAL and DISABLE_RESTART_ON_UPDATE when specified by a package directly in the .spec file. Some package know that a restart of their service is fatal (boo#968405). OBS-URL: https://build.opensuse.org/request/show/362153 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=13 --- macros.systemd | 2 ++ systemd-rpm-macros.changes | 8 ++++++++ systemd-rpm-macros.spec | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/macros.systemd b/macros.systemd index eca50af..4e9dca2 100644 --- a/macros.systemd +++ b/macros.systemd @@ -51,12 +51,14 @@ Requires(postun): systemd \ %_binfmtdir /usr/lib/binfmt.d %_restart_check_systemctl \ + test "$DISABLE_RESTART_ON_UPDATE" = yes && exit 0 \ test -f /etc/sysconfig/services && . /etc/sysconfig/services \ test "$YAST_IS_RUNNING" = instsys && exit 0 \ test "$DISABLE_RESTART_ON_UPDATE" = yes && exit 0 \ /usr/bin/systemctl try-restart %{nil} %_stop_check_systemctl \ + test "$DISABLE_STOP_ON_REMOVAL" = yes && exit 0 \ test -f /etc/sysconfig/services && . /etc/sysconfig/services \ test "$YAST_IS_RUNNING" = instsys && exit 0 \ test "$DISABLE_STOP_ON_REMOVAL" = yes && exit 0 \ diff --git a/systemd-rpm-macros.changes b/systemd-rpm-macros.changes index 89bf7fa..cc55a14 100644 --- a/systemd-rpm-macros.changes +++ b/systemd-rpm-macros.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Feb 27 10:18:55 UTC 2016 - dimstar@opensuse.org + +- Also honor DISABLE_STOP_ON_REMOVAL and DISABLE_RESTART_ON_UPDATE + when specified by a package directly in the .spec file. Some + package know that a restart of their service is fatal + (boo#968405). + ------------------------------------------------------------------- Fri Nov 20 16:53:23 UTC 2015 - werner@suse.de diff --git a/systemd-rpm-macros.spec b/systemd-rpm-macros.spec index 6e75ddb..293148d 100644 --- a/systemd-rpm-macros.spec +++ b/systemd-rpm-macros.spec @@ -1,7 +1,7 @@ # # spec file for package systemd-rpm-macros # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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