Sfoglia il codice sorgente

Update to memtest86-plus assets for efi and legacy

Antony Messerli 1 anno fa
parent
commit
7464bb3144

+ 14 - 13
roles/netbootxyz/defaults/main.yml

@@ -699,11 +699,12 @@ utilitiesefi:
     enabled: true
     enabled: true
     name: Kaspersky Rescue Disk
     name: Kaspersky Rescue Disk
     type: ipxemenu
     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:
   redorescue:
     enabled: true
     enabled: true
     initrd: ${live_endpoint}{{ endpoints.redorescue.path }}initrd
     initrd: ${live_endpoint}{{ endpoints.redorescue.path }}initrd
@@ -737,12 +738,12 @@ utilitiespcbios32:
     enabled: true
     enabled: true
     name: Clonezilla
     name: Clonezilla
     type: ipxemenu
     type: ipxemenu
-  memtest:
+  memtest86plus:
     enabled: true
     enabled: true
-    name: Memtest
+    util_path: ${live_endpoint}{{ endpoints.memtest86plus.path }}memtest32.bin
+    name: Memtest86+ - {{ endpoints.memtest86plus.version }}
+    version: "{{ endpoints.memtest86plus.version }}"
     type: memtest
     type: memtest
-    util_path: https://boot.netboot.xyz/utils/memtest86-5.01.0
-    version: 5.01.0
   shredos:
   shredos:
     enabled: true
     enabled: true
     name: ShredOS
     name: ShredOS
@@ -799,12 +800,12 @@ utilitiespcbios64:
     enabled: true
     enabled: true
     name: Kaspersky Rescue Disk
     name: Kaspersky Rescue Disk
     type: ipxemenu
     type: ipxemenu
-  memtest:
+  memtest86plus:
     enabled: true
     enabled: true
-    name: Memtest
+    util_path: ${live_endpoint}{{ endpoints.memtest86plus.path }}memtest64.bin
+    name: Memtest86+ - {{ endpoints.memtest86plus.version }}
+    version: "{{ endpoints.memtest86plus.version }}"
     type: memtest
     type: memtest
-    util_path: https://boot.netboot.xyz/utils/memtest86-5.01.0
-    version: 5.01.0
   redorescue:
   redorescue:
     enabled: true
     enabled: true
     initrd: ${live_endpoint}{{ endpoints.redorescue.path }}initrd
     initrd: ${live_endpoint}{{ endpoints.redorescue.path }}initrd

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

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

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

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

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

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