diff options
| author | Artturi <Artturin@artturin.com> | 2023-11-14 23:25:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-14 23:25:09 +0200 |
| commit | 85b3fae1710f8ad09722cca3f14008a00a8a3776 (patch) | |
| tree | 0b624ba1ef347d392a8cdd1a44347ff40dc761fa | |
| parent | 0369e58dfa676ac83223a2aad952004281ba90ca (diff) | |
| parent | 3f4c802d263989eb0a0327243a100ad3643be98e (diff) | |
| download | nixpkgs-85b3fae1710f8ad09722cca3f14008a00a8a3776.tar nixpkgs-85b3fae1710f8ad09722cca3f14008a00a8a3776.tar.gz nixpkgs-85b3fae1710f8ad09722cca3f14008a00a8a3776.tar.bz2 nixpkgs-85b3fae1710f8ad09722cca3f14008a00a8a3776.tar.lz nixpkgs-85b3fae1710f8ad09722cca3f14008a00a8a3776.tar.xz nixpkgs-85b3fae1710f8ad09722cca3f14008a00a8a3776.tar.zst nixpkgs-85b3fae1710f8ad09722cca3f14008a00a8a3776.zip | |
Merge pull request #267526 from zzywysm/autofs4-autofs-fix
| -rw-r--r-- | nixos/modules/services/misc/autofs.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/system/boot/systemd/initrd.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/misc/autofs.nix b/nixos/modules/services/misc/autofs.nix index 55ab15ff003..723b67e8bb6 100644 --- a/nixos/modules/services/misc/autofs.nix +++ b/nixos/modules/services/misc/autofs.nix @@ -74,7 +74,7 @@ in config = mkIf cfg.enable { - boot.kernelModules = [ "autofs4" ]; + boot.kernelModules = [ "autofs" ]; systemd.services.autofs = { description = "Automounts filesystems on demand"; diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix index e223451652b..0e7d59b3207 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"; |