public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/modules: deprecation warning for StartLimitInterval in [Service]

Browse Source 
This implements
https://github.com/NixOS/nixpkgs/issues/45786#issuecomment-440091879
This commit is contained in:
lf-
2020-10-31 16:50:35 +01:00
committed by Niklas Hambüchen
parent c178fe4bbb
commit 644079e707
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/system/boot/systemd.nix
+4
View File
@@ -892,11 +892,15 @@ in
let let
type = service.serviceConfig.Type or ""; type = service.serviceConfig.Type or "";
restart = service.serviceConfig.Restart or "no"; restart = service.serviceConfig.Restart or "no";
hasDeprecated = builtins.hasAttr "StartLimitInterval" service.serviceConfig;
in in
concatLists [ concatLists [
(optional (type == "oneshot" && (restart == "always" || restart == "on-success")) (optional (type == "oneshot" && (restart == "always" || restart == "on-success"))
"Service '${name}.service' with 'Type=oneshot' cannot have 'Restart=always' or 'Restart=on-success'" "Service '${name}.service' with 'Type=oneshot' cannot have 'Restart=always' or 'Restart=on-success'"
) )
(optional hasDeprecated
"Service '${name}.service' uses the attribute 'StartLimitInterval' in the Service section, which is deprecated. See https://github.com/NixOS/nixpkgs/issues/45786."
)
] ]
) )
cfg.services cfg.services