From 61947ab944aec76d60ee921ff3c451b7d02a5df2 Mon Sep 17 00:00:00 2001 From: Richard Neumann Date: Fri, 20 Aug 2021 18:16:00 +0200 Subject: Rewrite CPU vendor detection functions Use cpuinfo() function rather than a subprocess. --- archinstall/lib/hardware.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'archinstall/lib/hardware.py') diff --git a/archinstall/lib/hardware.py b/archinstall/lib/hardware.py index 56a9fa11..eaf01f40 100644 --- a/archinstall/lib/hardware.py +++ b/archinstall/lib/hardware.py @@ -1,6 +1,5 @@ import json import os -import subprocess from pathlib import Path from typing import Iterator, Optional @@ -82,15 +81,11 @@ def has_wifi() -> bool: def has_amd_cpu() -> bool: - if subprocess.check_output("lscpu | grep AMD", shell=True).strip().decode(): - return True - return False + return any(cpu.get("vendor_id") == "AuthenticAMD" for cpu in cpuinfo()) def has_intel_cpu() -> bool: - if subprocess.check_output("lscpu | grep Intel", shell=True).strip().decode(): - return True - return False + return any(cpu.get("vendor_id") == "GenuineIntel" for cpu in cpuinfo()) def has_uefi() -> bool: -- cgit v1.2.3-54-g00ecf