From 189b357d9ba80bd9dd4c29250258c352858565e2 Mon Sep 17 00:00:00 2001 From: Celestia Ludenberg Date: Thu, 2 Jul 2026 23:37:16 +0200 Subject: [PATCH] fix: install antergos-next-keyring during basestrap, remove artix-release from target - Add antergos-next-keyring to basestrap install list so keyring files are available in the target early (uses host keyring which already trusts the Antergos key) - Add antergos-next to keyrings list so pacman-key --populate imports the Antergos key into the target's keychain - try_remove artix-release so antergos-release doesn't conflict when packages module runs later (replaces= PKGBUILD fix also pushed, but this works regardless of rebuild) - Fix remove() method in basestrap main.py: was missing --root , causing removals to operate on the HOST instead of the target --- .../live-overlay/etc/calamares/modules/basestrap.conf | 4 ++++ .../usr/lib/calamares/modules/basestrap/main.py | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/iso-profiles/antergos/live-overlay/etc/calamares/modules/basestrap.conf b/iso-profiles/antergos/live-overlay/etc/calamares/modules/basestrap.conf index 6f43bc8..746f3fa 100644 --- a/iso-profiles/antergos/live-overlay/etc/calamares/modules/basestrap.conf +++ b/iso-profiles/antergos/live-overlay/etc/calamares/modules/basestrap.conf @@ -24,9 +24,13 @@ pacman: mode: "0o755" keyrings: - artix + - antergos-next base_init: elogind operations: - install: - base + - antergos-next-keyring + - try_remove: + - artix-release diff --git a/iso-profiles/antergos/live-overlay/usr/lib/calamares/modules/basestrap/main.py b/iso-profiles/antergos/live-overlay/usr/lib/calamares/modules/basestrap/main.py index 9b6975f..26037c6 100644 --- a/iso-profiles/antergos/live-overlay/usr/lib/calamares/modules/basestrap/main.py +++ b/iso-profiles/antergos/live-overlay/usr/lib/calamares/modules/basestrap/main.py @@ -370,7 +370,11 @@ class PMPacman(PackageManager): def remove(self, pkgs): self.reset_progress() - self.run_pacman(["pacman", "-Rs", "--noconfirm"] + pkgs, True) + install_root = libcalamares.globalstorage.value("rootMountPoint") + command = ["pacman"] + command.extend(self.get_optargs(install_root)) + command += ["-Rs", "--noconfirm"] + pkgs + self.run_pacman(command, True) def get_optargs(self, rootdir): cachedir = join(rootdir, "var/cache/pacman/pkg")