moving blackarch to live assets and pulling security entry from main menu

roles/netbootxyz/defaults/main.yml

@@ -96,10 +96,10 @@ releases:
   blackarch:
     name: "BlackArch"
     enabled: true
-    menu: "security"
+    menu: "linux"
     versions:
-      - name: "2020.01.01"
-        code_name: "2020.01.01"
+      - name: "current"
+        code_name: "current"
   centos:
     name: "CentOS"
     mirror: "http://mirror.centos.org"

roles/netbootxyz/templates/menu/blackarch.ipxe.j2

@@ -8,7 +8,8 @@ goto ${menu}
 :blackarch
 set os {{ releases.blackarch.name }}
 menu ${os} Installers
-item --gap Official Releases
+item --gap The Default login is root/blackarch
+item --gap Run blackarch-install once logged in
 {% for item in releases.blackarch.versions %}
 item {{ item.code_name }} ${space} ${os} {{ item.name }}
 {% endfor %}
@@ -16,12 +17,13 @@ choose blackarch_version || goto blackarch_exit
 goto blackarch_boot
 
 :blackarch_boot
-set blackarch_initrd http://distro.ibiblio.org/blackarch/iso/blackarch-linux-netinst-${blackarch_version}-x86_64.iso
-kernel ${memdisk} iso raw
-initrd ${blackarch_initrd}
+imgfree
+set url ${live_endpoint}{{ endpoints['blackarch-installer'].path }}
+kernel ${url}vmlinuz archisobasedir=blackarch ip=dhcp archiso_http_srv=${url} initrd=initrd
+initrd ${url}initrd
 boot
 goto blackarch_exit
 
 :blackarch_exit
 clear menu
-exit 0
+exit 0

roles/netbootxyz/templates/menu/boot.cfg.j2

@@ -49,7 +49,6 @@ set menu_linux 1
 set menu_bsd 1
 set menu_freedos 1
 set menu_live 1
-set menu_security 1
 set menu_windows 1
 set menu_utils 1
 iseq ${buildarch} i386 && goto x86_64 ||

roles/netbootxyz/templates/menu/menu.ipxe.j2

@@ -49,7 +49,6 @@ iseq ${menu_linux} 1 && item linux ${space} Linux Network Installs ||
 iseq ${menu_live} 1 && item live ${space} Live CDs ||
 iseq ${menu_bsd} 1 && item bsd ${space} BSD Installs ||
 iseq ${menu_freedos} 1 && item freedos ${space} FreeDOS || 
-iseq ${menu_security} 1 && item security ${space} Security Related ||
 iseq ${menu_windows} 1 && item windows ${space} Windows ||
 item --gap Tools:
 iseq ${menu_utils} 1 && item utils-${platform} ${space} Utilities ||