diff options
| author | Arian van Putten <arian.vanputten@gmail.com> | 2024-03-01 12:52:48 +0100 |
|---|---|---|
| committer | Arian van Putten <arian.vanputten@gmail.com> | 2024-03-01 12:52:48 +0100 |
| commit | b75a29cb6ca9b5d2e4823622be84d10a6b2e299f (patch) | |
| tree | 88a63b887d79566a26a2b2ad2076143365e69c9a /nixos/tests/qemu-vm-external-disk-image.nix | |
| parent | 5304897c5e6b225b9aeadaf4a8f2746cf4efb014 (diff) | |
nixos/lib/make-disk-image.nix: fix systemd-boot-builder clobbering /homeless-shelter
systemd-boot-builder.py calls nix-env --list-generations which creates $HOME/.nix-defexpr/channels/nixos if it doesn't exist. This would cause a folder /homeless-shelter to show up in the final image which in turn breaks nix builds in the target image if sandboxing is turned off (as /homeless-shelter is never allowed to exist).
Diffstat (limited to 'nixos/tests/qemu-vm-external-disk-image.nix')
| -rw-r--r-- | nixos/tests/qemu-vm-external-disk-image.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/nixos/tests/qemu-vm-external-disk-image.nix b/nixos/tests/qemu-vm-external-disk-image.nix index a229fc5e39633..c481159511a02 100644 --- a/nixos/tests/qemu-vm-external-disk-image.nix +++ b/nixos/tests/qemu-vm-external-disk-image.nix @@ -69,5 +69,8 @@ in os.environ['NIX_DISK_IMAGE'] = tmp_disk_image.name machine.succeed("findmnt --kernel --source ${rootFsDevice} --target /") + + # Make sure systemd boot didn't clobber this + machine.succeed("[ ! -e /homeless-shelter ]") ''; } |