From 2d27aa8554376939ad9be6a554aa4d0f60762a53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=E1=B4=8F=C9=B4=C9=A2=20Jie?= <gongjie@linux.vnet.ibm.com>
Date: Mon, 20 Aug 2018 10:21:40 +0800
Subject: [PATCH] Hide the `command "chronyd" not found' error message. And
 pass the $MASTER environment variable to setupntp.traditional (#5520)

---
 xCAT/postscripts/setupntp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/xCAT/postscripts/setupntp b/xCAT/postscripts/setupntp
index cd8207c87..22dbca662 100755
--- a/xCAT/postscripts/setupntp
+++ b/xCAT/postscripts/setupntp
@@ -125,11 +125,7 @@ then
 	esac
 fi
 
-# Unset xCAT passed environment variables
-unset MASTER
-unset NTPSERVERS
-
-check_executes chronyd || USE_NTPD="yes"
+check_executes chronyd >/dev/null 2>&1 || USE_NTPD="yes"
 
 if [ -n "${USE_NTPD}" ]
 then
@@ -140,6 +136,10 @@ then
 	exit 255
 fi
 
+# Unset xCAT passed environment variables
+unset MASTER
+unset NTPSERVERS
+
 check_exec_or_exit cp cat logger
 check_exec_or_exit systemctl timedatectl hwclock