[hardware] remove obsolete up2date_client hardware calls

Remove the calls to up2date_client's Hardware module and simplify
the plugin so we support Red Hat, Debian and Ubuntu from a single
module.

Signed-off-by: Bryn M. Reeves <bmr@redhat.com>

1 files changed, 1 insertions, 20 deletions

diff --git a/sos/plugins/hardware.py b/sos/plugins/hardware.py
index f3c968ea..d36b6cdd 100644
--- a/sos/plugins/hardware.py
+++ b/sos/plugins/hardware.py
@@ -16,7 +16,7 @@ from sos.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin
 from glob import glob
 import os
 
-class Hardware(Plugin):
+class Hardware(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
     """hardware related information
     """
 
@@ -35,23 +35,4 @@ class Hardware(Plugin):
         self.add_cmd_output("dmidecode", root_symlink = "dmidecode")
         
 
-class RedHatHardware(Hardware, RedHatPlugin):
-    """hardware related information for Red Hat distribution
-    """
-
-    def setup(self):
-        super(RedHatHardware, self).setup()
-        hwpaths = glob("/usr/share/rhn/up2date*client/hardware.py")
-        if (len(hwpaths) == 0):
-            return
-        self.add_cmd_output("python " + hwpaths[0])
-
-
-class DebianHardware(Hardware, DebianPlugin, UbuntuPlugin):
-    """hardware related information for Debian distribution
-    """
-
-    def setup(self):
-        super(DebianHardware, self).setup()
-
 # vim: et ts=4 sw=4