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: 0002a7d9ee08
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 103180155da0
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 5, 2019

  1. nixos/containers: explicitly load kernel modules for networking 

    List all modules that *may* be required depending on individual container
configurations; don't expect that further modules can be loaded after boot.

Fixes #38676
    @joachifm
    joachifm committed Oct 5, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has been revoked.
    joachifm Joachim F.
    GPG key ID: 5C204DF675C90294
    Revoked
    Verified
    Learn about vigilant mode
    Copy the full SHA
    fe3da83 View commit details

Commits on Oct 6, 2019

  1. Merge pull request #70447 from joachifm/feat/containers-private-netwo… 

    …rking-lockKernelModules-compat

nixos/containers: explicitly load kernel modules for networking
    @joachifm
    joachifm authored Oct 6, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has been revoked.
    joachifm Joachim F.
    GPG key ID: 5C204DF675C90294
    Revoked
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1031801 View commit details
Showing with 7 additions and 0 deletions.
  1. +7 −0 nixos/modules/virtualisation/containers.nix
7 changes: 7 additions & 0 deletions nixos/modules/virtualisation/containers.nix
View file
Original file line number Diff line number Diff line change
@@ -824,5 +824,12 @@ in
'';

environment.systemPackages = [ pkgs.nixos-container ];

boot.kernelModules = [
"bridge"
"macvlan"
"tap"
"tun"
];
});
}