diff options
| author | sternenseemann <git@lukasepple.de> | 2016-10-30 02:52:47 +0200 |
|---|---|---|
| committer | sternenseemann <git@lukasepple.de> | 2016-10-30 15:06:04 +0100 |
| commit | e2372502d3d0503711ea792a74292373286e5c8f (patch) | |
| tree | f213e1c0c10b379562acd31f7726667f5ed4114b /nixos/tests | |
| parent | 750af04badf015dfd1d9b2ec181e959b49927a42 (diff) | |
| download | nixpkgs-e2372502d3d0503711ea792a74292373286e5c8f.tar nixpkgs-e2372502d3d0503711ea792a74292373286e5c8f.tar.gz nixpkgs-e2372502d3d0503711ea792a74292373286e5c8f.tar.bz2 nixpkgs-e2372502d3d0503711ea792a74292373286e5c8f.tar.lz nixpkgs-e2372502d3d0503711ea792a74292373286e5c8f.tar.xz nixpkgs-e2372502d3d0503711ea792a74292373286e5c8f.tar.zst nixpkgs-e2372502d3d0503711ea792a74292373286e5c8f.zip | |
netcat: make netcat-openbsd the default netcat (#19411)
The motivation for this change is the following: As gnu-netcat, e. g. does not support ipv6, it is not suitable as default netcat. This commit also fixes all obvious build issues caused by this change.
Diffstat (limited to 'nixos/tests')
| -rw-r--r-- | nixos/tests/hibernate.nix | 4 | ||||
| -rw-r--r-- | nixos/tests/virtualbox.nix | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/nixos/tests/hibernate.nix b/nixos/tests/hibernate.nix index 787929f8904..7616a75b021 100644 --- a/nixos/tests/hibernate.nix +++ b/nixos/tests/hibernate.nix @@ -13,7 +13,7 @@ import ./make-test.nix (pkgs: { networking.firewall.allowedTCPPorts = [ 4444 ]; - systemd.services.listener.serviceConfig.ExecStart = "${pkgs.netcat}/bin/nc -l -p 4444"; + systemd.services.listener.serviceConfig.ExecStart = "${pkgs.netcat}/bin/nc -l 4444"; }; probe = { config, lib, pkgs, ...}: { @@ -36,7 +36,7 @@ import ./make-test.nix (pkgs: { $machine->waitForShutdown; $machine->start; $probe->waitForUnit("network.target"); - $probe->waitUntilSucceeds("echo test | nc -c machine 4444"); + $probe->waitUntilSucceeds("echo test | nc machine 4444"); ''; }) diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index 02a8fc68028..376c4f21dc0 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -299,9 +299,9 @@ let -pf /run/dhclient.pid \ -v eth0 eth1 - otherIP="$(${pkgs.netcat}/bin/netcat -clp 1234 || :)" + otherIP="$(${pkgs.netcat}/bin/nc -l 1234 || :)" ${pkgs.iputils}/bin/ping -I eth1 -c1 "$otherIP" - echo "$otherIP reachable" | ${pkgs.netcat}/bin/netcat -clp 5678 || : + echo "$otherIP reachable" | ${pkgs.netcat}/bin/nc -l 5678 || : ''; sysdDetectVirt = pkgs: '' @@ -461,11 +461,11 @@ in mapAttrs mkVBoxTest { my $test1IP = waitForIP_test1 1; my $test2IP = waitForIP_test2 1; - $machine->succeed("echo '$test2IP' | netcat -c '$test1IP' 1234"); - $machine->succeed("echo '$test1IP' | netcat -c '$test2IP' 1234"); + $machine->succeed("echo '$test2IP' | nc '$test1IP' 1234"); + $machine->succeed("echo '$test1IP' | nc '$test2IP' 1234"); - $machine->waitUntilSucceeds("netcat -c '$test1IP' 5678 >&2"); - $machine->waitUntilSucceeds("netcat -c '$test2IP' 5678 >&2"); + $machine->waitUntilSucceeds("nc '$test1IP' 5678 >&2"); + $machine->waitUntilSucceeds("nc '$test2IP' 5678 >&2"); shutdownVM_test1; shutdownVM_test2; |