summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
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-07-02 11:41:26 +0100
commit71bcd4c0a2ee268c2f3c280c62ea27cfdbb7ca93 (patch)
tree11b6b0d063fb404a0496d5737ed6a5438e8252ea /meta/recipes-extended
parent869d3586b0a8fa52bbd70ba525ce6b727148e076 (diff)
downloadpoky-71bcd4c0a2ee268c2f3c280c62ea27cfdbb7ca93.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) (From OE-Core rev: 23dda7c814eb65ac95695982173149142e53fa52) 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> (cherry picked from commit e4b365eb76bc634ff0707bddc578ff1d839c8588) Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-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