head	1.7;
access;
symbols
	RELENG_8_4:1.7.0.2
	RELENG_9_1_0_RELEASE:1.5.2.1.4.2
	RELENG_9_1:1.5.2.1.0.4
	RELENG_9_1_BP:1.5.2.1
	RELENG_8_3_0_RELEASE:1.2.10.2.6.1
	RELENG_8_3:1.2.10.2.0.6
	RELENG_8_3_BP:1.2.10.2
	RELENG_9_0_0_RELEASE:1.5.2.1.2.1
	RELENG_9_0:1.5.2.1.0.2
	RELENG_9_0_BP:1.5.2.1
	RELENG_9:1.5.0.2
	RELENG_9_BP:1.5
	RELENG_7_4_0_RELEASE:1.2.2.1.2.1
	RELENG_8_2_0_RELEASE:1.2.10.2.4.1
	RELENG_7_4:1.2.2.1.0.2
	RELENG_7_4_BP:1.2.2.1
	RELENG_8_2:1.2.10.2.0.4
	RELENG_8_2_BP:1.2.10.2
	RELENG_8_1_0_RELEASE:1.2.10.2.2.1
	RELENG_8_1:1.2.10.2.0.2
	RELENG_8_1_BP:1.2.10.2
	RELENG_7_3_0_RELEASE:1.2.12.1
	RELENG_7_3:1.2.0.12
	RELENG_7_3_BP:1.2
	RELENG_8_0_0_RELEASE:1.2.10.1.2.1
	RELENG_8_0:1.2.10.1.0.2
	RELENG_8_0_BP:1.2.10.1
	RELENG_8:1.2.0.10
	RELENG_8_BP:1.2
	RELENG_7_2_0_RELEASE:1.2.8.1
	RELENG_7_2:1.2.0.8
	RELENG_7_2_BP:1.2
	RELENG_7_1_0_RELEASE:1.2.6.1
	RELENG_6_4_0_RELEASE:1.1.2.2.4.1
	RELENG_7_1:1.2.0.6
	RELENG_7_1_BP:1.2
	RELENG_6_4:1.1.2.2.0.4
	RELENG_6_4_BP:1.1.2.2
	RELENG_7_0_0_RELEASE:1.2
	RELENG_6_3_0_RELEASE:1.1.2.2
	RELENG_7_0:1.2.0.4
	RELENG_7_0_BP:1.2
	RELENG_6_3:1.1.2.2.0.2
	RELENG_6_3_BP:1.1.2.2
	RELENG_7:1.2.0.2
	RELENG_7_BP:1.2
	RELENG_6_2_0_RELEASE:1.1.2.1
	RELENG_6_2:1.1.2.1.0.2
	RELENG_6_2_BP:1.1.2.1
	RELENG_6:1.1.0.2;
locks; strict;
comment	@# @;


1.7
date	2012.11.17.01.49.04;	author svnexp;	state Exp;
branches
	1.7.2.1;
next	1.6;

1.6
date	2012.07.13.06.46.09;	author kevlo;	state Exp;
branches;
next	1.5;

1.5
date	2011.09.20.00.37.35;	author hrs;	state Exp;
branches
	1.5.2.1;
next	1.4;

1.4
date	2011.09.19.15.55.53;	author hrs;	state Exp;
branches;
next	1.3;

1.3
date	2010.05.14.04.53.57;	author dougb;	state Exp;
branches;
next	1.2;

1.2
date	2006.12.30.22.53.20;	author yar;	state Exp;
branches
	1.2.2.1
	1.2.6.1
	1.2.8.1
	1.2.10.1
	1.2.12.1;
next	1.1;

1.1
date	2006.06.01.11.01.54;	author thompsa;	state Exp;
branches
	1.1.2.1;
next	;

1.7.2.1
date	2012.11.17.01.49.04;	author svnexp;	state dead;
branches;
next	1.7.2.2;

1.7.2.2
date	2013.03.28.13.02.43;	author svnexp;	state Exp;
branches;
next	;

1.5.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.5.2.1.2.1
	1.5.2.1.4.1;
next	1.5.2.2;

1.5.2.2
date	2012.11.17.11.36.11;	author svnexp;	state Exp;
branches;
next	;

1.5.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.5.2.1.2.2;

