xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-10-31 19:32:31 +00:00
Code Issues Releases Wiki Activity

Fix for defect 3393291: Fix bashisms in /etc/init.d/xcatd

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@10310 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
ericagar
2011-08-17 19:42:11 +00:00
parent 07bc66dcb4
commit bb376d4928
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
xCAT-server/etc/init.d/xcatd
View File

@@ -37,7 +37,7 @@ RHFailure()
}
MStatus()
{
ps ax|grep -v grep|grep xcatd: >& /dev/null
ps ax|grep -v grep|grep xcatd: > /dev/null 2>&1
if [ "$?" = "0" ]; then
RVAL=0
echo "xCAT service is running"
@@ -74,8 +74,8 @@ restart)
if [ -r /etc/profile.d/xcat.sh ]; then
. /etc/profile.d/xcat.sh
fi
$STATUS >& /dev/null
if [ "$?" == "0" ]; then
$STATUS > /dev/null 2>&1
if [ "$?" = "0" ]; then
if ! nodels --version |grep -q 'Version 2.6'; then #upgrade or downgrade from another major release, stop it just in case
$0 stop
fi
@@ -87,8 +87,8 @@ reload)
if [ -r /etc/profile.d/xcat.sh ]; then
. /etc/profile.d/xcat.sh
fi
$STATUS >& /dev/null
if [ "$?" == "0" ]; then
$STATUS > /dev/null 2>&1
if [ "$?" = "0" ]; then
if ! nodels --version |grep -q 'Version 2.6'; then #upgrade or downgrade from another major release, stop it just in case
$0 stop
fi
@@ -101,25 +101,25 @@ status)
;;
stop)
echo -n "Stopping xCATd "
$STATUS >& /dev/null
$STATUS > /dev/null 2>&1
if [ "$?" != "0" ]; then
echo -n "xCATd not running, not stopping "
$LOG_WARNING
exit 0
fi
kill -TERM -`cat /var/run/xcatd.pid`
let i=0;
while $STATUS >& /dev/null && [ $i -lt 15 ]; do
usleep 100000
let i=i+1
i=0;
while $STATUS > /dev/null 2>&1 && [ $i -lt 15 ]; do
sleep .1
i=$((i+1))
done
$STATUS >& /dev/null
if [ "$?" == "0" ]; then
$STATUS > /dev/null 2>&1
if [ "$?" = "0" ]; then
kill -KILL -`cat /var/run/xcatd.pid`
fi
usleep 100000
$STATUS >& /dev/null
if [ "$?" == "0" ]; then
sleep .1
$STATUS > /dev/null 2>&1
if [ "$?" = "0" ]; then
$LOG_FAILURE
exit 0
fi
@@ -127,8 +127,8 @@ stop)
rm /var/run/xcatd.pid
;;
start)
$STATUS >& /dev/null
if [ "$?" == "0" ]; then
$STATUS > /dev/null 2>&1
if [ "$?" = "0" ]; then
echo -n "xCATd already running "
$LOG_WARNING
exit