Merge branch 'development' into bootrepair

README.md

@@ -101,7 +101,7 @@ In addition to being able to host netboot.xyz locally, you can also create your
 |Alpine Linux| https://alpinelinux.org | Yes | No |
 |Arch Linux| https://www.archlinux.org| Yes | No |
 |Backbox|https://www.backbox.org | No | Yes |
-|BlackArch Linux|https://blackarch.org| ISO - Memdisk | No |
+|BlackArch Linux|https://blackarch.org| Yes | Yes |
 |Bodhi Linux|https://www.bodhilinux.com| No | Yes |
 |CentOS| https://centos.org | Yes | No |
 |Debian| https://debian.org | Yes | Yes|
@@ -125,6 +125,7 @@ In addition to being able to host netboot.xyz locally, you can also create your
 |Mint|https://linuxmint.com| No | Yes |
 |Microsoft Windows|https://www.microsoft.com| User supplied media | No |
 |MirOS|https://www.mirbsd.org| Yes | No |
+|Nitrux|https://nxos.org/| No | Yes |
 |NixOS|https://nixos.org| Yes | No |
 |OpenBSD|https://openbsd.org| Yes | No |
 |OpenSUSE|https://opensuse.org| Yes | No |
@@ -151,6 +152,7 @@ In addition to being able to host netboot.xyz locally, you can also create your
 |ALT Linux Rescue|https://en.altlinux.org/Rescue| ISO - Memdisk | - |
 |Boot Repair CD|https://sourceforge.net/projects/boot-repair-cd/| NA | Yes |
 |Breakin|http://www.advancedclustering.com/products/software/breakin/| Yes | Yes |
+|CAINE|https://www.caine-live.net/| NA | Yes |
 |Clonezilla|http://www.clonezilla.org/| - | Yes |
 |DBAN|http://www.dban.org/| Yes | Yes |
 |GParted|http://gparted.org| NA | Yes |
@@ -158,6 +160,7 @@ In addition to being able to host netboot.xyz locally, you can also create your
 |Memtest|http://www.memtest.org/| Yes | - |
 |Rescatux|https://www.supergrubdisk.org/rescatux/| NA | Yes |
 |Super Grub2 Disk|http://www.supergrubdisk.org| ISO - Memdisk | - |
+|System Rescue CD|http://www.system-rescue-cd.org/| NA | Yes |
 |Ultimate Boot CD|http://www.ultimatebootcd.com| ISO - Memdisk | - |
 
 ### Feedback

endpoints.yml

@@ -945,3 +945,11 @@ endpoints:
     - vmlinuz
     os: bootrepair
     version: current
+  blackarch-installer:
+    path: /asset-mirror/releases/download/2020.01.01-5e770614/
+    files:
+    - airoot.sfs
+    - initrd
+    - vmlinuz
+    os: blackarch
+    version: current

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"
@@ -399,6 +399,12 @@ utilitiespcbios:
     type: "direct"
     kernel: "${live_endpoint}{{ endpoints.breakin.path }}vmlinuz sshpasswd=breakin startup=breakin initrd=initrd"
     initrd: "${live_endpoint}{{ endpoints.breakin.path }}initrd"
+  caine:
+    name: "CAINE"
+    enabled: true
+    type: "direct"
+    kernel: "${live_endpoint}{{ endpoints.caine.path }}vmlinuz ip=dhcp boot=casper netboot=http fetch=${live_endpoint}{{ endpoints.caine.path }}filesystem.squashfs initrd=initrd"
+    initrd: "${live_endpoint}{{ endpoints.caine.path }}initrd"
   clonezilla:
     name: "Clonezilla"
     enabled: true
@@ -433,6 +439,10 @@ utilitiespcbios:
     type: "memdisk"
     version: "2.04s1"
     util_path: "http://master.dl.sourceforge.net/project/supergrub2/2.04s1/super_grub2_disk_2.04s1/super_grub2_disk_hybrid_2.04s1.iso"
+  systemrescue:
+    name: "System Rescue CD"
+    enabled: true
+    type: "ipxemenu"
   ubcd:
     name: "Ultimate Boot CD (UBCD)"
     enabled: true
