movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

Merge pull request #17082 from abbradar/fix-early-kbd

Browse source 
Use new early kbd-setting code in initrd and fix layouts from external packages
This commit is contained in:
Nikolay Amiantov 2016-07-20 23:52:45 +04:00 • committed by GitHub
commit 3cc54bbad9
3 changed files with 17 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

4
nixos/modules/system/boot/stage-1-init.sh
View file

@ -172,10 +172,6 @@ udevadm trigger --action=add
udevadm settle
# Load boot-time keymap before any LVM/LUKS initialization
@extraUtils@/bin/busybox loadkmap < "@busyboxKeymap@"
# XXX: Use case usb->lvm will still fail, usb->luks->lvm is covered
@preLVMCommands@

11
nixos/modules/system/boot/stage-1.nix
View file

@ -185,15 +185,6 @@ let
};
# The binary keymap for busybox to load at boot.
busyboxKeymap = pkgs.runCommand "boottime-keymap"
{ preferLocalBuild = true; }
''
${pkgs.kbd}/bin/loadkeys -qb "${config.i18n.consoleKeyMap}" > $out ||
${pkgs.kbd}/bin/loadkeys -qbu "${config.i18n.consoleKeyMap}" > $out
'';
# The init script of boot stage 1 (loading kernel modules for
# mounting the root FS).
bootStage1 = pkgs.substituteAll {
@ -203,7 +194,7 @@ let
isExecutable = true;
inherit udevRules extraUtils modulesClosure busyboxKeymap;
inherit udevRules extraUtils modulesClosure;
inherit (config.boot) resumeDevice devSize runSize;