3 files changed, 42 insertions, 2 deletions

diff --git a/meta/packages/avahi/avahi.inc b/meta/packages/avahi/avahi.inc
index 4300bcc3f3..cb2e4e7d83 100644
--- a/meta/packages/avahi/avahi.inc
+++ b/meta/packages/avahi/avahi.inc
@@ -9,7 +9,8 @@ DEPENDS = "expat libdaemon dbus glib-2.0 gtk+ libglade"
 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://initscript.patch;patch=1"
 
 inherit autotools pkgconfig update-rc.d
 
diff --git a/meta/packages/avahi/avahi_0.6.20.bb b/meta/packages/avahi/avahi_0.6.20.bb
index be22c985b0..8e36321ea7 100644
--- a/meta/packages/avahi/avahi_0.6.20.bb
+++ b/meta/packages/avahi/avahi_0.6.20.bb
@@ -1,7 +1,7 @@
 require avahi.inc
 
 RDEPENDS_avahi-daemon = "sysvinit-pidof"
-PR = "r4"
+PR = "r5"
 
 FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \
                        ${sysconfdir}/avahi/avahi-autoipd.action \
diff --git a/meta/packages/avahi/files/initscript.patch b/meta/packages/avahi/files/initscript.patch
new file mode 100644
index 0000000000..f76a965b85
--- /dev/null
+++ b/meta/packages/avahi/files/initscript.patch
@@ -0,0 +1,39 @@
+diff --git a/initscript/debian/avahi-daemon.in b/initscript/debian/avahi-daemon.in
+index 30a2c2f..b5848a8 100755
+--- a/initscript/debian/avahi-daemon.in
++++ b/initscript/debian/avahi-daemon.in
+@@ -1,2 +1,14 @@
+ #!/bin/sh
+-
++### BEGIN INIT INFO
++# Provides:          avahi
++# Required-Start:    $remote_fs dbus
++# Required-Stop:     $remote_fs dbus
++# Should-Start:             $syslog
++# Should-Stop:       $syslog
++# Default-Start:     2 3 4 5
++# Default-Stop:      0 1 6
++# Short-Description: Avahi mDNS/DNS-SD Daemon
++# Description:       Zeroconf daemon for configuring your network 
++#                    automatically
++### END INIT INFO
++#
+diff --git a/initscript/debian/avahi-dnsconfd.in b/initscript/debian/avahi-dnsconfd.in
+index ac34804..f95c340 100755
+--- a/initscript/debian/avahi-dnsconfd.in
++++ b/initscript/debian/avahi-dnsconfd.in
+@@ -1,1 +1,14 @@
+ #!/bin/sh
++### BEGIN INIT INFO
++# Provides:          avahi-dnsconfd
++# Required-Start:    $remote_fs avahi
++# Required-Stop:     $remote_fs avahi
++# Should-Start:             $syslog
++# Should-Stop:       $syslog
++# Default-Start:     2 3 4 5
++# Default-Stop:      0 1 6
++# Short-Description: Avahi mDNS/DNS-SD DNS configuration
++# Description:       Zeroconf daemon for configuring your network 
++#                    automatically
++### END INIT INFO
++#