Attachment 667148 Details for Bug 968405

Small chnage which adds a rpm macro option as well as makes

x (text/plain), 2.16 KB, created by Dr. Werner Fink on 2016-02-29 13:21:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dr. Werner Fink

Created: 2016-02-29 13:21:51 UTC

Size: 2.16 KB

patch

obsolete

>Index: macros.systemd
>===================================================================
>--- macros.systemd	(revision 13)
>+++ macros.systemd	(working copy)
>@@ -51,14 +51,14 @@
> %_binfmtdir /usr/lib/binfmt.d
> 
> %_restart_check_systemctl								\
>-	test "$DISABLE_RESTART_ON_UPDATE" = yes && exit 0				\
>+	test "$DISABLE_RESTART_ON_UPDATE" != no && 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 "$DISABLE_STOP_ON_REMOVAL" != no && 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					\
>@@ -130,7 +130,8 @@
> %{nil}
> 
> # On uninstall, disable and stop services
>-%service_del_preun()									\
>+%service_del_preun(d)									\
>+%{-d:DISABLE_STOP_ON_REMOVAL=yes}							\
> test -n "$FIRST_ARG" || FIRST_ARG="$1"							\
> if [ "$FIRST_ARG" -eq 0 -a -x /usr/bin/systemctl ]; then				\
> 	# Package removal, not upgrade							\
>@@ -140,7 +141,8 @@
> %{nil}
> 
> # On uninstall, tell systemd to reload its unit files
>-%service_del_postun()									\
>+%service_del_postun(d)									\
>+%{-d:DISABLE_RESTART_ON_UPDATE=yes}							\
> test -n "$FIRST_ARG" || FIRST_ARG="$1"							\
> if [ "$FIRST_ARG" -ge 1 ]; then								\
> 	# Package upgrade, not uninstall						\
>@@ -159,7 +161,8 @@
> fi											\
> %{nil}
> 
>-%systemd_post()										\
>+%systemd_post(d)										\
>+%{-d:DISABLE_STOP_ON_REMOVAL=yes}							\
> if [ "$1" -eq 0 -a -x /usr/bin/systemctl ]; then					\
> 	# Package removal, not upgrade							\
> 	/usr/bin/systemctl --no-reload disable %{?*} || :				\
>@@ -169,7 +172,8 @@
> 
> %systemd_user_post() %systemd_post --user --global %{?*}
> 
>-%systemd_preun()									\
>+%systemd_preun(d)									\
>+%{-d:DISABLE_STOP_ON_REMOVAL=yes}							\
> if [ "$1" -eq 0 -a -x /usr/bin/systemctl ]; then					\
> 	# Package removal, not upgrade							\
> 	/usr/bin/systemctl --no-reload disable %{?*} || :				\
>

Actions: View

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