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

Reverted 2afc317. Using Path().unlink() instead on ucode if they exist.

This commit is contained in:
Anton Hvornum 2021-05-17 21:59:42 +02:00
parent 2afc31715e
commit e23fffe288
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
archinstall/lib/installer.py
View File

@ -130,23 +130,13 @@ class Installer:
def post_install_check(self, *args, **kwargs): def post_install_check(self, *args, **kwargs):
return [step for step, flag in self.helper_flags.items() if flag is False] return [step for step, flag in self.helper_flags.items() if flag is False]
def pacstrap(self, *packages, options=[], **kwargs): def pacstrap(self, *packages, **kwargs):
if type(packages[0]) in (list, tuple): if type(packages[0]) in (list, tuple):
packages = packages[0] packages = packages[0]
if type(packages) != list: # Redundant?
packages = packages.split(' ')
self.log(f'Installing packages: {packages}', level=logging.INFO) self.log(f'Installing packages: {packages}', level=logging.INFO)
cmd_struct = [
"/usr/bin/pacman",
*options,
self.target,
*packages
]
if (sync_mirrors := SysCommand('/usr/bin/pacman -Syy')).exit_code == 0: if (sync_mirrors := SysCommand('/usr/bin/pacman -Syy')).exit_code == 0:
if (pacstrap := SysCommand(cmd_struct, **kwargs)).exit_code == 0: if (pacstrap := SysCommand(f'/usr/bin/pacstrap {self.target} {" ".join(packages)}', **kwargs)).exit_code == 0:
return True return True
else: else:
self.log(f'Could not strap in packages: {pacstrap.exit_code}', level=logging.INFO) self.log(f'Could not strap in packages: {pacstrap.exit_code}', level=logging.INFO)
@ -342,12 +332,16 @@ class Installer:
vendor = cpu_vendor() vendor = cpu_vendor()
if vendor == "AuthenticAMD": if vendor == "AuthenticAMD":
self.base_packages.append("amd-ucode") self.base_packages.append("amd-ucode")
if (ucode := pathlib.Path(f"{self.target}/boot/amd-ucode.img")).exists():
ucode.unlink()
elif vendor == "GenuineIntel": elif vendor == "GenuineIntel":
self.base_packages.append("intel-ucode") self.base_packages.append("intel-ucode")
if (ucode := pathlib.Path(f"{self.target}/boot/intel-ucode.img")).exists():
ucode.unlink()
else: else:
self.log("Unknown cpu vendor not installing ucode") self.log("Unknown cpu vendor not installing ucode", level=logging.INFO)
self.pacstrap(self.base_packages, options=['--overwrite', "/boot/*-ucode.img"]) self.pacstrap(self.base_packages)
self.helper_flags['base-strapped'] = True self.helper_flags['base-strapped'] = True
with open(f"{self.target}/etc/fstab", "a") as fstab: with open(f"{self.target}/etc/fstab", "a") as fstab: