From: Lennart Poettering Date: Sun, 7 Aug 2005 19:29:03 +0000 (+0000) Subject: rename dnsconf.action to avahi-dnsconfd.action X-Git-Url: https://git.meshlink.io/?a=commitdiff_plain;h=b8e32ea5ecd9112988fa34cd00423d010392a65e;p=catta rename dnsconf.action to avahi-dnsconfd.action git-svn-id: file:///home/lennart/svn/public/avahi/trunk@261 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- diff --git a/avahi-dnsconfd/Makefile.am b/avahi-dnsconfd/Makefile.am index db21810..4ccabb6 100644 --- a/avahi-dnsconfd/Makefile.am +++ b/avahi-dnsconfd/Makefile.am @@ -23,7 +23,7 @@ AM_CFLAGS= \ -I$(top_srcdir) \ -DAVAHI_RUNTIME_DIR=\"$(avahi_runtime_dir)/\" \ -DAVAHI_SOCKET=\"$(avahi_socket)\" \ - -DAVAHI_DNSCONF_SCRIPT=\"$(pkgsysconfdir)/dnsconf.action\" + -DAVAHI_DNSCONF_SCRIPT=\"$(pkgsysconfdir)/avahi-dnsconfd.action\" # GLIB 2.0 AM_CFLAGS+=$(GLIB20_CFLAGS) @@ -45,6 +45,6 @@ avahi_dnsconfd_SOURCES = \ avahi_dnsconfd_CFLAGS = $(AM_CFLAGS) avahi_dnsconfd_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la -pkgsysconf_DATA=dnsconf.action +pkgsysconf_DATA=avahi-dnsconfd.action -EXTRA_DIST=dnsconf.action +EXTRA_DIST=avahi-dnsconfd.action diff --git a/avahi-dnsconfd/avahi-dnsconfd.action b/avahi-dnsconfd/avahi-dnsconfd.action new file mode 100755 index 0000000..9337a6d --- /dev/null +++ b/avahi-dnsconfd/avahi-dnsconfd.action @@ -0,0 +1,62 @@ +#!/bin/sh + +# $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. + +set -e + +test "x$AVAHI_INTERFACE" != "x" + +# Command line arguments: +# $1 "+" if a new DNS server was found, "-" if one was removed +# $2 DNS Server address +# $3 interface index where this server was found on +# $4 protocol number where this server was found on + +# Available environment variables: +# +# $AVAHI_INTERFACE The interface name where this DNS server was found on +# $AVAHI_INTERFACE_DNS_SERVERS A whitespace seperated list of DNS servers on $AVAHI_INTERFACE +# $AVAHI_DNS_SERVERS The complete list of all DNS servers found on all interfaces + +if [ -x /sbin/resolvconf ] ; then + + # We have Debian's resolvconf tool + + if [ "x$AVAHI_INTERFACE_DNS_SERVERS" = "x" ] ; then + /sbin/resolvconf -d "$AVAHI_INTERFACE.avahi" + else + for n in $AVAHI_INTERFACE_DNS_SERVERS ; do + echo "nameserver $n" + done | /sbin/resolvconf -a "$AVAHI_INTERFACE.avahi" + fi +else + + # No resolvconf tool available + + if [ "x$AVAHI_DNS_SERVERS" = "x" ] ; then + test -f /etc/resolv.conf.avahi && mv /etc/resolv.conf.avahi /etc/resolv.conf + else + test -f /etc/resolv.conf.avahi || mv /etc/resolv.conf /etc/resolv.conf.avahi + + for n in $AVAHI_DNS_SERVERS ; do + echo "nameserver $n" + done > /etc/resolv.conf + fi +fi diff --git a/avahi-dnsconfd/dnsconf.action b/avahi-dnsconfd/dnsconf.action deleted file mode 100755 index 9337a6d..0000000 --- a/avahi-dnsconfd/dnsconf.action +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/sh - -# $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. - -set -e - -test "x$AVAHI_INTERFACE" != "x" - -# Command line arguments: -# $1 "+" if a new DNS server was found, "-" if one was removed -# $2 DNS Server address -# $3 interface index where this server was found on -# $4 protocol number where this server was found on - -# Available environment variables: -# -# $AVAHI_INTERFACE The interface name where this DNS server was found on -# $AVAHI_INTERFACE_DNS_SERVERS A whitespace seperated list of DNS servers on $AVAHI_INTERFACE -# $AVAHI_DNS_SERVERS The complete list of all DNS servers found on all interfaces - -if [ -x /sbin/resolvconf ] ; then - - # We have Debian's resolvconf tool - - if [ "x$AVAHI_INTERFACE_DNS_SERVERS" = "x" ] ; then - /sbin/resolvconf -d "$AVAHI_INTERFACE.avahi" - else - for n in $AVAHI_INTERFACE_DNS_SERVERS ; do - echo "nameserver $n" - done | /sbin/resolvconf -a "$AVAHI_INTERFACE.avahi" - fi -else - - # No resolvconf tool available - - if [ "x$AVAHI_DNS_SERVERS" = "x" ] ; then - test -f /etc/resolv.conf.avahi && mv /etc/resolv.conf.avahi /etc/resolv.conf - else - test -f /etc/resolv.conf.avahi || mv /etc/resolv.conf /etc/resolv.conf.avahi - - for n in $AVAHI_DNS_SERVERS ; do - echo "nameserver $n" - done > /etc/resolv.conf - fi -fi diff --git a/man/Makefile.am b/man/Makefile.am index 946a15f..4037bee 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -61,7 +61,7 @@ EXTRA_DIST = \ avahi-discover.1.xml.in \ avahi-bookmarks.1.xml.in \ avahi-dnsconfd.8.xml.in \ - avahi-daemon.5.conf.xml.in \ + avahi-daemon.conf.5.xml.in \ xmltoman.css \ xmltoman.xsl \ xmltoman.dtd