Skip to content

dhcp: if first ntp invocation fails, set time manually and retry #304

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

Draft
rpardini wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

dhcp: if first ntp invocation fails, set time manually and retry #304

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
24 changes: 22 additions & 2 deletions files/dhcp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,29 @@ run_dhcp_client() {
# the --nobackground is not used here because when it is used, dhcpcd doesn't honor the --timeout option
# and waits indefinitely for a response. For one shot, we want to timeout after the 30 second default.
/sbin/dhcpcd -f /dhcpcd.conf --allowinterfaces "${al}" -1 || true

# use busybox's ntpd to set the time after getting an IP address; don't fail
echo 'sleep 1 second before calling ntpd' && sleep 1
/usr/sbin/ntpd -n -q -dd -p pool.ntp.org || true
echo "sleep 1 second before calling ntpd; date: '$(date)'" && sleep 1
if ! /usr/sbin/ntpd -n -q -dd -p pool.ntp.org; then
echo "ntpd call failed; setting time manually and retrying"
# set system time to the date of the dhcpd binary file
# this should recover from ntpd failures due to time being too far off
date -s "$(stat -c %y /sbin/dhcpcd | cut -d'.' -f1)" || true
tries=1 # retry up to 5 times
while [ $tries -le 5 ]; do
echo "waiting 1 second before retrying ntpd call; try #$tries ; date is now: '$(date)'"
sleep 1
if /usr/sbin/ntpd -n -q -dd -p pool.ntp.org; then
echo "ntpd retry call succeeded on try #$tries; date is now: '$(date)'"
break
else
echo "ntpd retry call failed on try #$tries"
fi
tries=$((tries + 1))
done
else
echo "ntpd call succeeded; date is now: '$(date)'"
fi
else
/sbin/dhcpcd --nobackground -f /dhcpcd.conf --allowinterfaces "${al}"
fi
Expand Down
Loading