mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-06 17:13:24 -05:00
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).
This commit is contained in:
parent
5304897c5e
commit
b75a29cb6c
2 changed files with 10 additions and 0 deletions
|
|
@ -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 ]")
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue