Merging ^/head r278298 through r278350.

2 files changed, 4 insertions, 3 deletions

diff --git a/etc/rc.d/jail b/etc/rc.d/jail
index 0b886fd56b59..393e35526574 100755
--- a/etc/rc.d/jail
+++ b/etc/rc.d/jail
@@ -28,7 +28,7 @@ extra_commands="config console status"
 
 need_dad_wait=
 
-# extact_var jail name param num defval
+# extract_var jail name param num defval
 #	Extract value from ${jail_$jail_$name} or ${jail_$name} and
 #	set it to $param.  If not defined, $defval is used.
 #	When $num is [0-9]*, ${jail_$jail_$name$num} are looked up and
diff --git a/etc/rc.d/routing b/etc/rc.d/routing
index b38147153b0a..7a3c1ab4c2e7 100755
--- a/etc/rc.d/routing
+++ b/etc/rc.d/routing
@@ -165,13 +165,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=