[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. dd6c9bb9c3c9031358aa61b629bf38b568d96676

[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. dd6c9bb9c3c9031358aa61b629bf38b568d96676

[git]

[-- Attachment #1: Type: text/plain, Size: 4751 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, fifteen has been updated
       via  dd6c9bb9c3c9031358aa61b629bf38b568d96676 (commit)
       via  724908c6802b0750fcb96891e14a0e79c786dc9f (commit)
      from  8a5ef45f1520cd947c02b5dbbafb22163ec6c098 (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 dd6c9bb9c3c9031358aa61b629bf38b568d96676
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Thu Dec 19 22:46:48 2013 +0100

    collectd initskript: parse new lm_sensors config.

commit 724908c6802b0750fcb96891e14a0e79c786dc9f
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Thu Dec 19 22:45:34 2013 +0100

    lm_sensors: update to 3.3.4.

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

Summary of changes:
 config/rootfiles/common/armv5tel/lm_sensors | 2 +-
 config/rootfiles/common/i586/lm_sensors     | 2 +-
 lfs/lm_sensors                              | 6 +++---
 src/initscripts/init.d/collectd             | 8 ++++++--
 4 files changed, 11 insertions(+), 7 deletions(-)

Difference in files:
diff --git a/config/rootfiles/common/armv5tel/lm_sensors b/config/rootfiles/common/armv5tel/lm_sensors
index 774e47d..4d17590 100644
--- a/config/rootfiles/common/armv5tel/lm_sensors
+++ b/config/rootfiles/common/armv5tel/lm_sensors
@@ -8,7 +8,7 @@ usr/bin/sensors-conf-convert
 #usr/lib/libsensors.a
 usr/lib/libsensors.so
 usr/lib/libsensors.so.4
-usr/lib/libsensors.so.4.3.1
+usr/lib/libsensors.so.4.3.2
 #usr/man/man1/sensors.1
 #usr/man/man3/libsensors.3
 #usr/man/man5/sensors.conf.5
diff --git a/config/rootfiles/common/i586/lm_sensors b/config/rootfiles/common/i586/lm_sensors
index 217ac54..f23b97c 100644
--- a/config/rootfiles/common/i586/lm_sensors
+++ b/config/rootfiles/common/i586/lm_sensors
@@ -8,7 +8,7 @@ usr/bin/sensors-conf-convert
 #usr/lib/libsensors.a
 usr/lib/libsensors.so
 usr/lib/libsensors.so.4
-usr/lib/libsensors.so.4.3.1
+usr/lib/libsensors.so.4.3.2
 #usr/man/man1/sensors.1
 #usr/man/man3/libsensors.3
 #usr/man/man5/sensors.conf.5
diff --git a/lfs/lm_sensors b/lfs/lm_sensors
index b5ebcfb..f343a2f 100644
--- a/lfs/lm_sensors
+++ b/lfs/lm_sensors
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2013  IPFire Team  <info(a)ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.3.0
+VER        = 3.3.4
 
 THISAPP    = lm_sensors-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 5eb18d7531ead4f54f28a1133a606535
+$(DL_FILE)_MD5 = 60cfb98ab7a8915c3ac684af5459de2e
 
 install : $(TARGET)
 
diff --git a/src/initscripts/init.d/collectd b/src/initscripts/init.d/collectd
index 544b3e1..7de005e 100644
--- a/src/initscripts/init.d/collectd
+++ b/src/initscripts/init.d/collectd
@@ -34,8 +34,10 @@ case "$1" in
 			# pre scan and try to load modules
 			"yes" | /usr/sbin/sensors-detect > /dev/null
 			if [ -e /etc/sysconfig/lm_sensors ]; then
+
 				# Module load
-				for modul in `cat /etc/sysconfig/lm_sensors | grep '^MODULE_' | cut -d"=" -s -f2`; do
+				. /etc/sysconfig/lm_sensors
+				for modul in $BUS_MODULES $HWMON_MODULES ; do
 					modprobe $modul > /dev/null 2>&1;
 				done
 			fi
@@ -52,8 +54,10 @@ case "$1" in
 		# Load sensor modules only first start
 		if [ ! -e /var/lock/sensors_modules ]; then
 			touch /var/lock/sensors_modules
+
 			boot_mesg -n "Loading Sensor Modules: "
-			for modul in `cat /etc/sysconfig/lm_sensors | grep '^MODULE_' | cut -d"=" -s -f2`; do
+			. /etc/sysconfig/lm_sensors
+			for modul in $BUS_MODULES $HWMON_MODULES ; do
 			modprobe $modul > /dev/null 2>&1;
 				if [ ${?} = 0 ]; then
 					boot_mesg -n "$SUCCESS$modul$NORMAL ";


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