Bladeren bron

Merge pull request #545 from netbootxyz/development

Release 2.0.6-RC
Antony Messerli 5 jaren geleden
bovenliggende
commit
3f08d9b928
41 gewijzigde bestanden met toevoegingen van 815 en 162 verwijderingen
  1. 20 7
      README.md
  2. 202 2
      endpoints.yml
  3. 86 13
      roles/netbootxyz/defaults/main.yml
  4. 1 10
      roles/netbootxyz/templates/menu/alpinelinux.ipxe.j2
  5. 27 0
      roles/netbootxyz/templates/menu/anarchy.ipxe.j2
  6. 1 1
      roles/netbootxyz/templates/menu/archlinux.ipxe.j2
  7. 7 5
      roles/netbootxyz/templates/menu/blackarch.ipxe.j2
  8. 0 4
      roles/netbootxyz/templates/menu/boot.cfg.j2
  9. 1 11
      roles/netbootxyz/templates/menu/centos.ipxe.j2
  10. 4 4
      roles/netbootxyz/templates/menu/coreos.ipxe.j2
  11. 1 11
      roles/netbootxyz/templates/menu/debian.ipxe.j2
  12. 1 11
      roles/netbootxyz/templates/menu/devuan.ipxe.j2
  13. 1 11
      roles/netbootxyz/templates/menu/fedora.ipxe.j2
  14. 37 0
      roles/netbootxyz/templates/menu/gparted.ipxe.j2
  15. 37 0
      roles/netbootxyz/templates/menu/grml.ipxe.j2
  16. 1 10
      roles/netbootxyz/templates/menu/ipfire.ipxe.j2
  17. 36 0
      roles/netbootxyz/templates/menu/live-bluestar.ipxe.j2
  18. 37 0
      roles/netbootxyz/templates/menu/live-bodhi.ipxe.j2
  19. 0 0
      roles/netbootxyz/templates/menu/live-deepin.ipxe.j2
  20. 37 0
      roles/netbootxyz/templates/menu/live-devuan.ipxe.j2
  21. 37 0
      roles/netbootxyz/templates/menu/live-kodachi.ipxe.j2
  22. 2 2
      roles/netbootxyz/templates/menu/live-lite.ipxe.j2
  23. 0 0
      roles/netbootxyz/templates/menu/live-neon.ipxe.j2
  24. 37 0
      roles/netbootxyz/templates/menu/live-nitrux.ipxe.j2
  25. 37 0
      roles/netbootxyz/templates/menu/live-parrot-ipxe.j2
  26. 0 0
      roles/netbootxyz/templates/menu/live-regolith.ipxe.j2
  27. 36 0
      roles/netbootxyz/templates/menu/live-velt.ipxe.j2
  28. 7 0
      roles/netbootxyz/templates/menu/live.ipxe.j2
  29. 1 10
      roles/netbootxyz/templates/menu/mageia.ipxe.j2
  30. 0 8
      roles/netbootxyz/templates/menu/menu.ipxe.j2
  31. 1 11
      roles/netbootxyz/templates/menu/opensuse.ipxe.j2
  32. 41 0
      roles/netbootxyz/templates/menu/oracle.ipxe.j2
  33. 5 4
      roles/netbootxyz/templates/menu/parrotsec.ipxe.j2
  34. 38 0
      roles/netbootxyz/templates/menu/systemrescue.ipxe.j2
  35. 1 11
      roles/netbootxyz/templates/menu/ubuntu.ipxe.j2
  36. 1 1
      roles/netbootxyz/templates/menu/utils-efi.ipxe.j2
  37. 1 10
      roles/netbootxyz/templates/menu/utils-pcbios.ipxe.j2
  38. 5 3
      roles/netbootxyz/templates/menu/windows.ipxe.j2
  39. 27 0
      roles/netbootxyz/templates/menu/zeninstall.ipxe.j2
  40. 0 1
      script/netbootxyz-overrides.yml
  41. 1 1
      version.txt

+ 20 - 7
README.md

@@ -98,11 +98,15 @@ In addition to being able to host netboot.xyz locally, you can also create your
 
 | Name       | URL             | Installer Kernel | Live OS       |
 |------------|-----------------|------------------|---------------|
-|Alpine Linux| https://alpinelinux.org | Yes              | No            |
-|Arch Linux | https://www.archlinux.org| Yes              | No            |
+|Alpine Linux| https://alpinelinux.org | Yes | No |
+|Anarchy Linux| https://www.anarchylinux.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 |
+|Bluestar Linux|https://sourceforge.net/projects/bluestarlinux| No | Yes |
+|Bodhi Linux|https://www.bodhilinux.com| No | Yes |
 |CentOS| https://centos.org | Yes | No |
+|CoreOS| http://coreos.com/ | Yes | No |
 |Debian| https://debian.org | Yes | Yes|
 |Deepin| https://www.deepin.org | No | Yes |
 |Devuan| https://devuan.org | Yes | No |
@@ -116,6 +120,7 @@ In addition to being able to host netboot.xyz locally, you can also create your
 |IPFire|https://www.ipfire.org| Yes | No |
 |Kali Linux|https://www.kali.org| Yes | Yes |
 |KDE Neon|https://neon.kde.org | No | Yes |
+|Kodachi|https://www.digi77.com/linux-kodachi/ | No | Yes |
 |Linux Lite| https://www.linuxliteos.com | No | Yes |
 |Q4OS|https://q4os.org | No | Yes |
 |Mageia|https://www.mageia.org| Yes | No |
@@ -123,10 +128,12 @@ 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 |
-|Parrot Security|https://www.parrotsec.org| ISO | No |
+|Oracle Linux|https://www.oracle.com/linux/| Yes | Installer |
+|Parrot Security|https://www.parrotsec.org| Yes | Yes |
 |Peppermint|https://peppermintos.com | No | Yes |
 |Pop OS|https://system76.com/pop| No | Yes |
 |RancherOS|https://rancher.com/rancher-os| Yes | No |
