Browse Source

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
Antony Messerli 1 year ago
parent
commit
fc06700dbe
2 changed files with 3 additions and 3 deletions
  1. 2 2
      roles/netbootxyz/tasks/main.yml
  2. 1 1
      script/netbootxyz-overrides.yml

+ 2 - 2
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:

+ 1 - 1
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