From 552276c8666dec5373d8312bc3498b1887ddb0a8 Mon Sep 17 00:00:00 2001 From: Dave Brolley Date: Fri, 30 Jan 2009 15:43:34 -0500 Subject: More security checking for client/server. Set exec_prefix and sysconfdir at install time. --- stap-start-server | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'stap-start-server') 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 2>&1 & +${exec_prefix}stap-serverd "$@" /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 -- cgit