changed startup priority for avahi (15->75)

modified INSTALL for easier copy/paste of ./configure

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

diff --git a/INSTALL b/INSTALL
index 5db55458118cd2c00efc5048c3a063ce421767ae..635e57754eb600e3b6667b31f1a1aeef65a51890 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -1,9 +1,9 @@
 *** Quick install instructions (tested on debian/ubuntu only!) ***
 
 $ ./bootstrap.sh
-       (this will run autoconf/automake and finally ./configure
-       --prefix=/usr --sysconfdir=/etc --localstatedir=/var)
+       (this will run autoconf/automake)
 
+$ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
 $ make
 # make install
 

diff --git a/configure.ac b/configure.ac
index 5d24fd45c55f06947d5d19f87f2c0a08ea849f9c..97a57e542e2d8c2d611fcdb8c969a458518ece06 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -233,7 +233,7 @@ avahi-discover/Makefile
 avahi-client/Makefile 
 initscript/Makefile 
 initscript/Debian/Makefile
-initscript/Debian/15avahi
+initscript/Debian/75avahi
 ])
 AC_OUTPUT
 

diff --git a/initscript/Debian/15avahi.in b/initscript/Debian/15avahi.in
deleted file mode 100755 (executable)
index 00d8fb6..0000000
--- a/initscript/Debian/15avahi.in
+++ /dev/null
@@ -1,121 +0,0 @@
-#! /bin/sh
-#
-# avahi     avahi daemon
-#                               Daemon for ZeroConf
-#
-# Authors:      <sebastien.estienne@gmail.com>
-#
-
-if [ -f /lib/lsb/init-functions ]
-then
-    . /lib/lsb/init-functions
-else
-    # int log_begin_message (char *message)
-    log_begin_msg () {
-        if [ -z "$1" ]; then
-           return 1
-        fi
-        echo " * $@"
-    }
-
-    # int log_end_message (int exitstatus)
-    log_end_msg () {
-       
-    # If no arguments were passed, return
-       [ -z "$1" ] && return 1
-       
-    # Only do the fancy stuff if we have an appropriate terminal
-    # and if /usr is already mounted
-       TPUT=/usr/bin/tput
-       EXPR=/usr/bin/expr
-       if [ -x $TPUT ] && [ -x $EXPR ] && $TPUT hpa 60 >/dev/null 2>&1; then
-           COLS=`$TPUT cols`
-           if [ -n "$COLS" ]; then
-               COL=`$EXPR $COLS - 7`
-           else
-               COL=73
-           fi
-           UP=`$TPUT cuu1`
-           END=`$TPUT hpa $COL`
-           START=`$TPUT hpa 0`
-           RED=`$TPUT setaf 1`
-           NORMAL=`$TPUT op`
-           if [ $1 -eq 0 ]; then
-               echo "$UP$END[ ok ]"
-           else
-               echo -e "$UP$START $RED*$NORMAL$END[${RED}fail${NORMAL}]"
-           fi
-       else
-           if [ $1 -eq 0 ]; then
-               echo "   ...done."
-           else
-               echo "   ...fail!"
-           fi
-       fi
-       return $1
-    }
-    
-fi
-
-#set -e
-
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-DESC="Avahi ZeroConf daemon"
-NAME="avahi"
-DAEMON=/usr/bin/$NAME
-
-# Gracefully exit if the package has been removed.
-test -x $DAEMON || exit 0
-
-#
-#       Function that starts the daemon/service.
-#
-d_start() {
-    $DAEMON -D
-}
-
-#
-#       Function that stops the daemon/service.
-#
-d_stop() {
-    $DAEMON -k || /bin/true
-}
-
-#
-#       Function that reload the config file for the daemon/service.
-#
-d_reload() {
-    $DAEMON -r
-}
-
-
-case "$1" in
-    start)
-        log_begin_msg "Starting $DESC: $NAME"
-        d_start
-        log_end_msg $?
-        ;;
-    stop)
-        log_begin_msg "Stopping $DESC: $NAME"
-        d_stop
-        log_end_msg $?
-        ;;
-    reload)
-        log_begin_msg "Reloading config file for $DESC: $NAME"
-       d_reload
-        log_end_msg $?
-        ;;
-    restart|force-reload)
-        log_begin_msg "Restarting $DESC: $NAME"
-        d_stop
-        sleep 1
-        d_start
-        log_end_msg $?
-        ;;
-  *)
-        echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|reload}" >&2
-        exit 1
-        ;;
-esac
-
-exit 0