@@ -138,21 +145,27 @@ In addition to being able to host netboot.xyz locally, you can also create your
 |Tails|https://tails.boum.org | No | Yes |
 |Tiny Core Linux|https://tinycorelinux.net| ISO - Memdisk | No |
 |Ubuntu|https://www.ubuntu.com| Yes | Yes |
+|Velt|https://velt.io/| No | Yes |
 |Voyager|https://voyagerlive.org | No | Yes |
-|Zoris OS|https://zorinos.com| No | Yes |
+|Zen Installer|https://sourceforge.net/projects/revenge-installer| Yes | No |
+|Zorin OS|https://zorinos.com| No | Yes |
 
 ### Utilities
 
 | Name       | URL                     | Installer Kernel | Live OS |
 |------------|-------------------------|------------------|---------|
 |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| ISO - Memdisk | - |
-|Grml|http://grml.org| ISO - Memdisk | - |
+|GParted|http://gparted.org| NA | Yes |
+|Grml|http://grml.org| NA | Yes |
 |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

+ 202 - 2
endpoints.yml

@@ -544,7 +544,7 @@ endpoints:
     flavor: eoan
     kernel: voyager-eoan-squash
   kde-neon-user:
-    path: /ubuntu-squash/releases/download/20200102-1116-4cec4542/
+    path: /ubuntu-squash/releases/download/20200116-1117-4cec4542/
     files:
     - vmlinuz
     - filesystem.squashfs
@@ -584,7 +584,7 @@ endpoints:
     flavor: nvidia
     kernel: pop-19.10-nvidia-squash
   linux-lite-4-squash:
-    path: /ubuntu-squash/releases/download/4.6-816de7f4/
+    path: /ubuntu-squash/releases/download/4.8-feb35fae/
     files:
     - filesystem.squashfs
     - initrd
@@ -785,3 +785,203 @@ endpoints:
     version: rolling
     flavor: lxqt
     kernel: sparky-rolling-lxqt
+  oracle-8:
+    path: /asset-mirror/releases/download/u1-1fbcccf2/
+    files:
+    - vmlinuz
+    - initrd
+    - squashfs.img
+    os: oracle
+    version: '8'
+  oracle-7:
+    path: /asset-mirror/releases/download/u7-9f014587/
+    files:
+    - vmlinuz
+    - initrd
+    - squashfs.img
+    os: oracle
+    version: '7'
+  kodachi-6:
+    path: /ubuntu-squash/releases/download/6.2-2a23039c/
+    files:
+    - filesystem.squashfs
+    - initrd
+    - vmlinuz
+    os: kodachi
+    version: '6'
+  bodhi-5-standard:
+    path: /ubuntu-squash/releases/download/5.0.0-5868b819/
+    files:
+    - filesystem.squashfs
+    - initrd
+    - vmlinuz
+    os: bodhi
+    version: '5'
+    flavor: standard
+  bodhi-5-apppack:
+    path: /ubuntu-squash/releases/download/5.0.0-5f56cdcc/
+    files:
+    - filesystem.squashfs
+    - initrd
+    - vmlinuz
+    os: bodhi
+    version: '5'
+    flavor: apppack
+  devuan-ascii:
+    path: /debian-squash/releases/download/2.1-c5d9332b/
+    files:
+    - filesystem.squashfs
+    - initrd
+    - vmlinuz
+    os: devuan
+    version: '2'
+    flavor: ascii
+  parrot-net:
+    path: /asset-mirror/releases/download/4.7-db3290ce/
+    files:
+    - vmlinuz
+    - initrd
+    os: parrotnet
+    version: current
+  parrot-home-xfce:
+    path: /debian-squash/releases/download/4.7-68fc557d/
+    files:
+    - filesystem.squashfs
+    - initrd
+    - vmlinuz
+    os: parrot
+    version: current
+    flavor: xfce
+  parrot-home-kde:
+    path: /debian-squash/releases/download/4.7-680ef953/
+    files:
+    - filesystem.squashfs
+    - initrd
+    - vmlinuz
+    os: parrot
+    version: current
+    flavor: kde
+  parrot-security-xfce:
+    path: /debian-squash/releases/download/4.7-8ffa950d/
+    files:
+    - filesystem.squashfs
+    - initrd
+    - vmlinuz
+    os: parrot
+    version: current
+    flavor: xfce-security
+  parrot-security-kde:
+    path: /debian-squash/releases/download/4.7-bd06009c/
+    files:
+    - filesystem.squashfs
+    - initrd
+    - vmlinuz
+    os: parrot
+    version: current
+    flavor: kde-security
+  grml-full:
+    path: /debian-squash/releases/download/2018.12-89ed5442/
+    files:
+    - filesystem.squashfs
+    - initrd
+    - vmlinuz
+    os: grml
+    version: '2018'
+    flavor: full
+  grml-small:
+    path: /debian-squash/releases/download/2018.12-0c7b8f46/
+    files:
+    - filesystem.squashfs
+    - initrd
+    - vmlinuz
+    os: grml
+    version: '2018'
+    flavor: small
+  gparted-stable:
+    path: /debian-squash/releases/download/1.0.0-5-b6f38ff4/
+    files:
+    - filesystem.squashfs
+    - initrd
+    - vmlinuz
+    os: gparted
+    version: stable
+  rescatux:
+    path: /debian-squash/releases/download/0.72-beta6-0775b306/
+    files:
+    - filesystem.squashfs
+    - initrd
+    - vmlinuz
+    os: rescatux
+    version: current
+  systemrescue:
+    path: /asset-mirror/releases/download/6.0.5-3ee5dc80/
+    files:
+    - airoot.sfs
+    - initrd
+    - vmlinuz
+    os: systemrescue
+    version: current
+  caine:
+    path: /ubuntu-squash/releases/download/11.0-0f2bac21/
+    files:
+    - filesystem.squashfs
+    - initrd
+    - vmlinuz
+    os: caine
+    version: '11'
+  nitrux-stable:
+    path: /ubuntu-squash/releases/download/15012020-53f87b85/
+    files:
+    - initrd
+    - vmlinuz
+    - filesystem.squashfs
+    os: nitrux
+    version: stable
+  bootrepair:
+    path: /ubuntu-squash/releases/download/current-e035b00c/
+    files:
+    - filesystem.squashfs
+    - initrd
+    - 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
+  velt-current:
+    path: /asset-mirror/releases/download/0.3.0-9f6eb608/
+    files:
+    - airoot.sfs
+    - initrd
+    - vmlinuz
+    os: velt
+    version: current
+  bluestar:
+    path: /asset-mirror/releases/download/5.4.8-2020.01.07-3db62c8c/
+    files:
+    - airoot.sfs
+    - initrd
+    - vmlinuz
+    os: bluestar
+    version: current
+  anarchy:
+    path: /asset-mirror/releases/download/1.0.10-868be963/
+    files:
+    - airoot.sfs
+    - initrd
+    - vmlinuz
+    os: anarchy
+    version: current
+  zeninstall:
+    path: /asset-mirror/releases/download/2019.10.31-b8afbdfb/
+    files:
+    - airoot.sfs
+    - initrd
+    - vmlinuz
+    os: zeninstall
+    version: current

