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

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

+3 -7
-4
nixos/doc/manual/installation/installing-uefi.xml
··· 41 <option>boot.loader.efi</option> and <option>boot.loader.gummiboot</option> 42 as well.</para> 43 </listitem> 44 - <listitem> 45 - <para>To see console messages during early boot, add <literal>"fbcon"</literal> 46 - to your <option>boot.initrd.kernelModules</option>.</para> 47 - </listitem> 48 </itemizedlist> 49 </para> 50
··· 41 <option>boot.loader.efi</option> and <option>boot.loader.gummiboot</option> 42 as well.</para> 43 </listitem> 44 </itemizedlist> 45 </para> 46
-3
nixos/modules/installer/cd-dvd/installation-cd-base.nix
··· 42 # Add Memtest86+ to the CD. 43 boot.loader.grub.memtest86.enable = true; 44 45 - # Get a console as soon as the initrd loads fbcon on EFI boot. 46 - boot.initrd.kernelModules = [ "fbcon" ]; 47 - 48 # Allow the user to log in as root without a password. 49 users.extraUsers.root.initialHashedPassword = ""; 50 }
··· 42 # Add Memtest86+ to the CD. 43 boot.loader.grub.memtest86.enable = true; 44 45 # Allow the user to log in as root without a password. 46 users.extraUsers.root.initialHashedPassword = ""; 47 }
+3
pkgs/os-specific/linux/kernel/common-config.nix
··· 54 STANDALONE n 55 56 # Make /proc/config.gz available. 57 IKCONFIG_PROC y 58 59 # Optimize with -O2, not -Os. ··· 131 FB_SIS_300 y 132 FB_SIS_315 y 133 FB_3DFX_ACCEL y 134 ${optionalString (versionOlder version "3.9" || stdenv.system == "i686-linux") '' 135 FB_GEODE y 136 ''}
··· 54 STANDALONE n 55 56 # Make /proc/config.gz available. 57 + IKCONFIG y 58 IKCONFIG_PROC y 59 60 # Optimize with -O2, not -Os. ··· 132 FB_SIS_300 y 133 FB_SIS_315 y 134 FB_3DFX_ACCEL y 135 + FB_VESA y 136 + FRAMEBUFFER_CONSOLE y 137 ${optionalString (versionOlder version "3.9" || stdenv.system == "i686-linux") '' 138 FB_GEODE y 139 ''}