Changes - j0ke.net Open Build Service

Changes of Revision 10

[-] [+]	Changed	glusterfs.spec
@@ -89,10 +89,10 @@ Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units -%define _init_enable() /bin/systemctl enable %1.service ; -%define _init_disable() /bin/systemctl disable %1.service ; -%define _init_restart() /bin/systemctl try-restart %1.service ; -%define _init_stop() /bin/systemctl stop %1.service ; +%define _init_enable() /bin/systemctl enable %1.service \|\| : ; +%define _init_disable() /bin/systemctl disable %1.service \|\| : ; +%define _init_restart() /bin/systemctl try-restart %1.service \|\| : ; +%define _init_stop() /bin/systemctl stop %1.service \|\| : ; %define _init_install() %{__install} -D -p -m 0644 %1 %{buildroot}%{_unitdir}/%2.service ; # can't seem to make a generic macro that works %define _init_glusterd %{_unitdir}/glusterd.service @@ -105,10 +105,10 @@ Requires(preun): /sbin/service Requires(preun): /sbin/chkconfig Requires(postun): /sbin/service -%define _init_enable() /sbin/chkconfig --add %1 ; -%define _init_disable() /sbin/chkconfig --del %1 ; -%define _init_restart() /sbin/service %1 condrestart &>/dev/null ; -%define _init_stop() /sbin/service %1 stop &>/dev/null ; +%define _init_enable() /sbin/chkconfig --add %1 \|\| : ; +%define _init_disable() /sbin/chkconfig --del %1 \|\| : ; +%define _init_restart() /sbin/service %1 condrestart &>/dev/null \|\| : ; +%define _init_stop() /sbin/service %1 stop &>/dev/null \|\| : ; %define _init_install() %{__install} -D -p -m 0755 %1 %{buildroot}%{_sysconfdir}/init.d/%2 ; # can't seem to make a generic macro that works %define _init_glusterd %{_sysconfdir}/init.d/glusterd @@ -755,7 +755,7 @@ if [ -f %_init_glusterfsd ]; then %_init_stop glusterfsd \|\| : fi - %_init_stop glusterd + %_init_stop glusterd \|\| : if [ -f %_init_glusterfsd ]; then %_init_disable glusterfsd \|\| : fi