diff options
author | lf- <lf-@users.noreply.github.com> | 2020-09-09 00:31:27 -0700 |
---|---|---|
committer | lf- <lf-@users.noreply.github.com> | 2020-10-31 01:35:56 -0700 |
commit | b37bbca521556d30e564896eea56b41d63324fdf (patch) | |
tree | dff16af1c82314e010a1350c263d2f97426c16c9 /nixos/modules/services/x11/xserver.nix | |
parent | 2df221ec8a95566ba771f102fd421c12b41d875c (diff) | |
download | nixpkgs-b37bbca521556d30e564896eea56b41d63324fdf.tar nixpkgs-b37bbca521556d30e564896eea56b41d63324fdf.tar.gz nixpkgs-b37bbca521556d30e564896eea56b41d63324fdf.tar.bz2 nixpkgs-b37bbca521556d30e564896eea56b41d63324fdf.tar.lz nixpkgs-b37bbca521556d30e564896eea56b41d63324fdf.tar.xz nixpkgs-b37bbca521556d30e564896eea56b41d63324fdf.tar.zst nixpkgs-b37bbca521556d30e564896eea56b41d63324fdf.zip |
nixos/modules: fix systemd start rate-limits
These were broken since 2016: https://github.com/systemd/systemd/commit/f0367da7d1a61ad698a55d17b5c28ddce0dc265a since StartLimitIntervalSec got moved into [Unit] from [Service]. StartLimitBurst has also been moved accordingly, so let's fix that one too. NixOS systems have been producing logs such as: /nix/store/wf98r55aszi1bkmln1lvdbp7znsfr70i-unit-caddy.service/caddy.service:31: Unknown key name 'StartLimitIntervalSec' in section 'Service', ignoring. I have also removed some unnecessary duplication in units disabling rate limiting since setting either interval or burst to zero disables it (https://github.com/systemd/systemd/blob/ad16158c10dfc3258831a9ff2f1a988214f51653/src/basic/ratelimit.c#L16)
Diffstat (limited to 'nixos/modules/services/x11/xserver.nix')
-rw-r--r-- | nixos/modules/services/x11/xserver.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 55d3e742ef7..9e971671c47 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -678,14 +678,14 @@ in script = "${cfg.displayManager.job.execCmd}"; + # Stop restarting if the display manager stops (crashes) 2 times + # in one minute. Starting X typically takes 3-4s. + startLimitIntervalSec = 30; + startLimitBurst = 3; serviceConfig = { Restart = "always"; RestartSec = "200ms"; SyslogIdentifier = "display-manager"; - # Stop restarting if the display manager stops (crashes) 2 times - # in one minute. Starting X typically takes 3-4s. - StartLimitInterval = "30s"; - StartLimitBurst = "3"; }; }; |