summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--nixos/modules/security/pam.nix7
-rw-r--r--nixos/modules/system/activation/activation-script.nix5
2 files changed, 7 insertions, 5 deletions
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index bef10b4fe614..926c6d77d3bb 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -548,6 +548,13 @@ 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/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix
index b74153885318..cd6dc1fb8201 100644
--- a/nixos/modules/system/activation/activation-script.nix
+++ b/nixos/modules/system/activation/activation-script.nix
@@ -128,11 +128,6 @@ in
''
# Various log/runtime directories.
- mkdir -m 0755 -p /var/log
-
- touch /var/log/wtmp /var/log/lastlog # must exist
- chmod 644 /var/log/wtmp /var/log/lastlog
-
mkdir -m 1777 -p /var/tmp
# Empty, immutable home directory of many system accounts.