diff options
| author | Vladimír Čunát <v@cunat.cz> | 2020-06-10 09:42:36 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2020-06-10 09:42:36 +0200 |
| commit | 16024fcaecf63efb99aac191ee04af18762570cf (patch) | |
| tree | e9d3f924f1b66be624460d6887e35c3a4e2007a2 /nixos | |
| parent | a038553c8b8cb108ecba63f77ac0f04917d29672 (diff) | |
| parent | 6e9bb30566a617613e607a3641fe12d040de3afb (diff) | |
| download | nixpkgs-16024fcaecf63efb99aac191ee04af18762570cf.tar nixpkgs-16024fcaecf63efb99aac191ee04af18762570cf.tar.gz nixpkgs-16024fcaecf63efb99aac191ee04af18762570cf.tar.bz2 nixpkgs-16024fcaecf63efb99aac191ee04af18762570cf.tar.lz nixpkgs-16024fcaecf63efb99aac191ee04af18762570cf.tar.xz nixpkgs-16024fcaecf63efb99aac191ee04af18762570cf.tar.zst nixpkgs-16024fcaecf63efb99aac191ee04af18762570cf.zip | |
Merge branch 'staging-next' into staging
In particular, this fixes ISO evaluation.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/lib/make-iso9660-image.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/security/pam.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nixos/lib/make-iso9660-image.nix b/nixos/lib/make-iso9660-image.nix index be8ad9912db..12a6cf64996 100644 --- a/nixos/lib/make-iso9660-image.nix +++ b/nixos/lib/make-iso9660-image.nix @@ -35,7 +35,7 @@ isohybridMbrImage ? "" , # Whether to compress the resulting ISO image with zstd. - compressImage ? false + compressImage ? false, zstd , # The volume ID. volumeID ? "" diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index e1a94b0121a..688344852ae 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) |