From owner-svn-src-head@FreeBSD.ORG  Sun Mar  4 18:53:36 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0445D106566B;
	Sun,  4 Mar 2012 18:53:36 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CA8298FC08;
	Sun,  4 Mar 2012 18:53:35 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q24IrZem048171;
	Sun, 4 Mar 2012 18:53:35 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q24IrZ5m048169;
	Sun, 4 Mar 2012 18:53:35 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <201203041853.q24IrZ5m048169@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Sun, 4 Mar 2012 18:53:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r232515 - head/etc/rc.d
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Mar 2012 18:53:36 -0000

Author: bz
Date: Sun Mar  4 18:53:35 2012
New Revision: 232515
URL: http://svn.freebsd.org/changeset/base/232515

Log:
  Rather than printing the output from route add for all FIBs just print them
  for the default FIB followed by a statement with a list of FIB numbers for
  all the other FIBs we install the routes for.
  
  Request by:	kib (to make it less noisy)
  Tested by:	kib
  MFC after:	3 days

Modified:
  head/etc/rc.d/routing

Modified: head/etc/rc.d/routing
==============================================================================
--- head/etc/rc.d/routing	Sun Mar  4 18:51:45 2012	(r232514)
+++ head/etc/rc.d/routing	Sun Mar  4 18:53:35 2012	(r232515)
@@ -147,14 +147,21 @@ static_inet6()
 	: ${fibs:=1}
 
 	# disallow "internal" addresses to appear on the wire
-	i=0
-	while test ${i} -lt ${fibs}; do
-		setfib -F ${i} route ${_action} \
-		    -inet6 ::ffff:0.0.0.0 -prefixlen 96 ::1 -reject
-		setfib -F ${i} route ${_action} \
-		    -inet6 ::0.0.0.0 -prefixlen 96 ::1 -reject
-		i=$((i + 1))
-	done
+	route ${_action} -inet6 ::ffff:0.0.0.0 -prefixlen 96 ::1 -reject
+	route ${_action} -inet6 ::0.0.0.0 -prefixlen 96 ::1 -reject
+	i=1
+	if test ${i} -lt ${fibs}; then
+		printf "Also installing reject routes for FIBs"
+		while test ${i} -lt ${fibs}; do
+			setfib -F ${i} route -q ${_action} \
+			    -inet6 ::ffff:0.0.0.0 -prefixlen 96 ::1 -reject
+			setfib -F ${i} route -q ${_action} \
+			    -inet6 ::0.0.0.0 -prefixlen 96 ::1 -reject
+			printf " %d" ${i}
+			i=$((i + 1))
+		done
+		printf "\n"
+	fi
 
 	case ${ipv6_defaultrouter} in
 	[Nn][Oo] | '')
@@ -226,14 +233,21 @@ static_inet6()
 	# for the host case, you will allow to omit the identifiers.
 	# Under this configuration, the packets will go to the default
 	# interface.
-	i=0
-	while test ${i} -lt ${fibs}; do
-		setfib -F ${i} route ${_action} \
-		    -inet6 fe80:: -prefixlen 10 ::1 -reject
-		setfib -F ${i} route ${_action} \
-		    -inet6 ff02:: -prefixlen 16 ::1 -reject
-		i=$((i + 1))
-	done
+	route ${_action} -inet6 fe80:: -prefixlen 10 ::1 -reject
+	route ${_action} -inet6 ff02:: -prefixlen 16 ::1 -reject
+	i=1
+	if test ${i} -lt ${fibs}; then
+		printf "Also installing reject routes for FIBs"
+		while test ${i} -lt ${fibs}; do
+			setfib -F ${i} route -q ${_action} \
+			    -inet6 fe80:: -prefixlen 10 ::1 -reject
+			setfib -F ${i} route -q ${_action} \
+			    -inet6 ff02:: -prefixlen 16 ::1 -reject
+			printf " %d" ${i}
+			i=$((i + 1))
+		done
+		printf "\n"
+	fi
 
 	case ${ipv6_default_interface} in
 	'')