diff options
| author |   Trevor Gamblin <trevor.gamblin@windriver.com> | 2019-10-17 08:53:51 -0400 |
|---|---|---|
| committer |   Armin Kuster <akuster808@gmail.com> | 2019-11-24 12:54:30 -0800 |
| commit | 8b00105fa1851476493141e6ed0fad6ee0e47088 (patch) | |
| tree | 62dd89c6b0ce2380d405e472f971e302b89b73b0 /meta-networking | |
| parent | 0d15888c61c2072d1525889a0c0ad6af5676f11d (diff) | |
| download | meta-openembedded-contrib-8b00105fa1851476493141e6ed0fad6ee0e47088.tar.gz | |
quagga: fix PIDFile path for service files
Multiple quagga service files are causing the following type of message to
appear during boot:
/lib/systemd/system/zebra.service:10: PIDFile= references a path below legacy
directory /var/run/, updating /var/run/quagga/zebra.pid → /run/quagga/zebra.pid;
please update the unit file accordingly.
Update the service files included as part of the recipe to use /run instead of
/var/run as the PIDFile path.
Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-networking')
6 files changed, 12 insertions, 12 deletions
diff --git a/meta-networking/recipes-protocols/quagga/files/bgpd.service b/meta-networking/recipes-protocols/quagga/files/bgpd.service index 76f9f61e73..c1021fbd71 100644 --- a/meta-networking/recipes-protocols/quagga/files/bgpd.service +++ b/meta-networking/recipes-protocols/quagga/files/bgpd.service @@ -7,9 +7,9 @@ ConditionPathExists=@SYSCONFDIR@/quagga/bgpd.conf [Service] Type=forking EnvironmentFile=-@SYSCONFDIR@/default/quagga -PIDFile=@localstatedir@/run/quagga/bgpd.pid +PIDFile=/run/quagga/bgpd.pid ExecStart=@SBINDIR@/bgpd -d $bgpd_options -f @SYSCONFDIR@/quagga/bgpd.conf -ExecStopPost=@base_bindir@/rm -rf @localstatedir@/run/quagga/bgpd.pid +ExecStopPost=@base_bindir@/rm -rf /run/quagga/bgpd.pid Restart=on-abort [Install] diff --git a/meta-networking/recipes-protocols/quagga/files/ospf6d.service b/meta-networking/recipes-protocols/quagga/files/ospf6d.service index a2e493b423..99d0e6dcaf 100644 --- a/meta-networking/recipes-protocols/quagga/files/ospf6d.service +++ b/meta-networking/recipes-protocols/quagga/files/ospf6d.service @@ -7,9 +7,9 @@ ConditionPathExists=@SYSCONFDIR@/quagga/ospf6d.conf [Service] Type=forking EnvironmentFile=-@SYSCONFDIR@/default/quagga -PIDFile=@localstatedir@/run/quagga/ospf6d.pid +PIDFile=/run/quagga/ospf6d.pid ExecStart=@SBINDIR@/ospf6d -d $ospf6d_options -f @SYSCONFDIR@/quagga/ospf6d.conf -ExecStopPost=@base_bindir@/rm -rf @localstatedir@/run/quagga/ospf6d.pid +ExecStopPost=@base_bindir@/rm -rf /run/quagga/ospf6d.pid Restart=on-abort [Install] diff --git a/meta-networking/recipes-protocols/quagga/files/ospfd.service b/meta-networking/recipes-protocols/quagga/files/ospfd.service index 0c62cbce58..fe8343be1c 100644 --- a/meta-networking/recipes-protocols/quagga/files/ospfd.service +++ b/meta-networking/recipes-protocols/quagga/files/ospfd.service @@ -7,9 +7,9 @@ ConditionPathExists=@SYSCONFDIR@/quagga/ospfd.conf [Service] Type=forking EnvironmentFile=-@SYSCONFDIR@/default/quagga -PIDFile=@localstatedir@/run/quagga/ospfd.pid +PIDFile=/run/quagga/ospfd.pid ExecStart=@SBINDIR@/ospfd -d $ospfd_options -f @SYSCONFDIR@/quagga/ospfd.conf -ExecStopPost=@base_bindir@/rm -rf @localstatedir@/run/quagga/ospfd.pid +ExecStopPost=@base_bindir@/rm -rf /run/quagga/ospfd.pid Restart=on-abort [Install] diff --git a/meta-networking/recipes-protocols/quagga/files/ripd.service b/meta-networking/recipes-protocols/quagga/files/ripd.service index 1d20389e8b..7af65ca8a3 100644 --- a/meta-networking/recipes-protocols/quagga/files/ripd.service +++ b/meta-networking/recipes-protocols/quagga/files/ripd.service @@ -7,9 +7,9 @@ ConditionPathExists=@SYSCONFDIR@/quagga/ripd.conf [Service] Type=forking EnvironmentFile=-@SYSCONFDIR@/default/quagga -PIDFile=@localstatedir@/run/quagga/ripd.pid +PIDFile=/run/quagga/ripd.pid ExecStart=@SBINDIR@/ripd -d $ripd_options -f @SYSCONFDIR@/quagga/ripd.conf -ExecStopPost=@base_bindir@/rm -rf @localstatedir@/run/quagga/ripd.pid +ExecStopPost=@base_bindir@/rm -rf /run/quagga/ripd.pid Restart=on-abort [Install] diff --git a/meta-networking/recipes-protocols/quagga/files/ripngd.service b/meta-networking/recipes-protocols/quagga/files/ripngd.service index 0355ad12a4..9305f86be5 100644 --- a/meta-networking/recipes-protocols/quagga/files/ripngd.service +++ b/meta-networking/recipes-protocols/quagga/files/ripngd.service @@ -7,9 +7,9 @@ ConditionPathExists=@SYSCONFDIR@/quagga/ripngd.conf [Service] Type=forking EnvironmentFile=-@SYSCONFDIR@/default/quagga -PIDFile=@localstatedir@/run/quagga/ripngd.pid +PIDFile=/run/quagga/ripngd.pid ExecStart=@SBINDIR@/ripngd -d $ripngd_options -f @SYSCONFDIR@/quagga/ripngd.conf -ExecStopPost=@base_bindir@/rm -rf @localstatedir@/run/quagga/ripngd.pid +ExecStopPost=@base_bindir@/rm -rf /run/quagga/ripngd.pid Restart=on-abort [Install] diff --git a/meta-networking/recipes-protocols/quagga/files/zebra.service b/meta-networking/recipes-protocols/quagga/files/zebra.service index e4fb6c808d..e34af72426 100644 --- a/meta-networking/recipes-protocols/quagga/files/zebra.service +++ b/meta-networking/recipes-protocols/quagga/files/zebra.service @@ -7,10 +7,10 @@ ConditionPathExists=@SYSCONFDIR@/quagga/zebra.conf [Service] Type=forking EnvironmentFile=-@SYSCONFDIR@/default/quagga -PIDFile=@localstatedir@/run/quagga/zebra.pid +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 @localstatedir@/run/quagga/zebra.pid +ExecStopPost=@base_bindir@/rm -rf /run/quagga/zebra.pid Restart=on-abort [Install] |