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.
This commit is contained in:
parent
4ad5d253df
commit
7ae24d3f0d
@ -127,6 +127,9 @@ network6_pass1() {
|
|||||||
#
|
#
|
||||||
ipv6_network_interfaces="`ifconfig -l`"
|
ipv6_network_interfaces="`ifconfig -l`"
|
||||||
;;
|
;;
|
||||||
|
[Nn][Oo][Nn][Ee])
|
||||||
|
ipv6_network_interfaces=''
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
# just to make sure
|
# just to make sure
|
||||||
@ -151,17 +154,20 @@ network6_pass1() {
|
|||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
# act as endhost - start with manual configuration
|
# 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.forwarding=0
|
||||||
sysctl net.inet6.ip6.accept_rtadv=0
|
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
# setting up interfaces
|
if [ -n "${ipv6_network_interfaces}" ]; then
|
||||||
network6_interface_setup $ipv6_network_interfaces
|
# setting up interfaces
|
||||||
|
network6_interface_setup $ipv6_network_interfaces
|
||||||
|
|
||||||
# wait for DAD's completion (for global addrs)
|
# wait for DAD's completion (for global addrs)
|
||||||
sleep `sysctl -n net.inet6.ip6.dad_count`
|
sleep `sysctl -n net.inet6.ip6.dad_count`
|
||||||
sleep 1
|
sleep 1
|
||||||
|
fi
|
||||||
|
|
||||||
case ${ipv6_gateway_enable} in
|
case ${ipv6_gateway_enable} in
|
||||||
[Yy][Ee][Ss])
|
[Yy][Ee][Ss])
|
||||||
|
@ -127,6 +127,9 @@ network6_pass1() {
|
|||||||
#
|
#
|
||||||
ipv6_network_interfaces="`ifconfig -l`"
|
ipv6_network_interfaces="`ifconfig -l`"
|
||||||
;;
|
;;
|
||||||
|
[Nn][Oo][Nn][Ee])
|
||||||
|
ipv6_network_interfaces=''
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
# just to make sure
|
# just to make sure
|
||||||
@ -151,17 +154,20 @@ network6_pass1() {
|
|||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
# act as endhost - start with manual configuration
|
# 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.forwarding=0
|
||||||
sysctl net.inet6.ip6.accept_rtadv=0
|
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
# setting up interfaces
|
if [ -n "${ipv6_network_interfaces}" ]; then
|
||||||
network6_interface_setup $ipv6_network_interfaces
|
# setting up interfaces
|
||||||
|
network6_interface_setup $ipv6_network_interfaces
|
||||||
|
|
||||||
# wait for DAD's completion (for global addrs)
|
# wait for DAD's completion (for global addrs)
|
||||||
sleep `sysctl -n net.inet6.ip6.dad_count`
|
sleep `sysctl -n net.inet6.ip6.dad_count`
|
||||||
sleep 1
|
sleep 1
|
||||||
|
fi
|
||||||
|
|
||||||
case ${ipv6_gateway_enable} in
|
case ${ipv6_gateway_enable} in
|
||||||
[Yy][Ee][Ss])
|
[Yy][Ee][Ss])
|
||||||
|
Loading…
x
Reference in New Issue
Block a user