ppp: add workaround for ignored rp_pppoe_ac and rp_pppoe_service options by appending the nic-xxx argument last

SVN-Revision: 28364
owl
Jo-Philipp Wich 2011-10-04 23:10:36 +00:00
parent 829ae01f16
commit 5659ec6918
3 changed files with 12 additions and 4 deletions

View File

@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=ppp PKG_NAME:=ppp
PKG_VERSION:=2.4.5 PKG_VERSION:=2.4.5
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/ppp/ PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/ppp/

View File

@ -16,6 +16,13 @@ stop_interface_ppp() {
start_pppd() { start_pppd() {
local cfg="$1"; shift local cfg="$1"; shift
# Workaround for PPPoE service and AC name options,
# filter out the nic-* argument and append it as last option
local nic=""
case "$1" in
nic-*) nic="$1"; shift ;;
esac
local proto local proto
config_get proto "$cfg" proto config_get proto "$cfg" proto
@ -110,7 +117,8 @@ start_pppd() {
${disconnect:+disconnect "$disconnect"} \ ${disconnect:+disconnect "$disconnect"} \
${ipv6} \ ${ipv6} \
${pppd_options} \ ${pppd_options} \
nodetach nodetach \
${nic}
lock -u "/var/lock/ppp-${link}" lock -u "/var/lock/ppp-${link}"
} }

View File

@ -13,7 +13,7 @@ setup_interface_pppoe() {
config_get mtu "$config" mtu config_get mtu "$config" mtu
mtu=${mtu:-1492} mtu=${mtu:-1492}
start_pppd "$config" \ start_pppd "$config" \
"nic-$iface" \
plugin rp-pppoe.so \ plugin rp-pppoe.so \
mtu $mtu mru $mtu \ mtu $mtu mru $mtu
"nic-$iface"
} }