summaryrefslogtreecommitdiffstats
path: root/stap-start-server
diff options
context:
space:
mode:
authorDave Brolley <brolley@redhat.com>2009-01-13 16:19:53 -0500
committerDave Brolley <brolley@redhat.com>2009-01-13 16:19:53 -0500
commit21325e0c78f4de1e772813c8f071d909d83e1b58 (patch)
treef37745871b66343986890725829fb8df5f7b4fee /stap-start-server
parent790c4dd6eff3fbc127b67e23478d7edc6bf1cd08 (diff)
downloadsystemtap-steved-21325e0c78f4de1e772813c8f071d909d83e1b58.tar.gz
systemtap-steved-21325e0c78f4de1e772813c8f071d909d83e1b58.tar.xz
systemtap-steved-21325e0c78f4de1e772813c8f071d909d83e1b58.zip
Ensure that the client/server scripts call the installed copies of any
other systemtap tools.
Diffstat (limited to 'stap-start-server')
-rwxr-xr-xstap-start-server9
1 files changed, 7 insertions, 2 deletions
diff --git a/stap-start-server b/stap-start-server
index 04a3e2d3..c8ea8178 100755
--- a/stap-start-server
+++ b/stap-start-server
@@ -12,15 +12,20 @@
# This script attempts to start a systemtap server and echoes the
# process id, if successful.
+# Where are we installed?
+exec_prefix=`dirname $0`
+exec_prefix=`cd $exec_prefix && pwd`
+prefix=`dirname $exec_prefix`
+
# start the server
-stap-serverd "$@" </dev/null >/dev/null 2>&1 &
+$exec_prefix/stap-serverd "$@" </dev/null >/dev/null 2>&1 &
server_pid=$!
# Make sure the server is started
for ((attempt=0; $attempt < 5; ++attempt))
do
if test $EUID = 0; then
- if ! test -f `dirname $0`/../etc/systemtap/ssl/server/stap-server.cert; then
+ if ! test -f $prefix/etc/systemtap/ssl/server/stap-server.cert; then
sleep 1
continue;
fi