diff options
| author | Vojtěch Káně <vojtech.kane@gmail.com> | 2021-02-17 14:17:28 +0100 |
|---|---|---|
| committer | Vojtěch Káně <vojtech.kane@gmail.com> | 2021-02-17 14:17:28 +0100 |
| commit | 7fc1efdac7e09f7254d7c3d84459522cf5724dfa (patch) | |
| tree | e2af7770eed7fcaf97fcb9115eb70f02cdee33dd /pkgs/tools/virtualization/nixos-container | |
| parent | 5e9811b552779744e4a2e8aa0d0f6d4ddb346665 (diff) | |
fixup! nixos-container: fix show-ip command to support IPv6 addresses
Diffstat (limited to 'pkgs/tools/virtualization/nixos-container')
| -rwxr-xr-x | pkgs/tools/virtualization/nixos-container/nixos-container.pl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/tools/virtualization/nixos-container/nixos-container.pl b/pkgs/tools/virtualization/nixos-container/nixos-container.pl index 39bc57e9f1e8..b399b3d69174 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"; } |