From 71bcd4c0a2ee268c2f3c280c62ea27cfdbb7ca93 Mon Sep 17 00:00:00 2001 From: Ricardo Ribalda Delgado Date: Mon, 11 Jun 2018 10:05:04 +0200 Subject: 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit e4b365eb76bc634ff0707bddc578ff1d839c8588) Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- meta/recipes-extended/xinetd/xinetd/xinetd.service | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'meta/recipes-extended') 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 After=syslog.target network.target [Service] -Type=forking -PIDFile=/var/run/xinetd.pid EnvironmentFile=-/etc/sysconfig/xinetd -ExecStart=@SBINDIR@/xinetd -stayalive -pidfile /var/run/xinetd.pid "$EXTRAOPTIONS" -ExecReload=@BASE_BINDIR@/kill -HUP $MAINPID +ExecStart=@SBINDIR@/xinetd -dontfork "$EXTRAOPTIONS" [Install] WantedBy=multi-user.target -- cgit v1.2.3-54-g00ecf