Merge pull request #31753 from mbld/show-ip

nixos-container: Make show-ip work together with ipv4 + netmask

authored by Orivej Desh and committed by GitHub 963204e6 202912d6

+7 -1
+6
nixos/tests/containers-bridge.nix
··· 69 69 $machine->succeed("ping -n -c 1 $ip6"); 70 70 $machine->succeed("curl --fail http://[$ip6]/ > /dev/null"); 71 71 72 + # Check that nixos-container show-ip works in case of an ipv4 address with 73 + # subnetmask in CIDR notation. 74 + my $result = $machine->succeed("nixos-container show-ip webserver"); 75 + chomp $result; 76 + $result eq $ip or die; 77 + 72 78 # Stop the container. 73 79 $machine->succeed("nixos-container stop webserver"); 74 80 $machine->fail("curl --fail --connect-timeout 2 http://$ip/ > /dev/null");
+1 -1
pkgs/tools/virtualization/nixos-container/nixos-container.pl
··· 331 331 332 332 elsif ($action eq "show-ip") { 333 333 my $s = read_file($confFile) or die; 334 - $s =~ /^LOCAL_ADDRESS=([0-9\.]+)$/m or die "$0: cannot get IP address\n"; 334 + $s =~ /^LOCAL_ADDRESS=([0-9\.]+)(\/[0-9]+)?$/m or die "$0: cannot get IP address\n"; 335 335 print "$1\n"; 336 336 } 337 337