From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 5 Jan 2009 18:52:40 +0000 (+0100)
Subject: Fix modem dialup
X-Git-Tag: v2.5-beta1~228
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7c653e4b85459992c8fc59673cc2cbbcce2679cf;p=ipfire-2.x.git

Fix modem dialup
---

diff --git a/src/initscripts/init.d/networking/red b/src/initscripts/init.d/networking/red
index 9b4ffe8a07..a575c0e148 100644
--- a/src/initscripts/init.d/networking/red
+++ b/src/initscripts/init.d/networking/red
@@ -295,8 +295,10 @@ case "${1}" in
 			
 			if [ "$TYPE" == "modem" ]; then
 				PLUGOPTS=" /dev/${COMPORT} ${DTERATE} connect /etc/ppp/dialer lock modem crtscts"
+				METHOD="PPPOE_PLUGIN"
 			elif [ "$TYPE" == "serial" ]; then
 				PLUGOPTS=" /dev/${COMPORT} ${DTERATE} connect /bin/true lock modem crtscts"
+				METHOD="PPPOE_PLUGIN"
 			fi
 		
 			### Standard PPP options we always use
@@ -326,11 +328,12 @@ case "${1}" in
 			#
 			if [ "$TYPE" == "pptp" ]; then
 				PPPOE_CMD="pptp $PPTP_PEER --nolaunchpppd"
+				METHOD=""
 			fi
 			
 			### Run everything
 			#
-			if [ "$TYPE" == "pppoe" ] && [ "${METHOD}" == "PPPOE_PLUGIN" ]; then
+			if [ "$METHOD" == "PPPOE_PLUGIN" ]; then
 				/usr/sbin/pppd $PPP_STD_OPTIONS $DEBUG $DEMAND >/dev/null 2>&1 &
 				evaluate_retval
 				# echo PLUGIN: /usr/sbin/pppd $PPP_STD_OPTIONS $DEBUG $DEMAND