diff options
author | Hiroki Sato <hrs@FreeBSD.org> | 2009-10-02 06:19:34 +0000 |
---|---|---|
committer | Hiroki Sato <hrs@FreeBSD.org> | 2009-10-02 06:19:34 +0000 |
commit | ccbc06d893adcccddaa4089aa42c3adec9b51a23 (patch) | |
tree | 388e3ff013bccce0488597414ad9594cf6b206a2 | |
parent | e248dc09a8f5d9ad2b09c957fc992b0761f76e6f (diff) | |
download | src-ccbc06d893adcccddaa4089aa42c3adec9b51a23.tar.gz src-ccbc06d893adcccddaa4089aa42c3adec9b51a23.zip |
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
Notes
Notes:
svn path=/head/; revision=197701
-rwxr-xr-x | etc/rc.d/faith | 4 | ||||
-rw-r--r-- | etc/rc.d/static_arp | 4 | ||||
-rwxr-xr-x | etc/rc.d/stf | 4 |
3 files changed, 0 insertions, 12 deletions
diff --git a/etc/rc.d/faith b/etc/rc.d/faith index e48fff78bd4c..020b947ec86a 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 816d581d7ce2..6283b56ef087 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 fa1bfbd522d5..40b182a0de93 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 |