Unverified Commit 85b3fae1 authored by Artturi's avatar Artturi Committed by GitHub
Browse files

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

parents 0369e58d 3f4c802d

nixos/modules/services/misc/autofs.nix

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ in 


  config = mkIf cfg.enable {



    boot.kernelModules = [ "autofs4" ];

    boot.kernelModules = [ "autofs" ];



    systemd.services.autofs =

      { description = "Automounts filesystems on demand";

nixos/modules/system/boot/systemd/initrd.nix

+1 −1
Original line number Diff line number Diff line
@@ -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";