From 887266cc70e634761eaf5483f26831437504565e Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Wed, 8 Aug 2012 21:03:25 +0000
Subject: [PATCH] First pass at masking stock init script from FSM

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@13459 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/xCAT-server.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/xCAT-server/xCAT-server.spec b/xCAT-server/xCAT-server.spec
index 65b04c088..a56760197 100644
--- a/xCAT-server/xCAT-server.spec
+++ b/xCAT-server/xCAT-server.spec
@@ -270,8 +270,12 @@ rm $RPM_BUILD_ROOT/%{prefix}/sbin/xcat_traphandler
 
 cp lib/xcat/shfunctions $RPM_BUILD_ROOT/%{prefix}/lib
 chmod 644 $RPM_BUILD_ROOT/%{prefix}/lib/shfunctions
+%if %fsm
+%else
+echo "ScriptAlias /xcatws %{prefix}/ws/xcatws.cgi" > $RPM_BUILD_ROOT/etc/apache2/conf.d/xcat-ws.conf
 mkdir -p $RPM_BUILD_ROOT/etc/init.d
 cp etc/init.d/xcatd $RPM_BUILD_ROOT/etc/init.d
+%endif
 #TODO: the next has to me moved to postscript, to detect /etc/xcat vs /etc/opt/xcat
 mkdir -p $RPM_BUILD_ROOT/etc/xcat
 cp etc/xcat/postscripts.rules $RPM_BUILD_ROOT/etc/xcat/
@@ -305,9 +309,9 @@ rm -rf $RPM_BUILD_ROOT
 #%doc LICENSE.html
 %{prefix}
 /etc/xcat
-/etc/init.d/xcatd
 %if %fsm
 %else
+/etc/init.d/xcatd
 /etc/apache2/conf.d/xcat-ws.conf
 /etc/httpd/conf.d/xcat-ws.conf
 %endif