From 2afc31715ef70635c5580500956fb32f76b734b6 Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Mon, 17 May 2021 21:27:31 +0200 Subject: Adding a pacman --overwrite declaration for ucodes. --- archinstall/lib/installer.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'archinstall/lib') diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py index aa2ea920..4b1cda7b 100644 --- a/archinstall/lib/installer.py +++ b/archinstall/lib/installer.py @@ -130,13 +130,23 @@ class Installer: def post_install_check(self, *args, **kwargs): return [step for step, flag in self.helper_flags.items() if flag is False] - def pacstrap(self, *packages, **kwargs): + def pacstrap(self, *packages, options=[], **kwargs): if type(packages[0]) in (list, tuple): packages = packages[0] + if type(packages) != list: # Redundant? + packages = packages.split(' ') + 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 (pacstrap := SysCommand(f'/usr/bin/pacstrap {self.target} {" ".join(packages)}', **kwargs)).exit_code == 0: + if (pacstrap := SysCommand(cmd_struct, **kwargs)).exit_code == 0: return True else: self.log(f'Could not strap in packages: {pacstrap.exit_code}', level=logging.INFO) @@ -337,7 +347,7 @@ class Installer: else: self.log("Unknown cpu vendor not installing ucode") - self.pacstrap(self.base_packages) + self.pacstrap(self.base_packages, options=['--overwrite', "/boot/*-ucode.img"]) self.helper_flags['base-strapped'] = True with open(f"{self.target}/etc/fstab", "a") as fstab: -- cgit v1.2.3-54-g00ecf