mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Related to Ticket #3045 avoid races in the ntpdate_sync_one script due to killall returning without the process really exiting.

Browse Source
This commit is contained in:
Ermal 2013-09-04 10:36:15 +00:00
parent 5d1bde9670
commit c088fe72cb
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
usr/local/sbin/ntpdate_sync_once.sh
View File

@ -3,14 +3,25 @@
NOTSYNCED="true"
MAX_ATTEMPTS=3
SERVER=`/bin/cat /cf/conf/config.xml | /usr/bin/grep timeservers | /usr/bin/cut -d">" -f2 | /usr/bin/cut -d"<" -f1`
if [ "${SERVER}" = "" ]; then
exit
fi
/bin/pkill -f ntpdate_sync_once.sh
ATTEMPT=1
# Loop until we're synchronized, but for a set number of attempts so we don't get stuck here forever.
while [ "$NOTSYNCED" = "true" ] && [ ${ATTEMPT} -le ${MAX_ATTEMPTS} ]; do
# Ensure that ntpd and ntpdate are not running so that the socket we want will be free.
/usr/bin/killall ntpd 2>/dev/null
/usr/bin/killall ntpdate 2>/dev/null
while [ true ]; do
/usr/bin/killall ntpdate 2>/dev/null
/bin/pgrep ntpd
if [ $? -eq 0 ]; then
/usr/bin/killall ntpd 2>/dev/null
else
break
fi
done
sleep 1
/usr/sbin/ntpdate -s -t 5 ${SERVER}
if [ "$?" = "0" ]; then