this code change is for the changes in Postage -- put the OSPKGDIR attribute in the /xcatpost/mypostscript firstly. To support ospkgs enhancements to install/upgrade OS packages from Updates, it still needs some code changes in ospkgs.

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@13324 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jjhua 2012-07-20 09:55:45 +00:00
parent 00ac099deb
commit 4ac9f2e224

View File

@ -92,28 +92,35 @@ if [ -z "$OSPKGDIR" ]; then
else
OSPKGDIR="$NFSSERVER/$OSVER/$ARCH"
fi
if ( pmatch "$OSVER" "sles*" ); then
OSPKGDIR="$OSPKGDIR/1"
elif ( pmatch "$OSVER" "rhel*" ); then
OSPKGDIR="$OSPKGDIR/Server"
elif ( pmatch "$OSVER" "SL*" ); then
OSPKGDIR="$OSPKGDIR/SL"
else
if [ $mounted -eq 0 ]; then
OSPKGDIR="$NFSSERVER$OSPKGDIR"
fi
fi
if ( pmatch "$OSVER" "sles*" ); then
OSPKGDIR="$OSPKGDIR/1"
elif ( pmatch "$OSVER" "rhel*" ); then
OSPKGDIR="$OSPKGDIR/Server"
elif ( pmatch "$OSVER" "SL*" ); then
OSPKGDIR="$OSPKGDIR/SL"
fi
if [ "$SDKDIR" != "" ]; then
if [ $mounted -eq 0 ]; then
SDKDIR="$NFSSERVER/$SDKDIR"
fi
fi
if [ $mounted -eq 0 ]; then
OSPKGDIR_NO_PREFIX=${OSPKGDIR#$INSTALLDIR}
#if [ $mounted -eq 0 ]; then
# OSPKGDIR_NO_PREFIX=${OSPKGDIR#$INSTALLDIR}
if [ "$OSPKGDIR" != "$OSPKGDIR_NO_PREFIX" ]; then
OSPKGDIR="$NFSSERVER/$OSPKGDIR_NO_PREFIX"
fi
fi
# if [ "$OSPKGDIR" != "$OSPKGDIR_NO_PREFIX" ]; then
# OSPKGDIR="$NFSSERVER/$OSPKGDIR_NO_PREFIX"
# fi
#fi
logger -t xcat -p local4.info "NFSSERVER=$NFSSERVER"
logger -t xcat -p local4.info "OSPKGDIR=$OSPKGDIR"