From 3325620ce1074160d7211d7a84af1c2b82e8bf18 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@protonmail.com>
Date: Mon, 22 Mar 2021 15:14:00 +0100
Subject: [PATCH] Merge #21418: contrib: Make systemd invoke dependencies only
 when ready

663f6cd9ddadeec30b27ec12f0f5ed49f3146cc9 contrib: Use -daemonwait in systemd init script (Wladimir J. van der Laan)

Pull request description:

  Make systemd invoke dependencies only when ready by using `-daemonwait` in the service file instead of `-daemon`.

  Closes #21322 by making bitcoind conform to behavior specified for `type=forking`.

  This may need some tuning of timeouts.

ACKs for top commit:
  darosior:
    ACK 663f6cd
  hebasto:
    re-ACK 663f6cd9ddadeec30b27ec12f0f5ed49f3146cc9

Tree-SHA512: 890005852b632a202caa578e6c796ebdc9da0b2379a9157a4f56f7db9d193c0ffbb78d120bbf112ab2f273855f2a08c3da000b1f7a9fb5222a3b94dcdb16b878
---
 contrib/init/dashd.service | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/contrib/init/dashd.service b/contrib/init/dashd.service
index 6f960455eb..223c05a875 100644
--- a/contrib/init/dashd.service
+++ b/contrib/init/dashd.service
@@ -18,7 +18,7 @@ After=network-online.target
 Wants=network-online.target
 
 [Service]
-ExecStart=/usr/bin/dashd -daemon \
+ExecStart=/usr/bin/dashd -daemonwait \
                                                             -pid=/run/dashd/dashd.pid \
                                                             -conf=/etc/dash/dash.conf  \
                                                             -datadir=/var/lib/dashd
@@ -33,6 +33,7 @@ ExecStartPre=/bin/chgrp dashcore /etc/dash
 Type=forking
 PIDFile=/run/dashd/dashd.pid
 Restart=on-failure
+TimeoutStartSec=infinity
 TimeoutStopSec=600
 
 # Directory creation and permissions