+ 86 - 13
roles/netbootxyz/defaults/main.yml

@@ -10,7 +10,6 @@ time_server: "0.pool.ntp.org"
 # signature checking
 sigs_menu: false
 sigs_enabled: false
-img_sigs_enabled: false
 
 # helper app locations
 memdisk_location: "http://${boot_domain}/memdisk"
@@ -85,6 +84,13 @@ releases:
         code_name: "v3.11"
       - name: "Edge (development)"
         code_name: "edge"
+  anarchy:
+    name: "Anarchy Linux"
+    enabled: true
+    menu: "linux"
+    versions:
+      - name: "current"
+        code_name: "current"
   archlinux:
     name: "Arch Linux"
     mirror: "mirror.rackspace.com"
@@ -97,10 +103,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"
@@ -117,12 +123,12 @@ releases:
   coreos:
     name: "Fedora CoreOS"
     mirror: "https://builds.coreos.fedoraproject.org"
-    base_dir: "prod/streams/testing/builds"
-    enabled: false
+    base_dir: "prod/streams/stable/builds"
+    enabled: true
     menu: "linux"    
     versions:
       - name: "31"
-        code_name: "31.20191127.1"
+        code_name: "31.20200113.3.1"
   debian:
     name: "Debian"      
     mirror: "http://deb.debian.org"
@@ -297,12 +303,18 @@ releases:
         code_name: "42.3"
       - name: "openSUSE tumbleweed"
         code_name: "tumbleweed"
+  oracle:
+    name: "Oracle Linux"
+    mirror: "https://yum.oracle.com"
+    enabled: true
+    menu: "linux"
+    paths:
+      7: "/repo/OracleLinux/OL7/latest/x86_64"
+      8: "/repo/OracleLinux/OL8/baseos/latest/x86_64" 
   parrotsec:
     name: "Parrot Security"
-    mirror: "https://mirrordirector.archive.parrotsec.org"
-    base_dir: "parrot"
     enabled: true
-    menu: "security"
+    menu: "linux"
     versions:
       - name: "Stable Netinstall"
         code_name: "stable"
@@ -373,6 +385,13 @@ releases:
         code_name: "bionic"
       - name: "16.04 LTS Xenial Xerus"
         code_name: "xenial"
+  zeninstall:
+    name: "Zen Installer Arch"
+    enabled: true
+    menu: "linux"
+    versions:
+      - name: "current"
+        code_name: "current"
 
 # utility values
 utilitiespcbios:
@@ -382,12 +401,24 @@ utilitiespcbios:
     type: "memdisk"
     version: "160420a12074"
     util_path: "http://download.avg.com/filedir/inst/avg_arl_cdi_all_120_160420a12074.iso"
+  bootrepair:
+    name: "Boot Repair CD"
+    enabled: true
+    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"
   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"
+  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
@@ -399,21 +430,33 @@ utilitiespcbios:
   gparted:
     name: "GParted"
     enabled: true
-    type: "memdisk"
-    version: "1.0.0-3"
-    util_path: "http://master.dl.sourceforge.net/project/gparted/gparted-live-stable/1.0.0-3/gparted-live-1.0.0-3-amd64.iso"
+    type: "ipxemenu"
+  grml:
+    name: "Grml"
+    enabled: true
+    type: "ipxemenu"
   memtest:
     name: "Memtest"
     enabled: true
     type: "memtest"
     version: "5.01.0"
     util_path: "https://boot.netboot.xyz/utils/memtest86-5.01.0"
+  rescatux:
+    name: "Rescatux"
+    enabled: true
+    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"
   supergrub:
     name: "SuperGRUB"
     enabled: true
     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
@@ -423,10 +466,40 @@ utilitiespcbios:
 
 # efi utility values
 utilitiesefi:
+  bootrepair:
+    name: "Boot Repair CD"
+    enabled: true
+    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
     type: "ipxemenu"
+  gparted:
+    name: "GParted"
+    enabled: true
+    type: "ipxemenu"
+  grml:
+    name: "Grml"
+    enabled: true
+    type: "ipxemenu"
+  rescatux:
+    name: "Rescatux"
+    enabled: true
+    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:

+ 1 - 10
roles/netbootxyz/templates/menu/alpinelinux.ipxe.j2

