mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-01 13:40:04 +00:00
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>
This commit is contained in:
@@ -7,9 +7,9 @@ ConditionPathExists=@SYSCONFDIR@/quagga/bgpd.conf
|
|||||||
[Service]
|
[Service]
|
||||||
Type=forking
|
Type=forking
|
||||||
EnvironmentFile=-@SYSCONFDIR@/default/quagga
|
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
|
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
|
Restart=on-abort
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
|
|||||||
@@ -7,9 +7,9 @@ ConditionPathExists=@SYSCONFDIR@/quagga/ospf6d.conf
|
|||||||
[Service]
|
[Service]
|
||||||
Type=forking
|
Type=forking
|
||||||
EnvironmentFile=-@SYSCONFDIR@/default/quagga
|
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
|
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
|
Restart=on-abort
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
|
|||||||
@@ -7,9 +7,9 @@ ConditionPathExists=@SYSCONFDIR@/quagga/ospfd.conf
|
|||||||
[Service]
|
[Service]
|
||||||
Type=forking
|
Type=forking
|
||||||
EnvironmentFile=-@SYSCONFDIR@/default/quagga
|
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
|
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
|
Restart=on-abort
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
|
|||||||
@@ -7,9 +7,9 @@ ConditionPathExists=@SYSCONFDIR@/quagga/ripd.conf
|
|||||||
[Service]
|
[Service]
|
||||||
Type=forking
|
Type=forking
|
||||||
EnvironmentFile=-@SYSCONFDIR@/default/quagga
|
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
|
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
|
Restart=on-abort
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
|
|||||||
@@ -7,9 +7,9 @@ ConditionPathExists=@SYSCONFDIR@/quagga/ripngd.conf
|
|||||||
[Service]
|
[Service]
|
||||||
Type=forking
|
Type=forking
|
||||||
EnvironmentFile=-@SYSCONFDIR@/default/quagga
|
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
|
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
|
Restart=on-abort
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
|
|||||||
@@ -7,10 +7,10 @@ ConditionPathExists=@SYSCONFDIR@/quagga/zebra.conf
|
|||||||
[Service]
|
[Service]
|
||||||
Type=forking
|
Type=forking
|
||||||
EnvironmentFile=-@SYSCONFDIR@/default/quagga
|
EnvironmentFile=-@SYSCONFDIR@/default/quagga
|
||||||
PIDFile=@localstatedir@/run/quagga/zebra.pid
|
PIDFile=/run/quagga/zebra.pid
|
||||||
ExecStartPre=@BASE_SBINDIR@/ip route flush proto zebra
|
ExecStartPre=@BASE_SBINDIR@/ip route flush proto zebra
|
||||||
ExecStart=@SBINDIR@/zebra -d $zebra_options -f @SYSCONFDIR@/quagga/zebra.conf
|
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
|
Restart=on-abort
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
|
|||||||
Reference in New Issue
Block a user