kernel
/
dracut
mirror of https://git.kernel.org/pub/scm/boot/dracut/dracut.git/
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #214 from pallotron/master 

Look for IPv6 RA in wait_for_ipv6_dad, wait_for_ipv6_dad_link and wait_for_ipv6_auto
master
Harald Hoyer 2017-04-11 13:40:27 +02:00 committed by GitHub
parent 9998940493 e190073b21
commit 0096157e14
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules.d/40network/ifup.sh
View File

@ -108,6 +108,9 @@ do_static() {
if strglobin $ip '*:*:*'; then if strglobin $ip '*:*:*'; then
# note no ip addr flush for ipv6 # note no ip addr flush for ipv6
ip addr add $ip/$mask ${srv:+peer $srv} dev $netif ip addr add $ip/$mask ${srv:+peer $srv} dev $netif
echo 0 > /proc/sys/net/ipv6/conf/$netif/forwarding
echo 1 > /proc/sys/net/ipv6/conf/$netif/accept_ra
echo 1 > /proc/sys/net/ipv6/conf/$netif/accept_redirects
wait_for_ipv6_dad $netif wait_for_ipv6_dad $netif
else else
if command -v arping2 >/dev/null; then if command -v arping2 >/dev/null; then

4
modules.d/40network/net-lib.sh
View File

@ -654,6 +654,7 @@ wait_for_ipv6_dad_link() {


while [ $cnt -lt $timeout ]; do while [ $cnt -lt $timeout ]; do
[ -z "$(ip -6 addr show dev "$1" scope link tentative)" ] \ [ -z "$(ip -6 addr show dev "$1" scope link tentative)" ] \
&& [ -n "$(ip -6 route list proto ra dev "$1" | grep ^default)" ] \
&& return 0 && return 0
[ -n "$(ip -6 addr show dev "$1" scope link dadfailed)" ] \ [ -n "$(ip -6 addr show dev "$1" scope link dadfailed)" ] \
&& return 1 && return 1
@ -671,6 +672,7 @@ wait_for_ipv6_dad() {


while [ $cnt -lt $timeout ]; do while [ $cnt -lt $timeout ]; do
[ -z "$(ip -6 addr show dev "$1" tentative)" ] \ [ -z "$(ip -6 addr show dev "$1" tentative)" ] \
&& [ -n "$(ip -6 route list proto ra dev "$1" | grep ^default)" ] \
&& return 0 && return 0
[ -n "$(ip -6 addr show dev "$1" dadfailed)" ] \ [ -n "$(ip -6 addr show dev "$1" dadfailed)" ] \
&& return 1 && return 1
@ -688,7 +690,7 @@ wait_for_ipv6_auto() {


while [ $cnt -lt $timeout ]; do while [ $cnt -lt $timeout ]; do
[ -z "$(ip -6 addr show dev "$1" tentative)" ] \ [ -z "$(ip -6 addr show dev "$1" tentative)" ] \
&& [ -n "$(ip -6 route list proto ra dev "$1")" ] \ && [ -n "$(ip -6 route list proto ra dev "$1" | grep ^default)" ] \
&& return 0 && return 0
sleep 0.1 sleep 0.1
cnt=$(($cnt+1)) cnt=$(($cnt+1))