From f5437609d44aba15a7a3f0b3933d5b01593c11ca Mon Sep 17 00:00:00 2001
From: yangsong <immarvin@users.noreply.github.com>
Date: Thu, 23 Nov 2017 03:56:01 -0600
Subject: [PATCH] do not set exit_code to 1 when the clock is not synced before
 the timeout (#4362)

---
 xCAT/postscripts/setupntp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/xCAT/postscripts/setupntp b/xCAT/postscripts/setupntp
index e690a701b..90b0e223e 100755
--- a/xCAT/postscripts/setupntp
+++ b/xCAT/postscripts/setupntp
@@ -116,11 +116,14 @@ if [ $OS_TYPE = Linux ]; then
          stopservice ntpserver
     fi
 
-    logger -t xcat "setting current time"
+    msg='syncing the clock ...'
+    logger -t xcat $msg 
+    echo $msg
     if ! timeout 120 ntpd -gq  > /dev/null 2>&1 ; then
         if ! ntpdate -t5 $master > /dev/null 2>&1; then
-            logger -t xcat "WARNING: NTP Sync Failed!!"
-            exit_code=1
+            msg='WARNING: NTP Sync Failed before timeout. ntp server will try to sync...'
+            logger -t xcat $msg
+            echo $msg
         fi
     fi