xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-18 12:20:40 +00:00
Code Issues Releases Wiki Activity

fix defect4713, Postscript mlnxofed_ib_install assumes env ending with ofed, which is not always true

Browse Source
This commit is contained in:
huweihua
2015-06-25 03:12:14 -04:00
parent 2fab20c5f6
commit b672bd67ce
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
xCAT-server/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install
View File

@ -163,8 +163,10 @@ deb http://91.189.88.140/ubuntu-ports/ trusty-updates universe" >> /etc/apt/sour
# Being called from <image>.postinstall script
# Assume we are on the same machine
if [[ $OS == sles* ]] || [[ $OS == suse* ]] || [[ -f /etc/SuSE-release ]]; then
mkdir $installroot/tmp/ofed_install
cp -r $OFED_DIR/ $installroot/tmp/ofed_install/
#mkdir $installroot/tmp/ofed_install
#cp -r $OFED_DIR/ $installroot/tmp/ofed_install/
mkdir -p $installroot/tmp/ofed_install/ofed
( cd "$OFED_DIR" && tar cf - . ) | ( cd "$installroot/tmp/ofed_install/ofed" && tar xf - )
#mount -t devtmpfs /dev $installroot/dev/
#mount -t sysfs /sys $installroot/sys
#mount -t proc /proc $installroot/proc
@ -182,8 +184,10 @@ deb http://91.189.88.140/ubuntu-ports/ trusty-updates universe" >> /etc/apt/sour
elif [ -f /etc/os-release ] &&
cat /etc/os-release |grep NAME|grep Ubuntu>/dev/null; then
mkdir $installroot/tmp/ofed_install
cp -r $OFED_DIR/ $installroot/tmp/ofed_install/
#mkdir $installroot/tmp/ofed_install
#cp -r $OFED_DIR/ $installroot/tmp/ofed_install/
mkdir -p $installroot/tmp/ofed_install/ofed
( cd "$OFED_DIR" && tar cf - . ) | ( cd "$installroot/tmp/ofed_install/ofed" && tar xf - )
nodename=`hostname`
echo "$nodename 's operating system is Ubuntu."
@ -266,8 +270,10 @@ deb http://91.189.88.140/ubuntu-ports/ trusty-updates universe" >> $sourceslist
umount $installroot/sys/
else
mkdir $installroot/tmp/ofed_install
cp -r $OFED_DIR/ $installroot/tmp/ofed_install/
#mkdir $installroot/tmp/ofed_install
#cp -r $OFED_DIR/ $installroot/tmp/ofed_install/
mkdir -p $installroot/tmp/ofed_install/ofed
( cd "$OFED_DIR" && tar cf - . ) | ( cd "$installroot/tmp/ofed_install/ofed" && tar xf - )
chroot $installroot rpm -e --nodeps --allmatches libibverbs 2>/dev/null
#chroot $installroot perl -x /tmp/ofed_install/ofed/mlnxofedinstall --without-32bit --force
chroot $installroot perl -x /tmp/ofed_install/ofed/mlnxofedinstall $mlnxofed_options