diff options
author | Craig Younkins <cyounkins@gmail.com> | 2018-11-25 07:33:22 -0500 |
---|---|---|
committer | zimbatm <zimbatm@zimbatm.com> | 2018-11-25 13:33:22 +0100 |
commit | eff461c8ef17210cfd7cf50fe8c057f581663436 (patch) | |
tree | 8278422459bf71346864c644812ccf09001fabca | |
parent | 377e0e9b0fd01f3415ed21620a7913521e693600 (diff) | |
download | nixpkgs-eff461c8ef17210cfd7cf50fe8c057f581663436.tar nixpkgs-eff461c8ef17210cfd7cf50fe8c057f581663436.tar.gz nixpkgs-eff461c8ef17210cfd7cf50fe8c057f581663436.tar.bz2 nixpkgs-eff461c8ef17210cfd7cf50fe8c057f581663436.tar.lz nixpkgs-eff461c8ef17210cfd7cf50fe8c057f581663436.tar.xz nixpkgs-eff461c8ef17210cfd7cf50fe8c057f581663436.tar.zst nixpkgs-eff461c8ef17210cfd7cf50fe8c057f581663436.zip |
treewide: systemd timeout arguments to use infinity instead of 0 (#50934)
Fixes https://github.com/NixOS/nixpkgs/issues/49700
-rw-r--r-- | nixos/modules/services/monitoring/apcupsd.nix | 2 | ||||
-rw-r--r-- | nixos/modules/services/monitoring/osquery.nix | 2 | ||||
-rw-r--r-- | nixos/modules/services/networking/consul.nix | 2 | ||||
-rw-r--r-- | nixos/modules/services/system/cloud-init.nix | 8 | ||||
-rw-r--r-- | nixos/modules/virtualisation/google-compute-image.nix | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/nixos/modules/services/monitoring/apcupsd.nix b/nixos/modules/services/monitoring/apcupsd.nix index 839116de626..7ee870183ca 100644 --- a/nixos/modules/services/monitoring/apcupsd.nix +++ b/nixos/modules/services/monitoring/apcupsd.nix @@ -180,7 +180,7 @@ in serviceConfig = { Type = "oneshot"; ExecStart = "${pkgs.apcupsd}/bin/apcupsd --killpower -f ${configFile}"; - TimeoutSec = 0; + TimeoutSec = "infinity"; StandardOutput = "tty"; RemainAfterExit = "yes"; }; diff --git a/nixos/modules/services/monitoring/osquery.nix b/nixos/modules/services/monitoring/osquery.nix index ba0dc4c2176..c8c625577d3 100644 --- a/nixos/modules/services/monitoring/osquery.nix +++ b/nixos/modules/services/monitoring/osquery.nix @@ -78,7 +78,7 @@ in mkdir -p "$(dirname ${escapeShellArg cfg.databasePath})" ''; serviceConfig = { - TimeoutStartSec = 0; + TimeoutStartSec = "infinity"; ExecStart = "${pkgs.osquery}/bin/osqueryd --logger_path ${escapeShellArg cfg.loggerPath} --pidfile ${escapeShellArg cfg.pidfile} --database_path ${escapeShellArg cfg.databasePath}"; KillMode = "process"; KillSignal = "SIGTERM"; diff --git a/nixos/modules/services/networking/consul.nix b/nixos/modules/services/networking/consul.nix index 0e90fed788b..3a92a883fbf 100644 --- a/nixos/modules/services/networking/consul.nix +++ b/nixos/modules/services/networking/consul.nix @@ -185,7 +185,7 @@ in PermissionsStartOnly = true; User = if cfg.dropPrivileges then "consul" else null; Restart = "on-failure"; - TimeoutStartSec = "0"; + TimeoutStartSec = "infinity"; } // (optionalAttrs (cfg.leaveOnStop) { ExecStop = "${cfg.package.bin}/bin/consul leave"; }); diff --git a/nixos/modules/services/system/cloud-init.nix b/nixos/modules/services/system/cloud-init.nix index f22bd45dfeb..3ad555f78ef 100644 --- a/nixos/modules/services/system/cloud-init.nix +++ b/nixos/modules/services/system/cloud-init.nix @@ -119,7 +119,7 @@ in { Type = "oneshot"; ExecStart = "${pkgs.cloud-init}/bin/cloud-init init --local"; RemainAfterExit = "yes"; - TimeoutSec = "0"; + TimeoutSec = "infinity"; StandardOutput = "journal+console"; }; }; @@ -137,7 +137,7 @@ in { Type = "oneshot"; ExecStart = "${pkgs.cloud-init}/bin/cloud-init init"; RemainAfterExit = "yes"; - TimeoutSec = "0"; + TimeoutSec = "infinity"; StandardOutput = "journal+console"; }; }; @@ -153,7 +153,7 @@ in { Type = "oneshot"; ExecStart = "${pkgs.cloud-init}/bin/cloud-init modules --mode=config"; RemainAfterExit = "yes"; - TimeoutSec = "0"; + TimeoutSec = "infinity"; StandardOutput = "journal+console"; }; }; @@ -169,7 +169,7 @@ in { Type = "oneshot"; ExecStart = "${pkgs.cloud-init}/bin/cloud-init modules --mode=final"; RemainAfterExit = "yes"; - TimeoutSec = "0"; + TimeoutSec = "infinity"; StandardOutput = "journal+console"; }; }; diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index 795858e5eae..f9ebe769652 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -165,7 +165,7 @@ in ExecStop = "${gce}/bin/google_metadata_script_runner --debug --script-type shutdown"; Type = "oneshot"; RemainAfterExit = true; - TimeoutStopSec = 0; + TimeoutStopSec = "infinity"; }; }; |