[oe] [meta-networking][PATCH v2 3/8] quagga: add from OE-Classic, update and tidy-up

[Paul Eggleton]

On Wednesday 21 November 2012 14:03:40 Aws Ismail wrote:
> On 11/20/2012 10:30 AM, Paul Eggleton wrote:
> > diff --git a/meta-networking/recipes-protocols/quagga/files/quagga.init
> > b/meta-networking/recipes-protocols/quagga/files/quagga.init new file
> > mode 100644
> > index 0000000..d786a5a
> > --- /dev/null
> > +++ b/meta-networking/recipes-protocols/quagga/files/quagga.init
> > @@ -0,0 +1,200 @@
> > +#!/bin/sh
> > +#
> > +# /etc/init.d/quagga -- start/stop the Quagga routing daemons
> > +#
> > +# Based on debian version by Endre Hirling <endre at mail.elte.hu> and
> > +# Christian Hammers <ch at debian.org>.
> > +#
> > +
> > +### BEGIN INIT INFO
> > +# Provides: quagga
> > +# Required-Start: $local_fs $network $remote_fs $syslog
> > +# Required-Stop: $local_fs $network $remote_fs $syslog
> > +# Default-Start:  2 3 4 5
> > +# Default-Stop: 0 1 6
> > +# Short-Description: start and stop the Quagga routing suite
> > +# Description: Quagga is a routing suite for IP routing protocols like
> > +#              BGP, OSPF, RIP and others. This script contols the main
> > +#              daemon "quagga" as well as the individual protocol
> > daemons.
> > +### END INIT INFO
> > +
> > +# NOTE: sbin must be before bin so we get the iproute2 ip and not the
> > +# busybox ip command. The busybox one flushes all routes instead of just
> > +# the dynamic routes
> > +PATH=/sbin:/usr/sbin:/bin:/usr/bin:/sbin
> > +D_PATH=/usr/sbin/quagga
> 
> Shouldn't this be /usr/sbin rather than /usr/sbin/quagga.
> That's where the daemons are being installed, right?

Ah yes, looks like it should be. Thanks.

> > diff --git
> > a/meta-networking/recipes-protocols/quagga/files/watchquagga.default
> > b/meta-networking/recipes-protocols/quagga/files/watchquagga.default new
> > file mode 100644
> > index 0000000..f152032
> > --- /dev/null
> > +++ b/meta-networking/recipes-protocols/quagga/files/watchquagga.default
> > @@ -0,0 +1,7 @@
> > +# Watchquagga configuration
> > +#watch_daemons="zebra bgpd ospfd ospf6d ripd ripngd"
> > +watch_daemons="zebra"
> > +
> > +# To enable restarts, uncomment this line (but first be sure to edit
> > +# the WATCH_DAEMONS line to reflect the daemons you are actually using):
> > +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"
>
> Paul, these watch_options won't work because -A does not seem to jive
> when a single daemon (i.e. zebra) is being used.
> Recommend using something like:
> 
> watch_options="-z -b_ -r/etc/init.d/quagga_restart_%s"

OK, this is something that came from the OE-Classic recipe from which this one 
is derived. If -A is not going to work here I will remove it.

I'll send out a v2 with these fixes.

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre