Skip to content

fix: treat IPv4LL DHCP assignments as incomplete during boot #2649

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ljm42 wants to merge 1 commit into
base: master
Choose a base branch
from
+29 −4
Open

fix: treat IPv4LL DHCP assignments as incomplete during boot #2649

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 29 additions & 4 deletions etc/rc.d/rc.inet1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,24 @@ carrier(){
return 1
}

# check for a non-IPv4LL address
dhcp4_addr(){
ip -4 -o addr show dev $1 | awk '$4 !~ /^169[.]254[.]/ {found=1} END{exit !found}'
}

# wait for DHCP; return 2 when dhcpcd is running but only IPv4LL was assigned
dhcp_wait(){
local n start=$SECONDS
run timeout 60 dhcpcd -w $DHCP_OPTIONS $1 || return 1
[[ $IP == ipv6 ]] && return 0
dhcp4_addr $1 && return 0
for ((n=SECONDS-start;n<60;n=SECONDS-start)); do
sleep 1
dhcp4_addr $1 && return 0
done
return 2
}

# create bond interface
bond_up(){
[[ -d /proc/net/bonding ]] || modprobe bonding mode=${BONDING_MODE[$i]} miimon=${BONDING_MIIMON[$i]}
Expand Down Expand Up @@ -385,13 +403,20 @@ ipaddr_up(){
if carrier $IFACE; then
# interface is UP
log "interface $IFACE is UP, polling up to 60 sec for DHCP $IP server"
if ! run timeout 60 dhcpcd -w $DHCP_OPTIONS $IFACE; then
log "can't obtain IP address, continue polling in background on interface $IFACE"
dhcp_wait $IFACE
case $? in
0) ;;
2)
log "can't obtain non-link-local IP address, existing dhcpcd continues polling in background on interface $IFACE"
;;
*)
log "can't obtain IP address, starting dhcpcd to continue polling in background on interface $IFACE"
run dhcpcd -b $DHCP_OPTIONS $IFACE
fi
;;
esac
else
# interface is DOWN
log "interface $IFACE is DOWN, polling DHCP $IP server in background"
log "interface $IFACE is DOWN, starting dhcpcd to poll DHCP $IP server in background"
run dhcpcd -b $DHCP_OPTIONS $IFACE
fi
elif [[ $DHCP == no ]]; then
Expand Down
Loading