diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-07-20 23:52:45 +0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-20 23:52:45 +0400 |
| commit | 3cc54bbad943dd60fbf87b59178f66b321792a91 (patch) | |
| tree | dd4d98f516085ca1e66d5add5d78118a93dfdf52 /nixos/modules/system | |
| parent | afcf3176ec9dcb3fe6d00c7161d592b52a04203c (diff) | |
| parent | cf64a7ecc0f0feb654255a427e454a233773bbb9 (diff) | |
| download | nixlib-3cc54bbad943dd60fbf87b59178f66b321792a91.tar nixlib-3cc54bbad943dd60fbf87b59178f66b321792a91.tar.gz nixlib-3cc54bbad943dd60fbf87b59178f66b321792a91.tar.bz2 nixlib-3cc54bbad943dd60fbf87b59178f66b321792a91.tar.lz nixlib-3cc54bbad943dd60fbf87b59178f66b321792a91.tar.xz nixlib-3cc54bbad943dd60fbf87b59178f66b321792a91.tar.zst nixlib-3cc54bbad943dd60fbf87b59178f66b321792a91.zip | |
Merge pull request #17082 from abbradar/fix-early-kbd
Use new early kbd-setting code in initrd and fix layouts from external packages
Diffstat (limited to 'nixos/modules/system')
| -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; |