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
base: ae33b7daec95
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: eb66a32a5630
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jul 18, 2020

  1. nixos/docker: explicitly load kernel modules 

    This is analogous to #70447.

With security.lockKernelModules=true, docker commands result in the following
error without at least loading veth:

$ docker run hello-world
/nix/store/mr50kaan2vs4gc40ymwncb2vci25aq7z-docker-19.03.2/libexec/docker/docker: Error response from daemon: failed to create endpoint epic_kare on network bridge: failed to add the host (veth8b381f3) <=> sandbox (veth348e197) pair interfaces: operation not supported.
ERRO[0003] error waiting for container: context canceled
    @ryneeverett
    ryneeverett committed Jul 18, 2020
    Copy the full SHA
    f12581a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #76487 from ryneeverett/lockkernelmodules-docker

    @Mic92
    Mic92 committed Jul 18, 2020
    Copy the full SHA
    eb66a32 View commit details
    Browse the repository at this point in the history