diff options
| author | Vladimír Čunát <v@cunat.cz> | 2023-11-15 07:33:10 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2023-11-15 07:33:10 +0100 |
| commit | c46eae0f3572fbe7af42e5d40648b7b4a1d1317b (patch) | |
| tree | 84e748e6477734c4826b4d6b34152b1958e5627a /nixos/modules/system/boot/systemd/initrd.nix | |
| parent | 9297b620bb86624e6cf4b6ae54fc4ae1da98bb83 (diff) | |
| parent | e8ad54f562b4621c7c080b4a3ddbafe4735bcb86 (diff) | |
| download | nixlib-c46eae0f3572fbe7af42e5d40648b7b4a1d1317b.tar nixlib-c46eae0f3572fbe7af42e5d40648b7b4a1d1317b.tar.gz nixlib-c46eae0f3572fbe7af42e5d40648b7b4a1d1317b.tar.bz2 nixlib-c46eae0f3572fbe7af42e5d40648b7b4a1d1317b.tar.lz nixlib-c46eae0f3572fbe7af42e5d40648b7b4a1d1317b.tar.xz nixlib-c46eae0f3572fbe7af42e5d40648b7b4a1d1317b.tar.zst nixlib-c46eae0f3572fbe7af42e5d40648b7b4a1d1317b.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'nixos/modules/system/boot/systemd/initrd.nix')
| -rw-r--r-- | nixos/modules/system/boot/systemd/initrd.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix index e223451652b2..0e7d59b32075 100644 --- a/nixos/modules/system/boot/systemd/initrd.nix +++ b/nixos/modules/system/boot/systemd/initrd.nix @@ -370,7 +370,7 @@ in { boot.initrd.availableKernelModules = [ # systemd needs this for some features - "autofs4" + "autofs" # systemd-cryptenroll ] ++ lib.optional cfg.enableTpm2 "tpm-tis" ++ lib.optional (cfg.enableTpm2 && !(pkgs.stdenv.hostPlatform.isRiscV64 || pkgs.stdenv.hostPlatform.isArmv7)) "tpm-crb"; |