minor updates to postscripts to not process when errors

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6270 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
mellor 2010-05-30 02:21:43 +00:00
parent f8c5fc5de1
commit 412a728897
2 changed files with 8 additions and 3 deletions

View File

@ -42,11 +42,14 @@ if [ $OS != "AIX" ]; then
rm -f -R /tmp/gpfs_updates/*
cd /tmp/gpfs_updates
wget -l inf -N -r --waitretry=10 --random-wait --retry-connrefused -t 10 -T 60 -nH --cut-dirs=3 ftp://$SITEMASTER/$UPDATES_DIR/*.rpm 2> /tmp/wget.log
rpm -Uvh *.rpm
if [ -n "`ls *.rpm 2> /dev/null`" ] ; then
rpm -Uvh *.rpm
fi
rm -f -R /tmp/gpfs_updates
fi
if [ $NODESETSTATE == "genimage" ]; then
if [ -d $INSTALL_DIR/$UPDATES_DIR ] ; then
# Being called from <image>.postinstall script
# Assume we are on the same machine
if [[ $OS = sles* ]] || [[ $OS = suse* ]] || [[ -f /etc/SuSE-release ]]; then
@ -59,7 +62,7 @@ if [ $OS != "AIX" ]; then
# For Redhat, etc., assume yum is available on the system running genimage
yum --installroot $installroot --nogpgcheck localupdate $INSTALL_DIR/$UPDATES_DIR/*.rpm
fi
fi
fi
fi

View File

@ -42,7 +42,9 @@ if [ $OS != "AIX" ]; then
cd /tmp/pe
download_dir=`echo $PE_DIR | cut -d '/' -f3-`
wget -l inf -N -r --waitretry=10 --random-wait --retry-connrefused -t 10 -T 60 -nH --cut-dirs=5 ftp://$SITEMASTER/$download_dir/*.rpm 2> /tmp/wget.log
rpm -Uvh IBM_pe_license*.rpm
if [ -f /opt/ibmhpc/install/sbin/accept_ppe_license.sh ] ; then
rpm -Uvh IBM_pe_license*.rpm
fi
IBM_PE_LICENSE_PROMPT=N /opt/ibmhpc/install/sbin/accept_ppe_license.sh
rpm -Uvh --force ibm_lapi*.rpm ibm_pe*.rpm ppe_*.rpm
cd /