aboutsummaryrefslogtreecommitdiffstats
path: root/package/ppp/files
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2011-10-04 23:10:36 +0000
committerJo-Philipp Wich <jow@openwrt.org>2011-10-04 23:10:36 +0000
commitc5a1b9374c76306e54b397ff234c44daa3395030 (patch)
tree364648146f8d64a481249d8ecbbb90b69c11a6c9 /package/ppp/files
parente8ea342ffeeba71c11150ce744815a1420421c36 (diff)
downloadmaster-187ad058-c5a1b9374c76306e54b397ff234c44daa3395030.tar.gz
master-187ad058-c5a1b9374c76306e54b397ff234c44daa3395030.tar.bz2
master-187ad058-c5a1b9374c76306e54b397ff234c44daa3395030.zip
[package] ppp: add workaround for ignored rp_pppoe_ac and rp_pppoe_service options by appending the nic-xxx argument last
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28364 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/ppp/files')
-rw-r--r--package/ppp/files/ppp.sh10
-rw-r--r--package/ppp/files/pppoe.sh4
2 files changed, 11 insertions, 3 deletions
diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh
index 996d542280..7c789fc983 100644
--- a/package/ppp/files/ppp.sh
+++ b/package/ppp/files/ppp.sh
@@ -16,6 +16,13 @@ stop_interface_ppp() {
start_pppd() {
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
config_get proto "$cfg" proto
@@ -110,7 +117,8 @@ start_pppd() {
${disconnect:+disconnect "$disconnect"} \
${ipv6} \
${pppd_options} \
- nodetach
+ nodetach \
+ ${nic}
lock -u "/var/lock/ppp-${link}"
}
diff --git a/package/ppp/files/pppoe.sh b/package/ppp/files/pppoe.sh
index bbd36a11ab..99409f3f08 100644
--- a/package/ppp/files/pppoe.sh
+++ b/package/ppp/files/pppoe.sh
@@ -13,7 +13,7 @@ setup_interface_pppoe() {
config_get mtu "$config" mtu
mtu=${mtu:-1492}
start_pppd "$config" \
+ "nic-$iface" \
plugin rp-pppoe.so \
- mtu $mtu mru $mtu \
- "nic-$iface"
+ mtu $mtu mru $mtu
}