From 9c2f2bc89334a0c824d83c0d50072580f77b365c Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Wed, 3 Jun 2015 23:43:17 +0300 Subject: [PATCH 1/2] kernel-config: Enable FB_VESA and FRAMEBUFFER_CONSOLE Commit 159fed47bc (nixos/grub: Fix video display on efi) changed BIOS systems to start in non-text mode as well. Enable FB_VESA to get a framebuffer console on BIOS systems. Change FRAMEBUFFER_CONSOLE to 'y' instead of the default 'm' to so the user doesn't need to manually load the fbcon module anymore. Other distros have similar defaults, at least on Arch: CONFIG_FB_VESA=y CONFIG_FRAMEBUFFER_CONSOLE=y and on Ubuntu (12.04): CONFIG_FB_VESA=m CONFIG_FRAMEBUFFER_CONSOLE=y Fixes #8139 --- nixos/doc/manual/installation/installing-uefi.xml | 4 ---- nixos/modules/installer/cd-dvd/installation-cd-base.nix | 3 --- pkgs/os-specific/linux/kernel/common-config.nix | 2 ++ 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/nixos/doc/manual/installation/installing-uefi.xml b/nixos/doc/manual/installation/installing-uefi.xml index dbd5606c4a5..90d18695447 100644 --- a/nixos/doc/manual/installation/installing-uefi.xml +++ b/nixos/doc/manual/installation/installing-uefi.xml @@ -41,10 +41,6 @@ changes: and as well. - - To see console messages during early boot, add "fbcon" - to your . - diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix index 446d79ce220..a660199cbe0 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix @@ -42,9 +42,6 @@ with lib; # Add Memtest86+ to the CD. boot.loader.grub.memtest86.enable = true; - # Get a console as soon as the initrd loads fbcon on EFI boot. - boot.initrd.kernelModules = [ "fbcon" ]; - # Allow the user to log in as root without a password. users.extraUsers.root.initialHashedPassword = ""; } diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 25b707614ed..cfe77792f85 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -131,6 +131,8 @@ with stdenv.lib; FB_SIS_300 y FB_SIS_315 y FB_3DFX_ACCEL y + FB_VESA y + FRAMEBUFFER_CONSOLE y ${optionalString (versionOlder version "3.9" || stdenv.system == "i686-linux") '' FB_GEODE y ''} From 6be70d17c0f43368b008f54e3c3f2aa093249e63 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Thu, 4 Jun 2015 11:15:31 +0300 Subject: [PATCH 2/2] kernel-config: Enable IKCONFIG so ARM gets /proc/config.gz IKCONFIG must be enabled so IKCONFIG_PROC can be set. On x86 IKCONFIG gets implicitly enabled by kernelAutoModules in platforms.nix. But ARM doesn't use kernelAutoModules, so IKCONFIG_PROC won't get enabled without this patch. --- pkgs/os-specific/linux/kernel/common-config.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index cfe77792f85..a972c4e60f8 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -54,6 +54,7 @@ with stdenv.lib; STANDALONE n # Make /proc/config.gz available. + IKCONFIG y IKCONFIG_PROC y # Optimize with -O2, not -Os.