add function to check cpu vendor to allow for cpu specific command line arguments

This commit is contained in:
advaithm 2021-03-12 11:57:02 +05:30
parent 43a0134f2e
commit 94456bf8ba
No known key found for this signature in database
GPG Key ID: E557E45E6DAFFC0C
2 changed files with 9 additions and 3 deletions

View File

@ -1,4 +1,4 @@
import os
import os, subprocess
from .general import sys_command
from .networking import list_interfaces, enrichIfaceTypes
@ -7,6 +7,11 @@ def hasWifi():
return True
return False
def hasAMDCPU():
if subprocess.check_output("lscpu | grep AMD", shell=True).strip().decode():
return True
return False
def hasUEFI():
return os.path.isdir('/sys/firmware/efi')

View File

@ -9,6 +9,7 @@ from .mirrors import *
from .systemd import Networkd
from .output import log, LOG_LEVELS
from .storage import storage
from .hardware import *
class Installer():
"""
@ -335,7 +336,7 @@ class Installer():
for uid in uids:
real_path = os.path.realpath(os.path.join(root, uid))
if not os.path.basename(real_path) == os.path.basename(self.partition.real_device): continue
if subprocess.check_output("lscpu | grep AMD", shell=True).strip().decode(): # intel_paste is intel only, it's redudant on AMD systens
if hasAMDCPU(): # intel_paste is intel only, it's redudant on AMD systens
entry.write(f'options cryptdevice=UUID={uid}:luksdev root=/dev/mapper/luksdev rw\n')
else:
entry.write(f'options cryptdevice=UUID={uid}:luksdev root=/dev/mapper/luksdev rw intel_pstate=no_hwp\n')
@ -348,7 +349,7 @@ class Installer():
for uid in uids:
real_path = os.path.realpath(os.path.join(root, uid))
if not os.path.basename(real_path) == os.path.basename(self.partition.path): continue
if subprocess.check_output("lscpu | grep AMD", shell=True).strip().decode():
if hasAMDCPU():
entry.write(f'options root=PARTUUID={uid} rw\n')
else:
entry.write(f'options root=PARTUUID={uid} rw intel_pstate=no_hwp\n')