@@ -11,7 +11,7 @@ goto ${menu}
 clear alpine_version
 set os {{ releases.alpinelinux.name }}
 iseq ${arch} x86_64 && set bootarch x86_64 || set bootarch x86
-menu ${os} [${bootarch}] - Image Sig Checks: [${img_sigs_enabled}]
+menu ${os} [${bootarch}]
 item --gap Releases
 {% for item in releases.alpinelinux.versions %}
 item {{ item.code_name }} ${space} ${os} {{ item.name }}
@@ -29,15 +29,6 @@ initrd ${base-url}/${dir}/initramfs-lts
 echo
 echo MD5sums:
 md5sum vmlinuz-lts initramfs-lts
-iseq ${img_sigs_enabled} true && goto verify_sigs || goto skip_sigs
-:verify_sigs
-echo
-echo Checking signatures...
-imgverify vmlinuz-lts ${sigs}${dir}/vmlinuz-lts.sig || goto error
-imgverify initramfs-lts ${sigs}${dir}/initramfs-lts.sig || goto error
-echo Signatures verified!
-echo
-:skip_sigs
 boot
 
 :alpine_exit

+ 27 - 0
roles/netbootxyz/templates/menu/anarchy.ipxe.j2

@@ -0,0 +1,27 @@
+#!ipxe
+
+# Anarchy Linux Operating System
+# https://www.anarchylinux.org/
+
+goto ${menu}
+
+:anarchy
+set os {{ releases.anarchy.name }}
+menu ${os} Installers
+{% for item in releases.anarchy.versions %}
+item {{ item.code_name }} ${space} ${os} {{ item.name }}
+{% endfor %}
+choose anarchy_version || goto anarchy_exit
+goto anarchy_boot
+
+:anarchy_boot
+imgfree
+set url ${live_endpoint}{{ endpoints.anarchy.path }}
+kernel ${url}vmlinuz archisobasedir=arch ip=dhcp archiso_http_srv=${url} initrd=initrd
+initrd ${url}initrd
+boot
+goto anarchy_exit
+
+:anarchy_exit
+clear menu
+exit 0

+ 1 - 1
roles/netbootxyz/templates/menu/archlinux.ipxe.j2

@@ -43,4 +43,4 @@ goto archlinux_exit
 
 :archlinux_exit
 clear menu
-exit 0
+exit 0

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

+ 0 - 4
roles/netbootxyz/templates/menu/boot.cfg.j2

@@ -16,9 +16,6 @@ set live_endpoint {{ live_endpoint }}
 # signature check enabled?
 set sigs_enabled {{ sigs_enabled | default(false) | bool | lower }}
 
-# image signatures check enabled?
-set img_sigs_enabled {{ img_sigs_enabled | default(false) | bool | lower }}
-
 # set location of signatures for sources
 set sigs {{ sigs_location }}
 
@@ -52,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 ||

+ 1 - 11
roles/netbootxyz/templates/menu/centos.ipxe.j2

@@ -11,7 +11,7 @@ goto ${menu} ||
 :centos
 clear osversion
 set os {{ releases.centos.name }}
-menu ${os} - ${arch} - Image Sig Checks: [${img_sigs_enabled}]
+menu ${os} - ${arch}
 {% for item in releases.centos.versions %}
 item {{ item.code_name }} ${space} ${os} {{ item.name }}
 {% endfor %}
@@ -65,16 +65,6 @@ initrd ${centos_mirror}/${dir}/images/pxeboot/initrd.img
 echo
 echo MD5sums:
 md5sum vmlinuz initrd.img
-iseq ${osversion} 8-stream && echo Rolling release, skipping sig checks && goto skip_sigs ||
-iseq ${img_sigs_enabled} true && goto verify_sigs || goto skip_sigs
-:verify_sigs
-echo
-echo Checking signatures...
-imgverify vmlinuz ${sigs}${dir}/images/pxeboot/vmlinuz.sig || goto error
-imgverify initrd.img ${sigs}${dir}/images/pxeboot/initrd.img.sig || goto error
-echo Signatures verified!
-echo
-:skip_sigs
 boot
 goto linux_menu
 

+ 4 - 4
roles/netbootxyz/templates/menu/coreos.ipxe.j2

@@ -1,6 +1,6 @@
 #!ipxe
 
-# Fedora CoreOS (Preview)
+# Fedora CoreOS
 # https://getfedora.org/coreos/
 # https://github.com/coreos/coreos-installer/blob/master/README.md#installing-from-pxe
 
@@ -8,7 +8,7 @@ goto ${menu}
 
 :coreos
 set os {{ releases.coreos.name }}
-isset ${install_device} || set install_device sda
+isset ${install_device} || set install_device /dev/sda
 isset ${ignition_url} || set ignition_url skip
 menu ${os}
 item --gap ${os}:
@@ -25,8 +25,8 @@ goto coreos_exit
 :core_boot
 set base_url ${coreos_mirror}/${coreos_base_dir}
 set build_version ${core_version}
-kernel ${base_url}/${build_version}/x86_64/fedora-coreos-${build_version}-installer-kernel-x86_64 nomodeset rd.neednet=1 coreos.inst.install_dev=${install_device} coreos.inst.ignition_url=${ignition_url} ${console} coreos.inst.stream=testing initrd=fedora-coreos-${build_version}-installer-initramfs.x86_64.img
-initrd ${base_url}/${build_version}/x86_64/fedora-coreos-${build_version}-installer-initramfs.x86_64.img
+kernel ${base_url}/${build_version}/x86_64/fedora-coreos-${build_version}-live-kernel-x86_64 ip=dhcp rd.neednet=1 coreos.inst.install_dev=${install_device} coreos.inst.ignition_url=${ignition_url} ${console} coreos.inst.stream=stable initrd=fedora-coreos-${build_version}-live-initramfs.x86_64.img
+initrd ${base_url}/${build_version}/x86_64/fedora-coreos-${build_version}-live-initramfs.x86_64.img
 boot
 goto coreos_exit
 

