diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2019-09-23 15:33:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-23 15:33:53 +0200 |
| commit | 38bb1c373fbe11f75e9cad929bce6cdfc0ddbee4 (patch) | |
| tree | 5bcec901bf32d984a38fc9492dbf5f6dd22343db | |
| parent | 60f3c94965f036c9afa6284f99eb13d794bd3057 (diff) | |
| parent | 0dc4fe0a44f16e730a422de21f8f5ebdf582f54a (diff) | |
Merge pull request #69295 from mayflower/fix/pick-more-systemd-tmpfiles-examples
nixos/systemd: pick more upstream tmpfiles confs
| -rw-r--r-- | nixos/modules/security/pam.nix | 7 | ||||
| -rw-r--r-- | nixos/modules/system/boot/systemd.nix | 5 |
2 files changed, 5 insertions, 7 deletions
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 3cf09611fba..a3eb12b0694 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -742,13 +742,6 @@ in environment.etc = mapAttrsToList (n: v: makePAMService v) config.security.pam.services; - systemd.tmpfiles.rules = optionals - (any (s: s.updateWtmp) (attrValues config.security.pam.services)) - [ - "f /var/log/wtmp" - "f /var/log/lastlog" - ]; - security.pam.services = { other.text = '' diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 2287a82418f..5cf437bfbcb 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -858,7 +858,12 @@ in "sysctl.d/50-coredump.conf".source = "${systemd}/example/sysctl.d/50-coredump.conf"; "sysctl.d/50-default.conf".source = "${systemd}/example/sysctl.d/50-default.conf"; + "tmpfiles.d/journal-nocow.conf".source = "${systemd}/example/tmpfiles.d/journal-nocow.conf"; + "tmpfiles.d/static-nodes-permissions.conf".source = "${systemd}/example/tmpfiles.d/static-nodes-permissions.conf"; "tmpfiles.d/systemd.conf".source = "${systemd}/example/tmpfiles.d/systemd.conf"; + "tmpfiles.d/systemd-nspawn.conf".source = "${systemd}/example/tmpfiles.d/system-nspawn.conf"; + "tmpfiles.d/systemd-tmp.conf".source = "${systemd}/example/tmpfiles.d/system-tmp.conf"; + "tmpfiles.d/var.conf".source = "${systemd}/example/tmpfiles.d/var.conf"; "tmpfiles.d/x11.conf".source = "${systemd}/example/tmpfiles.d/x11.conf"; "tmpfiles.d/nixos.conf".text = '' |