Pārlūkot izejas kodu

Merge pull request #1139 from netbootxyz/development

Fixes for 2.0.60-RC CI
Antony Messerli 2 gadi atpakaļ
vecāks
revīzija
3b7a450ea2
3 mainītis faili ar 7 papildinājumiem un 2 dzēšanām
  1. 1 1
      Dockerfile
  2. 5 0
      roles/netbootxyz/tasks/main.yml
  3. 1 1
      script/netbootxyz-overrides.yml

+ 1 - 1
Dockerfile

@@ -9,7 +9,7 @@ FROM builder AS netbootxyz-default
 ENV EXTRA_VARS=""
 
 FROM builder AS netbootxyz-production
-ENV EXTRA_VARS="--extra-vars '@script/netbootxyz-overrides.yml'"
+ENV EXTRA_VARS="--extra-vars @script/netbootxyz-overrides.yml"
 
 FROM netbootxyz-${NBXYZ_OVERRIDES} as final
 RUN \

+ 5 - 0
roles/netbootxyz/tasks/main.yml

@@ -1,4 +1,9 @@
 ---
+
+- name: Print Bootloader Disks to Build
+  ansible.builtin.debug:
+    var: bootloader_disks
+
 - include_tasks: generate_menus.yml
   when:
     - generate_menus | default(true) | bool

+ 1 - 1
script/netbootxyz-overrides.yml

@@ -4,7 +4,7 @@ sigs_enabled: true
 generate_disks_arm: true
 generate_disks_hybrid: true
 generate_disks_linux: true
-generate_disks_rpi: true
+generate_disks_rpi: false
 generate_version_file: true
 generate_local_vars: false
 bootloader_multiple: true