summary refs log tree commit diff
path: root/nixos/modules/module-list.nix
diff options
context:
space:
mode:
authoradisbladis <adisbladis@gmail.com>2020-04-21 10:22:20 +0100
committeradisbladis <adisbladis@gmail.com>2020-04-21 10:38:39 +0100
commit43f383c46472f3284d8ebe9b61f779270ffd1f78 (patch)
tree4b3d594edcefff0bb60966b165ec7a52d6326c13 /nixos/modules/module-list.nix
parent650df709fb9312ec2128ba6a0600d6fb55af0084 (diff)
downloadnixpkgs-43f383c46472f3284d8ebe9b61f779270ffd1f78.tar
nixpkgs-43f383c46472f3284d8ebe9b61f779270ffd1f78.tar.gz
nixpkgs-43f383c46472f3284d8ebe9b61f779270ffd1f78.tar.bz2
nixpkgs-43f383c46472f3284d8ebe9b61f779270ffd1f78.tar.lz
nixpkgs-43f383c46472f3284d8ebe9b61f779270ffd1f78.tar.xz
nixpkgs-43f383c46472f3284d8ebe9b61f779270ffd1f78.tar.zst
nixpkgs-43f383c46472f3284d8ebe9b61f779270ffd1f78.zip
nixos.virtualisation.containers: Init common /etc/containers configuration module
What's happening now is that both cri-o and podman are creating
/etc/containers/policy.json.

By splitting out the creation of configuration files we can make the
podman module leaner & compose better with other container software.
Diffstat (limited to 'nixos/modules/module-list.nix')
-rw-r--r--nixos/modules/module-list.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 58f4b05c546..7244a7e0a89 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -983,6 +983,7 @@
   ./testing/service-runner.nix
   ./virtualisation/anbox.nix
   ./virtualisation/container-config.nix
+  ./virtualisation/containers.nix
   ./virtualisation/nixos-containers.nix
   ./virtualisation/cri-o.nix
   ./virtualisation/docker.nix