From cb561d0d3e099c9850c728416b4a2eeb12f94307 Mon Sep 17 00:00:00 2001
From: lissav <lissav@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Mon, 25 Jan 2010 13:48:20 +0000
Subject: [PATCH]  install xCATSB with xCATsn metapackage so will be removed on
 erase

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5036 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 makexcatsnrpm      | 2 ++
 xCATsn/xCATsn.spec | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/makexcatsnrpm b/makexcatsnrpm
index d893db0ca..9f7f87e11 100755
--- a/makexcatsnrpm
+++ b/makexcatsnrpm
@@ -12,6 +12,7 @@ then
     gzip -f /opt/freeware/src/packages/SOURCES/license.tar
 
     cp xcat.conf /opt/freeware/src/packages/SOURCES
+    cp xCATSN /usr/src/$pkg/SOURCES
     rm -f /opt/freeware/src/packages/SRPMS/xCATsn-$VER*rpm /opt/freeware/src/packages/RPMS/ppc/xCATsn-$VER*rpm
     cd -
 
@@ -30,6 +31,7 @@ else
 	cd `dirname $0`/xCATsn
 	tar --exclude .svn -czf /usr/src/$pkg/SOURCES/license.tar.gz LICENSE.html
 	cp xcat.conf /usr/src/$pkg/SOURCES
+        cp xCATSN /usr/src/$pkg/SOURCES
 	rm -f /usr/src/$pkg/SRPMS/xCATsn-$VER*rpm /usr/src/$pkg/RPMS/*/xCATsn-$VER*rpm
 	cd -
    if [ ! -z "$1" ]; then
diff --git a/xCATsn/xCATsn.spec b/xCATsn/xCATsn.spec
index 89e642585..83e2bf7ae 100644
--- a/xCATsn/xCATsn.spec
+++ b/xCATsn/xCATsn.spec
@@ -71,8 +71,6 @@ if [ "$1" = "1" ]; then #Only if installing for the first time..
 # so conserver will start
  mkdir -p /var/log/consoles
 
-# makes it a service node
-  touch /etc/xCATSN
 # remove any management node file
 if [ -f /etc/xCATMN ]; then
   rm  /etc/xCATMN