diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-09-06 17:36:01 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-09-06 17:36:01 +0000 |
| commit | 0068b99917c78f80d302624bceeeaf1ef7a4f82f (patch) | |
| tree | 378daaacaabdfca859d917a6cbf12eef5638f0d8 /package | |
| parent | db11e2abd1a7776d82e94fc33fd26dafdc7a6737 (diff) | |
move ppp ifname fixup from pppoe.sh to ppp.sh, so that it applies to all other ppp based protocols as well
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17529 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
| -rw-r--r-- | package/ppp/files/ppp.sh | 6 | ||||
| -rw-r--r-- | package/ppp/files/pppoe.sh | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh index bfa708dad..8dfdab7a0 100644 --- a/package/ppp/files/ppp.sh +++ b/package/ppp/files/ppp.sh @@ -17,6 +17,12 @@ scan_ppp() { start_pppd() { local cfg="$1"; shift + local ifname + + # make sure the network state references the correct ifname + scan_ppp "$cfg" + config_get ifname "$cfg" ifname + set_interface_ifname "$cfg" "$ifname" # make sure only one pppd process is started lock "/var/lock/ppp-${cfg}" diff --git a/package/ppp/files/pppoe.sh b/package/ppp/files/pppoe.sh index c0bb51516..74f1a8579 100644 --- a/package/ppp/files/pppoe.sh +++ b/package/ppp/files/pppoe.sh @@ -10,11 +10,6 @@ setup_interface_pppoe() { /sbin/insmod $module 2>&- >&- done - # make sure the network state references the correct ifname - scan_ppp "$config" - config_get ifname "$config" ifname - set_interface_ifname "$config" "$ifname" - config_get mtu "$config" mtu mtu=${mtu:-1492} start_pppd "$config" \ |