From 7fc1efdac7e09f7254d7c3d84459522cf5724dfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vojt=C4=9Bch=20K=C3=A1n=C4=9B?= Date: Wed, 17 Feb 2021 14:17:28 +0100 Subject: [PATCH] fixup! nixos-container: fix show-ip command to support IPv6 addresses --- pkgs/tools/virtualization/nixos-container/nixos-container.pl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/virtualization/nixos-container/nixos-container.pl b/pkgs/tools/virtualization/nixos-container/nixos-container.pl index 39bc57e9f1e..b399b3d6917 100755 --- 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-9a-zA-Z:]+))(\/[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"; }