From 64e0990a50ebf4200323241c3f0184969bd192cd Mon Sep 17 00:00:00 2001 From: Celestia Ludenberg Date: Sun, 5 Jul 2026 20:54:05 +0200 Subject: [PATCH] fix: restore base_init logic in basestrap with init-filtered netinstallAdd --- .../etc/calamares/modules/basestrap.conf | 3 ++- .../usr/lib/calamares/modules/basestrap/main.py | 15 +++++++++++++++ 2 files changed, 17 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 f49038e..746f3fa 100644 --- a/iso-profiles/antergos/live-overlay/etc/calamares/modules/basestrap.conf +++ b/iso-profiles/antergos/live-overlay/etc/calamares/modules/basestrap.conf @@ -26,10 +26,11 @@ pacman: - artix - antergos-next +base_init: elogind + operations: - install: - base - antergos-next-keyring - - elogind-openrc - 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 27af747..3459e25 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 @@ -531,6 +531,21 @@ def run(): return None operations = libcalamares.job.configuration.get("operations", []) + + base_init = libcalamares.job.configuration.get("base_init", None) + known_inits = ["openrc", "dinit", "runit", "s6"] + + if base_init is not None and libcalamares.globalstorage.contains("netinstallAdd"): + data = libcalamares.globalstorage.value("netinstallAdd") + for entry in data: + provider = entry.get("name", "").lower() + if provider in known_inits: + init_pkg = "-".join([base_init, provider]) + libcalamares.utils.debug("Init provider package added: {!s}".format(init_pkg)) + operations[0]["install"].append(init_pkg) + libcalamares.globalstorage.insert("initProvider", provider) + break + libcalamares.globalstorage.insert("packageOperationsBasestrap", operations) mode_packages = None