fix(bootstrap): make dhcp-client conditional for EL < 10 (removed in EL 10)

This commit is contained in:
2026-02-21 13:43:41 +01:00
parent 74f1365a06
commit 3f65585e5c

View File

@@ -29,7 +29,6 @@ bootstrap_rhel:
- standard - standard
extra: extra:
- bind-utils - bind-utils
- dhcp-client
- efibootmgr - efibootmgr
- glibc-langpack-de - glibc-langpack-de
- glibc-langpack-en - glibc-langpack-en
@@ -48,6 +47,7 @@ bootstrap_rhel:
{{ {{
(['grub2-efi-x64'] if os_version_major | default('') == '8' else ['grub2-efi']) (['grub2-efi-x64'] if os_version_major | default('') == '8' else ['grub2-efi'])
+ (['grub2-tools-extra'] if os_version_major | default('') in ['8', '9'] else []) + (['grub2-tools-extra'] if os_version_major | default('') in ['8', '9'] else [])
+ (['dhcp-client'] if (os_version_major | default('9') | int) < 10 else [])
+ (['python39'] if os_version_major | default('') == '8' else ['python']) + (['python39'] if os_version_major | default('') == '8' else ['python'])
+ (['kernel'] if os_version_major | default('') == '10' else []) + (['kernel'] if os_version_major | default('') == '10' else [])
+ (['zram-generator'] if os_version_major | default('') in ['9', '10'] else []) + (['zram-generator'] if os_version_major | default('') in ['9', '10'] else [])
@@ -62,7 +62,6 @@ bootstrap_almalinux:
- core - core
extra: extra:
- bind-utils - bind-utils
- dhcp-client
- efibootmgr - efibootmgr
- glibc-langpack-de - glibc-langpack-de
- glibc-langpack-en - glibc-langpack-en
@@ -87,6 +86,7 @@ bootstrap_almalinux:
conditional: >- conditional: >-
{{ {{
(['dbus-daemon'] if (os_version_major | default('10') | int) >= 9 else []) (['dbus-daemon'] if (os_version_major | default('10') | int) >= 9 else [])
+ (['dhcp-client'] if (os_version_major | default('10') | int) < 10 else [])
+ bootstrap_common_conditional + bootstrap_common_conditional
}} }}
@@ -98,7 +98,6 @@ bootstrap_rocky:
- core - core
extra: extra:
- bind-utils - bind-utils
- dhcp-client
- efibootmgr - efibootmgr
- glibc-langpack-de - glibc-langpack-de
- glibc-langpack-en - glibc-langpack-en
@@ -123,7 +122,11 @@ bootstrap_rocky:
- wget - wget
- zram-generator - zram-generator
- zstd - zstd
conditional: "{{ bootstrap_common_conditional }}" conditional: >-
{{
(['dhcp-client'] if (os_version_major | default('9') | int) < 10 else [])
+ bootstrap_common_conditional
}}
bootstrap_fedora: bootstrap_fedora:
repos: repos: