Attachment 667365 Details for Bug 968405

[patch] Yet an other change

x (text/plain), 3.24 KB, created by Dr. Werner Fink on 2016-03-01 18:24:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dr. Werner Fink

Created: 2016-03-01 18:24:43 UTC

Size: 3.24 KB

patch

obsolete

>Index: macros.systemd
>===================================================================
>--- macros.systemd	(revision 13)
>+++ macros.systemd	(working copy)
>@@ -50,18 +50,37 @@
> %_ntpunitsdir /usr/lib/systemd/ntp-units.d
> %_binfmtdir /usr/lib/binfmt.d
> 
>+%restart_on_update default
>+%stop_on_remove    default
>+
> %_restart_check_systemctl								\
>-	test "$DISABLE_RESTART_ON_UPDATE" = yes && exit 0				\
>+%if "%{restart_on_update}" == "never"							\
>+	exit 0										\
>+%else											\
>+	test "$YAST_IS_RUNNING" = instsys     && exit 0					\
>+%if "%{restart_on_update}" == "default"							\
>+	test "$DISABLE_RESTART_ON_UPDATE" = yes -o					\
>+	     "$DISABLE_RESTART_ON_UPDATE" = 1 && 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				\
>+	test "$DISABLE_RESTART_ON_UPDATE" = yes -o					\
>+	     "$DISABLE_RESTART_ON_UPDATE" = 1 && exit 0					\
>+%endif											\
>+%endif											\
> 	/usr/bin/systemctl try-restart %{nil}
> 
> %_stop_check_systemctl									\
>-	test "$DISABLE_STOP_ON_REMOVAL" = yes && exit 0					\
>+%if "%{stop_on_remove}" == "never"							\
>+	exit 0										\
>+%else											\
>+	test "$YAST_IS_RUNNING" = instsys   && exit 0					\
>+%if "%{stop_on_remove}" == "default"							\
>+	test "$DISABLE_STOP_ON_REMOVAL" = yes -o					\
>+	     "$DISABLE_STOP_ON_REMOVAL" = 1 && 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					\
>+	test "$DISABLE_STOP_ON_REMOVAL" = yes -o					\
>+	     "$DISABLE_STOP_ON_REMOVAL" = 1 && exit 0					\
>+%endif											\
>+%endif											\
> 	/usr/bin/systemctl stop %{nil}
> 
> %service_add_pre()									\
>@@ -130,7 +149,9 @@
> %{nil}
> 
> # On uninstall, disable and stop services
>-%service_del_preun()									\
>+%service_del_preun(fn)									\
>+%{-f:%global stop_on_remove force}							\
>+%{-n:%global stop_on_remove never}							\
> test -n "$FIRST_ARG" || FIRST_ARG="$1"							\
> if [ "$FIRST_ARG" -eq 0 -a -x /usr/bin/systemctl ]; then				\
> 	# Package removal, not upgrade							\
>@@ -140,7 +161,9 @@
> %{nil}
> 
> # On uninstall, tell systemd to reload its unit files
>-%service_del_postun()									\
>+%service_del_postun(fn)									\
>+%{-f:%global restart_on_update force}							\
>+%{-n:%global restart_on_update never}							\
> test -n "$FIRST_ARG" || FIRST_ARG="$1"							\
> if [ "$FIRST_ARG" -ge 1 ]; then								\
> 	# Package upgrade, not uninstall						\
>@@ -159,7 +182,9 @@
> fi											\
> %{nil}
> 
>-%systemd_post()										\
>+%systemd_post(fn)									\
>+%{-f:%global stop_on_remove force}							\
>+%{-n:%global stop_on_remove never}							\
> if [ "$1" -eq 0 -a -x /usr/bin/systemctl ]; then					\
> 	# Package removal, not upgrade							\
> 	/usr/bin/systemctl --no-reload disable %{?*} || :				\
>@@ -169,7 +194,9 @@
> 
> %systemd_user_post() %systemd_post --user --global %{?*}
> 
>-%systemd_preun()									\
>+%systemd_preun(fn)									\
>+%{-f:%global stop_on_remove force}							\
>+%{-n:%global stop_on_remove never}							\
> if [ "$1" -eq 0 -a -x /usr/bin/systemctl ]; then					\
> 	# Package removal, not upgrade							\
> 	/usr/bin/systemctl --no-reload disable %{?*} || :				\
>

Actions: View | Diff

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