From fc06700dbe02d2a9a0c3055ab3c778e61120cbc0 Mon Sep 17 00:00:00 2001 From: Antony Messerli Date: Sat, 30 Mar 2024 17:29:25 -0500 Subject: [PATCH] Switches bootloader_disks to bootloader_flavors Ensures bootloader_disks is set to one type to keep index generation bound to one falvor type. Shifts generate disk loop to use bootloader_flavors variable taht can be stacked with multiple types. Should fix issue causing the index to have the last name in the list of bootloader_disks which was setting the incorrect name. This was probably introduced with the change in: https://github.com/netbootxyz/netboot.xyz/pull/1096 --- roles/netbootxyz/tasks/main.yml | 4 ++-- script/netbootxyz-overrides.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/netbootxyz/tasks/main.yml b/roles/netbootxyz/tasks/main.yml index 974f591a..f799ea63 100644 --- a/roles/netbootxyz/tasks/main.yml +++ b/roles/netbootxyz/tasks/main.yml @@ -2,7 +2,7 @@ - name: Print Bootloader Disks to Build ansible.builtin.debug: - var: bootloader_disks + var: bootloader_flavors - name: Generate menus ansible.builtin.include_tasks: generate_menus.yml @@ -17,7 +17,7 @@ - name: Generate iPXE bootloaders ansible.builtin.include_tasks: generate_disks.yml with_items: - - "{{ bootloader_disks }}" + - "{{ bootloader_flavors }}" loop_control: loop_var: bootloader_file when: diff --git a/script/netbootxyz-overrides.yml b/script/netbootxyz-overrides.yml index 28e3b82b..46b09a96 100644 --- a/script/netbootxyz-overrides.yml +++ b/script/netbootxyz-overrides.yml @@ -8,7 +8,7 @@ generate_disks_rpi: false generate_version_file: true generate_local_vars: false bootloader_multiple: true -bootloader_disks: +bootloader_flavors: - "netboot.xyz" - "netboot.xyz-metal" generate_signatures: true