mirror of https://github.com/aredn/aredn.git
Merge "Merge branch 'ChaosCalmer' into develop" into develop
This commit is contained in:
commit
32a0d6348d
|
@ -17,7 +17,7 @@ config button
|
||||||
config button
|
config button
|
||||||
option button 'reset'
|
option button 'reset'
|
||||||
option action 'released'
|
option action 'released'
|
||||||
option handler 'firstboot && reboot'
|
option handler 'firstboot -y && reboot'
|
||||||
option min '12'
|
option min '12'
|
||||||
option max '20'
|
option max '20'
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,7 @@ config button
|
||||||
config button
|
config button
|
||||||
option button 'reset'
|
option button 'reset'
|
||||||
option action 'released'
|
option action 'released'
|
||||||
option handler 'firstboot && reboot'
|
option handler 'firstboot -y && reboot'
|
||||||
option min '12'
|
option min '12'
|
||||||
option max '20'
|
option max '20'
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,7 @@ config button
|
||||||
config button
|
config button
|
||||||
option button 'reset'
|
option button 'reset'
|
||||||
option action 'released'
|
option action 'released'
|
||||||
option handler 'firstboot && reboot'
|
option handler 'firstboot -y && reboot'
|
||||||
option min '12'
|
option min '12'
|
||||||
option max '20'
|
option max '20'
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,7 @@ config button
|
||||||
config button
|
config button
|
||||||
option button 'reset'
|
option button 'reset'
|
||||||
option action 'released'
|
option action 'released'
|
||||||
option handler 'firstboot && reboot'
|
option handler 'firstboot -y && reboot'
|
||||||
option min '12'
|
option min '12'
|
||||||
option max '20'
|
option max '20'
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,7 @@ config button
|
||||||
config button
|
config button
|
||||||
option button 'reset'
|
option button 'reset'
|
||||||
option action 'released'
|
option action 'released'
|
||||||
option handler 'firstboot && reboot'
|
option handler 'firstboot -y && reboot'
|
||||||
option min '12'
|
option min '12'
|
||||||
option max '20'
|
option max '20'
|
||||||
|
|
||||||
|
|
|
@ -16,6 +16,6 @@ config button
|
||||||
config button
|
config button
|
||||||
option button 'reset'
|
option button 'reset'
|
||||||
option action 'released'
|
option action 'released'
|
||||||
option handler 'firstboot && reboot'
|
option handler 'firstboot -y && reboot'
|
||||||
option min '12'
|
option min '12'
|
||||||
option max '20'
|
option max '20'
|
||||||
|
|
|
@ -125,7 +125,7 @@ foreach (@tunnelnames)
|
||||||
# add the nameservice plugin
|
# add the nameservice plugin
|
||||||
push @file, qq(\nLoadPlugin "olsrd_nameservice.so.0.3"\n);
|
push @file, qq(\nLoadPlugin "olsrd_nameservice.so.0.3"\n);
|
||||||
push @file, qq({\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 "interval" "30"\n);
|
||||||
push @file, qq( PlParam "timeout" "300"\n);
|
push @file, qq( PlParam "timeout" "300"\n);
|
||||||
push @file, qq( PlParam "name-change-script" "touch /tmp/namechange"\n);
|
push @file, qq( PlParam "name-change-script" "touch /tmp/namechange"\n);
|
||||||
|
|
|
@ -1319,6 +1319,24 @@ sub hardware_info
|
||||||
'usechains' => 1,
|
'usechains' => 1,
|
||||||
'rfband' => '5800ubntus',
|
'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();
|
$boardid = hardware_boardid();
|
||||||
|
|
Loading…
Reference in New Issue