From e6088f77bee79e2d202b3ded195648e77207bb21 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 21 Oct 2016 14:27:11 +0200 Subject: [PATCH] initrd: Include i8042 kernel module For some reason, between Linux 4.4.19 and 4.4.20, the atkbd and libps2 kernel modules lost their dependency on i8042 in modules.dep, causing i8042 not to be included in the initrd. This breaks keyboard in the initrd, in turn breaking LUKS. This only happens on the 16.03 branch; on 16.09, it appears i8042 is pulled into the initrd anyway (through some other dependency, presumably). But let's include it explicitly. http://hydra.nixos.org/build/40468431 --- nixos/modules/system/boot/kernel.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index 51b3b8a3dca..e751ff141f7 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -214,8 +214,8 @@ in "hid_generic" "hid_lenovo" "hid_apple" "hid_logitech_dj" "hid_lenovo_tpkbd" "hid_roccat" - # Misc. stuff. - "pcips2" "atkbd" + # Misc. keyboard stuff. + "pcips2" "atkbd" "i8042" # Temporary fix for https://github.com/NixOS/nixpkgs/issues/18451 # Remove as soon as upstream gets fixed - marking it: