From 97a37f7c12db198152cc37c637e59b04f3227571 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 8 Apr 2011 14:42:35 +0000
Subject: [PATCH] * "stage1panic" -> "stage1panic=1" to get rid of a harmless
 warning.

svn path=/nixos/trunk/; revision=26756
---
 modules/system/boot/stage-1-init.sh      | 2 +-
 modules/testing/test-instrumentation.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index 24c55d47e59..53df49599f6 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -77,7 +77,7 @@ for o in $(cat /proc/cmdline); do
         debug1mounts) # stop after mounting file systems
             debug1mounts=1
             ;;
-        stage1panic)
+        stage1panic=1)
             panicOnFail=1
             ;;
         root=*)
diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index 991c5d263a5..d1b3fe154d5 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -84,7 +84,7 @@ in
     # 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 ];