eisfunke/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Re-enable systemd-nspawn test

Browse source 
It was disabled in c6953d1ff6 because
a recent Nixpkgs bump brought in a new systemd which changed how
systemd-nspawn worked.

As far as I can tell, the issue was caused by this upstream systemd
commit:
b71a0192c0

Bind-mounting the host's `/sys` and `/proc` into the container's
`/run/host/{sys,proc}` fixes the issue and allows the test to succeed.

(cherry picked from commit 883092e3f78d4efb1066a2e24e343b307035a04c)
This commit is contained in:
Cole Helbling 2023-09-20 09:09:01 -07:00 committed by github-actions[bot]
parent 40a014416b
commit f3005632c4
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/nixos/containers/containers.nix
View file

@ -56,8 +56,8 @@
host.fail("nix build -v --auto-allocate-uids --no-sandbox -L --offline --impure --file ${./id-test.nix} --argstr name id-test-6 --arg uidRange true") host.fail("nix build -v --auto-allocate-uids --no-sandbox -L --offline --impure --file ${./id-test.nix} --argstr name id-test-6 --arg uidRange true")
# Run systemd-nspawn in a Nix build. # Run systemd-nspawn in a Nix build.
#host.succeed("nix build -v --auto-allocate-uids --sandbox -L --offline --impure --file ${./systemd-nspawn.nix} --argstr nixpkgs ${nixpkgs}") host.succeed("nix build -v --auto-allocate-uids --sandbox -L --offline --impure --file ${./systemd-nspawn.nix} --argstr nixpkgs ${nixpkgs}")
#host.succeed("[[ $(cat ./result/msg) = 'Hello World' ]]") host.succeed("[[ $(cat ./result/msg) = 'Hello World' ]]")
''; '';
} }

2
tests/nixos/containers/systemd-nspawn.nix
View file

@ -73,6 +73,8 @@ runCommand "test"
--resolv-conf=off \ --resolv-conf=off \
--bind-ro=/nix/store \ --bind-ro=/nix/store \
--bind=$out \ --bind=$out \
--bind=/proc:/run/host/proc \
--bind=/sys:/run/host/sys \
--private-network \ --private-network \
$toplevel/init $toplevel/init
'' ''