natalie
/
nixpkgs-custom
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

replace ping6 with ping 

reason: after the upgrade of iputils from 20151218 to 20161105
functionality of ping6 and tracepath6 was merged into ping and tracepath.

Ping is now mostly a drop-in replacment for ping6, except that selecting a
specific interface is done by encoding it into the address (ex.: fe80::1%eth0)
rather then specifing it with the `-I` flag.
release-18.03-flake
Jörg Thalheim 2017-02-15 11:05:50 +01:00
parent a674dea675
commit fd78ff23f7
No known key found for this signature in database
GPG Key ID: CA4106B8D7CC79FA
8 changed files with 29 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/tasks/network-interfaces.nix
View File

@ -940,14 +940,8 @@ in
source = "${pkgs.iputils.out}/bin/ping";
capabilities = "cap_net_raw+p";
};
ping6 = {
source = "${pkgs.iputils.out}/bin/ping6";
capabilities = "cap_net_raw+p";
};
} else {
ping.source = "${pkgs.iputils.out}/bin/ping";
"ping6".source = "${pkgs.iputils.out}/bin/ping6";
};
# Set the host and domain names in the activation script. Don't

12
nixos/tests/cjdns.nix
View File

@ -109,14 +109,14 @@ import ./make-test.nix ({ pkgs, ...} : {
# ping a few times each to let the routing table establish itself
$alice->succeed("ping6 -c 4 $carolIp6");
$bob->succeed("ping6 -c 4 $carolIp6");
$alice->succeed("ping -c 4 $carolIp6");
$bob->succeed("ping -c 4 $carolIp6");
$carol->succeed("ping6 -c 4 $aliceIp6");
$carol->succeed("ping6 -c 4 $bobIp6");
$carol->succeed("ping -c 4 $aliceIp6");
$carol->succeed("ping -c 4 $bobIp6");
$alice->succeed("ping6 -c 4 $bobIp6");
$bob->succeed("ping6 -c 4 $aliceIp6");
$alice->succeed("ping -c 4 $bobIp6");
$bob->succeed("ping -c 4 $aliceIp6");
$alice->waitForUnit("httpd.service");

2
nixos/tests/containers-bridge.nix
View File

@ -66,7 +66,7 @@ import ./make-test.nix ({ pkgs, ...} : {
"${containerIp6}" =~ /([^\/]+)\/([0-9+])/;
my $ip6 = $1;
chomp $ip6;
$machine->succeed("ping6 -n -c 1 $ip6");
$machine->succeed("ping -n -c 1 $ip6");
$machine->succeed("curl --fail http://[$ip6]/ > /dev/null");
# Stop the container.

2
nixos/tests/containers-extra_veth.nix
View File

@ -84,7 +84,7 @@ import ./make-test.nix ({ pkgs, ...} : {
# Ping on main veth
$machine->succeed("ping -n -c 1 192.168.0.100");
$machine->succeed("ping6 -n -c 1 fc00::2");
$machine->succeed("ping -n -c 1 fc00::2");
# Ping on the first extra veth
$machine->succeed("ping -n -c 1 192.168.1.100 >&2");

2
nixos/tests/containers-ipv6.nix
View File

@ -47,7 +47,7 @@ import ./make-test.nix ({ pkgs, ...} : {
# multi-user.target, we should now be able to access it.
my $ip = "${localIp}";
chomp $ip;
$machine->succeed("ping6 -n -c 1 $ip");
$machine->succeed("ping -n -c 1 $ip");
$machine->succeed("curl --fail http://[$ip]/ > /dev/null");
# Stop the container.

12
nixos/tests/ipv6.nix
View File

@ -54,22 +54,22 @@ import ./make-test.nix ({ pkgs, ...} : {
}
subtest "loopback address", sub {
$client->succeed("ping6 -c 1 ::1 >&2");
$client->fail("ping6 -c 1 ::2 >&2");
$client->succeed("ping -c 1 ::1 >&2");
$client->fail("ping -c 1 ::2 >&2");
};
subtest "local link addressing", sub {
my $clientIp = waitForAddress $client, "eth1", "link";
my $serverIp = waitForAddress $server, "eth1", "link";
$client->succeed("ping6 -c 1 -I eth1 $clientIp >&2");
$client->succeed("ping6 -c 1 -I eth1 $serverIp >&2");
$client->succeed("ping -c 1 $clientIp%eth1 >&2");
$client->succeed("ping -c 1 $serverIp%eth1 >&2");
};
subtest "global addressing", sub {
my $clientIp = waitForAddress $client, "eth1", "global";
my $serverIp = waitForAddress $server, "eth1", "global";
$client->succeed("ping6 -c 1 $clientIp >&2");
$client->succeed("ping6 -c 1 $serverIp >&2");
$client->succeed("ping -c 1 $clientIp >&2");
$client->succeed("ping -c 1 $serverIp >&2");
$client->succeed("curl --fail -g http://[$serverIp]");
$client->fail("curl --fail -g http://[$clientIp]");
};

24
nixos/tests/networking.nix
View File

@ -166,24 +166,24 @@ let
# Test vlan 1
$client->waitUntilSucceeds("ping -c 1 192.168.1.1");
$client->waitUntilSucceeds("ping -c 1 192.168.1.2");
$client->waitUntilSucceeds("ping6 -c 1 fd00:1234:5678:1::1");
$client->waitUntilSucceeds("ping6 -c 1 fd00:1234:5678:1::2");
$client->waitUntilSucceeds("ping -c 1 fd00:1234:5678:1::1");
$client->waitUntilSucceeds("ping -c 1 fd00:1234:5678:1::2");
$router->waitUntilSucceeds("ping -c 1 192.168.1.1");
$router->waitUntilSucceeds("ping -c 1 192.168.1.2");
$router->waitUntilSucceeds("ping6 -c 1 fd00:1234:5678:1::1");
$router->waitUntilSucceeds("ping6 -c 1 fd00:1234:5678:1::2");
$router->waitUntilSucceeds("ping -c 1 fd00:1234:5678:1::1");
$router->waitUntilSucceeds("ping -c 1 fd00:1234:5678:1::2");
# Test vlan 2
$client->waitUntilSucceeds("ping -c 1 192.168.2.1");
$client->waitUntilSucceeds("ping -c 1 192.168.2.2");
$client->waitUntilSucceeds("ping6 -c 1 fd00:1234:5678:2::1");
$client->waitUntilSucceeds("ping6 -c 1 fd00:1234:5678:2::2");
$client->waitUntilSucceeds("ping -c 1 fd00:1234:5678:2::1");
$client->waitUntilSucceeds("ping -c 1 fd00:1234:5678:2::2");
$router->waitUntilSucceeds("ping -c 1 192.168.2.1");
$router->waitUntilSucceeds("ping -c 1 192.168.2.2");
$router->waitUntilSucceeds("ping6 -c 1 fd00:1234:5678:2::1");
$router->waitUntilSucceeds("ping6 -c 1 fd00:1234:5678:2::2");
$router->waitUntilSucceeds("ping -c 1 fd00:1234:5678:2::1");
$router->waitUntilSucceeds("ping -c 1 fd00:1234:5678:2::2");
'';
};
dhcpOneIf = {
@ -390,11 +390,11 @@ let
$client2->succeed("ip addr >&2");
# Test ipv6
$client1->waitUntilSucceeds("ping6 -c 1 fc00::1");
$client1->waitUntilSucceeds("ping6 -c 1 fc00::2");
$client1->waitUntilSucceeds("ping -c 1 fc00::1");
$client1->waitUntilSucceeds("ping -c 1 fc00::2");
$client2->waitUntilSucceeds("ping6 -c 1 fc00::1");
$client2->waitUntilSucceeds("ping6 -c 1 fc00::2");
$client2->waitUntilSucceeds("ping -c 1 fc00::1");
$client2->waitUntilSucceeds("ping -c 1 fc00::2");
'';
};
vlan = let

4
pkgs/servers/monitoring/nagios/plugins/official-2.x.nix
View File

@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
# configured on the build machine).
preConfigure= "
configureFlagsArray=(
--with-ping-command='/run/wrappers/bin/ping -n -U -w %d -c %d %s'
--with-ping6-command='/run/wrappers/bin/ping6 -n -U -w %d -c %d %s'
--with-ping-command='/run/wrappers/bin/ping -4 -n -U -w %d -c %d %s'
--with-ping6-command='/run/wrappers/bin/ping -6 -n -U -w %d -c %d %s'
)
";