diff options
| author | Laurentiu Palcu <laurentiu.palcu@intel.com> | 2012-12-17 11:46:46 +0200 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2012-12-18 23:48:22 -0800 |
| commit | 878cb7b76b19b03c51aa368b0bc037647c844a21 (patch) | |
| tree | 50517117cd04101fae69bfef885b9da56eeb4ade | |
| parent | a941da8d348ad1b45c0d4083d9a0b67da0c6dfd4 (diff) | |
| download | openembedded-core-878cb7b76b19b03c51aa368b0bc037647c844a21.tar.gz openembedded-core-878cb7b76b19b03c51aa368b0bc037647c844a21.tar.bz2 openembedded-core-878cb7b76b19b03c51aa368b0bc037647c844a21.zip | |
avahi: use useradd.bbclass to add avahi-autoipd user
This is needed for the postinstalls to be run at do_rootfs time.
[YOCTO #3605]
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
| -rw-r--r-- | meta/recipes-connectivity/avahi/avahi.inc | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc index a0a1681ab3..d529b37996 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 = "r5" +INC_PR = "r6" DEPENDS = "expat libcap libdaemon dbus glib-2.0" @@ -26,11 +26,17 @@ SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \ file://fix_for_automake_1.12.x.patch \ " -USERADD_PACKAGES = "avahi-daemon" +USERADD_PACKAGES = "avahi-daemon avahi-autoipd" USERADD_PARAM_avahi-daemon = "--system --home /var/run/avahi-daemon \ --no-create-home --shell /bin/false \ --user-group avahi" +USERADD_PARAM_avahi-autoipd = "--system --home /var/run/avahi-autoipd \ + --no-create-home --shell /bin/false \ + --user-group \ + -c \"Avahi autoip daemon\" \ + avahi-autoipd" + inherit autotools pkgconfig update-rc.d gettext useradd EXTRA_OECONF = "--with-distro=debian \ @@ -137,15 +143,6 @@ if [ -z "$D" ]; then fi } -pkg_postinst_avahi-autoipd () { - # can't do this offline - if [ "x$D" != "x" ]; then - exit 1 - fi - grep "^avahi-autoipd:" /etc/group > /dev/null || addgroup avahi-autoipd - grep "^avahi-autoipd:" /etc/passwd > /dev/null || adduser --disabled-password --system --home /var/lib/avahi-autoipd --no-create-home avahi-autoipd --ingroup avahi-autoipd -g "Avahi autoip daemon" -} - pkg_postrm_avahi-daemon () { deluser avahi || true delgroup avahi || true |