From 64aa100f39dca60999028f83feb31983728ea4d4 Mon Sep 17 00:00:00 2001
From: Dave Brolley <brolley@redhat.com>
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