[oe-commits] Bopeng Liu : quagga: Fix watchquagga initscript problem.

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master
Commit: 98367f46aab5401e4bc2daf318c9bb9110af463b
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=98367f46aab5401e4bc2daf318c9bb9110af463b

Author: Bopeng Liu <bopeng.liu at windriver.com>
Date:   Tue Nov 19 15:50:36 2013 -0600

quagga: Fix watchquagga initscript problem.

Change the default config file for making watchquagga can startup successful

Signed-off-by: Bopeng Liu <Bopeng.Liu at windriver.com>
Signed-off-by: Joe MacDonald <joe at deserted.net>

---

 .../recipes-protocols/quagga/files/watchquagga.default           | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/meta-networking/recipes-protocols/quagga/files/watchquagga.default b/meta-networking/recipes-protocols/quagga/files/watchquagga.default
index 53f6a8c..2d601ec 100644
--- a/meta-networking/recipes-protocols/quagga/files/watchquagga.default
+++ b/meta-networking/recipes-protocols/quagga/files/watchquagga.default
@@ -2,6 +2,11 @@
 #watch_daemons="zebra bgpd ospfd ospf6d ripd ripngd"
 watch_daemons="zebra"
 
-# To enable restarts, uncomment this line (but first be sure to edit
+# To enable restarts when multiple daemons are being used, uncomment this line (but first be sure to edit
 # the WATCH_DAEMONS line to reflect the daemons you are actually using):
-watch_options="-z -b_ -r/etc/init.d/quagga_restart_%s -s/etc/init.d/quagga_start_%s -k/etc/init.d/quagga_stop_%s"
+#watch_options="-Az -b_ -r/etc/init.d/quagga_restart_%s -s/etc/init.d/quagga_start_%s -k/etc/init.d/quagga_stop_%s"
+
+# Since we are using one quagga daemon for now, use the following line. If using
+# multiple daemons, comment the line below and uncoment the line mentioned
+# above.
+watch_options="-z -b_ -r/etc/init.d/quagga_restart_%s"