From 18308688bfb1aa74fa043bccf41e11bc2e792e72 Mon Sep 17 00:00:00 2001
From: GONG Jie <gongjie@linux.vnet.ibm.com>
Date: Wed, 31 Aug 2016 16:36:20 +0800
Subject: [PATCH] Fix github issue #1591

---
 xCAT-genesis-scripts/bin/doxcat | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/xCAT-genesis-scripts/bin/doxcat b/xCAT-genesis-scripts/bin/doxcat
index 73f16b081..794e57534 100755
--- a/xCAT-genesis-scripts/bin/doxcat
+++ b/xCAT-genesis-scripts/bin/doxcat
@@ -274,14 +274,17 @@ logger -s -t $log_label -p local4.info "Acquired IPv4 address on $bootnic"
 
 ip addr show dev $bootnic|grep -v 'scope link'|grep -v 'dynamic'|grep -v  inet6|grep inet|awk '{print $2}'
 ntpd -g -x
+
+if [ -e "/dev/rtc" ]; then
+    ( sleep 8 ; hwclock --systohc ) </dev/null >/dev/null 2>&1 &
+    disown
+fi
+
 # rv 0 state does not work with the new ntp versions
-while [ "`ntpq -c \"rv 0 offset\" | grep \"offset=\" | awk -F \"=\" '{print $2}' | awk -F \".\" '{print $1}' | sed s/-//`" -ge 1000 ]; do 
+while [ "`ntpq -c 'rv 0 offset' | awk -F '=' '/offset=/ { print $2 }' | awk -F '.' '{ print $1 }' | sed s/-//`" -ge 1000 ]; do 
     sleep 1
 done
 
-if [ -e "/dev/rtc" ]; then
-    hwclock --systohc
-fi
 HOST_ARCH=`uname -m`
 if echo $HOST_ARCH | grep "ppc64"; then
     modprobe ipmi_powernv