summaryrefslogtreecommitdiffstats
path: root/etc/rc.d
diff options
context:
space:
mode:
authorhrs <hrs@FreeBSD.org>2014-09-15 07:20:40 +0000
committerhrs <hrs@FreeBSD.org>2014-09-15 07:20:40 +0000
commit0d57c69d7bcff6b7ff4abcbcd7b8eb07b3696055 (patch)
tree3ac16b40ca4ab86e6c32a1d014abfbd135da978e /etc/rc.d
parent5f22ea600bd3ce91b7a204c7f11105dbfd7f11de (diff)
downloadFreeBSD-src-0d57c69d7bcff6b7ff4abcbcd7b8eb07b3696055.zip
FreeBSD-src-0d57c69d7bcff6b7ff4abcbcd7b8eb07b3696055.tar.gz
Make net.inet.ip.sourceroute, net.inet.ip.accept_sourceroute, and
net.inet.ip.process_options vnet-aware. Revert changes in r271545. Suggested by: bz
Diffstat (limited to 'etc/rc.d')
-rwxr-xr-xetc/rc.d/routing28
1 files changed, 13 insertions, 15 deletions
diff --git a/etc/rc.d/routing b/etc/rc.d/routing
index f511cd3..9cb07e5 100755
--- a/etc/rc.d/routing
+++ b/etc/rc.d/routing
@@ -326,22 +326,20 @@ options_inet()
${SYSCTL} net.inet.ip.forwarding=0 > /dev/null
fi
- if ! check_jail vnet; then
- if checkyesno forward_sourceroute; then
- ropts_init inet
- echo -n ' do source routing=YES'
- ${SYSCTL} net.inet.ip.sourceroute=1 > /dev/null
- else
- ${SYSCTL} net.inet.ip.sourceroute=0 > /dev/null
- fi
+ if checkyesno forward_sourceroute; then
+ ropts_init inet
+ echo -n ' do source routing=YES'
+ ${SYSCTL} net.inet.ip.sourceroute=1 > /dev/null
+ else
+ ${SYSCTL} net.inet.ip.sourceroute=0 > /dev/null
+ fi
- if checkyesno accept_sourceroute; then
- ropts_init inet
- echo -n ' accept source routing=YES'
- ${SYSCTL} net.inet.ip.accept_sourceroute=1 > /dev/null
- else
- ${SYSCTL} net.inet.ip.accept_sourceroute=0 > /dev/null
- fi
+ if checkyesno accept_sourceroute; then
+ ropts_init inet
+ echo -n ' accept source routing=YES'
+ ${SYSCTL} net.inet.ip.accept_sourceroute=1 > /dev/null
+ else
+ ${SYSCTL} net.inet.ip.accept_sourceroute=0 > /dev/null
fi
if checkyesno arpproxy_all; then
OpenPOWER on IntegriCloud