Attachment 5398 Details for Bug 26890 – замена pppoe-connect на rp-pppoe.so

[patch] замена pppoe-connect на rp-pppoe.so

create-ppp.diff (text/plain), 1.40 KB, created by Alexei Takaseev on 2012-03-22 17:26:12 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: Alexei Takaseev

Created: 2012-03-22 17:26:12 MSK

Size: 1.40 KB

patch

obsolete

>--- create-ppp.old	2011-10-28 04:09:39.000000000 +0900
>+++ create-ppp	2012-03-22 22:20:45.000000000 +0900
>@@ -61,15 +61,16 @@
> 		PTYOPTION="$PPTP --nolaunchpppd $PPTP_SERVER $PPTP_EXTRA_OPTIONS"
> 	;;
> 	pppoe)
>-		[ -x "${PPPOE:=$DEFAULT_PPPOE}" ] || {
>-			print_error "$PPPOE does not exist or is not executable. Try installing rp-pppoe-base RPM."
>-			exit 1
>-		}
>-		[ -n "$HOST" ] || {
>-			print_error "WARNING: HOST is not set for interface $NAME with PPPTYPE $PPPTYPE"
>-			exit 1
>-		}
>-		PTYOPTION="$PPPOE -I $HOST -U $PPPOE_EXTRA_OPTIONS"
>+#		[ -x "${PPPOE:=$DEFAULT_PPPOE}" ] || {
>+#			print_error "$PPPOE does not exist or is not executable. Try installing rp-pppoe-base RPM."
>+#			exit 1
>+#		}
>+#		[ -n "$HOST" ] || {
>+#			print_error "WARNING: HOST is not set for interface $NAME with PPPTYPE $PPPTYPE"
>+#			exit 1
>+#		}
>+#		PTYOPTION="$PPPOE -I $HOST -U $PPPOE_EXTRA_OPTIONS"
>+		PTYOPTION="plugin rp-pppoe.so $HOST"
> 	;;
> 	dialup)
> 		BASIC_PPPOPTIONS="$BASIC_PPPOPTIONS modem"
>@@ -86,7 +87,8 @@
> fi
> 
> # Let the show start...
>-$PPPD $BASIC_PPPOPTIONS $PPPOPTIONS ${PTYOPTION:+local pty "$PTYOPTION"} \
>+#$PPPD $BASIC_PPPOPTIONS $PPPOPTIONS ${PTYOPTION:+local pty "$PTYOPTION"} \
>+$PPPD $BASIC_PPPOPTIONS $PPPOPTIONS ${PTYOPTION:+ $PTYOPTION} \
> ${PROF_PPPOPTIONSFILE:+ file $PROF_PPPOPTIONSFILE} \
> ${PROF_PPPINITCHAT:+ init "$CHAT_CMD $PROF_PPPINITCHAT"} \
> ${PROF_PPPCONNECTCHAT:+ connect "$CHAT_CMD $PROF_PPPCONNECTCHAT"} \

Actions: View | Diff

Attachments on bug 26890: 5398 | 5399 | 5404