summary refs log tree commit diff
path: root/nixos/modules/virtualisation/nixos-containers.nix
diff options
context:
space:
mode:
authorLuke Granger-Brown <git@lukegb.com>2021-04-25 11:37:01 +0100
committerGitHub <noreply@github.com>2021-04-25 11:37:01 +0100
commit0cc25061b0a1d148e74516eeeb37c732a5d97bc6 (patch)
tree11a3e05be7d11874ef0f5125592b53b03787a8e3 /nixos/modules/virtualisation/nixos-containers.nix
parent4a67076273c8c566f90e3f0caadce941106314d9 (diff)
parentd23ba22076f64c9daffedde66376b11796046b40 (diff)
downloadnixpkgs-0cc25061b0a1d148e74516eeeb37c732a5d97bc6.tar
nixpkgs-0cc25061b0a1d148e74516eeeb37c732a5d97bc6.tar.gz
nixpkgs-0cc25061b0a1d148e74516eeeb37c732a5d97bc6.tar.bz2
nixpkgs-0cc25061b0a1d148e74516eeeb37c732a5d97bc6.tar.lz
nixpkgs-0cc25061b0a1d148e74516eeeb37c732a5d97bc6.tar.xz
nixpkgs-0cc25061b0a1d148e74516eeeb37c732a5d97bc6.tar.zst
nixpkgs-0cc25061b0a1d148e74516eeeb37c732a5d97bc6.zip
Merge pull request #114240 from sorki/containers/nested
nixos/nixos-containers: default boot.enableContainers to true
Diffstat (limited to 'nixos/modules/virtualisation/nixos-containers.nix')
-rw-r--r--nixos/modules/virtualisation/nixos-containers.nix11
1 files changed, 3 insertions, 8 deletions
diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix
index f15d5875841..7a1f11ce40d 100644
--- a/nixos/modules/virtualisation/nixos-containers.nix
+++ b/nixos/modules/virtualisation/nixos-containers.nix
@@ -439,21 +439,16 @@ in
       default = false;
       description = ''
         Whether this NixOS machine is a lightweight container running
-        in another NixOS system. If set to true, support for nested
-        containers is disabled by default, but can be reenabled by
-        setting <option>boot.enableContainers</option> to true.
+        in another NixOS system.
       '';
     };
 
     boot.enableContainers = mkOption {
       type = types.bool;
-      default = !config.boot.isContainer;
+      default = true;
       description = ''
         Whether to enable support for NixOS containers. Defaults to true
-        (at no cost if containers are not actually used), but only if the
-        system is not itself a lightweight container of a host.
-        To enable support for nested containers, this option has to be
-        explicitly set to true (in the outer container).
+        (at no cost if containers are not actually used).
       '';
     };