summaryrefslogtreecommitdiffstats
path: root/stap-start-server
diff options
context:
space:
mode:
Diffstat (limited to 'stap-start-server')
-rwxr-xr-xstap-start-server9
1 files changed, 5 insertions, 4 deletions
diff --git a/stap-start-server b/stap-start-server
index ab78fc09..1225902d 100755
--- a/stap-start-server
+++ b/stap-start-server
@@ -13,11 +13,12 @@
# process id, if successful.
# Initialize the environment
-. `dirname $0`/stap-env
+. ${PKGLIBEXECDIR}stap-env
+
startup_timeout=20
# start the server
-${stap_exec_prefix}stap-serverd "$@" </dev/null >/dev/null 2>&1 &
+${stap_pkglibexecdir}stap-serverd "$@" </dev/null >/dev/null 2>&1 &
server_pid=$!
# Make sure the server is started
@@ -56,7 +57,7 @@ done
echo -n "Unable to start a systemtap server: " >&2
if test $server_started = 0; then
- echo "${stap_exec_prefix}stap-serverd did not start" >&2
+ echo "${stap_pkglibexecdir}stap-serverd did not start" >&2
elif test $avahi_advertising = 0; then
echo "avahi is not advertising the server" >&2
elif test $server_listening = 0; then
@@ -64,6 +65,6 @@ elif test $server_listening = 0; then
fi
# If the server partially started, then kill it.
-test $server_started = 1 && ${stap_exec_prefix}stap-stop-server $server_pid
+test $server_started = 1 && ${stap_pkglibexecdir}stap-stop-server $server_pid
exit 1 # server did not start