From 37be3cd9d76f1274e3679b60fec734321413e2c7 Mon Sep 17 00:00:00 2001
From: ligc <liguangc@cn.ibm.com>
Date: Thu, 2 Jan 2014 14:38:09 +0800
Subject: [PATCH] do not use nodels --version in /etc/init.d/xcatd

---
 xCAT-server/etc/init.d/xcatd | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/xCAT-server/etc/init.d/xcatd b/xCAT-server/etc/init.d/xcatd
index 7f69e19e1..cce484a74 100755
--- a/xCAT-server/etc/init.d/xcatd
+++ b/xCAT-server/etc/init.d/xcatd
@@ -76,7 +76,12 @@ restart)
   fi
   $STATUS > /dev/null 2>&1
   if [ "$?" = "0" ]; then
-    ver=`nodels --version`
+    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
@@ -90,7 +95,12 @@ reload)
   fi
   $STATUS > /dev/null 2>&1
   if [ "$?" = "0" ]; then
-    ver=`nodels --version`
+    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