On Wed, Aug 11, 2004 at 05:21:17PM -0700, Greg KH wrote:
> On Thu, Aug 12, 2004 at 01:11:16AM +0200, Aurelien Jarno wrote:
> > On Wed, Aug 11, 2004 at 08:36:51PM +0200, Jean Delvare wrote:
> > > > sensors-detect currently checks at the beginning of its execution if
> > > > the i2c device nodes exists. It can't work on a system using udev as
> > > > the nodes are created when the i2c-dev module is inserted.
> > > >
> > > > The attached patch fixes that.
> > >
> > > I don't get this:
> > >
> > > + if (-d './dev') {
> > It's a typo, I made the patch to quickly. Should be
> > if (-d './dev') {
>
> I still don't see how that shows if you are running on a udev system or
> not. Why not check for /dev/.udev.tdb or grep the process list for
> udevd (hm, but SLES 9 will fail that one, even though it's using udev.)
I personnaly don't know very well udev, so I used the same way as
/dev/MAKEDEV.sh which is checking for /.dev.
But it you know udevt better than me, so I have made a new patch
(attached) using your solution.
Aurelien
--
.''`. Aurelien Jarno GPG: 1024D/F1BCDB73
: :' : Debian GNU/Linux developer | Electrical Engineer
`. `' aurel32 at debian.org | aurelien at aurel32.net
`- people.debian.org/~aurel32 | www.aurel32.net
-------------- next part --------------
Index: prog/detect/sensors-detect
===================================================================
RCS file: /home/cvs/lm_sensors2/prog/detect/sensors-detect,v
retrieving revision 1.338
diff -u -1 -b -p -r1.338 sensors-detect
--- prog/detect/sensors-detect 31 Jul 2004 16:09:37 -0000 1.338
+++ prog/detect/sensors-detect 10 Aug 2004 23:10:18 -0000
@@ -1805,2 +1805,8 @@ sub initialize_conf
+ my $use_udev = 0;
+ if (-d '/dev/.udev.tdb') {
+ $use_udev = 1;
+ $dev_i2c = '/dev/i2c-';
+ }
+
if (-f '/etc/modules.conf') {
@@ -1813,3 +1819,3 @@ sub initialize_conf
- if (!$use_devfs) {
+ if (!($use_devfs || $use_udev)) {
if (-c '/dev/i2c-0') {
