Forráskód Böngészése

Add legacy memtest menu back, cleanup

Antony Messerli 1 éve
szülő
commit
91e1446cde

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

@@ -701,7 +701,7 @@ utilitiesefi:
     type: ipxemenu
   memtest86plus:
     enabled: true
-    name: Memtest86+ - {{ endpoints.memtest86plus.version }}
+    name: Memtest86+ {{ endpoints.memtest86plus.version }}
     type: memtest
     util_path: ${live_endpoint}{{ endpoints.memtest86plus.path }}memtest64.efi
     version: '{{ endpoints.memtest86plus.version }}'
@@ -814,7 +814,7 @@ utilitiespcbios64:
     version: 5.01.0
   memtest86plus:
     enabled: true
-    name: Memtest86+ - {{ endpoints.memtest86plus.version }}
+    name: Memtest86+ {{ endpoints.memtest86plus.version }}
     type: memtest
     util_path: ${live_endpoint}{{ endpoints.memtest86plus.path }}memtest64.bin
     version: '{{ endpoints.memtest86plus.version }}'

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

@@ -61,6 +61,11 @@ echo -n Enter cmdline parameters: ${} && read cmdline
 goto utils_menu
 
 :memtest86legacy
+imgfree
+kernel {{ utilitiespcbios32.memtest86legacy.util_path }}
+boot
+goto utils_menu
+
 :memtest86plus
 imgfree
 kernel {{ utilitiespcbios32.memtest86plus.util_path }}

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

@@ -61,6 +61,11 @@ echo -n Enter cmdline parameters: ${} && read cmdline
 goto utils_menu
 
 :memtest86legacy
+imgfree
+kernel {{ utilitiespcbios64.memtest86legacy.util_path }}
+boot
+goto utils_menu
+
 :memtest86plus
 imgfree
 kernel {{ utilitiespcbios64.memtest86plus.util_path }}