Merge pull request #1386 from netbootxyz/memtest86-plus

Update to memtest86-plus assets for efi and legacy

roles/netbootxyz/defaults/main.yml

@@ -699,11 +699,12 @@ utilitiesefi:
     enabled: true
     name: Kaspersky Rescue Disk
     type: ipxemenu
-  memtest86:
-    enabled: false
-    kernel: ${live_endpoint}{{ endpoints.memtest86.path }}memtest86-usb.img
-    name: Memtest86 Free - {{ endpoints.memtest86.version }}
-    type: sanboot
+  memtest86plus:
+    enabled: true
+    util_path: ${live_endpoint}{{ endpoints.memtest86plus.path }}memtest64.efi
+    name: Memtest86+ - {{ endpoints.memtest86plus.version }}
+    version: "{{ endpoints.memtest86plus.version }}"
+    type: memtest
   redorescue:
     enabled: true
     initrd: ${live_endpoint}{{ endpoints.redorescue.path }}initrd
@@ -737,12 +738,12 @@ utilitiespcbios32:
     enabled: true
     name: Clonezilla
     type: ipxemenu
-  memtest:
+  memtest86plus:
     enabled: true
-    name: Memtest
+    util_path: ${live_endpoint}{{ endpoints.memtest86plus.path }}memtest32.bin
+    name: Memtest86+ - {{ endpoints.memtest86plus.version }}
+    version: "{{ endpoints.memtest86plus.version }}"
     type: memtest
-    util_path: https://boot.netboot.xyz/utils/memtest86-5.01.0
-    version: 5.01.0
   shredos:
     enabled: true
     name: ShredOS
@@ -799,12 +800,12 @@ utilitiespcbios64:
     enabled: true
     name: Kaspersky Rescue Disk
     type: ipxemenu
-  memtest:
+  memtest86plus:
     enabled: true
-    name: Memtest
+    util_path: ${live_endpoint}{{ endpoints.memtest86plus.path }}memtest64.bin
+    name: Memtest86+ - {{ endpoints.memtest86plus.version }}
+    version: "{{ endpoints.memtest86plus.version }}"
     type: memtest
-    util_path: https://boot.netboot.xyz/utils/memtest86-5.01.0
-    version: 5.01.0
   redorescue:
     enabled: true
     initrd: ${live_endpoint}{{ endpoints.redorescue.path }}initrd

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

@@ -48,6 +48,12 @@ echo
 echo -n Enter cmdline parameters: ${} && read cmdline
 goto utils_menu
 
+:memtest86plus
+imgfree
+kernel {{ utilitiesefi.memtest86plus.util_path }}
+boot
+goto utils_menu
+
 :nbxyz_custom_url
 echo If you have a customized menu you would like to load into netboot.xyz
 echo set the base path url to your custom ipxe files here. 

roles/netbootxyz/templates/menu/utils-pcbios-32.ipxe.j2

@@ -60,9 +60,9 @@ echo
 echo -n Enter cmdline parameters: ${} && read cmdline
 goto utils_menu
 
-:memtest
+:memtest86plus
 imgfree
-kernel {{ utilitiespcbios32.memtest.util_path }}
+kernel {{ utilitiespcbios32.memtest86plus.util_path }}
 boot
 goto utils_menu
 

roles/netbootxyz/templates/menu/utils-pcbios-64.ipxe.j2

@@ -60,9 +60,9 @@ echo
 echo -n Enter cmdline parameters: ${} && read cmdline
 goto utils_menu
 
-:memtest
+:memtest86plus
 imgfree
-kernel {{ utilitiespcbios64.memtest.util_path }}
+kernel {{ utilitiespcbios64.memtest86plus.util_path }}
 boot
 goto utils_menu