diff options
| author | John Crispin <john@openwrt.org> | 2013-11-25 14:09:16 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2013-11-25 14:09:16 +0000 |
| commit | cba772f5bc0a2fa481cbd80fcf990bc35ac642f0 (patch) | |
| tree | 9392c894dacefe31cd054f9749bacbda2eabc68f | |
| parent | 6295f38c8fb4bb7839e7282cfdd93af164314f6b (diff) | |
| download | master-31e0f0ae-cba772f5bc0a2fa481cbd80fcf990bc35ac642f0.tar.gz master-31e0f0ae-cba772f5bc0a2fa481cbd80fcf990bc35ac642f0.tar.bz2 master-31e0f0ae-cba772f5bc0a2fa481cbd80fcf990bc35ac642f0.zip | |
pppd: Place plugin-specific options after `plugin name`.
Before this patch, if we specify a plugin specific option through
`pppd_options` in /etc/config/network, e.g. `rp_pppoe_verbose 1`, pppd
would quit with the following error in log.
Wed Oct 9 09:42:58 2013 daemon.notice netifd: GORG (1689): /usr/sbin/pppd: unrecognized option 'rp_pppoe_verbose'
Wed Oct 9 09:42:58 2013 daemon.err pppd[1689]: unrecognized option 'rp_pppoe_verbose'
Wed Oct 9 09:42:58 2013 daemon.notice netifd: GORG (1689): pppd version 2.4.5
Wed Oct 9 09:42:58 2013 daemon.notice netifd: GORG (1689): Usage: /usr/sbin/pppd [ options ], where options are:
This is due to the requirement that function add_option() should be
called by the plugin_init() function first before pppd can parse those
options.
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
SVN-Revision: 38911
| -rwxr-xr-x | package/network/services/ppp/files/ppp.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/network/services/ppp/files/ppp.sh b/package/network/services/ppp/files/ppp.sh index 02b40558ca..284d44cfed 100755 --- a/package/network/services/ppp/files/ppp.sh +++ b/package/network/services/ppp/files/ppp.sh @@ -55,7 +55,7 @@ ppp_generic_setup() { ip-down-script /lib/netifd/ppp-down \ ipv6-down-script /lib/netifd/ppp-down \ ${mtu:+mtu $mtu mru $mtu} \ - $pppd_options "$@" + "$@" $pppd_options } ppp_generic_teardown() { |