-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi,
thanks to jow, I rechecked the changes on the dropbear script, that were
submitted by me.
jow, would you be so kind and commit the attached patch to the trunk?
Thanks.
[package] dropbear: use -q where applicable
Signed off by: Matthias Buecher <[email protected]>
-----BEGIN PGP SIGNATURE-----
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iEYEARECAAYFAktnDKkACgkQUXXT+9wZdbXYMwCgzZQtFAqBNekXbgGwNdnG9Uu4
M3YAnRlG+ocJ/pXMBzOd+VEoOszdSn58
=WmEc
-----END PGP SIGNATURE-----
Index: package/dropbear/files/dropbear.init
===================================================================
--- package/dropbear/files/dropbear.init (revision 19489)
+++ 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,7 +112,7 @@
[ "${pid}" -eq 0 ] && break
# check if client connection
- ps | grep -e "^[ ]*${pid} " | grep "${PROG}" >/dev/null
+ ps | grep -e "^[ ]*${pid} " | grep -q -e "${PROG}"
if [ $? -eq 0 ]
then
append ignore "${pid}"
@@ -131,7 +131,7 @@
for pid in `pidof "${NAME}"`
do
# check if correct program
- ps | grep -e "^[ ]*${pid} " | grep "${PROG}" >/dev/null
+ ps | grep -e "^[ ]*${pid} " | grep -q -e "${PROG}"
[ $? -ne 0 ] && continue
# check if pid should be ignored (servers, ourself)
-----BEGIN PGP SIGNATURE-----
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iEYEABECAAYFAktnDKkACgkQUXXT+9wZdbUH2QCg+btpFh0n7tS9RniClvlmYOjN
BlEAoNX1+1JciNb2LcM1QAuxoGLCbU3S
=uD9b
-----END PGP SIGNATURE-----
_______________________________________________
openwrt-devel mailing list
[email protected]
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
