diff options
author | Nikolay Amiantov <ab@fmap.me> | 2016-07-18 23:27:45 +0300 |
---|---|---|
committer | Nikolay Amiantov <ab@fmap.me> | 2016-07-18 23:27:45 +0300 |
commit | 7bed3d0cb38635cd34a6ac33f08b493184bf435c (patch) | |
tree | ae3be4275d78de5251109b7c78210b16800fe799 /nixos/modules/system/boot | |
parent | 6f893694401fa3048eed94c865ed3f0038deac44 (diff) | |
download | nixlib-7bed3d0cb38635cd34a6ac33f08b493184bf435c.tar nixlib-7bed3d0cb38635cd34a6ac33f08b493184bf435c.tar.gz nixlib-7bed3d0cb38635cd34a6ac33f08b493184bf435c.tar.bz2 nixlib-7bed3d0cb38635cd34a6ac33f08b493184bf435c.tar.lz nixlib-7bed3d0cb38635cd34a6ac33f08b493184bf435c.tar.xz nixlib-7bed3d0cb38635cd34a6ac33f08b493184bf435c.tar.zst nixlib-7bed3d0cb38635cd34a6ac33f08b493184bf435c.zip |
nixos stage-1: move keymap handling to kbd module
Diffstat (limited to 'nixos/modules/system/boot')
-rw-r--r-- | nixos/modules/system/boot/stage-1-init.sh | 4 | ||||
-rw-r--r-- | nixos/modules/system/boot/stage-1.nix | 11 |
2 files changed, 1 insertions, 14 deletions
diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index 7705dcb2d125..82995d5bab11 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -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@ diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 4b1d3efb4113..21a49d45789e 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -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; |