mirror of https://github.com/aredn/aredn.git
bugfix: CPE510: Does not set nodecall or other mac based settings on boot
Change the location lookup to looup based on the radio0.path setting to obtain the mac address.
This commit is contained in:
parent
6e74aaf0f4
commit
5629ce93b7
|
@ -54,13 +54,17 @@ sub fail
|
||||||
|
|
||||||
$commit = 0;
|
$commit = 0;
|
||||||
|
|
||||||
# Added new wifimac parm, the radio0 wont startup without it, use pci device location
|
# Added new wifimac parm, the radio0 wont startup without it, use the path location in wifi config
|
||||||
# may need to find a better way to allow for wider hardware support
|
# Actually it just needs some path to get to the radio.
|
||||||
|
|
||||||
|
# Using radio0.path as it seems to always be set as method to get to the card.
|
||||||
|
chomp ($wifi_path = `uci -q get wireless.radio0.path`);
|
||||||
|
|
||||||
chomp ($wifi_mac = `uci -c /etc/local/uci/ -q get hsmmmesh.settings.wifimac`);
|
chomp ($wifi_mac = `uci -c /etc/local/uci/ -q get hsmmmesh.settings.wifimac`);
|
||||||
|
|
||||||
if($wifi_mac eq "")
|
if($wifi_mac eq "")
|
||||||
{
|
{
|
||||||
open(FILE, "/sys/devices/pci0000:00/0000:00:00.0/ieee80211/phy0/macaddress") or fail("ERROR: wireless mac not available");
|
open(FILE, "/sys/devices/$wifi_path/ieee80211/phy0/macaddress") or fail("ERROR: wireless mac not available");
|
||||||
while(<FILE>)
|
while(<FILE>)
|
||||||
{
|
{
|
||||||
next unless /(\w\w:\w\w:\w\w:\w\w:\w\w:\w\w)/;
|
next unless /(\w\w:\w\w:\w\w:\w\w:\w\w:\w\w)/;
|
||||||
|
@ -78,7 +82,7 @@ chomp ($mac2 = `uci -c /etc/local/uci/ -q get hsmmmesh.settings.mac2`);
|
||||||
|
|
||||||
if($mac2 eq "")
|
if($mac2 eq "")
|
||||||
{
|
{
|
||||||
open(FILE, "/sys/devices/pci0000:00/0000:00:00.0/ieee80211/phy0/macaddress") or fail("ERROR: wireless mac not available");
|
open(FILE, "/sys/devices/$wifi_path/ieee80211/phy0/macaddress") or fail("ERROR: wireless mac not available");
|
||||||
while(<FILE>)
|
while(<FILE>)
|
||||||
{
|
{
|
||||||
next unless /\w\w:\w\w:\w\w:(\w\w):(\w\w):(\w\w)/;
|
next unless /\w\w:\w\w:\w\w:(\w\w):(\w\w):(\w\w)/;
|
||||||
|
|
Loading…
Reference in New Issue