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

Restore Debian ESP mount layout

Browse Source
This commit is contained in:
Sandwich
2025-12-28 02:24:33 +01:00
parent ef945d925a
commit 232ab244ca
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
roles/configuration/tasks/bootloader.yml
View File

@@ -5,7 +5,11 @@
vars: vars:
configuration_use_efibootmgr: "{{ is_rhel | default(false) }}" configuration_use_efibootmgr: "{{ is_rhel | default(false) }}"
configuration_efi_dir: >- configuration_efi_dir: >-
{{ "/boot/efi" if (is_debian | default(false) or is_rhel | default(false)) else "/boot" }} {{
"/boot/efi"
if (is_rhel | default(false)) or (os | lower in ["ubuntu", "ubuntu-lts"])
else "/boot"
}}
configuration_bootloader_id: >- configuration_bootloader_id: >-
{{ "ubuntu" if os | lower in ["ubuntu", "ubuntu-lts"] else os }} {{ "ubuntu" if os | lower in ["ubuntu", "ubuntu-lts"] else os }}
configuration_efi_vendor: >- configuration_efi_vendor: >-

7
roles/partitioning/tasks/main.yml
View File

@@ -492,7 +492,12 @@
- name: Mount boot filesystem - name: Mount boot filesystem
ansible.posix.mount: ansible.posix.mount:
path: "{{ '/mnt/boot/efi' if (is_debian | default(false) or is_rhel | default(false)) else '/mnt/boot' }}" path: >-
{{
'/mnt/boot/efi'
if (is_rhel | default(false)) or (os | lower in ['ubuntu', 'ubuntu-lts'])
else '/mnt/boot'
}}
src: UUID={{ partitioning_boot_uuid.stdout }} src: UUID={{ partitioning_boot_uuid.stdout }}
fstype: vfat fstype: vfat
state: mounted state: mounted