quagga: bug fix

The bug is: after the service stopped,the pid file still exists.
So modidy the service files.

Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
This commit is contained in:
Li xin
2015-06-17 11:53:05 +08:00
committed by Joe MacDonald
parent 420ad67ab8
commit f195ff612b
7 changed files with 20 additions and 6 deletions
@@ -7,7 +7,9 @@ ConditionPathExists=@SYSCONFDIR@/quagga/bgpd.conf
[Service]
Type=forking
EnvironmentFile=-@SYSCONFDIR@/default/quagga
ExecStart=@SBINDIR@/bgpd -d $bgpd_options -f /etc/quagga/bgpd.conf
PIDFile=@localstatedir@/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
Restart=on-abort
[Install]
@@ -7,7 +7,9 @@ ConditionPathExists=@SYSCONFDIR@/quagga/ospf6d.conf
[Service]
Type=forking
EnvironmentFile=-@SYSCONFDIR@/default/quagga
ExecStart=@SBINDIR@/ospf6d -d $ospf6d_options -f /etc/quagga/ospf6d.conf
PIDFile=@localstatedir@/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
Restart=on-abort
[Install]
@@ -7,7 +7,9 @@ ConditionPathExists=@SYSCONFDIR@/quagga/ospfd.conf
[Service]
Type=forking
EnvironmentFile=-@SYSCONFDIR@/default/quagga
ExecStart=@SBINDIR@/ospfd -d $ospfd_options -f /etc/quagga/ospfd.conf
PIDFile=@localstatedir@/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
Restart=on-abort
[Install]
@@ -7,7 +7,9 @@ ConditionPathExists=@SYSCONFDIR@/quagga/ripd.conf
[Service]
Type=forking
EnvironmentFile=-@SYSCONFDIR@/default/quagga
ExecStart=@SBINDIR@/ripd -d $ripd_options -f /etc/quagga/ripd.conf
PIDFile=@localstatedir@/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
Restart=on-abort
[Install]
@@ -7,7 +7,9 @@ ConditionPathExists=@SYSCONFDIR@/quagga/ripngd.conf
[Service]
Type=forking
EnvironmentFile=-@SYSCONFDIR@/default/quagga
ExecStart=@SBINDIR@/ripngd -d $ripngd_options -f /etc/quagga/ripngd.conf
PIDFile=@localstatedir@/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
Restart=on-abort
[Install]
@@ -7,8 +7,10 @@ ConditionPathExists=@SYSCONFDIR@/quagga/zebra.conf
[Service]
Type=forking
EnvironmentFile=-@SYSCONFDIR@/default/quagga
PIDFile=@localstatedir@/run/quagga/zebra.pid
ExecStartPre=@BASE_SBINDIR@/ip route flush proto zebra
ExecStart=@SBINDIR@/zebra -d $zebra_options -f /etc/quagga/zebra.conf
ExecStart=@SBINDIR@/zebra -d $zebra_options -f @SYSCONFDIR@/quagga/zebra.conf
ExecStopPost=@base_bindir@/rm -rf @localstatedir@/run/quagga/zebra.pid
Restart=on-abort
[Install]
@@ -145,6 +145,8 @@ do_install () {
sed -e 's,@BASE_SBINDIR@,${base_sbindir},g' \
-e 's,@SYSCONFDIR@,${sysconfdir},g' \
-e 's,@SBINDIR@,${sbindir},g' \
-e 's,@base_bindir@,${base_bindir},g' \
-e 's,@localstatedir@,${localstatedir},g' \
-i ${D}${systemd_unitdir}/system/*.service
}