Hello community,
here is the log from the commit of package sensors for openSUSE:Factory checked in at 2014-01-29 07:17:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sensors (Old)
and /work/SRC/openSUSE:Factory/.sensors.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sensors"
Changes:
--------
--- /work/SRC/openSUSE:Factory/sensors/sensors.changes 2013-12-13 12:00:54.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.sensors.new/sensors.changes 2014-01-29 07:17:08.000000000 +0100
@@ -1,0 +2,24 @@
+Tue Jan 28 09:08:45 CET 2014 - jdelvare@suse.de
+
+- Package COPYING and COPYING.LGPL.
+
+-------------------------------------------------------------------
+Wed Jan 22 10:24:21 CET 2014 - jdelvare@suse.de
+
+- Package new file /usr/share/man/man8/sensors-conf-convert.8.gz.
+
+-------------------------------------------------------------------
+Wed Jan 22 10:08:21 CET 2014 - jdelvare@suse.de
+
+- Update to lm_sensors 3.3.5
+ * library: Support up to 33 sensors of the same type per
+ monitoring chip (needed for recent Intel processors, coretemp
+ driver)
+ * sensors-detect: Detection of new devices
+ Added non-interactive (automatic) mode
+ * lm_sensors-r6181-fix-service-files.patch: Removed, upstream
+ now.
+ * lm_sensors-3.0.0-sysconfig_metadata.patch,
+ lm_sensors-3.0.3-hint-at-kernel-extra-package.patch: Refreshed.
+
+-------------------------------------------------------------------
Old:
----
lm_sensors-3.3.4.tar.bz2
lm_sensors-r6181-fix-service-files.patch
New:
----
lm_sensors-3.3.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sensors.spec ++++++
--- /var/tmp/diff_new_pack.HaowcB/_old 2014-01-29 07:17:09.000000000 +0100
+++ /var/tmp/diff_new_pack.HaowcB/_new 2014-01-29 07:17:09.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package sensors
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -22,7 +22,7 @@
BuildRequires: rrdtool-devel
BuildRequires: systemd-rpm-macros
Url: http://www.lm-sensors.org/
-Version: 3.3.4
+Version: 3.3.5
Release: 0
Summary: Hardware health monitoring for Linux
License: GPL-2.0+
@@ -34,7 +34,6 @@
Patch2: lm_sensors-3.0.0-sensord-separate.patch
Patch3: lm_sensors-3.0.0-sysconfig_metadata.patch
Patch4: lm_sensors-3.0.3-hint-at-kernel-extra-package.patch
-Patch5: lm_sensors-r6181-fix-service-files.patch
ExcludeArch: s390 s390x
%{?systemd_requires}
@@ -95,7 +94,6 @@
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p1
%build
RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
@@ -103,16 +101,13 @@
%install
make PROG_EXTRA:=sensord BUILD_STATIC_LIB:=0 PREFIX=%{_prefix} MANDIR=%{_mandir} LIBDIR=%{_libdir} DESTDIR=$RPM_BUILD_ROOT install
- cd doc/
- mkdir -p $RPM_BUILD_ROOT/%{_docdir}/sensors
- cp -a donations $RPM_BUILD_ROOT/%{_docdir}/sensors/
- cp -a fan-divisors $RPM_BUILD_ROOT/%{_docdir}/sensors/
- cp -a fancontrol.txt $RPM_BUILD_ROOT/%{_docdir}/sensors/
- cp -a temperature-sensors $RPM_BUILD_ROOT/%{_docdir}/sensors/
- cp -a vid $RPM_BUILD_ROOT/%{_docdir}/sensors/
- cp -a progs $RPM_BUILD_ROOT/%{_docdir}/sensors/
- chmod -R u+rwX,g+rX,o+rX $RPM_BUILD_ROOT/%{_docdir}/sensors/
- cd ../
+ mkdir -p $RPM_BUILD_ROOT/%{_docdir}/sensors $RPM_BUILD_ROOT/%{_docdir}/sensord
+ cp -a doc/donations doc/fan-divisors \
+ doc/fancontrol.txt doc/libsensors-API.txt \
+ doc/progs doc/temperature-sensors \
+ doc/vid COPYING COPYING.LGPL $RPM_BUILD_ROOT/%{_docdir}/sensors/
+ cp -a COPYING $RPM_BUILD_ROOT/%{_docdir}/sensord/
+ chmod -R u+rwX,g+rX,o+rX $RPM_BUILD_ROOT/%{_docdir}/sensors/ $RPM_BUILD_ROOT/%{_docdir}/sensord/
chmod 0755 $RPM_BUILD_ROOT/%{_libdir}/libsensors.so.*
mkdir -p $RPM_BUILD_ROOT/%{_unitdir}
cp -a prog/init/*.service $RPM_BUILD_ROOT/%{_unitdir}/
@@ -168,7 +163,14 @@
%endif
/usr/sbin/pwmconfig
/usr/sbin/sensors-detect
-%doc %{_docdir}/sensors/
+%dir %{_docdir}/sensors
+%doc %{_docdir}/sensors/donations
+%doc %{_docdir}/sensors/fan-divisors
+%doc %{_docdir}/sensors/fancontrol.txt
+%doc %{_docdir}/sensors/progs
+%doc %{_docdir}/sensors/temperature-sensors
+%doc %{_docdir}/sensors/vid
+%doc %{_docdir}/sensors/COPYING
%doc /usr/share/man/man1/*.1.gz
%doc /usr/share/man/man8/fancontrol.8.gz
%ifarch i386 i486 i586 i686 x86_64
@@ -176,12 +178,15 @@
%doc /usr/share/man/man8/isaset.8.gz
%endif
%doc /usr/share/man/man8/pwmconfig.8.gz
+%doc /usr/share/man/man8/sensors-conf-convert.8.gz
%doc /usr/share/man/man8/sensors-detect.8.gz
%files -n sensord
%defattr(-,root,root)
%{_unitdir}/sensord.service
/usr/sbin/sensord
+%dir %{_docdir}/sensord
+%doc %{_docdir}/sensord/COPYING
%doc /usr/share/man/man8/sensord.8.gz
%files -n libsensors4
@@ -189,12 +194,16 @@
%config /etc/sensors3.conf
%config /etc/sensors.d/
%{_libdir}/libsensors.so.4*
+%dir %{_docdir}/sensors
+%doc %{_docdir}/sensors/COPYING.LGPL
%doc /usr/share/man/man5/*.5.gz
%files -n libsensors4-devel
%defattr(-,root,root)
/usr/include/sensors/
%{_libdir}/libsensors.so
+%dir %{_docdir}/sensors
+%doc %{_docdir}/sensors/libsensors-API.txt
%doc /usr/share/man/man3/*.3.gz
%changelog
++++++ lm_sensors-3.0.0-sysconfig_metadata.patch ++++++
--- /var/tmp/diff_new_pack.HaowcB/_old 2014-01-29 07:17:09.000000000 +0100
+++ /var/tmp/diff_new_pack.HaowcB/_new 2014-01-29 07:17:09.000000000 +0100
@@ -4,7 +4,7 @@
--- lm_sensors-3.3.2.orig/prog/detect/sensors-detect
+++ lm_sensors-3.3.2/prog/detect/sensors-detect
-@@ -6693,6 +6693,12 @@ sub write_config
+@@ -6784,6 +6784,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';
++++++ lm_sensors-3.0.3-hint-at-kernel-extra-package.patch ++++++
--- /var/tmp/diff_new_pack.HaowcB/_old 2014-01-29 07:17:09.000000000 +0100
+++ /var/tmp/diff_new_pack.HaowcB/_new 2014-01-29 07:17:09.000000000 +0100
@@ -3,21 +3,22 @@
sensors-detect is being run. Point the user to the kernel-*-extra
package if drivers are found to be missing.
---
- prog/detect/sensors-detect | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
+ prog/detect/sensors-detect | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
--- lm_sensors-3.3.2.orig/prog/detect/sensors-detect
+++ lm_sensors-3.3.2/prog/detect/sensors-detect
-@@ -2616,12 +2616,15 @@ sub initialize_conf
+@@ -2669,13 +2669,16 @@ sub initialize_conf
# [2] -> SUBLEVEL
# [3] -> EXTRAVERSION
#
--use vars qw(@kernel_version $kernel_arch);
-+use vars qw(@kernel_version $kernel_flavor $kernel_arch);
+-use vars qw($kernel_version @kernel_version $kernel_arch);
++use vars qw($kernel_version @kernel_version $kernel_flavor $kernel_arch);
sub initialize_kernel_version
{
- `uname -r` =~ /(\d+)\.(\d+)\.(\d+)(.*)/;
+ chomp($kernel_version = `uname -r`);
+ $kernel_version =~ /(\d+)\.(\d+)\.(\d+)(.*)/;
@kernel_version = ($1, $2, $3, $4);
+ if ($kernel_version[3] =~ /-([a-z]+)$/) {
+ chomp($kernel_flavor = $1);
@@ -25,16 +26,12 @@
chomp($kernel_arch = `uname -m`);
# We only support kernels >= 2.6.5
-@@ -6635,7 +6638,11 @@ sub generate_modprobes
- # isn't supported
- if ((($? >> 8) == 0) && ! $modulefound) {
+@@ -6729,6 +6732,8 @@ sub generate_modprobes
print "Warning: the required module $driver is not currently installed\n".
-- "on your system. If it is built into the kernel then it's OK.\n".
-+ "on your system. ".
-+ ($kernel_flavor ?
-+ "You may need to install package\n".
-+ "kernel-$kernel_flavor-extra for lm-sensors to work properly.\n" :
-+ "If it is built into the kernel then it's OK.\n").
- "Otherwise, check http://www.lm-sensors.org/wiki/Devices for\n".
+ "on your system. Check http://www.lm-sensors.org/wiki/Devices for\n".
"driver availability.\n\n";
++ print "You may need to install package kernel-$kernel_flavor-extra for\n".
++ "lm-sensors to work properly.\n\n" if $kernel_flavor;
} else {
+ $hwmon_modules{$driver}++
+ unless hwmon_is_autoloaded($driver);
++++++ lm_sensors-3.3.4.tar.bz2 -> lm_sensors-3.3.5.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lm_sensors-3.3.4/CHANGES new/lm_sensors-3.3.5/CHANGES
--- old/lm_sensors-3.3.4/CHANGES 2013-05-27 12:33:26.000000000 +0200
+++ new/lm_sensors-3.3.5/CHANGES 2014-01-22 09:11:15.000000000 +0100
@@ -1,6 +1,27 @@
lm-sensors CHANGES file
-----------------------
+3.3.5 "Happy Birthday Beddy" (2014-01-22)
+ libsensors: Improve documentation of two functions
+ Increase MAX_SENSORS_PER_TYPE to 33
+ init: Fix EnvironmentFile in service files
+ Drop syslog.target dependency from service files
+ sensors-conf-convert: Add a manual page
+ sensors-detect: Report built-in drivers as such
+ Use modules.builtin instead of /sys/module
+ Handle built-in modules properly
+ Add detection of NCT6791D
+ Add detection of NCT6681D, NCT6682D, and NCT6683D
+ Add detection of F71868A
+ Add detection of IT8603E
+ Add two PCI IDs for new family 15h AMD processors
+ Introduce automatic mode (--auto)
+ Detect incorrect non-interactive runs
+ Rework option handling
+ Fix use of uninitialized value 'vendor_id' on ppc64
+ Add detection of TMP451
+ Add detection of SMSC EMC2104
+
3.3.4 (2013-05-27)
sensors.conf.5: Mention "sensors -u" to get the raw feature names
sensors: Clarify what option -u is good for
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lm_sensors-3.3.4/doc/developers/lm_sensors.lsm new/lm_sensors-3.3.5/doc/developers/lm_sensors.lsm
--- old/lm_sensors-3.3.4/doc/developers/lm_sensors.lsm 2013-05-27 12:33:26.000000000 +0200
+++ new/lm_sensors-3.3.5/doc/developers/lm_sensors.lsm 2014-01-22 09:11:15.000000000 +0100
@@ -1,7 +1,7 @@
Begin4
Title: lm_sensors
-Version: 3.3.4
-Entered-date: 2013-05-27
+Version: 3.3.5
+Entered-date: 2014-01-22
Description: Hardware health monitoring package for Linux. It consists of
a library to allow applications to read sensors data more
easily, and of an example program to pretty print this data.
@@ -11,8 +11,8 @@
Author: khali@linux-fr.org (Jean Delvare)
Maintained-by: khali@linux-fr.org (Jean Delvare)
Primary-site: http://dl.lm-sensors.org /lm-sensors/releases/
- lm_sensors-3.3.4.tar.bz2
- lm_sensors-3.3.4.tar.bz2.sig
+ lm_sensors-3.3.5.tar.bz2
+ lm_sensors-3.3.5.tar.bz2.sig
Alternate-site: ftp.netroedge.com /pub/lm-sensors/
Copying-policy: GPL/LGPL
End
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lm_sensors-3.3.4/doc/developers/release_checklist new/lm_sensors-3.3.5/doc/developers/release_checklist
--- old/lm_sensors-3.3.4/doc/developers/release_checklist 2012-11-06 21:10:47.000000000 +0100
+++ new/lm_sensors-3.3.5/doc/developers/release_checklist 2013-05-28 10:36:56.000000000 +0200
@@ -27,10 +27,8 @@
ssh devel.atrpms.net chmod 664 '/srv/lm-sensors.org/dl/lm-sensors/releases/lm_sensors-3.x.x.tar.bz2{,.sig}'
After release, remember to:
-- Copy to mirrors
- Update the Download page on lm-sensors.org, then add a news item
- Announce on the lm-sensors mailing list
-- Announce on Freecode
- Add "+SVN" to version.h and commit
- Mark the corresponding release milestone as complete using trac-admin
e.g. 'trac-admin /srv/lm-sensors.org/trac milestone completed 3.x.x now'
@@ -40,3 +38,5 @@
e.g. 'trac-admin /srv/lm-sensors.org/trac milestone add 3.x.x+1 2012-05-10'
- Send lm_sensors.lsm to the LSM by mailing it to lsm@qqx.org with the
subject `add' (no quotes)
+- Copy to mirrors
+- Announce on Freecode
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lm_sensors-3.3.4/doc/developers/smbus_company_id new/lm_sensors-3.3.5/doc/developers/smbus_company_id
--- old/lm_sensors-3.3.4/doc/developers/smbus_company_id 2013-05-01 13:48:38.000000000 +0200
+++ new/lm_sensors-3.3.5/doc/developers/smbus_company_id 2013-06-07 22:18:02.000000000 +0200
@@ -26,3 +26,16 @@
0xDA Dallas
[A-Z]{3} at 0x00-0x02: Fujitsu-Siemens
+
+
+Jedec JC 42.4 compliant temperature sensors provide the manufacturer ID
+in 16-bit register 0x06. Known manufacturer IDs are as follows.
+
+0x001F Atmel
+0x004D Maxim
+0x0054 Microchip
+0x00B3 IDT
+0x104A ST Microelectronics
+0x1131 NXP (Philips)
+0x11D4 Analog Devices
+0x1B09 ON Semiconductor
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lm_sensors-3.3.4/doc/libsensors-API.txt new/lm_sensors-3.3.5/doc/libsensors-API.txt
--- old/lm_sensors-3.3.4/doc/libsensors-API.txt 2013-05-27 12:33:26.000000000 +0200
+++ new/lm_sensors-3.3.5/doc/libsensors-API.txt 2014-01-22 09:11:15.000000000 +0100
@@ -6,7 +6,7 @@
authors can quickly figure out how to test for the availability of a
given new feature.
-0x432 lm-sensors 3.3.2 to 3.3.4
+0x432 lm-sensors 3.3.2 to 3.3.5
* Added support for new sysfs attributes
enum sensors_subfeature_type SENSORS_SUBFEATURE_IN_AVERAGE
enum sensors_subfeature_type SENSORS_SUBFEATURE_IN_LOWEST
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lm_sensors-3.3.4/etc/Module.mk new/lm_sensors-3.3.5/etc/Module.mk
--- old/lm_sensors-3.3.4/etc/Module.mk 2009-07-24 15:52:28.000000000 +0200
+++ new/lm_sensors-3.3.5/etc/Module.mk 2013-09-11 14:18:59.000000000 +0200
@@ -32,10 +32,13 @@
-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
+ $(MKDIR) $(DESTDIR)$(MANDIR)/man8
+ $(INSTALL) -m 644 $(ETC_DIR)/sensors-conf-convert.8 $(DESTDIR)$(MANDIR)/man8
user_install :: install-etc
uninstall-etc:
$(RM) $(DESTDIR)$(BINDIR)/sensors-conf-convert
+ $(RM) $(DESTDIR)$(MANDIR)/man8/sensors-conf-convert.8
user_uninstall :: uninstall-etc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lm_sensors-3.3.4/etc/sensors-conf-convert.8 new/lm_sensors-3.3.5/etc/sensors-conf-convert.8
--- old/lm_sensors-3.3.4/etc/sensors-conf-convert.8 1970-01-01 01:00:00.000000000 +0100
+++ new/lm_sensors-3.3.5/etc/sensors-conf-convert.8 2013-09-11 14:18:59.000000000 +0200
@@ -0,0 +1,27 @@
+.TH SENSORS-CONF-CONVERT 8 "August 2013" "lm-sensors 3"
+.SH NAME
+sensors-conf-convert \- sensors configuration conversion
+
+.SH SYNOPSIS
+.B sensors-conf-convert
+<
+.I /etc/sensors.conf
+>
+.I /etc/sensors3.conf
+
+.SH DESCRIPTION
+The purpose of the
+.B sensors-conf-convert
+tool is to convert
+.I sensors.conf
+from the lm_sensors version 2 format to the lm_sensors
+version 3 format.
+.P
+The old configuration file is read from the standard input and the
+new one is written to the standard output.
+
+.SH SEE ALSO
+sensors(1), libsensors(3)
+
+.SH AUTHOR
+Jean Delvare
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lm_sensors-3.3.4/etc/sensors.conf.eg new/lm_sensors-3.3.5/etc/sensors.conf.eg
--- old/lm_sensors-3.3.4/etc/sensors.conf.eg 2010-01-13 21:18:02.000000000 +0100
+++ new/lm_sensors-3.3.5/etc/sensors.conf.eg 2014-01-19 16:59:11.000000000 +0100
@@ -1980,9 +1980,9 @@
# Abit Uguru sensor part configuration.
-# The Abit Uguru is relativly straight forward to configure.
+# The Abit Uguru is relatively straight forward to configure.
# label statements:
-# The voltage (in) temp and fan sensors are usualy in the same order as listed
+# The voltage (in) temp and fan sensors are usually in the same order as listed
# in the BIOS, but not always!
# compute statements:
# The temp and fan sensors don't need any compute statements. Most voltage
@@ -1994,7 +1994,7 @@
# mutiplier, 5 volt the 1.788 and 12 volt the 4.153.
# set statements:
# The Abit BIOS sets reasonable treshholds and allows changing them, thus
-# set statements may be ommited. The abituguru kernel driver does support
+# set statements may be omitted. The abituguru kernel driver does support
# them if you want to add them.
#
# The configuration below is for the Kv8Pro and AV8 this is the default as this
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lm_sensors-3.3.4/lib/init.c new/lm_sensors-3.3.5/lib/init.c
--- old/lm_sensors-3.3.4/lib/init.c 2010-07-01 13:56:42.000000000 +0200
+++ new/lm_sensors-3.3.5/lib/init.c 2013-09-11 13:56:08.000000000 +0200
@@ -175,6 +175,8 @@
return res;
}
+/* Ideally, initialization and configuraton file loading should be exposed
+ separately, to make it possible to load several configuration files. */
int sensors_init(FILE *input)
{
int res;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lm_sensors-3.3.4/lib/libsensors.3 new/lm_sensors-3.3.5/lib/libsensors.3
--- old/lm_sensors-3.3.4/lib/libsensors.3 2010-07-01 13:56:42.000000000 +0200
+++ new/lm_sensors-3.3.5/lib/libsensors.3 2013-09-11 13:56:08.000000000 +0200
@@ -1,5 +1,5 @@
.\" Copyright (C) 1998, 1999 Adrian Baugh
-.\" Copyright (C) 2007, 2009 Jean Delvare
+.\" Copyright (C) 2007, 2009, 2013 Jean Delvare
.\" based on sensors.h, part of libsensors by Frodo Looijaard
.\" libsensors is distributed under the LGPL
.\"
@@ -25,7 +25,7 @@
.\"
.\" References consulted:
.\" libsensors source code
-.TH libsensors 3 "February 2009" "lm-sensors 3" "Linux Programmer's Manual"
+.TH libsensors 3 "September 2013" "lm-sensors 3" "Linux Programmer's Manual"
.SH NAME
libsensors \- publicly accessible functions provided by the sensors library
@@ -88,8 +88,12 @@
.B sensors_init()
loads the configuration file and the detected chips list. If this returns a
value unequal to zero, you are in trouble; you can not assume anything will
-be initialized properly. If you want to reload the configuration file, call
-sensors_cleanup() below before calling sensors_init() again.
+be initialized properly. If you want to reload the configuration file, or
+load a different configuration file, call sensors_cleanup() below before
+calling sensors_init() again. This means you can't load multiple configuration
+files at once by calling sensors_init() multiple times.
+
+The configuration file format is described in sensors.conf(5).
If FILE is NULL, the default configuration files are used (see the FILES
section below). Most applications will want to do that.
@@ -117,9 +121,20 @@
success (same as snprintf), <0 on error.
.B sensors_get_adapter_name()
-returns the adapter name of a bus number, as used within the
+returns the adapter name of a bus type, number pair, as used within the
sensors_chip_name structure. If it could not be found, it returns NULL.
+Adapters describe how a monitoring chip is hooked up to the system.
+This is particularly relevant for I2C/SMBus sensor chips (bus type "i2c"),
+which must be accessed over an I2C/SMBus controller. Each such controller
+has a different number, assigned by the system at initialization time,
+so that they can be referenced individually.
+
+Super\-I/O or CPU\-embedded sensors, on the other hand, can be accessed
+directly and technically don't use any adapter. They have only a bus type
+but no bus number, and sensors_get_adapter_name() will return a generic
+adapter name for them.
+
.B sensors_get_detected_chips()
returns all detected chips that match a given chip name,
one by one. If no chip name is provided, all detected chips are returned.
@@ -258,6 +273,6 @@
sensors.conf(5)
.SH AUTHOR
-Frodo Looijaard and the lm_sensors group
+Frodo Looijaard, Jean Delvare and others
http://www.lm-sensors.org/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lm_sensors-3.3.4/lib/sysfs.c new/lm_sensors-3.3.5/lib/sysfs.c
--- old/lm_sensors-3.3.4/lib/sysfs.c 2012-03-06 08:34:13.000000000 +0100
+++ new/lm_sensors-3.3.5/lib/sysfs.c 2014-01-14 15:49:04.000000000 +0100
@@ -140,7 +140,7 @@
#define MAX_MAIN_SENSOR_TYPES (SENSORS_FEATURE_MAX_MAIN - SENSORS_FEATURE_IN)
#define MAX_OTHER_SENSOR_TYPES (SENSORS_FEATURE_MAX_OTHER - SENSORS_FEATURE_VID)
-#define MAX_SENSORS_PER_TYPE 24
+#define MAX_SENSORS_PER_TYPE 33
/* max_subfeatures is now computed dynamically */
#define FEATURE_SIZE (max_subfeatures * 2)
#define FEATURE_TYPE_SIZE (MAX_SENSORS_PER_TYPE * FEATURE_SIZE)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lm_sensors-3.3.4/prog/detect/sensors-detect new/lm_sensors-3.3.5/prog/detect/sensors-detect
--- old/lm_sensors-3.3.4/prog/detect/sensors-detect 2013-05-20 21:25:22.000000000 +0200
+++ new/lm_sensors-3.3.5/prog/detect/sensors-detect 2014-01-14 22:51:58.000000000 +0100
@@ -2,7 +2,7 @@
#
# sensors-detect - Detect hardware monitoring chips
# Copyright (C) 1998 - 2002 Frodo Looijaard
-# Copyright (C) 2004 - 2012 Jean Delvare
+# Copyright (C) 2004 - 2013 Jean Delvare
#
# 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
@@ -39,9 +39,9 @@
use constant NO_CACHE => 1;
use vars qw(@pci_adapters @chip_ids @ipmi_ifs @non_hwmon_chip_ids
- $i2c_addresses_to_scan $revision @i2c_byte_cache);
+ $i2c_addresses_to_scan $revision @i2c_byte_cache %opt);
-$revision = '$Revision: 6170 $ ($Date: 2013-05-20 21:25:22 +0200 (lun. 20 mai 2013) $)';
+$revision = '$Revision: 6209 $ ($Date: 2014-01-14 22:51:58 +0100 (mar. 14 janv. 2014) $)';
$revision =~ s/\$\w+: (.*?) \$/$1/g;
$revision =~ s/ \([^()]*\)//;
@@ -1028,6 +1028,11 @@
i2c_addrs => [0x4c, 0x4d],
i2c_detect => sub { lm90_detect(@_, 17); },
}, {
+ name => "Texas Instruments TMP451",
+ driver => "lm90",
+ i2c_addrs => [0x4c],
+ i2c_detect => sub { lm90_detect(@_, 18); },
+ }, {
name => "Texas Instruments AMC6821",
driver => "amc6821",
i2c_addrs => [0x18..0x1a, 0x2c..0x2e, 0x4c..0x4e],
@@ -1235,6 +1240,11 @@
i2c_addrs => [0x2e],
i2c_detect => sub { emc1403_detect(@_, 2); },
}, {
+ name => "SMSC EMC2104",
+ driver => "to-be-written",
+ i2c_addrs => [0x2f],
+ i2c_detect => sub { emc1403_detect(@_, 13); },
+ }, {
name => "Fintek F75121R/F75122R/RG (VID+GPIO)",
driver => "to-be-written",
i2c_addrs => [0x4e], # 0x37 not probed
@@ -2031,6 +2041,13 @@
logdev => 0x0b,
features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
}, {
+ name => "Nuvoton NCT6681D/NCT6682D eSIO",
+ driver => "to-be-written",
+ devid => 0xB270,
+ devid_mask => 0xFFF0,
+ logdev => 0x0b,
+ features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
+ }, {
name => "Nuvoton W83667HG-B (NCT5571D) Super IO Sensors",
driver => "w83627ehf",
devid => 0xB350,
@@ -2063,6 +2080,20 @@
logdev => 0x0b,
features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
}, {
+ name => "Nuvoton NCT6683D eSIO",
+ driver => "to-be-written",
+ devid => 0xC730,
+ devid_mask => 0xFFF0,
+ logdev => 0x0b,
+ features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
+ }, {
+ name => "Nuvoton NCT6791D Super IO Sensors",
+ driver => "nct6775",
+ devid => 0xC800,
+ devid_mask => 0xFFF0,
+ logdev => 0x0b,
+ features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
+ }, {
name => "Nuvoton NCT6102D/NCT6104D/NCT6106D Super IO Sensors",
driver => "to-be-written", # nct6775
devid => 0xC450,
@@ -2094,6 +2125,12 @@
logdev => 0x04,
features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
}, {
+ name => "Fintek F71868A Super IO Sensors",
+ driver => "to-be-written",
+ devid => 0x1106,
+ logdev => 0x04,
+ features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
+ }, {
name => "Fintek F71869F/E Super IO Sensors",
driver => "f71882fg",
devid => 0x0814,
@@ -2182,6 +2219,12 @@
@superio_ids_ite = (
{
+ name => "ITE IT8603E Super IO Sensors",
+ driver => "it87",
+ devid => 0x8603,
+ logdev => 0x04,
+ features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
+ }, {
name => "ITE IT8702F Super IO Fan Sensors",
driver => "to-be-written",
devid => 0x8702,
@@ -2365,7 +2408,7 @@
}, {
name => "AMD Family 15h thermal sensors",
driver => "k10temp",
- detect => sub { amd_pci_detect('1603') },
+ detect => sub { amd_pci_detect('1603', '1403', '141d') },
}, {
name => "AMD Family 15h power sensors",
driver => "fam15h_power",
@@ -2483,6 +2526,16 @@
return %result;
}
+# Read answer from stdin or accept default answer automatically
+sub read_answer
+{
+ if ($opt{auto}) {
+ print "\n";
+ return "";
+ }
+ return <STDIN> || "";
+}
+
###################
# I/O PORT ACCESS #
###################
@@ -2616,11 +2669,12 @@
# [2] -> SUBLEVEL
# [3] -> EXTRAVERSION
#
-use vars qw(@kernel_version $kernel_arch);
+use vars qw($kernel_version @kernel_version $kernel_arch);
sub initialize_kernel_version
{
- `uname -r` =~ /(\d+)\.(\d+)\.(\d+)(.*)/;
+ chomp($kernel_version = `uname -r`);
+ $kernel_version =~ /(\d+)\.(\d+)\.(\d+)(.*)/;
@kernel_version = ($1, $2, $3, $4);
chomp($kernel_arch = `uname -m`);
@@ -2656,7 +2710,10 @@
while (<INPUTFILE>) {
if (m/^processor\s*:\s*(\d+)/) {
push @cpu, $entry if scalar keys(%{$entry}); # Previous entry
- $entry = { nr => $1 }; # New entry
+ $entry = { # New entry
+ nr => $1,
+ vendor_id => "undefined",
+ };
next;
}
if (m/^(vendor_id|cpu family|model|model name|stepping|cpuid level)\s*:\s*(.+)$/) {
@@ -2743,7 +2800,7 @@
# First try to get the I2C adapter driver name from sysfs,
# and if it fails, fall back to searching our list of known
# I2C adapters.
- $entry->{driver} = sysfs_device_driver($entry->{parent})
+ $entry->{driver} = sysfs_device_module($entry->{parent})
|| find_i2c_adapter_driver($entry->{name})
|| 'UNKNOWN';
@@ -2766,7 +2823,7 @@
while (defined($hwmon = readdir(HWMON))) {
next unless $hwmon =~ m/^hwmon\d+$/;
- $driver = sysfs_device_driver("${class_dir}/$hwmon/device");
+ $driver = sysfs_device_module("${class_dir}/$hwmon/device");
next unless defined($driver);
if (device_driver_autoloads("${class_dir}/$hwmon/device")) {
@@ -2788,24 +2845,23 @@
# MODULES #
###########
-use vars qw(%modules_list %modules_supported @modules_we_loaded);
+use vars qw(%modules_builtin %modules_list %modules_supported @modules_we_loaded);
sub initialize_modules_list
{
- local $_;
+ local ($_, *INPUTFILE);
- # /sys/module contains built-in drivers too, but doesn't exist on
- # older kernels (added in kernel 2.6.7)
- if (opendir(local *MODULES, "$sysfs_root/module")) {
- while (defined($_ = readdir(MODULES))) {
- next if m/^\./;
- $modules_list{$1} = 1 if m/^(\S*)/;
+ # Starting with kernel 2.6.33, a list of built-in modules is available
+ if (open(*INPUTFILE, "/lib/modules/$kernel_version/modules.builtin")) {
+ while (<INPUTFILE>) {
+ tr/-/_/;
+ $modules_builtin{$1} = 1 if m/\/([^\/]+)\.ko$/;
}
- return;
+ close(INPUTFILE);
}
- # Fall back to /proc/modules as it is always available
- open(local *INPUTFILE, "/proc/modules") or return;
+ # List all loaded modules
+ open(*INPUTFILE, "/proc/modules") or return;
while (<INPUTFILE>) {
$modules_list{$1} = 1 if m/^(\S*)/;
}
@@ -2815,7 +2871,14 @@
{
my $module = shift;
$module =~ tr/-/_/;
- return exists $modules_list{$module}
+ return exists $modules_list{$module} || exists $modules_builtin{$module};
+}
+
+sub is_module_builtin
+{
+ my $module = shift;
+ $module =~ tr/-/_/;
+ return exists $modules_builtin{$module};
}
sub load_module
@@ -3004,8 +3067,8 @@
# SYSFS HELPERS #
#################
-# From a sysfs device path, return the driver (module) name, or undef
-sub sysfs_device_driver
+# From a sysfs device path, return the module name, or undef
+sub sysfs_device_module
{
my $device = shift;
@@ -3014,6 +3077,16 @@
return basename($link);
}
+# From a sysfs device path, return the driver name, or undef
+sub sysfs_device_driver
+{
+ my $device = shift;
+
+ my $link = readlink("$device/driver");
+ return unless defined $link;
+ return basename($link);
+}
+
# From a sysfs device path, return the subsystem name, or undef
sub sysfs_device_subsystem
{
@@ -3594,11 +3667,12 @@
# If the address is busy, we can normally find out which driver
# requested it (if the kernel is recent enough, at least 2.6.16 and
# later are known to work), and we assume it is the right one.
- my ($device, $driver, $new_hash);
+ my ($device, $driver, $module, $new_hash);
$device = sprintf("$sysfs_root/bus/i2c/devices/\%d-\%04x",
$adapter_nr, $addr);
$driver = sysfs_device_driver($device);
+ $module = sysfs_device_module($device);
if (!defined($driver)) {
printf("Client at address 0x%02x can not be probed - ".
@@ -3615,14 +3689,21 @@
};
printf "Client found at address 0x\%02x\n", $addr;
- printf "Handled by driver `\%s' (already loaded), chip type `\%s'\n",
- $driver, $new_hash->{chipname};
+ if (defined($module)) {
+ printf "Handled by driver `\%s' (already loaded), chip type `\%s'\n",
+ $module, $new_hash->{chipname};
+ } else {
+ printf "Handled by driver `\%s' (built-in), chip type `\%s'\n",
+ $driver, $new_hash->{chipname};
+ # Let's hope that the driver name matches the module name
+ $module = $driver;
+ }
# Only add it to the list if this is something we would have detected,
# else we end up with random i2c chip drivers listed (for example
# media/video drivers.)
- if (exists $modules_supported{$driver}) {
- add_i2c_to_chips_detected($driver, $new_hash);
+ if (exists $modules_supported{$module}) {
+ add_i2c_to_chips_detected($module, $new_hash);
} else {
print " (note: this is probably NOT a sensor chip!)\n";
}
@@ -3707,7 +3788,7 @@
"Do you want to scan it? (\%s/selectively): ",
$default ? "YES/no" : "yes/NO";
- $input = <STDIN>;
+ $input = read_answer();
if ($input =~ /^\s*n/i
|| (!$default && $input !~ /^\s*[ys]/i)) {
print "\n";
@@ -3718,7 +3799,7 @@
print "Please enter one or more addresses not to scan. Separate them with commas.\n",
"You can specify a range by using dashes. Example: 0x58-0x5f,0x69.\n",
"Addresses: ";
- $input = <STDIN>;
+ $input = read_answer();
chomp($input);
@not_to_scan = parse_not_to_scan(0x03, 0x77, $input);
} elsif (($class & 0xff00) == 0x0300) {
@@ -4498,7 +4579,7 @@
# 8 = W83L771W/G, 9 = TMP401, 10 = TMP411,
# 11 = W83L771AWG/ASG, 12 = MAX6690,
# 13 = ADT7461A/NCT1008, 14 = SA56004,
-# 15 = G781, 16 = TMP431, 17 = TMP432
+# 15 = G781, 16 = TMP431, 17 = TMP432, 18 = TMP451
# Registers used:
# 0x03: Configuration
# 0x04: Conversion rate
@@ -4628,6 +4709,12 @@
return if $mid != 0x55; # Texas Instruments
return 6 if ($cid == 0x32); # TMP432A/B
}
+ if ($chip == 18) {
+ return if ($conf & 0x1B) != 0;
+ return if $rate > 0x09;
+ return if $mid != 0x55; # Texas Instruments
+ return 4 if ($cid == 0x00); # TMP451
+ }
return;
}
@@ -5516,8 +5603,7 @@
# Extra checks for MAX1617 and LM84, since those are often misdetected.
# We verify several assertions (6 for the MAX1617, 4 for the LM84) and
- # discard the chip if any fail. Note that these checks are not done
- # by the adm1021 driver.
+ # discard the chip if any fail.
if ($chip == 2 || $chip == 5) {
my $lte = i2c_smbus_read_byte_data($file, 0x00);
my $rte = i2c_smbus_read_byte_data($file, 0x01);
@@ -5882,7 +5968,8 @@
# Chip to detect: 0 = EMC1403, 1 = EMC1404, 2 = EMC2103, 3 = EMC1423,
# 4 = EMC1002, 5 = EMC1033, 6 = EMC1046, 7 = EMC1047, 8 = EMC1072,
-# 9 = EMC1073, 10 = EMC1074, 11 = EMC1402, 12 = EMC1424
+# 9 = EMC1073, 10 = EMC1074, 11 = EMC1402, 12 = EMC1424,
+# 13 = EMC2104
# Registers used:
# 0xfd: Device ID register
# 0xfe: Vendor ID register
@@ -5935,6 +6022,9 @@
} elsif ($chip == 12) { # EMC1424
return unless $dev_id == 0x27;
return unless $rev == 0x01;
+ } elsif ($chip == 13) { # EMC2104
+ return unless $dev_id == 0x1d;
+ return unless $rev == 0x02;
}
return 6;
@@ -6381,9 +6471,11 @@
sub amd_pci_detect
{
- my $f3_id = shift;
- return unless exists $pci_list{"1022:$f3_id"};
- return 9;
+ my $dev_id;
+ while (defined($dev_id = shift)) {
+ return 9 if exists $pci_list{"1022:$dev_id"};
+ }
+ return undef;
}
sub fam10h_pci_detect
@@ -6620,7 +6712,7 @@
if ($driver eq "to-be-written") {
print "Note: there is no driver for ${$chips_detected{$driver}}[0]{chipname} yet.\n".
"Check http://www.lm-sensors.org/wiki/Devices for updates.\n\n";
- } else {
+ } elsif (!is_module_builtin($driver)) {
open(local *INPUTFILE, "modprobe -l $driver 2>/dev/null |");
local $_;
my $modulefound = 0;
@@ -6635,8 +6727,7 @@
# isn't supported
if ((($? >> 8) == 0) && ! $modulefound) {
print "Warning: the required module $driver is not currently installed\n".
- "on your system. If it is built into the kernel then it's OK.\n".
- "Otherwise, check http://www.lm-sensors.org/wiki/Devices for\n".
+ "on your system. Check http://www.lm-sensors.org/wiki/Devices for\n".
"driver availability.\n\n";
} else {
$hwmon_modules{$driver}++
@@ -6659,7 +6750,7 @@
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>;
+ $_ = read_answer();
if (($have_modprobe_d and not m/^\s*n/i) or m/^\s*y/i) {
unless ($have_modprobe_d) {
mkdir('/etc/modprobe.d', 0777)
@@ -6683,7 +6774,7 @@
printf "Do you want to \%s /etc/sysconfig/lm_sensors? (\%s): ",
(-e '/etc/sysconfig/lm_sensors' ? 'overwrite' : 'generate'),
($have_sysconfig ? 'YES/no' : 'yes/NO');
- $_ = <STDIN>;
+ $_ = read_answer();
if (($have_sysconfig and not m/^\s*n/i) or m/^\s*y/i) {
unless ($have_sysconfig) {
mkdir('/etc/sysconfig', 0777)
@@ -6752,21 +6843,30 @@
"/usr/local/bin/sensors -s\n").
"#----cut here----\n\n");
- print "If you have some drivers built into your kernel, the list above will\n".
- "contain too many modules. Skip the appropriate ones! You really\n".
- "should try these commands right now to make sure everything is\n".
- "working properly. Monitoring programs won't work until the needed\n".
+ print "You really should try these commands right now to make sure everything\n".
+ "is working properly. Monitoring programs won't work until the needed\n".
"modules are loaded.\n\n";
}
-
}
sub main
{
my ($input, $superio_features);
- # Handle special command line cases first
- if (defined $ARGV[0] && $ARGV[0] eq "--stat") {
+ # Parse command line options
+ while (defined $ARGV[0]) {
+ if ($ARGV[0] eq "--stat") {
+ $opt{stat} = 1;
+ } elsif ($ARGV[0] eq "--auto") {
+ $opt{auto} = 1;
+ } else {
+ print STDERR "Error: unknown option $ARGV[0]\n";
+ exit 1;
+ }
+ shift @ARGV;
+ }
+
+ if ($opt{stat}) {
show_i2c_stats();
exit 0;
}
@@ -6798,14 +6898,21 @@
initialize_dmi_data();
print_dmi_summary();
print "\n";
- print "This program will help you determine which kernel modules you need\n",
- "to load to use lm_sensors most effectively. It is generally safe\n",
- "and recommended to accept the default answers to all questions,\n",
- "unless you know what you're doing.\n\n";
+
+ if ($opt{auto}) {
+ print "Running in automatic mode, default answers to all questions\n",
+ "are assumed.\n\n";
+ } else {
+ print "This program will help you determine which kernel modules you need\n",
+ "to load to use lm_sensors most effectively. It is generally safe\n",
+ "and recommended to accept the default answers to all questions,\n",
+ "unless you know what you're doing.\n\n";
+ }
print "Some south bridges, CPUs or memory controllers contain embedded sensors.\n".
"Do you want to scan for them? This is totally safe. (YES/no): ";
- unless (<STDIN> =~ /^\s*n/i) {
+ $input = read_answer();
+ unless ($input =~ /^\s*n/i) {
# Load the cpuid driver if needed
unless (-e "$sysfs_root/class/cpuid") {
load_module("cpuid");
@@ -6827,7 +6934,8 @@
print "Some Super I/O chips contain embedded sensors. We have to write to\n".
"standard I/O ports to probe them. This is usually safe.\n";
print "Do you want to scan for Super I/O sensors? (YES/no): ";
- unless (<STDIN> =~ /^\s*n/i) {
+ $input = read_answer();
+ unless ($input =~ /^\s*n/i) {
if (initialize_ioports()) {
$superio_features |= scan_superio(0x2e, 0x2f);
$superio_features |= scan_superio(0x4e, 0x4f);
@@ -6843,7 +6951,8 @@
"there, we have to read from arbitrary I/O ports to probe for such\n".
"interfaces. This is normally safe. Do you want to scan for IPMI\n".
"interfaces? (YES/no): ";
- unless (<STDIN> =~ /^\s*n/i) {
+ $input = read_answer();
+ unless ($input =~ /^\s*n/i) {
if (!ipmi_from_smbios()) {
if (initialize_ioports()) {
scan_isa_bus(\@ipmi_ifs);
@@ -6859,7 +6968,7 @@
"safe though. Yes, you do have ISA I/O ports even if you do not have any\n".
"ISA slots! Do you want to scan the ISA I/O ports? (\%s): ",
$superio_features ? "yes/NO" : "YES/no";
- $input = <STDIN>;
+ $input = read_answer();
unless ($input =~ /^\s*n/i
|| ($superio_features && $input !~ /^\s*y/i)) {
if (initialize_ioports()) {
@@ -6876,7 +6985,8 @@
"on some systems.\n".
"Do you want to probe the I2C/SMBus adapters now? (YES/no): ";
- unless (<STDIN> =~ /^\s*n/i) {
+ $input = read_answer();
+ unless ($input =~ /^\s*n/i) {
adapter_pci_detection();
load_module("i2c-dev") unless -e "$sysfs_root/class/i2c-dev";
initialize_i2c_adapters_list();
@@ -6912,9 +7022,11 @@
exit;
}
- print "Now follows a summary of the probes I have just done.\n".
- "Just press ENTER to continue: ";
- <STDIN>;
+ print "\nNow follows a summary of the probes I have just done.\n";
+ unless ($opt{auto}) {
+ print "Just press ENTER to continue: ";
+ <STDIN>;
+ }
initialize_hwmon_autoloaded();
foreach my $driver (keys %chips_detected) {
@@ -6922,6 +7034,7 @@
find_aliases($chips_detected{$driver});
print "\nDriver `$driver'";
print " (autoloaded)" if hwmon_is_autoloaded($driver);
+ print " (built-in)" if is_module_builtin($driver);
print ":\n";
print_chips_report($chips_detected{$driver});
}
@@ -6936,6 +7049,15 @@
}
unload_modules();
+
+ # Check if running non-interactively without --auto
+ if (!$opt{auto} && ! -t STDIN) {
+ print "***************************************************************\n".
+ "Warning: the preferred way to run this script non-interactively\n".
+ "is with option --auto. Other methods are discouraged and may\n".
+ "stop working at some point in the future.\n".
+ "***************************************************************\n\n";
+ }
}
sub cleanup_on_int
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lm_sensors-3.3.4/prog/detect/sensors-detect.8 new/lm_sensors-3.3.5/prog/detect/sensors-detect.8
--- old/lm_sensors-3.3.4/prog/detect/sensors-detect.8 2008-12-03 16:15:39.000000000 +0100
+++ new/lm_sensors-3.3.5/prog/detect/sensors-detect.8 2013-09-11 13:22:37.000000000 +0200
@@ -1,9 +1,11 @@
-.TH SENSORS-DETECT 8 "December 2008" "lm-sensors 3"
+.TH SENSORS-DETECT 8 "September 2013" "lm-sensors 3"
.SH NAME
sensors-detect \- detect hardware monitoring chips
.SH SYNOPSIS
-.B sensors-detect
+.B sensors-detect [
+.I --auto
+.B ]
.SH DESCRIPTION
sensors-detect is an interactive program that will walk you through the
@@ -30,6 +32,13 @@
hardware monitoring chip. Some vendors are known to do this, most notably
Asus and Tyan.
+.SH OPTIONS
+.IP "--auto"
+Run in automatic, non-interactive mode. Assume default answers to all
+questions. Note that this isn't necessarily safe as the internal logic may
+lead to potentially dangerous probes being attempted. See the WARNING section
+below.
+
.SH WARNING
sensors-detect needs to access the hardware for most of the chip detections.
By definition, it doesn't know which chips are there before it manages to
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lm_sensors-3.3.4/prog/init/fancontrol.service new/lm_sensors-3.3.5/prog/init/fancontrol.service
--- old/lm_sensors-3.3.4/prog/init/fancontrol.service 2013-05-24 12:39:23.000000000 +0200
+++ new/lm_sensors-3.3.5/prog/init/fancontrol.service 2013-06-03 14:36:47.000000000 +0200
@@ -4,7 +4,6 @@
After=lm_sensors.service
[Service]
-EnvironmentFile=/etc/sysconfig/lm_sensors
Type=simple
PIDFile=/var/run/fancontrol.pid
ExecStart=/usr/sbin/fancontrol
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lm_sensors-3.3.4/prog/init/lm_sensors.service new/lm_sensors-3.3.5/prog/init/lm_sensors.service
--- old/lm_sensors-3.3.4/prog/init/lm_sensors.service 2011-04-27 19:35:18.000000000 +0200
+++ new/lm_sensors-3.3.5/prog/init/lm_sensors.service 2014-01-19 17:57:33.000000000 +0100
@@ -1,6 +1,5 @@
[Unit]
Description=Initialize hardware monitoring sensors
-After=syslog.target
[Service]
EnvironmentFile=/etc/sysconfig/lm_sensors
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lm_sensors-3.3.4/prog/init/sensord.service new/lm_sensors-3.3.5/prog/init/sensord.service
--- old/lm_sensors-3.3.4/prog/init/sensord.service 2013-05-24 15:28:38.000000000 +0200
+++ new/lm_sensors-3.3.5/prog/init/sensord.service 2014-01-19 17:57:33.000000000 +0100
@@ -1,10 +1,9 @@
[Unit]
Description=Log hardware monitoring data
After=lm_sensors.service
-After=syslog.target
[Service]
-EnvironmentFile=-/etc/sysconfig/sensord
+EnvironmentFile=/etc/sysconfig/sensord
Type=forking
PIDFile=/var/run/sensord.pid
ExecStart=/usr/sbin/sensord -i $INTERVAL -l $LOG_INTERVAL -f daemon
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lm_sensors-3.3.4/prog/sensors/chips.c new/lm_sensors-3.3.5/prog/sensors/chips.c
--- old/lm_sensors-3.3.4/prog/sensors/chips.c 2012-11-06 20:44:01.000000000 +0100
+++ new/lm_sensors-3.3.5/prog/sensors/chips.c 2014-01-19 16:59:11.000000000 +0100
@@ -115,7 +115,7 @@
int i;
const sensors_feature *iter;
char *label;
- unsigned int max_size = 11; /* 11 as minumum label width */
+ unsigned int max_size = 11; /* 11 as minimum label width */
i = 0;
while ((iter = sensors_get_features(name, &i))) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lm_sensors-3.3.4/prog/tellerstats/gather.sh new/lm_sensors-3.3.5/prog/tellerstats/gather.sh
--- old/lm_sensors-3.3.4/prog/tellerstats/gather.sh 2008-03-26 14:37:12.000000000 +0100
+++ new/lm_sensors-3.3.5/prog/tellerstats/gather.sh 2014-01-19 16:59:11.000000000 +0100
@@ -26,7 +26,7 @@
# generic tellerstats init BEGIN
-# get config information from /etc/tellerstats.conf or whereever we are pointed
+# get config information from /etc/tellerstats.conf or wherever we are pointed
if [ -z "$TELLERSTATS_CONF" ]
then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lm_sensors-3.3.4/prog/tellerstats/tellerstats.sh new/lm_sensors-3.3.5/prog/tellerstats/tellerstats.sh
--- old/lm_sensors-3.3.4/prog/tellerstats/tellerstats.sh 2008-03-26 14:37:12.000000000 +0100
+++ new/lm_sensors-3.3.5/prog/tellerstats/tellerstats.sh 2014-01-19 16:59:11.000000000 +0100
@@ -23,7 +23,7 @@
# generic tellerstats init BEGIN
-# get config information from /etc/tellerstats.conf or whereever we are pointed
+# get config information from /etc/tellerstats.conf or wherever we are pointed
if [ -z "$TELLERSTATS_CONF" ]
then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lm_sensors-3.3.4/version.h new/lm_sensors-3.3.5/version.h
--- old/lm_sensors-3.3.4/version.h 2013-05-27 12:33:26.000000000 +0200
+++ new/lm_sensors-3.3.5/version.h 2014-01-22 09:11:15.000000000 +0100
@@ -1 +1 @@
-#define LM_VERSION "3.3.4"
+#define LM_VERSION "3.3.5"
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org