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

Merge pull request #26 from aszlig/boottime-keymap

Browse Source 
stage-1: Add option to load keymap during bootup.
This commit is contained in:
Peter Simons 2012-09-24 07:33:03 -07:00
commit 573b6b710f
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -147,6 +147,10 @@ modprobe scsi_wait_scan || true
udevadm settle || true udevadm settle || true
# 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 # XXX: Use case usb->lvm will still fail, usb->luks->lvm is covered
@preLVMCommands@ @preLVMCommands@

10
modules/system/boot/stage-1.nix
View File

@ -288,6 +288,14 @@ 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
'';
# The init script of boot stage 1 (loading kernel modules for # The init script of boot stage 1 (loading kernel modules for
# mounting the root FS). # mounting the root FS).
bootStage1 = pkgs.substituteAll { bootStage1 = pkgs.substituteAll {
@ -297,7 +305,7 @@ let
isExecutable = true; isExecutable = true;
inherit udevConf extraUtils modulesClosure; inherit udevConf busyboxKeymap extraUtils modulesClosure;
inherit (config.boot) resumeDevice devSize runSize; inherit (config.boot) resumeDevice devSize runSize;