|
[-]
[+]
|
Deleted |
sensors.changes
|
| @@ -1,448 +0,0 @@
--------------------------------------------------------------------
-Tue Dec 18 10:45:45 CET 2007 - jdelvare@suse.de
-
-- Fix voltage references in sensors.conf. Fixed upstream in:
- http://www.lm-sensors.org/changeset/5076
-
--------------------------------------------------------------------
-Tue Dec 11 14:26:46 CET 2007 - jdelvare@suse.de
-
-- Fix rrd support in sensord. Fixed upstream in:
- http://www.lm-sensors.org/changeset/5069
-
--------------------------------------------------------------------
-Fri Nov 30 20:43:02 CET 2007 - jdelvare@suse.de
-
-- Remove obsolete Requires tags. Since version 3.0.0, it is no
- longer mandatory to provide a configuration file to libsensors.
-
--------------------------------------------------------------------
-Thu Nov 29 13:43:18 CET 2007 - jdelvare@suse.de
-
-- Add missing Conflicts tag.
-
--------------------------------------------------------------------
-Tue Nov 27 14:47:43 CET 2007 - jdelvare@suse.de
-
-- Add a link to the init script.
-
--------------------------------------------------------------------
-Mon Nov 26 13:34:08 CET 2007 - jdelvare@suse.de
-
-- Update to lm_sensors version 3.0.0
- * Completely rewritten library, much smaller
- * Supports all devices supported by the kernel (contains no
- device-specific code)
- * libsensors has a new SONAME (libsensors.so.4)
- * fancontrol.pl is gone
-
--------------------------------------------------------------------
-Thu Nov 22 11:31:49 CET 2007 - jdelvare@suse.de
-
-- Drop local changes to sensors-detect that are no longer relevant.
-- Drop local changes to sensord.init: we no longer package it.
-
--------------------------------------------------------------------
-Wed Nov 21 11:06:06 CET 2007 - jdelvare@suse.de
-
-- Add missing Requires to libsensors3-devel. This is a cosmetic
- change only, as the requirement was already drawn indirectly.
-
--------------------------------------------------------------------
-Mon Nov 5 13:45:24 CET 2007 - jdelvare@suse.de
-
-- Add split provides to subpackages libsensors3-devel and sensord
- so that an update will work as designed.
-
--------------------------------------------------------------------
-Fri Nov 2 17:57:14 CET 2007 - jdelvare@suse.de
-
-- Fix two rpmlint warnings. One of them was about a missing
- dependency between libsensors3-devel and libsensors3, which was
- breaking the build of other packages.
-
--------------------------------------------------------------------
-Fri Nov 2 14:16:43 CET 2007 - jdelvare@suse.de
-
-- Package libsensors separately. I've named the package
- "libsensors3" because it is going to fade out quickly in favor
- of the new, incompatible version from lm-sensors 3.
-- Don't remove the build root before installing. rpmlint was
- compaining about that.
-
--------------------------------------------------------------------
-Thu Nov 1 12:16:57 CET 2007 - jdelvare@suse.de
-
-- Fix packaging breakage introduced by the following change:
- ppc and ia64 packages do not include isadump nor isaset.
-
--------------------------------------------------------------------
-Wed Oct 31 14:42:04 CET 2007 - jdelvare@suse.de
-
-- Package sensord separately.
-- Don't include redundant or outdated initalization scripts in
- the documentation tree.
-
--------------------------------------------------------------------
-Sun Oct 28 16:16:39 CET 2007 - jdelvare@suse.de
-
-- Update to lm_sensors version 2.10.5
- * Support for the SMSC SCH3112, SCH3114, SCH3116
- * libsensors fixes for the thmc50, bmcsensors, lm93, adm1026
- drivers
- * sensord support for the w83793 and lm87 drivers
- * sensors fixes for the dme1737, thmc50 and adm1021 drivers
- * Detect new Winbond chips
-- useful_addresses.html is no longer part of the package.
-- lm_sensors-dont-probe-i2c-isa.dif: Drop, bug fixed upstream.
-
--------------------------------------------------------------------
-Mon Oct 15 13:39:55 CEST 2007 - jdelvare@suse.de
-
-- Do not include i2c tools, they have their own package now.
-
--------------------------------------------------------------------
-Mon Sep 3 17:41:30 CEST 2007 - jdelvare@suse.de
-
-- Run ldconfig in %post and %postun. rpmlint was complaining
- that this was missing.
-
--------------------------------------------------------------------
-Tue Aug 28 16:00:29 CEST 2007 - werner@suse.de
-
-- Remove hard coded modules introduced by last change
-
--------------------------------------------------------------------
-Tue Aug 14 22:55:31 CEST 2007 - hvogel@suse.de
-
-- Add sysconfig metadata [#300069]
-
--------------------------------------------------------------------
-Mon Aug 13 15:07:55 CEST 2007 - jdelvare@suse.de
-
-- Don't probe i2c-isa as a regular i2c bus. This regression was
- introduced in lm_sensors 2.10.4. Fixed upstream in:
- http://www.lm-sensors.org/changeset/4649
-
--------------------------------------------------------------------
-Wed Aug 1 15:41:26 CEST 2007 - werner@suse.de
-
-- Update to lm_sensors version 2.10.4
- * added support for recent devices and cips like
- dme1737, applesmc, abituguru3, f71882fg, w83627ehf (kernel 2.4)
- support for the w83627ehf VID function
- support for the w83627ehf thermal sensor types
- support for it87 fan4 and fan5
- * support block reads with specified length of I2C devices
- * A lot of fixes and enhancements
- * Add both patches form us for fancontrol and pwmconfig
-
--------------------------------------------------------------------
-Wed Jun 27 13:37:35 CEST 2007 - jdelvare@suse.de
-
-- Don't package the decode-edid.pl script. It requires parse-edid
- from the read-edid package, which isn't included in Suse.
-
--------------------------------------------------------------------
-Thu Jun 21 22:51:22 CEST 2007 - dmueller@suse.de
-
-- adjust buildrequires
-
--------------------------------------------------------------------
-Mon Jun 4 16:00:24 CEST 2007 - jdelvare@suse.de
-
-- Don't build on s390 nor s390x.
-
--------------------------------------------------------------------
-Mon May 28 13:43:34 CEST 2007 - jdelvare@suse.de
-
-- Fix two rpmlint errors: /etc/init.d/lm_sensors shouldn't be
- marked as a config file, and was missing a Short-Description
- tag.
-
--------------------------------------------------------------------
-Wed May 9 09:28:58 CEST 2007 - jdelvare@suse.de
-
-- lm_sensors-no-xeon-script.patch: The decode-xeon.pl script is
- outdated. It was never ported to work with 2.6 kernels, so it is
- of no use on recent Suse distributions. Stop shipping it.
-- Drop a legacy patch to sensors/main.c related to the
- configuration file name, which is no longer needed.
-
--------------------------------------------------------------------
-Fri May 4 18:13:40 CEST 2007 - jdelvare@suse.de
-
-- Don't package outdated driver documentation. The up-to-date
- driver documentation is in the kernel-source package.
- (bug #271302)
-- Two minor cleanups to the spec file.
-
--------------------------------------------------------------------
-Thu Apr 12 10:55:19 CEST 2007 - jdelvare@suse.de
-
-- lm_sensors-2.8.3-nodump.patch: Removed, should no longer be
- needed. Since lm_sensors 2.8.6, isadump is only compiled on i386
- and x86_64.
-- Likewise, no need to patch prog/dump/isadump.c for powerpc,
- as it won't be compiled for these architectures anyway.
-
--------------------------------------------------------------------
-Thu Apr 5 17:15:43 CEST 2007 - werner@suse.de
-
-- Update to lm_sensors version 2.10.3 which added support for
- recent devices and support for kernel 2.6.22.
-
--------------------------------------------------------------------
-Thu Mar 29 22:23:41 CEST 2007 - ro@suse.de
-
-- added bison,flex to buildreq
-
|
|
[-]
[+]
|
Changed |
sensors.spec
^
|
|
|
|
[-]
[+]
|
Deleted |
lm_sensors-3.0.0-sensord-fix-rrd-support.patch
^
|
| @@ -1,17 +0,0 @@
-Index: lm-sensors-3.0.0/prog/sensord/rrd.c
-===================================================================
---- prog/sensord/rrd.c (revision 4849)
-+++ prog/sensord/rrd.c (revision 5069)
-@@ -156,10 +156,10 @@
-
- for (index0 = 0; (ret == 0) && (num < MAX_RRD_SENSORS) && features[index0].format; ++ index0) {
- const FeatureDescriptor *feature = features + index0;
-- const char *rawLabel = features->feature->name;
-+ const char *rawLabel = feature->feature->name;
- char *label = NULL;
-
-- if (!(label = sensors_get_label (chip, features->feature))) {
-+ if (!(label = sensors_get_label (chip, feature->feature))) {
- sensorLog (LOG_ERR, "Error getting sensor label: %s/%s", chip->prefix, rawLabel);
- ret = -1;
- } else {
|
|
[-]
[+]
|
Changed |
lm_sensors-3.0.0-sensord-separate.patch
^
|
| @@ -1,8 +1,6 @@
-Index: doc/progs
-===================================================================
---- doc/progs.orig
-+++ doc/progs
-@@ -58,6 +58,8 @@ see http://www.lm-sensors.org/wiki/Usefu
+--- lm_sensors-3.1.1.orig/doc/progs
++++ lm_sensors-3.1.1/doc/progs
+@@ -53,6 +53,8 @@ see http://www.lm-sensors.org/wiki/Usefu
the sensors hardware to syslog, and to alert (using syslog level ALERT)
when a sensor alarm is signalled; for example, if a fan fails, a temperature
limit is exceeded, etc.
|
|
[-]
[+]
|
Deleted |
lm_sensors-3.0.0-sensors.conf-fix-voltage-references.patch
^
|
| @@ -1,35 +0,0 @@
---- etc/sensors.conf.eg (revision 4980)
-+++ etc/sensors.conf.eg (revision 5076)
-@@ -938,5 +938,5 @@
-
- compute in2 (197/47)*@ , @/(197/47)
-- compute in4 (5*@)-(4*in0) , (@+4*in0)/5
-+ compute in4 (5*@)-(4*in0_input) , (@+4*in0_input)/5
-
- # set in0_min 4.8
-@@ -988,6 +988,6 @@
- compute in3 (2.8/1.9) * @, @ * 1.9/2.8
- compute in4 (160/30.1 + 1) * @, @ / (160/30.1 + 1)
-- compute in5 (160/35.7)*(@ - in0) + @, (@ + in0 * 160/35.7)/ (1 + 160/35.7)
-- compute in6 (36/16.2)*(@ - in0) + @, (@ + in0 * 36/16.2) / (1 + 36/16.2)
-+ compute in5 (160/35.7)*(@ - in0_input) + @, (@ + in0_input * 160/35.7)/ (1 + 160/35.7)
-+ compute in6 (36/16.2)*(@ - in0_input) + @, (@ + in0_input * 36/16.2) / (1 + 36/16.2)
-
- # set in0_min 5 * 0.95
-@@ -2065,10 +2065,10 @@
- # default). If not, use 3.3 instead, but you lose accuracy.
-
-- compute temp4 3435 / (` (1 / (1 - @ / in10) - 1) + 3435 / 298.15) - 273.15, \
-- in10 * (1 - 1 / (1 + (^ (3435 / (273.15 + @) - 3435 / 298.15))))
-- compute temp5 3435 / (` (1 / (1 - @ / in10) - 1) + 3435 / 298.15) - 273.15, \
-- in10 * (1 - 1 / (1 + (^ (3435 / (273.15 + @) - 3435 / 298.15))))
-- compute temp6 3435 / (` (1 / (1 - @ / in10) - 1) + 3435 / 298.15) - 273.15, \
-- in10 * (1 - 1 / (1 + (^ (3435 / (273.15 + @) - 3435 / 298.15))))
-+ compute temp4 3435 / (` (1 / (1 - @ / in10_input) - 1) + 3435 / 298.15) - 273.15, \
-+ in10_input * (1 - 1 / (1 + (^ (3435 / (273.15 + @) - 3435 / 298.15))))
-+ compute temp5 3435 / (` (1 / (1 - @ / in10_input) - 1) + 3435 / 298.15) - 273.15, \
-+ in10_input * (1 - 1 / (1 + (^ (3435 / (273.15 + @) - 3435 / 298.15))))
-+ compute temp6 3435 / (` (1 / (1 - @ / in10_input) - 1) + 3435 / 298.15) - 273.15, \
-+ in10_input * (1 - 1 / (1 + (^ (3435 / (273.15 + @) - 3435 / 298.15))))
-
- # set temp4_min 0
|
|
[-]
[+]
|
Changed |
lm_sensors-3.0.0-sysconfig_metadata.patch
^
|
| @@ -1,17 +1,15 @@
-Index: prog/detect/sensors-detect
-===================================================================
---- prog/detect/sensors-detect.orig
-+++ prog/detect/sensors-detect
-@@ -5898,6 +5898,12 @@ sub main
- open(local *SYSCONFIG, ">/etc/sysconfig/lm_sensors")
- or die "Sorry, can't create /etc/sysconfig/lm_sensors ($!)";
- print SYSCONFIG <<'EOT';
+--- lm_sensors-3.1.1.orig/prog/detect/sensors-detect
++++ lm_sensors-3.1.1/prog/detect/sensors-detect
+@@ -5460,6 +5460,12 @@ sub write_config
+ or die "Sorry, can't create /etc/sysconfig/lm_sensors ($!)";
+ print SYSCONFIG "# Generated by sensors-detect on " . scalar localtime() . "\n";
+ print SYSCONFIG <<'EOT';
+## Path: Hardware/Sensors
+## Description: Defines the modules to used
+## Type: string
+## ServiceRestart: lm_sensors
+## Default: ""
+#
- # /etc/sysconfig/lm_sensors - Defines modules loaded by
- # /etc/init.d/lm_sensors
- # Copyright (c) 1998 - 2001 Frodo Looijaard <frodol@dds.nl>
+ # This file is sourced by /etc/init.d/lm_sensors and defines the modules to
+ # be loaded/unloaded.
+ #
|
|
[-]
[+]
|
Deleted |
lm_sensors-3.0.0.dif
^
|
| @@ -1,279 +0,0 @@
-Index: Makefile
-===================================================================
---- Makefile.orig
-+++ Makefile
-@@ -38,7 +38,7 @@ DEBUG := 0
- DESTDIR :=
-
- # This is the prefix that will be used for almost all directories below.
--PREFIX := /usr/local
-+PREFIX := /usr
-
- # Your C compiler
- CC := gcc
-@@ -71,7 +71,7 @@ LIBINCLUDEDIR := $(INCLUDEDIR)/sensors
-
- # You should not need to change this. It is the base directory under which the
- # manual pages will be installed.
--MANDIR := $(PREFIX)/man
-+MANDIR := $(PREFIX)/share/man
-
- MACHINE := $(shell uname -m)
-
-@@ -133,7 +133,7 @@ ifeq ($(DEBUG),1)
- ALL_CPPFLAGS += -DDEBUG
- ALL_CFLAGS += -O -g
- else
--ALL_CFLAGS += -O2
-+ALL_CFLAGS += $(RPM_OPT_FLAGS)
- endif
-
- ifeq ($(WARN),1)
-Index: prog/detect/sensors-detect
-===================================================================
---- prog/detect/sensors-detect.orig
-+++ prog/detect/sensors-detect
-@@ -5945,6 +5945,8 @@ EOT
- print "Copy prog/init/lm_sensors.init to /etc/init.d/lm_sensors\n".
- "for initialization at boot time.\n"
- unless -f "/etc/init.d/lm_sensors";
-+ system("/sbin/insserv", "/etc/init.d/lm_sensors")
-+ if -f "/etc/init.d/lm_sensors";
- }
- }
-
-Index: prog/init/README
-===================================================================
---- prog/init/README.orig
-+++ prog/init/README
-@@ -10,7 +10,7 @@ The script lm_sensors.init is a nice sta
- On RH and other RH-based systems (MDK, notably) use this sort of startup
- mechanism (i.e. SVR4-based), as opposed to the everything-in-one-script
- (/etc/rc or /etc/rc.local) like the BSD-based systems do.
--The lm_sensors.init file should be copied to /etc/rc.d/init.d/lm_sensors.
-+The lm_sensors.init file should be copied to /etc/init.d/lm_sensors.
- For more information see the top of the file.
- It requires the /etc/sysconfig/lm_sensors file, which identifies
- the correct modules.
-@@ -27,10 +27,10 @@ by Marc Rieffel <marc@paracel.com>.
- ----------------
-
- The script sensord.init also loads the modules, and then
--starts the sensord daemon. See the directory ../sensord for
-+starts the sensord daemon. See the manual page sensord(8) for
- more information on the daemon.
-
--The sensord.init file should be copied to /etc/rc.d/init.d/sensord.
-+The sensord.init file should be copied to /etc/init.d/sensord.
- For more information see the top of the file.
-
- To configure this service one should put appropriate "alias i2c-bus-0 xxx"
-Index: prog/init/lm_sensors.init.suse
-===================================================================
---- prog/init/lm_sensors.init.suse.orig
-+++ prog/init/lm_sensors.init.suse
-@@ -1,19 +1,15 @@
- #!/bin/sh
- #
- ### BEGIN INIT INFO
--# Provides: lm_sensors
--# Required-Start: $local_fs
--# X-UnitedLinux-Should-Start:
--# Required-Stop: $local_fs
--# X-UnitedLinux-Should-Stop:
--# Default-Start: 3 4 5
--# Default-Stop: 0 1 2 6
--# Short-Description: LM Sensors
--# Description: LM Sensors for hardware monitoring
-+# Provides: sensors
-+# Required-Start: $remote_fs
-+# Required-Stop: $remote_fs
-+# Default-Start: 2 3 5
-+# Default-Stop:
-+# Short-Description: Load and configure hardware monitoring drivers
-+# Description: sensors is used for monitoring motherboard sensor values.
-+# Config file is /etc/sysconfig/lm_sensors
- ### END INIT INFO
--# chkconfig: 2345 26 74
--# description: sensors is used for monitoring motherboard sensor values.
--# config: /etc/sysconfig/lm_sensors
- #
- # 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
-@@ -40,115 +36,91 @@
- # MODULE_1, MODULE_2, MODULE_3, etc.
-
- # If sensors isn't supported by the kernel, try loading the module...
--[ -e /proc/sys/dev/sensors ] || /sbin/modprobe i2c-proc &>/dev/null
-+[ -e /sys/bus/i2c/devices ] || /sbin/modprobe i2c-dev &>/dev/null
-
- # Don't bother if /proc/sensors still doesn't exist, kernel doesn't have
- # support for sensors.
--[ -e /proc/sys/dev/sensors ] || exit 0
--
-+[ -e /sys/bus/i2c/devices ] || exit 0
-+
- # If sensors was not already running, unload the module...
--[ -e /var/lock/subsys/lm_sensors ] || /sbin/modprobe -r i2c-proc &>/dev/null
-+[ -e /var/lock/subsys/sensors ] || /sbin/modprobe -r i2c-dev &>/dev/null
-
- CONFIG=/etc/sysconfig/lm_sensors
--PSENSORS=/usr/local/bin/sensors
-+PSENSORS=/usr/bin/sensors
-+FANCONFIG=/etc/fancontrol
-+PFAN=/usr/sbin/fancontrol
-
- # Source function library.
--#. /etc/init.d/functions
--
--# Shell functions sourced from /etc/rc.status:
--# rc_check check and set local and overall rc status
--# rc_status check and set local and overall rc status
--# rc_status -v ditto but be verbose in local rc status
--# rc_status -v -r ditto and clear the local rc status
--# rc_status -s display "skipped" and exit with status 3
--# rc_status -u display "unused" and exit with status 3
--# rc_failed set local and overall rc status to failed
--# rc_failed <num> set local and overall rc status to <num>
--# rc_reset clear local rc status (overall remains)
--# rc_exit exit appropriate to overall rc status
--# rc_active checks whether a service is activated by symlinks
--# rc_splash arg sets the boot splash screen to arg (if active)
- . /etc/rc.status
-
--# Reset status of this service
--rc_reset
--
--# Return values acc. to LSB for all commands but status:
--# 0 - success
--# 1 - generic or unspecified error
--# 2 - invalid or excess argument(s)
--# 3 - unimplemented feature (e.g. "reload")
--# 4 - user had insufficient privileges
--# 5 - program is not installed
--# 6 - program is not configured
--# 7 - program is not running
--# 8--199 - reserved (8--99 LSB, 100--149 distrib, 150--199 appl)
--#
--# Note that starting an already running service, stopping
--# or restarting a not-running service as well as the restart
--# with force-reload (in case signaling is not supported) are
--# considered a success.
--
--RETVAL=0
--
- start() {
-- echo -n $"Starting up sensors: "
-+ echo -n "Starting up sensors"
-+ unset ${!MODULE_*}
- test -r "$CONFIG" && . "$CONFIG"
-
-- modules=`grep \^MODULE_ $CONFIG | wc -l | tr -d ' '`
-- i=0
-- while [ $i -lt $modules ] ; do
-- module=`eval echo '$'MODULE_$i`
-- echo starting module __${module}__
-+ for i in ${!MODULE_*} ; do
-+ eval module=\$$i
- /sbin/modprobe $module &>/dev/null
-- i=`expr $i + 1`
-+ rc_status
- done
-- $PSENSORS -s
-+ rc_status
-
-- RETVAL=$?
-- if [ $RETVAL -eq 0 ] && touch /var/lock/subsys/lm_sensors ; then
-- rc_status -v
-+ /usr/bin/sensors -s &> /dev/null
-+ rc_status
-+
-+ # Start fan control, if configured
-+ if test -s "$FANCONFIG" -a -x "$PFAN" ; then
-+ echo -n ", starting fan control: "
-+ /sbin/startproc -q "$PFAN"
-+ rc_status
- else
-- rc_status -v
-+ echo -n ": "
- fi
|
|
[-]
[+]
|
Added |
lm_sensors-3.1.1-build.patch
^
|
| @@ -0,0 +1,11 @@
+--- lm_sensors-3.1.1.orig/Makefile
++++ lm_sensors-3.1.1/Makefile
+@@ -140,7 +140,7 @@ ifeq ($(DEBUG),1)
+ ALL_CPPFLAGS += -DDEBUG
+ ALL_CFLAGS += -O -g
+ else
+-ALL_CFLAGS += -O2
++ALL_CFLAGS += $(RPM_OPT_FLAGS)
+ endif
+
+ ifeq ($(WARN),1)
|
|
[-]
[+]
|
Added |
lm_sensors-r5757-LPC47M233-not-supported.patch
^
|
| @@ -0,0 +1,16 @@
+Upstream commit: http://www.lm-sensors.org/changeset/5757
+
+The SMSC LPC47M233 isn't currently supported. If it ever is, it will most
+probably not be by the smsc47m1 driver.
+
+--- lm_sensors-3.1.1.orig/prog/detect/sensors-detect
++++ lm_sensors-3.1.1/prog/detect/sensors-detect
+@@ -1415,7 +1415,7 @@ use constant FEAT_SMBUS => (1 << 7);
+ features => FEAT_FAN,
+ }, {
+ name => "SMSC LPC47M233 Super IO Sensors",
+- driver => "smsc47m1",
++ driver => "to-be-written",
+ devid => 0x6b80,
+ devid_mask => 0xff80,
+ logdev => 0x0a,
|
|
[-]
[+]
|
Added |
lm_sensors-r5760-rename-modprobe-conf.patch
^
|
| @@ -0,0 +1,53 @@
+Upstream commit: http://www.lm-sensors.org/changeset/5760
+
+Recent versions of module-init-tools only want *.conf files under
+/etc/modprobe.d. So rename our configuration file to lm_sensors.conf
+there. Also let "make install" rename the file if it already exists.
+
+--- lm_sensors-3.1.1.orig/Makefile
++++ lm_sensors-3.1.1/Makefile
+@@ -118,6 +118,7 @@ SRCDIRS += lib/test
+ MKDIR := mkdir -p
+ RMDIR := rmdir
+ RM := rm -f
++MV := mv -f
+ BISON := bison
+ FLEX := flex
+ AR := ar
+--- lm_sensors-3.1.1.orig/etc/Module.mk
++++ lm_sensors-3.1.1/etc/Module.mk
+@@ -28,6 +28,10 @@ install-etc:
+ fi
+ $(MKDIR) $(DESTDIR)$(BINDIR)
+ $(INSTALL) -m 755 $(ETC_DIR)/sensors-conf-convert $(DESTDIR)$(BINDIR)
++ if [ -e $(DESTDIR)$(ETCDIR)/modprobe.d/lm_sensors \
++ -a ! -e $(DESTDIR)$(ETCDIR)/modprobe.d/lm_sensors.conf ] ; then \
++ $(MV) $(DESTDIR)$(ETCDIR)/modprobe.d/lm_sensors $(DESTDIR)$(ETCDIR)/modprobe.d/lm_sensors.conf ; \
++ fi
+
+ user_install :: install-etc
+
+--- lm_sensors-3.1.1.orig/prog/detect/sensors-detect
++++ lm_sensors-3.1.1/prog/detect/sensors-detect
+@@ -5430,8 +5430,8 @@ sub write_config
+
+ if (defined $configfile) {
+ my $have_modprobe_d = -d '/etc/modprobe.d';
+- printf "Do you want to \%s /etc/modprobe.d/lm_sensors? (\%s): ",
+- (-e '/etc/modprobe.d/lm_sensors' ? 'overwrite' : 'generate'),
++ printf "Do you want to \%s /etc/modprobe.d/lm_sensors.conf? (\%s): ",
++ (-e '/etc/modprobe.d/lm_sensors.conf' ? 'overwrite' : 'generate'),
+ ($have_modprobe_d ? 'YES/no' : 'yes/NO');
+ $_ = <STDIN>;
+ if (($have_modprobe_d and not m/^\s*n/i) or m/^\s*y/i) {
+@@ -5439,8 +5439,8 @@ sub write_config
+ mkdir('/etc/modprobe.d', 0777)
+ or die "Sorry, can't create /etc/modprobe.d ($!)";
+ }
+- open(local *MODPROBE_D, ">/etc/modprobe.d/lm_sensors")
+- or die "Sorry, can't create /etc/modprobe.d/lm_sensors ($!)";
++ open(local *MODPROBE_D, ">/etc/modprobe.d/lm_sensors.conf")
++ or die "Sorry, can't create /etc/modprobe.d/lm_sensors.conf ($!)";
+ print MODPROBE_D "# Generated by sensors-detect on " . scalar localtime() . "\n";
+ print MODPROBE_D $configfile;
+ close(MODPROBE_D);
|
|
|
Changed |
lm_sensors-3.1.1.tar.bz2
^
|
|
[-]
[+]
|
Added |
lm_sensors.init
^
|
| @@ -0,0 +1,138 @@
+#!/bin/sh
+#
+### BEGIN INIT INFO
+# Provides: lm_sensors
+# Required-Start: $remote_fs
+# Required-Stop: $remote_fs
+# Default-Start: 2 3 5
+# Default-Stop:
+# Short-Description: Load and configure hardware monitoring drivers
+# Description: sensors is used for monitoring motherboard sensor values.
+# Config file is /etc/sysconfig/lm_sensors
+### END INIT INFO
+#
+# 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
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301 USA.
+
+# See also the lm_sensors homepage at:
+# http://www.lm-sensors.org
+
+# It uses a config file /etc/sysconfig/lm_sensors that contains the modules
+# to be loaded/unloaded. That file is sourced into this one.
+
+# The format of that file a shell script that simply defines the modules
+# in order as normal shell variables with the special names:
+# MODULE_1, MODULE_2, MODULE_3, etc.
+
+CONFIG=/etc/sysconfig/lm_sensors
+LOCK=/var/lock/subsys/lm_sensors
+PSENSORS=/usr/bin/sensors
+FANCONFIG=/etc/fancontrol
+PFAN=/usr/sbin/fancontrol
+
+# Source function library.
+. /etc/rc.status
+
+start() {
+ echo -n "Starting up sensors"
+ unset ${!MODULE_*}
+ test -r "$CONFIG" && . "$CONFIG"
+
+ for i in ${!MODULE_*} ; do
+ eval module=\$$i
+ /sbin/modprobe $module &>/dev/null
+ rc_status
+ done
+ rc_status
+
+ /usr/bin/sensors -s &> /dev/null
+ rc_status
+
+ # Start fan control, if configured
+ if test -s "$FANCONFIG" -a -x "$PFAN" ; then
+ echo -n ", starting fan control: "
+ /sbin/startproc -q "$PFAN"
+ rc_status
+ else
+ echo -n ": "
+ fi
+
+ rc_status -v && touch $LOCK
+}
+
+stop() {
+ echo -n "Shutting down sensors"
+ unset ${!MODULE_*}
+ test -r "$CONFIG" && . "$CONFIG"
+
+ # Stop fan control, if it was started
+ if test -s /var/run/fancontrol.pid ; then
+ echo -n ", stopping fan control: "
+ /sbin/killproc -TERM "$PFAN"
+ rc_status
+ else
+ echo -n ": "
+ fi
+
+ for i in ${!MODULE_*} ; do
+ eval module=\$$i
+ /sbin/modprobe -r $module &>/dev/null
+ rc_status
+ done
+
+ rc_status -v && rm -f $LOCK
+}
+
+dostatus() {
+ $PSENSORS
+ rc_status
+}
+
+restart() {
+ stop
+ start
+ rc_status
+}
+
+condrestart() {
+ [ -e $LOCK ] && restart || :
+}
+
+# Reset status of this service
+rc_reset
+
+# See how we were called.
+case "$1" in
+ start)
+ start
+ ;;
+ stop)
+ stop
+ ;;
+ status)
+ dostatus
+ ;;
+ restart|reload)
+ restart
+ ;;
+ try-restart)
+ condrestart
+ ;;
+ *)
+ echo "Usage: lm_sensors {start|stop|status|restart|reload|try-restart}"
+ exit 1
+esac
+
+rc_exit
|
|
|
Deleted |
ready
^
|
