summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/xinetd
diff options
context:
space:
mode:
authorRicardo Ribalda Delgado <ricardo.ribalda@gmail.com>2018-06-11 10:05:04 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-06-15 17:56:24 +0100
commite4b365eb76bc634ff0707bddc578ff1d839c8588 (patch)
tree102f5038dde8898bb02714815862ea4a052eeab4 /meta/recipes-extended/xinetd
parent425af487a3f6027c83779e7e229217089fae34a4 (diff)
downloadpoky-e4b365eb76bc634ff0707bddc578ff1d839c8588.tar.gz
xinetd: Fix systemd service for systemd>237
SystemD 237 implements a stricted PIDfile handling that breaks several daemons [1]. Change the way we start xinetd, mimicing other distros [2]. Fixes: root@qt5122:~# journalctl -u xinetd -- Logs begin at Fri 2018-05-25 14:33:29 UTC, end at Mon 2018-06-11 07:33:08 UTC. -- May 25 14:33:31 qt5122 systemd[1]: Starting Xinetd A Powerful Replacement For Inetd... May 25 14:33:31 qt5122 systemd[1]: xinetd.service: Permission denied while opening PID file or unsafe symlink chain: /var/run/xinetd.pid Jun 11 07:27:24 qt5122 systemd[1]: xinetd.service: Start operation timed out. Terminating. Jun 11 07:27:24 qt5122 systemd[1]: xinetd.service: Failed with result 'timeout'. Jun 11 07:27:24 qt5122 systemd[1]: Failed to start Xinetd A Powerful Replacement For Inetd. Jun 11 07:31:38 qt5122 systemd[1]: Starting Xinetd A Powerful Replacement For Inetd... Jun 11 07:31:38 qt5122 systemd[1]: xinetd.service: Permission denied while opening PID file or unsafe symlink chain: /var/run/xinetd.pid Jun 11 07:33:08 qt5122 systemd[1]: xinetd.service: Start operation timed out. Terminating. Jun 11 07:33:08 qt5122 systemd[1]: xinetd.service: Failed with result 'timeout'. Jun 11 07:33:08 qt5122 systemd[1]: Failed to start Xinetd A Powerful Replacement For Inetd. [1]: https://github.com/systemd/systemd/issues/8085 [2]: https://github.com/felixonmars/archlinux-community/commit/e49040636737fdb09031e75ec4d73a580f80676b (From OE-Core rev: eea25f03e4c46cfe0d05df46f8f50e1389179c80) Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/xinetd')
-rw-r--r--meta/recipes-extended/xinetd/xinetd/xinetd.service5
1 files changed, 1 insertions, 4 deletions
diff --git a/meta/recipes-extended/xinetd/xinetd/xinetd.service b/meta/recipes-extended/xinetd/xinetd/xinetd.service
index d5fdc5bc29..6da92f2bf5 100644
--- a/meta/recipes-extended/xinetd/xinetd/xinetd.service
+++ b/meta/recipes-extended/xinetd/xinetd/xinetd.service
@@ -3,11 +3,8 @@ Description=Xinetd A Powerful Replacement For Inetd
3After=syslog.target network.target 3After=syslog.target network.target
4 4
5[Service] 5[Service]
6Type=forking
7PIDFile=/var/run/xinetd.pid
8EnvironmentFile=-/etc/sysconfig/xinetd 6EnvironmentFile=-/etc/sysconfig/xinetd
9ExecStart=@SBINDIR@/xinetd -stayalive -pidfile /var/run/xinetd.pid "$EXTRAOPTIONS" 7ExecStart=@SBINDIR@/xinetd -dontfork "$EXTRAOPTIONS"
10ExecReload=@BASE_BINDIR@/kill -HUP $MAINPID
11 8
12[Install] 9[Install]
13WantedBy=multi-user.target 10WantedBy=multi-user.target