3
0
Fork 0
forked from mirrors/nixpkgs

nixos-container: force systemd-nspawn to use unified cgroups hierarchy

This commit is contained in:
Jakub Okoński 2022-10-29 22:22:57 +02:00
parent b0bce6ae73
commit 12508ac79a
4 changed files with 25 additions and 0 deletions

View file

@ -138,6 +138,8 @@ let
fi
''}
export SYSTEMD_NSPAWN_UNIFIED_HIERARCHY=1
# Run systemd-nspawn without startup notification (we'll
# wait for the container systemd to signal readiness)
# Kill signal handling means systemd-nspawn will pass a system-halt signal

View file

@ -143,6 +143,7 @@ in {
containers-reloadable = handleTest ./containers-reloadable.nix {};
containers-restart_networking = handleTest ./containers-restart_networking.nix {};
containers-tmpfs = handleTest ./containers-tmpfs.nix {};
containers-unified-hierarchy = handleTest ./containers-unified-hierarchy.nix {};
convos = handleTest ./convos.nix {};
corerad = handleTest ./corerad.nix {};
coturn = handleTest ./coturn.nix {};

View file

@ -0,0 +1,21 @@
import ./make-test-python.nix ({ pkgs, lib, ... }: {
name = "containers-unified-hierarchy";
meta = {
maintainers = with lib.maintainers; [ farnoy ];
};
nodes.machine = { ... }: {
containers = {
test-container = {
autoStart = true;
config = { };
};
};
};
testScript = ''
machine.wait_for_unit("default.target")
machine.succeed("echo 'stat -fc %T /sys/fs/cgroup/ | grep cgroup2fs' | nixos-container root-login test-container")
'';
})

View file

@ -25,6 +25,7 @@ substituteAll {
containers-ip
containers-tmpfs
containers-ephemeral
containers-unified-hierarchy
;
};
};