diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-01-06 21:16:57 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-01-06 21:16:57 +0000 |
| commit | ec3398e4b2b987eaa0615ee2bab49ee9133e340d (patch) | |
| tree | f5a67bdee1a3bc24cf81827b62b4b89158835bc8 /modules/testing/test-instrumentation.nix | |
| parent | bffb5450e5b666d1328419a77df9ceb327d63ad9 (diff) | |
| download | nixpkgs-ec3398e4b2b987eaa0615ee2bab49ee9133e340d.tar nixpkgs-ec3398e4b2b987eaa0615ee2bab49ee9133e340d.tar.gz nixpkgs-ec3398e4b2b987eaa0615ee2bab49ee9133e340d.tar.bz2 nixpkgs-ec3398e4b2b987eaa0615ee2bab49ee9133e340d.tar.lz nixpkgs-ec3398e4b2b987eaa0615ee2bab49ee9133e340d.tar.xz nixpkgs-ec3398e4b2b987eaa0615ee2bab49ee9133e340d.tar.zst nixpkgs-ec3398e4b2b987eaa0615ee2bab49ee9133e340d.zip | |
* Move the serial console kernel parameters to test-instrumentation.nix.
svn path=/nixos/trunk/; revision=19275
Diffstat (limited to 'modules/testing/test-instrumentation.nix')
| -rw-r--r-- | modules/testing/test-instrumentation.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix index 4b142197932..c404e044f63 100644 --- a/modules/testing/test-instrumentation.nix +++ b/modules/testing/test-instrumentation.nix @@ -69,7 +69,8 @@ in # Panic if an error occurs in stage 1 (rather than waiting for # user intervention). - boot.kernelParams = [ "stage1panic" ]; + boot.kernelParams = + [ "console=tty1" "console=ttyS0" "panic=1" "stage1panic" ]; # `xwininfo' is used by the test driver to query open windows. environment.systemPackages = [ pkgs.xorg.xwininfo ]; |