diff options
| author | Frank Ch. Eigler <fche@elastic.org> | 2008-08-21 13:26:56 -0400 |
|---|---|---|
| committer | Frank Ch. Eigler <fche@elastic.org> | 2008-08-21 13:26:56 -0400 |
| commit | eaf7e3121e673d7f5a7b383ab9563766f1e83ff0 (patch) | |
| tree | 0c1e415b03cc4f11667f6b4d8cb1cf8104b82d5e /stap-serverd | |
| parent | c569c2e4973296701cd4caff35847e2fde32754a (diff) | |
| parent | 46b3c6cd16e7aba1a5a26b310ee128bfdc7897fa (diff) | |
| download | systemtap-steved-eaf7e3121e673d7f5a7b383ab9563766f1e83ff0.tar.gz systemtap-steved-eaf7e3121e673d7f5a7b383ab9563766f1e83ff0.tar.xz systemtap-steved-eaf7e3121e673d7f5a7b383ab9563766f1e83ff0.zip | |
Merge commit 'origin/master' into pr4225
* commit 'origin/master':
Added task finder target parameter to vm_callback functions.
Supports original and new utrace interfaces.
Add ChangeLog entries
stap client/server now pass 'make installcheck'
Looks for both mmap and mmap2.
PR 6841 fix.
Add missing 'process' bindings.
Diffstat (limited to 'stap-serverd')
| -rwxr-xr-x | stap-serverd | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/stap-serverd b/stap-serverd index a6611255..6970217d 100755 --- a/stap-serverd +++ b/stap-serverd @@ -78,7 +78,7 @@ function listen { advertise_presence first=0 fi - wait %nc + wait '%nc' >/dev/null 2>&1 rc=$? if test $rc = 127 -o $rc = 0; then break; # success @@ -110,11 +110,11 @@ function terminate { # Kill the running 'avahi-publish-service' job kill -s SIGTERM %avahi-publish-service 2> /dev/null - wait %avahi-publish-service 2> /dev/null + wait '%avahi-publish-service' >/dev/null 2>&1 # Kill any running 'nc -l' job. kill -s SIGTERM "%nc -l" 2> /dev/null - wait "%nc - l" 2> /dev/null + wait "%nc - l" >/dev/null 2>&1 # Clean up cd `dirname $tmpdir` |