DGNum/liminix
13
0
Fork 1
Code Issues 16 Pull requests 10 Projects Releases Packages Wiki Activity Actions

rename rootfsFiles to rootdir, add bootablerootdir

Browse source
This commit is contained in:
Daniel Barlow 2023-12-11 20:49:48 +00:00
parent 133b64613d
commit d707345891
4 changed files with 27 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

22
modules/outputs.nix
View file

@ -69,13 +69,22 @@ in
out what's in the image, which is nice if it's unexpectedly huge
'';
};
rootfsFiles = mkOption {
rootdir = mkOption {
type = types.package;
internal = true;
description = ''
directory of files to package into root filesystem
'';
};
bootablerootdir = mkOption {
type = types.package;
internal = true;
description = ''
directory of files to package into root filesystem, including
a kernel and appropriate associated gubbins for the
selected bootloader
'';
};
rootfs = mkOption {
type = types.package;
internal = true;
@ -108,7 +117,7 @@ in
inherit kernel;
inherit dtb;
};
rootfsFiles =
rootdir =
let
inherit (pkgs.pkgsBuildBuild) runCommand;
in runCommand "mktree" { } ''
@ -120,6 +129,15 @@ in
(cd $out && cp -a $path .$path)
done
'';
bootablerootdir =
let inherit (pkgs.pkgsBuildBuild) runCommand;
in runCommand "add-slash-boot" { } ''
cp -a ${o.rootdir} $out
${if config.boot.loader.extlinux.enable
then "(cd $out && chmod -R +w . && rmdir boot && cp -a ${o.extlinux} boot)"
else ""
}
'';
manifest = writeText "manifest.json" (builtins.toJSON config.filesystem.contents);
};
};