diff options
| author | hrs <hrs@FreeBSD.org> | 2009-09-12 22:13:41 +0000 |
|---|---|---|
| committer | hrs <hrs@FreeBSD.org> | 2009-09-12 22:13:41 +0000 |
| commit | 7c88a6d4ae7fe6cf1d242c9a458a3a3460936fed (patch) | |
| tree | 24c1384fabefec07ce6741f83b3711da2a7f62a8 /etc/rc.d/ip6addrctl | |
| parent | 2eb62239d7432351eb544690c4ea2fc648ae2abc (diff) | |
| download | FreeBSD-src-7c88a6d4ae7fe6cf1d242c9a458a3a3460936fed.zip FreeBSD-src-7c88a6d4ae7fe6cf1d242c9a458a3a3460936fed.tar.gz | |
Integrate rc.d/network_ipv6 into rc.d/netif:
- Add rc.d/stf and rc.d/faith for stf(4) and faith(4).
- Remove rc.d/auto_linklocal and rc.d/network_ipv6.
- Move rc.d/sysctl to just before FILESYSTEMS because rc.d/netif
depends on some sysctl variables.
Reviewed by: brooks
MFC after: 3 days
Diffstat (limited to 'etc/rc.d/ip6addrctl')
| -rwxr-xr-x | etc/rc.d/ip6addrctl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/rc.d/ip6addrctl b/etc/rc.d/ip6addrctl index 88e1f99..518ac25 100755 --- a/etc/rc.d/ip6addrctl +++ b/etc/rc.d/ip6addrctl @@ -4,8 +4,8 @@ # # PROVIDE: ip6addrctl -# REQUIRE: FILESYSTEMS netif -# BEFORE: network_ipv6 +# REQUIRE: FILESYSTEMS +# BEFORE: netif # KEYWORD: nojail . /etc/rc.subr @@ -52,7 +52,7 @@ ip6addrctl_start() ip6addrctl install /etc/ip6addrctl.conf checkyesno ip6addrctl_verbose && ip6addrctl else - if checkyesno ipv6_enable; then + if checkyesno ipv6_prefer; then ip6addrctl_prefer_ipv6 else ip6addrctl_prefer_ipv4 |
