[oe-commits] org.oe.dev avahi: add scripts to start avahi-autoipd from udhcpc

[pH5 commit]

avahi: add scripts to start avahi-autoipd from udhcpc

Author: pH5 at openembedded.org
Branch: org.openembedded.dev
Revision: 2e8511b5a46ab79ff2e4e4fb5e7ce2637c3907a0
ViewMTN: http://monotone.openembedded.org/revision.psp?id=2e8511b5a46ab79ff2e4e4fb5e7ce2637c3907a0
Files:
1
packages/avahi/files
packages/avahi/files/00avahi-autoipd
packages/avahi/files/99avahi-autoipd
packages/avahi/avahi.inc
mtn:execute
true
Diffs:

#
# mt diff -rc93086b3f5c7eab9ce0a2be72c1c9c688ecbfddc -r2e8511b5a46ab79ff2e4e4fb5e7ce2637c3907a0
#
# 
# 
# add_dir "packages/avahi/files"
# 
# add_file "packages/avahi/files/00avahi-autoipd"
#  content [27a2c9b7c2c32742b45ef733f3f72ea6418f9f7e]
# 
# add_file "packages/avahi/files/99avahi-autoipd"
#  content [a756b42982b7e319c2058b888bf265cd8e428d1a]
# 
# patch "packages/avahi/avahi.inc"
#  from [28903eefbe4682db0ee5c374e6f8a6571cb5b14b]
#    to [cba7eb6ad856c5b1289061fad4aaed10781f93d3]
# 
#   set "packages/avahi/files/00avahi-autoipd"
#  attr "mtn:execute"
# value "true"
# 
#   set "packages/avahi/files/99avahi-autoipd"
#  attr "mtn:execute"
# value "true"
# 
============================================================
--- packages/avahi/files/00avahi-autoipd	27a2c9b7c2c32742b45ef733f3f72ea6418f9f7e
+++ packages/avahi/files/00avahi-autoipd	27a2c9b7c2c32742b45ef733f3f72ea6418f9f7e
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+[ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1
+
+case "$1" in
+
+	deconfig|renew|bound)
+		/usr/sbin/avahi-autoipd -k $interface 2> /dev/null
+		;;
+esac
============================================================
--- packages/avahi/files/99avahi-autoipd	a756b42982b7e319c2058b888bf265cd8e428d1a
+++ packages/avahi/files/99avahi-autoipd	a756b42982b7e319c2058b888bf265cd8e428d1a
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+[ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1
+
+case "$1" in
+
+	leasefail)
+		/usr/sbin/avahi-autoipd -wD $interface 2> /dev/null
+		;;
+esac
============================================================
--- packages/avahi/avahi.inc	28903eefbe4682db0ee5c374e6f8a6571cb5b14b
+++ packages/avahi/avahi.inc	cba7eb6ad856c5b1289061fad4aaed10781f93d3
@@ -1,15 +1,17 @@ LICENSE = "GPL"
 DESCRIPTION = "Avahi implements the DNS-SD over Multicast DNS"
 AUTHOR = "Lennart Poettering <lennart at poettering.net>"
 HOMEPAGE = "http://avahi.org"
 SECTION = "network"
 PRIORITY = "optional"
 LICENSE = "GPL"
+PR="r1"
 
 DEPENDS = "expat libdaemon dbus glib-2.0"
 RRECOMMENDS = "libnss-mdns"
 RRECOMMENDS_avahi-daemon = "libnss-mdns"
 
-SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz"
+SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \
+	   file://00avahi-autoipd file://99avahi-autoipd"
 
 inherit autotools pkgconfig update-rc.d
 
@@ -35,7 +37,8 @@ FILES_avahi-autoipd = "${sbindir}/avahi-
 FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*"
 FILES_avahi-utils = "${bindir}/avahi-*"
 FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \
-                       ${sysconfdir}/avahi/avahi-autoipd.action"
+                       ${sysconfdir}/avahi/avahi-autoipd.action \
+		       ${sysconfdir}/udhcpc.d/*avahi-autoipd"
 
 CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf"
 
@@ -62,11 +65,32 @@ pkg_postinst_avahi-daemon () {
 	fi
 }
 
+pkg_postinst_avahi-autoipd () {
+	# can't do this offline
+	if [ "x$D" != "x" ]; then
+		exit 1
+	fi
+	grep avahi-autoipd /etc/group || addgroup avahi-autoipd
+	grep avahi-autoipd /etc/passwd || 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
 }
 
+pkg_postrm_avahi-autoipd () {
+	deluser avahi-autoipd || true
+	delgroup avahi-autoipd || true
+}
+
+do_install() {
+	autotools_do_install
+	install -d ${D}${sysconfdir}/udhcpc.d
+	install ${WORKDIR}/00avahi-autoipd ${D}${sysconfdir}/udhcpc.d
+	install ${WORKDIR}/99avahi-autoipd ${D}${sysconfdir}/udhcpc.d
+}
+
 do_stage() {
 	autotools_stage_all
 }