summaryrefslogtreecommitdiffstats
path: root/usr/local/sbin
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2013-09-04 10:36:15 +0000
committerErmal <eri@pfsense.org>2013-09-04 10:36:32 +0000
commitc088fe72cb2dde3bf9ee9578417c26dfbc36d4d2 (patch)
treef3ab0c325549ed607d954ef50433582492d41c59 /usr/local/sbin
parent5d1bde9670b4ca412bf73cf27d249934a221dbdb (diff)
downloadpfsense-c088fe72cb2dde3bf9ee9578417c26dfbc36d4d2.zip
pfsense-c088fe72cb2dde3bf9ee9578417c26dfbc36d4d2.tar.gz
Related to Ticket #3045 avoid races in the ntpdate_sync_one script due to killall returning without the process really exiting.
Diffstat (limited to 'usr/local/sbin')
-rwxr-xr-xusr/local/sbin/ntpdate_sync_once.sh15
1 files changed, 13 insertions, 2 deletions
diff --git a/usr/local/sbin/ntpdate_sync_once.sh b/usr/local/sbin/ntpdate_sync_once.sh
index 3809b23..ac9a16f 100755
--- a/usr/local/sbin/ntpdate_sync_once.sh
+++ b/usr/local/sbin/ntpdate_sync_once.sh
@@ -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
OpenPOWER on IntegriCloud