diff options
| author | Mike Baker <mbm@openwrt.org> | 2004-05-11 03:55:23 +0000 |
|---|---|---|
| committer | Mike Baker <mbm@openwrt.org> | 2004-05-11 03:55:23 +0000 |
| commit | af0bb0db0c603dd7792f278ff8b3cca0ccf8d89b (patch) | |
| tree | 3d8e390e3e2e5567cb65fd8c44ef21097ba2438c /root/etc | |
| parent | 9c5ee8b2bb446b1152b37b33f8cf807e93f3ad86 (diff) | |
| download | upstream-af0bb0db0c603dd7792f278ff8b3cca0ccf8d89b.tar.gz upstream-af0bb0db0c603dd7792f278ff8b3cca0ccf8d89b.tar.bz2 upstream-af0bb0db0c603dd7792f278ff8b3cca0ccf8d89b.zip | |
move wifi mac fix to S10boot
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'root/etc')
| -rwxr-xr-x | root/etc/functions.sh | 4 | ||||
| -rwxr-xr-x | root/etc/init.d/S10boot | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/root/etc/functions.sh b/root/etc/functions.sh index 8befcde51ec..4e96ad77ca2 100755 --- a/root/etc/functions.sh +++ b/root/etc/functions.sh @@ -28,13 +28,9 @@ if_valid () ( return $? ) -mac () { - echo $2|awk -F ":" '{for(x=6,y='$1';x;x--){y+=int("0x"$x);$x=sprintf("%02x",y%256);y/=256}gsub(" ",":");print$0}' -} wifi () ( debug "### wifi $1 ###" if=$(awk 'gsub(":","") {print $1}' /proc/net/wireless) - $DEBUG ifconfig $if hw ether $(mac 2 $(nvram get et0macaddr)) $DEBUG wlconf $if $1 ) diff --git a/root/etc/init.d/S10boot b/root/etc/init.d/S10boot index 437bd7e0b0a..45b9dd28b4a 100755 --- a/root/etc/init.d/S10boot +++ b/root/etc/init.d/S10boot @@ -3,6 +3,12 @@ sysctl -p echo "S" > /proc/jffs2_bbc # networking stub +[ "$(nvram get il0macaddr)" = "00:90:4c:5f:00:2a" ] && { + # force unique mac + nvram set il0macaddr=$(nvram get et0macaddr| + awk -F ":" '{for(x=6,y=2;x;x--){y+=int("0x"$x);$x=sprintf("%02x",y%256);y/=256}gsub(" ",":");print$0}') +} + insmod et insmod wl |