diff options
author | dim <dim@FreeBSD.org> | 2015-02-07 12:57:40 +0000 |
---|---|---|
committer | dim <dim@FreeBSD.org> | 2015-02-07 12:57:40 +0000 |
commit | 65981136369a806a18c285ea73ca5ad1051d0c97 (patch) | |
tree | 764eb223d5a0160231bcdfca093f10b2db0d8c42 /etc | |
parent | fa0e7b41694bc598cd3df2405d0384ea29d7537e (diff) | |
parent | b2608b7652379fd4e19c95e8cc31268431b26495 (diff) | |
download | FreeBSD-src-65981136369a806a18c285ea73ca5ad1051d0c97.zip FreeBSD-src-65981136369a806a18c285ea73ca5ad1051d0c97.tar.gz |
Merging ^/head r278298 through r278350.
Diffstat (limited to 'etc')
-rwxr-xr-x | etc/rc.d/jail | 2 | ||||
-rwxr-xr-x | etc/rc.d/routing | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/etc/rc.d/jail b/etc/rc.d/jail index 0b886fd..393e355 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 b381471..7a3c1ab 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= |