All of lore.kernel.org
 help / color / mirror / Atom feed
From: Saul Wold <sgw@linux.intel.com>
To: Patches and discussions about the oe-core layer
	<openembedded-core@lists.openembedded.org>
Subject: Re: [PATCH] avahi-daemon: fix missing init script links
Date: Tue, 17 Apr 2012 07:21:46 -0700	[thread overview]
Message-ID: <4F8D7C7A.70905@linux.intel.com> (raw)
In-Reply-To: <1334659037-5186-1-git-send-email-obi@opendreambox.org>

On 04/17/2012 03:37 AM, Andreas Oberritter wrote:
> * update-rc.d wasn't executed when the rootfs was built, because
>    pkg_postinst_avahi-daemon exited early. It wasn't run either
>    on first boot, because the exit code was 0.
>
> Signed-off-by: Andreas Oberritter<obi@opendreambox.org>
> ---
>   meta/recipes-connectivity/avahi/avahi.inc |    9 ++++-----
>   1 files changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
> index 731ad9a..61ca25f 100644
> --- a/meta/recipes-connectivity/avahi/avahi.inc
> +++ b/meta/recipes-connectivity/avahi/avahi.inc
> @@ -14,7 +14,7 @@ SECTION = "network"
>   # python scripts are under GPLv2+
>   LICENSE = "GPLv2+&  LGPLv2.1+"
>
> -INC_PR = "r1"
> +INC_PR = "r2"
>
>   DEPENDS = "expat libcap libdaemon dbus glib-2.0"
>
> @@ -123,17 +123,16 @@ do_install_avahi-autoipd() {
>   }
>
>   # At the time the postinst runs, dbus might not be setup so only restart if running
> +# Don't exit early, because update-rc.d needs to run subsequently.
>
>   pkg_postinst_avahi-daemon () {
> -	if [ "x$D" != "x" ]; then
> -		exit 0
> -	fi
> -
> +if [ -z "$D" ]; then
>   	DBUSPID=`pidof dbus-daemon`
>
>   	if [ "x$DBUSPID" != "x" ]; then
>   		/etc/init.d/dbus-1 force-reload
>   	fi
> +fi
>   }
>
>   pkg_postinst_avahi-autoipd () {

Merged into OE-Core

Thanks
	Sau!



      reply	other threads:[~2012-04-17 14:31 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-04-17 10:37 [PATCH] avahi-daemon: fix missing init script links Andreas Oberritter
2012-04-17 14:21 ` Saul Wold [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=4F8D7C7A.70905@linux.intel.com \
    --to=sgw@linux.intel.com \
    --cc=openembedded-core@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.