From: Dave Brolley <brolley@redhat.com>
Date: Wed, 14 Sep 2011 15:24:03 +0000 (-0400)
Subject: Revert previous change to stap-start-server.
X-Git-Tag: release-1.7~153^2~26
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=524d562b619d4c7ec1250a82c2c24fac9337250a;p=systemtap.git

Revert previous change to stap-start-server.

Failure to advertise the server via avahi is fatal again.
---

diff --git a/stap-start-server b/stap-start-server
index 9825b21e6..68b88bf0d 100755
--- a/stap-start-server
+++ b/stap-start-server
@@ -45,21 +45,20 @@ do
     fi
     avahi_advertising=1
 
-    break; # Server is up and advertised
+    # The server is ready
+    echo $server_pid
+    exit 0
 done
 
-# server did not start?
+echo -n "Unable to start a systemtap server: " >&2
+
 if test $server_started = 0; then
-    echo -n "Unable to start a systemtap server: " >&2
     echo "${stap_pkglibexecdir}stap-serverd did not start" >&2
-    exit 1
+elif test $avahi_advertising = 0; then
+    echo "avahi is not advertising the server" >&2
 fi
 
-# Is avahi advertising the server? Warn if not.
-if test $avahi_advertising = 0; then
-    echo "WARNING: avahi is not advertising the server" >&2
-fi
+# If the server partially started, then kill it.
+test $server_started = 1 && ${stap_pkglibexecdir}stap-stop-server $server_pid
 
-# The server is ready
-echo $server_pid
-exit 0
+exit 1 # server did not start