1.5.2.1.2.2
date	2012.11.17.08.36.11;	author svnexp;	state Exp;
branches;
next	;

1.5.2.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.5.2.1.4.2;

1.5.2.1.4.2
date	2012.11.17.08.47.01;	author svnexp;	state Exp;
branches;
next	;

1.2.2.1
date	2010.05.14.19.36.11;	author dougb;	state Exp;
branches
	1.2.2.1.2.1;
next	1.2.2.2;

1.2.2.2
date	2012.11.17.08.01.20;	author svnexp;	state Exp;
branches;
next	;

1.2.2.1.2.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.2.2.1.2.2;

1.2.2.1.2.2
date	2012.11.17.08.16.37;	author svnexp;	state Exp;
branches;
next	;

1.2.6.1
date	2008.11.25.02.59.29;	author kensmith;	state Exp;
branches;
next	;

1.2.8.1
date	2009.04.15.03.14.26;	author kensmith;	state Exp;
branches;
next	;

1.2.10.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.2.10.1.2.1;
next	1.2.10.2;

1.2.10.2
date	2010.05.14.19.28.16;	author dougb;	state Exp;
branches
	1.2.10.2.2.1
	1.2.10.2.4.1
	1.2.10.2.6.1;
next	1.2.10.3;

1.2.10.3
date	2012.11.17.10.35.56;	author svnexp;	state Exp;
branches;
next	;

1.2.10.1.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

1.2.10.2.2.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.2.10.2.4.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.2.10.2.6.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.2.10.2.6.2;

1.2.10.2.6.2
date	2012.11.17.08.24.38;	author svnexp;	state Exp;
branches;
next	;

1.2.12.1
date	2010.02.10.00.26.20;	author kensmith;	state Exp;
branches;
next	;

1.1.2.1
date	2006.07.24.20.46.14;	author thompsa;	state Exp;
branches;
next	1.1.2.2;

1.1.2.2
date	2007.10.25.14.36.11;	author mtm;	state Exp;
branches
	1.1.2.2.4.1;
next	1.1.2.3;

1.1.2.3
date	2010.05.14.19.57.18;	author dougb;	state Exp;
branches;
next	1.1.2.4;

1.1.2.4
date	2012.11.17.07.39.06;	author svnexp;	state Exp;
branches;
next	;

1.1.2.2.4.1
date	2008.10.02.02.57.24;	author kensmith;	state Exp;
branches;
next	;


desc
@@


1.7
log
@Switching exporter and resync
@
text
@#!/bin/sh
#
# Copyright (c) 2006 The FreeBSD Project. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE PROJECT ``AS IS'' AND ANY EXPRESS OR
# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
# IN NO EVENT SHALL THE PROJECT BE LIABLE FOR ANY DIRECT, INDIRECT,
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
# $FreeBSD: head/etc/rc.d/bridge 238416 2012-07-13 06:46:09Z kevlo $
#

# PROVIDE: bridge
# REQUIRE: netif faith ppp stf
# KEYWORD: nojail

. /etc/rc.subr
. /etc/network.subr

name="bridge"
start_cmd="bridge_start"
stop_cmd="bridge_stop"
cmd=""

glob_int() {
	case "$1" in
		$2 ) true ;;
		* ) false ;;
	esac
}

bridge_test() {
	bridge=$1
	iface=$2

	eval interfaces=\$autobridge_${bridge}
	if [ -n "${interfaces}" ]; then
		for i in ${interfaces}; do
			if glob_int $iface $i ; then
				ifconfig $bridge $cmd $iface > /dev/null 2>&1
				return
			fi
		done
	fi
}

autobridge()
{
	if [ -n "${autobridge_interfaces}" ]; then
		if [ -z "$iflist" ]; then
			# We're operating as a general network start routine.
			iflist="`list_net_interfaces`"
		fi

		for br in ${autobridge_interfaces}; do
			for i in $iflist; do
				bridge_test $br $i
			done
		done
	fi
}

bridge_start()
{
	cmd="addm"
	autobridge
}

bridge_stop()
{
	cmd="deletem"
	autobridge
}

iflist=$2

load_rc_config $name
run_rc_command "$1"
@