+ 1 - 11
roles/netbootxyz/templates/menu/debian.ipxe.j2

@@ -9,7 +9,7 @@ goto ${menu}
 set os Debian
 clear debian_version
 clear older_release
-menu ${os} - ${arch_a} - Image Sig Checks: [${img_sigs_enabled}]
+menu ${os} - ${arch_a}
 item --gap Latest Releases
 {% for item in releases.debian.versions.stable %}
 item {{ item.code_name }} ${space} ${os} {{ item.name }}
@@ -82,16 +82,6 @@ initrd ${debian_mirror}/${dir}/initrd.gz
 echo
 echo MD5sums:
 md5sum linux initrd.gz
-iseq ${img_sigs_enabled} true && iseq ${older_release} true && goto skip_sigs ||
-iseq ${img_sigs_enabled} true && goto verify_sigs || goto skip_sigs
-:verify_sigs
-echo
-echo Checking signatures...
-imgverify linux ${sigs}${dir}/linux.sig || goto error
-imgverify initrd.gz ${sigs}${dir}/initrd.gz.sig || goto error
-echo Signatures verified!
-echo
-:skip_sigs
 boot
 
 :debian_exit

+ 1 - 11
roles/netbootxyz/templates/menu/devuan.ipxe.j2

@@ -9,7 +9,7 @@ goto ${menu}
 set os Devuan
 clear devuan_version
 clear older_release
-menu ${os} - ${arch_a} - Image Sig Checks: [${img_sigs_enabled}]
+menu ${os} - ${arch_a}
 item --gap Latest Releases
 {% for item in releases.devuan.versions.stable %}
 item {{ item.code_name }} ${space} ${os} {{ item.name }}
@@ -69,16 +69,6 @@ initrd ${devuan_mirror}/${dir}/initrd.gz
 echo
 echo MD5sums:
 md5sum linux initrd.gz
-iseq ${img_sigs_enabled} true && iseq ${older_release} true && goto skip_sigs ||
-iseq ${img_sigs_enabled} true && goto verify_sigs || goto skip_sigs
-:verify_sigs
-echo
-echo Checking signatures...
-imgverify linux ${sigs}${dir}/linux.sig || goto error
-imgverify initrd.gz ${sigs}${dir}/initrd.gz.sig || goto error
-echo Signatures verified!
-echo
-:skip_sigs
 boot
 
 :devuan_exit

+ 1 - 11
roles/netbootxyz/templates/menu/fedora.ipxe.j2

@@ -13,7 +13,7 @@ clear osversion
 clear sku_type
 clear ova
 set os {{ releases.fedora.name }}
-menu ${os} - ${arch} - Image Sig Checks: [${img_sigs_enabled}]
+menu ${os} - ${arch}
 item --gap Latest Releases
 {% for item in releases.fedora.versions %}
 item {{ item.code_name }} ${space} ${os} {{ item.name }}
@@ -67,16 +67,6 @@ initrd ${fedora_mirror}/${dir}/images/pxeboot/initrd.img
 echo
 echo MD5sums:
 md5sum vmlinuz initrd.img
-iseq ${osversion} rawhide && goto skip_sigs ||
-iseq ${img_sigs_enabled} true && goto verify_sigs || goto skip_sigs
-:verify_sigs
-echo
-echo Checking signatures...
-imgverify vmlinuz ${sigs}${dir}/images/pxeboot/vmlinuz.sig || goto error
-imgverify initrd.img ${sigs}${dir}/images/pxeboot/initrd.img.sig || goto error
-echo Signatures verified!
-echo
-:skip_sigs
 boot
 goto linux_menu
 

+ 37 - 0
roles/netbootxyz/templates/menu/gparted.ipxe.j2

@@ -0,0 +1,37 @@
+#!ipxe
+
+goto ${menu} ||
+
+:live_menu
+set os GParted Live
+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 == "gparted" %}
+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 == "gparted" %}
+:{{ 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 boot=live fetch=${squash_url} union=overlay username=user vga=788 initrd=initrd
+initrd ${kernel_url}initrd
+boot
+
+:live_exit
+clear menu
+exit 0

+ 37 - 0
roles/netbootxyz/templates/menu/grml.ipxe.j2

@@ -0,0 +1,37 @@
+#!ipxe
+
+goto ${menu} ||
+
+:live_menu
+set os Grml
+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 == "grml" %}
+item {{ value.version }}-{{ value.flavor }} ${space} ${os} {{ value.version }} {{ value.flavor }}
+{% endif %}
+{% endfor %}
+choose live_version || goto live_exit
+goto ${live_version}
+
+
+{% for key, value in endpoints.items() | sort %}
+{% if value.os == "grml" %}
+:{{ value.version }}-{{ value.flavor }}
+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 boot=live fetch=${squash_url} initrd=initrd
+initrd ${kernel_url}initrd
+boot
+
+:live_exit
+clear menu
+exit 0

+ 1 - 10
roles/netbootxyz/templates/menu/ipfire.ipxe.j2

@@ -8,7 +8,7 @@ goto ${menu} ||
 :ipfire
 clear osversion
 set os {{ releases.ipfire.name }}
-menu ${os} - Image Sig Checks: [${img_sigs_enabled}]
+menu ${os}
 {% for item in releases.ipfire.versions %}
 item {{ item.code_name }} ${space} ${os} {{ item.name }}
 {% endfor %}
@@ -24,15 +24,6 @@ initrd ${ipfire_mirror}/${dir}/instroot
 echo
 echo MD5sums:
 md5sum vmlinuz instroot
-iseq ${img_sigs_enabled} true && goto verify_sigs || goto skip_sigs
-:verify_sigs
-echo
-echo Checking signatures...
-imgverify vmlinuz ${sigs}ipfire/${dir}/vmlinuz.sig || goto error
-imgverify instroot ${sigs}ipfire/${dir}/instroot.sig || goto error
-echo Signatures verified!
-echo
-:skip_sigs
 boot
 
 :ipfire_exit

+ 36 - 0
roles/netbootxyz/templates/menu/live-bluestar.ipxe.j2

@@ -0,0 +1,36 @@
+#!ipxe
+
+goto ${menu} ||
+
+:live_menu
+set os Bluestar
+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 == "bluestar" %}
+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 == "bluestar" %}
+:{{ value.version }}
+set url ${live_endpoint}{{ value.path }}
+goto boot
+
+{% endif %}
+{% endfor %}
+
+:boot
+imgfree
+kernel ${url}vmlinuz archisobasedir=arch ip=dhcp archiso_http_srv=${url} cow_spacesize=30% cow_label=BSLX_PERSIST ipv6.disable=1 disablehooks=v86d,915resolution,gma3600 modprobe.blacklist=uvesafb console=tty1 initrd=initrd
+initrd ${url}initrd
+boot
+
+:live_exit
+clear menu
+exit 0

