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: 202912d61796
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 963204e6eef2
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Nov 16, 2017

  1. nixos-container: Make show-ip work together with ipv4 + netmask 

    The containers local address can be given as ipv4 only or with a subnetmask in
CIDR notation in the container configuration, see [1]. This works fine but the
'nixos-container show-ip' only supports plain ipv4 addresses without the netmask
suffix.

Changed the regex to also match in case of a CIDR netmask suffix.

[1] https://github.com/NixOS/nixpkgs/blob/9939032e35bb144bc8f6b57ed6325089910f738c/nixos/modules/virtualisation/containers.nix#L382
    Martin Bornhold committed Nov 16, 2017
    Configuration menu
    Copy the full SHA
    ac7edee View commit details
    Browse the repository at this point in the history

  2. nixos-container: Modify existing test to cover show-ip command 

    Modified the existing test to check that the 'nixos-container show-ip' command
can handle ipv4 addresses with submask in CIDR notation.
    Martin Bornhold committed Nov 16, 2017
    Configuration menu
    Copy the full SHA
    25b71e1 View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2017

  1. Merge pull request #31753 from mbld/show-ip 

    nixos-container: Make show-ip work together with ipv4 + netmask
    @orivej
    orivej committed Nov 17, 2017
    Configuration menu
    Copy the full SHA
    963204e View commit details
    Browse the repository at this point in the history