From 421c9202a3d21cebc433588da1bdc2e7e00ac9e9 Mon Sep 17 00:00:00 2001 From: Mike Baker Date: Tue, 11 May 2004 03:55:23 +0000 Subject: [PATCH] move wifi mac fix to S10boot SVN-Revision: 27 --- root/etc/functions.sh | 4 ---- 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 8befcde51e..4e96ad77ca 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 437bd7e0b0..45b9dd28b4 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