Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

Conflicts:

	src/initscripts/init.d/connectd

diff --git a/src/initscripts/init.d/connectd b/src/initscripts/init.d/connectd
index fbcb32d8a2597b7cbe78a8d43c325548a8240b4f..75d51d26005e0ecd182f75d4d5b70130717f38a7 100644 (file)
--- a/src/initscripts/init.d/connectd
+++ b/src/initscripts/init.d/connectd
@@ -81,8 +81,7 @@ case "$1" in
                        echo $ATTEMPTS > /var/ipfire/red/keepconnected
                        sleep ${HOLDOFF}
                fi
-               
-               /etc/rc.d/init.d/network start red &
+               /etc/rc.d/init.d/network start red >/dev/tty12 2>&1 </dev/tty12 &
                ;;
                
   reconnect)