From d938bd60eb9b8a5860e20fc46fc81317a0cac020 Mon Sep 17 00:00:00 2001 From: Antony Messerli Date: Sun, 18 Jul 2021 11:27:44 -0500 Subject: [PATCH] Switch Gentoo to leverage initrd.magic functionality --- roles/netbootxyz/templates/menu/gentoo.ipxe.j2 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/roles/netbootxyz/templates/menu/gentoo.ipxe.j2 b/roles/netbootxyz/templates/menu/gentoo.ipxe.j2 index 07c367a0..977fc1f2 100644 --- a/roles/netbootxyz/templates/menu/gentoo.ipxe.j2 +++ b/roles/netbootxyz/templates/menu/gentoo.ipxe.j2 @@ -7,8 +7,6 @@ set os {{ releases.gentoo.name }} menu ${os} - Current Arch [ ${arch} ] iseq ${arch} x86_64 && set arch_a amd64 || set arch_a ${arch} -item --gap Currently during boot you need to press ctrl+d/ctrl+c -item --gap repeatedly when init hangs on starting a download item --gap ${os} Versions {% for key, value in endpoints.items() | sort %} {% if value.os == "gentoo" %} @@ -29,8 +27,9 @@ 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 {{ kernel_params }} +kernel ${url}vmlinuz ip=dhcp root=/dev/ram0 init=/linuxrc loop=/image.squashfs looptype=squashfs cdroot=1 {{ kernel_params }} initrd ${url}initrd +initrd ${url}image.squashfs /image.squashfs boot :gentoo_exit