[prev in list] [next in list] [prev in thread] [next in thread] 

List:       spacewalk-commits
Subject:    client/rhel
From:       mmraka () fedoraproject ! org (Michael Mraka)
Date:       2010-08-31 10:32:18
Message-ID: 20100831103218.6E9A41205A7 () lists ! fedorahosted ! org
[Download RAW message or body]

 client/rhel/rhn-client-tools/src/up2date_client/hardware.py |   22 ++++++++++++
 1 file changed, 22 insertions(+)

New commits:
commit ec14d9bbba2a987ee3ccaf3206e7692959504db8
Author: Michael Mraka <michael.mraka at redhat.com>
Date:   Tue Aug 31 12:22:48 2010 +0200

    621135 - report resonable cpuinfo in s390(x)

diff --git a/client/rhel/rhn-client-tools/src/up2date_client/hardware.py \
b/client/rhel/rhn-client-tools/src/up2date_client/hardware.py index 2a21930..fab40b7 \
                100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
@@ -272,6 +272,28 @@ def read_cpuinfo():
             hwdict['speed'] = int(round(float(mhz_speed)) - 1)
         except ValueError:
             hwdict['speed'] = -1
+         
+    elif uname in ['s390', 's390x']:
+        tmpdict = {}
+        for cpu in string.split(cpulist, "\n"):
+            vals = string.split(cpu, ": ")
+            if len(vals) != 2:
+                continue
+            tmpdict[vals[0].strip()] = vals[1].strip()
+
+        hwdict['platform']      = uname
+        hwdict['type']          = get_entry(tmpdict,'vendor_id')
+        hwdict['model']         = uname
+        hwdict['count']         = get_entry(tmpdict, '# processors')
+        hwdict['bogomips']      = get_entry(tmpdict, 'bogomips per cpu')
+        hwdict['model_number']  = ""
+        hwdict['model_ver']     = ""
+        hwdict['model_rev']     = ""
+        hwdict['cache']         = ""
+        hwdict['other']         = get_entry(tmpdict, 'features')
+        hwdict['speed']         = 0
+
+        
     else:
         # XXX: expand me. Be nice to others
         hwdict['platform']      = uname


[prev in list] [next in list] [prev in thread] [next in thread]