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

stage-1: Load boot-time keymap by default. 

This also removes the configuration option, as suggested by @edolstra.
This commit is contained in:
aszlig 2012-08-12 16:54:31 +02:00
parent eb0b2651b8
commit c9e05f1ed8
2 changed files with 6 additions and 16 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@

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

@ -27,15 +27,6 @@ let
"; ";
}; };
boot.initrd.loadConsoleKeyMap = mkOption {
default = false;
type = with types; bool;
description = ''
Load i18n.consoleKeyMap at boot time. This is especially useful if you
bring together a non-QWERTY keyboard with a LUKS password prompt.
'';
};
boot.initrd.checkJournalingFS = mkOption { boot.initrd.checkJournalingFS = mkOption {
default = true; default = true;
type = types.bool; type = types.bool;
@ -293,17 +284,12 @@ 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;
inherit (config.boot.initrd) checkJournalingFS inherit (config.boot.initrd) checkJournalingFS
postDeviceCommands postMountCommands kernelModules; preLVMCommands postDeviceCommands postMountCommands kernelModules;
preLVMCommands = (optionalString config.boot.initrd.loadConsoleKeyMap ''
# load boot-time keymap before any LVM/LUKS initialization
${extraUtils}/bin/busybox loadkmap < "${busyboxKeymap}"
'') + config.boot.initrd.preLVMCommands;
fsInfo = fsInfo =
let f = fs: [ fs.mountPoint (if fs.device != null then fs.device else "/dev/disk/by-label/${fs.label}") fs.fsType fs.options ]; let f = fs: [ fs.mountPoint (if fs.device != null then fs.device else "/dev/disk/by-label/${fs.label}") fs.fsType fs.options ];