From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Tue, 12 Feb 2019 15:00:42 +0000 (+0100)
Subject: systemd/kresd@.service: switch to Restart=on-abnormal
X-Git-Tag: v4.0.0~24^2~135
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=df6cb62ef1e5cc16dbeeb358e669203a3767628a;p=thirdparty%2Fknot-resolver.git

systemd/kresd@.service: switch to Restart=on-abnormal

Avoid unnecessary and confusing restarts when starting kresd
fails to start, e.g. due to incorrect configuration. Attempt
to restart on crashes only.
---

diff --git a/meson.build b/meson.build
index c7bcad5cf..72a1aa9d0 100644
--- a/meson.build
+++ b/meson.build
@@ -88,7 +88,8 @@ if opt_systemd != 'disabled'
     systemd = true
     systemd_socket = opt_systemd != 'nosocket'
   else
-    libsystemd = dependency('libsystemd', required: systemd == 'nosocket')
+    libsystemd = dependency('libsystemd', version: '>=214',
+			    required: opt_systemd == 'nosocket')
     if libsystemd.found()
       systemd = true
       systemd_socket = false
diff --git a/systemd/kresd@.service.in b/systemd/kresd@.service.in
index bc584a30b..8957143d9 100644
--- a/systemd/kresd@.service.in
+++ b/systemd/kresd@.service.in
@@ -8,7 +8,7 @@ Type=notify
 WorkingDirectory=@systemd_work_dir@
 ExecStart=@sbin_dir@/kresd --config=@etc_dir@/kresd.conf
 User=@user@
-Restart=on-failure
+Restart=on-abnormal
 Sockets=kresd.socket
 Sockets=kresd-tls.socket
 Sockets=kresd-control@%i.socket
diff --git a/systemd/nosocket/kresd@.service.in b/systemd/nosocket/kresd@.service.in
index abe4d2f2c..d5be474ed 100644
--- a/systemd/nosocket/kresd@.service.in
+++ b/systemd/nosocket/kresd@.service.in
@@ -7,7 +7,7 @@ Documentation=man:kresd(8)
 Type=simple
 WorkingDirectory=@systemd_work_dir@
 ExecStart=@sbin_dir@/kresd --config=@etc_dir@/kresd.conf --forks=1
-Restart=on-failure
+Restart=on-abnormal
 
 [Install]
 WantedBy=kresd.target