projects
/
openwrt
/
svn-archive
/
archive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add option for setting the mac address (#1014)
[openwrt/svn-archive/archive.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 90f5bf742414659f0916d90b9b7b3acbc359d705..8188203d31726a73d705bb6735b8ebd7bcb8a251 100755
(executable)
--- a/
package/base-files/files/lib/network/config.sh
+++ b/
package/base-files/files/lib/network/config.sh
@@
-66,6
+66,7
@@
setup_interface() {
local iface="$1"
local config="$2"
local proto
local iface="$1"
local config="$2"
local proto
+ local macaddr
[ -n "$config" ] || {
config=$(find_config "$iface")
[ -n "$config" ] || {
config=$(find_config "$iface")
@@
-76,7
+77,8
@@
setup_interface() {
config_get iftype "$config" type
ifconfig "$iface" 2>/dev/null >/dev/null && {
config_get iftype "$config" type
ifconfig "$iface" 2>/dev/null >/dev/null && {
- # make sure the interface is removed from any existing bridge
+ # make sure the interface is removed from any existing bridge and brought down
+ ifconfig "$iface" down
unbridge "$iface"
}
unbridge "$iface"
}
@@
-101,7
+103,8
@@
setup_interface() {
# Interface settings
config_get mtu "$config" mtu
# Interface settings
config_get mtu "$config" mtu
- $DEBUG ifconfig "$iface" ${mtu:+mtu $mtu} up
+ config_get macddr "$config" macaddr
+ $DEBUG ifconfig "$iface" ${macaddr:+hw ether "$macaddr"} ${mtu:+mtu $mtu} up
pidfile="/var/run/$iface.pid"
case "$proto" in
pidfile="/var/run/$iface.pid"
case "$proto" in