public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* "stage1panic" -> "stage1panic=1" to get rid of a harmless warning.

Browse Source 
svn path=/nixos/trunk/; revision=26756
This commit is contained in:
Eelco Dolstra 2011-04-08 14:42:35 +00:00
parent 05ff7baf48
commit 97a37f7c12
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/system/boot/stage-1-init.sh
View File

@ -77,7 +77,7 @@ for o in $(cat /proc/cmdline); do
debug1mounts) # stop after mounting file systems debug1mounts) # stop after mounting file systems
debug1mounts=1 debug1mounts=1
;; ;;
stage1panic) stage1panic=1)
panicOnFail=1 panicOnFail=1
;; ;;
root=*) root=*)

2
modules/testing/test-instrumentation.nix
View File

@ -84,7 +84,7 @@ in
# Panic if an error occurs in stage 1 (rather than waiting for # Panic if an error occurs in stage 1 (rather than waiting for
# user intervention). # user intervention).
boot.kernelParams = boot.kernelParams =
[ "console=tty1" "console=ttyS0" "panic=1" "stage1panic" ]; [ "console=tty1" "console=ttyS0" "panic=1" "stage1panic=1" ];
# `xwininfo' is used by the test driver to query open windows. # `xwininfo' is used by the test driver to query open windows.
environment.systemPackages = [ pkgs.xorg.xwininfo ]; environment.systemPackages = [ pkgs.xorg.xwininfo ];