various patches to add support for ppp over evdo or character devices

[openwrt.git] / package / base-files / files / lib / network / config.sh

diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh
index 8a59687..7e90368 100755 (executable)
--- a/package/base-files/files/lib/network/config.sh
+++ b/package/base-files/files/lib/network/config.sh
@@ -24,6 +24,7 @@ find_config() {
 }
 
 scan_interfaces() {
 }
 
 scan_interfaces() {

+       local cfgfile="$1"

        local mode iftype iface ifname device
        interfaces=
        config_cb() {
        local mode iftype iface ifname device
        interfaces=
        config_cb() {


@@ -50,7 +51,7 @@ scan_interfaces() {
                        ;;
                esac
        }
                        ;;
                esac
        }

-       config_load network
+       config_load "${cfgfile:-network}"

 }
 
 add_vlan() {
 }
 
 add_vlan() {


@@ -74,6 +75,8 @@ prepare_interface() {
        # to create any interfaces here. The scripts have already done that, otherwise
        # the bridge interface wouldn't exist.
        [ "$iface" = "br-$config" ] && return 0;
        # to create any interfaces here. The scripts have already done that, otherwise
        # the bridge interface wouldn't exist.
        [ "$iface" = "br-$config" ] && return 0;

+
+       [ -f "$iface" ] && return 0;

        
        ifconfig "$iface" 2>/dev/null >/dev/null && {
                # make sure the interface is removed from any existing bridge and brought down
        
        ifconfig "$iface" 2>/dev/null >/dev/null && {
                # make sure the interface is removed from any existing bridge and brought down


@@ -83,6 +86,7 @@ prepare_interface() {
 
        # Setup VLAN interfaces
        add_vlan "$iface"
 
        # Setup VLAN interfaces
        add_vlan "$iface"

+       ifconfig "$iface" 2>/dev/null >/dev/null || return 0

 
        # Setup bridging
        config_get iftype "$config" type
 
        # Setup bridging
        config_get iftype "$config" type