From c5fea87cfd8cfa00f523912b0424e11650a3e24e Mon Sep 17 00:00:00 2001
From: mxi1 <mxi1@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Wed, 2 Jun 2010 06:50:38 +0000
Subject: [PATCH] for defect 2979871, if NODESETSTATE=statelite, we will use
"cp -a" and "echo '' " to emulate "rm -f" action
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6303 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
xCAT/postscripts/setupntp | 33 +++++++++++++++++++--------------
1 file changed, 19 insertions(+), 14 deletions(-)
diff --git a/xCAT/postscripts/setupntp b/xCAT/postscripts/setupntp
index 082ca870a..fdb4fa235 100755
--- a/xCAT/postscripts/setupntp
+++ b/xCAT/postscripts/setupntp
@@ -17,13 +17,15 @@ logger -t xcat "Install: Setup NTP"
# else use the master which should be a service node
if [ "$master" == "$sitemaster" ]; then
if [ $NTPSERVERS ]; then
- if [ ! -f $conf_file_org ]; then
- mv -f $conf_file $conf_file_org
+ if [ "$NODESETSTATE" == "statelite" ]; then
+ cp -a $conf_file $conf_file_org
+ echo "" > $conf_file
else
- # mv can't work on statelite node
- # "cp" and "empty" is used to simulate
- cp -a $conf_file $conf_file_backup
- echo "" > $conf_file
+ if [ ! -f $conf_file_org ]; then
+ mv -f $conf_file $conf_file_org
+ else
+ mv -f $conf_file $conf_file_backup
+ fi
fi
for i in $(echo $NTPSERVERS | tr ',' ' ')
do
@@ -36,14 +38,17 @@ if [ "$master" == "$sitemaster" ]; then
fi
else
- if [ ! -f $conf_file_org ]; then
- mv -f $conf_file $conf_file_org
- else
- cp -a $conf_file $conf_file_backup
- echo "" > $conf_file
- fi
- echo "server $master" >$conf_file
-
+ if [ "$NODESETSTATE" == "statelite" ]; then
+ cp -a $conf_file $conf_file_org
+ echo "" > $conf_file
+ else
+ if [ ! -f $conf_file_org ]; then
+ mv -f $conf_file $conf_file_org
+ else
+ mv -f $conf_file $conf_file_backup
+ fi
+ fi
+ echo "server $master" >$conf_file
fi