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

Commits on Dec 19, 2020

  1. nixos/nixos-container: Always apply extraVeth ip configuration

    Fixes that `containers.<name>.extraVeths.<name>` configuration was not
    always applied.
    
    When configuring `containers.<name>.extraVeths.<name>` and not
    configuring one of `containers.<name>.localAddress`, `.localAddress6`,
    `.hostAddress`, `.hostAddress6` or `.hostBridge` the veth was created,
    but otherwise no configuration (i.e. no ip) was applied.
    
    nixos-container always configures the primary veth (when `.localAddress`
    or `.hostAddress` is set) to be the containers default gateway, so
    this fix is required to create a veth in containers that use a different
    default gateway.
    
    To test this patch configure the following container and check if the
    addresses are applied:
    ```
      containers.testveth = {
        extraVeths.testveth = {
          hostAddress = "192.168.13.2";
          localAddress = "192.168.13.1";
        };
        config = {...}:{};
      };
    ```
    queezle42 committed Dec 19, 2020
    Copy the full SHA
    ad6c2de View commit details
    Browse the repository at this point in the history

Commits on Dec 29, 2020

  1. Merge pull request #107127 from qzle/nixos-container-extraVeth-fix

    Fix: nixos-container does not always apply extraVeth ips
    Lassulus committed Dec 29, 2020
    Copy the full SHA
    86102eb View commit details
    Browse the repository at this point in the history