diff --git a/initscript/Debian/75avahi.in b/initscript/Debian/75avahi.in
new file mode 100755 (executable)
index 0000000..00d8fb6
--- /dev/null
+++ b/initscript/Debian/75avahi.in
@@ -0,0 +1,121 @@
+#! /bin/sh
+#
+# avahi     avahi daemon
+#                               Daemon for ZeroConf
+#
+# Authors:      <sebastien.estienne@gmail.com>
+#
+
+if [ -f /lib/lsb/init-functions ]
+then
+    . /lib/lsb/init-functions
+else
+    # int log_begin_message (char *message)
+    log_begin_msg () {
+        if [ -z "$1" ]; then
+           return 1
+        fi
+        echo " * $@"
+    }
+
+    # int log_end_message (int exitstatus)
+    log_end_msg () {
+       
+    # If no arguments were passed, return
+       [ -z "$1" ] && return 1
+       
+    # Only do the fancy stuff if we have an appropriate terminal
+    # and if /usr is already mounted
+       TPUT=/usr/bin/tput
+       EXPR=/usr/bin/expr
+       if [ -x $TPUT ] && [ -x $EXPR ] && $TPUT hpa 60 >/dev/null 2>&1; then
+           COLS=`$TPUT cols`
+           if [ -n "$COLS" ]; then
+               COL=`$EXPR $COLS - 7`
+           else
+               COL=73
+           fi
+           UP=`$TPUT cuu1`
+           END=`$TPUT hpa $COL`
+           START=`$TPUT hpa 0`
+           RED=`$TPUT setaf 1`
+           NORMAL=`$TPUT op`
+           if [ $1 -eq 0 ]; then
+               echo "$UP$END[ ok ]"
+           else
+               echo -e "$UP$START $RED*$NORMAL$END[${RED}fail${NORMAL}]"
+           fi
+       else
+           if [ $1 -eq 0 ]; then
+               echo "   ...done."
+           else
+               echo "   ...fail!"
+           fi
+       fi
+       return $1
+    }
+    
+fi
+
+#set -e
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+DESC="Avahi ZeroConf daemon"
+NAME="avahi"
+DAEMON=/usr/bin/$NAME
+
+# Gracefully exit if the package has been removed.
+test -x $DAEMON || exit 0
+
+#
+#       Function that starts the daemon/service.
+#
+d_start() {
+    $DAEMON -D
+}
+
+#
+#       Function that stops the daemon/service.
+#
+d_stop() {
+    $DAEMON -k || /bin/true
+}
+
+#
+#       Function that reload the config file for the daemon/service.
+#
+d_reload() {
+    $DAEMON -r
+}
+
+
+case "$1" in
+    start)
+        log_begin_msg "Starting $DESC: $NAME"
+        d_start
+        log_end_msg $?
+        ;;
+    stop)
+        log_begin_msg "Stopping $DESC: $NAME"
+        d_stop
+        log_end_msg $?
+        ;;
+    reload)
+        log_begin_msg "Reloading config file for $DESC: $NAME"
+       d_reload
+        log_end_msg $?
+        ;;
+    restart|force-reload)
+        log_begin_msg "Restarting $DESC: $NAME"
+        d_stop
+        sleep 1
+        d_start
+        log_end_msg $?
+        ;;
+  *)
+        echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|reload}" >&2
+        exit 1
+        ;;
+esac
+
+exit 0

diff --git a/initscript/Debian/Makefile.am b/initscript/Debian/Makefile.am
index fd274dcbeae29de4f503323d3c0e77436689af78..b9991713c225c4e86185e3e1b1d8b2becdfc02cf 100644 (file)
--- a/initscript/Debian/Makefile.am
+++ b/initscript/Debian/Makefile.am
@@ -1,4 +1,4 @@
 dbusinitddir = $(sysconfdir)/dbus-1/event.d
-dbusinitd_SCRIPTS = 15avahi
+dbusinitd_SCRIPTS = 75avahi
 
 EXTRA_DIST = $(dbusinitd_SCRIPTS)