Mirrors
/
aredn
mirror of https://github.com/aredn/aredn.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ChaosCalmer' into develop 

Change-Id: I26a8677595a25aae267b7365f1e5835ea68f49b4
This commit is contained in:
Conrad Lara - KG6JEI 2016-06-19 19:25:27 -07:00
parent ae6688dc33 b8a9c18850
commit 061ede3488
8 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/etc/config.ap/system
View File

@ -17,7 +17,7 @@ config button
config button
option button 'reset'
option action 'released'
option handler 'firstboot && reboot'
option handler 'firstboot -y && reboot'
option min '12'
option max '20'

2
files/etc/config.client/system
View File

@ -17,7 +17,7 @@ config button
config button
option button 'reset'
option action 'released'
option handler 'firstboot && reboot'
option handler 'firstboot -y && reboot'
option min '12'
option max '20'

2
files/etc/config.mesh/system
View File

@ -17,7 +17,7 @@ config button
config button
option button 'reset'
option action 'released'
option handler 'firstboot && reboot'
option handler 'firstboot -y && reboot'
option min '12'
option max '20'

2
files/etc/config.mesh_ap/system
View File

@ -17,7 +17,7 @@ config button
config button
option button 'reset'
option action 'released'
option handler 'firstboot && reboot'
option handler 'firstboot -y && reboot'
option min '12'
option max '20'

2
files/etc/config.router/system
View File

@ -17,7 +17,7 @@ config button
config button
option button 'reset'
option action 'released'
option handler 'firstboot && reboot'
option handler 'firstboot -y && reboot'
option min '12'
option max '20'

2
files/etc/config/system
View File

@ -16,6 +16,6 @@ config button
config button
option button 'reset'
option action 'released'
option handler 'firstboot && reboot'
option handler 'firstboot -y && reboot'
option min '12'
option max '20'

2
files/usr/local/bin/olsrd-config
View File

@ -125,7 +125,7 @@ foreach (@tunnelnames)
# add the nameservice plugin
push @file, qq(\nLoadPlugin "olsrd_nameservice.so.0.3"\n);
push @file, qq({\n);
push @file, qq( PlParam "sighup-pid-file" "/var/run/dnsmasq.pid"\n);
push @file, qq( PlParam "sighup-pid-file" "/var/run/dnsmasq/dnsmasq.pid"\n);
push @file, qq( PlParam "interval" "30"\n);
push @file, qq( PlParam "timeout" "300"\n);
push @file, qq( PlParam "name-change-script" "touch /tmp/namechange"\n);

18
files/www/cgi-bin/perlfunc.pm
View File

@ -1319,6 +1319,24 @@ sub hardware_info
'usechains' => 1,
'rfband' => '5800ubntus',
},
'Ubiquiti Loco M XW' => {
'name' => 'NanoStation Loco M5 XW',
'comment' => 'NanoStation Loco M5 XW 0xe845 (in testing)',
'supported' => '-2',
'maxpower' => '22',
'pwroffset' => '1',
'usechains' => 1,
'rfband' => '5800ubntus',
},
'Ubiquiti Rocket M XW' => {
'name' => 'Rocket M5 XW',
'comment' => 'Rocket M5 XW 0xe6b5 (in testing)',
'supported' => '-2',
'maxpower' => '22',
'pwroffset' => '5',
'usechains' => 1,
'rfband' => '5800ubntus',
},
);
$boardid = hardware_boardid();