From c821ffc9307c4649ed25b62835d8bf0a9ab87f1c Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 2 Apr 2012 10:44:02 -0700 Subject: use /sys/class/dmi instead of dmidecode removes dmidecode binary requirement from specfile and changes isMactel to read the information directly. --- pyanaconda/iutil.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'pyanaconda/iutil.py') diff --git a/pyanaconda/iutil.py b/pyanaconda/iutil.py index e3b6c846f..5c68e021d 100644 --- a/pyanaconda/iutil.py +++ b/pyanaconda/iutil.py @@ -688,11 +688,10 @@ def isMactel(): if not isX86(): mactel = False - elif not os.path.exists("/usr/sbin/dmidecode"): + elif not os.path.isfile(DMI_CHASSIS_VENDOR): mactel = False else: - buf = execWithCapture("/usr/sbin/dmidecode", - ["dmidecode", "-s", "system-manufacturer"]) + buf = open(DMI_CHASSIS_VENDOR).read() if buf.lower().find("apple") != -1: mactel = True else: -- cgit