use the right hotplug2 invocation for initramfs

[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 b8f350d..7fa1d37 100755 (executable)
--- a/package/base-files/files/lib/network/config.sh
+++ b/package/base-files/files/lib/network/config.sh
@@ -40,10 +40,11 @@ scan_interfaces() {
                                append interfaces "$CONFIG_SECTION"
                                config_get iftype "$CONFIG_SECTION" type
                                config_get ifname "$CONFIG_SECTION" ifname
                                append interfaces "$CONFIG_SECTION"
                                config_get iftype "$CONFIG_SECTION" type
                                config_get ifname "$CONFIG_SECTION" ifname

-                               config_set "$CONFIG_SECTION" device "$ifname"
+                               config_get device "$CONFIG_SECTION" device
+                               config_set "$CONFIG_SECTION" device "${device:-$ifname}"

                                case "$iftype" in
                                        bridge)
                                case "$iftype" in
                                        bridge)

-                                               config_set "$CONFIG_SECTION" ifnames "$ifname"
+                                               config_set "$CONFIG_SECTION" ifnames "${device:-$ifname}"

                                                config_set "$CONFIG_SECTION" ifname br-"$CONFIG_SECTION"
                                        ;;
                                esac
                                                config_set "$CONFIG_SECTION" ifname br-"$CONFIG_SECTION"
                                        ;;
                                esac


@@ -74,7 +75,7 @@ prepare_interface() {
        # if we're called for the bridge interface itself, don't bother trying
        # to create any interfaces here. The scripts have already done that, otherwise
        # the bridge interface wouldn't exist.
        # if we're called for the bridge interface itself, don't bother trying
        # to create any interfaces here. The scripts have already done that, otherwise
        # the bridge interface wouldn't exist.

-       [ "br-$config" = "$iface" -o -f "$iface" ] && return 0;
+       [ "br-$config" = "$iface" -o -e "$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


@@ -113,6 +114,15 @@ prepare_interface() {
        return 0
 }
 
        return 0
 }
 

+set_interface_ifname() {
+       local config="$1"
+       local ifname="$2"
+
+       config_get device "$1" device
+       uci_set_state network "$config" ifname "$ifname"
+       uci_set_state network "$config" device "$device"
+}
+

 setup_interface() {
        local iface="$1"
        local config="$2"
 setup_interface() {
        local iface="$1"
        local config="$2"


@@ -138,8 +148,9 @@ setup_interface() {
        # Interface settings
        config_get mtu "$config" mtu
        config_get macaddr "$config" macaddr
        # Interface settings
        config_get mtu "$config" mtu
        config_get macaddr "$config" macaddr

-       $DEBUG ifconfig "$iface" ${macaddr:+hw ether "$macaddr"} ${mtu:+mtu $mtu} up
-       uci set "/var/state/network.$config.ifname=$iface"
+       grep "$iface:" /proc/net/dev > /dev/null && \
+               $DEBUG ifconfig "$iface" ${macaddr:+hw ether "$macaddr"} ${mtu:+mtu $mtu} up
+       set_interface_ifname "$config" "$iface"

 
        pidfile="/var/run/$iface.pid"
        case "$proto" in
 
        pidfile="/var/run/$iface.pid"
        case "$proto" in