about summary refs log tree commit diff
path: root/nixos/modules/system/boot
diff options
context:
space:
mode:
authorMarek Mahut <marek.mahut@gmail.com>2020-02-13 09:47:54 +0100
committerGitHub <noreply@github.com>2020-02-13 09:47:54 +0100
commit4011c2a2aa3e34727ba176a36b6034a2519d2afd (patch)
tree0db1ae5618a737d7a701b658e96fd19297563e23 /nixos/modules/system/boot
parent3b7f5c6762bb174bd9951a697b636e1db531e98a (diff)
parenteaffc7d0a5f85d3c0ff0b6405de712eebc4b337d (diff)
downloadnixlib-4011c2a2aa3e34727ba176a36b6034a2519d2afd.tar
nixlib-4011c2a2aa3e34727ba176a36b6034a2519d2afd.tar.gz
nixlib-4011c2a2aa3e34727ba176a36b6034a2519d2afd.tar.bz2
nixlib-4011c2a2aa3e34727ba176a36b6034a2519d2afd.tar.lz
nixlib-4011c2a2aa3e34727ba176a36b6034a2519d2afd.tar.xz
nixlib-4011c2a2aa3e34727ba176a36b6034a2519d2afd.tar.zst
nixlib-4011c2a2aa3e34727ba176a36b6034a2519d2afd.zip
Merge pull request #76481 from fare-patches/vesa
Deprecate the boot.vesa option
Diffstat (limited to 'nixos/modules/system/boot')
-rw-r--r--nixos/modules/system/boot/kernel.nix7
1 files changed, 6 insertions, 1 deletions
diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix
index 6edb9082e75a..c247f334c23d 100644
--- a/nixos/modules/system/boot/kernel.nix
+++ b/nixos/modules/system/boot/kernel.nix
@@ -101,7 +101,12 @@ in
       type = types.bool;
       default = false;
       description = ''
-        Whether to activate VESA video mode on boot.
+        (Deprecated) This option, if set, activates the VESA 800x600 video
+        mode on boot and disables kernel modesetting. It is equivalent to
+        specifying <literal>[ "vga=0x317" "nomodeset" ]</literal> in the
+        <option>boot.kernelParams</option> option. This option is
+        deprecated as of 2020: Xorg now works better with modesetting, and
+        you might want a different VESA vga setting, anyway.
       '';
     };