diff options
| author | Dave Brolley <brolley@redhat.com> | 2008-08-08 15:15:19 -0400 |
|---|---|---|
| committer | Dave Brolley <brolley@redhat.com> | 2008-08-08 15:15:19 -0400 |
| commit | 71906647386a9684086b0542318b536d95ae089c (patch) | |
| tree | fb0348d7bb34095e95ad830da8e832bad9187a55 /stap-find-servers | |
| parent | d5658775da9fa0ac792eb3f874df9f7c4d60de7e (diff) | |
| parent | f1118e1032612170cae8cd979cd529722ad95fdb (diff) | |
| download | systemtap-steved-71906647386a9684086b0542318b536d95ae089c.tar.gz systemtap-steved-71906647386a9684086b0542318b536d95ae089c.tar.xz systemtap-steved-71906647386a9684086b0542318b536d95ae089c.zip | |
Merge branch 'master' of ssh://sources.redhat.com/git/systemtap
Conflicts:
ChangeLog
testsuite/ChangeLog
Diffstat (limited to 'stap-find-servers')
| -rwxr-xr-x | stap-find-servers | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/stap-find-servers b/stap-find-servers index 9e7b633d..fea645bd 100755 --- a/stap-find-servers +++ b/stap-find-servers @@ -87,7 +87,7 @@ function match_server { server_port=`expr "$service_data" : '\[\([^]]*\)\]'` ;; txt ) - server_sysinfo=`expr "$service_data" : '\[\"\([^]]*\)\"\]'` + server_sysinfo=`expr "$service_data" : '\[.*\"\(sysinfo=[^]]*\)\"\]'` ;; * ) break ;; @@ -115,7 +115,7 @@ function client_sysinfo { # Add some info from uname sysinfo_client="`uname -rvm`" fi - echo $sysinfo_client + echo sysinfo=$sysinfo_client } #----------------------------------------------------------------------------- |