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

Conflicts:

	src/initscripts/init.d/connectd
This commit is contained in:
Maniacikarus
2008-08-26 21:10:08 +02:00

View File

@@ -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)