[avahi] Fedora support
Trent Lloyd
lathiat at bur.st
Fri Oct 21 19:33:38 PDT 2005
Hi Alex,
Thanks for that, looks good
Just one thing
+# Check that networking is configured.
+[ ${NETWORKING} = "no" ] && exit 0
Does that mean, is networing setup yet? avahi will run happily if the
interfaces aren't setup, or whatever, and adjust to if they are setup
later, so if thats the meaning this isn't really needed, but if it has
some other meaning could you explain it?
Cheers,
Trent
On Fri, Oct 21, 2005 at 07:47:52PM +0200, Alexander Larsson wrote:
> This patch adds support for fedora to avahi 0.5.2.
>
> =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
> Alexander Larsson Red Hat, Inc
> alexl at redhat.com alla at lysator.liu.se
> He's an old-fashioned amnesiac stage actor with a passion for fast cars. She's
> a bloodthirsty Buddhist bounty hunter from aristocratic European stock. They
> fight crime!
> --- avahi-0.5.2.fedora/configure.ac.fedora 2005-10-20 18:05:07.000000000 +0200
> +++ avahi-0.5.2.fedora/configure.ac 2005-10-19 18:02:19.000000000 +0200
> @@ -62,6 +62,7 @@
> AC_CHECK_FILE(/etc/gentoo-release,with_distro="gentoo")
> AC_CHECK_FILE(/etc/arch-release,with_distro="archlinux")
> AC_CHECK_FILE(/etc/debian_version,with_distro="debian")
> + AC_CHECK_FILE(/etc/redhat-release,with_distro="fedora")
> fi
> with_distro=`echo ${with_distro} | tr '[[:upper:]]' '[[:lower:]]' `
>
> @@ -70,7 +71,7 @@
> exit 1
> else
> case $with_distro in
> - debian|gentoo|archlinux|suse|none)
> + debian|gentoo|archlinux|suse|fedora|none)
> ;;
> *)
> AC_MSG_ERROR([Your distribution (${with_distro}) is not yet supported, init scripts and dbus configuration will not be installed! (patches welcome), you can specify --with-distro=none to skip this check])
> @@ -82,6 +83,7 @@
> AM_CONDITIONAL(TARGET_GENTOO, test x"$with_distro" = xgentoo)
> AM_CONDITIONAL(TARGET_DEBIAN, test x"$with_distro" = xdebian)
> AM_CONDITIONAL(TARGET_ARCHLINUX, test x"$with_distro" = xarchlinux)
> +AM_CONDITIONAL(TARGET_FEDORA, test x"$with_distro" = xfedora)
>
> test_gcc_flag() {
> AC_LANG_CONFTEST([int main() {}])
> @@ -543,6 +545,7 @@
> initscript/gentoo/Makefile
> initscript/archlinux/Makefile
> initscript/suse/Makefile
> +initscript/fedora/Makefile
> avahi-dnsconfd/Makefile
> avahi-utils/Makefile
> avahi-utils/avahi/Makefile
> --- avahi-0.5.2.fedora/initscript/fedora/Makefile.am.fedora 2005-10-20 18:06:09.000000000 +0200
> +++ avahi-0.5.2.fedora/initscript/fedora/Makefile.am 2005-10-19 18:06:26.000000000 +0200
> @@ -0,0 +1,34 @@
> +# $Id$
> +
> +# This file is part of avahi.
> +#
> +# avahi is free software; you can redistribute it and/or modify it
> +# under the terms of the GNU Lesser General Public License as
> +# published by the Free Software Foundation; either version 2 of the
> +# License, or (at your option) any later version.
> +#
> +# avahi is distributed in the hope that it will be useful, but WITHOUT
> +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
> +# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
> +# License for more details.
> +#
> +# You should have received a copy of the GNU Lesser General Public
> +# License along with avahi; if not, write to the Free Software
> +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
> +# USA.
> +
> +initddir = $(sysconfdir)/init.d
> +
> +EXTRA_DIST = avahi-daemon.in avahi-dnsconfd.in
> +
> +initd_SCRIPTS = avahi-daemon avahi-dnsconfd
> +
> +CLEANFILES = avahi-daemon avahi-dnsconfd
> +
> +avahi-daemon: avahi-daemon.in
> + sed -e 's, at sbindir\@,$(sbindir),g' $< > $@
> + chmod +x $@
> +
> +avahi-dnsconfd: avahi-dnsconfd.in
> + sed -e 's, at sbindir\@,$(sbindir),g' $< > $@
> + chmod +x $@
> --- avahi-0.5.2.fedora/initscript/fedora/avahi-dnsconfd.in.fedora 2005-10-20 18:06:04.000000000 +0200
> +++ avahi-0.5.2.fedora/initscript/fedora/avahi-dnsconfd.in 2005-10-20 18:02:10.000000000 +0200
> @@ -0,0 +1,87 @@
> +#! /bin/sh
> +#
> +# avahi-daemon: Starts the Avahi dns configuration daemon
> +#
> +# chkconfig: - 34 66
> +# description: avahi-dnsconfd connects to a running avahi-daemon and runs the script
> +# /etc/avahi/dnsconf.action for each unicast DNS server that is announced
> +# on the local LAN. This is useful for configuring unicast DNS servers in
> +# a DHCP-like fashion with mDNS.
> +# processname: avahi-dnsconfd
> +# config:
> +
> +OTHER_AVAHI_OPTS=""
> +
> +# Source function library.
> +. /etc/init.d/functions
> +
> +. /etc/sysconfig/network
> +
> +# Check that networking is configured.
> +[ ${NETWORKING} = "no" ] && exit 0
> +
> +AVAHI_BIN=@sbindir@/avahi-dnsconfd
> +test -x $AVAHI_BIN || exit 5
> +
> +start() {
> + echo -n $"Starting Avahi DNS daemon... "
> + $AVAHI_BIN -D
> + RETVAL=$?
> + [ $RETVAL = 0 ] && success $"$base startup" || failure $"$base startup"
> + echo
> + return $RETVAL
> +}
> +
> +stop() {
> + echo -n "Shutting down Avahi DNS daemon: "
> + $AVAHI_BIN -k
> + RETVAL=$?
> + echo
> + return $RETVAL
> +}
> +
> +reload() {
> + echo -n "Reloading Avahi DNS daemon... "
> + $AVAHI_BIN -r
> + RETVAL=$?
> + [ $RETVAL = 0 ] && success $"$base startup" || failure $"$base startup"
> + echo
> + return $RETVAL
> +}
> +
> +
> +restart() {
> + stop
> + start
> +}
> +
> +RETVAL=0
> +
> +# See how we were called.
> +case "$1" in
> + start)
> + start
> + ;;
> + stop)
> + stop
> + ;;
> + status)
> + $AVAHI_BIN -c
> + [ $? = 0 ] && echo "Avahi DNS daemon is running" || echo "Avahi DNS daemon is not running"
> + ;;
> + restart)
> + restart
> + ;;
> + reload)
> + reload
> + ;;
> + condrestart)
> + $AVAHI_BIN -c
> + [ $? = 0 ] && restart || :
> + ;;
> + *)
> + echo $"Usage: $0 {start|stop|status|restart|condrestart}"
> + exit 1
> +esac
> +
> +exit $?
> --- avahi-0.5.2.fedora/initscript/fedora/avahi-daemon.in.fedora 2005-10-20 18:05:59.000000000 +0200
> +++ avahi-0.5.2.fedora/initscript/fedora/avahi-daemon.in 2005-10-20 18:02:20.000000000 +0200
> @@ -0,0 +1,87 @@
> +#! /bin/sh
> +#
> +# avahi-daemon: Starts the Avahi Daemon
> +#
> +# chkconfig: 345 34 66
> +# description: This is a daemon which runs on client machines to perform \
> +# Zeroconf service discovery on a network. avahi-daemon must be \
> +# running on systems that use Avahi for service discovery. \
> +# Avahi-daemon should not be running otherwise.
> +# processname: avahi-daemon
> +# config:
> +
> +OTHER_AVAHI_OPTS=""
> +
> +# Source function library.
> +. /etc/init.d/functions
> +
> +. /etc/sysconfig/network
> +
> +# Check that networking is configured.
> +[ ${NETWORKING} = "no" ] && exit 0
> +
> +AVAHI_BIN=@sbindir@/avahi-daemon
> +test -x $AVAHI_BIN || exit 5
> +
> +start() {
> + echo -n $"Starting Avahi daemon... "
> + $AVAHI_BIN -D
> + RETVAL=$?
> + [ $RETVAL = 0 ] && success $"$base startup" || failure $"$base startup"
> + echo
> + return $RETVAL
> +}
> +
> +stop() {
> + echo -n "Shutting down Avahi daemon: "
> + $AVAHI_BIN -k
> + RETVAL=$?
> + echo
> + return $RETVAL
> +}
> +
> +reload() {
> + echo -n "Reloading Avahi daemon... "
> + $AVAHI_BIN -r
> + RETVAL=$?
> + [ $RETVAL = 0 ] && success $"$base startup" || failure $"$base startup"
> + echo
> + return $RETVAL
> +}
> +
> +
> +restart() {
> + stop
> + start
> +}
> +
> +RETVAL=0
> +
> +# See how we were called.
> +case "$1" in
> + start)
> + start
> + ;;
> + stop)
> + stop
> + ;;
> + status)
> + $AVAHI_BIN -c
> + [ $? = 0 ] && echo "Avahi daemon is running" || echo "Avahi daemon is not running"
> + ;;
> + restart)
> + restart
> + ;;
> + reload)
> + reload
> + ;;
> + condrestart)
> + $AVAHI_BIN -c
> + [ $? = 0 ] && restart || :
> + ;;
> + *)
> + echo $"Usage: $0 {start|stop|status|restart|condrestart}"
> + exit 1
> +esac
> +
> +exit $?
> --- avahi-0.5.2.fedora/initscript/Makefile.am.fedora 2005-10-21 13:41:31.000000000 +0200
> +++ avahi-0.5.2.fedora/initscript/Makefile.am 2005-10-19 17:59:57.000000000 +0200
> @@ -34,3 +34,7 @@
> if TARGET_SUSE
> SUBDIRS += suse
> endif
> +
> +if TARGET_FEDORA
> +SUBDIRS += fedora
> +endif
> _______________________________________________
> avahi mailing list
> avahi at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/avahi
--
Trent Lloyd <lathiat at bur.st>
Bur.st Networking Inc.
More information about the avahi
mailing list