diff options
author | Tim Steinbach <NeQuissimus@users.noreply.github.com> | 2016-11-02 19:44:29 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-02 19:44:29 -0400 |
commit | 04b22dd935ee3359adaef20186db50017dbe3975 (patch) | |
tree | 01e57cba5550a8dc45bd068e8d833743ec2e8476 /nixos | |
parent | 9e150c92d4de210f84bb5bd80630cc07a12f40be (diff) | |
parent | bbe9159725d73a77922953b3cd17c862451ba59a (diff) | |
download | nixlib-04b22dd935ee3359adaef20186db50017dbe3975.tar nixlib-04b22dd935ee3359adaef20186db50017dbe3975.tar.gz nixlib-04b22dd935ee3359adaef20186db50017dbe3975.tar.bz2 nixlib-04b22dd935ee3359adaef20186db50017dbe3975.tar.lz nixlib-04b22dd935ee3359adaef20186db50017dbe3975.tar.xz nixlib-04b22dd935ee3359adaef20186db50017dbe3975.tar.zst nixlib-04b22dd935ee3359adaef20186db50017dbe3975.zip |
Merge pull request #19982 from sternenseemann/netcat
Make netcat-openbsd the default netcat
Diffstat (limited to 'nixos')
-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 787929f8904d..7616a75b0214 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 02a8fc680280..376c4f21dc04 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; |