summaryrefslogtreecommitdiffstats
path: root/systemtap.spec
diff options
context:
space:
mode:
Diffstat (limited to 'systemtap.spec')
-rw-r--r--systemtap.spec56
1 files changed, 42 insertions, 14 deletions
diff --git a/systemtap.spec b/systemtap.spec
index 860fe283..1c520f2e 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -121,9 +121,13 @@ Summary: Instrumentation System Server
Group: Development/System
License: GPLv2+
URL: http://sourceware.org/systemtap/
-Requires: systemtap initscripts
+Requires: systemtap
Requires: avahi avahi-tools nss nss-tools mktemp
Requires: zip unzip
+Requires(post): chkconfig
+Requires(preun): chkconfig
+Requires(preun): initscripts
+Requires(postun): initscripts
%description server
This is the remote script compilation server component of systemtap.
@@ -144,7 +148,11 @@ Summary: Systemtap Initscripts
Group: Development/System
License: GPLv2+
URL: http://sourceware.org/systemtap/
-Requires: systemtap-runtime, initscripts
+Requires: systemtap-runtime
+Requires(post): chkconfig
+Requires(preun): chkconfig
+Requires(preun): initscripts
+Requires(postun): initscripts
%description initscript
Initscript for Systemtap scripts
@@ -268,18 +276,19 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/systemtap/*.pdf docs.installed/
mv $RPM_BUILD_ROOT%{_datadir}/doc/systemtap/tapsets docs.installed/
%endif
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d/
-install -m 755 initscript/systemtap $RPM_BUILD_ROOT%{_sysconfdir}/init.d/
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/
+install -m 755 initscript/systemtap $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/systemtap
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/systemtap/conf.d
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/systemtap/script.d
-install -m 644 initscript/config $RPM_BUILD_ROOT%{_sysconfdir}/systemtap
+install -m 644 initscript/config.systemtap $RPM_BUILD_ROOT%{_sysconfdir}/systemtap/config
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/systemtap
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/systemtap
-install -m 755 initscript/stap-server $RPM_BUILD_ROOT%{_sysconfdir}/init.d/
+install -m 755 initscript/stap-server $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/stap-server
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/stap-server/conf.d
+install -m 644 initscript/config.stap-server $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/stap-server
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log
touch $RPM_BUILD_ROOT%{_localstatedir}/log/stap-server.log
@@ -300,19 +309,37 @@ exit 0
chmod 664 %{_localstatedir}/log/stap-server.log
chown stap-server %{_localstatedir}/log/stap-server.log
chgrp stap-server %{_localstatedir}/log/stap-server.log
-chkconfig --add stap-server
+/sbin/chkconfig --add stap-server
exit 0
%preun server
-chkconfig --del stap-server
+if [ $1 = 0 ] ; then
+ /sbin/service stap-server stop >/dev/null 2>&1
+ /sbin/chkconfig --del stap-server
+fi
+exit 0
+
+%postun server
+if [ "$1" -ge "1" ] ; then
+ /sbin/service stap-server condrestart >/dev/null 2>&1 || :
+fi
exit 0
%post initscript
-chkconfig --add systemtap
+/sbin/chkconfig --add systemtap
exit 0
%preun initscript
-chkconfig --del systemtap
+if [ $1 = 0 ] ; then
+ /sbin/service systemtap stop >/dev/null 2>&1
+ /sbin/chkconfig --del systemtap
+fi
+exit 0
+
+%postun initscript
+if [ "$1" -ge "1" ] ; then
+ /sbin/service systemtap condrestart >/dev/null 2>&1 || :
+fi
exit 0
%post
@@ -395,11 +422,12 @@ exit 0
%{_bindir}/stap-server-connect
%{_bindir}/stap-sign-module
%{_mandir}/man8/stap-server.8*
-%{_sysconfdir}/init.d/stap-server
+%{_sysconfdir}/init.d/rc.d/stap-server
%dir %{_sysconfdir}/stap-server
%dir %{_sysconfdir}/stap-server/conf.d
+%config(noreplace) %{_sysconfdir}/stap-server/config
%{_localstatedir}/log/stap-server.log
-%doc initscript/README.initscript
+%doc initscript/README.stap-server
%files sdt-devel
%defattr(-,root,root)
@@ -408,14 +436,14 @@ exit 0
%files initscript
%defattr(-,root,root)
-%{_sysconfdir}/init.d/systemtap
+%{_sysconfdir}/rc.d/init.d/systemtap
%dir %{_sysconfdir}/systemtap
%dir %{_sysconfdir}/systemtap/conf.d
%dir %{_sysconfdir}/systemtap/script.d
%config(noreplace) %{_sysconfdir}/systemtap/config
%dir %{_localstatedir}/cache/systemtap
%dir %{_localstatedir}/run/systemtap
-%doc initscript/README.initscript
+%doc initscript/README.systemtap
%if %{with_grapher}
%files grapher