From 0ec39c2a57987aac871b22dc8f8c38d4329fc70d Mon Sep 17 00:00:00 2001
From: GONG Jie <gongjie@linux.vnet.ibm.com>
Date: Tue, 20 Dec 2016 12:11:27 +0800
Subject: [PATCH] Fix the code of waiting for ntpd to synchronize in genessis

---
 xCAT-genesis-scripts/bin/doxcat | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/xCAT-genesis-scripts/bin/doxcat b/xCAT-genesis-scripts/bin/doxcat
index 6a637fb91..0f39e1e89 100755
--- a/xCAT-genesis-scripts/bin/doxcat
+++ b/xCAT-genesis-scripts/bin/doxcat
@@ -266,18 +266,18 @@ ip addr show dev $bootnic|grep -v 'scope link'|grep -v 'dynamic'|grep -v  inet6|
 logger -s -t $log_label -p local4.info "Starting ntpd..." 
 ntpd -g -x
 
-if [ -e "/dev/rtc" ]; then
-    logger -s -t $log_label -p local4.info "Attempting to sync hardware clock..."
-    ( sleep 8 ; hwclock --systohc ) </dev/null >/dev/null 2>&1 &
-    disown
+logger -s -t $log_label -p local4.info "Waiting for ntpd to synchronize..."
+ntp-wait -n 1999 -s 1 -v
+if [ $? -ne 0 ]
+then
+    logger -s -t $log_label -p local4.info "... ntpd did not synchronize."
 fi
 
-# rv 0 state does not work with the new ntp versions
-logger -s -t $log_label -p local4.info "Checking ntpq for the offset values..."
-while [ "`ntpq -c 'rv 0 offset' | awk -F '=' '/offset=/ { print $2 }' | awk -F '.' '{ print $1 }' | sed s/-//`" -ge 1000 ]; do 
-    sleep 1
-done
-logger -s -t $log_label -p local4.info "Checking ntpq for the offset values... Done"
+if [ -e "/dev/rtc" ]; then
+    logger -s -t $log_label -p local4.info "Attempting to sync hardware clock..."
+    ( hwclock --systohc ) </dev/null >/dev/null 2>&1 &
+    disown
+fi
 
 logger -s -t $log_label -p local4.info "Restarting syslog..."
 read -r RSYSLOG_PID </var/run/syslogd.pid 2>/dev/null