summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2015-03-11 10:07:25 -0300
committerRenato Botelho <garga@FreeBSD.org>2015-03-11 10:07:25 -0300
commita03974a3fa042bbffd867cdc52970a26dae6fb85 (patch)
treed6eb2021bd411e4a5d493a13f127ea6c1e9664d0 /etc
parent05036071e21b31a97fa9d0ac8b38d7abaa3af0d3 (diff)
downloadpfsense-a03974a3fa042bbffd867cdc52970a26dae6fb85.zip
pfsense-a03974a3fa042bbffd867cdc52970a26dae6fb85.tar.gz
Add a log message when hostres SNMP module is ignored on APU boards
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/services.inc15
1 files changed, 9 insertions, 6 deletions
diff --git a/etc/inc/services.inc b/etc/inc/services.inc
index a1521a3..c3e2fe2 100644
--- a/etc/inc/services.inc
+++ b/etc/inc/services.inc
@@ -2272,16 +2272,19 @@ begemotSnmpdModulePath."pf" = "/usr/lib/snmp_pf.so"
EOD;
}
- /* XXX: hostres module crashes APU - ticket #4403 */
- $specplatform = system_identify_specific_platform();
- if (isset($config['snmpd']['modules']['hostres']) &&
- $specplatform['name'] != 'APU') {
- $snmpdconf .= <<<EOD
+ if (isset($config['snmpd']['modules']['hostres'])) {
+ /* XXX: hostres module crashes APU - ticket #4403 */
+ $specplatform = system_identify_specific_platform();
+ if ($specplatform['name'] == 'APU') {
+ log_error("'Host Resources' SNMP module was ignored because it can potentially crash system on APU boards");
+ } else {
+ $snmpdconf .= <<<EOD
begemotSnmpdModulePath."hostres" = "/usr/lib/snmp_hostres.so"
EOD;
+ }
+ unset($specplatform);
}
- unset($specplatform);
if (isset($config['snmpd']['modules']['bridge'])) {
$snmpdconf .= <<<EOD
OpenPOWER on IntegriCloud