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