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

Merge branch '2.8' of ssh://git.code.sf.net/p/xcat/xcat-core into 2.8

Browse Source
This commit is contained in:
lissav 2014-01-08 11:11:44 -05:00
commit 1caaf17eb2
1 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,18 +73,6 @@ restart)
echo -n "Restarting xCATd "
if [ -r /etc/profile.d/xcat.sh ]; then
. /etc/profile.d/xcat.sh
fi
$STATUS > /dev/null 2>&1
if [ "$?" = "0" ]; then
if [ ! -z $XCATROOT ]; then
XCATLIBPATH="$XCATROOT/lib/perl"
else
XCATLIBPATH="/opt/xcat/lib/perl"
fi
ver=`perl -I $XCATLIBPATH -mxCAT::Version -e 'print xCAT::Version::Version()'`
if [ "$ver" \< "Version 2.6" ]; then # force to stop xcatd first when update from version earlier than 2.6
$0 stop
fi
fi
xcatd -p /var/run/xcatd.pid && $LOG_SUCCESS || $LOG_FAILURE
;;
@ -93,18 +81,6 @@ reload)
if [ -r /etc/profile.d/xcat.sh ]; then
. /etc/profile.d/xcat.sh
fi
$STATUS > /dev/null 2>&1
if [ "$?" = "0" ]; then
if [ ! -z $XCATROOT ]; then
XCATLIBPATH="$XCATROOT/lib/perl"
else
XCATLIBPATH="/opt/xcat/lib/perl"
fi
ver=`perl -I $XCATLIBPATH -mxCAT::Version -e 'print xCAT::Version::Version()'`
if [ "$ver" \< "Version 2.6" ]; then # force to stop xcatd first when update from version earlier than 2.6
$0 stop
fi
fi
export XCATRELOAD=yes
xcatd -p /var/run/xcatd.pid && $LOG_SUCCESS || $LOG_FAILURE
;;