| Submitter | Andreas Oberritter |
|---|---|
| Date | April 17, 2012, 10:37 a.m. |
| Message ID | <1334659037-5186-1-git-send-email-obi@opendreambox.org> |
| Download | mbox | patch |
| Permalink | /patch/26041/ |
| State | Accepted |
| Commit | c084759d7f69b751e1ed3ef79d686389d867f248 |
| Headers | show |
Comments
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!
Patch
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 () {
* 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(-)