move ppp ifname fixup from pppoe.sh to ppp.sh, so that it applies to all other ppp...
authorFelix Fietkau <nbd@openwrt.org>
Sun, 6 Sep 2009 17:36:01 +0000 (17:36 +0000)
committerFelix Fietkau <nbd@openwrt.org>
Sun, 6 Sep 2009 17:36:01 +0000 (17:36 +0000)
SVN-Revision: 17529

package/ppp/files/ppp.sh
package/ppp/files/pppoe.sh

index bfa708d..8dfdab7 100644 (file)
@@ -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}"
index c0bb515..74f1a85 100644 (file)
@@ -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" \