[git.ipfire.org] IPFire 2.x development tree branch, next, updated. aab33d48450aedf20409fe187f573d74eb60f95d

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. aab33d48450aedf20409fe187f573d74eb60f95d

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 2376 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  aab33d48450aedf20409fe187f573d74eb60f95d (commit)
      from  ab79dc43bf66f66b0c34a10158d46e4727d4df6a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit aab33d48450aedf20409fe187f573d74eb60f95d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Apr 4 09:05:25 2019 +0100

    core130: Do not search for sensors on AWS
    
    This causes some i2c drivers to load and tons of error messages
    being created in syslog. So we skip searching for any sensors
    that do not exist.
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/130/filelists/files | 1 +
 src/initscripts/system/collectd           | 5 +++++
 2 files changed, 6 insertions(+)

Difference in files:
diff --git a/config/rootfiles/core/130/filelists/files b/config/rootfiles/core/130/filelists/files
index 248a2c753..00d3cdde6 100644
--- a/config/rootfiles/core/130/filelists/files
+++ b/config/rootfiles/core/130/filelists/files
@@ -4,6 +4,7 @@ srv/web/ipfire/cgi-bin/credits.cgi
 var/ipfire/langs
 etc/collectd.conf
 etc/logrotate.conf
+etc/rc.d/init.d/collectd
 etc/rc.d/init.d/firewall
 etc/rc.d/init.d/networking/red.up/23-suricata
 etc/rc.d/init.d/suricata
diff --git a/src/initscripts/system/collectd b/src/initscripts/system/collectd
index cdb8693ae..5233525f0 100644
--- a/src/initscripts/system/collectd
+++ b/src/initscripts/system/collectd
@@ -35,6 +35,11 @@ case "$1" in
 			touch /etc/sysconfig/lm_sensors
 		fi
 
+		# Do not search for sensors when running on AWS
+		if [ -e "/var/run/aws-instance-id" ]; then
+			touch /etc/sysconfig/lm_sensors
+		fi
+
 		# At first run search for sensors with sensors-detect
 		if [ ! -e /etc/sysconfig/lm_sensors ]; then
 			boot_mesg "Searching for Sensors..."


hooks/post-receive
--
IPFire 2.x development tree