diff options
| author | David Smith <dsmith@redhat.com> | 2009-05-21 16:57:04 -0500 |
|---|---|---|
| committer | David Smith <dsmith@redhat.com> | 2009-05-21 16:57:04 -0500 |
| commit | c8e9eb18d8d13d099a4a177fe53de507c1d9ce8b (patch) | |
| tree | ab2388afb795ed1a7ead2fbbf8b9d1b368a8231f /stap-start-server | |
| parent | dd9a3bcbef65bde65491d959e9458bc641924811 (diff) | |
| parent | 3863e7999255deeaa7f8f4bba7df893773812537 (diff) | |
| download | systemtap-steved-c8e9eb18d8d13d099a4a177fe53de507c1d9ce8b.tar.gz systemtap-steved-c8e9eb18d8d13d099a4a177fe53de507c1d9ce8b.tar.xz systemtap-steved-c8e9eb18d8d13d099a4a177fe53de507c1d9ce8b.zip | |
Merge commit 'origin/master' into pr7043
Conflicts:
runtime/print.c
runtime/transport/transport.c
runtime/transport/transport_msgs.h
Diffstat (limited to 'stap-start-server')
| -rwxr-xr-x | stap-start-server | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/stap-start-server b/stap-start-server index d718ed30..6471db96 100755 --- a/stap-start-server +++ b/stap-start-server @@ -12,14 +12,11 @@ # This script attempts to start a systemtap server and echoes the # process id, if successful. -# INSTALL-HOOK These settings work for running the client from the source tree -# INSTALL-HOOK using the dejagnu test harness and will be overridden at install -# INSTALL-HOOK time. -exec_prefix= -sysconfdir=`pwd`/net +# Initialize the environment +. `dirname $0`/stap-env # start the server -${exec_prefix}stap-serverd "$@" </dev/null >/dev/null 2>&1 & +${stap_exec_prefix}stap-serverd "$@" </dev/null >/dev/null 2>&1 & server_pid=$! # Make sure the server is started @@ -30,6 +27,7 @@ do sleep 1 continue fi + # Is avahi advertizing the server? if ! (ps -fa | grep avahi-publish-service | grep $server_pid) > /dev/null 2>&1; then sleep 1 |