+ 37 - 0
roles/netbootxyz/templates/menu/live-bodhi.ipxe.j2

@@ -0,0 +1,37 @@
+#!ipxe
+
+goto ${menu} ||
+
+:live_menu
+set os Bodhi
+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 == "bodhi" %}
+item {{ value.version }}-{{ value.flavor }} ${space} ${os} {{ value.version }} {{ value.flavor }}
+{% endif %}
+{% endfor %}
+choose live_version || goto live_exit
+goto ${live_version}
+
+
+{% for key, value in endpoints.items() | sort %}
+{% if value.os == "bodhi" %}
+:{{ value.version }}-{{ value.flavor }}
+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

+ 0 - 0
roles/netbootxyz/templates/menu/live-deepin.ipxe → roles/netbootxyz/templates/menu/live-deepin.ipxe.j2


+ 37 - 0
roles/netbootxyz/templates/menu/live-devuan.ipxe.j2

@@ -0,0 +1,37 @@
+#!ipxe
+
+goto ${menu} ||
+
+:live_menu
+set os Devuan
+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 == "devuan" %}
+item {{ value.version }}-{{ value.flavor }} ${space} ${os} {{ value.version }} {{ value.flavor }}
+{% endif %}
+{% endfor %}
+choose live_version || goto live_exit
+goto ${live_version}
+
+
+{% for key, value in endpoints.items() | sort %}
+{% if value.os == "devuan" %}
+:{{ value.version }}-{{ value.flavor }}
+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 boot=live username=devuan fetch=${squash_url} initrd=initrd
+initrd ${kernel_url}initrd
+boot
+
+:live_exit
+clear menu
+exit 0

+ 37 - 0
roles/netbootxyz/templates/menu/live-kodachi.ipxe.j2

@@ -0,0 +1,37 @@
+#!ipxe
+
+goto ${menu} ||
+
+:live_menu
+set os Kodachi
+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 == "kodachi" %}
+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 == "kodachi" %}
+:{{ 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

+ 2 - 2
roles/netbootxyz/templates/menu/live-lite.ipxe → roles/netbootxyz/templates/menu/live-lite.ipxe.j2

@@ -15,9 +15,9 @@ goto ${live_version}
 :4
 set squash_url ${live_endpoint}{{ endpoints["linux-lite-4-squash"].path }}filesystem.squashfs
 set kernel_url ${live_endpoint}{{ endpoints["linux-lite-4-squash"].path }}
-goto live-boot
+goto boot
 
-:4-boot
+:boot
 imgfree
 kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=http fetch=${squash_url} username=linuxlite userfullname=linuxlite initrd=initrd
 initrd ${kernel_url}initrd

+ 0 - 0
roles/netbootxyz/templates/menu/live-neon.ipxe → roles/netbootxyz/templates/menu/live-neon.ipxe.j2


+ 37 - 0
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

+ 37 - 0
roles/netbootxyz/templates/menu/live-parrot-ipxe.j2

@@ -0,0 +1,37 @@
+#!ipxe
+
+goto ${menu} ||
+
+:live_menu
+set os Parrot OS
+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 == "parrot" %}
+item {{ value.version }}-{{ value.flavor }} ${space} ${os} {{ value.version }} {{ value.flavor }}
+{% endif %}
+{% endfor %}
+choose live_version || goto live_exit
+goto ${live_version}
+
+
+{% for key, value in endpoints.items() | sort %}
+{% if value.os == "parrot" %}
+:{{ value.version }}-{{ value.flavor }}
+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 boot=live fetch=${squash_url} initrd=initrd
+initrd ${kernel_url}initrd
+boot
+
+:live_exit
+clear menu
+exit 0

+ 0 - 0
roles/netbootxyz/templates/menu/live-regolith.ipxe → roles/netbootxyz/templates/menu/live-regolith.ipxe.j2


+ 36 - 0
roles/netbootxyz/templates/menu/live-velt.ipxe.j2

@@ -0,0 +1,36 @@
+#!ipxe
+
+goto ${menu} ||
+
+:live_menu
+set os Velt
+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 == "velt" %}
+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 == "velt" %}
+:{{ value.version }}
+set url ${live_endpoint}{{ value.path }}
+goto boot
+
+{% endif %}
+{% endfor %}
+
+:boot
+imgfree
+kernel ${url}vmlinuz archisobasedir=arch ip=dhcp archiso_http_srv=${url} initrd=initrd
+initrd ${url}initrd
+boot
+
+:live_exit
+clear menu
+exit 0

