move wifi mac fix to S10boot

SVN-Revision: 27

diff --git a/root/etc/functions.sh b/root/etc/functions.sh
index 8befcde51eca8e7946443712dc93c830a6b1260f..4e96ad77ca21d3bc315aee7fc4e7f3bed00907fe 100755 (executable)
--- 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 437bd7e0b0a367ce3def983af3ed4869abaf1fe7..45b9dd28b4a08ccca8af31ad1985d086bbbe7a4b 100755 (executable)
--- 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