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

Commits on Dec 19, 2017

  1. containers: deny networkmanager from managing the ve-* and vb-* NICs 

    Without this, when you've enabled networkmanager and start a
nixos-container the container will briefly have its specified IP
address but then networkmanager starts managing it causing the IP
address to be dropped.

(cherry picked from commit 5572de7)
    @basvandijk @rycee
    basvandijk authored and rycee committed Dec 19, 2017
    Copy the full SHA
    1bbcdfe View commit details
    Browse the repository at this point in the history

  2. nixos containers: remove stray , from pattern 

    See #31888.

(cherry picked from commit 5eb4a83)
    @rycee
    rycee committed Dec 19, 2017
    Copy the full SHA
    0bb77b8 View commit details
    Browse the repository at this point in the history