From 1cecb3c506475a0e0b0ee4180a91e1a9433d346b Mon Sep 17 00:00:00 2001 From: Dave Brolley Date: Wed, 24 Dec 2008 13:18:50 -0500 Subject: Systemtap compile server phase 2 (ssl) -- first cut. --- stap-start-server | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'stap-start-server') diff --git a/stap-start-server b/stap-start-server index aa2850b5..5bc97c22 100755 --- a/stap-start-server +++ b/stap-start-server @@ -13,7 +13,7 @@ # process id, if successful. # start the server -stap-serverd /dev/null 2>&1 & +stap-serverd "$@" /dev/null 2>&1 & server_pid=$! # Make sure the server is started -- cgit From 64aa100f39dca60999028f83feb31983728ea4d4 Mon Sep 17 00:00:00 2001 From: Dave Brolley Date: Fri, 9 Jan 2009 15:11:04 -0500 Subject: New framework for creating/using certificate databases for client/server. --- stap-start-server | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'stap-start-server') diff --git a/stap-start-server b/stap-start-server index 5bc97c22..04a3e2d3 100755 --- a/stap-start-server +++ b/stap-start-server @@ -2,7 +2,7 @@ # Start a systemtap server # -# Copyright (C) 2008 Red Hat Inc. +# Copyright (C) 2008, 2009 Red Hat Inc. # # This file is part of systemtap, and is free software. You can # redistribute it and/or modify it under the terms of the GNU General @@ -19,8 +19,17 @@ server_pid=$! # Make sure the server is started for ((attempt=0; $attempt < 5; ++attempt)) do - (ps -a | grep $server_pid) >/dev/null 2>&1 && echo $server_pid && exit 0 - sleep 1 + if test $EUID = 0; then + if ! test -f `dirname $0`/../etc/systemtap/ssl/server/stap-server.cert; then + sleep 1 + continue; + fi + elif ! test -f $HOME/.systemtap/ssl/server/stap-server.cert; then + sleep 1 + continue + fi + (ps -a | grep $server_pid) >/dev/null 2>&1 && echo $server_pid && exit 0 + sleep 1 done exit 1 # server did not start -- cgit From 21325e0c78f4de1e772813c8f071d909d83e1b58 Mon Sep 17 00:00:00 2001 From: Dave Brolley Date: Tue, 13 Jan 2009 16:19:53 -0500 Subject: Ensure that the client/server scripts call the installed copies of any other systemtap tools. --- stap-start-server | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'stap-start-server') diff --git a/stap-start-server b/stap-start-server index 04a3e2d3..c8ea8178 100755 --- a/stap-start-server +++ b/stap-start-server @@ -12,15 +12,20 @@ # 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` + # start the server -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)) do if test $EUID = 0; then - if ! test -f `dirname $0`/../etc/systemtap/ssl/server/stap-server.cert; then + if ! test -f $prefix/etc/systemtap/ssl/server/stap-server.cert; then sleep 1 continue; fi -- cgit