diff options
Diffstat (limited to 'nixpkgs/nixos/modules/testing/test-instrumentation.nix')
| -rw-r--r-- | nixpkgs/nixos/modules/testing/test-instrumentation.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nixpkgs/nixos/modules/testing/test-instrumentation.nix b/nixpkgs/nixos/modules/testing/test-instrumentation.nix index 50a54a006415..28abbe66adaf 100644 --- a/nixpkgs/nixos/modules/testing/test-instrumentation.nix +++ b/nixpkgs/nixos/modules/testing/test-instrumentation.nix @@ -56,14 +56,14 @@ in options.testing = { - initrdBackdoor = lib.mkEnableOption (lib.mdDoc '' + initrdBackdoor = lib.mkEnableOption '' enable backdoor.service in initrd. Requires boot.initrd.systemd.enable to be enabled. Boot will pause in stage 1 at initrd.target, and will listen for commands from the Machine python interface, just like stage 2 normally does. This enables commands to be sent to test and debug stage 1. Use machine.switch_root() to leave stage 1 and proceed to stage 2. - ''); + ''; }; @@ -170,7 +170,7 @@ in # thing, but for VM tests it should provide a bit more # determinism (e.g. if the VM runs at lower speed, then # timeouts in the VM should also be delayed). - "clock=acpi_pm" + "clocksource=acpi_pm" ]; # `xwininfo' is used by the test driver to query open windows. @@ -216,7 +216,7 @@ in # uses credentials to set passwords on users. users.users.root.hashedPasswordFile = mkOverride 150 "${pkgs.writeText "hashed-password.root" ""}"; - services.xserver.displayManager.job.logToJournal = true; + services.displayManager.logToJournal = true; # Make sure we use the Guest Agent from the QEMU package for testing # to reduce the closure size required for the tests. |