move ppp ifname fixup from pppoe.sh to ppp.sh, so that it applies to all other ppp...

SVN-Revision: 17529

diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh
index bfa708dadc03c45d87c4de88660d6360c615cda9..8dfdab7a0baa808dfc0420770cdd51d4afe69cd0 100644 (file)
--- 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 c0bb515162e8c9c96269932badf17034d523c933..74f1a8579c5e8b81a520ef1f97eb0e63158f8140 100644 (file)
--- 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" \