diff options
| author | hrs <hrs@FreeBSD.org> | 2010-09-13 19:51:15 +0000 |
|---|---|---|
| committer | hrs <hrs@FreeBSD.org> | 2010-09-13 19:51:15 +0000 |
| commit | 3319d93aea4340bab959aaa636738910a48960da (patch) | |
| tree | dcff0aae5c63fdf041424dbf02aaddadf00353be /etc/rc.d | |
| parent | 7766ec39d496d5f467624ce957fb8cbc33958626 (diff) | |
| download | FreeBSD-src-3319d93aea4340bab959aaa636738910a48960da.zip FreeBSD-src-3319d93aea4340bab959aaa636738910a48960da.tar.gz | |
Revert changes in r206408.
Discussed with: dougb, core.5, and core.6
Diffstat (limited to 'etc/rc.d')
| -rwxr-xr-x | etc/rc.d/ip6addrctl | 2 | ||||
| -rwxr-xr-x | etc/rc.d/netif | 9 | ||||
| -rwxr-xr-x | etc/rc.d/netoptions | 7 |
3 files changed, 3 insertions, 15 deletions
diff --git a/etc/rc.d/ip6addrctl b/etc/rc.d/ip6addrctl index 3963b07..d3b1856 100755 --- a/etc/rc.d/ip6addrctl +++ b/etc/rc.d/ip6addrctl @@ -20,6 +20,8 @@ status_cmd="ip6addrctl" prefer_ipv6_cmd="ip6addrctl_prefer_ipv6" prefer_ipv4_cmd="ip6addrctl_prefer_ipv4" +set_rcvar_obsolete ipv6_enable ipv6_prefer + ip6addrctl_prefer_ipv6() { afexists inet6 || return 0 diff --git a/etc/rc.d/netif b/etc/rc.d/netif index 06b8e76..f982cfc 100755 --- a/etc/rc.d/netif +++ b/etc/rc.d/netif @@ -34,7 +34,6 @@ . /etc/network.subr name="network" -start_precmd="network_prestart" start_cmd="network_start" stop_cmd="network_stop" cloneup_cmd="clone_up" @@ -42,13 +41,7 @@ clonedown_cmd="clone_down" extra_commands="cloneup clonedown" cmdifn= -network_prestart() -{ - if [ -n "$ipv6_enable" ]; then - warn 'The ipv6_enable option is deprecated.' - warn 'See rc.conf(5) for information on disabling IPv6.' - fi -} +set_rcvar_obsolete ipv6_enable ipv6_prefer network_start() { diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions index 433ce82..4631304 100755 --- a/etc/rc.d/netoptions +++ b/etc/rc.d/netoptions @@ -99,13 +99,6 @@ netoptions_inet6() else ${SYSCTL_W} net.inet6.ip6.v6only=1 >/dev/null fi - - if checkyesno ipv6_privacy; then - netoptions_init - echo -n " IPv6 Privacy Addresses" - ${SYSCTL_W} net.inet6.ip6.use_tempaddr=1 >/dev/null - ${SYSCTL_W} net.inet6.ip6.prefer_tempaddr=1 >/dev/null - fi } load_rc_config $name |
