Attachment 667263 Details for Bug 968405

[patch] Patch for %_restart_check_systemctl using macro argument

macros.systemd.patch (text/plain), 1.77 KB, created by Egbert Eich on 2016-03-01 09:08:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Egbert Eich

Created: 2016-03-01 09:08:59 UTC

Size: 1.77 KB

patch

obsolete

>--- ../macros.systemd.orig	2016-01-18 00:27:27.000000000 +0100
>+++ macros.systemd	2016-03-01 10:04:35.842980256 +0100
>@@ -50,11 +50,28 @@
> %_ntpunitsdir /usr/lib/systemd/ntp-units.d
> %_binfmtdir /usr/lib/binfmt.d
> 
>+%do_restart_on_update do_restart
>+%no_restart_on_update no_restart
>+%restart_on_update_default restart_default
>+
> %_restart_check_systemctl								\
>-	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}
>+        test "$YAST_IS_RUNNING" = instsys && exit 0					\
>+%if 0%{!?2:1}										\
>+        test "$DISABLE_STOP_ON_REMOVAL" = yes -o					\
>+             "$DISABLE_STOP_ON_REMOVAL" = 1  && exit 0					\
>+%endif 											\
>+%if "%{?2}%{!?2:%restart_on_update_default}" == "%restart_on_update_default" 		\
>+        if [ -f /etc/sysconfig/services ]; then						\
>+               . /etc/sysconfig/services						\
>+               test "$DISABLE_STOP_ON_REMOVAL" = yes -o					\
>+                    "$DISABLE_STOP_ON_REMOVAL" = 1 && exit 0				\
>+        fi										\
>+%else											\
>+%if "%{2}" == %no_restart_on_update							\
>+        exit 0 ;;                                                			\
>+%endif 											\
>+%endif 											\
>+        /usr/bin/systemctl try-restart %{1} %{nil}
> 
> %_stop_check_systemctl									\
> 	test -f /etc/sysconfig/services && . /etc/sysconfig/services			\
>@@ -144,7 +161,7 @@
> 	# Package upgrade, not uninstall						\
> 	if [ -x /usr/bin/systemctl ]; then						\
> 		/usr/bin/systemctl daemon-reload || :					\
>-		( %_restart_check_systemctl %{?*} || : )				\
>+		( %_restart_check_systemctl  || : )				\
> 	fi										\
> else # package uninstall								\
> 	for service in %{?*} ; do							\

Actions: View | Diff

Attachments on bug 968405: 667084 | 667148 | 667154 | 667263 | 667293 | 667365 | 667474 | 667586