summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorhrs <hrs@FreeBSD.org>2009-10-02 06:19:34 +0000
committerhrs <hrs@FreeBSD.org>2009-10-02 06:19:34 +0000
commit43628417e2edca37d35e980eb48a584c68e9db5a (patch)
tree388e3ff013bccce0488597414ad9594cf6b206a2 /etc
parenta8f54fa5ca180238d20d58265286a9b1261e5c98 (diff)
downloadFreeBSD-src-43628417e2edca37d35e980eb48a584c68e9db5a.zip
FreeBSD-src-43628417e2edca37d35e980eb48a584c68e9db5a.tar.gz
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
Diffstat (limited to 'etc')
-rwxr-xr-xetc/rc.d/faith4
-rw-r--r--etc/rc.d/static_arp4
-rwxr-xr-xetc/rc.d/stf4
3 files changed, 0 insertions, 12 deletions
diff --git a/etc/rc.d/faith b/etc/rc.d/faith
index e48fff7..020b947 100755
--- a/etc/rc.d/faith
+++ b/etc/rc.d/faith
@@ -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
diff --git a/etc/rc.d/static_arp b/etc/rc.d/static_arp
index 816d581..6283b56 100644
--- a/etc/rc.d/static_arp
+++ b/etc/rc.d/static_arp
@@ -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
diff --git a/etc/rc.d/stf b/etc/rc.d/stf
index fa1bfbd..40b182a 100755
--- a/etc/rc.d/stf
+++ b/etc/rc.d/stf
@@ -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
OpenPOWER on IntegriCloud