diff options
| author | Hajimu UMEMOTO <ume@FreeBSD.org> | 2002-04-06 15:15:43 +0000 |
|---|---|---|
| committer | Hajimu UMEMOTO <ume@FreeBSD.org> | 2002-04-06 15:15:43 +0000 |
| commit | 7ae24d3f0d51c4e424426fec964001801e59ab1c (patch) | |
| tree | 67032c419edef9a0f1c998a7b43c064ebadefece | |
| parent | 4ad5d253df6d45f5cd4679f45ea11f5929eb65e0 (diff) | |
| download | src-7ae24d3f0d51c4e424426fec964001801e59ab1c.tar.gz src-7ae24d3f0d51c4e424426fec964001801e59ab1c.zip | |
Now, you can specify "" or "NONE" for ipv6_network_interfaces to
prevent the interfaces from being initialized by /etc/rc.network6
wrongly. So, you can explicitly initialize the interfaces by
/etc/pccard_ether.
With previous rc.network6, if you specify pccardd_flags="-z",
net.inet6.ip6.accept_rtadv was wronly set to 0, then RA was not
accepted.
Notes
Notes:
svn path=/head/; revision=93974
| -rw-r--r-- | etc/rc.d/network_ipv6 | 18 | ||||
| -rw-r--r-- | etc/rc.network6 | 18 |
2 files changed, 24 insertions, 12 deletions
diff --git a/etc/rc.d/network_ipv6 b/etc/rc.d/network_ipv6 index 7d35cdcc859a..406bde6f7db1 100644 --- a/etc/rc.d/network_ipv6 +++ b/etc/rc.d/network_ipv6 @@ -127,6 +127,9 @@ network6_pass1() { # ipv6_network_interfaces="`ifconfig -l`" ;; + [Nn][Oo][Nn][Ee]) + ipv6_network_interfaces='' + ;; esac # just to make sure @@ -151,17 +154,20 @@ network6_pass1() { ;; *) # act as endhost - start with manual configuration + # Setup of net.inet6.ip6.accept_rtadv is done later by + # network6_interface_setup. sysctl net.inet6.ip6.forwarding=0 - sysctl net.inet6.ip6.accept_rtadv=0 ;; esac - # setting up interfaces - network6_interface_setup $ipv6_network_interfaces + if [ -n "${ipv6_network_interfaces}" ]; then + # setting up interfaces + network6_interface_setup $ipv6_network_interfaces - # wait for DAD's completion (for global addrs) - sleep `sysctl -n net.inet6.ip6.dad_count` - sleep 1 + # wait for DAD's completion (for global addrs) + sleep `sysctl -n net.inet6.ip6.dad_count` + sleep 1 + fi case ${ipv6_gateway_enable} in [Yy][Ee][Ss]) diff --git a/etc/rc.network6 b/etc/rc.network6 index 7d35cdcc859a..406bde6f7db1 100644 --- a/etc/rc.network6 +++ b/etc/rc.network6 @@ -127,6 +127,9 @@ network6_pass1() { # ipv6_network_interfaces="`ifconfig -l`" ;; + [Nn][Oo][Nn][Ee]) + ipv6_network_interfaces='' + ;; esac # just to make sure @@ -151,17 +154,20 @@ network6_pass1() { ;; *) # act as endhost - start with manual configuration + # Setup of net.inet6.ip6.accept_rtadv is done later by + # network6_interface_setup. sysctl net.inet6.ip6.forwarding=0 - sysctl net.inet6.ip6.accept_rtadv=0 ;; esac - # setting up interfaces - network6_interface_setup $ipv6_network_interfaces + if [ -n "${ipv6_network_interfaces}" ]; then + # setting up interfaces + network6_interface_setup $ipv6_network_interfaces - # wait for DAD's completion (for global addrs) - sleep `sysctl -n net.inet6.ip6.dad_count` - sleep 1 + # wait for DAD's completion (for global addrs) + sleep `sysctl -n net.inet6.ip6.dad_count` + sleep 1 + fi case ${ipv6_gateway_enable} in [Yy][Ee][Ss]) |