Parcourir la source

Update overrides for 32-bit and 64-bit split on pcbios

Antony Messerli il y a 3 ans
Parent
commit
db7906d143
2 fichiers modifiés avec 19 ajouts et 9 suppressions
  1. 18 8
      roles/netbootxyz/tasks/generate_menus.yml
  2. 1 1
      user_overrides.yml

+ 18 - 8
roles/netbootxyz/tasks/generate_menus.yml

@@ -9,18 +9,28 @@
       releases: "{{ _releases }}"
     when: release_overrides is defined
 
-    # PC BIOS utilities
-  - name: Combine overrides with utilitiespcbios defaults
+  # PC BIOS utilities
+  - name: Combine overrides with utilitiespcbios64 defaults
     set_fact:
-      _utilitiespcbios: "{{ utilitiespcbios|combine(utilitiespcbios_overrides, recursive=True) }}"
-    when: utilitiespcbios_overrides is defined
+      _utilitiespcbios64: "{{ utilitiespcbios64|combine(utilitiespcbios64_overrides, recursive=True) }}"
+    when: utilitiespcbios64_overrides is defined
 
-  - name: Set utilitypcbios with user overrides
+  - name: Set utilitypcbios64 with user overrides
     set_fact:
-      utilitiespcbios: "{{ _utilitiespcbios }}"
-    when: utilitiespcbios_overrides is defined
+      utilitiespcbios64: "{{ _utilitiespcbios64 }}"
+    when: utilitiespcbios64_overrides is defined
 
-    # EFI utilities
+  - name: Combine overrides with utilitiespcbios32 defaults
+    set_fact:
+      _utilitiespcbios32: "{{ utilitiespcbios32|combine(utilitiespcbios32_overrides, recursive=True) }}"
+    when: utilitiespcbios32_overrides is defined
+
+  - name: Set utilitypcbios32 with user overrides
+    set_fact:
+      utilitiespcbios32: "{{ _utilitiespcbios32 }}"
+    when: utilitiespcbios32_overrides is defined
+
+  # EFI utilities
   - name: Combine overrides with utilitiesefi defaults
     set_fact:
       _utilitiesefi: "{{ utilitiesefi|combine(utilitiesefi_overrides, recursive=True) }}"

+ 1 - 1
user_overrides.yml

@@ -32,7 +32,7 @@ generate_local_vars: true
 #    enabled: false
 
 # set utilities_overrides from standard netboot.xyz defaults for PC BIOS utilities
-#utilitiespcbios_overrides:
+#utilitiespcbios64_overrides:
 #  supergrub:
 #    enabled: false