core130: Do not search for sensors on AWS

[ipfire-2.x.git] / src / initscripts / system / collectd

diff --git a/src/initscripts/system/collectd b/src/initscripts/system/collectd
index 1c685b44a86f6f1a83dc43b3ace83c8347185e1c..5233525f0460006a6a5765d8fad554dc20ed34db 100644 (file)
--- 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..."
@@ -92,7 +97,7 @@ case "$1" in
                fi
 
                # Enable cpufreq plugin if cpufreq found
-               if [ ! -e  /sys/devices/system/cpu/cpufreq/policy0/*_cur_freq ]; then
+               if [ ! -e  /sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq ]; then
                        sed -i -e "s|^LoadPlugin cpufreq|#LoadPlugin cpufreq|g" /etc/collectd.conf
                else
                        sed -i -e "s|^#LoadPlugin cpufreq|LoadPlugin cpufreq|g" /etc/collectd.conf