diff options
| author | Dave Brolley <brolley@redhat.com> | 2009-01-30 15:43:34 -0500 |
|---|---|---|
| committer | Dave Brolley <brolley@redhat.com> | 2009-01-30 15:43:34 -0500 |
| commit | 552276c8666dec5373d8312bc3498b1887ddb0a8 (patch) | |
| tree | 55744f20b131641d506d0faf5462120deee2dc50 /stap-start-server | |
| parent | df79aa4b87b39a64867c343f1bcd22c7e675aa43 (diff) | |
| download | systemtap-steved-552276c8666dec5373d8312bc3498b1887ddb0a8.tar.gz systemtap-steved-552276c8666dec5373d8312bc3498b1887ddb0a8.tar.xz systemtap-steved-552276c8666dec5373d8312bc3498b1887ddb0a8.zip | |
More security checking for client/server. Set exec_prefix and sysconfdir at install time.
Diffstat (limited to 'stap-start-server')
| -rwxr-xr-x | stap-start-server | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/stap-start-server b/stap-start-server index c8ea8178..f1f02d2f 100755 --- a/stap-start-server +++ b/stap-start-server @@ -12,20 +12,21 @@ # 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` +# 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 # start the server -$exec_prefix/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)) +for ((attempt=0; $attempt < 10; ++attempt)) do if test $EUID = 0; then - if ! test -f $prefix/etc/systemtap/ssl/server/stap-server.cert; then + if ! test -f $sysconfdir/systemtap/ssl/server/stap-server.cert; then sleep 1 continue; fi |