Merge pull request #922 from netbootxyz/development

Release 2.0.41-RC

CHANGELOG.md

@@ -4,6 +4,17 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [2.0.41]
+### Added
+- Adds support for openEuler
+- Adds ping command to iPXE build
+### Fixes
+- NixOS working again, using images and iPXE configs that are generated upstream
+### Changes
+- Use non https repo for almalinux
+- Switch to using initrd.magic (https://github.com/ipxe/ipxe/commit/e5f02551735922eb235388bff08249a6f31ded3d)
+- Moves initrd= and cmdline values to single kernel parameter in Ansible
+
 ## [2.0.40]
 ### Added
 - Adds support for VMware ESXi with user supplied media

README.md

@@ -8,12 +8,17 @@
 
 ### Bootloader Downloads
 
-#### Legacy (PCBIOS) iPXE Bootloaders
+#### Combined Legacy and UEFI iPXE Bootloaders
 
 | Type | Bootloader | Description |
 |------|------------|-------------|
 |ISO| [netboot.xyz.iso](https://boot.netboot.xyz/ipxe/netboot.xyz.iso)| Used for CD/DVD, Virtual CDs, DRAC/iLO, VMware, Virtual Box |
-|USB| [netboot.xyz.usb](https://boot.netboot.xyz/ipxe/netboot.xyz.usb)| Used for creation of USB Keys|
+|USB| [netboot.xyz.img](https://boot.netboot.xyz/ipxe/netboot.xyz.img)| Used for creation of USB Keys|
+
+#### Legacy (PCBIOS) iPXE Bootloaders
+
+| Type | Bootloader | Description |
+|------|------------|-------------|
 |Kernel| [netboot.xyz.lkrn](https://boot.netboot.xyz/ipxe/netboot.xyz.lkrn)|Used for booting from GRUB/EXTLINUX|
 |Floppy| [netboot.xyz.dsk](https://boot.netboot.xyz/ipxe/netboot.xyz.dsk)| Virtual floppy disk for DRAC/iLO, VMware, Virtual Box, etc|
 |DHCP| [netboot.xyz.kpxe](https://boot.netboot.xyz/ipxe/netboot.xyz.kpxe)| DHCP boot image file, uses built-in iPXE NIC drivers|
@@ -23,11 +28,22 @@
 
 | Type | Bootloader | Description |
 |------|------------|-------------|
-|ISO| [netboot.xyz-efi.iso](https://boot.netboot.xyz/ipxe/netboot.xyz-efi.iso)| Used for CD/DVD, Virtual CDs, DRAC/iLO, VMware, Virtual Box |
-|USB| [netboot.xyz-efi.usb](https://boot.netboot.xyz/ipxe/netboot.xyz-efi.usb)| Used for creation of USB Keys|
 |DHCP| [netboot.xyz.efi](https://boot.netboot.xyz/ipxe/netboot.xyz.efi)| DHCP boot image file, uses built-in iPXE NIC drivers|
-|DHCP-snp |	[netboot.xyz-snp.efi](https://boot.netboot.xyz/ipxe/netboot.xyz-snp.efi)| EFI w/ Simple Network Protocol, attempts to boot all net devices|
-|DHCP-snponly | [netboot.xyz-snponly.efi](https://boot.netboot.xyz/ipxe/netboot.xyz-snponly.efi)| EFI w/ Simple Network Protocol, only boots from device chained from|
+|DHCP-snp| [netboot.xyz-snp.efi](https://boot.netboot.xyz/ipxe/netboot.xyz-snp.efi)| EFI w/ Simple Network Protocol, attempts to boot all net devices|
+|DHCP-snponly| [netboot.xyz-snponly.efi](https://boot.netboot.xyz/ipxe/netboot.xyz-snponly.efi)| EFI w/ Simple Network Protocol, only boots from device chained from|
+
+#### ARM64 iPXE Bootloaders
+
+| Type | Bootloader | Description |
+|------|------------|-------------|
+|DHCP-snp| [netboot.xyz-arm64.efi](https://boot.netboot.xyz/ipxe/netboot.xyz-arm64.efi)| EFI w/ Simple Network Protocol, attempts to boot all net devices|
+
+#### Raspberry Pi iPXE Bootloaders
+
+| Type | Bootloader | Description |
+|------|------------|-------------|
+|USB/SD Card| [netboot.xyz-rpi4-sdcard.img](https://boot.netboot.xyz/ipxe/netboot.xyz-rpi4-sdcard.img)| Raspberry Pi 4 - USB/SD Card Image|
+|DHCP-snp| [netboot.xyz-rpi4-snp.efi](https://boot.netboot.xyz/ipxe/netboot.xyz-rpi4-snp.efi)| Raspberry Pi 4 - EFI Image|
 
 SHA256 checksums are generated during each build of iPXE and are located [here](https://boot.netboot.xyz/ipxe/netboot.xyz-sha256-checksums.txt).  You can also view the scripts that are embedded into the images [here](https://github.com/netbootxyz/netboot.xyz/tree/master/ipxe/disks).
 
@@ -134,6 +150,7 @@ In addition to being able to host netboot.xyz locally, you can also create your
 | Nitrux | https://nxos.org/ | No | Yes |
 | NixOS | https://nixos.org | Yes | No |
 | OpenBSD | https://openbsd.org | Yes | No |
+| openEuler | https://openeuler.org | Yes | No |
 | OpenSUSE | https://opensuse.org | Yes | No |
 | Oracle Linux | https://www.oracle.com/linux/ | Yes | Installer |
 | Parrot Security | https://www.parrotsec.org | No | Yes |

endpoints.yml

@@ -141,7 +141,7 @@ endpoints:
     flavor: Budgie
     kernel: ubuntu-19.10-live-kernel
   debian-10-xfce-squash:
-    path: /debian-squash/releases/download/10.9.0-e94fae4e/
+    path: /debian-squash/releases/download/10.10.0-e94fae4e/
     files:
     - filesystem.squashfs
     os: debian
@@ -149,7 +149,7 @@ endpoints:
     flavor: xfce
     kernel: debian-10-live-kernel
   debian-10-gnome-squash:
-    path: /debian-squash/releases/download/10.9.0-13fd68d4/
+    path: /debian-squash/releases/download/10.10.0-13fd68d4/
     files:
     - filesystem.squashfs
     os: debian
@@ -157,7 +157,7 @@ endpoints:
     flavor: gnome
     kernel: debian-10-live-kernel
   debian-10-cinnamon-squash:
-    path: /debian-squash/releases/download/10.9.0-77fb8dba/
+    path: /debian-squash/releases/download/10.10.0-77fb8dba/
     files:
     - filesystem.squashfs
     os: debian
@@ -173,7 +173,7 @@ endpoints:
     flavor: kylin
     kernel: ubuntu-19.10-live-kernel
   debian-10-kde-squash:
-    path: /debian-squash/releases/download/10.9.0-fc058090/
+    path: /debian-squash/releases/download/10.10.0-fc058090/
     files:
     - filesystem.squashfs
     os: debian
@@ -181,7 +181,7 @@ endpoints:
     flavor: kde
     kernel: debian-10-live-kernel
   debian-10-lxde-squash:
-    path: /debian-squash/releases/download/10.9.0-ae0d6ef2/
+    path: /debian-squash/releases/download/10.10.0-ae0d6ef2/
     files:
     - filesystem.squashfs
     os: debian
@@ -189,7 +189,7 @@ endpoints:
     flavor: lxde
     kernel: debian-10-live-kernel
   debian-10-lxqt-squash:
-    path: /debian-squash/releases/download/10.9.0-92b8fed6/
+    path: /debian-squash/releases/download/10.10.0-92b8fed6/
     files:
     - filesystem.squashfs
     os: debian
@@ -197,7 +197,7 @@ endpoints:
     flavor: lxqt
     kernel: debian-10-live-kernel
   debian-10-mate-squash:
-    path: /debian-squash/releases/download/10.9.0-e397bfb9/
+    path: /debian-squash/releases/download/10.10.0-e397bfb9/
     files:
     - filesystem.squashfs
     os: debian
@@ -467,7 +467,7 @@ endpoints:
     flavor: eoan
     kernel: voyager-eoan-squash
   kde-neon-user:
-    path: /ubuntu-squash/releases/download/20210610-0944-92641c1f/
+    path: /ubuntu-squash/releases/download/20210624-0945-92641c1f/
     files:
     - vmlinuz
     - filesystem.squashfs
@@ -578,7 +578,7 @@ endpoints:
     version: classic
     kernel: feren-classic-squash
   clonezilla-debian-stable:
-    path: /debian-squash/releases/download/2.7.2-38-fcb50247/
+    path: /debian-squash/releases/download/2.7.2-39-fcb50247/
     files:
     - filesystem.squashfs
     - initrd
@@ -598,7 +598,7 @@ endpoints:
     flavor: testing
     kernel: clonezilla-debian-testing
   clonezilla-ubuntu-stable:
-    path: /ubuntu-squash/releases/download/20210530-hirsute-2a768141/
+    path: /ubuntu-squash/releases/download/20210609-hirsute-2a768141/
     files:
     - filesystem.squashfs
     - initrd
@@ -608,7 +608,7 @@ endpoints:
     flavor: stable
     kernel: clonezilla-ubuntu-stable
   clonezilla-ubuntu-testing:
-    path: /ubuntu-squash/releases/download/20210609-hirsute-18e78f5f/
+    path: /ubuntu-squash/releases/download/20210701-hirsute-18e78f5f/
     files:
     - filesystem.squashfs
     - initrd
@@ -661,7 +661,7 @@ endpoints:
     flavor: lxqt
     kernel: sparky-stable-lxqt
   sparky-rolling-mingui:
-    path: /debian-squash/releases/download/2021.03-6bf1f5f9/
+    path: /debian-squash/releases/download/2021.06-6bf1f5f9/
     files:
     - filesystem.squashfs
     - initrd
@@ -671,7 +671,7 @@ endpoints:
     flavor: xfce-min
     kernel: sparky-rolling-mingui
   sparky-rolling-gui:
-    path: /debian-squash/releases/download/2021.03-895a3198/
+    path: /debian-squash/releases/download/2021.06-895a3198/
     files:
     - filesystem.squashfs
     - initrd
@@ -681,7 +681,7 @@ endpoints:
     flavor: xfce
     kernel: sparky-rolling-gui
   sparky-rolling-lxqt:
-    path: /debian-squash/releases/download/5.15-5d8b15b7/
+    path: /debian-squash/releases/download/2021.06-5d8b15b7/
     files:
     - filesystem.squashfs
     - initrd
@@ -812,7 +812,7 @@ endpoints:
     os: rescatux
     version: current
   systemrescue:
-    path: /asset-mirror/releases/download/8.01-29e43bb5/
+    path: /asset-mirror/releases/download/8.03-29e43bb5/
     files:
     - initrd
     - vmlinuz
@@ -844,7 +844,7 @@ endpoints:
     os: blackarch
     version: current
   bluestar:
-    path: /asset-mirror/releases/download/5.12.6-2021.05.23-a3024eea/
+    path: /asset-mirror/releases/download/5.12.11-2021.06.17-a3024eea/
     files:
     - initrd
     - vmlinuz
@@ -868,7 +868,7 @@ endpoints:
     os: zeninstall
     version: current
   gentoo:
-    path: /asset-mirror/releases/download/20210602T214502Z-8bb30d0c/
+    path: /asset-mirror/releases/download/20210630T214504Z-8bb30d0c/
     files:
     - image.squashfs
     - initrd
@@ -986,7 +986,7 @@ endpoints:
     version: current
     flavor: BakAndImg
   4mlinux-antivirus:
-    path: /asset-mirror/releases/download/36.0-0.103.0-ba9e3ece/
+    path: /asset-mirror/releases/download/37.0-0.103.2-ba9e3ece/
     files:
     - initrd
     - vmlinuz
@@ -1731,3 +1731,21 @@ endpoints:
     - special-edition.img
     os: freebsd
     version: '13'
+  xcp-ng:
+    path: /asset-mirror/releases/download/8.2-6c6b5220/
+    files:
+    - xen.gz
+    - vmlinuz
+    - install.img
+    os: xcp-ng
+    version: '8.2'
+  pop-21.04-default-squash:
+    path: /ubuntu-squash/releases/download/2-7ee5da15/
+    files:
+    - filesystem.squashfs
+    - initrd
+    - vmlinuz
+    os: pop
+    version: '21.04'
+    flavor: intel-amd
+    kernel: pop-21.04-default-squash

etc/netbootxyz/custom/README.md

@@ -20,7 +20,7 @@ A sample menu is provided to demonstrate how to configure and set up
 a menu.  You can copy the custom directory from the repo:
 
 ```
-cp etc/netbootxyz/custom /etc/netbootxyz/custom
+cp -r etc/netbootxyz/custom /etc/netbootxyz/custom
 ```
 
 If you are building via Docker, you can create a `custom` folder in
@@ -29,4 +29,4 @@ the root source directory and then set the variable like so:
 ```
 custom_generate_menus: true
 custom_templates_dir: "/ansible/custom"
-```
+```

roles/netbootxyz/defaults/main.yml

@@ -83,6 +83,7 @@ ipxe_ca_filename: ca-ipxe-org.crt
 ipxe_ca_url: http://ca.ipxe.org/ca.crt
 ipxe_repo: https://github.com/ipxe/ipxe
 ipxe_source_dir: /usr/src/ipxe
+kernel_params: initrd=initrd.magic ${cmdline}
 live_endpoint: https://github.com/netbootxyz
 memdisk_location: http://${boot_domain}/memdisk
 netbootxyz_conf_dir: /etc/netbootxyz
@@ -96,7 +97,7 @@ releases:
     base_dir: almalinux
     enabled: true
     menu: linux
-    mirror: https://repo.almalinux.org
+    mirror: http://repo.almalinux.org
     name: AlmaLinux
     versions:
     - code_name: 8.3
@@ -110,8 +111,8 @@ releases:
     mirror: http://dl-cdn.alpinelinux.org
     name: Alpine Linux
     versions:
-    - code_name: v3.13
-      name: '3.13'
+    - code_name: v3.14
+      name: '3.14'
     - code_name: edge
       name: Edge (development)
   anarchy:
@@ -128,8 +129,8 @@ releases:
     mirror: mirrors.evowise.com
     name: Arch Linux
     versions:
-    - code_name: 2021.04.01
-      name: 2021.04.01
+    - code_name: 2021.07.01
+      name: 2021.07.01
   blackarch:
     enabled: true
     menu: linux
@@ -159,7 +160,7 @@ releases:
     mirror: https://builds.coreos.fedoraproject.org
     name: Fedora CoreOS
     versions:
-    - code_name: 33.20210328.3.0
+    - code_name: 34.20210611.3.0
       name: stable
   debian:
     archive_mirror: http://archive.debian.org
@@ -247,8 +248,8 @@ releases:
     mirror: https://downloads.ipfire.org
     name: IPFire
     versions:
-    - code_name: 2.25-core155
-      name: 2.25 Core155
+    - code_name: 2.25-core157
+      name: 2.25 Core157
   k3os:
     enabled: true
     menu: linux
@@ -275,9 +276,28 @@ releases:
     - code_name: cauldron
       name: cauldron
   nixos:
+    base_dir: nixos
     enabled: true
     menu: linux
     name: NixOS
+    versions:
+    - code_name: nixos-20.09
+      name: nixos-20.09
+    - code_name: nixos-21.05
+      name: nixos-21.05
+    - code_name: nixos-unstable
+      name: nixos-unstable
+  openEuler:
+    base_dir: null
+    enabled: true
+    menu: linux
+    mirror: http://repo.openeuler.org
+    name: openEuler
+    versions:
+    - code_name: openEuler-20.03-LTS-SP1
+      name: openEuler-20.03-LTS-SP1
+    - code_name: openEuler-21.03
+      name: openEuler-21.03
   openbsd:
     base_dir: pub/OpenBSD
     enabled: true
@@ -390,14 +410,14 @@ releases:
     mirror: https://netboot.joyent.com/os/
     name: SmartOS
     versions:
-    - code_name: 20210422T002312Z
-      name: 20210422T002312Z
-    - code_name: 20210408T001154Z
-      name: 20210408T001154Z
-    - code_name: 20210325T002528Z
-      name: 20210325T002528Z
-    - code_name: 20210311T001742Z
-      name: 20210311T001742Z
+    - code_name: 20210701T204427Z
+      name: 20210701T204427Z
+    - code_name: 20210617T001230Z
+      name: 20210617T001230Z
+    - code_name: 20210520T001536Z
+      name: 20210520T001536Z
+    - code_name: 20210508T051936Z
+      name: 20210508T051936Z
   talos:
     enabled: true
     menu: linux
@@ -613,8 +633,8 @@ utilitiesefi:
   redorescue:
     enabled: true
     initrd: ${live_endpoint}{{ endpoints.redorescue.path }}initrd
-    kernel: ${live_endpoint}{{ endpoints.redorescue.path }}vmlinuz boot=live noprompt nocomponents 
-      setkmap=us fetch=${live_endpoint}{{ endpoints.redorescue.path }}filesystem.squashfs
+    kernel: ${live_endpoint}{{ endpoints.redorescue.path }}vmlinuz boot=live noprompt
+      nocomponents setkmap=us fetch=${live_endpoint}{{ endpoints.redorescue.path }}filesystem.squashfs
       initrd=initrd
     name: RedoRescue
     type: direct
@@ -701,8 +721,8 @@ utilitiespcbios:
   redorescue:
     enabled: true
     initrd: ${live_endpoint}{{ endpoints.redorescue.path }}initrd
-    kernel: ${live_endpoint}{{ endpoints.redorescue.path }}vmlinuz boot=live noprompt nocomponents 
-      setkmap=us fetch=${live_endpoint}{{ endpoints.redorescue.path }}filesystem.squashfs
+    kernel: ${live_endpoint}{{ endpoints.redorescue.path }}vmlinuz boot=live noprompt
+      nocomponents setkmap=us fetch=${live_endpoint}{{ endpoints.redorescue.path }}filesystem.squashfs
       initrd=initrd
     name: RedoRescue
     type: direct

roles/netbootxyz/files/ipxe/local/general.h

@@ -9,6 +9,7 @@
 #define NSLOOKUP_CMD          /* DNS resolving command */
 #define NTP_CMD               /* NTP commands */
 #define PCI_CMD               /* PCI commands */
+#define PING_CMD              /* Ping command */
 #define REBOOT_CMD            /* Reboot command */
 #define TIME_CMD              /* Time commands */
 #define VLAN_CMD              /* VLAN commands */

roles/netbootxyz/files/ipxe/local/general.h.efi

@@ -8,6 +8,7 @@
 #define NSLOOKUP_CMD          /* DNS resolving command */
 #define NTP_CMD               /* NTP commands */
 #define PCI_CMD               /* PCI commands */
+#define PING_CMD              /* Ping command */
 #define REBOOT_CMD            /* Reboot command */
 #define TIME_CMD              /* Time commands */
 #define VLAN_CMD              /* VLAN commands */

roles/netbootxyz/templates/index.html.j2

@@ -96,7 +96,7 @@ exit
 {% endif %}
 
 {% if generate_disks_arm == true %}
-  <p>ARM64 iPXE Bootloaders - Experimental</p>
+  <p>ARM64 iPXE Bootloaders</p>
 
   <table style="width:100%">
     <!-- table header -->
@@ -117,7 +117,7 @@ exit
 {% endif %}
 
 {% if generate_disks_rpi == true %}
-  <p>Raspberry Pi iPXE Bootloaders - Experimental</p>
+  <p>Raspberry Pi iPXE Bootloaders</p>
 
   <table style="width:100%">
     <!-- table header -->

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

@@ -27,7 +27,7 @@ goto boot
 
 :boot
 imgfree
-kernel ${url}vmlinuz root=/dev/ram0 vga=normal initrd=initrd ${cmdline}
+kernel ${url}vmlinuz root=/dev/ram0 vga=normal {{ kernel_params }} 
 initrd ${url}initrd
 boot
 

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

@@ -59,7 +59,7 @@ goto boottype
 
 :bootos_images
 imgfree
-kernel ${almalinux_mirror}/${dir}/images/pxeboot/vmlinuz inst.repo=${repo} ${params} ${ipparam} initrd=initrd.img ${cmdline}
+kernel ${almalinux_mirror}/${dir}/images/pxeboot/vmlinuz inst.repo=${repo} ${params} ${ipparam} {{ kernel_params }}
 initrd ${almalinux_mirror}/${dir}/images/pxeboot/initrd.img
 echo
 echo MD5sums:

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

@@ -24,7 +24,7 @@ set base-url ${alpinelinux_mirror}
 set dir ${alpinelinux_base_dir}/${alpine_version}/releases/${bootarch}/netboot
 set repo-url ${alpinelinux_mirror}/${alpinelinux_base_dir}/${alpine_version}/main
 imgfree
-kernel ${base-url}/${dir}/vmlinuz-lts ${ipparam} alpine_repo=${repo-url} modules=loop,squashfs modloop=${base-url}/${dir}/modloop-lts quiet nomodeset ${cmdline}
+kernel ${base-url}/${dir}/vmlinuz-lts ${ipparam} alpine_repo=${repo-url} modules=loop,squashfs modloop=${base-url}/${dir}/modloop-lts quiet nomodeset {{ kernel_params }}
 initrd ${base-url}/${dir}/initramfs-lts
 echo
 echo MD5sums:

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

@@ -18,7 +18,7 @@ goto anarchy_boot
 :anarchy_boot
 imgfree
 set url ${live_endpoint}{{ endpoints.anarchy.path }}
-kernel ${url}vmlinuz archisobasedir=arch ${ipparam} archiso_http_srv=${url} initrd=initrd ${cmdline}
+kernel ${url}vmlinuz archisobasedir=arch ${ipparam} archiso_http_srv=${url} {{ kernel_params }}
 initrd ${url}initrd
 boot
 goto anarchy_exit

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

@@ -33,7 +33,7 @@ goto boot
 imgfree
 set dir ${archlinux_base_dir}/iso/${arch_version}/arch/boot
 set params initrd=initramfs-linux.img archiso_http_srv=http://${real_archlinux_mirror}/${archlinux_base_dir}/iso/${arch_version}/ archisobasedir=arch verify=y ${ipparam} net.ifnames=0 ${cmdline}
-kernel http://${archlinux_mirror}/${dir}/x86_64/vmlinuz-linux ${params} initrd=initramfs-linux.img
+kernel http://${archlinux_mirror}/${dir}/x86_64/vmlinuz-linux ${params} {{ kernel_params }}
 initrd http://${archlinux_mirror}/${dir}/x86_64/initramfs-linux.img
 echo
 echo MD5sums:

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

@@ -20,7 +20,7 @@ goto blackarch_boot
 :blackarch_boot
 imgfree
 set url ${live_endpoint}{{ endpoints['blackarch-installer'].path }}
-kernel ${url}vmlinuz archisobasedir=blackarch ${ipparam} archiso_http_srv=${url} initrd=initrd ${cmdline}
+kernel ${url}vmlinuz archisobasedir=blackarch ${ipparam} archiso_http_srv=${url} {{ kernel_params }}
 initrd ${url}initrd
 boot
 goto blackarch_exit

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

@@ -60,7 +60,7 @@ goto boottype
 
 :bootos_images
 imgfree
-kernel ${centos_mirror}/${dir}/images/pxeboot/vmlinuz inst.repo=${repo} ${params} ${ipparam} initrd=initrd.img ${cmdline} 
+kernel ${centos_mirror}/${dir}/images/pxeboot/vmlinuz inst.repo=${repo} ${params} ${ipparam} {{ kernel_params }}
 initrd ${centos_mirror}/${dir}/images/pxeboot/initrd.img
 echo
 echo MD5sums:

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

@@ -35,7 +35,7 @@ goto clonezilla-boot
 :clonezilla-boot
 imgfree
 set url ${live_endpoint}${path}
-kernel ${url}vmlinuz boot=live username=user union=overlay config components noswap edd=on nomodeset ocs_live_run="ocs-live-general" ocs_live_batch=no net.ifnames=0 nosplash noprompt fetch=${url}filesystem.squashfs initrd=initrd ${cmdline}
+kernel ${url}vmlinuz boot=live username=user union=overlay config components noswap edd=on nomodeset ocs_live_run="ocs-live-general" ocs_live_batch=no net.ifnames=0 nosplash noprompt fetch=${url}filesystem.squashfs {{ kernel_params }}
 initrd ${url}initrd
 boot
 

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

@@ -31,7 +31,7 @@ iseq ${core_version} {{ item.code_name }} && set coreos_channel {{ item.name }}
 set base_url ${coreos_mirror}/${coreos_base_dir}/${coreos_channel}/builds
 set build_version ${core_version}
 imgfree
-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} coreos.live.rootfs_url=${base_url}/${build_version}/x86_64/fedora-coreos-${build_version}-live-rootfs.x86_64.img initrd=fedora-coreos-${build_version}-live-initramfs.x86_64.img ${cmdline}
+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} coreos.live.rootfs_url=${base_url}/${build_version}/x86_64/fedora-coreos-${build_version}-live-rootfs.x86_64.img {{ kernel_params }}
 initrd ${base_url}/${build_version}/x86_64/fedora-coreos-${build_version}-live-initramfs.x86_64.img
 boot
 goto coreos_exit

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

@@ -77,7 +77,7 @@ goto deb_boot
 :deb_boot
 imgfree
 echo Boot parameters: ${install_params} -- quiet ${params}
-kernel ${debian_mirror}/${dir}/linux ${install_params} ${netcfg} ${mirrorcfg} -- quiet ${params} initrd=initrd.gz ${cmdline}
+kernel ${debian_mirror}/${dir}/linux ${install_params} ${netcfg} ${mirrorcfg} -- quiet ${params} {{ kernel_params }}
 initrd ${debian_mirror}/${dir}/initrd.gz
 echo
 echo MD5sums:

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

@@ -64,7 +64,7 @@ goto devuan_boot
 :devuan_boot
 imgfree
 echo Boot parameters: ${install_params} -- quiet ${params}
-kernel ${devuan_mirror}/${dir}/linux ${install_params} ${mirrorcfg} -- quiet ${params} initrd=initrd.gz ${cmdline}
+kernel ${devuan_mirror}/${dir}/linux ${install_params} ${mirrorcfg} -- quiet ${params} {{ kernel_params }}
 initrd ${devuan_mirror}/${dir}/initrd.gz
 echo
 echo MD5sums:

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

@@ -27,7 +27,7 @@ goto boot
 
 :boot
 imgfree
-kernel ${url}vmlinuz archisobasedir=arch ${ipparam} archiso_http_srv=${url} initrd=initrd ${cmdline}
+kernel ${url}vmlinuz archisobasedir=arch ${ipparam} archiso_http_srv=${url} {{ kernel_params }}
 initrd ${url}initrd
 boot
 

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

@@ -61,7 +61,7 @@ goto boot
 
 :boot
 imgfree
-kernel ${fedora_mirror}/${dir}/images/pxeboot/vmlinuz inst.repo=${fedora_mirror}/${dir} ${params} ${ipparam} initrd=initrd.img ${cmdline}
+kernel ${fedora_mirror}/${dir}/images/pxeboot/vmlinuz inst.repo=${fedora_mirror}/${dir} ${params} ${ipparam} {{ kernel_params }}
 initrd ${fedora_mirror}/${dir}/images/pxeboot/initrd.img
 echo
 echo MD5sums:

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

@@ -28,7 +28,7 @@ goto flatcar_exit
 :edge
 set release ${menu}
 set base-url http://${release}.release.flatcar-linux.net/amd64-usr/current
-kernel ${base-url}/flatcar_production_pxe.vmlinuz ${flatcar_firstboot} ${flatcar_params} flatcar.autologin=tty1 flatcar.autologin=ttyS0 initrd=flatcar_production_pxe_image.cpio.gz ${cmdline}
+kernel ${base-url}/flatcar_production_pxe.vmlinuz ${flatcar_firstboot} ${flatcar_params} flatcar.autologin=tty1 flatcar.autologin=ttyS0 {{ kernel_params }}
 initrd ${base-url}/flatcar_production_pxe_image.cpio.gz
 boot
 goto flatcar_exit

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

@@ -29,7 +29,7 @@ goto boot
 
 :boot
 imgfree
-kernel ${url}vmlinuz ip=dhcp root=/dev/ram0 init=/linuxrc loop=/image.squashfs looptype=squashfs cdroot=1 real_root=/ fetch=${url}image.squashfs initrd=initrd ${cmdline}
+kernel ${url}vmlinuz ip=dhcp root=/dev/ram0 init=/linuxrc loop=/image.squashfs looptype=squashfs cdroot=1 real_root=/ fetch=${url}image.squashfs {{ kernel_params }}
 initrd ${url}initrd
 boot
 

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

@@ -28,7 +28,7 @@ goto boot
 
 :boot
 imgfree
-kernel ${kernel_url}vmlinuz boot=live fetch=${squash_url} union=overlay username=user vga=788 initrd=initrd ${cmdline}
+kernel ${kernel_url}vmlinuz boot=live fetch=${squash_url} union=overlay username=user vga=788 {{ kernel_params }}
 initrd ${kernel_url}initrd
 boot
 

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

@@ -28,7 +28,7 @@ goto boot
 
 :boot
 imgfree
-kernel ${kernel_url}vmlinuz boot=live fetch=${squash_url} initrd=initrd ${cmdline}
+kernel ${kernel_url}vmlinuz boot=live fetch=${squash_url} {{ kernel_params }}
 initrd ${kernel_url}initrd
 boot
 

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

@@ -19,7 +19,7 @@ goto ipfire_images
 
 :ipfire_images
 imgfree
-kernel ${ipfire_mirror}/${dir}/vmlinuz vga=791 initrd=instroot ${cmdline}
+kernel ${ipfire_mirror}/${dir}/vmlinuz vga=791 {{ kernel_params }}
 initrd ${ipfire_mirror}/${dir}/instroot
 echo
 echo MD5sums:

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

@@ -67,7 +67,7 @@ isset ${k3os_base_url} || set k3os_base_url ${k3os_mirror}/latest/download
 set install_params k3os.install.silent=true k3os.mode=install k3os.install.config_url=${k3os_config_url} k3os.install.device=${k3os_install_device}
 set boot_params printk.devkmsg=on k3os.install.iso_url=${k3os_base_url}/k3os-${arch_a}.iso console=ttyS0 console=tty1
 imgfree
-kernel ${k3os_base_url}/k3os-vmlinuz-${arch_a} ${install_params} ${boot_params} initrd=k3os-initrd-${arch_a} ${cmdline}
+kernel ${k3os_base_url}/k3os-vmlinuz-${arch_a} ${install_params} ${boot_params} {{ kernel_params }}
 initrd ${k3os_base_url}/k3os-initrd-${arch_a}
 echo
 echo MD5sums:

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

@@ -28,7 +28,7 @@ goto deb_boot
 
 :deb_boot
 imgfree
-kernel ${kali_mirror}/${dir}/linux vga=788 -- quiet initrd=initrd.gz ${cmdline}
+kernel ${kali_mirror}/${dir}/linux vga=788 -- quiet {{ kernel_params }}
 initrd ${kali_mirror}/${dir}/initrd.gz
 echo
 echo MD5sums:

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

@@ -27,7 +27,7 @@ goto boot
 
 :boot
 imgfree
-kernel ${url}vmlinuz netboot=${url} loadsrm=000-core.srm,001-xorg.srm,002-xfce.srm,003-kl.srm,004-krt.srm,005-bases.srm,008-firefox.srm net.ifnames=0 dodhcp dostartx initrd=initrd.xz initrd=initrd ${cmdline}
+kernel ${url}vmlinuz netboot=${url} loadsrm=000-core.srm,001-xorg.srm,002-xfce.srm,003-kl.srm,004-krt.srm,005-bases.srm,008-firefox.srm net.ifnames=0 dodhcp dostartx {{ kernel_params }}
 initrd ${url}initrd.xz
 initrd ${url}initrd
 boot

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

@@ -28,13 +28,13 @@ goto {{ value.version }}-boot
 
 :6-boot
 imgfree
-kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=http fetch=${squash_url} initrd=initrd ${cmdline}
+kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=http fetch=${squash_url} {{ kernel_params }}
 initrd ${kernel_url}initrd
 boot
 
 :7-boot
 imgfree
-kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=url url=${squash_url} initrd=initrd ${cmdline}
+kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=url url=${squash_url} {{ kernel_params }}
 initrd ${kernel_url}initrd
 boot
 

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

@@ -28,7 +28,7 @@ goto boot
 
 :boot
 imgfree
-kernel ${url}vmlinuz archisobasedir=arch ${ipparam} 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 ${cmdline}
+kernel ${url}vmlinuz archisobasedir=arch ${ipparam} archiso_http_srv=${url} cow_spacesize=30% cow_label=BSLX_PERSIST ipv6.disable=1 disablehooks=v86d,915resolution,gma3600 modprobe.blacklist=uvesafb console=tty1 {{ kernel_params }}
 initrd ${url}initrd
 boot
 

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

@@ -20,7 +20,6 @@ item {{ value.version }}-{{ value.flavor }} ${space} ${os} {{ value.version }} {
 choose live_version || goto live_exit
 goto ${live_version}
 
-
 {% for key, value in endpoints.items() | sort %}
 {% if value.os == "bodhi" %}
 :{{ value.version }}-{{ value.flavor }}
@@ -33,13 +32,13 @@ goto boot-{{ value.version }}
 
 :boot-5
 imgfree
-kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=http fetch=${squash_url} initrd=initrd ${cmdline}
+kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=http fetch=${squash_url} {{ kernel_params }}
 initrd ${kernel_url}initrd
 boot
 
 :boot-6
 imgfree
-kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=url url=${squash_url} initrd=initrd ${cmdline}
+kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=url url=${squash_url} {{ kernel_params }}
 initrd ${kernel_url}initrd
 boot
 

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

@@ -50,7 +50,7 @@ goto boot
 
 :boot
 imgfree
-kernel ${kernel_url}vmlinuz boot=live fetch=${squash_url} initrd=initrd ${cmdline}
+kernel ${kernel_url}vmlinuz boot=live fetch=${squash_url} {{ kernel_params }}
 initrd ${kernel_url}initrd
 boot
 

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

@@ -27,7 +27,7 @@ goto boot
 
 :boot
 imgfree
-kernel ${kernel_url}vmlinuz boot=live fetch=${squash_url} union=overlay initrd=initrd ${cmdline}
+kernel ${kernel_url}vmlinuz boot=live fetch=${squash_url} union=overlay {{ kernel_params }}
 initrd ${kernel_url}initrd
 boot
 

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

@@ -28,7 +28,7 @@ goto boot
 
 :boot
 imgfree
-kernel ${kernel_url}vmlinuz boot=live username=devuan fetch=${squash_url} initrd=initrd ${cmdline}
+kernel ${kernel_url}vmlinuz boot=live username=devuan fetch=${squash_url} {{ kernel_params }}
 initrd ${kernel_url}initrd
 boot
 

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

@@ -27,7 +27,7 @@ goto boot
 
 :boot
 imgfree
-kernel ${kernel_url}vmlinuz ip=dhcp boot=casper maybe-ubiquity netboot=http fetch=${squash_url} initrd=initrd ${cmdline}
+kernel ${kernel_url}vmlinuz ip=dhcp boot=casper maybe-ubiquity netboot=http fetch=${squash_url} {{ kernel_params }}
 initrd ${kernel_url}initrd
 boot
 

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

@@ -27,10 +27,10 @@ goto boot
 
 :boot
 imgfree
-kernel ${url}vmlinuz ${ipparam} archiso_http_srv=${url} initrd=initrd archisobasedir=arch cow_spacesize=10G earlymodules=loop modules-load=loop rd.modules-load=loop nvidia nouveau.modeset=0 nouveau.blacklist=yes modprobe.blacklist=nouveau i915.modeset=1 radeon.modeset=1 ${cmdline}
+kernel ${url}vmlinuz ${ipparam} archiso_http_srv=${url} archisobasedir=arch cow_spacesize=10G earlymodules=loop modules-load=loop rd.modules-load=loop nvidia nouveau.modeset=0 nouveau.blacklist=yes modprobe.blacklist=nouveau i915.modeset=1 radeon.modeset=1 {{ kernel_params }}
 initrd ${url}initrd
 boot
 
 :live_exit
 clear menu
-exit 0
+exit 0

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

@@ -27,7 +27,7 @@ goto boot
 
 :boot
 imgfree
-kernel ${url}vmlinuz rootfstype=ramfs initrd=initrd ${cmdline}
+kernel ${url}vmlinuz rootfstype=ramfs {{ kernel_params }}
 initrd ${url}initrd
 boot
 

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

@@ -44,7 +44,7 @@ goto boot
 
 :boot
 imgfree
-kernel ${live_url}vmlinuz ${ipparam} root=live:${live_url}squashfs.img ro rd.live.image rd.lvm=0 rd.luks=0 rd.md=0 rd.dm=0 initrd=initrd ${cmdline}
+kernel ${live_url}vmlinuz ${ipparam} root=live:${live_url}squashfs.img ro rd.live.image rd.lvm=0 rd.luks=0 rd.md=0 rd.dm=0 {{ kernel_params }}
 initrd ${live_url}initrd
 boot
 

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

@@ -26,7 +26,7 @@ goto feren-boot
 imgfree
 set squash_url ${live_endpoint}${path}filesystem.squashfs
 set kernel_url ${live_endpoint}${path}
-kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=http fetch=${squash_url} initrd=initrd ${cmdline}
+kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=http fetch=${squash_url} {{ kernel_params }}
 initrd ${kernel_url}initrd
 boot
 

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

@@ -51,7 +51,7 @@ isset ${k3os_base_url} || set k3os_base_url ${k3os_mirror}/latest/download
 set install_params k3os.mode=live
 set boot_params printk.devkmsg=on console=ttyS0 console=tty1
 imgfree
-kernel ${k3os_base_url}/k3os-vmlinuz-${arch_a} ${install_params} ${boot_params} initrd=k3os-initrd-${arch_a} ${cmdline}
+kernel ${k3os_base_url}/k3os-vmlinuz-${arch_a} ${install_params} ${boot_params} {{ kernel_params }}
 initrd ${k3os_base_url}/k3os-initrd-${arch_a}
 boot
 

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

@@ -38,7 +38,7 @@ goto boot
 
 :boot
 imgfree
-kernel ${kernel_url}vmlinuz boot=live ${params} fetch=${squash_url} initrd=initrd ${cmdline}
+kernel ${kernel_url}vmlinuz boot=live ${params} fetch=${squash_url} {{ kernel_params }}
 initrd ${kernel_url}initrd
 boot
 

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

@@ -28,7 +28,7 @@ goto boot
 
 :boot
 imgfree
-kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=http fetch=${squash_url} initrd=initrd ${cmdline}
+kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=http fetch=${squash_url} {{ kernel_params }}
 initrd ${kernel_url}initrd
 boot
 

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

@@ -25,12 +25,12 @@ goto boot-5
 
 :boot-4
 imgfree
-kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=http fetch=${squash_url} username=linuxlite userfullname=linuxlite initrd=initrd ${cmdline}
+kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=http fetch=${squash_url} username=linuxlite userfullname=linuxlite {{ kernel_params }}
 initrd ${kernel_url}initrd
 boot
 
 :boot-5
-kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=url url=${squash_url} username=linuxlite userfullname=linuxlite initrd=initrd ${cmdline}
+kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=url url=${squash_url} username=linuxlite userfullname=linuxlite {{ kernel_params }}
 initrd ${kernel_url}initrd
 boot
 

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

@@ -28,7 +28,7 @@ goto boot
 
 :boot
 imgfree
-kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=http fetch=${squash_url} initrd=initrd ${cmdline}
+kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=http fetch=${squash_url} {{ kernel_params }}
 initrd ${kernel_url}initrd
 boot
 

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

@@ -59,7 +59,7 @@ goto boot
 
 :boot
 imgfree
-kernel ${kernel_url}vmlinuz misobasedir=manjaro ${ipparam} miso_http_srv=${fetch_url} nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 driver=free tz=UTC lang=en_US keytable=us initrd=initrd ${cmdline}
+kernel ${kernel_url}vmlinuz misobasedir=manjaro ${ipparam} miso_http_srv=${fetch_url} nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 driver=free tz=UTC lang=en_US keytable=us {{ kernel_params }}
 initrd ${kernel_url}initrd
 boot
 

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

@@ -60,19 +60,19 @@ goto {{ value.version }}-boot
 
 :20-boot
 imgfree
-kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=url url=${squash_url} initrd=initrd ${cmdline}
+kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=url url=${squash_url} {{ kernel_params }}
 initrd ${kernel_url}initrd
 boot
 
 :19-boot
 imgfree
-kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=http fetch=${squash_url} initrd=initrd ${cmdline}
+kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=http fetch=${squash_url} {{ kernel_params }}
 initrd ${kernel_url}initrd
 boot
 
 :lmde-boot
 imgfree
-kernel ${kernel_url}vmlinuz boot=live fetch=${squash_url} initrd=initrd ${cmdline} 
+kernel ${kernel_url}vmlinuz boot=live fetch=${squash_url} {{ kernel_params }}
 initrd ${kernel_url}initrd
 boot
 

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

@@ -18,7 +18,7 @@ goto user-boot
 
 :user-boot
 imgfree
-kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=url url=${squash_url} initrd=initrd.lz ${cmdline}
+kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=url url=${squash_url} {{ kernel_params }}
 initrd ${kernel_url}initrd.lz
 boot
 

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

@@ -28,7 +28,7 @@ goto boot
 
 :boot
 imgfree
-kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=http fetch=${squash_url} initrd=initrd ${cmdline}
+kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=http fetch=${squash_url} {{ kernel_params }}
 initrd ${kernel_url}initrd
 boot
 

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

@@ -28,7 +28,7 @@ goto boot
 
 :boot
 imgfree
-kernel ${kernel_url}vmlinuz boot=live fetch=${squash_url} initrd=initrd ${cmdline}
+kernel ${kernel_url}vmlinuz boot=live fetch=${squash_url} {{ kernel_params }}
 initrd ${kernel_url}initrd
 boot
 

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

@@ -27,7 +27,7 @@ goto {{ value.version }}-boot
 
 :10-boot
 imgfree
-kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=http fetch=${squash_url} initrd=initrd ${cmdline}
+kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=http fetch=${squash_url} {{ kernel_params }}
 initrd ${kernel_url}initrd
 boot
 

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

@@ -60,14 +60,14 @@ goto {{ value.version }}-boot
 
 :18.04-boot
 imgfree
-kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=http fetch=${squash_url} initrd=initrd ${cmdline}
+kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=http fetch=${squash_url} {{ kernel_params }}
 initrd ${kernel_url}initrd
 boot
 
 :20.04-boot
 :20.10-boot
 imgfree
-kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=url url=${squash_url} initrd=initrd ${cmdline}
+kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=url url=${squash_url} {{ kernel_params }}
 initrd ${kernel_url}initrd
 boot
 

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

@@ -42,7 +42,7 @@ goto q4os-boot
 
 :q4os-boot
 imgfree
-kernel ${kernel_url}vmlinuz boot=live fetch=${squash_url} initrd=initrd ${cmdline}
+kernel ${kernel_url}vmlinuz boot=live fetch=${squash_url} {{ kernel_params }}
 initrd ${kernel_url}initrd
 boot
 

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

@@ -28,7 +28,7 @@ goto boot
 
 :boot
 imgfree
-kernel ${kernel_url}vmlinuz boot=live fetch=${squash_url} initrd=initrd ${cmdline}
+kernel ${kernel_url}vmlinuz boot=live fetch=${squash_url} {{ kernel_params }}
 initrd ${kernel_url}initrd
 boot
 

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

@@ -18,7 +18,7 @@ goto current-boot
 
 :current-boot
 imgfree
-kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=http fetch=${squash_url} initrd=initrd ${cmdline}
+kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=http fetch=${squash_url} {{ kernel_params }}
 initrd ${kernel_url}initrd
 boot
 

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

@@ -28,7 +28,7 @@ goto boot
 
 :boot
 imgfree
-kernel ${kernel_url}vmlinuz boot=live fetch=${squash_url} initrd=initrd ${cmdline}
+kernel ${kernel_url}vmlinuz boot=live fetch=${squash_url} {{ kernel_params }}
 initrd ${kernel_url}initrd
 boot
 

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

@@ -47,7 +47,7 @@ goto boot
 
 :boot
 imgfree
-kernel ${kernel_url}vmlinuz boot=live fetch=${squash_url} initrd=initrd ${cmdline}
+kernel ${kernel_url}vmlinuz boot=live fetch=${squash_url} {{ kernel_params }}
 initrd ${kernel_url}initrd
 boot
 

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

@@ -69,7 +69,7 @@ goto {{ value.version }}-boot
 
 :18.04-boot
 imgfree
-kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=http fetch=${squash_url} initrd=initrd ${cmdline}
+kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=http fetch=${squash_url} {{ kernel_params }}
 initrd ${kernel_url}initrd
 boot
 
@@ -77,7 +77,7 @@ boot
 :20.10-boot
 :21.04-boot
 imgfree
-kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=url url=${squash_url} initrd=initrd ${cmdline}
+kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=url url=${squash_url} {{ kernel_params }}
 initrd ${kernel_url}initrd
 boot
 

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

@@ -18,7 +18,7 @@ goto ${live_version}
 set squash_url ${live_endpoint}{{ endpoints["voyager-focal-squash"].path }}filesystem.squashfs
 set kernel_url ${live_endpoint}{{ endpoints["voyager-focal-squash"].path }}
 imgfree
-kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=url url=${squash_url} initrd=initrd ${cmdline}
+kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=url url=${squash_url} {{ kernel_params }}
 initrd ${kernel_url}initrd
 boot
 
@@ -26,7 +26,7 @@ boot
 set squash_url ${live_endpoint}{{ endpoints["voyager-bionic-squash"].path }}filesystem.squashfs
 set kernel_url ${live_endpoint}{{ endpoints["voyager-bionic-squash"].path }}
 imgfree
-kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=http fetch=${squash_url} initrd=initrd ${cmdline}
+kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=http fetch=${squash_url} {{ kernel_params }}
 initrd ${kernel_url}initrd
 boot
 
@@ -34,7 +34,7 @@ boot
 set squash_url ${live_endpoint}{{ endpoints["voyager-buster-squash"].path }}filesystem.squashfs
 set kernel_url ${live_endpoint}{{ endpoints["voyager-buster-squash"].path }}
 imgfree
-kernel ${kernel_url}vmlinuz boot=live fetch=${squash_url} initrd=initrd ${cmdline}
+kernel ${kernel_url}vmlinuz boot=live fetch=${squash_url} {{ kernel_params }}
 initrd ${kernel_url}initrd
 boot
 
@@ -42,7 +42,7 @@ boot
 set squash_url ${live_endpoint}{{ endpoints["voyager-eoan-squash"].path }}filesystem.squashfs
 set kernel_url ${live_endpoint}{{ endpoints["voyager-eoan-squash"].path }}
 imgfree
-kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=url url=${squash_url} initrd=initrd ${cmdline}
+kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=url url=${squash_url} {{ kernel_params }}
 initrd ${kernel_url}initrd
 boot
 

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

@@ -42,7 +42,7 @@ goto {{ value.version }}-boot
 
 :15-boot
 imgfree
-kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=http fetch=${squash_url} initrd=initrd ${cmdline}
+kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=http fetch=${squash_url} {{ kernel_params }}
 initrd ${kernel_url}initrd
 boot
 

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

@@ -22,9 +22,8 @@ set dir ${mageia_base_dir}/distrib/${version}/x86_64 && set dir2 isolinux/x86_64
 iseq ${arch} i386 && set dir ${mageia_base_dir}/distrib/${version}/i586 && set dir2 isolinux/i386 ||
 set automatic method:http,network:${network},server:${mageia_mirror},directory:/${dir}
 imgfree
-kernel ${mageia_mirror}/${dir}/${dir2}/vmlinuz
+kernel ${mageia_mirror}/${dir}/${dir2}/vmlinuz automatic=${automatic} vga=788 splash=silent {{ kernel_params }}
 initrd ${mageia_mirror}/${dir}/${dir2}/all.rdz
-imgargs vmlinuz automatic=${automatic} vga=788 splash=silent initrd=all.rdz ${cmdline}
 echo
 echo MD5sums:
 md5sum vmlinuz all.rdz

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

@@ -6,20 +6,13 @@
 set os {{ releases.nixos.name }}
 menu ${os}
 item --gap Official Releases
-{% for key, value in endpoints.items() | sort %}
-{% if value.os == "nixos" %}
-item {{ value.version }} ${space} ${os} {{ value.version }}
-{% endif %}
+{% for item in releases.nixos.versions %}
+item {{ item.code_name }} ${space} ${os} {{ item.name }}
 {% endfor %}
 choose version || goto nixos_exit
 
-{% for key, value in endpoints.items() | sort %}
-{% if value.os == "nixos" %}
-iseq ${version} {{ value.version }} && set link ${live_endpoint}{{ value.path }}netboot.ipxe ||
-{% endif %}
-{% endfor %}
 imgfree
-chain ${link}
+chain https://github.com/nix-community/nixos-images/releases/download/${version}/netboot-x86_64-linux.ipxe
 goto nixos_exit
 
 :nixos_exit

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

@@ -0,0 +1,72 @@
+#!ipxe
+
+# openEuler
+# https://openeuler.org/
+
+isset ${dhcp-server} && set ipparam ip=dhcp || set ipparam ip=${ip}::${gateway}:${netmask}:::none nameserver=${dns}
+set ipparam BOOTIF=${netX/mac} ${ipparam}
+
+goto ${menu} ||
+
+:openEuler
+clear osversion
+set os {{ releases.openEuler.name }}
+menu ${os} - ${arch}
+{% for item in releases.openEuler.versions %}
+item {{ item.code_name }} ${space} ${os} {{ item.name }}
+{% endfor %}
+isset ${osversion} || choose osversion || goto linux_menu
+echo ${cls}
+set dir ${osversion}/OS/${arch}
+set repo ${openEuler_mirror}/${dir}
+goto boottype
+
+:boottype
+set ova ${os} ${osversion}
+menu ${os} ${arch} boot type
+item graphical ${ova} graphical installer
+item text ${ova} text based installer
+item rescue ${ova} rescue
+item kickstart ${ova} set kickstart url [ ${ksurl} ]
+item kickstart_device ${ova} set ksdevice [ ${ksdevice} ]
+isset ${bt} || choose bt || goto openEuler
+echo ${cls}
+iseq ${bt} text && goto text ||
+iseq ${bt} rescue && goto rescue ||
+iseq ${bt} kickstart && goto kickstart ||
+iseq ${bt} kickstart_device && goto kickstart_device ||
+goto bootos_images
+
+:text
+set params text ||
+goto bootos_images
+
+:rescue
+set params rescue ||
+goto bootos_images
+
+:kickstart
+echo -n Specify kickstart URL for ${os} ${osversion}: && read ksurl
+set params inst.ks=${ksurl} ||
+clear bt
+goto boottype
+
+:kickstart_device
+echo -n Specify ksdevice param for ${os} ${osversion}: && read ksdevice
+set ksdevice ${ksdevice} ||
+clear bt
+goto boottype
+
+:bootos_images
+imgfree
+kernel ${openEuler_mirror}/${dir}/images/pxeboot/vmlinuz inst.repo=${repo} ${params} ${ipparam} {{ kernel_params }}
+initrd ${openEuler_mirror}/${dir}/images/pxeboot/initrd.img
+echo
+echo MD5sums:
+md5sum vmlinuz initrd.img
+boot
+goto linux_menu
+
+:linux_menu
+clear menu
+exit 0

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

@@ -66,10 +66,8 @@ set dir ${opensuse_base_dir}/${version}/repo/oss
 iseq ${version} tumbleweed && set dir ${version}/repo/oss ||
 
 imgfree
-kernel ${opensuse_mirror}/${dir}/boot/x86_64/loader/linux
+kernel ${opensuse_mirror}/${dir}/boot/x86_64/loader/linux ${netsetup} install=${opensuse_mirror}/${dir} ${params} {{ kernel_params }}
 initrd ${opensuse_mirror}/${dir}/boot/x86_64/loader/initrd
-imgargs linux ${netsetup} install=${opensuse_mirror}/${dir} ${params} initrd=initrd ${cmdline}
-echo
 echo MD5sums:
 md5sum linux initrd
 boot

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

@@ -31,7 +31,7 @@ goto boot
 
 :boot
 imgfree
-kernel ${url}vmlinuz ${ipparam} inst.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 ${cmdline}
+kernel ${url}vmlinuz ${ipparam} inst.repo=${repo} root=live:${url}squashfs.img ro rd.live.image rd.lvm=0 rd.luks=0 rd.md=0 rd.dm=0 {{ kernel_params }}
 initrd ${url}initrd
 boot
 

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

@@ -20,7 +20,7 @@ goto boot
 
 :boot
 imgfree
-kernel ${url}/${folder}/vmlinuz rancher.autologin=tty1 initrd=initrd ${cmdline}
+kernel ${url}/${folder}/vmlinuz rancher.autologin=tty1 {{ kernel_params }}
 initrd ${url}/${folder}/initrd
 boot
 

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

@@ -19,7 +19,7 @@ goto ${rescuezilla_version}
 :{{ value.os }}_{{ value.version }}
 set kernel_url ${live_endpoint}{{ value.path }}
 imgfree
-kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=url url=${kernel_url}filesystem.squashfs initrd=initrd ${cmdline}
+kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=url url=${kernel_url}filesystem.squashfs {{ kernel_params }}
 initrd ${kernel_url}initrd
 boot
 {% endif %}

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

@@ -49,7 +49,7 @@ goto boot
 
 :boot
 imgfree
-kernel ${rhel_base_url}/os/${rhel_arch}/images/pxeboot/vmlinuz inst.repo=${rhel_base_url}/os/${rhel_arch} ${ipparam} ${params} initrd=initrd.img ${cmdline}
+kernel ${rhel_base_url}/os/${rhel_arch}/images/pxeboot/vmlinuz inst.repo=${rhel_base_url}/os/${rhel_arch} ${ipparam} ${params} {{ kernel_params }}
 initrd ${rhel_base_url}/os/${rhel_arch}/images/pxeboot/initrd.img
 md5sum vmlinuz initrd.img
 boot

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

@@ -59,7 +59,7 @@ goto boottype
 
 :bootos_images
 imgfree
-kernel ${rockylinux_mirror}/${dir}/images/pxeboot/vmlinuz inst.repo=${repo} ${params} ${ipparam} initrd=initrd.img ${cmdline}
+kernel ${rockylinux_mirror}/${dir}/images/pxeboot/vmlinuz inst.repo=${repo} ${params} ${ipparam} {{ kernel_params }}
 initrd ${rockylinux_mirror}/${dir}/images/pxeboot/initrd.img
 echo
 echo MD5sums:

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

@@ -49,7 +49,7 @@ goto bootos_images
 
 :bootos_images
 imgfree
-kernel ${scientific_mirror}/${dir}/images/pxeboot/vmlinuz repo=${repo} ${params} ${ipparam} ${cmdline}
+kernel ${scientific_mirror}/${dir}/images/pxeboot/vmlinuz repo=${repo} ${params} ${ipparam} {{ kernel_params }}
 initrd ${scientific_mirror}/${dir}/images/pxeboot/initrd.img
 boot
 goto linux_menu

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

@@ -27,7 +27,7 @@ goto boot
 
 :boot
 imgfree
-kernel ${url}vmlinuz archisobasedir=sysresccd ${ipparam} archiso_http_srv=${url} initrd=initrd ${cmdline}
+kernel ${url}vmlinuz archisobasedir=sysresccd ${ipparam} archiso_http_srv=${url} {{ kernel_params }}
 initrd ${url}initrd
 boot
 

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

@@ -67,7 +67,7 @@ goto talos
 :talos_boot
 isset ${talos_base_url} || set talos_base_url ${talos_mirror}/latest/download
 isset ${talos_config_url} && set talos_config talos.config=${talos_config_url} ||
-set boot_params initrd=initramfs.xz page_poison=1 printk.devkmsg=on slab_nomerge slub_debug=P pti=on talos.platform=${talos_platform} ${talos_config} ${cmdline}
+set boot_params page_poison=1 printk.devkmsg=on slab_nomerge slub_debug=P pti=on talos.platform=${talos_platform} ${talos_config} {{ kernel_params }}
 imgfree
 kernel ${talos_base_url}/vmlinuz ${boot_params}
 initrd ${talos_base_url}/initramfs.xz

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

@@ -40,13 +40,12 @@ goto ${version}
 :{{ item.code_name }}
 set kernel_url ${tinycore_mirror}{{ item.kernel }}
 set initrd_url ${tinycore_mirror}{{ item.initrd }}
-set initrd_name {{ item.initrd | basename }}
 goto boot
 {% endfor %}
 
 :boot
 imgfree
-kernel ${kernel_url} loglevel=3 initrd=${initrd_name} ${cmdline}
+kernel ${kernel_url} loglevel=3 {{ kernel_params }}
 initrd ${initrd_url}
 boot
 

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

@@ -74,7 +74,7 @@ iseq ${install_type} sub && goto ${ubuntu_version} ||
 echo Loading Ubuntu PXE netboot installer
 set dir ${dir}${menu}-installer/${arch_a}
 imgfree
-kernel ${ubuntu_mirror}/${dir}/linux ${install_params} ${mirrorcfg} -- quiet initrd=initrd.gz ${cmdline}
+kernel ${ubuntu_mirror}/${dir}/linux ${install_params} ${mirrorcfg} -- quiet {{ kernel_params }}
 initrd ${ubuntu_mirror}/${dir}/initrd.gz
 echo
 echo MD5sums:
@@ -100,7 +100,7 @@ goto sub_boot
 imgfree
 isset ${dhcp-server} && set netboot_params ip=dhcp url=http://releases.ubuntu.com/${codename}/ubuntu-${version_number}-live-server-${arch_a}.iso || set netboot_params
 echo Loading Ubuntu Subiquity Network Installer...
-kernel ${kernel_url}vmlinuz root=/dev/ram0 ramdisk_size=1500000 ${netboot_params} ${install_params} initrd=initrd ${cmdline}
+kernel ${kernel_url}vmlinuz root=/dev/ram0 ramdisk_size=1500000 ${netboot_params} ${install_params} {{ kernel_params }}
 initrd ${kernel_url}initrd
 echo
 echo MD5sums:

roles/netbootxyz/templates/menu/vyos.ipxe

@@ -18,7 +18,7 @@ goto vyos_boot
 :vyos_boot
 imgfree
 set url ${live_endpoint}{{ endpoints['vyos-rolling'].path }}
-kernel ${url}vmlinuz boot=live components hostname=vyos username=live nopersistence noautologin union=overlay console=ttyS0,115200 console=tty0 net.ifnames=0 biosdevname=0 fetch=${url}filesystem.squashfs initrd=initrd ${cmdline}
+kernel ${url}vmlinuz boot=live components hostname=vyos username=live nopersistence noautologin union=overlay console=ttyS0,115200 console=tty0 net.ifnames=0 biosdevname=0 fetch=${url}filesystem.squashfs {{ kernel_params }}
 initrd ${url}initrd
 
 boot

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

@@ -18,7 +18,7 @@ goto zen_boot
 :zen_boot
 imgfree
 set url ${live_endpoint}{{ endpoints.zeninstall.path }}
-kernel ${url}vmlinuz archisobasedir=arch ${ipparam} archiso_http_srv=${url} initrd=initrd ${cmdline}
+kernel ${url}vmlinuz archisobasedir=arch ${ipparam} archiso_http_srv=${url} {{ kernel_params }}
 initrd ${url}initrd
 boot
 goto zen_exit

version.txt

@@ -1 +1 @@
-2.0.40
+2.0.41