Merge commit 'origin/master' into pr6429-comp-unwindsyms

* commit 'origin/master':
  fix shutdown race condition for scripts that might exit during begin probes
  Fix PR 6732: Add runtime/autoconf-real-parent.c check for task_struct field.
  clarify dejagnu test case name for empty-struct changes
  add changelog entries for last two changes
  Add test suite for declaration resolution
  Fix semantic error: empty struct
  Add hack to support git 1.6 in git_version.sh
  Sync latest fix for git_version.sh from RadeonHD's tree
  Slightly cleanup code of translate.cxx
  PR2111: add general blurbage to stapprobes.5 on syscalls tapset
  Use `uname -rvm` for checking system compatibility. Generate
  Add section to stapex manual page on how installed examples are documented.
  Install examples, demos and samples.
  Install tutorial and langref manuals.

1 files changed, 2 insertions, 3 deletions

diff --git a/stap-serverd b/stap-serverd
index 2c0743c0..eaaeda00 100755
--- a/stap-serverd
+++ b/stap-serverd
@@ -34,13 +34,12 @@ function initialization {
 function advertise_presence {
     # Build up a string representing our server's properties.
     # TODO: this needs fleshing out.
-
-    local sysinfo=`uname -r`
+    local sysinfo=`uname -rvm`
     local txt="$sysinfo"
 
     # Call avahi-publish-service to advertise our presence.
     avahi-publish-service "Systemtap Compile Server on `uname -n`" \
-	$avahi_type $port $txt > /dev/null 2>&1 &
+	$avahi_type $port "$txt" > /dev/null 2>&1 &
 
     echo "Systemtap Compile Server on `uname -n` listening on port $port"
 }