RomanNum3ral
/
archinstall
mirror of https://github.com/archlinux/archinstall.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #622 from conqp/refactor_cpu_data_detection 

Refactor cpu data detection
This commit is contained in:
Anton Hvornum 2021-09-06 16:29:14 +02:00 committed by GitHub
parent 81f3ccad40 8841e209ee
commit 4505c3a11f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
archinstall/lib/hardware.py
View File

@ -111,23 +111,17 @@ def has_intel_graphics() -> bool:
def cpu_vendor() -> Optional[str]:
cpu_info_raw = SysCommand("lscpu -J")
cpu_info = json.loads(b"".join(cpu_info_raw).decode('UTF-8'))['lscpu']
for cpu in cpuinfo():
return cpu.get("vendor_id")
for info in cpu_info:
if info.get('field', None) == "Vendor ID:":
return info.get('data', None)
return
return None
def cpu_model() -> Optional[str]:
cpu_info_raw = SysCommand("lscpu -J")
cpu_info = json.loads(b"".join(cpu_info_raw).decode('UTF-8'))['lscpu']
for cpu in cpuinfo():
return cpu.get("model name")
for info in cpu_info:
if info.get('field', None) == "Model name:":
return info.get('data', None)
return
return None
def sys_vendor() -> Optional[str]: