Merge pull request #8173 from dezgeg/pr-kernel-config

kernel-config: Enable framebuffer console for BIOS systems & /proc/config.gz for ARM

Changed files
+3 -7
nixos
doc
manual
installation
modules
installer
pkgs
os-specific
linux
-4
nixos/doc/manual/installation/installing-uefi.xml
···
<option>boot.loader.efi</option> and <option>boot.loader.gummiboot</option>
as well.</para>
</listitem>
-
<listitem>
-
<para>To see console messages during early boot, add <literal>"fbcon"</literal>
-
to your <option>boot.initrd.kernelModules</option>.</para>
-
</listitem>
</itemizedlist>
</para>
-3
nixos/modules/installer/cd-dvd/installation-cd-base.nix
···
# 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 = "";
}
+3
pkgs/os-specific/linux/kernel/common-config.nix
···
STANDALONE n
# Make /proc/config.gz available.
+
IKCONFIG y
IKCONFIG_PROC y
# Optimize with -O2, not -Os.
···
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
''}