View | Details | Raw Unified | Return to bug 26890
Collapse All | Expand All

(-)create-ppp.old (-10 / +12 lines)
Lines 61-75 Link Here
61
		PTYOPTION="$PPTP --nolaunchpppd $PPTP_SERVER $PPTP_EXTRA_OPTIONS"
61
		PTYOPTION="$PPTP --nolaunchpppd $PPTP_SERVER $PPTP_EXTRA_OPTIONS"
62
	;;
62
	;;
63
	pppoe)
63
	pppoe)
64
		[ -x "${PPPOE:=$DEFAULT_PPPOE}" ] || {
64
#		[ -x "${PPPOE:=$DEFAULT_PPPOE}" ] || {
65
			print_error "$PPPOE does not exist or is not executable. Try installing rp-pppoe-base RPM."
65
#			print_error "$PPPOE does not exist or is not executable. Try installing rp-pppoe-base RPM."
66
			exit 1
66
#			exit 1
67
		}
67
#		}
68
		[ -n "$HOST" ] || {
68
#		[ -n "$HOST" ] || {
69
			print_error "WARNING: HOST is not set for interface $NAME with PPPTYPE $PPPTYPE"
69
#			print_error "WARNING: HOST is not set for interface $NAME with PPPTYPE $PPPTYPE"
70
			exit 1
70
#			exit 1
71
		}
71
#		}
72
		PTYOPTION="$PPPOE -I $HOST -U $PPPOE_EXTRA_OPTIONS"
72
#		PTYOPTION="$PPPOE -I $HOST -U $PPPOE_EXTRA_OPTIONS"
73
		PTYOPTION="plugin rp-pppoe.so $HOST"
73
	;;
74
	;;
74
	dialup)
75
	dialup)
75
		BASIC_PPPOPTIONS="$BASIC_PPPOPTIONS modem"
76
		BASIC_PPPOPTIONS="$BASIC_PPPOPTIONS modem"
Lines 86-92 Link Here
86
fi
87
fi
87
88
88
# Let the show start...
89
# Let the show start...
89
$PPPD $BASIC_PPPOPTIONS $PPPOPTIONS ${PTYOPTION:+local pty "$PTYOPTION"} \
90
#$PPPD $BASIC_PPPOPTIONS $PPPOPTIONS ${PTYOPTION:+local pty "$PTYOPTION"} \
91
$PPPD $BASIC_PPPOPTIONS $PPPOPTIONS ${PTYOPTION:+ $PTYOPTION} \
90
${PROF_PPPOPTIONSFILE:+ file $PROF_PPPOPTIONSFILE} \
92
${PROF_PPPOPTIONSFILE:+ file $PROF_PPPOPTIONSFILE} \
91
${PROF_PPPINITCHAT:+ init "$CHAT_CMD $PROF_PPPINITCHAT"} \
93
${PROF_PPPINITCHAT:+ init "$CHAT_CMD $PROF_PPPINITCHAT"} \
92
${PROF_PPPCONNECTCHAT:+ connect "$CHAT_CMD $PROF_PPPCONNECTCHAT"} \
94
${PROF_PPPCONNECTCHAT:+ connect "$CHAT_CMD $PROF_PPPCONNECTCHAT"} \

Return to bug 26890