alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

nixos/systemd: Update warning for restarting oneshots

Browse source 
Restart= can be anything other than on-success and always for onehost units as of
10e72727ee
which is contained in systemd 245.
This commit is contained in:
Malte Brandy 2020-06-16 14:34:03 +02:00
parent f1603aa18a
commit 0d4134de4a
No known key found for this signature in database
GPG key ID: 226A2D41EF5378C9
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
nixos/modules/system/boot/systemd.nix
View file

@ -826,8 +826,13 @@ in
config = {
warnings = concatLists (mapAttrsToList (name: service:
optional (service.serviceConfig.Type or "" == "oneshot" && service.serviceConfig.Restart or "no" != "no")
"Service ‘${name}.service’ with ‘Type=oneshot’ must have ‘Restart=no’") cfg.services);
let
type = service.serviceConfig.Type or "";
restart = service.serviceConfig.Restart or "no";
in optional
(type == "oneshot" && (restart == "always" || restart == "on-success"))
"Service '${name}.service' with 'Type=oneshot' cannot have 'Restart=always' or 'Restart=on-success'")
cfg.services);
system.build.units = cfg.units;