From c5a1b9374c76306e54b397ff234c44daa3395030 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Tue, 4 Oct 2011 23:10:36 +0000 Subject: [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 --- package/ppp/files/ppp.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'package/ppp/files/ppp.sh') 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}" } -- cgit v1.2.3