diff options
| author | Orivej Desh <orivej@gmx.fr> | 2017-11-17 00:32:56 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-17 00:32:56 +0000 |
| commit | 963204e6eef211f452d4ed45e40269d720d19ba4 (patch) | |
| tree | 1a09ccbb425fe75d62a71036259f2d8f37da9e95 | |
| parent | 202912d6179696bd6d34df42d7f31a93b05c356b (diff) | |
| parent | 25b71e18f50ed951ada5ad63e32f25d990abec5e (diff) | |
| download | nixlib-963204e6eef211f452d4ed45e40269d720d19ba4.tar nixlib-963204e6eef211f452d4ed45e40269d720d19ba4.tar.gz nixlib-963204e6eef211f452d4ed45e40269d720d19ba4.tar.bz2 nixlib-963204e6eef211f452d4ed45e40269d720d19ba4.tar.lz nixlib-963204e6eef211f452d4ed45e40269d720d19ba4.tar.xz nixlib-963204e6eef211f452d4ed45e40269d720d19ba4.tar.zst nixlib-963204e6eef211f452d4ed45e40269d720d19ba4.zip | |
Merge pull request #31753 from mbld/show-ip
nixos-container: Make show-ip work together with ipv4 + netmask
| -rw-r--r-- | nixos/tests/containers-bridge.nix | 6 | ||||
| -rwxr-xr-x | pkgs/tools/virtualization/nixos-container/nixos-container.pl | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/nixos/tests/containers-bridge.nix b/nixos/tests/containers-bridge.nix index 598abd22e61b..b8d4759684cc 100644 --- a/nixos/tests/containers-bridge.nix +++ b/nixos/tests/containers-bridge.nix @@ -69,6 +69,12 @@ import ./make-test.nix ({ pkgs, ...} : { $machine->succeed("ping -n -c 1 $ip6"); $machine->succeed("curl --fail http://[$ip6]/ > /dev/null"); + # Check that nixos-container show-ip works in case of an ipv4 address with + # subnetmask in CIDR notation. + my $result = $machine->succeed("nixos-container show-ip webserver"); + chomp $result; + $result eq $ip or die; + # Stop the container. $machine->succeed("nixos-container stop webserver"); $machine->fail("curl --fail --connect-timeout 2 http://$ip/ > /dev/null"); 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"; } |