fix(bootstrap): repair version-specific package availability across distributions

roles/bootstrap/vars/main.yml

@@ -22,7 +22,6 @@ bootstrap_rhel_base:
   - "{{ 'qemu-guest-agent' if hypervisor_type in ['libvirt', 'proxmox'] else '' }}"
   - "{{ 'open-vm-tools' if hypervisor_type == 'vmware' else '' }}"
   - vim
-  - zram-generator
   - zstd
 
 bootstrap_rhel_versioned:
@@ -31,6 +30,7 @@ bootstrap_rhel_versioned:
   - "{{ 'grub2-tools-extra' if os_version_major | default('') in ['8', '9'] else '' }}"
   - "{{ 'python39' if os_version_major | default('') == '8' else 'python' }}"
   - "{{ 'kernel' if os_version_major | default('') == '10' else '' }}"
+  - "{{ 'zram-generator' if os_version_major | default('') in ['9', '10'] else '' }}"
 
 bootstrap_rhel_common: "{{ bootstrap_rhel_base + bootstrap_rhel_versioned }}"
 
@@ -39,10 +39,10 @@ bootstrap_rhel9: "{{ bootstrap_rhel_common }}"
 bootstrap_rhel10: "{{ bootstrap_rhel_common }}"
 
 bootstrap_almalinux:
-  "{{ bootstrap_rhel_base + ['grub2', 'grub2-efi', 'dbus-daemon', 'lrzsz', 'nfsv4-client-utils', 'nc', 'ppp'] }}"
+  "{{ bootstrap_rhel_base + ['grub2', 'grub2-efi', 'dbus-daemon', 'lrzsz', 'nfsv4-client-utils', 'nc', 'ppp', 'zram-generator'] }}"
 
 bootstrap_rocky:
-  "{{ bootstrap_rhel_base + ['grub2', 'grub2-efi', 'nfsv4-client-utils', 'nc', 'ppp', 'telnet', 'util-linux-core', 'wget'] }}"
+  "{{ bootstrap_rhel_base + ['grub2', 'grub2-efi', 'nfsv4-client-utils', 'nc', 'ppp', 'telnet', 'util-linux-core', 'wget', 'zram-generator'] }}"
 
 bootstrap_almalinux8: "{{ bootstrap_almalinux }}"
 bootstrap_almalinux9: "{{ bootstrap_almalinux }}"
@@ -99,7 +99,7 @@ bootstrap_fedora41: "{{ bootstrap_fedora }}"
 bootstrap_fedora42: "{{ bootstrap_fedora }}"
 bootstrap_fedora43: "{{ bootstrap_fedora }}"
 
-bootstrap_debian_base:
+bootstrap_debian_base_common:
   - btrfs-progs
   - cron
   - gnupg
@@ -117,12 +117,11 @@ bootstrap_debian_base:
   - python3
   - xfsprogs
 
-bootstrap_debian_extra:
+bootstrap_debian_extra_common:
   - apparmor-utils
   - bat
   - chrony
   - curl
-  - duf
   - entr
   - "{{ 'firewalld' if system_cfg.features.firewall.backend == 'firewalld' and system_cfg.features.firewall.enabled | bool else '' }}"
   - "{{ 'ufw' if system_cfg.features.firewall.backend == 'ufw' and system_cfg.features.firewall.enabled | bool else '' }}"
@@ -140,12 +139,9 @@ bootstrap_debian_extra:
   - ripgrep
   - rsync
   - screen
-  - software-properties-common
   - sudo
   - syslog-ng
-  - systemd-zram-generator
   - tcpd
-  - tldr
   - "{{ 'tpm2-tools' if system_cfg.luks.enabled else '' }}"
   - "{{ 'qemu-guest-agent' if hypervisor_type in ['libvirt', 'proxmox'] else '' }}"
   - "{{ 'open-vm-tools' if hypervisor_type == 'vmware' else '' }}"
@@ -153,30 +149,44 @@ bootstrap_debian_extra:
   - wget
   - zstd
 
-bootstrap_debian_versioned:
-  - "{{ 'linux-image-amd64' if (os_version | string) in ['10', '11', '13', 'unstable'] else '' }}"
+bootstrap_debian_extra_versioned:
+  - linux-image-amd64
+  - "{{ 'duf' if (os_version | string) not in ['10', '11'] else '' }}"
   - "{{ 'fastfetch' if (os_version | string) in ['12', '13', 'unstable'] else '' }}"
   - "{{ 'neofetch' if (os_version | string) == '12' else '' }}"
+  - "{{ 'software-properties-common' if (os_version | string) not in ['13', 'unstable'] else '' }}"
+  - "{{ 'systemd-zram-generator' if (os_version | string) not in ['10', '11'] else '' }}"
+  - "{{ 'tldr' if (os_version | string) not in ['13', 'unstable'] else '' }}"
 
-bootstrap_debian_common: "{{ bootstrap_debian_base + bootstrap_debian_extra + bootstrap_debian_versioned }}"
+bootstrap_debian:
+  base: "{{ bootstrap_debian_base_common }}"
+  extra: "{{ bootstrap_debian_extra_common + bootstrap_debian_extra_versioned }}"
 
-bootstrap_debian10: "{{ bootstrap_debian_common }}"
-bootstrap_debian11: "{{ bootstrap_debian_common }}"
-bootstrap_debian12: "{{ bootstrap_debian_common }}"
-bootstrap_debian13: "{{ bootstrap_debian_common }}"
-bootstrap_debianunstable: "{{ bootstrap_debian_common }}"
+bootstrap_debian10: "{{ bootstrap_debian }}"
+bootstrap_debian11: "{{ bootstrap_debian }}"
+bootstrap_debian12: "{{ bootstrap_debian }}"
+bootstrap_debian13: "{{ bootstrap_debian }}"
+bootstrap_debianunstable: "{{ bootstrap_debian }}"
 
 bootstrap_ubuntu:
-  "{{
-    bootstrap_debian_base + bootstrap_debian_extra +
-    ['bash-completion', 'dnsutils', 'eza', 'fdupes', 'fio', 'ncurses-term', 'traceroute', 'util-linux-extra', 'yq', 'zoxide']
-  }}"
+  base:
+    - linux-image-generic
+  extra: >-
+    {{
+      bootstrap_debian_base_common
+      + bootstrap_debian_extra_common
+      + ['bash-completion', 'dnsutils', 'duf', 'eza', 'fdupes', 'fio', 'ncurses-term', 'software-properties-common', 'systemd-zram-generator', 'tldr', 'traceroute', 'util-linux-extra', 'yq', 'zoxide']
+    }}
 
 bootstrap_ubuntu_lts:
-  "{{
-    bootstrap_debian_base + bootstrap_debian_extra +
-    ['bash-completion', 'dnsutils', 'eza', 'fdupes', 'fio', 'ncurses-term', 'traceroute', 'util-linux-extra', 'yq', 'zoxide']
-  }}"
+  base:
+    - linux-image-generic
+  extra: >-
+    {{
+      bootstrap_debian_base_common
+      + bootstrap_debian_extra_common
+      + ['bash-completion', 'dnsutils', 'duf', 'eza', 'fdupes', 'fio', 'ncurses-term', 'software-properties-common', 'systemd-zram-generator', 'tldr', 'traceroute', 'util-linux-extra', 'yq', 'zoxide']
+    }}
 
 bootstrap_archlinux:
   - base