From c454f53c75e3de9b0291e0836afb336687147b70 Mon Sep 17 00:00:00 2001
From: immarvin <immarvin@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 19 Jul 2012 07:08:53 +0000
Subject: [PATCH] download rmcmon resource and scripts with http instead of ftp

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.7@13317 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-rmc/scripts/configrmcnode | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/xCAT-rmc/scripts/configrmcnode b/xCAT-rmc/scripts/configrmcnode
index b1eb67795..7437ae9e1 100755
--- a/xCAT-rmc/scripts/configrmcnode
+++ b/xCAT-rmc/scripts/configrmcnode
@@ -178,7 +178,14 @@ if [ $ADD -eq 1 ]; then
   if [[ -z "$NFSSERVER" ]]; then
     NFSSERVER=$MASTER
   fi
-  
+ 
+  if [ -f /opt/xcat/xcatinfo ]; then
+    INSTALLDIR=`grep 'INSTALLDIR' /opt/xcat/xcatinfo |cut -d= -f2`
+  fi
+  if [ -z "$INSTALLDIR" ]; then
+    INSTALLDIR="/install"
+  fi
+ 
   nodetype="node"
   if [[ $NTYPE = service ]]; then
       nodetype=sn
@@ -187,19 +194,12 @@ if [ $ADD -eq 1 ]; then
   mkdir -p /var/xcat/rmcmon
   rm -f -R /var/xcat/rmcmon/*
   if [[ $OSTYPE = linux* ]]; then
-      mkdir -p /tmp/postage/rmcmon/scripts
-      mkdir -p /tmp/postage/rmcmon/resources/$nodetype
-      rm -f -R /tmp/postage/rmcmon/scripts/*
-      rm -f -R /tmp/postage/rmcmon/resources/$nodetype/*
-      cd /tmp/postage/rmcmon/scripts
-      wget -l inf -N -r --waitretry=10 --random-wait --retry-connrefused -t 0 -T 60 ftp://$NFSSERVER/postscripts/rmcmon/scripts 2> /tmp/wget.log
-      cd /tmp/postage/rmcmon/resources/$nodetype
-      wget -l inf -N -r --waitretry=10 --random-wait --retry-connrefused -t 0 -T 60 ftp://$NFSSERVER/postscripts/rmcmon/resources/$nodetyp 2> /tmp/wget.log
-      mv $NFSSERVER/postscripts/rmcmon/* /var/xcat/rmcmon;
-      rm -rf $NFSSERVER
-	  cd /tmp/postage/rmcmon/scripts
-	  mv $NFSSERVER/postscripts/rmcmon/* /var/xcat/rmcmon/;
-      rm -rf $NFSSERVER
+      mkdir -p /tmp/postage/
+      rm -f -R /tmp/postage/rmcmon/*
+      wget -l inf -N -r --waitretry=10 --random-wait --retry-connrefused -t 0 -T 60 -nH --cut-dirs=2 --reject "index.html*" --no-parent http://$NFSSERVER$INSTALLDIR/postscripts/rmcmon/scripts -P /tmp/postage/ 2> /tmp/wget.log
+      wget -l inf -N -r --waitretry=10 --random-wait --retry-connrefused -t 0 -T 60 -nH --cut-dirs=2 --reject "index.html*" --no-parent http://$NFSSERVER$INSTALLDIR/postscripts/rmcmon/resources/$nodetyp -P /tmp/postage/ 2> /tmp/wget.log
+      mv /tmp/postage/rmcmon/* /var/xcat/rmcmon;
+      rm -rf /tmp/postage/rmcmon/
   else
       mkdir -p /xcatmnt
       if [[ $USENFSV4ONAIX = yes ]] || [[ $USENFSV4ONAIX = 1 ]] || [[ $USENFSV4ONAIX = Yes ]] || [[ $USENFSV4ONAIX = YES ]] || [[ $USENFSV4ONAIX = Y ]] || [[ $USENFSV4ONAIX = y ]]; then