diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-06-05 00:02:31 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-05 00:02:31 +0000 |
| commit | 4b2a80fbd07c9fddb15106e033472fb90285f374 (patch) | |
| tree | c35ce18a131943a284b05d5951f56db9e36ca03a /doc | |
| parent | 593056204bfd6a543923817f666be9b07fbcbc83 (diff) | |
| parent | a5ca13d240ba0bf6db69f041dccdf4377d753d2f (diff) | |
Merge master into staging-next
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/build-helpers/images/makediskimage.section.md | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/doc/build-helpers/images/makediskimage.section.md b/doc/build-helpers/images/makediskimage.section.md index e50479c4e83e4..3edfa906aa6ae 100644 --- a/doc/build-helpers/images/makediskimage.section.md +++ b/doc/build-helpers/images/makediskimage.section.md @@ -85,14 +85,14 @@ let in make-disk-image { inherit pkgs lib; - config = evalConfig { + inherit (evalConfig { modules = [ { fileSystems."/" = { device = "/dev/vda"; fsType = "ext4"; autoFormat = true; }; boot.grub.device = "/dev/vda"; } ]; - }; + }) config; format = "qcow2"; onlyNixStore = false; partitionTableType = "legacy+gpt"; @@ -104,5 +104,3 @@ in memSize = 2048; # Qemu VM memory size in megabytes. Defaults to 1024M. } ``` - - |