1.7.2.1
log
@file bridge was added on branch RELENG_8_4 on 2013-03-28 13:02:43 +0000
@
text
@d1 93
@


1.7.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 93
#!/bin/sh
#
# Copyright (c) 2006 The FreeBSD Project. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE PROJECT ``AS IS'' AND ANY EXPRESS OR
# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
# IN NO EVENT SHALL THE PROJECT BE LIABLE FOR ANY DIRECT, INDIRECT,
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
# $FreeBSD: releng/8.4/etc/rc.d/bridge 208094 2010-05-14 19:28:16Z dougb $
#

# PROVIDE: bridge
# REQUIRE: netif
# KEYWORD: nojail

. /etc/rc.subr
. /etc/network.subr

name="bridge"
start_cmd="bridge_start"
stop_cmd="bridge_stop"
cmd=""

glob_int () {
	case "$1" in
		$2 ) true ;;
		* ) false ;;
	esac
}

bridge_test () {
	bridge=$1
	iface=$2

	eval interfaces=\$autobridge_${bridge}
	if [ -n "${interfaces}" ]; then
		for i in ${interfaces}; do
			if glob_int $iface $i ; then
				ifconfig $bridge $cmd $iface > /dev/null 2>&1
				return
			fi
		done
	fi
}

autobridge()
{
	if [ -n "${autobridge_interfaces}" ]; then
		if [ -z "$iflist" ]; then
			# We're operating as a general network start routine.
			iflist="`list_net_interfaces`"
		fi

		for br in ${autobridge_interfaces}; do
			for i in $iflist; do
				bridge_test $br $i
			done
		done
	fi
}

bridge_start()
{
	cmd="addm"
	autobridge
}

bridge_stop()
{
	cmd="deletem"
	autobridge
}

iflist=$2

load_rc_config $name
run_rc_command "$1"
@


1.6
log
@SVN rev 238416 on 2012-07-13 06:46:09Z by kevlo

Whitespace nit
@
text
@d25 1
a25 1
# $FreeBSD$
@


1.5
log
@SVN rev 225684 on 2011-09-20 00:37:35Z by hrs

Use REQUIRE: line to reorder rc.d/bridge instead of BEFORE: line.

Pointed out by:	dougb
Approved by:	re (bz)
@
text
@d40 1
a40 1
glob_int () {
d47 1
a47 1
bridge_test () {
@


1.5.2.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.5.2.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d25 1
a25 1
# $FreeBSD: stable/9/etc/rc.d/bridge 225684 2011-09-20 00:37:35Z hrs $
@


1.5.2.1.4.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.5.2.1.4.2
log
@Switch importer
@
text
@d25 1
a25 1
# $FreeBSD: releng/9.1/etc/rc.d/bridge 225684 2011-09-20 00:37:35Z hrs $
@


1.5.2.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.5.2.1.2.2
log
@Switch importer
@
text
@d25 1
a25 1
# $FreeBSD: releng/9.0/etc/rc.d/bridge 225684 2011-09-20 00:37:35Z hrs $
@


1.4
log
@SVN rev 225669 on 2011-09-19 15:55:53Z by hrs

Fix the script order to run rc.d/bridge after the initial network
interface configuration and before running network daemons.

Approved by:	re (kib)
@
text
@a29 1
# BEFORE: SERVERS
@


1.3
log
@SVN rev 208060 on 2010-05-14 04:53:57Z by dougb

Remove trailing white space. No functional changes.
@
text
@d29 2
a30 1
# REQUIRE: netif
@


1.2
log
@Eliminate global symbols starting with an underscore from rc.d
scripts, except for mdconfig* and jail.  Such symbols are reserved
for the rc.subr internals.  Most scripts can be fixed by just
declaring _foo symbols as local: few scripts actually need them to
be global.

Discussed with:	dougb in freebsd-rc
@
text
@d45 1
a45 1
} 
@


1.2.2.1
log
@SVN rev 208095 on 2010-05-14 19:36:11Z by dougb

MFC 208060:

Remove trailing white space. No functional changes.

Hand-delete trailing ws from rc.firewall while I'm here.
@
text
@d45 1
a45 1
}
@


1.2.2.2
log
@Switch importer
@
text
@d25 1
a25 1
# $FreeBSD: stable/7/etc/rc.d/bridge 220110 2011-03-28 19:29:30Z dougb $
@


