| 1 |
mrness 09/02/28 09:53:42 |
| 2 |
|
| 3 |
Modified: dante-sockd-init |
| 4 |
Log: |
| 5 |
Fix bashisms in dante-sockd init.d script (#260151). |
| 6 |
(Portage version: 2.1.6.4/cvs/Linux 2.6.25-gentoo-r6 x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.5 net-proxy/dante/files/dante-sockd-init |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/dante/files/dante-sockd-init?rev=1.5&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/dante/files/dante-sockd-init?rev=1.5&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/dante/files/dante-sockd-init?r1=1.4&r2=1.5 |
| 14 |
|
| 15 |
Index: dante-sockd-init |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/net-proxy/dante/files/dante-sockd-init,v |
| 18 |
retrieving revision 1.4 |
| 19 |
retrieving revision 1.5 |
| 20 |
diff -u -r1.4 -r1.5 |
| 21 |
--- dante-sockd-init 2 May 2007 19:25:15 -0000 1.4 |
| 22 |
+++ dante-sockd-init 28 Feb 2009 09:53:42 -0000 1.5 |
| 23 |
@@ -1,7 +1,7 @@ |
| 24 |
#!/sbin/runscript |
| 25 |
# Copyright 1999-2004 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/files/dante-sockd-init,v 1.4 2007/05/02 19:25:15 mrness Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/files/dante-sockd-init,v 1.5 2009/02/28 09:53:42 mrness Exp $ |
| 29 |
|
| 30 |
SOCKD_OPT="-D" |
| 31 |
[ "${SOCKD_FORKDEPTH:-1}" -gt 1 ] && SOCKD_OPT="${SOCKD_OPT} -N ${SOCKD_FORKDEPTH}" |
| 32 |
@@ -22,7 +22,7 @@ |
| 33 |
return 1 |
| 34 |
fi |
| 35 |
|
| 36 |
- /usr/sbin/sockd -V &> /tmp/dante-sockd.checkconf |
| 37 |
+ /usr/sbin/sockd -V 2>&1 >/tmp/dante-sockd.checkconf |
| 38 |
if [ $? -ne 0 ]; then |
| 39 |
cat /tmp/dante-sockd.checkconf |
| 40 |
eerror "Something is wrong with your configuration file" |
| 41 |
@@ -44,7 +44,7 @@ |
| 42 |
checkconfig || return 1 |
| 43 |
ebegin "Starting dante sockd" |
| 44 |
start-stop-daemon --start --quiet --pidfile $PIDFILE \ |
| 45 |
- --make-pidfile --exec /usr/sbin/sockd -- ${SOCKD_OPT} &> /dev/null |
| 46 |
+ --make-pidfile --exec /usr/sbin/sockd -- ${SOCKD_OPT} 2>&1 >/dev/null |
| 47 |
eend $? "Failed to start sockd" |
| 48 |
} |
Archives