diff options
| author | Peter Hoeg <peter@hoeg.com> | 2020-06-10 10:12:21 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-10 10:12:21 +0800 |
| commit | 5a0e9e63c71b3fb5743bd53acf9e09ed209aee18 (patch) | |
| tree | f70f423487cb90a7c12421b98efdc32892ca9d44 /nixos | |
| parent | 986ff168c7da80db109eee8b0309b35aee169826 (diff) | |
| parent | 66e040eaac1ac4b5e41d951af5abe48dbf6a636d (diff) | |
| download | nixlib-5a0e9e63c71b3fb5743bd53acf9e09ed209aee18.tar nixlib-5a0e9e63c71b3fb5743bd53acf9e09ed209aee18.tar.gz nixlib-5a0e9e63c71b3fb5743bd53acf9e09ed209aee18.tar.bz2 nixlib-5a0e9e63c71b3fb5743bd53acf9e09ed209aee18.tar.lz nixlib-5a0e9e63c71b3fb5743bd53acf9e09ed209aee18.tar.xz nixlib-5a0e9e63c71b3fb5743bd53acf9e09ed209aee18.tar.zst nixlib-5a0e9e63c71b3fb5743bd53acf9e09ed209aee18.zip | |
Merge pull request #89457 from NixOS/f/pam_ordering
nixos/pam: mount encrypted home earlier
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/security/pam.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index e1a94b0121ac..688344852aeb 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -436,6 +436,8 @@ let "session required ${pkgs.pam}/lib/security/pam_lastlog.so silent"} ${optionalString config.security.pam.enableEcryptfs "session optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"} + ${optionalString cfg.pamMount + "session optional ${pkgs.pam_mount}/lib/security/pam_mount.so"} ${optionalString use_ldap "session optional ${pam_ldap}/lib/security/pam_ldap.so"} ${optionalString config.services.sssd.enable @@ -452,8 +454,6 @@ let "session required ${pkgs.pam}/lib/security/pam_limits.so conf=${makeLimitsConf cfg.limits}"} ${optionalString (cfg.showMotd && config.users.motd != null) "session optional ${pkgs.pam}/lib/security/pam_motd.so motd=${motd}"} - ${optionalString cfg.pamMount - "session optional ${pkgs.pam_mount}/lib/security/pam_mount.so"} ${optionalString (cfg.enableAppArmor && config.security.apparmor.enable) "session optional ${pkgs.apparmor-pam}/lib/security/pam_apparmor.so order=user,group,default debug"} ${optionalString (cfg.enableKwallet) |