sandwich/Ansible-Bootstrap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(partitioning): add default fallbacks for is_rhel, os, os_version in defaults

Browse Source
This commit is contained in:
Sandwich
2026-02-20 22:51:37 +01:00
parent 5246a905bb
commit e174ecda42
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
roles/partitioning/defaults/main.yml
View File

@@ -30,13 +30,13 @@ partitioning_separate_boot: >-
(system_cfg.luks.enabled | bool) (system_cfg.luks.enabled | bool)
or (system_cfg.filesystem != 'btrfs') or (system_cfg.filesystem != 'btrfs')
) )
and (os not in ['archlinux']) and ((os | default('')) not in ['archlinux'])
}} }}
partitioning_boot_fs_fstype: >- partitioning_boot_fs_fstype: >-
{{ {{
system_cfg.filesystem system_cfg.filesystem
if system_cfg.filesystem != 'btrfs' if system_cfg.filesystem != 'btrfs'
else ('xfs' if is_rhel else 'ext4') else ('xfs' if (is_rhel | default(false) | bool) else 'ext4')
}} }}
partitioning_boot_fs_partition_suffix: >- partitioning_boot_fs_partition_suffix: >-
{{ {{
@@ -54,7 +54,7 @@ partitioning_efi_mountpoint: >-
if (partitioning_separate_boot | bool) if (partitioning_separate_boot | bool)
else ( else (
'/boot/efi' '/boot/efi'
if is_rhel or (os in ['ubuntu', 'ubuntu-lts'] or (os == 'debian' and (os_version | string) in ['11', '12', '13'])) if (is_rhel | default(false) | bool) or ((os | default('')) in ['ubuntu', 'ubuntu-lts'] or ((os | default('')) == 'debian' and (os_version | default('') | string) in ['11', '12', '13']))
else '/boot' else '/boot'
) )
}} }}