projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ppp: add workaround for ignored rp_pppoe_ac and rp_pppoe_service options by appending...
[openwrt/openwrt.git]
/
package
/
ppp
/
files
/
ppp.sh
diff --git
a/package/ppp/files/ppp.sh
b/package/ppp/files/ppp.sh
index 996d542280cd1d8ea59ac4f55951e8ca97fceaea..7c789fc9837d62b680e0def3ae92f9e69572e233 100644
(file)
--- 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
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
local proto
config_get proto "$cfg" proto
@@
-110,7
+117,8
@@
start_pppd() {
${disconnect:+disconnect "$disconnect"} \
${ipv6} \
${pppd_options} \
${disconnect:+disconnect "$disconnect"} \
${ipv6} \
${pppd_options} \
- nodetach
+ nodetach \
+ ${nic}
lock -u "/var/lock/ppp-${link}"
}
lock -u "/var/lock/ppp-${link}"
}