From ac08846b6c0749dde4aad9c5b7c6ec9facc76297 Mon Sep 17 00:00:00 2001
From: vallard <vallard@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 1 Nov 2007 19:51:02 +0000
Subject: [PATCH] added the chkconfig nfs and httpd on and fixed mkrpm to copy
 xcat.conf http config.

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@33 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT/mkrpm     | 1 +
 xCAT/xCAT.spec | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/xCAT/mkrpm b/xCAT/mkrpm
index 0d331d4e4..e46f5de46 100755
--- a/xCAT/mkrpm
+++ b/xCAT/mkrpm
@@ -2,6 +2,7 @@ cd `dirname $0`
 tar --exclude .svn -czvf postscripts.tar.gz  postscripts LICENSE.html
 tar --exclude .svn -czvf templates.tar.gz templates
 mv -f *.gz /usr/src/redhat/SOURCES
+cp xcat.conf /usr/src/redhat/SOURCES
 rpmbuild -ba xCAT.spec 
 cd -
 
diff --git a/xCAT/xCAT.spec b/xCAT/xCAT.spec
index 9e3d3ee23..406e05fc8 100644
--- a/xCAT/xCAT.spec
+++ b/xCAT/xCAT.spec
@@ -63,6 +63,7 @@ if [ "$1" = "1" ]; then #Only if installing for the fist time..
     if ! grep /install /etc/exports; then
         echo '/install *(ro,no_root_squash,sync)' >> /etc/exports #SECURITY: this has potential for sharing private host/user keys
         service nfs restart
+	chkconfig nfs on
     fi
     if [ ! -r /etc/xcat/site.sqlite ]; then 
       chtab key=xcatdport site.value=3001
@@ -95,6 +96,7 @@ if [ "$1" = "1" ]; then #Only if installing for the fist time..
     makenetworks
     chtab key=nameservers site.value=`grep nameserver /etc/resolv.conf|awk '{printf $2 ","}'|sed -e s/,$//`
     service httpd restart
+    chkconfig httpd on
     echo "xCAT is now installed, it is recommended to tabedit networks and set a dynamic ip address range on any networks where nodes are to be discovered"
     echo "Then, run makedhcp -n to create a new dhcpd.configuration file, and /etc/init.d/dhcpd restart"
     echo "Either examine sample configuration templates, or write your own, or specify a value per node with nodeadd or tabedit."