From 13b96e9af6e701c7111a4c1025ce8b4fe61b7614 Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Mon, 20 Feb 2012 19:38:44 +0000
Subject: [PATCH] Fix problems with otherpkgs seen in IC test process with
 plain_pkgs

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@11643 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT/postscripts/otherpkgs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xCAT/postscripts/otherpkgs b/xCAT/postscripts/otherpkgs
index 4666be1f8..4bfca87c3 100755
--- a/xCAT/postscripts/otherpkgs
+++ b/xCAT/postscripts/otherpkgs
@@ -574,7 +574,7 @@ while [ $op_index -le $OTHERPKGS_INDEX ]; do
     #Handle the rest with rpm
     if [ "$plain_pkgs" != "" ]; then 
         if [ $mounted -eq 0 ]; then
-	    dir_no_ftproot=${OTHERPKGDIR#$INSTALLDIR/}
+	    dir_no_ftproot=${OTHERPKGDIR#*$INSTALLDIR/}
             mkdir -p /xcatpost/$dir_no_ftproot 
             rm -f -R /xcatpost/$dir_no_ftproot/*
             mkdir -p /tmp/postage/
@@ -584,7 +584,7 @@ while [ $op_index -le $OTHERPKGS_INDEX ]; do
 	    wget -l inf -N -r --waitretry=10 --random-wait --retry-connrefused -t 0 -T 60 --reject "index.html*" --no-parent http://$OTHERPKGDIR/ 2> /tmp/wget.log  
     
             mv $dir_no_ftproot/* /xcatpost/$dir_no_ftproot; 
-            rm -rf $NFSSERVER
+            rm -rf $dir_no_ftproot
             cd /xcatpost/$dir_no_ftproot
         else
             cd $OTHERPKGDIR