+ 7 - 0
roles/netbootxyz/templates/menu/live.ipxe.j2

@@ -7,23 +7,30 @@ menu Live Boot Distributions - Current Arch [ ${arch} ]
 iseq ${arch} x86_64 && set arch_a amd64 || set arch_a ${arch}
 item --gap Live Boot Distributions
 item live-backbox ${space} BackBox
+item live-bluestar ${space} Bluestar Linux
+item live-bodhi ${space} Bodhi
 item live-debian ${space} Debian
 item live-deepin ${space} Deepin
+item live-devuan ${space} Devuan
 item live-elementary ${space} elementary OS
 item live-fedora ${space} Fedora
 item live-feren ${space} Feren OS
 item live-kali ${space} Kali
+item live-kodachi ${space} Kodachi
 item live-neon ${space} KDE Neon
 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
 item live-regolith ${space} Regolith
 item live-sparky ${space} SparkyLinux
 item live-tails ${space} Tails
 item live-ubuntu ${space} Ubuntu
+item live-velt ${space} Velt
 item live-voyager ${space} Voyager
 item live-zorin ${space} Zorin OS
 choose menu || goto live_exit

+ 1 - 10
roles/netbootxyz/templates/menu/mageia.ipxe.j2

@@ -10,7 +10,7 @@ goto ${menu} ||
 
 :mageia
 set os {{ releases.mageia.name }}
-menu ${os} - ${arch} - Image Sig Checks: [${img_sigs_enabled}]
+menu ${os} - ${arch}
 {% for item in releases.mageia.versions %}
 item {{ item.code_name }} ${space} ${os} {{ item.name }}
 {% endfor %}
@@ -28,15 +28,6 @@ imgargs vmlinuz automatic=${automatic} vga=788 splash=silent ${console} initrd=a
 echo
 echo MD5sums:
 md5sum vmlinuz all.rdz
-iseq ${img_sigs_enabled} true && goto verify_sigs || goto skip_sigs
-:verify_sigs
-echo
-echo Checking signatures...
-imgverify vmlinuz ${sigs}${dir}/${dir2}/vmlinuz.sig || goto error
-imgverify all.rdz ${sigs}${dir}/${dir2}/all.rdz.sig || goto error
-echo Signatures verified!
-echo
-:skip_sigs
 boot || goto mageia
 
 :mageia_exit

+ 0 - 8
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 ||
@@ -64,9 +63,6 @@ item --gap Signature Checks:
 {% if sigs_enabled | bool %}
 item sig_check ${space} {{ site_name }} [ enabled: ${sigs_enabled} ]
 {% endif %}
-{% if img_sigs_enabled | bool %}
-item img_sigs_check ${space} Images [ enabled: ${img_sigs_enabled} ]
-{% endif %}
 {% endif %}
 {% if custom_github_menus | bool %}
 isset ${github_user} && item --gap Custom Github Menu: ||
@@ -113,10 +109,6 @@ goto main_menu
 iseq ${sigs_enabled} true && set sigs_enabled false || set sigs_enabled true
 goto main_menu
 
-:img_sigs_check
-iseq ${img_sigs_enabled} true && set img_sigs_enabled false || set img_sigs_enabled true
-goto main_menu
-
 :about
 chain https://boot.netboot.xyz/about.ipxe || chain about.ipxe 
 goto main_menu

+ 1 - 11
roles/netbootxyz/templates/menu/opensuse.ipxe.j2

@@ -57,7 +57,7 @@ set netsetup netsetup=hostip,gateway,nameserver hostip=${ip}/${prefix} gateway=$
 set netsetup ${netsetup} BOOTIF=${netX/mac}
 
 set distro opensuse
-menu openSUSE - ${arch} - Image Sig Checks: [${img_sigs_enabled}]
+menu openSUSE - ${arch}
 {% for item in releases.opensuse.versions %}
 item {{ item.code_name }} ${space} ${os} {{ item.name }}
 {% endfor %}
@@ -72,16 +72,6 @@ imgargs linux ${netsetup} install=${opensuse_mirror}/${dir} ${params} ${console}
 echo
 echo MD5sums:
 md5sum linux initrd
-iseq ${img_sigs_enabled} true && iseq ${version} tumbleweed && goto skip_sigs ||
-iseq ${img_sigs_enabled} true && goto verify_sigs || goto skip_sigs
-:verify_sigs
-echo
-echo Checking signatures...
-imgverify linux ${sigs}${distro}/${dir}/boot/x86_64/loader/linux.sig || goto error
-imgverify initrd ${sigs}${distro}/${dir}/boot/x86_64/loader/initrd.sig || goto error
-echo Signatures verified!
-echo
-:skip_sigs
 boot
 
 :opensuse_exit

+ 41 - 0
roles/netbootxyz/templates/menu/oracle.ipxe.j2

@@ -0,0 +1,41 @@
+#!ipxe
+
+isset ${dhcp-server} && set ipparam ip=dhcp || set ipparam ip=${ip}::${gateway}:${netmask}:::none nameserver=${dns}
+set ipparam BOOTIF=${netX/mac} ${ipparam}
+
+goto ${menu} ||
+
+:oracle_menu
+set os Oracle Linux
+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 == "oracle" %}
+item {{ value.version }} ${space} ${os} {{ value.version }}
+{% endif %}
+{% endfor %}
+choose version || goto oracle_exit
+goto ${version}
+
+
+{% for key, value in endpoints.items() | sort %}
+{% if value.os == "oracle" %}
+:{{ value.version }}
+set url ${live_endpoint}{{ value.path }}
+set repo {{ releases.oracle.mirror }}{{ releases.oracle.paths[value.version|int] }}
+goto boot
+
+{% endif %}
+{% endfor %}
+
+:boot
+imgfree
+kernel ${url}vmlinuz ${ipparam} repo=${repo} root=live:${url}squashfs.img ro rd.live.image rd.lvm=0 rd.luks=0 rd.md=0 rd.dm=0 initrd=initrd
+initrd ${url}initrd
+boot
+
+:oracle_exit
+clear menu
+exit 0
+

