Attachment 667084 Details for Bug 968405

[patch] Fix.

macros.systemd.patch (text/plain), 1.16 KB, created by Egbert Eich on 2016-02-28 09:55:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Egbert Eich

Created: 2016-02-28 09:55:41 UTC

Size: 1.16 KB

patch

obsolete

>Fix regression from fix for bsc#955996
>
>Check for spec-file provided setting of DISABLE_RESTART_ON_UPDATE
>and DISABLE_STOP_ON_REMOVAL before checking for the system wide
>default (boo#968405).
>---
>Index: macros.systemd
>===================================================================
>--- macros.systemd (revision 1)
>+++ macros.systemd (revision 2)
>@@ -51,15 +51,17 @@
> %_binfmtdir /usr/lib/binfmt.d
> 
> %_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				\
>+	test -f /etc/sysconfig/services && . /etc/sysconfig/services			\
>+	test "$DISABLE_RESTART_ON_UPDATE" = yes && exit 0				\
> 	/usr/bin/systemctl try-restart %{nil}
> 
> %_stop_check_systemctl									\
>-	test -f /etc/sysconfig/services && . /etc/sysconfig/services			\
> 	test "$YAST_IS_RUNNING" = instsys     && exit 0					\
> 	test "$DISABLE_STOP_ON_REMOVAL" = yes && exit 0					\
>+	test -f /etc/sysconfig/services && . /etc/sysconfig/services			\
>+	test "$DISABLE_STOP_ON_REMOVAL" = yes && 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