public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

kernel-config: Enable framebuffer console for BIOS systems & /proc/config.gz for ARM
This commit is contained in:
William A. Kennington III 2015-06-07 10:14:51 -07:00
parent 42c65fd1c9 6be70d17c0
commit 514a9fdf87
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/doc/manual/installation/installing-uefi.xml
View File

@ -41,10 +41,6 @@ changes:
<option>boot.loader.efi</option> and <option>boot.loader.gummiboot</option> <option>boot.loader.efi</option> and <option>boot.loader.gummiboot</option>
as well.</para> as well.</para>
</listitem> </listitem>
<listitem>
<para>To see console messages during early boot, add <literal>"fbcon"</literal>
to your <option>boot.initrd.kernelModules</option>.</para>
</listitem>
</itemizedlist> </itemizedlist>
</para> </para>

3
nixos/modules/installer/cd-dvd/installation-cd-base.nix
View File

@ -42,9 +42,6 @@ with lib;
# Add Memtest86+ to the CD. # Add Memtest86+ to the CD.
boot.loader.grub.memtest86.enable = true; 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. # Allow the user to log in as root without a password.
users.extraUsers.root.initialHashedPassword = ""; users.extraUsers.root.initialHashedPassword = "";
} }

3
pkgs/os-specific/linux/kernel/common-config.nix
View File

@ -54,6 +54,7 @@ with stdenv.lib;
STANDALONE n STANDALONE n
# Make /proc/config.gz available. # Make /proc/config.gz available.
IKCONFIG y
IKCONFIG_PROC y IKCONFIG_PROC y
# Optimize with -O2, not -Os. # Optimize with -O2, not -Os.
@ -131,6 +132,8 @@ with stdenv.lib;
FB_SIS_300 y FB_SIS_300 y
FB_SIS_315 y FB_SIS_315 y
FB_3DFX_ACCEL y FB_3DFX_ACCEL y
FB_VESA y
FRAMEBUFFER_CONSOLE y
${optionalString (versionOlder version "3.9" || stdenv.system == "i686-linux") '' ${optionalString (versionOlder version "3.9" || stdenv.system == "i686-linux") ''
FB_GEODE y FB_GEODE y
''} ''}