diff --git a/bsp/default/root_file_system/etc/rc.local b/bsp/default/root_file_system/etc/rc.local index 4ed19d6..c3931af 100755 --- a/bsp/default/root_file_system/etc/rc.local +++ b/bsp/default/root_file_system/etc/rc.local @@ -10,21 +10,14 @@ batctl if add wlan0-1 #echo none > /sys/devices/platform/ar231x-wmac.0/leds/ath5k-phy0\:\:rx/trigger #echo phy0tx > /sys/devices/platform/ar231x-wmac.0/leds/ath5k-phy0\:\:tx/trigger -toLower() { - echo $1 | sed -e "s/A/a/g" -e "s/B/b/g" -e "s/C/c/g" -e "s/D/d/g" -e "s/E/e/g" -e "s/F/f/g" -} - # todo: all devices or only dir300 ? if uci get network.mesh.macaddr then echo "MAC is set already" else - BRMAC=`ip link | grep br-mesh -A1 | grep link | awk '{ print $2 }'` - BRMAC=`toLower $BRMAC` - WLMAC=`ip link | grep wlan0 -A1 | grep link | awk '{ print $2 }'` - WLMAC=`toLower $WLMAC` - ETMAC=`ip link | grep eth0 -A1 | grep link | awk '{ print $2 }'` - ETMAC=`toLower $ETMAC` + BRMAC=$(awk '{ tolower($0); print }' /sys/class/net/br-mesh/address) + WLMAC=$(awk '{ tolower($0); print }' /sys/class/net/wlan0/address) + ETMAC=$(awk '{ tolower($0); print }' /sys/class/net/eth0/address) if [ "$WLMAC" != "" ] && [ "$BRMAC" != "" ] && [ "$BRMAC" = "$ETMAC" ]; then if [[ "$BRMAC" != "$WLMAC" ]]; then diff --git a/bsp/dir300/root_file_system/etc/rc.local b/bsp/dir300/root_file_system/etc/rc.local index c7276f6..fc38e21 100755 --- a/bsp/dir300/root_file_system/etc/rc.local +++ b/bsp/dir300/root_file_system/etc/rc.local @@ -10,21 +10,14 @@ batctl if add wlan0-1 #echo none > /sys/devices/platform/ar231x-wmac.0/leds/ath5k-phy0\:\:rx/trigger #echo phy0tx > /sys/devices/platform/ar231x-wmac.0/leds/ath5k-phy0\:\:tx/trigger -toLower() { - echo $1 | sed -e "s/A/a/g" -e "s/B/b/g" -e "s/C/c/g" -e "s/D/d/g" -e "s/E/e/g" -e "s/F/f/g" -} - # todo: all devices or only dir300 ? if uci get network.mesh.macaddr then echo "MAC is set already" else - BRMAC=`ip link | grep br-mesh -A1 | grep link | awk '{ print $2 }'` - BRMAC=`toLower $BRMAC` - WLMAC=`ip link | grep wlan0 -A1 | grep link | awk '{ print $2 }'` - WLMAC=`toLower $WLMAC` - ETMAC=`ip link | grep eth0 -A1 | grep link | awk '{ print $2 }'` - ETMAC=`toLower $ETMAC` + BRMAC=$(awk '{ tolower($0); print }' /sys/class/net/br-mesh/address) + WLMAC=$(awk '{ tolower($0); print }' /sys/class/net/wlan0/address) + ETMAC=$(awk '{ tolower($0); print }' /sys/class/net/eth0/address) if [ "$WLMAC" != "" ] && [ "$BRMAC" != "" ] && [ "$BRMAC" = "$ETMAC" ]; then if [[ "$BRMAC" != "$WLMAC" ]]; then diff --git a/bsp/fonera/root_file_system/etc/rc.local b/bsp/fonera/root_file_system/etc/rc.local index 1ddfa10..7988ef6 100755 --- a/bsp/fonera/root_file_system/etc/rc.local +++ b/bsp/fonera/root_file_system/etc/rc.local @@ -10,10 +10,6 @@ batctl if add wlan0-1 #echo none > /sys/devices/platform/ar231x-wmac.0/leds/ath5k-phy0\:\:rx/trigger #echo phy0tx > /sys/devices/platform/ar231x-wmac.0/leds/ath5k-phy0\:\:tx/trigger -toLower() { - echo $1 | sed -e "s/A/a/g" -e "s/B/b/g" -e "s/C/c/g" -e "s/D/d/g" -e "s/E/e/g" -e "s/F/f/g" -} - #. /etc/firewall.user #busybox-httpd for crawldata @@ -28,12 +24,9 @@ if uci get network.mesh.macaddr then echo "MAC is set already" else - BRMAC=`ip link | grep br-mesh -A1 | grep link | awk '{ print $2 }'` - BRMAC=`toLower $BRMAC` - WLMAC=`ip link | grep wlan0 -A1 | grep link | awk '{ print $2 }'` - WLMAC=`toLower $WLMAC` - ETMAC=`ip link | grep eth0 -A1 | grep link | awk '{ print $2 }'` - ETMAC=`toLower $ETMAC` + BRMAC=$(awk '{ tolower($0); print }' /sys/class/net/br-mesh/address) + WLMAC=$(awk '{ tolower($0); print }' /sys/class/net/wlan0/address) + ETMAC=$(awk '{ tolower($0); print }' /sys/class/net/eth0/address) if [ "$WLMAC" != "" ] && [ "$BRMAC" != "" ] && [ "$BRMAC" != "$ETMAC" ]; then echo "Fixing wrong MAC on br-mesh" diff --git a/bsp/wr741nd2/root_file_system/etc/rc.local b/bsp/wr741nd2/root_file_system/etc/rc.local index 7a66ece..bb11927 100755 --- a/bsp/wr741nd2/root_file_system/etc/rc.local +++ b/bsp/wr741nd2/root_file_system/etc/rc.local @@ -2,8 +2,8 @@ # the system init finished. By default this file does nothing. #Set Mac-Addr of wr1043nd wifi interface if not right -WLAN0_MACADDR=`ifconfig -a wlan0 | grep 'HWaddr' | awk '{ print $5}'` -BRMESH_MACADDR=`ifconfig -a br-mesh | grep 'HWaddr' | awk '{ print $5}'` +WLAN0_MACADDR=$(cat /sys/class/net/wlan0/address) +BRMESH_MACADDR=$(cat /sys/class/net/br-mesh/address) if [[ "$WLAN0_MACADDR=" != "$BRMESH_MACADDR=" ]]; then echo "Fixing wrong MAC on br-mesh" diff --git a/bsp/wr741nd4/root_file_system/etc/rc.local b/bsp/wr741nd4/root_file_system/etc/rc.local index 7a66ece..bb11927 100755 --- a/bsp/wr741nd4/root_file_system/etc/rc.local +++ b/bsp/wr741nd4/root_file_system/etc/rc.local @@ -2,8 +2,8 @@ # the system init finished. By default this file does nothing. #Set Mac-Addr of wr1043nd wifi interface if not right -WLAN0_MACADDR=`ifconfig -a wlan0 | grep 'HWaddr' | awk '{ print $5}'` -BRMESH_MACADDR=`ifconfig -a br-mesh | grep 'HWaddr' | awk '{ print $5}'` +WLAN0_MACADDR=$(cat /sys/class/net/wlan0/address) +BRMESH_MACADDR=$(cat /sys/class/net/br-mesh/address) if [[ "$WLAN0_MACADDR=" != "$BRMESH_MACADDR=" ]]; then echo "Fixing wrong MAC on br-mesh" diff --git a/bsp/wr841nd7/root_file_system/etc/rc.local b/bsp/wr841nd7/root_file_system/etc/rc.local index 7a66ece..e44abfd 100755 --- a/bsp/wr841nd7/root_file_system/etc/rc.local +++ b/bsp/wr841nd7/root_file_system/etc/rc.local @@ -2,8 +2,8 @@ # the system init finished. By default this file does nothing. #Set Mac-Addr of wr1043nd wifi interface if not right -WLAN0_MACADDR=`ifconfig -a wlan0 | grep 'HWaddr' | awk '{ print $5}'` -BRMESH_MACADDR=`ifconfig -a br-mesh | grep 'HWaddr' | awk '{ print $5}'` +WLAN0_MACADDR=$(cat /sys/class/net/wlan0/address) +WLAN0_MACADDR=$(cat /sys/class/net/br-mesh/address) if [[ "$WLAN0_MACADDR=" != "$BRMESH_MACADDR=" ]]; then echo "Fixing wrong MAC on br-mesh"