about summary refs log tree commit diff
path: root/nixos/modules/testing
diff options
context:
space:
mode:
authorSamuel Dionne-Riel <samuel@dionne-riel.com>2019-01-19 13:06:48 -0500
committerSamuel Dionne-Riel <samuel@dionne-riel.com>2019-01-19 13:24:39 -0500
commit3aab228d09f356c2aa170b5d581a9bde1c90db06 (patch)
tree096c609f5a8a28d933e6272152311e608eae1369 /nixos/modules/testing
parentbe445a9074f139d63e704fa82610d25456562c3d (diff)
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/modules/testing')
-rw-r--r--nixos/modules/testing/test-instrumentation.nix3
1 files changed, 1 insertions, 2 deletions
diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix
index aa0db4afd9788..ed4cfa7805e2d 100644
--- a/nixos/modules/testing/test-instrumentation.nix
+++ b/nixos/modules/testing/test-instrumentation.nix
@@ -55,8 +55,7 @@ with import ../../lib/qemu-flags.nix { inherit pkgs; };
     systemd.services."serial-getty@hvc0".enable = false;
 
     # Only use a serial console, no TTY.
-    # hvc1: socket backdoor, see "Debugging NixOS tests" section in NixOS manual
-    virtualisation.qemu.consoles = [ "hvc1" qemuSerialDevice ];
+    virtualisation.qemu.consoles = [ qemuSerialDevice ];
 
     boot.initrd.preDeviceCommands =
       ''