Commit 1cc3dface77e41b40816951d636b14e279a5ec4b - avahi

Use dh_installifupdown to install the ifupdown hook scripts for avahi-daemon and avahi-autoipd. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/avahi@2829 ceb527fc-18e6-0310-9fe2-813c157c29e7 Michael Biebl 15 years ago

8 changed file(s) with 83 addition(s) and 85 deletion(s). Raw diff Collapse all Expand all

+32

-0

debian/avahi-autoipd.if-down less more

	0	#!/bin/sh -e
	1	# Description: Remove routes to allow communication between machines which
	2	# only have an IPv4LL address assigned and those which only
	3	# have a routable address assigned. These were added by
	4	# /etc/network/if-up.d/avahi-autoipd.
	5	#
	6	# See http://developer.apple.com/qa/qa2004/qa1357.html for
	7	# more information.
	8
	9
	10	[ "$IFACE" != "lo" ] \|\| exit 0
	11	case "$ADDRFAM" in
	12	inet\|NetworkManager) ;;
	13	*) exit 0
	14	esac
	15	case "$METHOD" in
	16	static\|dhcp\|NetworkManager) ;;
	17	*) exit 0
	18	esac
	19
	20	if [ -x /bin/ip ]; then
	21	# route already present?
	22	ip route show \| grep -q '^169.254.0.0/16[[:space:]]' && exit 0
	23
	24	/bin/ip route del 169.254.0.0/16 dev $IFACE metric 1000 scope link \|\| true
	25	elif [ -x /sbin/route ]; then
	26	# route already present?
	27	/sbin/route -n \| grep -q "^169.254.0.0[[:space:]]" && exit 0
	28
	29	/sbin/route del -net 169.254.0.0 netmask 255.255.0.0 dev $IFACE metric 1000 \|\| true
	30	fi
	31

+32

-0

debian/avahi-autoipd.if-up less more

	0	#!/bin/sh -e
	1	# Description: Add routes to allow communication between machines which
	2	# only have an IPv4LL address assigned and those which only
	3	# have a routable address assigned.
	4	#
	5	# See http://developer.apple.com/qa/qa2004/qa1357.html for
	6	# more information.
	7
	8	[ "$IFACE" != "lo" ] \|\| exit 0
	9	case "$ADDRFAM" in
	10	inet\|NetworkManager) ;;
	11	*) exit 0
	12	esac
	13
	14	case "$METHOD" in
	15	static\|dhcp\|NetworkManager) ;;
	16	*) exit 0
	17	esac
	18
	19
	20	if [ -x /bin/ip ]; then
	21	# route already present?
	22	ip route show \| grep -q '^169.254.0.0/16[[:space:]]' && exit 0
	23
	24	/bin/ip route add 169.254.0.0/16 dev $IFACE metric 1000 scope link
	25	elif [ -x /sbin/route ]; then
	26	# route already present?
	27	/sbin/route -n \| egrep -q "^169.254.0.0[[:space:]]" && exit 0
	28
	29	/sbin/route add -net 169.254.0.0 netmask 255.255.0.0 dev $IFACE metric 1000
	30	fi
	31

-32

~~debian/avahi-autoipd.ifdown~~ less more

0		#!/bin/sh -e
1		# Description: Remove routes to allow communication between machines which
2		# only have an IPv4LL address assigned and those which only
3		# have a routable address assigned. These were added by
4		# /etc/network/if-up.d/avahi-autoipd.
5		#
6		# See http://developer.apple.com/qa/qa2004/qa1357.html for
7		# more information.
8
9
10		[ "$IFACE" != "lo" ] \|\| exit 0
11		case "$ADDRFAM" in
12		inet\|NetworkManager) ;;
13		*) exit 0
14		esac
15		case "$METHOD" in
16		static\|dhcp\|NetworkManager) ;;
17		*) exit 0
18		esac
19
20		if [ -x /bin/ip ]; then
21		# route already present?
22		ip route show \| grep -q '^169.254.0.0/16[[:space:]]' && exit 0
23
24		/bin/ip route del 169.254.0.0/16 dev $IFACE metric 1000 scope link \|\| true
25		elif [ -x /sbin/route ]; then
26		# route already present?
27		/sbin/route -n \| grep -q "^169.254.0.0[[:space:]]" && exit 0
28
29		/sbin/route del -net 169.254.0.0 netmask 255.255.0.0 dev $IFACE metric 1000 \|\| true
30		fi
31

