summaryrefslogtreecommitdiffstats
path: root/meta-networking/recipes-protocols
diff options
context:
space:
mode:
authorLi xin <lixin.fnst@cn.fujitsu.com>2015-06-17 11:53:05 +0800
committerJoe MacDonald <joe_macdonald@mentor.com>2015-07-06 15:27:51 -0400
commitf195ff612ba17dcd1bd8003b43cd2ecf513710c1 (patch)
tree86c051d001ae7cc93723fe8381fa65e6a87173f0 /meta-networking/recipes-protocols
parent420ad67ab8e92a82875632b3e07fa46be4f5fae7 (diff)
downloadmeta-openembedded-f195ff612ba17dcd1bd8003b43cd2ecf513710c1.tar.gz
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>
Diffstat (limited to 'meta-networking/recipes-protocols')
-rw-r--r--meta-networking/recipes-protocols/quagga/files/bgpd.service4
-rw-r--r--meta-networking/recipes-protocols/quagga/files/ospf6d.service4
-rw-r--r--meta-networking/recipes-protocols/quagga/files/ospfd.service4
-rw-r--r--meta-networking/recipes-protocols/quagga/files/ripd.service4
-rw-r--r--meta-networking/recipes-protocols/quagga/files/ripngd.service4
-rw-r--r--meta-networking/recipes-protocols/quagga/files/zebra.service4
-rw-r--r--meta-networking/recipes-protocols/quagga/quagga.inc2
7 files changed, 20 insertions, 6 deletions
diff --git a/meta-networking/recipes-protocols/quagga/files/bgpd.service b/meta-networking/recipes-protocols/quagga/files/bgpd.service
index 164c81724..76f9f61e7 100644
--- a/meta-networking/recipes-protocols/quagga/files/bgpd.service
+++ b/meta-networking/recipes-protocols/quagga/files/bgpd.service
@@ -7,7 +7,9 @@ ConditionPathExists=@SYSCONFDIR@/quagga/bgpd.conf
7[Service] 7[Service]
8Type=forking 8Type=forking
9EnvironmentFile=-@SYSCONFDIR@/default/quagga 9EnvironmentFile=-@SYSCONFDIR@/default/quagga
10ExecStart=@SBINDIR@/bgpd -d $bgpd_options -f /etc/quagga/bgpd.conf 10PIDFile=@localstatedir@/run/quagga/bgpd.pid
11ExecStart=@SBINDIR@/bgpd -d $bgpd_options -f @SYSCONFDIR@/quagga/bgpd.conf
12ExecStopPost=@base_bindir@/rm -rf @localstatedir@/run/quagga/bgpd.pid
11Restart=on-abort 13Restart=on-abort
12 14
13[Install] 15[Install]
diff --git a/meta-networking/recipes-protocols/quagga/files/ospf6d.service b/meta-networking/recipes-protocols/quagga/files/ospf6d.service
index 4b8ebf802..a2e493b42 100644
--- a/meta-networking/recipes-protocols/quagga/files/ospf6d.service
+++ b/meta-networking/recipes-protocols/quagga/files/ospf6d.service
@@ -7,7 +7,9 @@ ConditionPathExists=@SYSCONFDIR@/quagga/ospf6d.conf
7[Service] 7[Service]
8Type=forking 8Type=forking
9EnvironmentFile=-@SYSCONFDIR@/default/quagga 9EnvironmentFile=-@SYSCONFDIR@/default/quagga
10ExecStart=@SBINDIR@/ospf6d -d $ospf6d_options -f /etc/quagga/ospf6d.conf 10PIDFile=@localstatedir@/run/quagga/ospf6d.pid
11ExecStart=@SBINDIR@/ospf6d -d $ospf6d_options -f @SYSCONFDIR@/quagga/ospf6d.conf
12ExecStopPost=@base_bindir@/rm -rf @localstatedir@/run/quagga/ospf6d.pid
11Restart=on-abort 13Restart=on-abort
12 14
13[Install] 15[Install]
diff --git a/meta-networking/recipes-protocols/quagga/files/ospfd.service b/meta-networking/recipes-protocols/quagga/files/ospfd.service
index f9f5031b4..0c62cbce5 100644
--- a/meta-networking/recipes-protocols/quagga/files/ospfd.service
+++ b/meta-networking/recipes-protocols/quagga/files/ospfd.service
@@ -7,7 +7,9 @@ ConditionPathExists=@SYSCONFDIR@/quagga/ospfd.conf
7[Service] 7[Service]
8Type=forking 8Type=forking
9EnvironmentFile=-@SYSCONFDIR@/default/quagga 9EnvironmentFile=-@SYSCONFDIR@/default/quagga
10ExecStart=@SBINDIR@/ospfd -d $ospfd_options -f /etc/quagga/ospfd.conf 10PIDFile=@localstatedir@/run/quagga/ospfd.pid
11ExecStart=@SBINDIR@/ospfd -d $ospfd_options -f @SYSCONFDIR@/quagga/ospfd.conf
12ExecStopPost=@base_bindir@/rm -rf @localstatedir@/run/quagga/ospfd.pid
11Restart=on-abort 13Restart=on-abort
12 14
13[Install] 15[Install]
diff --git a/meta-networking/recipes-protocols/quagga/files/ripd.service b/meta-networking/recipes-protocols/quagga/files/ripd.service
index 5dfd28b3a..1d20389e8 100644
--- a/meta-networking/recipes-protocols/quagga/files/ripd.service
+++ b/meta-networking/recipes-protocols/quagga/files/ripd.service
@@ -7,7 +7,9 @@ ConditionPathExists=@SYSCONFDIR@/quagga/ripd.conf
7[Service] 7[Service]
8Type=forking 8Type=forking
9EnvironmentFile=-@SYSCONFDIR@/default/quagga 9EnvironmentFile=-@SYSCONFDIR@/default/quagga
10ExecStart=@SBINDIR@/ripd -d $ripd_options -f /etc/quagga/ripd.conf 10PIDFile=@localstatedir@/run/quagga/ripd.pid
11ExecStart=@SBINDIR@/ripd -d $ripd_options -f @SYSCONFDIR@/quagga/ripd.conf
12ExecStopPost=@base_bindir@/rm -rf @localstatedir@/run/quagga/ripd.pid
11Restart=on-abort 13Restart=on-abort
12 14
13[Install] 15[Install]
diff --git a/meta-networking/recipes-protocols/quagga/files/ripngd.service b/meta-networking/recipes-protocols/quagga/files/ripngd.service
index 72562d5f7..0355ad12a 100644
--- a/meta-networking/recipes-protocols/quagga/files/ripngd.service
+++ b/meta-networking/recipes-protocols/quagga/files/ripngd.service
@@ -7,7 +7,9 @@ ConditionPathExists=@SYSCONFDIR@/quagga/ripngd.conf
7[Service] 7[Service]
8Type=forking 8Type=forking
9EnvironmentFile=-@SYSCONFDIR@/default/quagga 9EnvironmentFile=-@SYSCONFDIR@/default/quagga
10ExecStart=@SBINDIR@/ripngd -d $ripngd_options -f /etc/quagga/ripngd.conf 10PIDFile=@localstatedir@/run/quagga/ripngd.pid
11ExecStart=@SBINDIR@/ripngd -d $ripngd_options -f @SYSCONFDIR@/quagga/ripngd.conf
12ExecStopPost=@base_bindir@/rm -rf @localstatedir@/run/quagga/ripngd.pid
11Restart=on-abort 13Restart=on-abort
12 14
13[Install] 15[Install]
diff --git a/meta-networking/recipes-protocols/quagga/files/zebra.service b/meta-networking/recipes-protocols/quagga/files/zebra.service
index afdd9e52d..e4fb6c808 100644
--- a/meta-networking/recipes-protocols/quagga/files/zebra.service
+++ b/meta-networking/recipes-protocols/quagga/files/zebra.service
@@ -7,8 +7,10 @@ ConditionPathExists=@SYSCONFDIR@/quagga/zebra.conf
7[Service] 7[Service]
8Type=forking 8Type=forking
9EnvironmentFile=-@SYSCONFDIR@/default/quagga 9EnvironmentFile=-@SYSCONFDIR@/default/quagga
10PIDFile=@localstatedir@/run/quagga/zebra.pid
10ExecStartPre=@BASE_SBINDIR@/ip route flush proto zebra 11ExecStartPre=@BASE_SBINDIR@/ip route flush proto zebra
11ExecStart=@SBINDIR@/zebra -d $zebra_options -f /etc/quagga/zebra.conf 12ExecStart=@SBINDIR@/zebra -d $zebra_options -f @SYSCONFDIR@/quagga/zebra.conf
13ExecStopPost=@base_bindir@/rm -rf @localstatedir@/run/quagga/zebra.pid
12Restart=on-abort 14Restart=on-abort
13 15
14[Install] 16[Install]
diff --git a/meta-networking/recipes-protocols/quagga/quagga.inc b/meta-networking/recipes-protocols/quagga/quagga.inc
index 071e8d448..2f0b515ca 100644
--- a/meta-networking/recipes-protocols/quagga/quagga.inc
+++ b/meta-networking/recipes-protocols/quagga/quagga.inc
@@ -145,6 +145,8 @@ do_install () {
145 sed -e 's,@BASE_SBINDIR@,${base_sbindir},g' \ 145 sed -e 's,@BASE_SBINDIR@,${base_sbindir},g' \
146 -e 's,@SYSCONFDIR@,${sysconfdir},g' \ 146 -e 's,@SYSCONFDIR@,${sysconfdir},g' \
147 -e 's,@SBINDIR@,${sbindir},g' \ 147 -e 's,@SBINDIR@,${sbindir},g' \
148 -e 's,@base_bindir@,${base_bindir},g' \
149 -e 's,@localstatedir@,${localstatedir},g' \
148 -i ${D}${systemd_unitdir}/system/*.service 150 -i ${D}${systemd_unitdir}/system/*.service
149} 151}
150 152