diff options
| author |   Saul Wold <sgw@linux.intel.com> | 2011-10-27 16:08:40 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-02 08:58:01 +0000 |
| commit | d9fc7ba254cfe3d60555fffeb09a294e1de7256b (patch) | |
| tree | f4e75a68dd474d8ea43d7028017758ca042b0c77 /meta/recipes-connectivity/avahi/avahi.inc | |
| parent | 4a951e0433a99cd985515843f0a48fadc7050aca (diff) | |
| download | openembedded-core-contrib-d9fc7ba254cfe3d60555fffeb09a294e1de7256b.tar.gz | |
avahi: use useradd to create avahi user for avahi-daemon
DBus was failing to start correct since the avahi user was
not setup.
Keep the dbus reload since this could still be installed
as a package an would require a dbus restart.
Fixes: [YOCTO #1699]
(From OE-Core rev: f0bfecc8a0af1c4c76a37a9c88f334ab6ae7e7ef)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
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 | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc index 5ad9db060f..79cfd73738 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 = "r8" +INC_PR = "r9" DEPENDS = "expat libcap libdaemon dbus glib-2.0" @@ -23,7 +23,12 @@ SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \ file://99avahi-autoipd \ file://initscript.patch" -inherit autotools pkgconfig update-rc.d gettext +USERADD_PACKAGES = "${PN}-daemon" +USERADD_PARAM_${PN}-daemon = "--system --home /var/run/avahi-daemon \ + --no-create-home --shell /bin/false \ + --user-group avahi" + +inherit autotools pkgconfig update-rc.d gettext useradd EXTRA_OECONF = "--with-distro=debian \ --disable-introspection \ @@ -116,15 +121,12 @@ do_install_avahi-autoipd() { install ${WORKDIR}/99avahi-autoipd ${D}${sysconfdir}/udhcpc.d } -# At the time the postinst runs, dbus might not be setup so only restart if running +# At the time the postinst runs, dbus might not be setup so only restart if running pkg_postinst_avahi-daemon () { - # can't do this offline if [ "x$D" != "x" ]; then - exit 1 + exit 0 fi - grep "^avahi:" /etc/group > /dev/null || addgroup avahi - grep "^avahi:" /etc/passwd > /dev/null || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi --ingroup avahi -g Avahi DBUSPID=`pidof dbus-daemon` |