diff options
| author | Tim Moore <timoore@redhat.com> | 2009-12-23 09:14:02 +0100 |
|---|---|---|
| committer | Tim Moore <timoore@redhat.com> | 2009-12-23 09:14:02 +0100 |
| commit | 69ce6c79dbcb2cec2d1245935ef20bf832ffe70a (patch) | |
| tree | 0b6aea71ef4f3ca5c797494d062819bfba63e7f7 /stap-start-server | |
| parent | 72195f6b17c0ed2e508c58bf3cadd5b9dc4e28ac (diff) | |
| parent | 0ee3adb42f2f6d8bffe177e77a415b3a74f3a777 (diff) | |
| download | systemtap-steved-69ce6c79dbcb2cec2d1245935ef20bf832ffe70a.tar.gz systemtap-steved-69ce6c79dbcb2cec2d1245935ef20bf832ffe70a.tar.xz systemtap-steved-69ce6c79dbcb2cec2d1245935ef20bf832ffe70a.zip | |
Merge remote branch 'origin/master'
Diffstat (limited to 'stap-start-server')
| -rwxr-xr-x | stap-start-server | 9 |
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 |