diff options
| author | xeji <36407913+xeji@users.noreply.github.com> | 2018-05-13 19:57:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-13 19:57:24 +0200 |
| commit | c482b41f40fab80ff973e8b191b62cdc1e5e5084 (patch) | |
| tree | 7cdac8511bb58301d316857df28e898772196920 /nixos/modules/services/misc | |
| parent | 409b97c95f80537a94d6183131b20d82e669a8ca (diff) | |
| parent | ec00b6fbb3669e1852f537a8b624c6102f3eeb32 (diff) | |
| download | nixlib-c482b41f40fab80ff973e8b191b62cdc1e5e5084.tar nixlib-c482b41f40fab80ff973e8b191b62cdc1e5e5084.tar.gz nixlib-c482b41f40fab80ff973e8b191b62cdc1e5e5084.tar.bz2 nixlib-c482b41f40fab80ff973e8b191b62cdc1e5e5084.tar.lz nixlib-c482b41f40fab80ff973e8b191b62cdc1e5e5084.tar.xz nixlib-c482b41f40fab80ff973e8b191b62cdc1e5e5084.tar.zst nixlib-c482b41f40fab80ff973e8b191b62cdc1e5e5084.zip | |
Merge pull request #40373 from xeji/fix-mesos-test
nixos/mesos: fix non-deterministic service and test failure
Diffstat (limited to 'nixos/modules/services/misc')
| -rw-r--r-- | nixos/modules/services/misc/mesos-slave.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/misc/mesos-slave.nix b/nixos/modules/services/misc/mesos-slave.nix index effa29b64f63..468c7f36ecc5 100644 --- a/nixos/modules/services/misc/mesos-slave.nix +++ b/nixos/modules/services/misc/mesos-slave.nix @@ -187,7 +187,7 @@ in { systemd.services.mesos-slave = { description = "Mesos Slave"; wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; + after = [ "network.target" ] ++ optionals cfg.withDocker [ "docker.service" ] ; path = [ pkgs.runtimeShellPackage ]; serviceConfig = { ExecStart = '' |