diff options
| -rw-r--r-- | package/base-files/Makefile | 2 | ||||
| -rwxr-xr-x | package/base-files/files/lib/network/config.sh | 11 | ||||
| -rwxr-xr-x | package/base-files/files/sbin/wifi | 3 |
3 files changed, 12 insertions, 4 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 57d53ecc1f..b148bdf33f 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=base-files -PKG_RELEASE:=16 +PKG_RELEASE:=17 PKG_FILE_DEPEND:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh index 29b7fe5c13..0ab46c18af 100755 --- a/package/base-files/files/lib/network/config.sh +++ b/package/base-files/files/lib/network/config.sh @@ -83,6 +83,7 @@ sort_list() { prepare_interface() { local iface="$1" local config="$2" + local vifmac="$3" # 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 @@ -93,6 +94,12 @@ prepare_interface() { # make sure the interface is removed from any existing bridge and deconfigured ifconfig "$iface" 0.0.0.0 unbridge "$iface" + + # Change interface MAC address if requested + [ -n "$vifmac" ] && { + ifconfig "$iface" down + ifconfig "$iface" hw ether "$vifmac" up + } } # Setup VLAN interfaces @@ -209,6 +216,7 @@ setup_interface_alias() { setup_interface() { local iface="$1" local config="$2" + local vifmac="$4" local proto local macaddr @@ -218,7 +226,7 @@ setup_interface() { } proto="${3:-$(config_get "$config" proto)}" - prepare_interface "$iface" "$config" || return 0 + prepare_interface "$iface" "$config" "$vifmac" || return 0 [ "$iface" = "br-$config" ] && { # need to bring up the bridge and wait a second for @@ -231,7 +239,6 @@ setup_interface() { # Interface settings config_get mtu "$config" mtu config_get macaddr "$config" macaddr - macaddr="${macaddr:-$3}" grep "$iface:" /proc/net/dev > /dev/null && \ $DEBUG ifconfig "$iface" down && \ $DEBUG ifconfig "$iface" ${macaddr:+hw ether "$macaddr"} ${mtu:+mtu $mtu} up diff --git a/package/base-files/files/sbin/wifi b/package/base-files/files/sbin/wifi index 30ecb1b77c..e0aca63155 100755 --- a/package/base-files/files/sbin/wifi +++ b/package/base-files/files/sbin/wifi @@ -66,11 +66,12 @@ wifi_detect() { start_net() {( local iface="$1" local config="$2" + local vifmac="$3" [ -f "/var/run/$iface.pid" ] && kill "$(cat /var/run/${iface}.pid)" 2>/dev/null include /lib/network scan_interfaces - setup_interface "$1" "$2" "$3" + setup_interface "$iface" "$config" "" "$vifmac" )} set_wifi_up() { |