From: Joe MacDonald <joe@deserted.net>
To: Mark Hatle <mark.hatle@windriver.com>
Cc: openembedded-devel@lists.openembedded.org
Subject: Re: [meta-networking][PATCH 1/3] quagga: Fix watchquagga initscript problem.
Date: Tue, 26 Nov 2013 11:24:30 -0500 [thread overview]
Message-ID: <20131126162429.GE3939@deserted.net> (raw)
In-Reply-To: <1384897838-11066-2-git-send-email-mark.hatle@windriver.com>
[-- Attachment #1: Type: text/plain, Size: 1692 bytes --]
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"
--
-Joe MacDonald.
:wq
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
next prev parent reply other threads:[~2013-11-26 16:24 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-19 21:50 [meta-networking][PATCH 0/3] misc fixes Mark Hatle
2013-11-19 21:50 ` [meta-networking][PATCH 1/3] quagga: Fix watchquagga initscript problem Mark Hatle
2013-11-26 16:24 ` Joe MacDonald [this message]
2013-11-19 21:50 ` [meta-networking][PATCH 2/3] proftpd: Convert proftpd group to system scope Mark Hatle
2013-11-26 2:54 ` Joe MacDonald
2013-11-19 21:50 ` [meta-networking][PATCH 3/3] ntpd: make start-stop-daemon command available for ntpd Mark Hatle
2013-11-26 16:25 ` Joe MacDonald
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20131126162429.GE3939@deserted.net \
--to=joe@deserted.net \
--cc=mark.hatle@windriver.com \
--cc=openembedded-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox