From 95ac9a456e725b2f508c03322b5f13245e6027de Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Fri, 24 Jan 2014 09:53:53 -0800 Subject: [PATCH] Resolves: rhbz1057773 --- systemtap.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/systemtap.spec b/systemtap.spec index c8daaeb..09baff1 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -599,10 +599,11 @@ test -e %{_localstatedir}/log/stap-server/log || { if test ! -e ~stap-server/.systemtap/ssl/server/stap.cert; then runuser -s /bin/sh - stap-server -c %{_libexecdir}/systemtap/stap-gen-cert >/dev/null fi -# Activate the service +# Prepare the service %if %{with_systemd} - /bin/systemctl enable stap-server.service >/dev/null 2>&1 || : - /bin/systemd-tmpfiles --create >/dev/null 2>&1 || : + # Note, Fedora policy doesn't allow network services enabled by default + # /bin/systemctl enable stap-server.service >/dev/null 2>&1 || : + /bin/systemd-tmpfiles --create %{_tmpfilesdir}/stap-server.conf >/dev/null 2>&1 || : %else /sbin/chkconfig --add stap-server %endif @@ -636,7 +637,7 @@ exit 0 # If so, restart the service if it's running if [ "$1" -ge "1" ] ; then %if %{with_systemd} - /bin/systemctl restart stap-server.service >/dev/null 2>&1 || : + /bin/systemctl condrestart stap-server.service >/dev/null 2>&1 || : %else /sbin/service stap-server condrestart >/dev/null 2>&1 || : %endif -- 1.8.3.1