Merge commit 'origin/master' into pr4225

* commit 'origin/master': (34 commits)
  PR5049: fix overbroad effects of naive "*" prefixing; instead use optional "*/" only.
  stap-serverd was incorectly determining that the server could
  stapprobes man page: clarify statement(NUM).absolute and process("path") searching
  PR5049: prefix with "*" any filenames given in "fn@filename:line" probes
  Indentation fix.
  Redirect stderr gets redircted so warnings don't let example script run fail.
  PR6835. io/io_submit.stp: Fix #! start. Convert to normal line-ending.
  PR2895. Add proper #! /usr/bin/env stap line. Make example scripts executable.
  Use INSTALL_PROGRAM, not INSTALL_DATA for executable .stp scripts.
  example index: only warn if old, do not regenerate
  Start/stop the systemtap server from systemtap.exp and not in the top level Makefile.
  Lower statement wildcard test matching threshold.
  Moved details of utrace detach to stap_utrace_detach().
  Saves thread vma information.
  Always generate examples indexes and install examples from srcdir.
  Refer to srcdir spec file Makefile so make rpm works when builddir != srcdir.
  Add index of subsystem and keywords at top of HTML indexes.
  Don't output output, exits, status line in indexes (mentioned in descriptions).
  Disable chmodding of samples/kmalloc-top in spec file since it isn't installed.
  Make sure examples indexes are always generated in builddir.
  ...

1 files changed, 6 insertions, 10 deletions

diff --git a/stap-find-or-start-server b/stap-find-or-start-server
index 0ea0ef43..32a45052 100755
--- a/stap-find-or-start-server
+++ b/stap-find-or-start-server
@@ -10,27 +10,23 @@
 # later version.
 
 # This script attempts to find a systemtap server. If one is found, it
-# simply exits with 0.
+# echoes 0 and exits with 0.
 #
 # Otherwise, it attempts to start a server. If succesful, it echoes the
 # process id and exits with 0.
 #
-# Otherwise, it exits with 1
+# Otherwise, it echoes -1 and exits with 1
 
 # Is there a server available?
-stap-find-servers >/dev/null 2>&1 && exit 0
+stap-find-servers >/dev/null 2>&1 && echo 0 && exit 0
 
 # No server available, try to start one.
 pid=`stap-start-server`
 if test $? = 0; then
-  echo $pid
-  # Make sure the server is started
-  for ((attempt=0; $attempt < 5; ++attempt))
-  do
-    stap-find-servers >/dev/null 2>&1 && exit 0
-    sleep 1
-  done
+    echo $pid
+    exit 0
 fi
 
 # Could not find or start a server
+echo -1
 exit 1