about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorrnhmjoj <rnhmjoj@inventati.org>2021-09-22 09:19:46 +0200
committerrnhmjoj <rnhmjoj@inventati.org>2021-09-22 11:20:30 +0200
commit1f826a71645203bbf6f6f6ec0d5e6973d7f0464a (patch)
treecc5fa12367cf2753c936d5f4c27ef1433b97a3ae /nixos
parente2a668224fbd0a577bcf5a89d9e10a95cceeffc3 (diff)
downloadnixlib-1f826a71645203bbf6f6f6ec0d5e6973d7f0464a.tar
nixlib-1f826a71645203bbf6f6f6ec0d5e6973d7f0464a.tar.gz
nixlib-1f826a71645203bbf6f6f6ec0d5e6973d7f0464a.tar.bz2
nixlib-1f826a71645203bbf6f6f6ec0d5e6973d7f0464a.tar.lz
nixlib-1f826a71645203bbf6f6f6ec0d5e6973d7f0464a.tar.xz
nixlib-1f826a71645203bbf6f6f6ec0d5e6973d7f0464a.tar.zst
nixlib-1f826a71645203bbf6f6f6ec0d5e6973d7f0464a.zip
nixos/tests/ec2: fix conflicting option values
Diffstat (limited to 'nixos')
-rw-r--r--nixos/tests/ec2.nix5
1 files changed, 5 insertions, 0 deletions
diff --git a/nixos/tests/ec2.nix b/nixos/tests/ec2.nix
index df0672480168..aa3c2b7051f6 100644
--- a/nixos/tests/ec2.nix
+++ b/nixos/tests/ec2.nix
@@ -24,6 +24,11 @@ let
           ln -s vda1 /dev/xvda1
         '';
 
+        # In a NixOS test the serial console is occupied by the "backdoor"
+        # (see testing/test-instrumentation.nix) and is incompatible with
+        # the configuration in virtualisation/amazon-image.nix.
+        systemd.services."serial-getty@ttyS0".enable = mkForce false;
+
         # Needed by nixos-rebuild due to the lack of network
         # access. Determined by trial and error.
         system.extraDependencies = with pkgs; ( [