From 2aeb8737cd8222e51fa079fe872c4a60529b4439 Mon Sep 17 00:00:00 2001
From: linggao <linggao@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Sun, 9 Nov 2008 00:15:30 +0000
Subject: [PATCH] fix problems in xCAT-rmc.spec file so that xcatd will not get
 started if xCAT or xCATsn is not install yet

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@2482 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-rmc/xCAT-rmc.spec | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/xCAT-rmc/xCAT-rmc.spec b/xCAT-rmc/xCAT-rmc.spec
index 61a2ef91b..f37c2e805 100644
--- a/xCAT-rmc/xCAT-rmc.spec
+++ b/xCAT-rmc/xCAT-rmc.spec
@@ -58,11 +58,27 @@ rm -rf $RPM_BUILD_ROOT
 %post
 %ifos linux
   if [ -f "/proc/cmdline" ]; then   # prevent running it during install into chroot image
-    /etc/init.d/xcatd restart
+    tmp=`rpm -q xCAT`
+    if [ $? -eq 0 ]; then
+      /etc/init.d/xcatd restart
+    else 
+      tmp=`rpm -q xCATsn`
+      if [ $? -eq 0 ]; then
+        /etc/init.d/xcatd restart
+      fi
+    fi
   fi
 %else
-  #restart the xcatd
-  XCATROOT=$RPM_INSTALL_PREFIX0 $RPM_INSTALL_PREFIX0/sbin/xcatstart
+  #restart the xcatd on if xCAT or xCATsn is installed already
+  tmp=`rpm -q xCAT`
+  if [ $? -eq 0 ]; then
+    XCATROOT=$RPM_INSTALL_PREFIX0 $RPM_INSTALL_PREFIX0/sbin/xcatstart
+  else 
+    tmp=`rpm -q xCATsn`
+    if [ $? -eq 0 ]; then
+      XCATROOT=$RPM_INSTALL_PREFIX0 $RPM_INSTALL_PREFIX0/sbin/xcatstart
+    fi
+  fi
 %endif