Browse Source

Merge pull request #985 from netbootxyz/memtest86-free

Support for Memtest86 Free for UEFI
Antony Messerli 3 years ago
parent
commit
cc22070981

+ 1 - 0
CHANGELOG.md

@@ -7,6 +7,7 @@ All notable changes to this project will be documented in this file.
 ## [2.0.48]
 ## [2.0.48]
 #### Added
 #### Added
 - Support for Harvester
 - Support for Harvester
+- Support for MemTest86 Free
 
 
 ## [2.0.47] - 2021-08-30
 ## [2.0.47] - 2021-08-30
 #### Fixes
 #### Fixes

+ 1 - 0
README.md

@@ -194,6 +194,7 @@ In addition to being able to host netboot.xyz locally, you can also create your
 | Grml | http://grml.org | LiveCD |
 | Grml | http://grml.org | LiveCD |
 | Kaspersky Rescue Disk | https://support.kaspersky.com/viruses/krd18 | LiveCD |
 | Kaspersky Rescue Disk | https://support.kaspersky.com/viruses/krd18 | LiveCD |
 | Memtest | http://www.memtest.org/ | Kernel |
 | Memtest | http://www.memtest.org/ | Kernel |
+| MemTest86 Free | https://www.memtest86.com | USB Img |
 | Redo Rescue | http://redorescue.com/ | LiveCD |
 | Redo Rescue | http://redorescue.com/ | LiveCD |
 | Rescatux | https://www.supergrubdisk.org/rescatux/ | LiveCD |
 | Rescatux | https://www.supergrubdisk.org/rescatux/ | LiveCD |
 | Rescuezilla | https://rescuezilla.com/ | LiveCD |
 | Rescuezilla | https://rescuezilla.com/ | LiveCD |

+ 0 - 6
endpoints.yml

@@ -1527,12 +1527,6 @@ endpoints:
     version: bullseye
     version: bullseye
     flavor: bullseye
     flavor: bullseye
     kernel: voyager-bullseye-squash
     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:
   memtest86:
     path: /asset-mirror/releases/download/9.2-4e73affb/
     path: /asset-mirror/releases/download/9.2-4e73affb/
     files:
     files:

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

@@ -619,10 +619,11 @@ sigs_menu: false
 site_name: netboot.xyz
 site_name: netboot.xyz
 time_server: 0.pool.ntp.org
 time_server: 0.pool.ntp.org
 utilitiesarm:
 utilitiesarm:
-  placeholder:
-    enabled: false
-    name: placeholder
-    type: direct
+  memtest86:
+    enabled: true
+    kernel: ${live_endpoint}{{ endpoints.memtest86.path }}memtest86-usb.img
+    name: Memtest86 Free - {{ endpoints.memtest86.version }}
+    type: sanboot
 utilitiesefi:
 utilitiesefi:
   4mlinux:
   4mlinux:
     enabled: true
     enabled: true
@@ -660,6 +661,11 @@ utilitiesefi:
     enabled: true
     enabled: true
     name: Kaspersky Rescue Disk
     name: Kaspersky Rescue Disk
     type: ipxemenu
     type: ipxemenu
+  memtest86:
+    enabled: true
+    kernel: ${live_endpoint}{{ endpoints.memtest86.path }}memtest86-usb.img
+    name: Memtest86 Free - {{ endpoints.memtest86.version }}
+    type: sanboot
   redorescue:
   redorescue:
     enabled: true
     enabled: true
     initrd: ${live_endpoint}{{ endpoints.redorescue.path }}initrd
     initrd: ${live_endpoint}{{ endpoints.redorescue.path }}initrd

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

@@ -26,6 +26,15 @@ goto utils_exit
 {% endif %}
 {% endif %}
 {% endfor %}
 {% endfor %}
 
 
+{% for key, value in utilitiesefi.items() | sort %}
+{% if value.enabled | bool and value.type == "sanboot" %}
+:{{ key }}
+imgfree
+sanboot {{ value.kernel }}
+goto utils_exit
+{% endif %}
+{% endfor %}
+
 :utils_exit
 :utils_exit
 clear menu
 clear menu
 exit 0
 exit 0

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

@@ -30,6 +30,15 @@ goto utils_exit
 {% endif %}
 {% endif %}
 {% endfor %}
 {% endfor %}
 
 
+{% for key, value in utilitiesefi.items() | sort %}
+{% if value.enabled | bool and value.type == "sanboot" %}
+:{{ key }}
+imgfree
+sanboot {{ value.kernel }}
+goto utils_exit
+{% endif %}
+{% endfor %}
+
 :cmdline
 :cmdline
 echo If you want to change the default kernel command line parameters
 echo If you want to change the default kernel command line parameters
 echo you can override the defaults here.
 echo you can override the defaults here.