Patchwork [meta-networking,1/3] quagga: Fix watchquagga initscript problem.

login
register
mail settings
Submitter Mark Hatle
Date Nov. 19, 2013, 9:50 p.m.
Message ID <1384897838-11066-2-git-send-email-mark.hatle@windriver.com>
Download mbox | patch
Permalink /patch/61989/
State Accepted, archived
Headers show

Comments

Mark Hatle - Nov. 19, 2013, 9:50 p.m.
From: Bopeng Liu <bopeng.liu@windriver.com>

Change the default config file for making watchquagga can startup successful

Signed-off-by: Bopeng Liu <Bopeng.Liu@windriver.com>
---
 .../recipes-protocols/quagga/files/watchquagga.default           | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
Joe MacDonald - Nov. 26, 2013, 4:24 p.m.
Merged, thanks.
-J.

[[meta-networking][PATCH 1/3] quagga: Fix watchquagga initscript problem.] On 13.11.19 (Tue 15:50) Mark Hatle wrote:

> From: Bopeng Liu <bopeng.liu@windriver.com>
> 
> Change the default config file for making watchquagga can startup successful
> 
> Signed-off-by: Bopeng Liu <Bopeng.Liu@windriver.com>
> ---
>  .../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"

Patch

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"