diff options
| author | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2019-01-19 13:06:48 -0500 |
|---|---|---|
| committer | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2019-01-19 13:24:39 -0500 |
| commit | 3aab228d09f356c2aa170b5d581a9bde1c90db06 (patch) | |
| tree | 096c609f5a8a28d933e6272152311e608eae1369 /nixos/lib | |
| parent | be445a9074f139d63e704fa82610d25456562c3d (diff) | |
| download | nixpkgs-3aab228d09f356c2aa170b5d581a9bde1c90db06.tar nixpkgs-3aab228d09f356c2aa170b5d581a9bde1c90db06.tar.gz nixpkgs-3aab228d09f356c2aa170b5d581a9bde1c90db06.tar.bz2 nixpkgs-3aab228d09f356c2aa170b5d581a9bde1c90db06.tar.lz nixpkgs-3aab228d09f356c2aa170b5d581a9bde1c90db06.tar.xz nixpkgs-3aab228d09f356c2aa170b5d581a9bde1c90db06.tar.zst nixpkgs-3aab228d09f356c2aa170b5d581a9bde1c90db06.zip | |
Revert "Add ssh backdoor to VM tests infrastructure."
This reverts commit d6e3db44cf09d04f0a3cd5b7ccb4a5dc3b7bfaa9. See #53935 for explanations. In short, it may be causing issues with tests on the build infrastructure.
Diffstat (limited to 'nixos/lib')
| -rw-r--r-- | nixos/lib/test-driver/Machine.pm | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm index c95bc548e04..006da889671 100644 --- a/nixos/lib/test-driver/Machine.pm +++ b/nixos/lib/test-driver/Machine.pm @@ -156,10 +156,8 @@ sub start { $ENV{USE_TMPDIR} = 1; $ENV{QEMU_OPTS} = ($self->{allowReboot} ? "" : "-no-reboot ") . - "-monitor unix:./monitor " . - "-chardev socket,id=shell,path=./shell -device virtio-serial -device virtconsole,chardev=shell " . - # socket backdoor, see "Debugging NixOS tests" section in NixOS manual - "-chardev socket,id=backdoor,path=./backdoor,server,nowait -device virtio-serial -device virtconsole,chardev=backdoor " . + "-monitor unix:./monitor -chardev socket,id=shell,path=./shell " . + "-device virtio-serial -device virtconsole,chardev=shell " . "-device virtio-rng-pci " . ($showGraphics ? "-serial stdio" : "-nographic") . " " . ($ENV{QEMU_OPTS} || ""); chdir $self->{stateDir} or die; |