Antony Messerli 3 år sedan
förälder
incheckning
8f4f0ef69c

+ 0 - 6
endpoints.yml

@@ -1527,12 +1527,6 @@ endpoints:
     version: bullseye
     flavor: bullseye
     kernel: voyager-bullseye-squash
-  memtest86-free:
-    path: /asset-mirror/releases/download/9.2-8d9d286c/
-    files:
-    - memtest86-usb.img
-    os: memtest86-free
-    version: '9.2'
   memtest86:
     path: /asset-mirror/releases/download/9.2-4e73affb/
     files:

+ 4 - 4
roles/netbootxyz/defaults/main.yml

@@ -621,8 +621,8 @@ time_server: 0.pool.ntp.org
 utilitiesarm:
   memtest86:
     enabled: true
-    kernel: ${live_endpoint}{{ endpoints.memtest86-free.path }}memtest86-usb.img
-    name: Memtest86 Free
+    kernel: ${live_endpoint}{{ endpoints.memtest86.path }}memtest86-usb.img
+    name: Memtest86 Free - {{ endpoints.memtest86.version }}
     type: sanboot
 utilitiesefi:
   4mlinux:
@@ -663,8 +663,8 @@ utilitiesefi:
     type: ipxemenu
   memtest86:
     enabled: true
-    kernel: ${live_endpoint}{{ endpoints.memtest86-free.path }}memtest86-usb.img
-    name: Memtest86 Free - {{ endpoints.memtest86-free.version }}
+    kernel: ${live_endpoint}{{ endpoints.memtest86.path }}memtest86-usb.img
+    name: Memtest86 Free - {{ endpoints.memtest86.version }}
     type: sanboot
   redorescue:
     enabled: true

+ 1 - 1
roles/netbootxyz/templates/menu/utils-arm.ipxe.j2

@@ -30,7 +30,7 @@ goto utils_exit
 {% if value.enabled | bool and value.type == "sanboot" %}
 :{{ key }}
 imgfree
-sanboot {{ value.img_url }}
+sanboot {{ value.kernel }}
 goto utils_exit
 {% endif %}
 {% endfor %}

+ 1 - 1
roles/netbootxyz/templates/menu/utils-efi.ipxe.j2

@@ -34,7 +34,7 @@ goto utils_exit
 {% if value.enabled | bool and value.type == "sanboot" %}
 :{{ key }}
 imgfree
-sanboot {{ value.img_url }}
+sanboot {{ value.kernel }}
 goto utils_exit
 {% endif %}
 {% endfor %}