Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d5c13032d6a3
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6eb1020cbfcd
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 22, 2020

  1. nixos-containers: add docs about nested containers

    @iblech
    iblech authored Apr 22, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    cole-h Cole Helbling
    GPG key ID: B37E0F2371016A4C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2e2da18 View commit details

  2. Merge pull request #85746 from iblech/patch-11

    @Mic92
    Mic92 authored Apr 22, 2020
    Copy the full SHA
    6eb1020 View commit details
Showing with 9 additions and 3 deletions.
  1. +9 −3 nixos/modules/virtualisation/nixos-containers.nix
12 changes: 9 additions & 3 deletions nixos/modules/virtualisation/nixos-containers.nix
View file
Original file line number Diff line number Diff line change
@@ -440,15 +440,21 @@ 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.
'';
};

boot.enableContainers = mkOption {
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.
'';
};