about summary refs log tree commit diff
path: root/nixos/modules
diff options
context:
space:
mode:
authorSamuel Dionne-Riel <samuel@dionne-riel.com>2019-01-19 14:20:15 -0500
committerGitHub <noreply@github.com>2019-01-19 14:20:15 -0500
commit50555a6d35b5a8b0794bb1fb295f9c0af7e0956e (patch)
treec36376de2871800fbe9bbd71dee14dc147d9707c /nixos/modules
parent3fa77297b593bdcbb74250021a0130319384288c (diff)
parent3aab228d09f356c2aa170b5d581a9bde1c90db06 (diff)
downloadnixlib-50555a6d35b5a8b0794bb1fb295f9c0af7e0956e.tar
nixlib-50555a6d35b5a8b0794bb1fb295f9c0af7e0956e.tar.gz
nixlib-50555a6d35b5a8b0794bb1fb295f9c0af7e0956e.tar.bz2
nixlib-50555a6d35b5a8b0794bb1fb295f9c0af7e0956e.tar.lz
nixlib-50555a6d35b5a8b0794bb1fb295f9c0af7e0956e.tar.xz
nixlib-50555a6d35b5a8b0794bb1fb295f9c0af7e0956e.tar.zst
nixlib-50555a6d35b5a8b0794bb1fb295f9c0af7e0956e.zip
Merge pull request #54330 from samueldr/fix/disable-tests-shell-access
Revert "Add ssh backdoor to VM tests infrastructure."
Diffstat (limited to 'nixos/modules')
-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 aa0db4afd978..ed4cfa7805e2 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 =
       ''