diff --git a/buildiso b/buildiso index 6de90a7..d7cdcc4 100755 --- a/buildiso +++ b/buildiso @@ -100,11 +100,13 @@ make_rootfs() { # Ignore init-logind providers alphabetically before the selected # init to prevent pacman --noconfirm from pulling in the wrong one # (elogind-dinit < elogind-openrc) and its conflicting deps. + # --ask 4 auto-answers YES to the "remove ?" question + # as a safety net if --ignore doesn't prevent the conflict entirely. local ignore_args=() case "${INITSYS}" in - openrc) ignore_args=("--ignore=elogind-dinit") ;; - runit) ignore_args=("--ignore=elogind-dinit" "--ignore=elogind-openrc") ;; - s6) ignore_args=("--ignore=elogind-dinit" "--ignore=elogind-openrc" "--ignore=elogind-runit") ;; + openrc) ignore_args=("--ignore=elogind-dinit" "--ask=4") ;; + runit) ignore_args=("--ignore=elogind-dinit" "--ignore=elogind-openrc" "--ask=4") ;; + s6) ignore_args=("--ignore=elogind-dinit" "--ignore=elogind-openrc" "--ignore=elogind-runit" "--ask=4") ;; esac basestrap "${basestrap_args[@]}" "${args[@]}" "${rootfs}" "${packages[@]}" --overwrite='*' "${ignore_args[@]}" 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 01bf699..ee90036 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 @@ -357,6 +357,10 @@ class PMPacman(PackageManager): ignore_pkg = f"{base_init}-{p}" command.append(f"--ignore={ignore_pkg}") + # Safety net: auto-answer YES to conflict resolution (e.g. + # "remove dinit-rc?") if --ignore doesn't prevent the conflict. + command.append("--ask=4") + if self.pacman_needed_only: command.append("--needed") 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 9d899e3..9ef5e83 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 @@ -233,6 +233,9 @@ class PMPacman(PackageManager): for p in sorted_inits[:idx]: command.append(f"--ignore={base_init}-{p}") + # Safety net: auto-answer YES to conflict resolution + command.append("--ask=4") + if self.pacman_needed_only is True: command.append("--needed") if self.pacman_disable_timeout is True: