SOURCES: sensors.init - modules are loaded now by separate script

[pascalek]

Author: pascalek                     Date: Wed Nov 15 15:32:21 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- modules are loaded now by separate script

---- Files affected:
SOURCES:
   sensors.init (1.14 -> 1.15) 

---- Diffs:

================================================================
Index: SOURCES/sensors.init
diff -u SOURCES/sensors.init:1.14 SOURCES/sensors.init:1.15
--- SOURCES/sensors.init:1.14	Thu Dec  8 02:02:49 2005
+++ SOURCES/sensors.init	Wed Nov 15 16:32:15 2006
@@ -20,26 +20,14 @@
 # See how we were called.
 case "$1" in
   start)
+	if [ ! -f /var/lock/subsys/sensors_modules ]; then
+		msg_starting "sensors daemon"; fail
+		nls "sensors_modules services not started" >&2
+		exit 6
+	fi
+	
 	# Check if the service is already running?
 	if [ ! -f /var/lock/subsys/sensors ]; then
-		if [ -z "$BUS" ] || [ -z "$CHIP" ]; then
-			msg_starting "sensors daemon"; fail
-			nls "BUS or CHIP not configured in /etc/sysconfig/sensors" >&2
-			exit 6
-		fi
-
-		# insert modules
-		for i in $BUS; do
-			_modprobe single die "i2c-$i"
-		done
-		for i in $CHIP; do
-			_modprobe single die "$i"
-		done
-
-		if [ "$SENSORS_SET" = "1" ]; then
-			sensors -s
-		fi
-
 		msg_starting "sensors daemon"
 		daemon sensord \
 			$([ -n "$INTERVAL" ] && echo "-i $INTERVAL") \
@@ -59,15 +47,6 @@
 	if [ -f /var/lock/subsys/sensors ]; then
 		msg_stopping "sensors daemon"
 		killproc sensord
-
-		# remove kernel modules
-		for i in $CHIP; do
-			/sbin/rmmod $i >/dev/null 2>&1
-		done
-		for i in $BUS; do
-			/sbin/rmmod i2c-$BUS >/dev/null 2>&1
-		done
-
 		rm -f /var/lock/subsys/sensors
 	else
 		msg_not_running "sensors daemon"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/sensors.init?r1=1.14&r2=1.15&f=u