Merge pull request #941 from wzzrd/devel

Add working CPU model fact for some ARM devices
2012-08-24 16:45:35 -07:00 · 2012-08-24 16:45:35 -07:00 · 4ce5b0caea
commit 4ce5b0caea
parent 98483f5252 3d44de284a
1 changed files with 3 additions and 1 deletions
--- a/library/setup
+++ b/library/setup
@ -246,7 +246,9 @@ class LinuxHardware(Hardware):
        for line in open("/proc/cpuinfo").readlines():
            data = line.split(":", 1)
            key = data[0].strip()
-            if key == 'model name':
+            # model name is for Intel arch, Processor (mind the uppercase P)
+            # works for some ARM devices, like the Sheevaplug.
+            if key == 'model name' or key == 'Processor':
                if 'processor' not in self.facts:
                    self.facts['processor'] = []
                self.facts['processor'].append(data[1].strip())