Changeset 4358

Timestamp:

04/04/07 21:24:39 (6 years ago)

Author:

khali

Message:

sensors-detect: Add /usr/sbin to the PATH. i2cdetect might be there instead
of in /usr/local/sbin. Many users have been complaining and several
distribtions were (rightly) modifying sensors-detect because of this.

Location:

lm-sensors/trunk

Files:

• CHANGES (modified) (1 diff)
• prog/detect/sensors-detect (modified) (2 diffs)

lm-sensors/trunk/CHANGES

@@ -11 +11 @@
   Program sensors-detect: Stop Super-I/O probe after first family success
                           Fix SMSC DME1737 detection
+                          Add /usr/sbin to the PATH (#2199)
 
 

lm-sensors/trunk/prog/detect/sensors-detect

@@ -5 +5 @@
 #    Copyright (C) 1998 - 2002  Frodo Looijaard <frodol@dds.nl>
 #    Copyright (C) 2000 - 2004  The lm_sensors team
-#    Copyright (C) 2005 - 2006  Jean Delvare <khali@linux-fr.org>
+#    Copyright (C) 2005 - 2007  Jean Delvare <khali@linux-fr.org>
 #
 #    This program is free software; you can redistribute it and/or modify
@@ -35 +35 @@
 use File::Basename;
 
-# Just in case a root user doesn't have /sbin in his/her path for some reason
-# (was seen once)
-$ENV{PATH} = '/sbin:'.$ENV{PATH}
-        unless $ENV{PATH} =~ m,(^|:)/sbin/?(:|$),;
-# Same for /usr/local/sbin since we need i2cdetect which is installed there
-# by default (reported by Lennard Klein)
-$ENV{PATH} = '/usr/local/sbin:'.$ENV{PATH}
-        unless $ENV{PATH} =~ m,(^|:)/usr/local/sbin/?(:|$),;
+# We will call modprobe and i2cdetect, which typically live in either /sbin,
+# /usr/sbin or /usr/local/bin. So make sure these are all in the PATH.
+foreach ('/usr/sbin', '/usr/local/sbin', '/sbin') {
+        $ENV{PATH} = "$_:".$ENV{PATH}
+                unless $ENV{PATH} =~ m/(^|:)$_\/?(:|$)/;
+}
 
 #########################