All of lore.kernel.org
 help / color / mirror / Atom feed
From: Koen Kooi <koen@dominion.thruhere.net>
To: openembedded-devel@lists.openembedded.org
Subject: Re: [meta-oe][PATCH 1/2] meta-networking: Migrate dnsmasq into meta-networking
Date: Mon, 03 Sep 2012 08:09:42 +0200	[thread overview]
Message-ID: <k21hj7$npr$2@ger.gmane.org> (raw)
In-Reply-To: <1346633420-10990-2-git-send-email-joe.macdonald@windriver.com>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 03-09-12 02:50, Joe MacDonald schreef:
> Signed-off-by: Joe MacDonald <joe.macdonald@windriver.com> --- 
> .../recipes-daemons/dnsmasq/dnsmasq-dbus_2.55.bb   |  13 + 
> .../recipes-daemons/dnsmasq/dnsmasq.inc            |  29 ++ 
> .../recipes-daemons/dnsmasq/dnsmasq_2.55.bb        |   4 + 
> .../recipes-daemons/dnsmasq/files/dnsmasq.conf     | 293
> +++++++++++++++++++++ meta-networking/recipes-daemons/dnsmasq/files/init
> |  52 ++++ .../dnsmasq/dnsmasq-dbus_2.55.bb                   |  13 - 
> meta-oe/recipes-connectivity/dnsmasq/dnsmasq.inc   |  29 -- 
> .../recipes-connectivity/dnsmasq/dnsmasq_2.55.bb   |   4 - 
> .../dnsmasq/files/dnsmasq.conf                     | 293
> --------------------- meta-oe/recipes-connectivity/dnsmasq/files/init
> |  52 ---- 10 files changed, 391 insertions(+), 391 deletions(-) create
> mode 100644 meta-networking/recipes-daemons/dnsmasq/dnsmasq-dbus_2.55.bb 
> create mode 100644 meta-networking/recipes-daemons/dnsmasq/dnsmasq.inc 
> create mode 100644
> meta-networking/recipes-daemons/dnsmasq/dnsmasq_2.55.bb create mode
> 100755 meta-networking/recipes-daemons/dnsmasq/files/dnsmasq.conf create
> mode 100644 meta-networking/recipes-daemons/dnsmasq/files/init delete
> mode 100644 meta-oe/recipes-connectivity/dnsmasq/dnsmasq-dbus_2.55.bb 
> delete mode 100644 meta-oe/recipes-connectivity/dnsmasq/dnsmasq.inc 
> delete mode 100644 meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bb 
> delete mode 100755
> meta-oe/recipes-connectivity/dnsmasq/files/dnsmasq.conf delete mode
> 100644 meta-oe/recipes-connectivity/dnsmasq/files/init
> 

> diff --git a/meta-networking/recipes-daemons/dnsmasq/files/init
> b/meta-networking/recipes-daemons/dnsmasq/files/init new file mode
> 100644 index 0000000..d1aa9e5 --- /dev/null +++
> b/meta-networking/recipes-daemons/dnsmasq/files/init @@ -0,0 +1,52 @@ 
> +#!/bin/sh +DAEMON=/usr/bin/dnsmasq +NAME=dnsmasq +DESC="DNS forwarder
> and DHCP server" +ARGS="-7 /etc/dnsmasq.d" + +test -f $DAEMON || exit 0 
> + +set -e + +case "$1" in +    start) +        echo -n "starting $DESC:
> $NAME... " +	test -d /var/lib/misc/ || mkdir /var/lib/misc/ +
> start-stop-daemon -S -x $DAEMON -- $ARGS +	echo "done." +	;; +    stop) +
> echo -n "stopping $DESC: $NAME... " +	start-stop-daemon -K -x $DAEMON +
> echo "done." +	;; +    status) +	echo -n "dnsmasq " +	start-stop-daemon
> -q -K -t -x $DAEMON +	RET=$? +	if [ "$RET" = "0" ]; then +		PID=`cat
> /var/run/dnsmasq.pid` +		echo "($PID) is running" +	else +		echo "is not
> running" +		exit $RET +	fi +	;; +    restart) +        echo "restarting
> $DESC: $NAME... " + 	$0 stop +	$0 start +	echo "done." +	;; +    reload) 
> +    	echo -n "reloading $DESC: $NAME... " +    	killall -HUP $(basename
> ${DAEMON}) +	echo "done." +	;; +    *) +	echo "Usage: $0
> {start|stop|status|restart|reload}" +	exit 1 +	;; +esac + +exit 0

Can this be made LSB compliant? Or better, does dnsmasq ship with its own
initscript we can use?
Another nit, the initscript and conffile hardcode /etc and /var, while the
recipe allows changing them.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFQREmmMkyGM64RGpERApmoAJ9jBM4+/H1EiY4yHPmWUUq3Q8p7hQCgnlx4
i+OCPKb2ao1egXP88MOKCVA=
=AhXV
-----END PGP SIGNATURE-----




      parent reply	other threads:[~2012-09-03  6:22 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-03  0:50 [meta-oe][meta-networking] Migrate dnsmasq Joe MacDonald
2012-09-03  0:50 ` [meta-oe][PATCH 1/2] meta-networking: Migrate dnsmasq into meta-networking Joe MacDonald
2012-09-03  0:50   ` [meta-oe][PATCH 2/2] meta-networking: stylize dnsmasq recipe Joe MacDonald
2012-09-03  6:06     ` Koen Kooi
2012-09-03  6:09   ` Koen Kooi [this message]

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='k21hj7$npr$2@ger.gmane.org' \
    --to=koen@dominion.thruhere.net \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.