- renamed sensors.{init,sysconfig} to sensord.{init,sysconfig}

Changed files:
    sensord.init -> 1.1
    sensord.sysconfig -> 1.1
    sensors.init -> 1.19
    sensors.sysconfig -> 1.8

diff --git a/sensord.init b/sensord.init
new file mode 100644 (file)
index 0000000..7ed3bf7
--- /dev/null
+++ b/sensord.init
@@ -0,0 +1,73 @@
+#!/bin/sh
+#
+# sensord:     Hardware sensors monitoring daemon
+#
+# chkconfig:   2345 32 68
+# description: Starts and stops hardware sensors monitoring daemon.
+# author:      Filip Kalinski <filon@pld.org.pl>
+
+# Source function library.
+. /etc/rc.d/init.d/functions
+
+# Get service config
+if [ -f /etc/sysconfig/sensord ]; then
+       . /etc/sysconfig/sensord
+fi
+
+start() {
+       if [ ! -f /var/lock/subsys/lm_sensors ]; then
+               msg_not_running "lm_sensors"
+               exit 6
+       fi
+       
+       # Check if the service is already running?
+       if [ ! -f /var/lock/subsys/sensord ]; then
+               msg_already_running "sensors daemon"
+               return
+       fi
+       msg_starting "sensors daemon"
+       daemon sensord \
+               ${INTERVAL:+-i $INTERVAL} \
+               ${LOG_INTERVAL:+-l $LOG_INTERVAL} \
+               ${RRD_LOGFILE:+-r $RRD_LOGFILE} \
+               ${RRD_INTERVAL:+-t $RRD_INTERVAL} \
+               -f daemon
+
+       RETVAL=$?
+       [ $RETVAL -eq 0 ] && touch /var/lock/subsys/sensord
+}
+
+stop() {
+       if [ -f /var/lock/subsys/sensord ]; then
+               msg_not_running "sensors daemon"
+               return
+       fi
+       msg_stopping "sensors daemon"
+       killproc sensord
+       rm -f /var/lock/subsys/sensord
+}
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start)
+       start
+       ;;
+  stop)
+       stop
+       ;;
+  status)
+       status sensord
+       RETVAL=$?
+       sensors
+       ;;
+  restart|force-reload)
+       stop
+       start
+       ;;
+  *)
+       msg_usage "$0 {start|stop|restart|force-reload|status}"
+       exit 3
+esac
+
+exit $RETVAL

diff --git a/sensors.sysconfig b/sensord.sysconfig
similarity index 100%
rename from sensors.sysconfig
rename to sensord.sysconfig

diff --git a/sensors.init b/sensors.init
deleted file mode 100644 (file)
index 63495c6..0000000
--- a/sensors.init
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/sh
-#
-# sensors:     Hardware sensors monitoring daemon
-#
-# Version:     $Revision$
-#
-# chkconfig:   2345 32 68
-# description: Starts and stops hardware sensors monitoring daemon.
-# author:      Filip Kalinski <filon@pld.org.pl>
-
-# Source function library.
-. /etc/rc.d/init.d/functions
-
-# Get service config
-if [ -f /etc/sysconfig/sensors ]; then
-       . /etc/sysconfig/sensors
-fi
-
-start() {
-       if [ ! -f /var/lock/subsys/sensors_modules ]; then
-               msg_not_running "sensors_modules"
-               exit 6
-       fi
-       
-       # Check if the service is already running?
-       if [ ! -f /var/lock/subsys/sensors ]; then
-               msg_starting "sensors daemon"
-               daemon sensord \
-                       ${INTERVAL:+-i $INTERVAL} \
-                       ${LOG_INTERVAL:+-l $LOG_INTERVAL} \
-                       ${RRD_LOGFILE:+-r $RRD_LOGFILE} \
-                       ${RRD_INTERVAL:+-t $RRD_INTERVAL} \
-                       -f daemon
-
-               RETVAL=$?
-               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/sensors
-               touch /var/lock/subsys/sensors
-       else
-               msg_already_running "sensors daemon"
-       fi
-}
-
-stop() {
-       if [ -f /var/lock/subsys/sensors ]; then
-               msg_stopping "sensors daemon"
-               killproc sensord
-               rm -f /var/lock/subsys/sensors
-       else
-               msg_not_running "sensors daemon"
-       fi
-}
-
-RETVAL=0
-# See how we were called.
-case "$1" in
-  start)
-       start
-       ;;
-  stop)
-       stop
-       ;;
-  status)
-       status sensors sensord
-       RETVAL=$?
-       sensors
-       ;;
-  restart|force-reload)
-       stop
-       start
-       ;;
-  *)
-       msg_usage "$0 {start|stop|restart|force-reload|status}"
-       exit 3
-esac
-
-exit $RETVAL