svn commit: r278659 - stable/10/etc/rc.d

[Rui Paulo]

Author: rpaulo
Date: Fri Feb 13 04:50:39 2015
New Revision: 278659
URL: https://svnweb.freebsd.org/changeset/base/278659

Log:
  MFC r278302:
   Don't add static IPv6 routes when to all FIBs when
   net.add_addr_allfibs is 0.

Modified:
  stable/10/etc/rc.d/routing
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/etc/rc.d/routing
==============================================================================
--- stable/10/etc/rc.d/routing	Fri Feb 13 03:18:29 2015	(r278658)
+++ stable/10/etc/rc.d/routing	Fri Feb 13 04:50:39 2015	(r278659)
@@ -170,13 +170,14 @@ static_inet()
 
 static_inet6()
 {
-	local _action _if _skip fibmod fibs
+	local _action _if _skip fibmod fibs allfibs
 	_action=$1
 	_if=$2
 
 	# get the number of FIBs supported.
 	fibs=$((`${SYSCTL_N} net.fibs` - 1))
-	if [ "$fibs" -gt 0 ]; then
+	allfibs=`${SYSCTL_N} net.add_addr_allfibs`
+	if [ "$fibs" -gt 0 ] && [ "$allfibs" -ne 0 ]; then
 		fibmod="-fib 0-$fibs"
 	else
 		fibmod=