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) (From OE-Core rev: 925c7cd5c3ff44a4d0f2c71d0029998bfd00db48) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
398a0159a6
commit
9f542cf856
|
@ -14,7 +14,7 @@ SECTION = "network"
|
||||||
# python scripts are under GPLv2+
|
# python scripts are under GPLv2+
|
||||||
LICENSE = "GPLv2+ & LGPLv2.1+"
|
LICENSE = "GPLv2+ & LGPLv2.1+"
|
||||||
|
|
||||||
INC_PR = "r7"
|
INC_PR = "r8"
|
||||||
|
|
||||||
DEPENDS = "expat libcap libdaemon dbus glib-2.0"
|
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://99avahi-autoipd \
|
||||||
file://initscript.patch"
|
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 \
|
EXTRA_OECONF = "--with-distro=debian \
|
||||||
--disable-introspection \
|
--disable-introspection \
|
||||||
|
@ -117,12 +122,9 @@ do_install_avahi-autoipd() {
|
||||||
# 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 () {
|
pkg_postinst_avahi-daemon () {
|
||||||
# can't do this offline
|
|
||||||
if [ "x$D" != "x" ]; then
|
if [ "x$D" != "x" ]; then
|
||||||
exit 1
|
exit 0
|
||||||
fi
|
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`
|
DBUSPID=`pidof dbus-daemon`
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue