diff options
| author | Samuel Dionne-Riel | 2019-01-19 14:20:15 -0500 |
|---|---|---|
| committer | GitHub | 2019-01-19 14:20:15 -0500 |
| commit | 50555a6d35b5a8b0794bb1fb295f9c0af7e0956e (patch) | |
| tree | c36376de2871800fbe9bbd71dee14dc147d9707c /nixos/lib | |
| parent | 3fa77297b593bdcbb74250021a0130319384288c (diff) | |
| parent | 3aab228d09f356c2aa170b5d581a9bde1c90db06 (diff) | |
Merge pull request #54330 from samueldr/fix/disable-tests-shell-access
Revert "Add ssh backdoor to VM tests 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 c95bc548e04f..006da889671e 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; |