rpms/lm_sensors/F-8 lm_sensors-2.10.6-lsb-retcodes.patch, NONE, 1.1 lm_sensors-2.10.6-service-default-off.patch, NONE, 1.1 .cvsignore, 1.19, 1.20 lm_sensors.spec, 1.55, 1.56 sources, 1.19, 1.20 lm_sensors-2.10.4-service-default-off.patch, 1.2, NONE
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Wed Mar 12 19:34:35 UTC 2008
- Previous message (by thread): rpms/scummvm/F-8 scummvm-0.11.0-nostrip.patch, NONE, 1.1 scummvm-0.11.1-lure-sound-bug-fixes.patch, NONE, 1.1 scummvm-0.11.1-lure-sound-channel-alloc.patch, NONE, 1.1 scummvm-0.11.1-lure-volume-fixes.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 scummvm.spec, 1.6, 1.7 sources, 1.3, 1.4 scummvm-0.9.0-nostrip.patch, 1.1, NONE
- Next message (by thread): rpms/openoffice.org/devel openoffice.org.spec, 1.1440.2.17, 1.1440.2.18 openoffice.org-3.0.0.ooo86588.sw.buildfix.patch, 1.1.2.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jwrdegoede
Update of /cvs/extras/rpms/lm_sensors/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18820
Modified Files:
.cvsignore lm_sensors.spec sources
Added Files:
lm_sensors-2.10.6-lsb-retcodes.patch
lm_sensors-2.10.6-service-default-off.patch
Removed Files:
lm_sensors-2.10.4-service-default-off.patch
Log Message:
* Wed Mar 12 2008 Hans de Goede <j.w.r.degoede at hhs.nl> - 2.10.6-1
- New upstream bugfix release 2.10.6 (fixes bz 436767)
- Add a patch to make the initscript returncodes LSB compliant (bug 431884)
lm_sensors-2.10.6-lsb-retcodes.patch:
--- NEW FILE lm_sensors-2.10.6-lsb-retcodes.patch ---
--- lm_sensors-3.0.1/prog/init/lm_sensors.init 2008-02-26 14:37:51.000000000 +0100
+++ lm_sensors-3.0.1.new/prog/init/lm_sensors.init 2008-02-26 14:25:13.000000000 +0100
@@ -28,31 +28,6 @@
# in order as normal shell variables with the special names:
# MODULE_1, MODULE_2, MODULE_3, etc.
-if grep -q sysfs /proc/mounts; then
- WITHSYS=1
-else
- WITHSYS=0
-fi
-
-if [ $WITHSYS == "0" ]; then
- # If sensors isn't supported by the kernel, try loading the module...
- [ -e /proc/sys/dev/sensors ] || /sbin/modprobe i2c-proc >/dev/null 2>&1
-
- # Don't bother if /proc/sensors still doesn't exist, kernel doesn't have
- # support for sensors.
- [ -e /proc/sys/dev/sensors ] || exit 0
-
- # If sensors was not already running, unload the module...
- [ -e /var/lock/subsys/lm_sensors ] || /sbin/modprobe -r i2c-proc >/dev/null 2>&1
-fi
-
-CONFIG=/etc/sysconfig/lm_sensors
-[ -r "$CONFIG" ] || exit 0
-grep '^MODULE_' $CONFIG >/dev/null 2>&1 || exit 0
-
-# Load config file
-. "$CONFIG"
-
PSENSORS=/usr/local/bin/sensors
if [ ! -x $PSENSORS ]; then
@@ -65,7 +40,47 @@
RETVAL=0
prog="lm_sensors"
+# This functions checks if sensor support is compiled into the kernel, if
+# sensors are configured, and loads the config file
+check_sensors() {
+ if grep -q sysfs /proc/mounts; then
+ WITHSYS=1
+ else
+ WITHSYS=0
+ fi
+
+ if [ $WITHSYS == "0" ]; then
+ # If sensors isn't supported by the kernel, try loading the module...
+ [ -e /proc/sys/dev/sensors ] || /sbin/modprobe i2c-proc >/dev/null 2>&1
+
+ # Don't bother if /proc/sensors still doesn't exist, kernel doesn't have
+ # support for sensors.
+ if ! [ -e /proc/sys/dev/sensors ]; then
+ echo -n "$1 $prog: kernel does not have sensors support"
+ echo_failure
+ echo
+ exit 5
+ fi
+
+ # If sensors was not already running, unload the module...
+ [ -e /var/lock/subsys/lm_sensors ] || /sbin/modprobe -r i2c-proc >/dev/null 2>&1
+ fi
+
+ CONFIG=/etc/sysconfig/lm_sensors
+ if ! [ -r "$CONFIG" ] || ! grep '^MODULE_' $CONFIG >/dev/null 2>&1; then
+ echo -n "$1 $prog: not configured, run sensors-detect"
+ echo_warning
+ echo
+ exit 6
+ fi
+
+ # Load config file
+ . "$CONFIG"
+}
+
start() {
+ check_sensors "Starting"
+
echo -n "Starting $prog: loading module "
modules=`grep \^MODULE_ $CONFIG | wc -l | tr -d ' '`
@@ -89,6 +104,8 @@
}
stop() {
+ check_sensors "Stopping"
+
echo -n "Stopping $prog: "
modules=`grep \^MODULE_ $CONFIG | wc -l | tr -d ' '`
@@ -116,12 +133,14 @@
dostatus() {
$PSENSORS
RETVAL=$?
+ if [ $RETVAL -ne 0 ]; then
+ RETVAL=3
+ fi
}
restart() {
stop
start
- RETVAL=$?
}
condrestart() {
@@ -147,7 +166,7 @@
;;
*)
echo "Usage: $0 {start|stop|status|restart|reload|condrestart}"
- exit 1
+ exit 3
esac
exit $RETVAL
lm_sensors-2.10.6-service-default-off.patch:
--- NEW FILE lm_sensors-2.10.6-service-default-off.patch ---
--- lm_sensors-3.0.1/prog/init/lm_sensors.init.default-off 2007-04-27 14:34:17.000000000 +0200
+++ lm_sensors-3.0.1/prog/init/lm_sensors.init 2008-02-26 14:55:58.000000000 +0100
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# chkconfig: 2345 26 74
+# chkconfig: - 26 74
# description: sensors is used for monitoring motherboard sensor values.
# config: /etc/sysconfig/lm_sensors
#
--- lm_sensors-3.0.1/prog/detect/sensors-detect.default-off 2008-01-22 13:22:47.000000000 +0100
+++ lm_sensors-3.0.1/prog/detect/sensors-detect 2008-02-26 15:00:07.000000000 +0100
@@ -5673,6 +5673,11 @@ sub main
exit -1;
}
+ if (-x "/sbin/service" && -f "/etc/init.d/lm_sensors" &&
+ -f "/var/lock/subsys/lm_sensors") {
+ system("/sbin/service", "lm_sensors", "stop");
+ }
+
initialize_kernel_version();
initialize_conf;
initialize_proc_pci;
@@ -5943,6 +5948,11 @@ EOT
if (-x "/sbin/insserv" && -f "/etc/init.d/lm_sensors") {
system("/sbin/insserv", "/etc/init.d/lm_sensors");
+ } elsif (-x "/sbin/chkconfig" && -f "/etc/init.d/lm_sensors") {
+ system("/sbin/chkconfig", "lm_sensors", "on");
+ if (-x "/sbin/service") {
+ system("/sbin/service", "lm_sensors", "start");
+ }
} else {
print "You should now start the lm_sensors service to load the required\n".
"kernel modules.\n\n";
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lm_sensors/F-8/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore 15 Nov 2007 13:27:44 -0000 1.19
+++ .cvsignore 12 Mar 2008 19:33:52 -0000 1.20
@@ -1 +1 @@
-lm_sensors-2.10.5.tar.gz
+lm_sensors-2.10.6.tar.gz
Index: lm_sensors.spec
===================================================================
RCS file: /cvs/extras/rpms/lm_sensors/F-8/lm_sensors.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- lm_sensors.spec 15 Nov 2007 13:27:44 -0000 1.55
+++ lm_sensors.spec 12 Mar 2008 19:33:52 -0000 1.56
@@ -1,5 +1,5 @@
Name: lm_sensors
-Version: 2.10.5
+Version: 2.10.6
Release: 1%{?dist}
URL: http://www.lm-sensors.org/
Source: http://dl.lm-sensors.org/lm-sensors/releases/%{name}-%{version}.tar.gz
@@ -7,8 +7,8 @@
# these 2 were taken from PLD-linux, Thanks!
Source2: sensord.sysconfig
Source3: sensord.init
-Patch0: lm_sensors-2.10.4-service-default-off.patch
-Patch1: lm_sensors-2.10.5-fschrc.patch
+Patch0: lm_sensors-2.10.6-service-default-off.patch
+Patch1: lm_sensors-2.10.6-lsb-retcodes.patch
Summary: Hardware monitoring tools
Group: Applications/System
License: GPLv2+
@@ -164,6 +164,10 @@
%changelog
+* Wed Mar 12 2008 Hans de Goede <j.w.r.degoede at hhs.nl> - 2.10.6-1
+- New upstream bugfix release 2.10.6 (fixes bz 436767)
+- Add a patch to make the initscript returncodes LSB compliant (bug 431884)
+
* Thu Nov 15 2007 Hans de Goede <j.w.r.degoede at hhs.nl> - 2.10.5-1
- New upstream bugfix release 2.10.5
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lm_sensors/F-8/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources 15 Nov 2007 13:27:44 -0000 1.19
+++ sources 12 Mar 2008 19:33:52 -0000 1.20
@@ -1 +1 @@
-77f96bc8a7773e95b2990d756e4925d6 lm_sensors-2.10.5.tar.gz
+b75189e15b9fea569cda493923b161bb lm_sensors-2.10.6.tar.gz
--- lm_sensors-2.10.4-service-default-off.patch DELETED ---
- Previous message (by thread): rpms/scummvm/F-8 scummvm-0.11.0-nostrip.patch, NONE, 1.1 scummvm-0.11.1-lure-sound-bug-fixes.patch, NONE, 1.1 scummvm-0.11.1-lure-sound-channel-alloc.patch, NONE, 1.1 scummvm-0.11.1-lure-volume-fixes.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 scummvm.spec, 1.6, 1.7 sources, 1.3, 1.4 scummvm-0.9.0-nostrip.patch, 1.1, NONE
- Next message (by thread): rpms/openoffice.org/devel openoffice.org.spec, 1.1440.2.17, 1.1440.2.18 openoffice.org-3.0.0.ooo86588.sw.buildfix.patch, 1.1.2.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list