[oe-commits] [openembedded-core] 60/68: xinetd: Fix systemd service for systemd>237

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch sumo
in repository openembedded-core.

commit 23dda7c814eb65ac95695982173149142e53fa52
Author: Ricardo Ribalda Delgado <ricardo.ribalda at gmail.com>
AuthorDate: Mon Jun 11 10:05:04 2018 +0200

    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 at 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 at gmail.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
    (cherry picked from commit e4b365eb76bc634ff0707bddc578ff1d839c8588)
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 meta/recipes-extended/xinetd/xinetd/xinetd.service | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/meta/recipes-extended/xinetd/xinetd/xinetd.service b/meta/recipes-extended/xinetd/xinetd/xinetd.service
index d5fdc5b..6da92f2 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

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.