[SCM] Samba Shared Repository - branch v3-3-stable updated -
release-3-3-0rc2-90-g9b17f79
Karolin Seeger
kseeger at samba.org
Mon Jan 5 15:37:03 GMT 2009
The branch, v3-3-stable has been updated
via 9b17f7907bca32282d6e56fa28ca62ef84bf7afc (commit)
via f7d2e48c6e79983928c126e6d2d9fa3f295a765e (commit)
from 84ef55b65f6b3a877da98ace762e5ec3d784fa4d (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-stable
- Log -----------------------------------------------------------------
commit 9b17f7907bca32282d6e56fa28ca62ef84bf7afc
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Jan 5 16:33:00 2009 +0100
examples: Avoid bashism in perfcount.init.
This fixes bug #6000.
Thanks to the Debian Samba package maintainers for providing the patch!
Remove trailing whitespaces.
Karolin
(cherry picked from commit 2e09746a4db4186c9d648370b9004971bc18e5c9)
commit f7d2e48c6e79983928c126e6d2d9fa3f295a765e
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Jan 5 16:35:50 2009 +0100
Revert "examples: Avoid bashism in perfcount.init."
This reverts commit a1bf1f1819ab184682327583d05b0258db8856ef.
-----------------------------------------------------------------------
Summary of changes:
examples/perfcounter/perfcountd.init | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/examples/perfcounter/perfcountd.init b/examples/perfcounter/perfcountd.init
index 8a89fad..1a05a69 100755
--- a/examples/perfcounter/perfcountd.init
+++ b/examples/perfcounter/perfcountd.init
@@ -21,17 +21,17 @@
PATH=/bin:/usr/bin:/sbin:/usr/sbin
-killproc()
+killproc()
{
pid=`ps aux | grep $1 | egrep -v '(grep|perfcountd)' | awk '{print $2}'`
- if [ -z "$pid" ]; then
+ if [ x"$pid" != "x" ]; then
kill $pid
fi
}
-# Start/stop processes
+# Start/stop processes
-case "$1"
+case "$1"
in
start)
/opt/samba/bin/perfcount -d -f /var/lib/samba/perfmon 2> /dev/null
@@ -47,7 +47,7 @@ stop)
status)
pid=`ps aux | grep perfcount | egrep -v '(grep|perfcountd)' | awk '{print $2}'`
- if [ "$pid" == "" ]; then
+ if [ x"$pid" = "x" ]; then
echo "Dead!"
exit 2;
fi
--
Samba Shared Repository
More information about the samba-cvs
mailing list