diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2020-04-22 10:47:28 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-22 10:47:28 +0100 |
commit | 6eb1020cbfcd18b4ef8076a09674863da649b8ed (patch) | |
tree | 2f62e8171e49bd2a703300a22c0c7c68e74a9049 /nixos | |
parent | d5c13032d6a36bbc0e9d9f9faa389b1156e05fa7 (diff) | |
parent | 2e2da182fefe41b0b1c962995450a83243fafb32 (diff) | |
download | nixlib-6eb1020cbfcd18b4ef8076a09674863da649b8ed.tar nixlib-6eb1020cbfcd18b4ef8076a09674863da649b8ed.tar.gz nixlib-6eb1020cbfcd18b4ef8076a09674863da649b8ed.tar.bz2 nixlib-6eb1020cbfcd18b4ef8076a09674863da649b8ed.tar.lz nixlib-6eb1020cbfcd18b4ef8076a09674863da649b8ed.tar.xz nixlib-6eb1020cbfcd18b4ef8076a09674863da649b8ed.tar.zst nixlib-6eb1020cbfcd18b4ef8076a09674863da649b8ed.zip |
Merge pull request #85746 from iblech/patch-11
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/virtualisation/nixos-containers.nix | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix index 2db5c117aa7f..4f5be91939db 100644 --- a/nixos/modules/virtualisation/nixos-containers.nix +++ b/nixos/modules/virtualisation/nixos-containers.nix @@ -440,7 +440,9 @@ in default = false; description = '' Whether this NixOS machine is a lightweight container running - in another NixOS system. + in another NixOS system. If set to true, support for nested + containers is disabled by default, but can be reenabled by + setting <config>boot.enableContainers</config> to true. ''; }; @@ -448,7 +450,11 @@ in type = types.bool; default = !config.boot.isContainer; description = '' - Whether to enable support for NixOS containers. + 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). ''; }; @@ -596,7 +602,7 @@ in type = with types; attrsOf (submodule { options = networkOptions; }); default = {}; description = '' - Extra veth-pairs to be created for the container + Extra veth-pairs to be created for the container. ''; }; |