adding/updating avahi initscript for gentoo

updated README/INSTALL

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@175 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

diff --git a/INSTALL b/INSTALL
index f47c8482f29e381842ac732f70239bd8de0ff9a8..ab9aa3f1fe85e79df073b8852be39b5452bc7841 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,8 @@
 *** Quick install instructions (tested on debian/ubuntu only!) ***
 
+While "make" and "boostrap.sh" may be run as normal users all other commands
+need to be run is root.
+
 $ ./bootstrap.sh
        (this will run autoconf/automake)
 
@@ -12,19 +15,11 @@ $ make
        (These commands are Debian specific and may be different on other
        distributions)
 
-# /etc/init.d/dbus-1 restart
-       (This whill restart DBUS and avahi too)
-
-While "make" and "boostrap.sh" may be run as normal users all other commands
-need to be run is root.
-
-*** Note ***
-
-- On other linux distributions, the dbus initscript may be different (eg redhat
-/etc/init.d/messagebus).  You need to restart dbus to make it know about
-/etc/dbus-1/system.d/avahi-dbus.conf .
+# kill -HUP `cat /var/run/dbus/pid`
+       (This will ask DBUS to re-read its policies)
+# /etc/dbus-1/event.d/75avahi-daemon start
 
-- To automatically start avahi-dnsconfd on Debian base distro:
+- To automatically start avahi-dnsconfd on Debian based distro:
 # update-rc.d avahi-dnsconfd defaults 25 15
 
 $Id$

diff --git a/README b/README
index 3b0696e7bd42c60d07681966d8cd5b22f6d5d3e9..dfaf4099ed29ff206092e01d201ec8fcd5b3de4f 100644 (file)
--- a/README
+++ b/README
@@ -1,10 +1,11 @@
 * Quick start guide:
 0) make sure you read the INSTALL file.
-1) start the deamon in background as root: avahi -D
-2) start the Gui to browse zeroconf network as your user: avahi-discover
+1) start the deamon in background as root: avahi-daemon -D
+Or (You shouldn't start avahi-daemon and avahi-discover at the same time.) 
+1) start the Gui to browse zeroconf network as your user: avahi-discover
 
 
 * Basic instructions to control the avahi deamon (as root):
-- starting it:                 avahi
-- starting it in background:   avahi -D
-- stopping it:                 avahi -k
+- starting it:                 avahi-daemon
+- starting it in background:   avahi-daemon -D
+- stopping it:                 avahi-daemon -k

diff --git a/initscript/Gentoo/Makefile.am b/initscript/Gentoo/Makefile.am
index 58d35dd7045a2b525df0843dcea790c060e741bc..6e69bb28592cd8dd209efcb41d7bf14af4d4ae1e 100644 (file)
--- a/initscript/Gentoo/Makefile.am
+++ b/initscript/Gentoo/Makefile.am
@@ -1,4 +1,4 @@
 dbusinitddir = $(sysconfdir)/init.d
-dbusinitd_SCRIPTS = avahi-daemon
+dbusinitd_SCRIPTS = avahi-daemon avahi-dnsconfd
 
 EXTRA_DIST = $(dbusinitd_SCRIPTS)

diff --git a/initscript/Gentoo/avahi-daemon b/initscript/Gentoo/avahi-daemon
index 532d108c80484356cbfcf06d5e6f9217d98543c9..8b3a35934525fd5b3192c855d0e5a626de2afc45 100644 (file)
--- a/initscript/Gentoo/avahi-daemon
+++ b/initscript/Gentoo/avahi-daemon
@@ -1,11 +1,13 @@
 #!/sbin/runscript
 # Avahi ZeroConf Daemon init script
 # Many thanks to the Avahi developer's and Sebastien Estienne
+# Author:              Steev Klimaszewski <steev@steev.net>
 
 DAEMON=/usr/bin/avahi-daemon
 
 depend () {
-       need dbus
+       need net
+       use dbus
 }
 
 start() {

diff --git a/initscript/Gentoo/avahi-dnsconfd b/initscript/Gentoo/avahi-dnsconfd
new file mode 100644 (file)
index 0000000..85ad78e
--- /dev/null
+++ b/initscript/Gentoo/avahi-dnsconfd
@@ -0,0 +1,31 @@
+#! /bin/sh
+#
+# avahi-dnsconfd     avahi dns configuration daemon
+#                               Daemon for ZeroConf
+#
+# Author:              Steev Klimaszewski <steev@steev.net>
+
+DAEMON=/usr/bin/avahi-dnsconfd
+
+depend () {
+       need net
+       after avahi-daemon
+}
+
+start() {
+       ebegin "Starting avahi-dnsconfd"
+        $DAEMON -D
+       eend $?
+}
+
+stop() {
+       ebegin "Stopping avahi-dnsconfd"
+       $DAEMON -k || /bin/true
+       eend $?
+}
+
+reload() {
+       ebegin "Reloading avahi-dnsconfd"
+        $DAEMON -r
+       eend $?
+}