From 3df99865d155726610e0797728dae20b82b48c36 Mon Sep 17 00:00:00 2001 From: luzbel Date: Sun, 5 Feb 2017 18:01:11 +0000 Subject: [PATCH] Get rid of ROOTFSCFG hack on ISO platform Modify grub.cfg: Pass json.cfg to kernel using a multiboot module instead of reading json.cfg from rootfs This allow simple diskless unikernels to boot on baremetal or on hypervisors without virtio support (like Hyper V or VirtualBox ) while PCI IDE drivers aren't built by default. --- app-tools/rumprun | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app-tools/rumprun b/app-tools/rumprun index a5e1d5ac3..334d3915e 100644 --- a/app-tools/rumprun +++ b/app-tools/rumprun @@ -773,8 +773,9 @@ bake_iso () mkdir -p "${ISODIR}/boot/grub" printf 'set timeout=0\n' > "${ISODIR}/boot/grub/grub.cfg" printf 'menuentry "rumpkernel" {\n' >> "${ISODIR}/boot/grub/grub.cfg" - printf '\tmultiboot /boot/%s _RUMPRUN_ROOTFSCFG=/json.cfg\n}\n' \ + printf '\tmultiboot /boot/%s \n' \ $(basename $1) >> "${ISODIR}/boot/grub/grub.cfg" + printf '\tmodule /json.cfg cmdline \n}\n' >> "${ISODIR}/boot/grub/grub.cfg" cp ${bootimage} "${ISODIR}/boot" cp "${TMPDIR}/json.cfg" "${ISODIR}" grub-mkrescue -o ${opt_name} "${ISODIR}"