View | Details | Raw Unified | Return to bug 968405
Collapse All | Expand All

(-)../macros.systemd.orig (-5 / +22 lines)
Lines 50-60 Link Here
50
%_ntpunitsdir /usr/lib/systemd/ntp-units.d
50
%_ntpunitsdir /usr/lib/systemd/ntp-units.d
51
%_binfmtdir /usr/lib/binfmt.d
51
%_binfmtdir /usr/lib/binfmt.d
52
52
53
%do_restart_on_update do_restart
54
%no_restart_on_update no_restart
55
%restart_on_update_default restart_default
56
53
%_restart_check_systemctl								\
57
%_restart_check_systemctl								\
54
	test -f /etc/sysconfig/services && . /etc/sysconfig/services			\
58
        test "$YAST_IS_RUNNING" = instsys && exit 0					\
55
	test "$YAST_IS_RUNNING" = instsys       && exit 0				\
59
%if 0%{!?2:1}										\
56
	test "$DISABLE_RESTART_ON_UPDATE" = yes && exit 0				\
60
        test "$DISABLE_STOP_ON_REMOVAL" = yes -o					\
57
	/usr/bin/systemctl try-restart %{nil}
61
             "$DISABLE_STOP_ON_REMOVAL" = 1  && exit 0					\
62
%endif 											\
63
%if "%{?2}%{!?2:%restart_on_update_default}" == "%restart_on_update_default" 		\
64
        if [ -f /etc/sysconfig/services ]; then						\
65
               . /etc/sysconfig/services						\
66
               test "$DISABLE_STOP_ON_REMOVAL" = yes -o					\
67
                    "$DISABLE_STOP_ON_REMOVAL" = 1 && exit 0				\
68
        fi										\
69
%else											\
70
%if "%{2}" == %no_restart_on_update							\
71
        exit 0 ;;                                                			\
72
%endif 											\
73
%endif 											\
74
        /usr/bin/systemctl try-restart %{1} %{nil}
58
75
59
%_stop_check_systemctl									\
76
%_stop_check_systemctl									\
60
	test -f /etc/sysconfig/services && . /etc/sysconfig/services			\
77
	test -f /etc/sysconfig/services && . /etc/sysconfig/services			\
Lines 144-150 Link Here
144
	# Package upgrade, not uninstall						\
161
	# Package upgrade, not uninstall						\
145
	if [ -x /usr/bin/systemctl ]; then						\
162
	if [ -x /usr/bin/systemctl ]; then						\
146
		/usr/bin/systemctl daemon-reload || :					\
163
		/usr/bin/systemctl daemon-reload || :					\
147
		( %_restart_check_systemctl %{?*} || : )				\
164
		( %_restart_check_systemctl  || : )				\
148
	fi										\
165
	fi										\
149
else # package uninstall								\
166
else # package uninstall								\
150
	for service in %{?*} ; do							\
167
	for service in %{?*} ; do							\

Return to bug 968405