arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix for defect 3405955: Fix bashisms in setupntp.

Browse Source 
Checking in on behalf of coworker Leonardo Tonetto (leont@br.ibm.com).


git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@10470 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
ericagar 2011-09-08 03:22:49 +00:00
parent fe33c68cee
commit 5c9ce99d14
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
xCAT/postscripts/setupntp
View File

@ -11,13 +11,25 @@ sitemaster=$SITEMASTER
conf_file="/etc/ntp.conf"
conf_file_org="/etc/ntp.conf.org"
conf_file_backup="/etc/ntp.conf.postbackup"
# pmatch determines if 1st argument string is matched by 2nd argument pattern
pmatch ()
{
case $1 in
$2) return 0;; # zero return code means string matched by pattern
esac
return 1 # non-zero return code means string not matched by pattern
}
logger -t xcat "Install: Setup NTP"
# if master is the sitemaster, then use the ntpservers defined in the site
# table, if they exist. If they don't exist, do not setup ntp
# else use the master which should be a service node
if [ "$master" == "$sitemaster" ]; then
if [ "$master" = "$sitemaster" ]; then
if [ $NTPSERVERS ]; then
if [ "$NODESETSTATE" == "statelite" ]; then
if [ "$NODESETSTATE" = "statelite" ]; then
cp -a $conf_file $conf_file_org
echo "" > $conf_file
else
@ -38,7 +50,7 @@ if [ "$master" == "$sitemaster" ]; then
fi
else
if [ "$NODESETSTATE" == "statelite" ]; then
if [ "$NODESETSTATE" = "statelite" ]; then
cp -a $conf_file $conf_file_org
echo "" > $conf_file
else
@ -51,8 +63,8 @@ else
echo "server $master" >$conf_file
fi
if [[ $OSTYPE = linux* ]]; then
OS_TYPE=`uname`
if [ $OS_TYPE = Linux ]; then
mkdir -p /var/lib/ntp
chown ntp /var/lib/ntp
echo "driftfile /var/lib/ntp/drift
@ -61,14 +73,14 @@ restrict 127.0.0.1" >>$conf_file
# default service for redhat/fedora
SERVICE=ntpd
echo $SERVICE
if [[ $OSVER = sles* ]] || [[ $OSVER = suse* ]] || [[ -f /etc/SuSE-release ]]; then
if ( pmatch $OSVER "sles*" ) || ( pmatch $OSVER "suse*" ) || [ -f /etc/SuSE-release ] || ( pmatch $OSVER "ubuntu*" ); then
SERVICE=ntp
fi
#service ntpd restart
service $SERVICE stop
#ntpdate program is deprecated on SuSE
if [[ $OSVER = sles* ]] || [[ $OSVER = suse* ]] || [[ -f /etc/SuSE-release ]]; then
if ( pmatch $OSVER "sles*" ) || ( pmatch $OSVER "suse*" ) || [ -f /etc/SuSE-release ]; then
logger -t xcat "ntpd -q -g"
ntpd -q -g
if [ "$?" != "0" ]