summary refs log tree commit diff
path: root/modules/system/boot/kernel.nix
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2010-01-15 21:55:51 +0000
committerMichael Raskin <7c6f434c@mail.ru>2010-01-15 21:55:51 +0000
commit6502806689113c1a12b944be2695664ea7e7f26a (patch)
tree185fe815edab644420cb616ff7ac000e95ec5197 /modules/system/boot/kernel.nix
parent8d5037ad62949c13d3018fb4e743df44878b09c4 (diff)
downloadnixpkgs-6502806689113c1a12b944be2695664ea7e7f26a.tar
nixpkgs-6502806689113c1a12b944be2695664ea7e7f26a.tar.gz
nixpkgs-6502806689113c1a12b944be2695664ea7e7f26a.tar.bz2
nixpkgs-6502806689113c1a12b944be2695664ea7e7f26a.tar.lz
nixpkgs-6502806689113c1a12b944be2695664ea7e7f26a.tar.xz
nixpkgs-6502806689113c1a12b944be2695664ea7e7f26a.tar.zst
nixpkgs-6502806689113c1a12b944be2695664ea7e7f26a.zip
Allow turning off VESA framebuffer
svn path=/nixos/trunk/; revision=19473
Diffstat (limited to 'modules/system/boot/kernel.nix')
-rw-r--r--modules/system/boot/kernel.nix13
1 files changed, 10 insertions, 3 deletions
diff --git a/modules/system/boot/kernel.nix b/modules/system/boot/kernel.nix
index d5d54d6f813..66b83107ec2 100644
--- a/modules/system/boot/kernel.nix
+++ b/modules/system/boot/kernel.nix
@@ -47,6 +47,14 @@ let kernel = config.boot.kernelPackages.kernel; in
       description = "Additional user-defined kernel parameters.";
     };
 
+    boot.vesa = mkOption {
+      default = true;
+      example = false;
+      description = ''
+        Whether to activate VESA video mode on boot
+      '';
+    };
+
     boot.extraModulePackages = mkOption {
       default = [];
       # !!! example = [pkgs.aufs pkgs.nvidia_x11];
@@ -115,9 +123,8 @@ let kernel = config.boot.kernelPackages.kernel; in
     system.modulesTree = [ kernel ] ++ config.boot.extraModulePackages;
 
     boot.kernelParams =
-      [ "splash=verbose"
-        "vga=0x317"
-      ];
+      [ "splash=verbose"] ++ 
+      optional config.boot.vesa "vga=0x317";
       
     boot.kernelModules = [ "loop" ];