diff options
author | Andreas Oberritter <obi@opendreambox.org> | 2012-04-17 12:37:17 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-17 12:26:12 +0100 |
commit | 6004dc8906f6a36f6242a96b94efd111d474d2cf (patch) | |
tree | 557dda28f1cd754607f568f9ebd71c0f1e3ec17e /meta/recipes-connectivity/avahi/avahi.inc | |
parent | 04d6aa1069f68562cc28167c4bf9f0096789ec7f (diff) | |
download | openembedded-core-contrib-6004dc8906f6a36f6242a96b94efd111d474d2cf.tar.gz |
avahi-daemon: fix missing init script links
* 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.
(From OE-Core rev: c084759d7f69b751e1ed3ef79d686389d867f248)
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/avahi/avahi.inc')
-rw-r--r-- | 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 731ad9a1cc..61ca25f75e 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 () { |