+ 5 - 4
roles/netbootxyz/templates/menu/parrotsec.ipxe.j2

@@ -16,12 +16,13 @@ choose parrotsec_version || goto parrotsec_exit
 goto parrotsec_boot
 
 :parrotsec_boot
-set parrotsec_initrd https://mirrordirector.archive.parrotsec.org/parrot/dists/${parrotsec_version}/main/installer-${arch_a}/current/images/netboot/mini.iso
-kernel ${memdisk} iso raw
-initrd ${parrotsec_initrd}
+imgfree
+set url ${live_endpoint}{{ endpoints['parrot-net'].path }}
+kernel ${url}vmlinuz vga=788 initrd=initrd
+initrd ${url}initrd
 boot
 goto parrotsec_exit
 
 :parrotsec_exit
 clear menu
-exit 0
+exit 0

+ 38 - 0
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

+ 1 - 11
roles/netbootxyz/templates/menu/ubuntu.ipxe.j2

@@ -8,7 +8,7 @@ goto ${menu}
 :ubuntu
 set os Ubuntu
 clear ubuntu_version
-menu ${os} - ${arch_a} - Image Sig Checks: [${img_sigs_enabled}]
+menu ${os} - ${arch_a}
 item --gap Latest Releases
 {% for item in releases.ubuntu.versions %}
 item {{ item.code_name }} ${space} ${os} {{ item.name }}
@@ -66,16 +66,6 @@ initrd ${ubuntu_mirror}/${dir}/initrd.gz
 echo
 echo MD5sums:
 md5sum linux initrd.gz
-iseq ${img_sigs_enabled} true && iseq ${older_release} true && goto skip_sigs ||
-iseq ${img_sigs_enabled} true && goto verify_sigs || goto skip_sigs
-:verify_sigs
-echo
-echo Checking signatures...
-imgverify linux ${sigs}${dir}/linux.sig || goto error
-imgverify initrd.gz ${sigs}${dir}/initrd.gz.sig || goto error
-echo Signatures verified!
-echo
-:skip_sigs
 boot
 
 :ubuntu_exit

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

@@ -1,6 +1,6 @@
 #!ipxe
 
-menu Utilities - Image Sig Checks: [${img_sigs_enabled}]
+menu Utilities
 item --gap Utilities:
 {% for key, value in utilitiesefi.items() | sort(attribute='1.name') %}
 {% if value.enabled %}

+ 1 - 10
roles/netbootxyz/templates/menu/utils-pcbios.ipxe.j2

@@ -1,6 +1,6 @@
 #!ipxe
 
-menu Utilities - Image Sig Checks: [${img_sigs_enabled}]
+menu Utilities
 item --gap Utilities:
 {% for key, value in utilitiespcbios.items() | sort(attribute='1.name') %}
 {% if value.enabled %}
@@ -46,15 +46,6 @@ 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
 boot
 goto utils_exit
 

+ 5 - 3
roles/netbootxyz/templates/menu/windows.ipxe.j2

@@ -46,9 +46,11 @@ imgfree
 kernel {{ wimboot_location }}
 initrd -n bootmgr     ${win_base_url}/${win_arch}/bootmgr       bootmgr ||
 initrd -n bootmgr.efi ${win_base_url}/${win_arch}/bootmgr.efi   bootmgr.efi ||      
-initrd -n bcd         ${win_base_url}/${win_arch}/boot/bcd      bcd
-initrd -n boot.sdi    ${win_base_url}/${win_arch}/boot/boot.sdi boot.sdi   
-initrd -n boot.wim    ${win_base_url}/${win_arch}/boot/boot.wim boot.wim
+initrd -n bcd         ${win_base_url}/${win_arch}/boot/bcd      bcd ||
+initrd -n bcd         ${win_base_url}/${win_arch}/Boot/BCD      bcd ||
+initrd -n boot.sdi    ${win_base_url}/${win_arch}/boot/boot.sdi boot.sdi ||
+initrd -n boot.sdi    ${win_base_url}/${win_arch}/Boot/boot.sdi boot.sdi ||
+initrd -n boot.wim    ${win_base_url}/${win_arch}/sources/boot.wim boot.wim
 boot
 
 :windows_exit

+ 27 - 0
roles/netbootxyz/templates/menu/zeninstall.ipxe.j2

@@ -0,0 +1,27 @@
+#!ipxe
+
+# Zen Installer for Arch
+# https://sourceforge.net/projects/revenge-installer/
+
+goto ${menu}
+
+:zen
+set os {{ releases.zeninstall.name }}
+menu ${os} Installers
+{% for item in releases.zeninstall.versions %}
+item {{ item.code_name }} ${space} ${os} {{ item.name }}
+{% endfor %}
+choose zen_version || goto zen_exit
+goto zen_boot
+
+:zen_boot
+imgfree
+set url ${live_endpoint}{{ endpoints.zeninstall.path }}
+kernel ${url}vmlinuz archisobasedir=arch ip=dhcp archiso_http_srv=${url} initrd=initrd
+initrd ${url}initrd
+boot
+goto zen_exit
+
+:zen_exit
+clear menu
+exit 0

+ 0 - 1
script/netbootxyz-overrides.yml

@@ -1,7 +1,6 @@
 ---
 sigs_menu: true
 sigs_enabled: true
-img_sigs_enabled: false
 generate_disks_arm: true
 generate_version_file: true
 bootloader_multiple: true

+ 1 - 1
version.txt

@@ -1 +1 @@
-2.0.5
+2.0.6