From 2c0d2424b41986f70f822e2b155f7c400ebf93c2 Mon Sep 17 00:00:00 2001 From: Celestia Ludenberg Date: Sun, 5 Jul 2026 22:03:03 +0200 Subject: [PATCH] fix: add --ignore logic to packages module too The branding's netinstall.yaml has a Base System group with 'base' that gets added to packageOperations. The packages module then reinstalls base without --ignore, triggering the same init-logind resolution bug. Adding the same --ignore logic from the basestrap module. --- .../usr/lib/calamares/modules/packages/main.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/iso-profiles/antergos/live-overlay/usr/lib/calamares/modules/packages/main.py b/iso-profiles/antergos/live-overlay/usr/lib/calamares/modules/packages/main.py index f814102..9d899e3 100644 --- a/iso-profiles/antergos/live-overlay/usr/lib/calamares/modules/packages/main.py +++ b/iso-profiles/antergos/live-overlay/usr/lib/calamares/modules/packages/main.py @@ -221,6 +221,18 @@ class PMPacman(PackageManager): command.append("--noprogressbar") command.append("--overwrite=*") + # Same --ignore logic as basestrap module to prevent pacman + # --noconfirm from picking the wrong init-logind provider. + if libcalamares.globalstorage.contains("initProvider"): + provider = libcalamares.globalstorage.value("initProvider") + base_init = libcalamares.globalstorage.value("baseInit") + if base_init and provider: + sorted_inits = ["dinit", "openrc", "runit", "s6"] + if provider in sorted_inits: + idx = sorted_inits.index(provider) + for p in sorted_inits[:idx]: + command.append(f"--ignore={base_init}-{p}") + if self.pacman_needed_only is True: command.append("--needed") if self.pacman_disable_timeout is True: