From e9d0f104ad9999bacb63911eebcaecb527a386e8 Mon Sep 17 00:00:00 2001
From: linggao <linggao@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Wed, 1 Oct 2008 16:08:51 +0000
Subject: [PATCH] changed spec files to use the new command xcatstart to
 restart the xcatd on AIX

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@2271 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-rmc/xCAT-rmc.spec       | 9 +++++++++
 xCAT-server/xCAT-server.spec | 7 +------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/xCAT-rmc/xCAT-rmc.spec b/xCAT-rmc/xCAT-rmc.spec
index 656ee794a..986d5a24e 100644
--- a/xCAT-rmc/xCAT-rmc.spec
+++ b/xCAT-rmc/xCAT-rmc.spec
@@ -55,4 +55,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 
+%post
+%ifos linux
+  if [ -f "/proc/cmdline" ]; then   # prevent running it during install into chroot image
+    /etc/init.d/xcatd restart
+  fi
+%else
+  #restart the xcatd
+  $XCATROOT/sbin/xcatstart
+%endif
 
diff --git a/xCAT-server/xCAT-server.spec b/xCAT-server/xCAT-server.spec
index cedff19f2..105684e00 100644
--- a/xCAT-server/xCAT-server.spec
+++ b/xCAT-server/xCAT-server.spec
@@ -161,12 +161,7 @@ fi
 if [ "$1" -gt "1" ]; then #only on upgrade for AIX...
     #migration issue for monitoring
     XCATROOT=$RPM_INSTALL_PREFIX0 $RPM_INSTALL_PREFIX0/sbin/chtab filename=monitorctrl.pm notification -d 
-    #restart the xcatd
-    pids=`ps xww |grep xcatd|grep -v grep|cut -c1-7`
-    if [ ! -z "$pids" ]; then
-      kill $pids
-    fi
-    $XCATROOT/sbin/xcatd&
+    $XCATROOT/sbin/xcatstart
 fi  
 %endif