diff --git a/nixos-modules/default.nix b/nixos-modules/default.nix index 9b6a664..243849a 100644 --- a/nixos-modules/default.nix +++ b/nixos-modules/default.nix @@ -137,15 +137,15 @@ in { menuentry Genode on NOVA { insmod multiboot2 insmod gzio - multiboot2 /boot/bender - module2 /boot/hypervisor hypervisor iommu novpid serial logmem - module2 /boot/image.elf.gz image.elf + multiboot2 /bender + module2 /hypervisor hypervisor iommu novpid serial logmem + module2 /image.elf.gz image.elf } ''; extraFiles = { - bender = "${pkgs'.genodeSources}/tool/boot/bender"; - hypervisor = "${pkgs'.NOVA}/hypervisor-x86_64"; + "bender" = "${pkgs'.genodeSources}/tool/boot/bender"; + "hypervisor" = "${pkgs'.NOVA}/hypervisor-x86_64"; "image.elf.gz" = "${firmware}/image.elf.gz"; }; }; diff --git a/nixos-modules/dhall/vbox-guest.dhall b/nixos-modules/dhall/vbox-guest.dhall index 0ec7a35..f7854c0 100644 --- a/nixos-modules/dhall/vbox-guest.dhall +++ b/nixos-modules/dhall/vbox-guest.dhall @@ -149,11 +149,12 @@ let toVbox = , ram = Genode.units.MiB 64 + Genode.units.MiB params.memorySize } , routes = - [ ServiceRoute.parent "VM" - , ServiceRoute.parent "Nitpicker" - , ServiceRoute.parent "File_system" + [ ServiceRoute.parent "File_system" , ServiceRoute.parent "Nic" + , ServiceRoute.parent "Nitpicker" , ServiceRoute.parent "Rtc" + , ServiceRoute.parent "Timer" + , ServiceRoute.parent "VM" , ServiceRoute.parent "Report" , ServiceRoute.parentLabel "ROM" diff --git a/nixos-modules/dhall/vbox-host.dhall b/nixos-modules/dhall/vbox-host.dhall index ee01783..984cee2 100644 --- a/nixos-modules/dhall/vbox-host.dhall +++ b/nixos-modules/dhall/vbox-host.dhall @@ -480,15 +480,7 @@ let rootInit = { name = "policy" , attributes = toMap { label_last = "nix" - , root = "/nix" - , writeable = "no" - } - } - , XML.leaf - { name = "policy" - , attributes = toMap - { label = "store_rom" - , root = "/nix/store" + , root = "/store" , writeable = "no" } } @@ -517,7 +509,7 @@ let rootInit = "File_system" "file_system" (None Text) - (Some "store_rom") + (Some "nix") ] } , chroot =