summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authoradisbladis <adisbladis@gmail.com>2020-04-21 10:36:01 +0100
committeradisbladis <adisbladis@gmail.com>2020-04-21 10:36:56 +0100
commit650df709fb9312ec2128ba6a0600d6fb55af0084 (patch)
tree31d9b7b42efadf6d52bfe4f453c9d676ec694edc /nixos
parentf0a92ef1d98a7f26e4918351fa865a17883de41b (diff)
downloadnixpkgs-650df709fb9312ec2128ba6a0600d6fb55af0084.tar
nixpkgs-650df709fb9312ec2128ba6a0600d6fb55af0084.tar.gz
nixpkgs-650df709fb9312ec2128ba6a0600d6fb55af0084.tar.bz2
nixpkgs-650df709fb9312ec2128ba6a0600d6fb55af0084.tar.lz
nixpkgs-650df709fb9312ec2128ba6a0600d6fb55af0084.tar.xz
nixpkgs-650df709fb9312ec2128ba6a0600d6fb55af0084.tar.zst
nixpkgs-650df709fb9312ec2128ba6a0600d6fb55af0084.zip
nixos.virtualisation: Move containers.nix to nixos-containers.nix
In anticipation of the new containers module.
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/module-list.nix2
-rw-r--r--nixos/modules/virtualisation/nixos-containers.nix (renamed from nixos/modules/virtualisation/containers.nix)0
2 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 38452fddf31..58f4b05c546 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -983,7 +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
   ./virtualisation/docker-containers.nix
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/nixos-containers.nix
index 2db5c117aa7..2db5c117aa7 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/nixos-containers.nix