← Back to branch summary

~ubuntu-branches/ubuntu/trusty/lm-sensors/trusty

« back to all changes in this revision

Viewing changes to debian/patches/12-sensors-detect-superio-x86.patch

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2012-02-21 08:53:20 UTC
  • mfrom: (2.1.7 sid)
  • Revision ID: package-import@ubuntu.com-20120221085320-3s1fld4o2yblp277
Tags: 1:3.3.1-2ubuntu1
* Merge from debian testing, remaining changes are:
  - Add 100_recommend_using_upstart.patch: Recommend use of upstart rather
    than init-script. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/12-sensors-detect-superio-x86.patch
 
1
--- a/prog/detect/sensors-detect
 
2
+++ b/prog/detect/sensors-detect
 
3
@@ -6579,9 +6579,9 @@ sub main
 
4
        print "\n";
 
5
 
 
6
        $superio_features = 0;
 
7
-       # Skip "random" I/O port probing on PPC
 
8
-       if ($kernel_arch ne 'ppc'
 
9
-        && $kernel_arch ne 'ppc64') {
 
10
+       # Skip "random" I/O port probing on non x86 machines
 
11
+       if ($kernel_arch =~ /i?86/
 
12
+        || $kernel_arch eq 'x86_64') {
 
13
                print "Some Super I/O chips contain embedded sensors. We have to write to\n".
 
14
                      "standard I/O ports to probe them. This is usually safe.\n";
 
15
                print "Do you want to scan for Super I/O sensors? (YES/no): ";