diff options
| author | Yi Zhao <yi.zhao@windriver.com> | 2021-03-10 16:06:42 +0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2021-03-11 00:12:55 -0800 |
| commit | 9e20a2f41a1504217b5c1345e53dfe93380a1a09 (patch) | |
| tree | f697442783b0fc0f03159bafaed82e4e97020fc9 | |
| parent | f555f9d34f93118bb4dbe1ae45ba0657c585ee4f (diff) | |
| download | meta-openembedded-9e20a2f41a1504217b5c1345e53dfe93380a1a09.tar.gz | |
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 <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
6 files changed, 0 insertions, 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 | |||
| 7 | [Service] | 7 | [Service] |
| 8 | Type=forking | 8 | Type=forking |
| 9 | EnvironmentFile=-@SYSCONFDIR@/default/quagga | 9 | EnvironmentFile=-@SYSCONFDIR@/default/quagga |
| 10 | PIDFile=/run/quagga/bgpd.pid | ||
| 11 | ExecStart=@SBINDIR@/bgpd -d $bgpd_options -f @SYSCONFDIR@/quagga/bgpd.conf | 10 | ExecStart=@SBINDIR@/bgpd -d $bgpd_options -f @SYSCONFDIR@/quagga/bgpd.conf |
| 12 | ExecStopPost=@base_bindir@/rm -rf /run/quagga/bgpd.pid | 11 | ExecStopPost=@base_bindir@/rm -rf /run/quagga/bgpd.pid |
| 13 | Restart=on-abort | 12 | 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 | |||
| 7 | [Service] | 7 | [Service] |
| 8 | Type=forking | 8 | Type=forking |
| 9 | EnvironmentFile=-@SYSCONFDIR@/default/quagga | 9 | EnvironmentFile=-@SYSCONFDIR@/default/quagga |
| 10 | PIDFile=/run/quagga/ospf6d.pid | ||
| 11 | ExecStart=@SBINDIR@/ospf6d -d $ospf6d_options -f @SYSCONFDIR@/quagga/ospf6d.conf | 10 | ExecStart=@SBINDIR@/ospf6d -d $ospf6d_options -f @SYSCONFDIR@/quagga/ospf6d.conf |
| 12 | ExecStopPost=@base_bindir@/rm -rf /run/quagga/ospf6d.pid | 11 | ExecStopPost=@base_bindir@/rm -rf /run/quagga/ospf6d.pid |
| 13 | Restart=on-abort | 12 | 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 | |||
| 7 | [Service] | 7 | [Service] |
| 8 | Type=forking | 8 | Type=forking |
| 9 | EnvironmentFile=-@SYSCONFDIR@/default/quagga | 9 | EnvironmentFile=-@SYSCONFDIR@/default/quagga |
| 10 | PIDFile=/run/quagga/ospfd.pid | ||
| 11 | ExecStart=@SBINDIR@/ospfd -d $ospfd_options -f @SYSCONFDIR@/quagga/ospfd.conf | 10 | ExecStart=@SBINDIR@/ospfd -d $ospfd_options -f @SYSCONFDIR@/quagga/ospfd.conf |
| 12 | ExecStopPost=@base_bindir@/rm -rf /run/quagga/ospfd.pid | 11 | ExecStopPost=@base_bindir@/rm -rf /run/quagga/ospfd.pid |
| 13 | Restart=on-abort | 12 | 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 | |||
| 7 | [Service] | 7 | [Service] |
| 8 | Type=forking | 8 | Type=forking |
| 9 | EnvironmentFile=-@SYSCONFDIR@/default/quagga | 9 | EnvironmentFile=-@SYSCONFDIR@/default/quagga |
| 10 | PIDFile=/run/quagga/ripd.pid | ||
| 11 | ExecStart=@SBINDIR@/ripd -d $ripd_options -f @SYSCONFDIR@/quagga/ripd.conf | 10 | ExecStart=@SBINDIR@/ripd -d $ripd_options -f @SYSCONFDIR@/quagga/ripd.conf |
| 12 | ExecStopPost=@base_bindir@/rm -rf /run/quagga/ripd.pid | 11 | ExecStopPost=@base_bindir@/rm -rf /run/quagga/ripd.pid |
| 13 | Restart=on-abort | 12 | 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 | |||
| 7 | [Service] | 7 | [Service] |
| 8 | Type=forking | 8 | Type=forking |
| 9 | EnvironmentFile=-@SYSCONFDIR@/default/quagga | 9 | EnvironmentFile=-@SYSCONFDIR@/default/quagga |
| 10 | PIDFile=/run/quagga/ripngd.pid | ||
| 11 | ExecStart=@SBINDIR@/ripngd -d $ripngd_options -f @SYSCONFDIR@/quagga/ripngd.conf | 10 | ExecStart=@SBINDIR@/ripngd -d $ripngd_options -f @SYSCONFDIR@/quagga/ripngd.conf |
| 12 | ExecStopPost=@base_bindir@/rm -rf /run/quagga/ripngd.pid | 11 | ExecStopPost=@base_bindir@/rm -rf /run/quagga/ripngd.pid |
| 13 | Restart=on-abort | 12 | 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 | |||
| 7 | [Service] | 7 | [Service] |
| 8 | Type=forking | 8 | Type=forking |
| 9 | EnvironmentFile=-@SYSCONFDIR@/default/quagga | 9 | EnvironmentFile=-@SYSCONFDIR@/default/quagga |
| 10 | PIDFile=/run/quagga/zebra.pid | ||
| 11 | ExecStartPre=@BASE_SBINDIR@/ip route flush proto zebra | 10 | ExecStartPre=@BASE_SBINDIR@/ip route flush proto zebra |
| 12 | ExecStart=@SBINDIR@/zebra -d $zebra_options -f @SYSCONFDIR@/quagga/zebra.conf | 11 | ExecStart=@SBINDIR@/zebra -d $zebra_options -f @SYSCONFDIR@/quagga/zebra.conf |
| 13 | ExecStopPost=@base_bindir@/rm -rf /run/quagga/zebra.pid | 12 | ExecStopPost=@base_bindir@/rm -rf /run/quagga/zebra.pid |
