diff --git a/nixos-modules/nova.nix b/nixos-modules/nova.nix index caa30e9..376da34 100644 --- a/nixos-modules/nova.nix +++ b/nixos-modules/nova.nix @@ -39,20 +39,29 @@ in { "-initrd '${pkgs.genodePackages.NOVA}/hypervisor-x86_64 arg=iommu logmem novpid serial,${config.genode.boot.image}/image.elf'" ]; - virtualisation.qemu.kernel = "${pkgs.genodePackages.bender}/share/bender/bender"; + virtualisation.qemu.kernel = + "${pkgs.genodePackages.bender}/share/bender/bender"; virtualisation.qemu.initrd = "${pkgs.genodePackages.NOVA}/hypervisor-x86_64"; - virtualisation.qemu.cmdline = "arg=iommu logmem novpid serial,${config.genode.boot.image}/image.elf"; + virtualisation.qemu.cmdline = + "arg=iommu logmem novpid serial,${config.genode.boot.image}/image.elf"; - boot.loader.grub.extraEntries = '' - menuentry 'Genode on NOVA' { - insmod multiboot2 - insmod gzio - multiboot2 ${bootDir}/bender.gz serial_fallback - module2 ${bootDir}/hypervisor.gz hypervisor iommu logmem novga novpid serial - module2 ${bootDir}/image.elf.gz image.elf - } - ''; + boot.loader.grub = { + extraEntries = '' + menuentry 'Genode on NOVA' { + insmod multiboot2 + insmod gzio + multiboot2 ${bootDir}/bender.gz serial_fallback + module2 ${bootDir}/hypervisor.gz hypervisor iommu logmem novga novpid serial + module2 ${bootDir}/image.elf.gz image.elf + } + ''; + extraFiles = { + "bender.gz" = bootDir + "/bender.gz"; + "hypervisor.gz" = bootDir + "/hypervisor.gz"; + "image.elf.gz" = bootDir + "/image.elf.gz"; + }; + }; }