Attachment 667293 Details for Bug 968405

[patch] Full patch for macros.systemd

macros.systemd.patch (text/plain), 3.41 KB, created by Egbert Eich on 2016-03-01 12:14:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Egbert Eich

Created: 2016-03-01 12:14:43 UTC

Size: 3.41 KB

patch

obsolete

>>Index: macros.systemd
>===================================================================
>--- macros.systemd	(revision 1)
>+++ macros.systemd	(working copy)
>@@ -51,17 +51,41 @@
> %_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					\
>+%if 0%{!?2:1}										\
>+        test "$DISABLE_RESTART_ON_UPDATE" = yes -o					\
>+             "$DISABLE_RESTART_ON_UPDATE" = 1  && exit 0				\
>+%endif 											\
>+%if "%{?2}%{!?2:default}" == "default"							\
>+        if [ -f /etc/sysconfig/services ]; then						\
>+               . /etc/sysconfig/services						\
>+               test "$DISABLE_RESTART_ON_UPDATE" = yes -o				\
>+                    "$DISABLE_RESTART_ON_UPDATE" = 1 && exit 0				\
>+        fi										\
>+%else											\
>+%if "%{2}" == "no_restart"								\
>+        exit 0 ;;                                                			\
>+%endif 											\
>+%endif 											\
>+        /usr/bin/systemctl try-restart %{1} %{nil}
>+
>+%_stop_check_systemctl									\
> 	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					\
>+%if 0%{!?2:1}										\
>+        test "$DISABLE_STOP_ON_REMOVAL" = yes -o					\
>+             "$DISABLE_STOP_ON_REMOVAL" = 1  && exit 0					\
>+%endif 											\
>+%if "%{?2}%{!?2:default}" == "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_stop"									\
>+        exit 0 ;;                                                			\
>+%endif 											\
>+%endif 											\
> 	/usr/bin/systemctl stop %{nil}
> 
> %service_add_pre()									\
>@@ -135,7 +159,7 @@
> if [ "$FIRST_ARG" -eq 0 -a -x /usr/bin/systemctl ]; then				\
> 	# Package removal, not upgrade							\
> 	/usr/bin/systemctl --no-reload disable %{?*} || :				\
>-	( %_stop_check_systemctl %{?*} || : )						\
>+	( %_stop_check_systemctl || : )							\
> fi											\
> %{nil}
> 
>@@ -146,7 +170,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							\
>@@ -163,7 +187,7 @@
> if [ "$1" -eq 0 -a -x /usr/bin/systemctl ]; then					\
> 	# Package removal, not upgrade							\
> 	/usr/bin/systemctl --no-reload disable %{?*} || :				\
>-	( %_stop_check_systemctl %{?*} || : )						\
>+	( %_stop_check_systemctl || : )							\
> fi											\
> %{nil}
> 
>@@ -173,7 +197,7 @@
> if [ "$1" -eq 0 -a -x /usr/bin/systemctl ]; then					\
> 	# Package removal, not upgrade							\
> 	/usr/bin/systemctl --no-reload disable %{?*} || :				\
>-	( %_stop_check_systemctl %{?*} || : )						\
>+	( %_stop_check_systemctl || : )							\
> fi											\
> %{nil}
>

Actions: View | Diff

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