b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

nixos/tests/systemd-machinectl: Fix resolved and UID shift check

Browse source
This commit is contained in:
Christian Kögler 2022-07-30 22:32:12 +02:00
parent 7efdfc2a59
commit 68973d60a2
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nixos/tests/systemd-machinectl.nix
View file

@ -32,7 +32,6 @@ import ./make-test-python.nix (
# use networkd to obtain systemd network setup # use networkd to obtain systemd network setup
networking.useNetworkd = true; networking.useNetworkd = true;
networking.useDHCP = false; networking.useDHCP = false;
services.resolved.enable = false;
# open DHCP server on interface to container # open DHCP server on interface to container
networking.firewall.trustedInterfaces = [ "ve-+" ]; networking.firewall.trustedInterfaces = [ "ve-+" ];
@ -64,7 +63,7 @@ import ./make-test-python.nix (
machine.succeed("ping -n -c 1 ${containerName}"); machine.succeed("ping -n -c 1 ${containerName}");
# Test systemd-nspawn uses a user namespace # Test systemd-nspawn uses a user namespace
machine.succeed("test `stat ${containerRoot}/var/empty -c %u%g` != 00"); machine.succeed("test $(machinectl status ${containerName} | grep 'UID Shift: ' | wc -l) = 1")
# Test systemd-nspawn reboot # Test systemd-nspawn reboot
machine.succeed("machinectl shell ${containerName} /run/current-system/sw/bin/reboot"); machine.succeed("machinectl shell ${containerName} /run/current-system/sw/bin/reboot");
@ -76,6 +75,7 @@ import ./make-test-python.nix (
# Test machinectl stop # Test machinectl stop
machine.succeed("machinectl stop ${containerName}"); machine.succeed("machinectl stop ${containerName}");
machine.wait_until_succeeds("test $(systemctl is-active systemd-nspawn@${containerName}) = inactive");
# Show to to delete the container # Show to to delete the container
machine.succeed("chattr -i ${containerRoot}/var/empty"); machine.succeed("chattr -i ${containerRoot}/var/empty");