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 c7bcad5cfb72b34dec4ef67655933eca8c26b15d..72a1aa9d06f9fb06168fce5584168849204760c0 100644 (file)
--- 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 bc584a30bd8994a3862ea170afeb7eb6bc792fc7..8957143d9b9e6feb2c5ded8ec30ad08eb789aad8 100644 (file)
--- 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 abe4d2f2c0008974a92051a15038a2183919c971..d5be474ed883a62f7f4f94fda6e49a9641122d4e 100644 (file)
--- 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