-32

~~debian/avahi-autoipd.ifup~~ less more

0		#!/bin/sh -e
1		# Description: Add routes to allow communication between machines which
2		# only have an IPv4LL address assigned and those which only
3		# have a routable address assigned.
4		#
5		# See http://developer.apple.com/qa/qa2004/qa1357.html for
6		# more information.
7
8		[ "$IFACE" != "lo" ] \|\| exit 0
9		case "$ADDRFAM" in
10		inet\|NetworkManager) ;;
11		*) exit 0
12		esac
13
14		case "$METHOD" in
15		static\|dhcp\|NetworkManager) ;;
16		*) exit 0
17		esac
18
19
20		if [ -x /bin/ip ]; then
21		# route already present?
22		ip route show \| grep -q '^169.254.0.0/16[[:space:]]' && exit 0
23
24		/bin/ip route add 169.254.0.0/16 dev $IFACE metric 1000 scope link
25		elif [ -x /sbin/route ]; then
26		# route already present?
27		/sbin/route -n \| egrep -q "^169.254.0.0[[:space:]]" && exit 0
28
29		/sbin/route add -net 169.254.0.0 netmask 255.255.0.0 dev $IFACE metric 1000
30		fi
31

+15

-0

debian/avahi-daemon.if-up less more

	0	#!/bin/sh
	1
	2	# Don't run the avahi-daemon unicast local check while bringing up
	3	# the loopback device; it's not necessary until we bring up a real network
	4	# device
	5	[ "$IFACE" != "lo" ] \|\| exit 0
	6
	7	# Bail out if resolvconf is installed
	8	[ -x /sbin/resolvconf ] && exit 0
	9
	10	# If we have an unicast .local domain, we immediately disable avahi to avoid
	11	# conflicts with the multicast IP4LL .local domain
	12	if [ -x /usr/lib/avahi/avahi-daemon-check-dns.sh ] ; then
	13	exec /usr/lib/avahi/avahi-daemon-check-dns.sh
	14	fi

-15

~~debian/avahi-daemon.ifupdown~~ less more

0		#!/bin/sh
1
2		# Don't run the avahi-daemon unicast local check while bringing up
3		# the loopback device; it's not necessary until we bring up a real network
4		# device
5		[ "$IFACE" != "lo" ] \|\| exit 0
6
7		# Bail out if resolvconf is installed
8		[ -x /sbin/resolvconf ] && exit 0
9
10		# If we have an unicast .local domain, we immediately disable avahi to avoid
11		# conflicts with the multicast IP4LL .local domain
12		if [ -x /usr/lib/avahi/avahi-daemon-check-dns.sh ] ; then
13		exec /usr/lib/avahi/avahi-daemon-check-dns.sh
14		fi

-0

debian/changelog less more

14	14	* debian/libavahi-core6.symbols.hurd-i386
15	15	- Add symbols file for hurd-i386, copied from
16	16	libavahi-core6.symbols.kfreebsd-i386. (Closes: #508895)
	17	* Use dh_installifupdown to install the ifupdown hook scripts for
	18	avahi-daemon and avahi-autoipd.
17	19
18	20	-- Michael Biebl <biebl@debian.org> Tue, 17 Feb 2009 15:44:07 +0100
19	21

-6

debian/rules less more

46	46	rm -f debian/tmp/usr/lib/python/site-packages/avahi/.py[co]
47	47
48	48	install/avahi-autoipd::
49		install -D -o root -g root -m 755 debian/avahi-autoipd.ifup \
50		debian/$(cdbs_curpkg)/etc/network/if-up.d/avahi-autoipd
51		install -D -o root -g root -m 755 debian/avahi-autoipd.ifdown \
52		debian/$(cdbs_curpkg)/etc/network/if-down.d/avahi-autoipd
	49	dh_installifupdown -p$(cdbs_curpkg)
53	50
54	51	install/avahi-daemon::
55		install -D -o root -g root -m 755 debian/avahi-daemon.ifupdown \
56		debian/$(cdbs_curpkg)/etc/network/if-up.d/avahi-daemon
	52	dh_installifupdown -p$(cdbs_curpkg)
57	53	install -D -o root -g root -m 755 debian/avahi-daemon.resolvconf \
58	54	debian/$(cdbs_curpkg)/etc/resolvconf/update-libc.d/avahi-daemon
59	55	install -D -o root -g root -m 755 debian/avahi-daemon-check-dns.sh \