From c0d7a0fd4964eb75d02f00a7968b67f6967d99e1 Mon Sep 17 00:00:00 2001
From: linggao <linggao@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 11 Dec 2008 16:08:45 +0000
Subject: [PATCH] fixed rpm installation error
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@2541 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
xCAT-rmc/xCAT-rmc.spec | 16 ++--------------
1 file changed, 2 insertions(+), 14 deletions(-)
diff --git a/xCAT-rmc/xCAT-rmc.spec b/xCAT-rmc/xCAT-rmc.spec
index f37c2e805..722aeee4f 100644
--- a/xCAT-rmc/xCAT-rmc.spec
+++ b/xCAT-rmc/xCAT-rmc.spec
@@ -58,26 +58,14 @@ rm -rf $RPM_BUILD_ROOT
%post
%ifos linux
if [ -f "/proc/cmdline" ]; then # prevent running it during install into chroot image
- tmp=`rpm -q xCAT`
- if [ $? -eq 0 ]; then
+ if [ -f $RPM_INSTALL_PREFIX0/sbin/xcatd ]; 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 on if xCAT or xCATsn is installed already
- tmp=`rpm -q xCAT`
- if [ $? -eq 0 ]; then
+ if [ -f $RPM_INSTALL_PREFIX0/sbin/xcatd ]; 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