Use ISO9660 for the ERIS store
This commit is contained in:
parent
4731f16b17
commit
192e9f1b7b
|
@ -19,7 +19,7 @@
|
||||||
( VFS.vfs
|
( VFS.vfs
|
||||||
[ VFS.leafAttrs
|
[ VFS.leafAttrs
|
||||||
"plugin"
|
"plugin"
|
||||||
(toMap { load = "${vfsRump.cap}", fs = "ext2fs", ram = "12M" })
|
(toMap { load = "${vfsRump.cap}", fs = "cd9660", ram = "12M", writeable="no" })
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -12,6 +12,7 @@
|
||||||
let VFS = Sigil.VFS
|
let VFS = Sigil.VFS
|
||||||
|
|
||||||
in ${./rom-vfs.dhall}
|
in ${./rom-vfs.dhall}
|
||||||
|
${../partition-type}
|
||||||
Sigil.Init.Resources::{=}
|
Sigil.Init.Resources::{=}
|
||||||
( VFS.vfs
|
( VFS.vfs
|
||||||
[ VFS.leafAttrs
|
[ VFS.leafAttrs
|
||||||
|
|
|
@ -304,14 +304,20 @@ in {
|
||||||
xmllint --noout $out
|
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
|
virtualisation.diskImage = let
|
||||||
espImage = import ./lib/make-esp-fs.nix { inherit config pkgs; };
|
espImage = import ./lib/make-esp-fs.nix { inherit config pkgs; };
|
||||||
storeFsImage = pkgs.callPackage ./lib/make-ext2-fs.nix {
|
inherit (config.system.build) storeFsImage;
|
||||||
inherit config lib pkgs;
|
|
||||||
contents = erisContents;
|
|
||||||
};
|
|
||||||
bootDriveImage = import ./lib/make-bootable-image.nix {
|
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;
|
in lib.mkIf (config.genode.boot.storeBackend == "fs") bootDriveImage;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue