-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Somehow I felt unfcomfortable after my reply, so I re-read docu again
and Bastian is right:
grep = regular expression (not extended)
grep -E = extended(!) regular expression
grep -F = simple string
So here's the final quiet patch for dropbear, just apply to the current
trunk with -p0:
[dropbear] use -q where applicable
Signed off by: Matthias Buecher <[email protected]>
On 03.02.2010 15:40, Bastian Bittorf wrote:
> * Matthias Buecher / Germany <[email protected]> [03.02.2010 15:30]:
>> Note, that it is a small "e" not a big "E", so not a regular expression.
>
> sorry, you are right - didn't know this till now.
> anyway...commit this 8-))) sorry for the noise...
>
> bye, Bastian
>
-----BEGIN PGP SIGNATURE-----
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iEYEARECAAYFAktpk20ACgkQUXXT+9wZdbUWkQCbB/QjL0ZLCVMOh4r8A+5g60Op
JZcAnifruJMF67b87HrsiaIF9cvIWjOp
=qI2g
-----END PGP SIGNATURE-----
Index: package/dropbear/files/dropbear.init
===================================================================
--- package/dropbear/files/dropbear.init (revision 19500)
+++ package/dropbear/files/dropbear.init (working copy)
@@ -1,5 +1,5 @@
#!/bin/sh /etc/rc.common
-# Copyright (C) 2006-2009 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
# Copyright (C) 2006 Carlos Sobrinho
NAME=dropbear
@@ -91,7 +91,7 @@
local pidfile
for pidfile in `ls /var/run/${NAME}.*.pid`
do
- start-stop-daemon -K -s KILL -p "${pidfile}" -n "${NAME}" >/dev/null
+ start-stop-daemon -q -K -s KILL -p "${pidfile}" -n "${NAME}"
rm -f "${pidfile}"
done
[ -z "${pidfile}" ] && echo "${initscript}: no pid files, if you get problems with start then try killclients"
@@ -112,12 +112,10 @@
[ "${pid}" -eq 0 ] && break
# check if client connection
- ps | grep -e "^[ ]*${pid} " | grep "${PROG}" >/dev/null
- if [ $? -eq 0 ]
- then
+ grep -F -q -e "${PROG}" "/proc/${pid}/cmdline" && {
append ignore "${pid}"
break
- fi
+ }
done
# get all server pids that should be ignored
@@ -130,9 +128,10 @@
local skip
for pid in `pidof "${NAME}"`
do
- # check if correct program
- ps | grep -e "^[ ]*${pid} " | grep "${PROG}" >/dev/null
- [ $? -ne 0 ] && continue
+ # check if correct program, otherwise process next pid
+ grep -F -q -e "${PROG}" "/proc/${pid}/cmdline" || {
+ continue
+ }
# check if pid should be ignored (servers, ourself)
skip=0
-----BEGIN PGP SIGNATURE-----
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iEYEABECAAYFAktpk20ACgkQUXXT+9wZdbVeDgCeNxcGPVSwuWff3A5AccvT0S5a
4/sAn1p6i3XYofnhGCms7ZzPCl7W4KAm
=AjWq
-----END PGP SIGNATURE-----
_______________________________________________
openwrt-devel mailing list
[email protected]
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
