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 /pkgs/build-support/vm/windows/controller/default.nix | |
| parent | 750af04badf015dfd1d9b2ec181e959b49927a42 (diff) | |
| download | nixlib-e2372502d3d0503711ea792a74292373286e5c8f.tar nixlib-e2372502d3d0503711ea792a74292373286e5c8f.tar.gz nixlib-e2372502d3d0503711ea792a74292373286e5c8f.tar.bz2 nixlib-e2372502d3d0503711ea792a74292373286e5c8f.tar.lz nixlib-e2372502d3d0503711ea792a74292373286e5c8f.tar.xz nixlib-e2372502d3d0503711ea792a74292373286e5c8f.tar.zst nixlib-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 'pkgs/build-support/vm/windows/controller/default.nix')
| -rw-r--r-- | pkgs/build-support/vm/windows/controller/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/build-support/vm/windows/controller/default.nix b/pkgs/build-support/vm/windows/controller/default.nix index 06a0a2293064..9009702113ea 100644 --- a/pkgs/build-support/vm/windows/controller/default.nix +++ b/pkgs/build-support/vm/windows/controller/default.nix @@ -1,5 +1,5 @@ { stdenv, writeScript, vmTools, makeInitrd -, samba, vde2, openssh, socat, netcat, coreutils, gnugrep, gzip +, samba, vde2, openssh, socat, netcat-gnu, coreutils, gnugrep, gzip }: { sshKey @@ -79,7 +79,7 @@ let ${coreutils}/bin/chmod 600 /ssh.key '' + (if installMode then '' echo -n "Waiting for Windows installation to finish..." - while ! ${netcat}/bin/netcat -z 192.168.0.1 22; do + while ! ${netcat-gnu}/bin/netcat -z 192.168.0.1 22; do echo -n . # Print a dot every 10 seconds only to shorten line length. ${coreutils}/bin/sleep 10 @@ -118,7 +118,7 @@ let ${samba}/sbin/smbd -D echo -n "Waiting for Windows VM to become available..." - while ! ${netcat}/bin/netcat -z 192.168.0.1 22; do + while ! ${netcat-gnu}/bin/netcat -z 192.168.0.1 22; do echo -n . ${coreutils}/bin/sleep 1 done |