Revert the previous afexists() change. Knobs configured explicitly by
the user should not be ignored if possible even if the kernel does not support the prerequisite feature. Discussed with: ume
This commit is contained in:
parent
e248dc09a8
commit
ccbc06d893
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=197701
@ -15,8 +15,6 @@ stop_cmd="faith_down"
|
||||
|
||||
faith_up()
|
||||
{
|
||||
afexists inet6 || return 0
|
||||
|
||||
case ${ipv6_faith_prefix} in
|
||||
[Nn][Oo] | '')
|
||||
;;
|
||||
@ -50,8 +48,6 @@ faith_up()
|
||||
|
||||
faith_down()
|
||||
{
|
||||
afexists inet6 || return 0
|
||||
|
||||
echo "Removing IPv6-to-IPv4 TCP relay capturing interface: faith0."
|
||||
ifconfig faith0 destroy
|
||||
${SYSCTL_W} net.inet6.ip6.keepfaith=0
|
||||
|
@ -44,8 +44,6 @@ static_arp_start()
|
||||
{
|
||||
local e arp_args
|
||||
|
||||
afexists inet || return 0
|
||||
|
||||
if [ -n "${static_arp_pairs}" ]; then
|
||||
echo -n 'Binding static ARP pair(s):'
|
||||
for e in ${static_arp_pairs}; do
|
||||
@ -61,8 +59,6 @@ static_arp_stop()
|
||||
{
|
||||
local e arp_args
|
||||
|
||||
afexists inet || return 0
|
||||
|
||||
if [ -n "${static_arp_pairs}" ]; then
|
||||
echo -n 'Unbinding static ARP pair(s):'
|
||||
for e in ${static_arp_pairs}; do
|
||||
|
@ -15,8 +15,6 @@ stop_cmd="stf_down"
|
||||
|
||||
stf_up()
|
||||
{
|
||||
afexists inet6 || return 0
|
||||
|
||||
case ${stf_interface_ipv4addr} in
|
||||
[Nn][Oo] | '')
|
||||
;;
|
||||
@ -69,8 +67,6 @@ stf_up()
|
||||
|
||||
stf_down()
|
||||
{
|
||||
afexists inet6 || return 0
|
||||
|
||||
echo "Removing 6to4 tunnel interface: stf0."
|
||||
ifconfig stf0 destroy
|
||||
route delete -inet6 2002:e000:: -prefixlen 20 ::1
|
||||
|
Loading…
Reference in New Issue
Block a user