about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMartin Bornhold <mb@bo-tech.de>2017-11-16 13:55:20 +0100
committerMartin Bornhold <mb@bo-tech.de>2017-11-16 20:25:45 +0100
commitac7edeebfd4ca45d4c6569f36dc5d6dd10aa58e9 (patch)
tree3f07032d9066a4902b0cc2f46b7c5656cf6f5986
parent55851579d9314de21c094ec09d78e9c9fb3a366e (diff)
downloadnixlib-ac7edeebfd4ca45d4c6569f36dc5d6dd10aa58e9.tar
nixlib-ac7edeebfd4ca45d4c6569f36dc5d6dd10aa58e9.tar.gz
nixlib-ac7edeebfd4ca45d4c6569f36dc5d6dd10aa58e9.tar.bz2
nixlib-ac7edeebfd4ca45d4c6569f36dc5d6dd10aa58e9.tar.lz
nixlib-ac7edeebfd4ca45d4c6569f36dc5d6dd10aa58e9.tar.xz
nixlib-ac7edeebfd4ca45d4c6569f36dc5d6dd10aa58e9.tar.zst
nixlib-ac7edeebfd4ca45d4c6569f36dc5d6dd10aa58e9.zip
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
-rwxr-xr-xpkgs/tools/virtualization/nixos-container/nixos-container.pl2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/tools/virtualization/nixos-container/nixos-container.pl b/pkgs/tools/virtualization/nixos-container/nixos-container.pl
index 207177133a57..fefdcd614a56 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";
 }