Merge pull request #492 from netbootxyz/breakin

adding breaking for EFI, cleaning up menus, fixing memtest

roles/netbootxyz/defaults/main.yml

@@ -374,13 +374,13 @@ utilitiespcbios:
   breakin:
     name: "Breakin"
     enabled: true
-    type: "memdisk"
-    version: "4.26.1-53"
-    util_path: "http://www.advancedclustering.com/wp-content/uploads/2017/02/bootimage-4.26.1-53.iso"
+    type: "direct"
+    kernel: "${live_endpoint}{{ endpoints.breakin.path }}vmlinuz sshpasswd=breakin startup=breakin initrd=initrd"
+    initrd: "${live_endpoint}{{ endpoints.breakin.path }}initrd"
   clonezilla:
     name: "Clonezilla"
     enabled: true
-    type: "live"
+    type: "ipxemenu"
   dban:
     name: "DBAN"
     enabled: true
@@ -414,10 +414,16 @@ utilitiespcbios:
 
 # efi utility values
 utilitiesefi:
+  breakin:
+    name: "Breakin"
+    enabled: true
+    type: "direct"
+    kernel: "${live_endpoint}{{ endpoints.breakin.path }}vmlinuz sshpasswd=breakin startup=breakin initrd=initrd"
+    initrd: "${live_endpoint}{{ endpoints.breakin.path }}initrd"
   clonezilla:
     name: "Clonezilla"
     enabled: true
-    type: "live"
+    type: "ipxemenu"
 
 bootloaders:
   legacy:

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

@@ -18,37 +18,15 @@ chain ${menu}.ipxe || goto utils_exit
 goto utils_exit
 
 {% for key, value in utilitiesefi.items() | sort %}
-{% if value.enabled | bool and value.type == "memdisk" %}
+{% if value.enabled | bool and value.type == "direct" %}
 :{{ key }}
-set util_path {{ value.util_path }}
-set util_file {{ value.util_path | basename }}
-set util_version {{ value.version }}
-goto boot_{{ value.type }}
-{% endif %}
-{% endfor %}
-
-:boot_memdisk
 imgfree
-kernel ${memdisk} iso raw
-initrd --name ${util_file} ${util_path}
-echo
-echo MD5sums:
-md5sum memdisk ${util_file}
-iseq ${img_sigs_enabled} true && goto verify_sigs || goto skip_sigs
-:verify_sigs
-echo
-echo Checking signatures...
-imgverify memdisk ${sigs}memdisk.sig || goto error
-imgverify ${util_file} ${sigs}${menu}/${util_file}.sig || goto error
-echo Signatures verified!
-echo
-:skip_sigs
+kernel {{ value.kernel }}
+initrd {{ value.initrd }}
 boot
 goto utils_exit
-
-:boot_memtest
-chain https://${util_path} && goto main_menu ||
-goto utils_exit
+{% endif %}
+{% endfor %}
 
 :nbxyz-custom
 echo EXPERIMENTAL

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

@@ -27,6 +27,17 @@ goto boot_{{ value.type }}
 {% endif %}
 {% endfor %}
 
+{% for key, value in utilitiespcbios.items() | sort %}
+{% if value.enabled | bool and value.type == "direct" %}
+:{{ key }}
+imgfree
+kernel {{ value.kernel }}
+initrd {{ value.initrd }}
+boot
+goto utils_exit
+{% endif %}
+{% endfor %}
+
 :boot_memdisk
 imgfree
 kernel ${memdisk} iso raw
@@ -46,8 +57,10 @@ echo
 boot
 goto utils_exit
 
-:boot_memtest
-chain https://${util_path} && goto main_menu ||
+:memtest
+imgfree
+kernel {{ utilitiespcbios.memtest.util_path }}
+boot
 goto utils_exit
 
 :nbxyz-custom