diff options
| author | Vladimír Čunát <v@cunat.cz> | 2020-06-10 09:41:53 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2020-06-10 09:41:53 +0200 |
| commit | 6e9bb30566a617613e607a3641fe12d040de3afb (patch) | |
| tree | 0241cf4a29146f6fec8e61b1b02a32a72a48f03f /nixos | |
| parent | c637cbe99208d1fcffc50579f5dbfe0ee0cb5c67 (diff) | |
| parent | f6482597318278cdc4d33b703effa4636d2875c6 (diff) | |
| download | nixlib-6e9bb30566a617613e607a3641fe12d040de3afb.tar nixlib-6e9bb30566a617613e607a3641fe12d040de3afb.tar.gz nixlib-6e9bb30566a617613e607a3641fe12d040de3afb.tar.bz2 nixlib-6e9bb30566a617613e607a3641fe12d040de3afb.tar.lz nixlib-6e9bb30566a617613e607a3641fe12d040de3afb.tar.xz nixlib-6e9bb30566a617613e607a3641fe12d040de3afb.tar.zst nixlib-6e9bb30566a617613e607a3641fe12d040de3afb.zip | |
Merge branch 'master' into staging-next
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 be8ad9912db0..12a6cf649966 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 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) |