diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-09-28 11:35:27 -0400 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-09-28 11:35:27 -0400 |
| commit | 3ad370ae0a16a87b736ded31a3ea040aaabad0b4 (patch) | |
| tree | f22fcf1c580886b3323955ff10237ccda92fd3f4 /modules/system/boot/stage-1.nix | |
| parent | 3e6bb7d1de4fb0e4024161f501dbd7521ff791b4 (diff) | |
| parent | 1084a8e0de805229d216c928efbc457cae57eea2 (diff) | |
| download | nixpkgs-3ad370ae0a16a87b736ded31a3ea040aaabad0b4.tar nixpkgs-3ad370ae0a16a87b736ded31a3ea040aaabad0b4.tar.gz nixpkgs-3ad370ae0a16a87b736ded31a3ea040aaabad0b4.tar.bz2 nixpkgs-3ad370ae0a16a87b736ded31a3ea040aaabad0b4.tar.lz nixpkgs-3ad370ae0a16a87b736ded31a3ea040aaabad0b4.tar.xz nixpkgs-3ad370ae0a16a87b736ded31a3ea040aaabad0b4.tar.zst nixpkgs-3ad370ae0a16a87b736ded31a3ea040aaabad0b4.zip | |
Merge remote-tracking branch 'origin/master' into systemd
Conflicts: modules/misc/ids.nix modules/services/mail/postfix.nix modules/services/system/nscd.nix modules/services/x11/desktop-managers/xfce.nix modules/system/boot/stage-1.nix
Diffstat (limited to 'modules/system/boot/stage-1.nix')
| -rw-r--r-- | modules/system/boot/stage-1.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix index 97f1aa516e8..18d11e2d402 100644 --- a/modules/system/boot/stage-1.nix +++ b/modules/system/boot/stage-1.nix @@ -280,6 +280,15 @@ 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 { @@ -289,7 +298,7 @@ let isExecutable = true; - inherit udevRules extraUtils modulesClosure; + inherit udevRules extraUtils modulesClosure busyboxKeymap; inherit (config.boot) resumeDevice devSize runSize; |