Adds the initrd.magic param

Simplfies the logic around initrd stub for EFI,
moves initrd= and cmdline values to single kernel
parameter.

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

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

@@ -59,7 +59,7 @@ goto boottype
 
 :bootos_images
 imgfree
-kernel ${openEuler_mirror}/${dir}/images/pxeboot/vmlinuz inst.repo=${repo} ${params} ${ipparam} initrd=initrd.img ${cmdline}
+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:

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