Merge pull request #267526 from zzywysm/autofs4-autofs-fix

This commit is contained in:
Artturi
2023-11-14 23:25:09 +02:00
committed by GitHub
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -74,7 +74,7 @@ in
config = mkIf cfg.enable {
boot.kernelModules = [ "autofs4" ];
boot.kernelModules = [ "autofs" ];
systemd.services.autofs =
{ description = "Automounts filesystems on demand";
+1 -1
View File
@@ -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";