Author: eelco
Date: Fri Apr 8 14:42:35 2011
New Revision: 26756
URL: https://svn.nixos.org/websvn/nix/?rev=26756&sc=1
Log:
* "stage1panic" -> "stage1panic=1" to get rid of a harmless warning.
Modified:
nixos/trunk/modules/system/boot/stage-1-init.sh
nixos/trunk/modules/testing/test-instrumentation.nix
Modified: nixos/trunk/modules/system/boot/stage-1-init.sh
==============================================================================
--- nixos/trunk/modules/system/boot/stage-1-init.sh Fri Apr 8 14:11:54
2011 (r26755)
+++ nixos/trunk/modules/system/boot/stage-1-init.sh Fri Apr 8 14:42:35
2011 (r26756)
@@ -77,7 +77,7 @@
debug1mounts) # stop after mounting file systems
debug1mounts=1
;;
- stage1panic)
+ stage1panic=1)
panicOnFail=1
;;
root=*)
Modified: nixos/trunk/modules/testing/test-instrumentation.nix
==============================================================================
--- nixos/trunk/modules/testing/test-instrumentation.nix Fri Apr 8
14:11:54 2011 (r26755)
+++ nixos/trunk/modules/testing/test-instrumentation.nix Fri Apr 8
14:42:35 2011 (r26756)
@@ -84,7 +84,7 @@
# Panic if an error occurs in stage 1 (rather than waiting for
# user intervention).
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.
environment.systemPackages = [ pkgs.xorg.xwininfo ];
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
