diff options
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, 15 insertions, 3 deletions
diff --git a/etc/rc.d/ip6addrctl b/etc/rc.d/ip6addrctl index d3b1856..3963b07 100755 --- a/etc/rc.d/ip6addrctl +++ b/etc/rc.d/ip6addrctl @@ -20,8 +20,6 @@ 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 f982cfc..06b8e76 100755 --- a/etc/rc.d/netif +++ b/etc/rc.d/netif @@ -34,6 +34,7 @@ . /etc/network.subr name="network" +start_precmd="network_prestart" start_cmd="network_start" stop_cmd="network_stop" cloneup_cmd="clone_up" @@ -41,7 +42,13 @@ clonedown_cmd="clone_down" extra_commands="cloneup clonedown" cmdifn= -set_rcvar_obsolete ipv6_enable ipv6_prefer +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 +} network_start() { diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions index 4631304..433ce82 100755 --- a/etc/rc.d/netoptions +++ b/etc/rc.d/netoptions @@ -99,6 +99,13 @@ 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 |
