Hi Hans,
On Mon, 11 Feb 2008 14:18:20 +0100, Hans de Goede wrote:
> The attached patch modifies the initscript included with lm_sensors so that it
> doesn't start by default on chkconfig using systems.
>
> The patch also modifies sensors-detect to activate the initscript once
> lm_sensors has been successfully configured.
>
> If I don't get any objections I will be committing this to svn in a couple of days.
Overall I am fine with this change (it doesn't affect openSuse.)
> diff -up lm_sensors-3.0.1/prog/detect/sensors-detect.foo lm_sensors-3.0.1/prog/detect/sensors-detect
> --- lm_sensors-3.0.1/prog/detect/sensors-detect.foo 2008-01-22 13:22:47.000000000 +0100
> +++ lm_sensors-3.0.1/prog/detect/sensors-detect 2008-02-11 13:42:04.000000000 +0100
> @@ -5943,6 +5943,15 @@ 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") {
> + if (-f "/var/lock/subsys/lm_sensors") {
> + system("/sbin/service", "lm_sensors", "restart");
> + } else {
> + system("/sbin/service", "lm_sensors", "start");
> + }
My only worry is to see the lock file name "leak" to sensors-detect.
I'd prefer it to be only mentioned in the initialization script
itself... Is there any problem to calling "restart" unconditionally? Or
maybe even better, shouldn't we call "stop" at the beginning of
sensors-detect? Probing for devices while the hwmon drivers are loaded
has side effects we probably want to avoid anyway.
> + }
> } else {
> print "You should now start the lm_sensors service to load the required\n".
> "kernel modules.\n\n";
> diff -up lm_sensors-3.0.1/prog/init/lm_sensors.init.foo lm_sensors-3.0.1/prog/init/lm_sensors.init
> --- lm_sensors-3.0.1/prog/init/lm_sensors.init.foo 2007-04-27 14:34:17.000000000 +0200
> +++ lm_sensors-3.0.1/prog/init/lm_sensors.init 2008-02-11 13:08: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
> #
--
Jean Delvare