1.2.2.1.2.1
log
@SVN rev 216618 on 2010-12-21 17:10:29Z by kensmith

Copy stable/7 to releng/7.4 in preparation for FreeBSD-7.4 release.

Approved by:	re (implicit)
@
text
@@


1.2.2.1.2.2
log
@Switch importer
@
text
@d25 1
a25 1
# $FreeBSD: releng/7.4/etc/rc.d/bridge 208095 2010-05-14 19:36:11Z dougb $
@


1.2.12.1
log
@SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith

Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process.

Approved by:	re (implicit)
@
text
@@


1.2.10.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@@


1.2.10.2
log
@SVN rev 208094 on 2010-05-14 19:28:16Z by dougb

MFC 208060:

Remove trailing white space. No functional changes.
@
text
@d45 1
a45 1
}
@


1.2.10.3
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d25 1
a25 1
# $FreeBSD: stable/8/etc/rc.d/bridge 208094 2010-05-14 19:28:16Z dougb $
@


1.2.10.2.6.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.2.10.2.6.2
log
@Switch importer
@
text
@d25 1
a25 1
# $FreeBSD: releng/8.3/etc/rc.d/bridge 208094 2010-05-14 19:28:16Z dougb $
@


1.2.10.2.4.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.2.10.2.2.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.2.10.1.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


1.2.8.1
log
@SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)
@
text
@@


1.2.6.1
log
@SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)
@
text
@@


1.1
log
@Add rc.d/bridge which is invoked when a new interface arrives and can
automaticly add it to an Ethernet bridge. This is intended for applications
such as qemu, vmware, openvpn, ... which open tap interfaces and need them
bridged with the hosts network adapter, the user can set up a glob for
interfaces to be automatically added (eg tap*).
@
text
@d38 1
a38 1
_cmd=""
d55 1
a55 1
				ifconfig $bridge $_cmd $iface > /dev/null 2>&1
d65 1
a65 1
		if [ -z "$_iflist" ]; then
d67 1
a67 1
			_iflist="`list_net_interfaces`"
d71 1
a71 1
			for i in $_iflist; do
d80 1
a80 1
	_cmd="addm"
d86 1
a86 1
	_cmd="deletem"
d90 1
a90 1
_iflist=$2
@


1.1.2.1
log
@MFC
  Add rc.d/bridge which is invoked when a new interface arrives and can
  automaticly add it to an Ethernet bridge.

  r1.287     src/etc/defaults/rc.conf
  r1.73      src/etc/rc.d/Makefile
  r1.1       src/etc/rc.d/bridge
  r1.20      src/etc/rc.d/netif
  r1.299     src/share/man/man5/rc.conf.5
@
text
@@


1.1.2.2
log
@MFC:
  Eliminate global symbols starting with an underscore from rc.d
  scripts, except for mdconfig* and jail.  Such symbols are reserved
  for the rc.subr internals.  Most scripts can be fixed by just
  declaring _foo symbols as local: few scripts actually need them to
  be global.
@
text
@d38 1
a38 1
cmd=""
d55 1
a55 1
				ifconfig $bridge $cmd $iface > /dev/null 2>&1
d65 1
a65 1
		if [ -z "$iflist" ]; then
d67 1
a67 1
			iflist="`list_net_interfaces`"
d71 1
a71 1
			for i in $iflist; do
d80 1
a80 1
	cmd="addm"
d86 1
a86 1
	cmd="deletem"
d90 1
a90 1
iflist=$2
@


1.1.2.3
log
@SVN rev 208096 on 2010-05-14 19:57:18Z by dougb

MFC 208060:

Remove trailing white space. No functional changes.

Hand-delete trailing ws from rc.subr, rc.d/nsswitch, and rc.d/nfslocking
while I'm here.
@
text
@d45 1
a45 1
}
@


1.1.2.4
log
@Switch importer
@
text
@d25 1
a25 1
# $FreeBSD: stable/6/etc/rc.d/bridge 208096 2010-05-14 19:57:18Z dougb $
@


1.1.2.2.4.1
log
@SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith

Create releng/6.4 from stable/6 in preparation for 6.4-RC1.

Approved by:	re (implicit)
@
text
@@


