summary refs log tree commit diff
path: root/nixos/tests
diff options
context:
space:
mode:
authorzowoq <59103226+zowoq@users.noreply.github.com>2020-07-16 12:11:09 +1000
committerzowoq <59103226+zowoq@users.noreply.github.com>2020-07-16 12:11:09 +1000
commit805f7676bccac1e02f8d6cf6125c73534e5711b4 (patch)
treedbb3d46942bfad78c2c04501b6e27098b7b6d8e7 /nixos/tests
parent178de8429d1225687f60af7e5cdd1cd8681e3ee5 (diff)
downloadnixpkgs-805f7676bccac1e02f8d6cf6125c73534e5711b4.tar
nixpkgs-805f7676bccac1e02f8d6cf6125c73534e5711b4.tar.gz
nixpkgs-805f7676bccac1e02f8d6cf6125c73534e5711b4.tar.bz2
nixpkgs-805f7676bccac1e02f8d6cf6125c73534e5711b4.tar.lz
nixpkgs-805f7676bccac1e02f8d6cf6125c73534e5711b4.tar.xz
nixpkgs-805f7676bccac1e02f8d6cf6125c73534e5711b4.tar.zst
nixpkgs-805f7676bccac1e02f8d6cf6125c73534e5711b4.zip
Revert "nixos/podman: use cgroupfs for rootless crun test"
This reverts commit 033ba9c73d4fe544db93fbf299cf7a4a0a786ea8.
Diffstat (limited to 'nixos/tests')
-rw-r--r--nixos/tests/podman.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/tests/podman.nix b/nixos/tests/podman.nix
index aea1516c4f7..cd8c2b4308c 100644
--- a/nixos/tests/podman.nix
+++ b/nixos/tests/podman.nix
@@ -68,7 +68,7 @@ import ./make-test-python.nix (
           podman.succeed(su_cmd("tar cv --files-from /dev/null | podman import - scratchimg"))
           podman.succeed(
               su_cmd(
-                  "podman run --cgroup-manager=cgroupfs --runtime=crun -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"
+                  "podman run --runtime=crun -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"
               )
           )
           podman.succeed(su_cmd("podman ps | grep sleeping"))