Merge pull request #111530 from vojta001/nixos-container-show-ip-ipv6

nixos-container: fix show-ip command to support IPv6 addresses
3 years ago · 71770e1f6f
parent 054e9b37fd 7fc1efdac7
commit 71770e1f6f
1 changed files with 3 additions and 1 deletions
--- a/pkgs/tools/virtualization/nixos-container/nixos-container.pl
+++ b/pkgs/tools/virtualization/nixos-container/nixos-container.pl
@ -458,7 +458,9 @@ elsif ($action eq "run") {

 elsif ($action eq "show-ip") {
    my $s = read_file($confFile) or die;
-    $s =~ /^LOCAL_ADDRESS=([0-9\.]+)(\/[0-9]+)?$/m or die "$0: cannot get IP address\n";
+    $s =~ /^LOCAL_ADDRESS=([0-9\.]+)(\/[0-9]+)?$/m
+        or $s =~ /^LOCAL_ADDRESS6=([0-9a-f:]+)(\/[0-9]+)?$/m
+        or die "$0: cannot get IP address\n";
    print "$1\n";
 }