From 9e20a2f41a1504217b5c1345e53dfe93380a1a09 Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Wed, 10 Mar 2021 16:06:42 +0800 Subject: [PATCH] quagga: do not set PIDFile in service files The systemd can not open the pid file because it is locked by quagga daemon. Fixes: $ systemctl status ospf6d.service Feb 25 05:53:26 intel-x86-64 systemd[1]: Starting OSPF routing daemon for IPv6... Feb 25 05:53:26 intel-x86-64 systemd[1]: ospf6d.service: Can't open PID file /run/quagga/ospf6d.pid (yet?) after start: Operation not permitted Feb 25 05:53:26 intel-x86-64 systemd[1]: Started OSPF routing daemon for IPv6. Signed-off-by: Yi Zhao Signed-off-by: Khem Raj --- meta-networking/recipes-protocols/quagga/files/bgpd.service | 1 - meta-networking/recipes-protocols/quagga/files/ospf6d.service | 1 - meta-networking/recipes-protocols/quagga/files/ospfd.service | 1 - meta-networking/recipes-protocols/quagga/files/ripd.service | 1 - meta-networking/recipes-protocols/quagga/files/ripngd.service | 1 - meta-networking/recipes-protocols/quagga/files/zebra.service | 1 - 6 files changed, 6 deletions(-) diff --git a/meta-networking/recipes-protocols/quagga/files/bgpd.service b/meta-networking/recipes-protocols/quagga/files/bgpd.service index c1021fbd71..818b59cb27 100644 --- a/meta-networking/recipes-protocols/quagga/files/bgpd.service +++ b/meta-networking/recipes-protocols/quagga/files/bgpd.service @@ -7,7 +7,6 @@ ConditionPathExists=@SYSCONFDIR@/quagga/bgpd.conf [Service] Type=forking EnvironmentFile=-@SYSCONFDIR@/default/quagga -PIDFile=/run/quagga/bgpd.pid ExecStart=@SBINDIR@/bgpd -d $bgpd_options -f @SYSCONFDIR@/quagga/bgpd.conf ExecStopPost=@base_bindir@/rm -rf /run/quagga/bgpd.pid Restart=on-abort diff --git a/meta-networking/recipes-protocols/quagga/files/ospf6d.service b/meta-networking/recipes-protocols/quagga/files/ospf6d.service index 99d0e6dcaf..50645fe2a9 100644 --- a/meta-networking/recipes-protocols/quagga/files/ospf6d.service +++ b/meta-networking/recipes-protocols/quagga/files/ospf6d.service @@ -7,7 +7,6 @@ ConditionPathExists=@SYSCONFDIR@/quagga/ospf6d.conf [Service] Type=forking EnvironmentFile=-@SYSCONFDIR@/default/quagga -PIDFile=/run/quagga/ospf6d.pid ExecStart=@SBINDIR@/ospf6d -d $ospf6d_options -f @SYSCONFDIR@/quagga/ospf6d.conf ExecStopPost=@base_bindir@/rm -rf /run/quagga/ospf6d.pid Restart=on-abort diff --git a/meta-networking/recipes-protocols/quagga/files/ospfd.service b/meta-networking/recipes-protocols/quagga/files/ospfd.service index fe8343be1c..2cab1cd147 100644 --- a/meta-networking/recipes-protocols/quagga/files/ospfd.service +++ b/meta-networking/recipes-protocols/quagga/files/ospfd.service @@ -7,7 +7,6 @@ ConditionPathExists=@SYSCONFDIR@/quagga/ospfd.conf [Service] Type=forking EnvironmentFile=-@SYSCONFDIR@/default/quagga -PIDFile=/run/quagga/ospfd.pid ExecStart=@SBINDIR@/ospfd -d $ospfd_options -f @SYSCONFDIR@/quagga/ospfd.conf ExecStopPost=@base_bindir@/rm -rf /run/quagga/ospfd.pid Restart=on-abort diff --git a/meta-networking/recipes-protocols/quagga/files/ripd.service b/meta-networking/recipes-protocols/quagga/files/ripd.service index 7af65ca8a3..2c824318a1 100644 --- a/meta-networking/recipes-protocols/quagga/files/ripd.service +++ b/meta-networking/recipes-protocols/quagga/files/ripd.service @@ -7,7 +7,6 @@ ConditionPathExists=@SYSCONFDIR@/quagga/ripd.conf [Service] Type=forking EnvironmentFile=-@SYSCONFDIR@/default/quagga -PIDFile=/run/quagga/ripd.pid ExecStart=@SBINDIR@/ripd -d $ripd_options -f @SYSCONFDIR@/quagga/ripd.conf ExecStopPost=@base_bindir@/rm -rf /run/quagga/ripd.pid Restart=on-abort diff --git a/meta-networking/recipes-protocols/quagga/files/ripngd.service b/meta-networking/recipes-protocols/quagga/files/ripngd.service index 9305f86be5..c3555b345b 100644 --- a/meta-networking/recipes-protocols/quagga/files/ripngd.service +++ b/meta-networking/recipes-protocols/quagga/files/ripngd.service @@ -7,7 +7,6 @@ ConditionPathExists=@SYSCONFDIR@/quagga/ripngd.conf [Service] Type=forking EnvironmentFile=-@SYSCONFDIR@/default/quagga -PIDFile=/run/quagga/ripngd.pid ExecStart=@SBINDIR@/ripngd -d $ripngd_options -f @SYSCONFDIR@/quagga/ripngd.conf ExecStopPost=@base_bindir@/rm -rf /run/quagga/ripngd.pid Restart=on-abort diff --git a/meta-networking/recipes-protocols/quagga/files/zebra.service b/meta-networking/recipes-protocols/quagga/files/zebra.service index e34af72426..9186041ae6 100644 --- a/meta-networking/recipes-protocols/quagga/files/zebra.service +++ b/meta-networking/recipes-protocols/quagga/files/zebra.service @@ -7,7 +7,6 @@ ConditionPathExists=@SYSCONFDIR@/quagga/zebra.conf [Service] Type=forking EnvironmentFile=-@SYSCONFDIR@/default/quagga -PIDFile=/run/quagga/zebra.pid ExecStartPre=@BASE_SBINDIR@/ip route flush proto zebra ExecStart=@SBINDIR@/zebra -d $zebra_options -f @SYSCONFDIR@/quagga/zebra.conf ExecStopPost=@base_bindir@/rm -rf /run/quagga/zebra.pid