diff options
| author | Brian C. Lane <bcl@redhat.com> | 2012-04-02 10:44:02 -0700 |
|---|---|---|
| committer | Brian C. Lane <bcl@redhat.com> | 2012-04-04 08:13:21 -0700 |
| commit | c821ffc9307c4649ed25b62835d8bf0a9ab87f1c (patch) | |
| tree | 0a69bc8cbb571487083b5ad8ccd02af73a5c5186 /pyanaconda/iutil.py | |
| parent | ae74cebff312327ce2d9b5ac3be5dbe22e791f09 (diff) | |
| download | anaconda-c821ffc9307c4649ed25b62835d8bf0a9ab87f1c.tar.gz anaconda-c821ffc9307c4649ed25b62835d8bf0a9ab87f1c.tar.xz anaconda-c821ffc9307c4649ed25b62835d8bf0a9ab87f1c.zip | |
use /sys/class/dmi instead of dmidecode
removes dmidecode binary requirement from specfile and
changes isMactel to read the information directly.
Diffstat (limited to 'pyanaconda/iutil.py')
| -rw-r--r-- | pyanaconda/iutil.py | 5 |
1 files changed, 2 insertions, 3 deletions
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: |