From d9ca905b731a0f1aad4dd50184399f5223b7a451 Mon Sep 17 00:00:00 2001
From: Sandwich <sandwich@archworks.co>
Date: Sat, 21 Feb 2026 02:38:27 +0100
Subject: [PATCH] fix(bootstrap): move Jinja to end of task name and rename
 registers to bootstrap_dnf_*

---
 roles/bootstrap/tasks/_dnf_family.yml | 31 ++++++++++-----------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/roles/bootstrap/tasks/_dnf_family.yml b/roles/bootstrap/tasks/_dnf_family.yml
index 0168cce..5137204 100644
--- a/roles/bootstrap/tasks/_dnf_family.yml
+++ b/roles/bootstrap/tasks/_dnf_family.yml
@@ -1,41 +1,32 @@
 ---
 - name: "Bootstrap {{ os | capitalize }}"
   vars:
-    _dnf_os_config:
-      rocky:
-        repos: [baseos, appstream]
-        groups: [core]
-      almalinux:
-        repos: [baseos, appstream]
-        groups: [core]
-      fedora:
-        repos: [fedora, fedora-updates]
-        groups: [critical-path-base, core]
-    _dnf_repos: "{{ _dnf_os_config[os].repos | map('regex_replace', '^', '--repo=') | join(' ') }}"
-    _dnf_groups: "{{ _dnf_os_config[os].groups | join(' ') }}"
+    _dnf_config: "{{ lookup('vars', bootstrap_var_key) }}"
+    _dnf_repos: "{{ _dnf_config.repos | map('regex_replace', '^', '--repo=') | join(' ') }}"
+    _dnf_groups: "{{ _dnf_config.base | join(' ') }}"
     _dnf_extra: >-
       {{
-        lookup('vars', bootstrap_var_key)
+        ((_dnf_config.extra | default([])) + (_dnf_config.conditional | default([])))
         | reject('equalto', '')
         | join(' ')
       }}
   block:
-    - name: "Install {{ os | capitalize }} base system"
+    - name: "Install base system for {{ os | capitalize }}"
       ansible.builtin.command: >-
         dnf --releasever={{ os_version }} --best {{ _dnf_repos }}
         --installroot=/mnt --setopt=install_weak_deps=False
         groupinstall -y {{ _dnf_groups }}
-      register: _dnf_base_result
-      changed_when: _dnf_base_result.rc == 0
+      register: bootstrap_dnf_base_result
+      changed_when: bootstrap_dnf_base_result.rc == 0
 
     - name: Install extra packages
       ansible.builtin.command: >-
         {{ chroot_command }} dnf --releasever={{ os_version }} --setopt=install_weak_deps=False
         install -y {{ _dnf_extra }}
-      register: _dnf_extra_result
-      changed_when: _dnf_extra_result.rc == 0
+      register: bootstrap_dnf_extra_result
+      changed_when: bootstrap_dnf_extra_result.rc == 0
 
     - name: Reinstall kernel core
       ansible.builtin.command: "{{ chroot_command }} dnf reinstall -y kernel-core"
-      register: _dnf_kernel_result
-      changed_when: _dnf_kernel_result.rc == 0
+      register: bootstrap_dnf_kernel_result
+      changed_when: bootstrap_dnf_kernel_result.rc == 0