From f9ac42dbc01a9113c8a644e30a164e5f87a6a50a Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Mon, 12 Jan 2009 12:39:29 +0000 Subject: [PATCH] Improve the format of /etc/sysconfig/lm_sensors as generated by sensors-detect. The new format is more flexible and less error-prone. The old format is still included for compatibility. git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5588 7894878c-1315-0410-8ee3-d5d059ff63e0 --- CHANGES | 1 + prog/detect/sensors-detect | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index ddf65b15..3e7405b0 100644 --- a/CHANGES +++ b/CHANGES @@ -53,6 +53,7 @@ SVN-HEAD Skip IPMI probing on laptops Add Winbond/Nuvoton W83667HG support Add Intel Core I7 support + Generate new format for /etc/sysconfig/lm_sensors sensors-detect-stat.pl: Delete (functionality merged into sensors-detect) 3.0.3 (2008-09-28) diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect index 94a77547..966fe7c8 100755 --- a/prog/detect/sensors-detect +++ b/prog/detect/sensors-detect @@ -5348,9 +5348,20 @@ sub main # This file is sourced by /etc/init.d/lm_sensors and defines the modules to # be loaded/unloaded. # -# The format of this file is a shell script that simply defines the modules -# in order as normal variables with the special names: +# The format of this file is a shell script that simply defines variables: +# HWMON_MODULES for hardware monitoring driver modules, and optionally +# BUS_MODULES for any required bus driver module (for example for I2C or SPI). + +EOT + print SYSCONFIG "BUS_MODULES=\"", join(" ", @{$bus_modules}), "\"\n" + if @{$bus_modules}; + print SYSCONFIG "HWMON_MODULES=\"", join(" ", @{$hwmon_modules}), "\"\n"; + + print SYSCONFIG <<'EOT'; + +# For compatibility reasons, modules are also listed individually as variables # MODULE_0, MODULE_1, MODULE_2, etc. +# You should use BUS_MODULES and HWMON_MODULES instead if possible. EOT my $i = 0;