Attachment 667154 Details for Bug 968405

[patch] Fix using a macro argument while retaining the old semantics.

macros.systemd.patch (text/plain), 1.60 KB, created by Egbert Eich on 2016-02-29 13:55:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Egbert Eich

Created: 2016-02-29 13:55:30 UTC

Size: 1.60 KB

patch

obsolete

>Index: macros.systemd
>===================================================================
>--- macros.systemd	(revision 1)
>+++ macros.systemd	(working copy)
>@@ -51,15 +51,31 @@
> %_binfmtdir /usr/lib/binfmt.d
> 
> %_restart_check_systemctl								\
>+	package_disable_on_update=%{?1}							\
>+	test "$YAST_IS_RUNNING" = instsys       && exit 0				\
>+	if [ -z "$package_disable_on_update" ]; then					\
>+		test "$DISABLE_RESTART_ON_UPDATE" = yes ||				\
>+		test "$DISABLE_RESTART_ON_UPDATE" = 1 && exit 0				\
>+	else										\
>+		test "$package_disable_on_update" = 1 && exit 0				\
>+	fi										\
> 	test -f /etc/sysconfig/services && . /etc/sysconfig/services			\
>-	test "$YAST_IS_RUNNING" = instsys       && exit 0				\
>-	test "$DISABLE_RESTART_ON_UPDATE" = yes && exit 0				\
>+	test "$DISABLE_RESTART_ON_UPDATE" = yes ||					\
>+	test "$DISABLE_RESTART_ON_UPDATE" = 1 && exit 0					\
> 	/usr/bin/systemctl try-restart %{nil}
> 
> %_stop_check_systemctl									\
>+	package_stop_on_removal=%{?1}							\
>+	test "$YAST_IS_RUNNING" = instsys     && exit 0					\
>+	if [ -z "$package_stop_on_removal" ]; then					\
>+		test "$DISABLE_STOP_ON_REMOVAL" = yes ||				\
>+		test "$DISABLE_STOP_ON_REMOVAL" = 1 && exit 0				\
>+	else										\
>+		test $package_stop_on_removal = 1 && exit 0				\
>+	fi										\
> 	test -f /etc/sysconfig/services && . /etc/sysconfig/services			\
>-	test "$YAST_IS_RUNNING" = instsys     && exit 0					\
>-	test "$DISABLE_STOP_ON_REMOVAL" = yes && exit 0					\
>+	test "$DISABLE_STOP_ON_REMOVAL" = yes ||					\
>+	test "$DISABLE_STOP_ON_REMOVAL" = 1 && exit 0					\
> 	/usr/bin/systemctl stop %{nil}
> 
> %service_add_pre()									\

Actions: View | Diff

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