Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Hvornum <anton@hvornum.se>2021-05-17 21:27:31 +0200
committerAnton Hvornum <anton@hvornum.se>2021-05-17 21:27:31 +0200
commit2afc31715ef70635c5580500956fb32f76b734b6 (patch)
tree3969145264e42d5854d8ba78181941f1fcbdde12
parent4755de73197a96139e15f9b0d0673c348912dddc (diff)
Adding a pacman --overwrite declaration for ucodes.
-rw-r--r--archinstall/lib/installer.py16
1 files changed, 13 insertions, 3 deletions
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: