diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-06-20 15:31:17 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-20 15:31:17 -0400 |
| commit | 2b8ea614b8803952b08a8160d6ba0199422098b2 (patch) | |
| tree | 80a891d7319c8d0d55a2c7eb69837abda4620fdd /nixos/modules/system | |
| parent | c154646f5df5a825d3e7a8a2b4b1b9046650094a (diff) | |
| parent | 7938c1613d04dd4d0ce1e6fd6a8e92da29253c62 (diff) | |
| download | nixlib-2b8ea614b8803952b08a8160d6ba0199422098b2.tar nixlib-2b8ea614b8803952b08a8160d6ba0199422098b2.tar.gz nixlib-2b8ea614b8803952b08a8160d6ba0199422098b2.tar.bz2 nixlib-2b8ea614b8803952b08a8160d6ba0199422098b2.tar.lz nixlib-2b8ea614b8803952b08a8160d6ba0199422098b2.tar.xz nixlib-2b8ea614b8803952b08a8160d6ba0199422098b2.tar.zst nixlib-2b8ea614b8803952b08a8160d6ba0199422098b2.zip | |
Merge pull request #63090 from NixOS/nomodeset
kernel.nix: boot.vesa implies nomodeset
Diffstat (limited to 'nixos/modules/system')
| -rw-r--r-- | nixos/modules/system/boot/kernel.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index ab919099d112..ee43fe100238 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -196,7 +196,7 @@ in # (so you don't need to reboot to have changes take effect). boot.kernelParams = [ "loglevel=${toString config.boot.consoleLogLevel}" ] ++ - optionals config.boot.vesa [ "vga=0x317" ]; + optionals config.boot.vesa [ "vga=0x317" "nomodeset" ]; boot.kernel.sysctl."kernel.printk" = mkDefault config.boot.consoleLogLevel; |