From 8841e209ee7d0cadb7b7c68e5001b4c006d3714b Mon Sep 17 00:00:00 2001 From: Richard Neumann Date: Mon, 6 Sep 2021 16:12:53 +0200 Subject: Refactor cpu_model() to use cpuinfo() --- archinstall/lib/hardware.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/archinstall/lib/hardware.py b/archinstall/lib/hardware.py index d5bdc98f..416045c4 100644 --- a/archinstall/lib/hardware.py +++ b/archinstall/lib/hardware.py @@ -118,13 +118,10 @@ def cpu_vendor() -> Optional[str]: 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]: -- cgit v1.2.3-70-g09d2