From ac7edeebfd4ca45d4c6569f36dc5d6dd10aa58e9 Mon Sep 17 00:00:00 2001 From: Martin Bornhold Date: Thu, 16 Nov 2017 13:55:20 +0100 Subject: [PATCH] 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 --- pkgs/tools/virtualization/nixos-container/nixos-container.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/virtualization/nixos-container/nixos-container.pl b/pkgs/tools/virtualization/nixos-container/nixos-container.pl index 207177133a5..fefdcd614a5 100755 --- a/pkgs/tools/virtualization/nixos-container/nixos-container.pl +++ b/pkgs/tools/virtualization/nixos-container/nixos-container.pl @@ -331,7 +331,7 @@ elsif ($action eq "run") { elsif ($action eq "show-ip") { my $s = read_file($confFile) or die; - $s =~ /^LOCAL_ADDRESS=([0-9\.]+)$/m or die "$0: cannot get IP address\n"; + $s =~ /^LOCAL_ADDRESS=([0-9\.]+)(\/[0-9]+)?$/m or die "$0: cannot get IP address\n"; print "$1\n"; }