JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #85746 from iblech/patch-11

Browse Source
This commit is contained in:
Jörg Thalheim 2020-04-22 10:47:28 +01:00 committed by GitHub
commit 6eb1020cbf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nixos/modules/virtualisation/nixos-containers.nix
View File

@ -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.
'';
};