summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/avahi
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2011-10-27 14:08:40 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-02 08:58:01 (GMT)
commitd9fc7ba254cfe3d60555fffeb09a294e1de7256b (patch)
treef4e75a68dd474d8ea43d7028017758ca042b0c77 /meta/recipes-connectivity/avahi
parent4a951e0433a99cd985515843f0a48fadc7050aca (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-connectivity/avahi/avahi.inc16
1 files changed, 9 insertions, 7 deletions
diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
index 5ad9db0..79cfd73 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -14,7 +14,7 @@ SECTION = "network"
14# python scripts are under GPLv2+ 14# python scripts are under GPLv2+
15LICENSE = "GPLv2+ & LGPLv2.1+" 15LICENSE = "GPLv2+ & LGPLv2.1+"
16 16
17INC_PR = "r8" 17INC_PR = "r9"
18 18
19DEPENDS = "expat libcap libdaemon dbus glib-2.0" 19DEPENDS = "expat libcap libdaemon dbus glib-2.0"
20 20
@@ -23,7 +23,12 @@ SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \
23 file://99avahi-autoipd \ 23 file://99avahi-autoipd \
24 file://initscript.patch" 24 file://initscript.patch"
25 25
26inherit autotools pkgconfig update-rc.d gettext 26USERADD_PACKAGES = "${PN}-daemon"
27USERADD_PARAM_${PN}-daemon = "--system --home /var/run/avahi-daemon \
28 --no-create-home --shell /bin/false \
29 --user-group avahi"
30
31inherit autotools pkgconfig update-rc.d gettext useradd
27 32
28EXTRA_OECONF = "--with-distro=debian \ 33EXTRA_OECONF = "--with-distro=debian \
29 --disable-introspection \ 34 --disable-introspection \
@@ -116,15 +121,12 @@ do_install_avahi-autoipd() {
116 install ${WORKDIR}/99avahi-autoipd ${D}${sysconfdir}/udhcpc.d 121 install ${WORKDIR}/99avahi-autoipd ${D}${sysconfdir}/udhcpc.d
117} 122}
118 123
119# At the time the postinst runs, dbus might not be setup so only restart if running 124# At the time the postinst runs, dbus might not be setup so only restart if running
120 125
121pkg_postinst_avahi-daemon () { 126pkg_postinst_avahi-daemon () {
122 # can't do this offline
123 if [ "x$D" != "x" ]; then 127 if [ "x$D" != "x" ]; then
124 exit 1 128 exit 0
125 fi 129 fi
126 grep "^avahi:" /etc/group > /dev/null || addgroup avahi
127 grep "^avahi:" /etc/passwd > /dev/null || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi --ingroup avahi -g Avahi
128 130
129 DBUSPID=`pidof dbus-daemon` 131 DBUSPID=`pidof dbus-daemon`
130 132