From 1df6cf5d1d6d4fa092252275ab82f409dd8f79fe Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Fri, 22 Sep 2017 23:45:04 +0200 Subject: nixos/lock-kernel-modules: fix deferred fileSystem mounts Ensure that modules required by all declared fileSystems are explicitly loaded. A little ugly but fixes the deferred mount test. See also https://github.com/NixOS/nixpkgs/issues/29019 --- nixos/modules/security/lock-kernel-modules.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/nixos/modules/security/lock-kernel-modules.nix b/nixos/modules/security/lock-kernel-modules.nix index 30fdb1e2bab..c81521ed9b0 100644 --- a/nixos/modules/security/lock-kernel-modules.nix +++ b/nixos/modules/security/lock-kernel-modules.nix @@ -17,6 +17,14 @@ with lib; }; config = mkIf config.security.lockKernelModules { + boot.kernelModules = concatMap (x: + if x.device != null + then + if x.fsType == "vfat" + then [ "vfat" "nls-cp437" "nls-iso8859-1" ] + else [ x.fsType ] + else []) config.system.build.fileSystems; + systemd.services.disable-kernel-module-loading = rec { description = "Disable kernel module loading"; -- cgit 1.4.1