diff options
| author | ume <ume@FreeBSD.org> | 2001-04-26 17:33:37 +0000 |
|---|---|---|
| committer | ume <ume@FreeBSD.org> | 2001-04-26 17:33:37 +0000 |
| commit | e76cced2fd1cca60ec8730a9cbcf2a41561927bc (patch) | |
| tree | 575054dd9e012a1d395107695466dd1b33df3330 | |
| parent | cd1f3817def48e94fbb6cff073d5bbbd52594967 (diff) | |
| download | FreeBSD-src-e76cced2fd1cca60ec8730a9cbcf2a41561927bc.zip FreeBSD-src-e76cced2fd1cca60ec8730a9cbcf2a41561927bc.tar.gz | |
Enable static IPv6 address assignment on PCMCIA NIC.
PR: conf/26633
| -rwxr-xr-x | etc/pccard_ether | 14 | ||||
| -rw-r--r-- | etc/rc.d/network_ipv6 | 5 | ||||
| -rw-r--r-- | etc/rc.network6 | 5 |
3 files changed, 10 insertions, 14 deletions
diff --git a/etc/pccard_ether b/etc/pccard_ether index 58f0ca6..7a4e733 100755 --- a/etc/pccard_ether +++ b/etc/pccard_ether @@ -122,16 +122,10 @@ case ${startstop} in # IPv6 setup case ${ipv6_enable} in [Yy][Ee][Ss]) - case ${ipv6_gateway_enable} in - [Yy][Ee][Ss]) - ;; - *) - sysctl -w net.inet6.ip6.forwarding=0 - sysctl -w net.inet6.ip6.accept_rtadv=1 - ifconfig ${interface} up - rtsol ${interface} - ;; - esac + if [ -r /etc/rc.network6 ]; then + . /etc/rc.network6 + network6_interface_setup ${interface} + fi ;; esac ;; diff --git a/etc/rc.d/network_ipv6 b/etc/rc.d/network_ipv6 index 6b47af8..30de630 100644 --- a/etc/rc.d/network_ipv6 +++ b/etc/rc.d/network_ipv6 @@ -129,7 +129,7 @@ network6_pass1() { network6_gif_setup # setting up interfaces - network6_interface_setup + network6_interface_setup $ipv6_network_interfaces # wait for DAD's completion (for global addrs) sleep `sysctl -n net.inet6.ip6.dad_count` @@ -251,6 +251,7 @@ network6_pass1() { } network6_interface_setup() { + interfaces=$* rtsol_interfaces='' case ${ipv6_gateway_enable} in [Yy][Ee][Ss]) @@ -261,7 +262,7 @@ network6_interface_setup() { prefixcmd_enable=NO ;; esac - for i in $ipv6_network_interfaces; do + for i in $interfaces; do rtsol_interface=yes eval prefix=\$ipv6_prefix_$i if [ -n "${prefix}" ]; then diff --git a/etc/rc.network6 b/etc/rc.network6 index 6b47af8..30de630 100644 --- a/etc/rc.network6 +++ b/etc/rc.network6 @@ -129,7 +129,7 @@ network6_pass1() { network6_gif_setup # setting up interfaces - network6_interface_setup + network6_interface_setup $ipv6_network_interfaces # wait for DAD's completion (for global addrs) sleep `sysctl -n net.inet6.ip6.dad_count` @@ -251,6 +251,7 @@ network6_pass1() { } network6_interface_setup() { + interfaces=$* rtsol_interfaces='' case ${ipv6_gateway_enable} in [Yy][Ee][Ss]) @@ -261,7 +262,7 @@ network6_interface_setup() { prefixcmd_enable=NO ;; esac - for i in $ipv6_network_interfaces; do + for i in $interfaces; do rtsol_interface=yes eval prefix=\$ipv6_prefix_$i if [ -n "${prefix}" ]; then |
