From 9889d9f9f8f38f74bc42dd2e658a9f29a184fefb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 5 Jan 2010 13:11:12 +0000
Subject: [PATCH] * Remove most default kernel options since they have no
 effect.  Also,   don't put them in a default, so that they can easily be
 added to.

svn path=/nixos/trunk/; revision=19232
---
 modules/system/boot/kernel.nix | 14 ++++++--------
 tests/trac.nix                 |  1 -
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/modules/system/boot/kernel.nix b/modules/system/boot/kernel.nix
index 4cb862a3a00..60bc47cdc65 100644
--- a/modules/system/boot/kernel.nix
+++ b/modules/system/boot/kernel.nix
@@ -28,14 +28,7 @@ let kernel = config.boot.kernelPackages.kernel; in
     };
 
     boot.kernelParams = mkOption {
-      default = [
-        "selinux=0"
-        "apm=on"
-        "acpi=on"
-        "console=tty1"
-        "splash=verbose"
-        "vga=0x317"
-      ];
+      default = [ ];
       description = ''
         The kernel parameters.  If you want to add additional
         parameters, it's best to set
@@ -116,6 +109,11 @@ let kernel = config.boot.kernelPackages.kernel; in
     
     system.modulesTree = [ kernel ] ++ config.boot.extraModulePackages;
 
+    boot.kernelParams =
+      [ "splash=verbose"
+        "vga=0x317"
+      ];
+      
     boot.kernelModules = [ "loop" ];
 
     boot.initrd.availableKernelModules =
diff --git a/tests/trac.nix b/tests/trac.nix
index f544c5e99cd..7fe85dbabfe 100644
--- a/tests/trac.nix
+++ b/tests/trac.nix
@@ -67,7 +67,6 @@
           useDefaultShell = true;
           password = "foobar";
         };
-        environment.systemPackages = [ pkgs.scrot ];
       };
   };