ehmry/sigil
ehmry
/
sigil
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Use ISO9660 for the ERIS store

This commit is contained in:
Ehmry - 2021-04-01 15:29:31 +02:00
parent 4731f16b17
commit 192e9f1b7b
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos-modules/eris/rom-fs.nix
View File

@ -19,7 +19,7 @@
( VFS.vfs
[ VFS.leafAttrs
"plugin"
(toMap { load = "${vfsRump.cap}", fs = "ext2fs", ram = "12M" })
(toMap { load = "${vfsRump.cap}", fs = "cd9660", ram = "12M", writeable="no" })
]
)
'';

1
nixos-modules/eris/rom-memory.nix
View File

@ -12,6 +12,7 @@
let VFS = Sigil.VFS
in ${./rom-vfs.dhall}
${../partition-type}
Sigil.Init.Resources::{=}
( VFS.vfs
[ VFS.leafAttrs

16
nixos-modules/genode-core.nix
View File

@ -304,14 +304,20 @@ in {
xmllint --noout $out
'';
system.build.storeFsImage =
pkgs.callPackage "${modulesPath}/../lib/make-iso9660-image.nix" {
contents = builtins.trace (builtins.toJSON erisContents) erisContents;
compressImage = true;
volumeID = "SIGIL";
};
virtualisation.diskImage = let
espImage = import ./lib/make-esp-fs.nix { inherit config pkgs; };
storeFsImage = pkgs.callPackage ./lib/make-ext2-fs.nix {
inherit config lib pkgs;
contents = erisContents;
};
inherit (config.system.build) storeFsImage;
bootDriveImage = import ./lib/make-bootable-image.nix {
inherit config pkgs espImage storeFsImage;
inherit config pkgs espImage;
storeFsImage = "${config.system.build.storeFsImage}/iso/cd.iso.zst";
};
in lib.mkIf (config.genode.boot.storeBackend == "fs") bootDriveImage;