tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom

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

authored by Artturi and committed by GitHub 85b3fae1 0369e58d

+2 -2
unified split
+1 -1
nixos/modules/services/misc/autofs.nix
··· 74 74 75 75 config = mkIf cfg.enable { 76 76 77 - boot.kernelModules = [ "autofs4" ]; 77 + boot.kernelModules = [ "autofs" ]; 78 78 79 79 systemd.services.autofs = 80 80 { description = "Automounts filesystems on demand";
+1 -1
nixos/modules/system/boot/systemd/initrd.nix
··· 370 370 371 371 boot.initrd.availableKernelModules = [ 372 372 # systemd needs this for some features 373 - "autofs4" 373 + "autofs" 374 374 # systemd-cryptenroll 375 375 ] ++ lib.optional cfg.enableTpm2 "tpm-tis" 376 376 ++ lib.optional (cfg.enableTpm2 && !(pkgs.stdenv.hostPlatform.isRiscV64 || pkgs.stdenv.hostPlatform.isArmv7)) "tpm-crb";