From 53b3b40b1fd85f843212cd25055dba1cde91103f Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 3 Nov 2011 13:57:00 +0100 Subject: avahi: fix useradd race condition Avahi doesn't work at boot because of: + sh /OE/../rootfs/var/lib/opkg/info/avahi-daemon.preinst Running useradd commands... grep: /OE/../rootfs/etc/passwd: No such file or directory That is due to: Package: avahi-daemon Version: 0.6.30-r9.0 [..] Depends: libavahi-core7 (>= 0.6.30), libdaemon0 (>= 0.14), libcap2 (>= 2.22), libavahi-common3 (>= 0.6.30), libdbus-1-3 (>= 1.4.12), sysvinit-pidof, libc6 (>= 2.12), libexpat1 (>= 2.0.1) After this patch: Package: avahi-daemon Version: 0.6.30-r10.0 [..] Depends: libavahi-core7 (>= 0.6.30), libdaemon0 (>= 0.14), libcap2 (>= 2.22), libavahi-common3 (>= 0.6.30), libdbus-1-3 (>= 1.4.12), sysvinit-pidof, libc6 (>= 2.12), shadow, libexpat1 (>= 2.0.1), base-passwd This also changes ${PN}-daemon to avahi-daemon to be consistent with the PACKAGES/FILES lines below (From OE-Core rev: f01fbc17b5d9bf9a227d64fe858014376cd19432) Signed-off-by: Koen Kooi Signed-off-by: Richard Purdie --- meta/recipes-connectivity/avahi/avahi.inc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'meta/recipes-connectivity/avahi') diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc index 79cfd73738..728c38fee7 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 = "r9" +INC_PR = "r10" DEPENDS = "expat libcap libdaemon dbus glib-2.0" @@ -23,8 +23,9 @@ SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \ file://99avahi-autoipd \ file://initscript.patch" -USERADD_PACKAGES = "${PN}-daemon" -USERADD_PARAM_${PN}-daemon = "--system --home /var/run/avahi-daemon \ +USERADDPN = "avahi-daemon" +USERADD_PACKAGES = "avahi-daemon" +USERADD_PARAM_avahi-daemon = "--system --home /var/run/avahi-daemon \ --no-create-home --shell /bin/false \ --user-group avahi" -- cgit v1.2.3-54-g00ecf