* Move avahi-daemon and avahi-dnsconfd to sbin

* Fix Debian init scripts to use absolute paths to the binaries installed with the package

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

diff --git a/avahi-daemon/Makefile.am b/avahi-daemon/Makefile.am
index a1b2dcb8d9f0c5ea26dbfd4d0ef8b10d436fe1b0..ed231a6b76293ad6945271707a64f16cdf50c5d7 100644 (file)
--- a/avahi-daemon/Makefile.am
+++ b/avahi-daemon/Makefile.am
@@ -46,7 +46,7 @@ endif
 # This cool debug trap works on i386/gcc only
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
-bin_PROGRAMS = \
+sbin_PROGRAMS = \
        avahi-daemon
 
 avahi_daemon_SOURCES = \
@@ -79,3 +79,4 @@ avahi_daemon_LDADD = $(AM_LDADD) ../avahi-core/libavahi-core.la ../avahi-common/
 
 xmllint:
        xmllint --noout --valid example.service
+       xmllint --noout --valid Server.introspect

diff --git a/avahi-dnsconfd/Makefile.am b/avahi-dnsconfd/Makefile.am
index 3b3c79e4d5d1700f1e29a22a32fea1f6804b1791..db21810334bd43e15fcb6ac1826c6b15eb4f6436 100644 (file)
--- a/avahi-dnsconfd/Makefile.am
+++ b/avahi-dnsconfd/Makefile.am
@@ -36,7 +36,7 @@ AM_LDADD+=$(LIBDAEMON_LIBS)
 # This cool debug trap works on i386/gcc only
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
-bin_PROGRAMS = \
+sbin_PROGRAMS = \
        avahi-dnsconfd
 
 avahi_dnsconfd_SOURCES = \

diff --git a/initscript/Debian/75avahi-daemon b/initscript/Debian/75avahi-daemon
deleted file mode 100755 (executable)
index 82377dd..0000000
--- a/initscript/Debian/75avahi-daemon
+++ /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"
-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-daemon.in b/initscript/Debian/75avahi-daemon.in
new file mode 100755 (executable)
index 0000000..337fed6
--- /dev/null
+++ b/initscript/Debian/75avahi-daemon.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"
+DAEMON="@sbindir@/$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 811526d8f0c8747ea514c52e992c29ecbba0bf57..89e666385dd5fa02b035e46b50b47d89f517941a 100644 (file)
--- a/initscript/Debian/Makefile.am
+++ b/initscript/Debian/Makefile.am
@@ -1,9 +1,22 @@
+
+EXTRA_DIST=75avahi-daemon.in avahi-dnsconfd.in
+
 dbusinitddir = $(sysconfdir)/dbus-1/event.d
 dbusinitd_SCRIPTS = 75avahi-daemon
 
 initddir = $(sysconfdir)/init.d
 initd_SCRIPTS = avahi-dnsconfd
 
+CLEANFILES=75avahi-daemon avahi-dnsconfd
+
+75avahi-daemon: 75avahi-daemon.in
+       sed -e 's,@sbindir\@,$(sbindir),g' $< > $@
+       chmod +x $@
+
+avahi-dnsconfd: avahi-dnsconfd.in
+       sed -e 's,@sbindir\@,$(sbindir),g' $< > $@
+       chmod +x $@
+
 #if ENABLE_DBUS
 #install-data-local:
 #      $(LN_S) -f $(initddir)/avahi-daemon \

diff --git a/initscript/Debian/avahi-dnsconfd b/initscript/Debian/avahi-dnsconfd
deleted file mode 100755 (executable)
index 7b2e131..0000000
--- a/initscript/Debian/avahi-dnsconfd
+++ /dev/null
@@ -1,121 +0,0 @@
-#! /bin/sh
-#
-# avahi-dnsconfd     avahi dns configuration 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 Dns Config daemon"
-NAME="avahi-dnsconfd"
-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/avahi-dnsconfd.in b/initscript/Debian/avahi-dnsconfd.in
new file mode 100755 (executable)
index 0000000..eb67a91
--- /dev/null
+++ b/initscript/Debian/avahi-dnsconfd.in
@@ -0,0 +1,121 @@
+#! /bin/sh
+#
+# avahi-dnsconfd     avahi dns configuration 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 Dns Config daemon"
+NAME="avahi-dnsconfd"
+DAEMON="@sbindir@/$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