Skip to content

Commit 0e653dc

Browse files
committed
rak7267: Fix random wifi mac + hostname.
See fc5e81b for details.
1 parent 30afbf0 commit 0e653dc

File tree

5 files changed

+16
-19
lines changed

5 files changed

+16
-19
lines changed
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
[ "$ACTION" == "add" ] || exit 0
2+
[ "$DEVTYPE" == "wlan" ] || exit 0
3+
4+
. /lib/functions.sh
5+
. /lib/functions/system.sh
6+
7+
uci set wireless.@wifi-iface[0].macaddr=$(macaddr_add "$(mtd_get_mac_binary factory 0x4)" 1)
8+
uci commit wireless
9+
wifi reload
10+

conf/rak_rak7267/files/etc/uci-defaults/90_config_chirpstack_ap

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,10 @@ if [ "$(uci -q get wireless.default_radio0.ssid)" != "OpenWrt" ]; then
66
exit 0
77
fi
88

9-
GWID_END=""
9+
. /lib/functions.sh
10+
. /lib/functions/system.sh
1011

11-
ip link show eth0
12-
if [ $? -eq 0 ]; then
13-
GWID_END=$(ip link show eth0 | awk '/ether/ {print $2}' | awk -F\: '{print $4$5$6}')
14-
else
15-
GWID_END=$(ip link show wlan0 | awk '/ether/ {print $2}' | awk -F\: '{print $4$5$6}')
16-
fi
12+
GWID_END=$(mtd_get_mac_binary factory 0x4 | awk -F\: '{print $4$5$6}')
1713

1814
uci -q batch << EOI
1915
set dhcp.wwan=dhcp
@@ -44,5 +40,3 @@ set firewall.@zone[0].masq='1'
4440
commit firewall
4541

4642
EOI
47-
48-
service network restart

conf/rak_rak7267/files/etc/uci-defaults/90_config_lan

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,3 @@ delete network.lan.ipaddr
44
delete network.lan.netmask
55
delete network.lan.ip6assign
66
EOI
7-
8-
service network restart

conf/rak_rak7267/files/etc/uci-defaults/90_leds

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,3 @@ add_list system.led_eth_led.mode='tx'
1313
add_list system.led_eth_led.mode='rx'
1414
EOI
1515
uci commit system
16-
service led restart

conf/rak_rak7267/files/etc/uci-defaults/90_set_hostname

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
1-
GWID_END=""
1+
. /lib/functions.sh
2+
. /lib/functions/system.sh
23

3-
ip link show eth0
4-
if [ $? -eq 0 ]; then
5-
GWID_END=$(ip link show eth0 | awk '/ether/ {print $2}' | awk -F\: '{print $4$5$6}')
6-
else
7-
GWID_END=$(ip link show wlan0 | awk '/ether/ {print $2}' | awk -F\: '{print $4$5$6}')
8-
fi
4+
GWID_END=$(mtd_get_mac_binary factory 0x4 | awk -F\: '{print $4$5$6}')
95

106
uci set system.@system[0].hostname="chirpstack-${GWID_END}"
117
uci commit system

0 commit comments

Comments
 (0)