From aa6fddabd07bfc964231dbdcc2936306531d7612 Mon Sep 17 00:00:00 2001 From: linggao Date: Thu, 8 Mar 2012 00:13:00 +0000 Subject: [PATCH] fixed otherpkgs postscript for the case when wget has to be used. It has been broken for a long time. git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@11786 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT/postscripts/otherpkgs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xCAT/postscripts/otherpkgs b/xCAT/postscripts/otherpkgs index f65d60918..a83be9ea0 100755 --- a/xCAT/postscripts/otherpkgs +++ b/xCAT/postscripts/otherpkgs @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh # IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html #------------------------------------------------------------------------------- @@ -581,6 +581,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 + cd /tmp/postage/$NFSSERVER$INSTALLDIR mv $dir_no_ftproot/* /xcatpost/$dir_no_ftproot; rm -rf $dir_no_ftproot cd /xcatpost/$dir_no_ftproot @@ -598,7 +599,7 @@ while [ $op_index -le $OTHERPKGS_INDEX ]; do if [ $mounted -eq 0 ]; then cd /xcatpost - dir_no_ftproot=${OTHERPKGDIR#$INSTALLDIR/} + dir_no_ftproot=${OTHERPKGDIR#*$INSTALLDIR/} dir_no_ftproot=${dir_no_ftproot%%/*} rm -f -R $dir_no_ftproot fi