@@ -448,6 +458,12 @@ utilitiesefi:
     type: "direct"
     kernel: "${live_endpoint}{{ endpoints.bootrepair.path }}vmlinuz ip=dhcp boot=casper netboot=http fetch=${live_endpoint}{{ endpoints.bootrepair.path }}filesystem.squashfs initrd=initrd"
     initrd: "${live_endpoint}{{ endpoints.bootrepair.path }}initrd"
+  caine:
+    name: "CAINE"
+    enabled: true
+    type: "direct"
+    kernel: "${live_endpoint}{{ endpoints.caine.path }}vmlinuz ip=dhcp boot=casper netboot=http fetch=${live_endpoint}{{ endpoints.caine.path }}filesystem.squashfs initrd=initrd"
+    initrd: "${live_endpoint}{{ endpoints.caine.path }}initrd"
   clonezilla:
     name: "Clonezilla"
     enabled: true
@@ -466,6 +482,10 @@ utilitiesefi:
     type: "direct"
     kernel: "${live_endpoint}{{ endpoints.rescatux.path }}vmlinuz boot=live fetch=${live_endpoint}{{ endpoints.rescatux.path }}filesystem.squashfs selinux=1 security=selinux enforcing=0 initrd=initrd"
     initrd: "${live_endpoint}{{ endpoints.rescatux.path }}initrd"
+  systemrescue:
+    name: "System Rescue CD"
+    enabled: true
+    type: "ipxemenu"
 
 bootloaders:
   legacy:

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/live-nitrux.ipxe.j2

@@ -0,0 +1,37 @@
+#!ipxe
+
+goto ${menu} ||
+
+:live_menu
+set os Nitrux
+menu ${os} - Current Arch [ ${arch} ]
+iseq ${arch} x86_64 && set arch_a amd64 || set arch_a ${arch}
+item --gap ${os} Versions
+{% for key, value in endpoints.items() | sort %}
+{% if value.os == "nitrux" %}
+item {{ value.version }} ${space} ${os} {{ value.version }}
+{% endif %}
+{% endfor %}
+choose live_version || goto live_exit
+goto ${live_version}
+
+
+{% for key, value in endpoints.items() | sort %}
+{% if value.os == "nitrux" %}
+:{{ value.version }}
+set squash_url ${live_endpoint}{{ value.path }}filesystem.squashfs
+set kernel_url ${live_endpoint}{{ value.path }}
+goto boot
+
+{% endif %}
+{% endfor %}
+
+:boot
+imgfree
+kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=http fetch=${squash_url} initrd=initrd
+initrd ${kernel_url}initrd
+boot
+
+:live_exit
+clear menu
+exit 0

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

@@ -21,6 +21,7 @@ item live-lite ${space} Linux Lite
 item live-q4os ${space} Q4OS
 item live-manjaro ${space} Manjaro
 item live-mint ${space} Mint
+item live-nitrux ${space} Nitrux
 item live-parrot ${space} Parrot OS
 item live-peppermint ${space} Peppermint
 item live-popos ${space} Pop OS

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 ||

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

@@ -0,0 +1,38 @@
+#!ipxe
+
+goto ${menu} ||
+
+:live_menu
+set os System Rescue CD
+menu ${os} - Current Arch [ ${arch} ]
+item --gap Currently during boot you need to press ctrl+d/ctrl+c
+item --gap repeatedly when init hangs on starting a download
+iseq ${arch} x86_64 && set arch_a amd64 || set arch_a ${arch}
+item --gap ${os} Versions
+{% for key, value in endpoints.items() | sort %}
+{% if value.os == "systemrescue" %}
+item {{ value.version }} ${space} ${os} {{ value.version }}
+{% endif %}
+{% endfor %}
+choose live_version || goto live_exit
+goto ${live_version}
+
+
+{% for key, value in endpoints.items() | sort %}
+{% if value.os == "systemrescue" %}
+:{{ value.version }}
+set url ${live_endpoint}{{ value.path }}
+goto boot
+
+{% endif %}
+{% endfor %}
+
+:boot
+imgfree
+kernel ${url}vmlinuz archisobasedir=sysresccd ip=dhcp archiso_http_srv=${url} initrd=initrd
+initrd ${url}initrd
+boot
+
+:live_exit
+clear menu
+exit 0