diff --git a/docs/source/advanced/networks/infiniband/index.rst b/docs/source/advanced/networks/infiniband/index.rst
index cb92a7045..8bda17a81 100644
--- a/docs/source/advanced/networks/infiniband/index.rst
+++ b/docs/source/advanced/networks/infiniband/index.rst
@@ -7,7 +7,7 @@ xCAT has the ability to help with Mellanox InfiniBand (IB) adapter installation
 .. toctree::
    :maxdepth: 2
 
-   mlnxofed_ib_install_v2.rst
+   mlnxofed_ib_install.rst
    network_configuration.rst
    switch_configuration.rst
    ufm_configuration.rst
diff --git a/docs/source/advanced/networks/infiniband/mlnxofed_configuration.rst b/docs/source/advanced/networks/infiniband/mlnxofed_configuration.rst
index 046e0a0a7..d7c113849 100644
--- a/docs/source/advanced/networks/infiniband/mlnxofed_configuration.rst
+++ b/docs/source/advanced/networks/infiniband/mlnxofed_configuration.rst
@@ -6,6 +6,6 @@ The process to configure the osimage to install the Mellanox OFED Drivers for Di
 .. toctree::
    :maxdepth: 2
 
-   mlnxofed_ib_install_v2_diskful.rst
-   mlnxofed_ib_install_v2_diskless.rst
+   mlnxofed_ib_install_diskful.rst
+   mlnxofed_ib_install_diskless.rst
 
diff --git a/docs/source/advanced/networks/infiniband/mlnxofed_ib_install_v2.rst b/docs/source/advanced/networks/infiniband/mlnxofed_ib_install.rst
similarity index 78%
rename from docs/source/advanced/networks/infiniband/mlnxofed_ib_install_v2.rst
rename to docs/source/advanced/networks/infiniband/mlnxofed_ib_install.rst
index 25f856007..ea8e63916 100644
--- a/docs/source/advanced/networks/infiniband/mlnxofed_ib_install_v2.rst
+++ b/docs/source/advanced/networks/infiniband/mlnxofed_ib_install.rst
@@ -1,12 +1,12 @@
 Mellanox OFED Installation Script
 =================================
 
-Mellanox provides a tested and packaged version of the OpenFabrics Enterprise Distribution (OFED) driver, named Mellanox OFED (MLNX_OFED).  To assist with the installation of the MLNX_OFED driver, xCAT provides a sample postscript: ``mlnxofed_ib_install.v2``.
+Mellanox provides a tested and packaged version of the OpenFabrics Enterprise Distribution (OFED) driver, named Mellanox OFED (MLNX_OFED).  To assist with the installation of the MLNX_OFED driver, xCAT provides a sample postscript: ``mlnxofed_ib_install``.
 
 .. toctree::
    :maxdepth: 2
 
-   mlnxofed_ib_install_v2_preparation.rst
+   mlnxofed_ib_install_preparation.rst
    mlnxofed_configuration.rst
    mlnxofed_ib_verified_scenario_matrix.rst
    mlnxofed_ib_known_issue.rst
diff --git a/docs/source/advanced/networks/infiniband/mlnxofed_ib_install_v2_diskful.rst b/docs/source/advanced/networks/infiniband/mlnxofed_ib_install_diskful.rst
similarity index 100%
rename from docs/source/advanced/networks/infiniband/mlnxofed_ib_install_v2_diskful.rst
rename to docs/source/advanced/networks/infiniband/mlnxofed_ib_install_diskful.rst
diff --git a/docs/source/advanced/networks/infiniband/mlnxofed_ib_install_v2_diskless.rst b/docs/source/advanced/networks/infiniband/mlnxofed_ib_install_diskless.rst
similarity index 100%
rename from docs/source/advanced/networks/infiniband/mlnxofed_ib_install_v2_diskless.rst
rename to docs/source/advanced/networks/infiniband/mlnxofed_ib_install_diskless.rst
diff --git a/docs/source/advanced/networks/infiniband/mlnxofed_ib_install_v2_preparation.rst b/docs/source/advanced/networks/infiniband/mlnxofed_ib_install_preparation.rst
similarity index 87%
rename from docs/source/advanced/networks/infiniband/mlnxofed_ib_install_v2_preparation.rst
rename to docs/source/advanced/networks/infiniband/mlnxofed_ib_install_preparation.rst
index b4a646868..12fdcd6cf 100644
--- a/docs/source/advanced/networks/infiniband/mlnxofed_ib_install_v2_preparation.rst
+++ b/docs/source/advanced/networks/infiniband/mlnxofed_ib_install_preparation.rst
@@ -12,11 +12,11 @@ Download the Mellanox OFED ISO file `here (MLNX_OFED) <http://www.mellanox.com/p
 Prepare Installation Script
 ---------------------------
 
-The ``mlnxofed_ib_install.v2`` is a sample script intended to assist with the installation of the Mellanox OFED drivers.  The following support matrix documents the limited number of scenarios that have been verified: :doc:`support matrix </advanced/networks/infiniband/mlnxofed_ib_verified_scenario_matrix>`.
+The ``mlnxofed_ib_install`` is a sample script intended to assist with the installation of the Mellanox OFED drivers.  The following support matrix documents the limited number of scenarios that have been verified: :doc:`support matrix </advanced/networks/infiniband/mlnxofed_ib_verified_scenario_matrix>`.
 
-#. Copy the ``mlnxofed_ib_install.v2`` to ``/install/postscripts``, renaming to ``mlnxofed_ib_install``. ::
+#. Copy the ``mlnxofed_ib_install`` to ``/install/postscripts``, renaming to ``mlnxofed_ib_install``. ::
 
-       cp /opt/xcat/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install.v2 \
+       cp /opt/xcat/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install \
           /install/postscripts/mlnxofed_ib_install
 
        # ensure the script has execute permission
diff --git a/xCAT-server/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install b/xCAT-server/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install
index d0f63e5a4..df149b25a 100755
--- a/xCAT-server/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install
+++ b/xCAT-server/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install
@@ -1,289 +1,432 @@
-#!/bin/sh
+#!/bin/bash
+#
+# This is the second version of Mellanox IB driver installation sample script
+# This is also the version we recommend to use right now.
+# What are changed in this version
+#    1. The usage interface is changed, using command line arguments instead of using environment attribute
+#    2. The way of downloading Mellanox OFED files.
+#    3. Some structure of code
 #
-# Sample script to customize options for Mellonax OFED IB support
 # For AIX:
 #    TBD
 # For Linux:
 #    - For full-disk installs:
-#        - Copy rpms to node
+#        - Copy Mellanox OFED ISO to node
 #        - Install IB rpms
 #    - For diskless images:
 #        - Copy the packages to the images.
 #        - Install IB rpms
 #
+#usage:
 #
-# Usage:
-#   Copy the xCAT mlnxofed_ib_install script file to postscripts directory:
+#      Copy the xCAT mlnxofed_ib_install script file to postscripts directory:
 #      cp /opt/xcat/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install /install/postscripts/mlnxofed_ib_install
 #
-#   1. Install the ofed driver for diskful node
-#      1.1 Set the postscript as one postbootscripts for the node
-#              chdef xcat01 -p postbootscripts=mlnxofed_ib_install,configiba
-#      1.2 Copy the pkglist to the custom directory:
-#              cp /opt/xcat/share/xcat/install/<ostype>/compute.<osver>.<arch>.pkglist /install/custom/install/<ostype>/compute.<osver>.<arch>.pkglist
-#          Edit your /install/custom/install/<ostype>/compute.<osver>.<arch>.pkglist and add:
-#              #INCLUDE:/opt/xcat/share/xcat/ib/netboot/<ostype>/ib.<osver>.<arch>.pkglist#
-#      1.3 Make sure the related osimage use the customized pkglist.
-#             lsdef -t osimage -o  <osver>-<arch>-install-compute
-#          if not, change it:
-#             chdef  -t osimage -o <osver>-<arch>-install-compute pkglist=/install/custom/install/<ostype>/compute.<osver>.<arch>.pkglist
-#      1.4 Do the diskful installation
+#      Prepare Mellanox OFED ISO file and save it into any subdirectory under /install.
+#
+#   1. install the ofed driver for diskfull node
+#      [NOTE] step 1.1-1.2 are only needed by redhat and sles
+#      1.1  copy the pkglist to the custom directory:
+#         cp /opt/xcat/share/xcat/install/<ostype>/compute.<osver>.<arch>.pkglist /install/custom/install/<ostype>/compute.<osver>.<arch>.pkglist
+#         Edit your /install/custom/install/<ostype>/compute.<osver>.<arch>.pkglist and add:
+#             #INCLUDE:/opt/xcat/share/xcat/ib/netboot/<ostype>/ib.<osver>.<arch>.pkglist#
+#      1.2 Make the related osimage use the customized pkglist.
+#          chdef  -t osimage -o <osver>-<arch>-install-compute pkglist=/install/custom/install/<ostype>/compute.<osver>.<arch>.pkglist
+#      1.3 set mlnxofed_ib_install as postbootscripts for the target node. assign necessary attribute for mlnxofed_ib_install at same time.
+#      chdef <node> -p postbootscripts="mlnxofed_ib_install -p /install/<path>/<OFED.ISO>"
+#      [NOTE] The default options input into Mellanox are '--without-32bit --without-fw-update --force'
+#             you can appoint the options by yourslef with '-m' option of mlnxofed_ib_install
+#             In order to distinguish which options are tranfered to Mellanox and which options are belong to mlnxofed_ib_install, any options wanted to transfered to Mellanox must follow behind -m and end with "-end-", for example:
+#      chdef <node> -p postbootscripts="mlnxofed_ib_install -p /install/<path>/<OFED.ISO> -m --without-32bit --add-kernel-support --force -end-"
+#      1.4 do the diskfull installation
+#           nodeset <node> osimage=<osimage>  ......
+#
 #   2. install the ofed driver for diskless images:
-#      2.1 Copy the pkglist to the custom directory:
-#              cp /opt/xcat/share/xcat/netboot/<ostype>/compute.<osver>.<arch>.pkglist /install/custom/netboot/<ostype>/compute.<osver>.<arch>.pkglist
-#          Edit your /install/custom/netboot/<ostype>/<profile>.pkglist and add:
-#              #INCLUDE:/opt/xcat/share/xcat/ib/netboot/<ostype>/ib.<osver>.<arch>.pkglist#
-#      2.2 Add to postinstall scripts
-#          Edit your /install/custom/netboot/<ostype>/<profile>.postinstall and add:
-#              installroot=$1 ofeddir=/install/post/otherpkgs/<osver>/<arch>/ofed/ NODESETSTATE=genimage /install/postscripts/mlnxofed_ib_install
-#      2.3 Make sure the related osimage use the customized pkglist and customized compute.postinsall
-#              lsdef -t osimage -o  <osver>-<arch>-netboot-compute
-#          if not, change it:
-#              chdef  -t osimage -o <osver>-<arch>-netboot-compute pkglist=/install/custom/netboot/<ostype>/compute.<osver>.<arch>.pkglist postinstall=/install/custom/netboot/<ostype>/<profile>.postinstall
-#      2.4 Run genimage
-#              genimage <osver>-<arch>-netboot-compute
-#
-#   You can obtain more information at: http://xcat-docs.readthedocs.org/
+#      [NOTE] step 2.1 is only needed by redhat and sles
+#      2.1 copy the pkglist to the custom directory:
+#            cp /opt/xcat/share/xcat/netboot/<ostype>/compute.<osver>.<arch>.pkglist /install/custom/netboot/<ostype>/compute.<osver>.<arch>.pkglist
+#         Edit your /install/custom/netboot/<ostype>/<profile>.pkglist and add:
+#          #INCLUDE:/opt/xcat/share/xcat/ib/netboot/<ostype>/ib.<osver>.<arch>.pkglist#
+#       2.2 Add to postinstall scripts
+#       Edit your /install/custom/netboot/<ostype>/<profile>.postinstall and add:
+#          /install/postscripts/mlnxofed_ib_install -p /install/<path>/<OFED.ISO> -n genimage  -i $1
+#       2.3 Make sure the related osimage use the customized pkglist and customized compute.postinsall
+#          lsdef -t osimage -o  <osver>-<arch>-netboot-compute
+#       if not, change it:
+#           chdef  -t osimage -o <osver>-<arch>-netboot-compute pkglist=/install/custom/netboot/<ostype>/compute.<osver>.<arch>.pkglist postinstall=/install/custom/netboot/<ostype>/<profile>.postinstall
+#       2.4 run genimage
+#       genimage <osver>-<arch>-netboot-compute
 #
 
-OS=`uname`
-#installroot='/install/netboot/sles11.1/x86_64/compute/rootimg'
-INSTALL_DIR='/install'
+#set -x
 
-#echo "------------------------------------------"
-#echo "OFED_DIR=$ofeddir"
-#echo "OSVER=$OSVER"
-#echo "arch=$ARCH"
-#echo  "NODESETSTATE=$NODESETSTATE"
-#echo "mlnxofed_options=$mlnxofed_options"
-#echo  "installroot=$installroot"
-#echo "------------------------------------------"
-
-if [ "$(uname -s|tr 'A-Z' 'a-z')" = "linux" ];then
-    str_dir_name=`dirname $0`
-    . $str_dir_name/xcatlib.sh
+OS="$(uname)"
+if [ "$OS" = "Linux" ]; then
+    str_dir_name="${0%/*}"
+    . "$str_dir_name/xcatlib.sh" 2>/dev/null
 fi
 
-#use arg for the OFED_DIR if defined,
-ARGNUM=$#
-if [ $ARGNUM -gt 1 ]; then
-    if [ $1 = "-s" ]; then
-        OFED_DIR=$2
-    fi
+#--------------------------------------------------------
+declare -a MLNXOFED_OPTS
+
+function usage() {
+    echo "Usage: mlnxofed_ib_install [-attribute]"
+    echo "  attribute include:"
+    echo "    -h: print this help message"
+    echo "    -p: the path where OFED file is saved. this is necessary attribute"
+    echo "    -m: the options inputted into mlnxofedinstall script, defualt value are --without-32bit --without-fw-update --force"
+    echo "    -i: the image root path. this is necessary attribute in diskless scenario"
+    echo "    -n: nodeset status, the value are one of install, boot or genimage"
+}
+
+while [ "$#" -gt "0" ]
+do
+    case "$1" in
+        "-p")
+            shift
+            OFED_PATH="$1"
+            ;;
+        "-m")
+            shift
+            while [ "$#" -gt "0" -a "-end-" != "$1" ]
+            do
+                MLNXOFED_OPTS=("${MLNXOFED_OPTS[@]}" "$1")
+                shift
+            done
+            ;;
+        "-i")
+            shift
+            IMGROOTPATH="$1"
+            ;;
+        "-n")
+            shift
+            NODESETSTATE="$1"
+            ;;
+        "-h")
+            usage
+            exit 0
+            ;;
+        *)
+            echo "unsupport attribute $1"
+            exit 0
+            ;;
+    esac
+    shift
+done
+
+if [ -z "$OFED_PATH" ]; then
+    echo "[Error] Without Mellanox OFED file path, please assign correct path" >&2
+    exit 1
 fi
 
-#if arg is not defined, check ofeddir environment variable,
-if [ -z "$OFED_DIR" ]; then
-   OFED_DIR=$ofeddir
-   #if ofeddir is not defined, use default.
-   if [ -z "$OFED_DIR" ]; then
-       # try to default
-       OFED_DIR=$INSTALL_DIR/post/otherpkgs/$OSVER/$ARCH/ofed
-   fi
+if [ "$NODESETSTATE" = "genimage"  -a  ! -d "$IMGROOTPATH" ]; then
+    echo "[Error] this is for diskless installation, please assign correct diskless image root path" >&2
+    exit 1
 fi
 
-# $mlnxofed_options is an environment variable passed to the mlnxofed_ib_install script. By default mlnxofed_option is '--without-32bit --force'
-if [ -z "$mlnxofed_options" ]; then
-   mlnxofed_options="--without-32bit --force"
-fi
+[ "${#MLNXOFED_OPTS[@]}" = 0 ] && MLNXOFED_OPTS=(--without-32bit --without-fw-update --force)
 
-if [[ $NODESETSTATE != "genimage" ]]; then
-   # running as a postscript in a full-disk install or AIX diskless install
-   installroot=""
-fi
+OFED_DIR=${OFED_PATH%/*}
+OFED_NAME=${OFED_PATH##*/}
 
-if [ $OS != "AIX" ]; then
-    if [[ $NODESETSTATE == "install" ]] || [[ $NODESETSTATE == "boot" ]]; then
-    #  Being run from a stateful install postscript
-    #  Copy rpms directly from the xCAT management node and install
-        mkdir -p /tmp/ofed
-        rm -f -R /tmp/ofed/*
-        cd /tmp/ofed
-        #download_dir=`echo $OFED_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/ 2> /tmp/wget.log
-        download_dir=$OFED_DIR
-        num=`echo $download_dir | awk -F"/" '{if($NF==""){print NF-2}else{print NF-1}}'`
-        wget -l inf -N -r --waitretry=10 --random-wait --retry-connrefused -t 10 -T 60 -nH --cut-dirs=$num --reject "index.html*"  --no-parent http://$MASTER$download_dir/ 2> /tmp/wget.log
-        wget -l inf -N -r --waitretry=10 --random-wait --retry-connrefused -t 10 -T 60 -nH --cut-dirs=$num --reject "index.html*"  --no-parent http://$MASTER$download_dir/.mlnx 2>> /tmp/wget.log
-        wget -l inf -N -r --waitretry=10 --random-wait --retry-connrefused -t 10 -T 60 -nH --cut-dirs=$num --reject "index.html*"  --no-parent http://$MASTER$download_dir/.supported_kernels 2>> /tmp/wget.log
+echo "Mellanox OFED file path is $OFED_DIR"
+echo "Mellanox OFED file is $OFED_NAME"
+echo "Mellanox OFED options are ${MLNXOFED_OPTS[@]}"
+echo "image root path is $IMGROOTPATH"
+echo "NODESETSTATE is $NODESETSTATE"
 
+function hack_uname()
+{
+    BEFORE_UNAME_R="$($1/bin/uname -r)"
+    BEFORE_UNAME_M="$($1/bin/uname -m)"
+    echo "Before hack_uname(), -r=>'${BEFORE_UNAME_R}' -m=>'${BEFORE_UNAME_M}'"
+    BEFORE_UNAME_R_NEW="$(chroot $1 /bin/uname -r)"
+    BEFORE_UNAME_M_NEW="$(chroot $1 /bin/uname -m)"
+    echo "Before hack_uname(), chroot -r=>'${BEFORE_UNAME_R_NEW}' -m=>'${BEFORE_UNAME_M_NEW}'"
 
-        if [ -f /etc/os-release ] &&
-            cat /etc/os-release |grep NAME|grep Ubuntu>/dev/null
-        then
-            nodename=`hostname`
-            echo "$nodename 's operating system is Ubuntu."
-            echo "If you want to install Mellanox_OFED in $nodename, $nodename must have ability to access www.ports.ubuntu.com"
-            echo -n "checking $nodename 's ability to access www.ports.ubuntu.com ..........."
-            if ping -c 3 www.ports.ubuntu.com > /dev/null;then
-               echo "[OK]"
-            else
-               echo "[Failed]"
-               echo "please make your $nodename have ability to access www.ports.ubuntu.com"
-               exit 1
-            fi
-
-           cp /etc/apt/sources.list  /etc/apt/sources.list.bak
-           sed -i "/deb http:\\/\\/ports.ubuntu.com\\/ubuntu-ports\\/ trusty main/d"  /etc/apt/sources.list
-           sed -i "/deb http:\\/\\/ports.ubuntu.com\\/ubuntu-ports\\/ trusty-updates main/d"  /etc/apt/sources.list
-           sed -i "/deb http:\\/\\/ports.ubuntu.com\\/ubuntu-ports\\/ trusty universe/d" /etc/apt/sources.list
-           sed -i "/deb http:\\/\\/ports.ubuntu.com\\/ubuntu-ports\\/ trusty-updates universe/d" /etc/apt/sources.list
-
-           echo "deb http://ports.ubuntu.com/ubuntu-ports/ trusty main
-deb http://ports.ubuntu.com/ubuntu-ports/ trusty-updates main
-deb http://ports.ubuntu.com/ubuntu-ports/ trusty universe
-deb http://ports.ubuntu.com/ubuntu-ports/ trusty-updates universe" >> /etc/apt/sources.list
-
-           apt-get clean all
-           sleep 1
-           apt-get update
-        fi
-
-        #rpm -Uvh --force libibverbs-devel*.rpm
-        #perl -x mlnxofedinstall --without-32bit --force
-
-        if [ -f /etc/os-release ] &&
-            cat /etc/os-release|grep NAME|grep Ubuntu>/dev/null &&
-            uname -m |grep ppc64 >/dev/null
-        then
-            echo "perl -x mlnxofedinstall --without-fw-update $mlnxofed_options"
-            {
-                unset ARCH
-                perl -x mlnxofedinstall --without-fw-update $mlnxofed_options
-            }
-            sleep 1
-            service openibd restart
-        else
-            echo  "perl -x mlnxofedinstall --without-fw-update $mlnxofed_options"
-            perl -x mlnxofedinstall --without-fw-update $mlnxofed_options
-        fi
-        rm -Rf /tmp/ofed
-        #force openibd load all modules in need, restart again
-        restartservice openibd
-    fi
-
-    if [[ $NODESETSTATE == "genimage" ]]; then
-    # 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 -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
-            mount --bind  /dev $installroot/dev/
-            mount --bind  /sys $installroot/sys
-            mount --bind /proc $installroot/proc
-            chroot $installroot rpm -e --noscripts --allmatches mlnx-ofa_kernel-kmp-default 2>/dev/null
-            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
-            rm -rf $installroot/tmp/ofed_install
-            umount $installroot/dev/
-            umount $installroot/sys
-            umount $installroot/proc
-        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 -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."
-            echo "If you want to install Mellanox_OFED in $nodename, $nodename must have ability to access public network."
-            echo -n "checking $nodename 's ability to access public network..........."
-            if ping -c 3 www.ports.ubuntu.com > /dev/null;then
-                echo "[OK]"
-            else
-                echo "[Failed]"
-                echo "please make your $nodename have ability to access public network"
-                exit 1
-            fi
-
-            sourceslist="$installroot/etc/apt/sources.list"
-            cp  $sourceslist $sourceslist.bak
-
-            sed -i "/deb http:\\/\\/ports.ubuntu.com\\/ubuntu-ports\\/ trusty main/d"  $sourceslist
-            sed -i "/deb http:\\/\\/ports.ubuntu.com\\/ubuntu-ports\\/ trusty-updates main/d" $sourceslist
-            sed -i "/deb http:\\/\\/ports.ubuntu.com\\/ubuntu-ports\\/ trusty universe/d" $sourceslist
-            sed -i "/deb http:\\/\\/ports.ubuntu.com\\/ubuntu-ports\\/ trusty-updates universe/d" $sourceslist
-
-            echo "deb http://ports.ubuntu.com/ubuntu-ports/ trusty main
-deb http://ports.ubuntu.com/ubuntu-ports/ trusty-updates main
-deb http://ports.ubuntu.com/ubuntu-ports/ trusty universe
-deb http://ports.ubuntu.com/ubuntu-ports/ trusty-updates universe" >> $sourceslist
-
-            chroot $installroot apt-get clean all
-            sleep 1
-            chroot $installroot apt-get update
-            mount --bind  /dev $installroot/dev/
-            mount --bind  /proc  $installroot/proc/
-            mount --bind  /sys   $installroot/sys/
-
-            mv "${installroot}/bin/uname" "${installroot}/bin/uname.nouse"
-#            cat <<-EOF >"${installroot}/bin/uname"
-#		#!/bin/sh
-#		[ "\$1" = "-r" ] && cd /lib/modules && for d in *; do :; done && echo \$d
-#		[ "\$1" = "-m" ] && if [ -d "/proc/powerpc" ];then echo ppc64le;else echo x86_64;fi
-#		[ "\$1" = "-s" ] && echo Linux
-#		exit 0
-#		EOF
-
-            cat <<-EOF >"${installroot}/bin/uname"
+    mv "$1/bin/uname" "$1/bin/uname.save"
+    cat <<-EOF >"$1/bin/uname"
 		#!/bin/sh
 		case "\$1" in
 		"-m")
-			ARCH="\$(dpkg --print-architecture || rpm -q kernel-\$("\$0" -r) --qf '%{arch}')"
+			ARCH="\$(dpkg --print-architecture 2>/dev/null || rpm -q kernel-\$("\$0" -r) --qf '%{arch}' 2>/dev/null)"
 			case "\$ARCH" in
-			"amd64")		
+			"amd64")
 				ARCH="x86_64"
 				;;
 			"ppc64el")
-			        ARCH="ppc64le"		
-				;;	
+			        ARCH="ppc64le"
+				;;
 			esac
-			echo "\$ARCH"	
+			echo "\$ARCH"
 			;;
-		"-r")	
-			cd /lib/modules && for d in * ; do : ; done && echo \$d	
+		"-r")
+                        if [ -n "\$KERNELVERSION" ]; then
+                            echo \$KERNELVERSION
+                        else
+                            for d in \$(ls /lib/modules | sort -V) 
+                            do 
+                                rpm -q kernel-\$d >/dev/null 2>&1
+                                if [ "\$?" == "0" ] ; then
+                                    echo \$d
+                                    break 
+                                fi
+                            done
+                        fi
 			;;
 		"-s"|"")
-			echo "Linux"	
+			echo "Linux"
 			;;
 		esac
 		exit 0
 		EOF
 
-#            head -n 999 "${installroot}/bin/uname"
-            chmod 0755 "${installroot}/bin/uname"
+    chmod 0755 "$1/bin/uname"
+    AFTER_UNAME_R="$($1/bin/uname -r)"
+    AFTER_UNAME_M="$($1/bin/uname -m)"
+    echo "After  hack_uname(), -r=>'${AFTER_UNAME_R}', -m=>'${AFTER_UNAME_M}'"
+    AFTER_UNAME_R_NEW="$(chroot $1 /bin/uname -r)"
+    AFTER_UNAME_M_NEW="$(chroot $1 /bin/uname -m)"
+    echo "After  hack_uname(), chroot -r=>'${AFTER_UNAME_R_NEW}' -m=>'${AFTER_UNAME_M_NEW}'"
+}
 
-            chroot $installroot sh -c 'apt-get install -y linux-headers-$(uname -r)'
-
-            echo "perl -x /tmp/ofed_install/ofed/mlnxofedinstall  --without-fw-update $mlnxofed_options"
-            chroot $installroot  perl -x /tmp/ofed_install/ofed/mlnxofedinstall  --without-fw-update $mlnxofed_options
-            mv "${installroot}/bin/uname.nouse" "${installroot}/bin/uname"
-
-            rm -rf $installroot/tmp/ofed_install
-            umount $installroot/dev/
-            umount $installroot/proc/
-            umount $installroot/sys/
-
-        else
-            #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 --without-fw-update $mlnxofed_options
-            rm -rf $installroot/tmp/ofed_install
+function cleanup()
+{
+    local -i i=0
+    local -i max_retry=99
+	
+    if [ "$NODESETSTATE" != "genimage" ]; then
+        # Clean up the uname hacking
+        if [ -f "/bin/uname.save" ]; then
+            mv -f "/bin/uname.save" "/bin/uname"
         fi
 
+        if mount | grep -q "/tmp/ofed/mountpoint"; then
+            while ! umount "/tmp/ofed/mountpoint"
+            do
+                (( ++i > max_retry )) && echo "Umount /tmp/ofed/mountpoint failed" >&2 && break
+                sleep 1
+            done
+        fi
+        if [ -d "/tmp/ofed" ]; then
+            rm -rf -- /tmp/ofed
+        fi
+    else
+        # Clean up the uname hacking
+        if [ -f "$IMGROOTPATH/bin/uname.save" ]; then
+            mv -f "$IMGROOTPATH/bin/uname.save" "$IMGROOTPATH/bin/uname"
+        fi
 
+        # Clean up the ofed iso
+        tmp_imgpath=$IMGROOTPATH
+        while (echo $tmp_imgpath | grep "/$")
+        do
+            tmp_imgpath=${tmp_imgpath%/*}
+        done
+        if mount | grep -q "$tmp_imgpath/tmp/ofed/mountpoint"; then
+            while ! umount "$IMGROOTPATH/tmp/ofed/mountpoint"
+            do
+                (( ++i > max_retry )) && echo "Umount $IMGROOTPATH/tmp/ofed/mountpoint failed" >&2 && break
+                sleep 1
+            done
+        fi
+        if [ -d "$IMGROOTPATH/tmp/ofed" ]; then
+            rm -rf -- "$IMGROOTPATH/tmp/ofed"
+        fi
+		
+        i=0
+        if mount | grep -q "$IMGROOTPATH/sys"; then
+            while ! umount "$IMGROOTPATH/sys"
+            do
+                (( ++i > max_retry )) && echo "Umount $IMGROOTPATH/sys failed" >&2 && break
+                sleep 1
+            done
+        fi
+        i=0
+        if mount | grep -q "$IMGROOTPATH/proc"; then
+            while ! umount "$IMGROOTPATH/proc"
+            do
+                (( ++i > max_retry )) && echo "Umount $IMGROOTPATH/proc failed" >&2 && break
+                sleep 1
+            done
+        fi
+        i=0
+        if mount | grep -q "$IMGROOTPATH/dev"; then
+            while ! umount "$IMGROOTPATH/dev"
+            do
+                (( ++i > max_retry )) && echo "Umount $IMGROOTPATH/dev failed" >&2 && break
+                sleep 1
+            done
+        fi 		
+    fi
+}
+trap 'cleanup' 0
+
+
+if [ "$OS" = "Linux" ]; then
+    if [ "$NODESETSTATE" = "install" -o "$NODESETSTATE" = "boot" ]; then
+
+        #if the host is ubuntn, need to do some network check and configuration
+        if grep -q Ubuntu /etc/os-release 2>/dev/null
+        then
+            echo "$HOSTNAME 's operating system is Ubuntu."
+            echo "If you want to install Mellanox_OFED in $HOSTNAME, $HOSTNAME must have ability to access ports.ubuntu.com"
+            echo -n "checking $HOSTNAME 's ability to access ports.ubuntu.com..........."
+            if ping -c 3 ports.ubuntu.com > /dev/null;then
+                echo "[OK]"
+            else
+                echo "[Failed]" >&2
+                echo "[Error] please make your $HOSTNAME has ability to access ports.ubuntu.com" >&2
+                exit 1
+            fi
+
+
+            echo "get distro name form /etc/lsb-release ......"
+            source /etc/lsb-release >/dev/null 2>&1
+            if [ -z "$DISTRIB_CODENAME" ]; then
+                echo "[Error] can't get DISTRIB_CODENAME " >&2
+                exit 1
+            fi
+            echo "DISTRIB_CODENAME=$DISTRIB_CODENAME ...[OK]"
+
+            cp /etc/apt/sources.list /etc/apt/sources.list.bak
+            sed -i "/deb http:\\/\\/ports.ubuntu.com\\/ubuntu-ports\\/ $DISTRIB_CODENAME main/d"  /etc/apt/sources.list
+            sed -i "/deb http:\\/\\/ports.ubuntu.com\\/ubuntu-ports\\/ $DISTRIB_CODENAME-updates main/d"  /etc/apt/sources.list
+            sed -i "/deb http:\\/\\/ports.ubuntu.com\\/ubuntu-ports\\/ $DISTRIB_CODENAME universe/d" /etc/apt/sources.list
+            sed -i "/deb http:\\/\\/ports.ubuntu.com\\/ubuntu-ports\\/ $DISTRIB_CODENAME-updates universe/d" /etc/apt/sources.list
+
+            cat <<-EOF >>/etc/apt/sources.list
+deb http://ports.ubuntu.com/ubuntu-ports/ $DISTRIB_CODENAME main
+deb http://ports.ubuntu.com/ubuntu-ports/ $DISTRIB_CODENAME-updates main
+deb http://ports.ubuntu.com/ubuntu-ports/ $DISTRIB_CODENAME universe
+deb http://ports.ubuntu.com/ubuntu-ports/ $DISTRIB_CODENAME-updates universe
+EOF
+
+            apt-get clean all
+            sleep 1
+            apt-get update
+        fi
+
+        #  Being run from a stateful install postscript
+        #  Copy ISO directly from the xCAT management node and install
+        rm -rf -- /tmp/ofed
+        mkdir -p /tmp/ofed/mountpoint
+        if [ "$?" != "0" ] ;then
+            echo "[Error] We are in trouble to mkdir /tmp/ofed/mountpoint, please check your node" >&2
+            exit 1
+        fi
+
+        cd /tmp/ofed/
+        echo "Downloading Mellanox OFED file $OFED_NAME form http://$MASTER/$OFED_DIR .........."
+        wget -l inf -N --waitretry=10 --random-wait --retry-connrefused -t 10 -T 60 -nH --no-parent "http://$MASTER/$OFED_DIR/$OFED_NAME" 2> /tmp/wget.log
+        if [ "$?" != "0" ]; then
+            echo "[Error] Downloading Mellanox OFED file $OFED_NAME failed" >&2
+            exit 1
+        fi
+        if [ ! -f "/tmp/ofed/$OFED_NAME" ]; then
+            echo "[Failed]" >&2
+            exit 1
+        fi
+        echo "[OK]"
+
+        echo "Mounting Mellanox OFED file $OFED_NAME ........."
+        mount -o loop "/tmp/ofed/$OFED_NAME"  /tmp/ofed/mountpoint
+        if [ ! -f "/tmp/ofed/mountpoint/mlnxofedinstall" -o ! -x "/tmp/ofed/mountpoint/mlnxofedinstall" ]; then
+            echo "[Failed]" >&2
+            exit 1
+        fi
+        echo "[OK]"
+
+        if [ "$NODESETSTATE" = "install" ]; then
+            hack_uname
+        fi
+
+        echo "Start Mellanox OFED installation ........."
+        env -i "PATH=${PATH}" /tmp/ofed/mountpoint/mlnxofedinstall "${MLNXOFED_OPTS[@]}"
+
+        #force openibd load all modules in need, restart again
+        if [ "$NODESETSTATE" = "boot" ]; then
+            sleep 1
+            service openibd restart
+            if [ "$?" != "0" ]; then
+                echo "[Error] service openibd restart failed."
+                exit 1
+            fi
+        fi
+    fi
+
+    if [[ "$NODESETSTATE" == "genimage" ]]; then
+        rm -rf -- "$IMGROOTPATH/tmp/ofed"
+        mkdir -p "$IMGROOTPATH/tmp/ofed/mountpoint"
+        if [ "$?" != "0" ] ;then
+           echo "[Error] We are in trouble to mkdir $IMGROOTPATH/tmp/ofed/mountpoint, please check your node" >&2
+           exit 1
+        fi
+
+        echo "Mounting Mellanox OFED file $OFED_DIR/$OFED_NAME ........."
+        mount -o loop "$OFED_DIR/$OFED_NAME"  "$IMGROOTPATH/tmp/ofed/mountpoint"
+        if [ ! -f "$IMGROOTPATH/tmp/ofed/mountpoint/mlnxofedinstall" -o ! -x "$IMGROOTPATH/tmp/ofed/mountpoint/mlnxofedinstall" ]; then
+            echo "[Failed]" >&2
+            exit 1
+        fi
+        echo "[OK]"
+
+        echo "Start Mellanox OFED installation ........."
+
+        mount --bind  /dev   "$IMGROOTPATH/dev/"
+        mount --bind  /proc  "$IMGROOTPATH/proc/"
+        mount --bind  /sys   "$IMGROOTPATH/sys/"
+
+        hack_uname "${IMGROOTPATH}"
+
+        # Being called from <image>.postinstall script
+        # Assume we are on the same machine
+        if [ -f /etc/SuSE-release ]; then
+            chroot "$IMGROOTPATH" rpm -e --noscripts --allmatches mlnx-ofa_kernel-kmp-default 2>/dev/null
+            chroot "$IMGROOTPATH" rpm -e --nodeps --allmatches libibverbs 2>/dev/null
+        elif grep -q Ubuntu /etc/os-release 2>/dev/null; then
+            echo "$HOSTNAME 's operating system is Ubuntu."
+            echo "If you want to install Mellanox_OFED in $HOSTNAME, $HOSTNAME must have ability to access ports.ubuntu.com"
+            echo -n "checking $HOSTNAME 's ability to access ports.ubuntu.com..........."
+            if ping -c 3 ports.ubuntu.com > /dev/null; then
+                echo "[OK]"
+            else
+                echo "[Failed]" >&2
+                echo "please make your $HOSTNAME has ability to access ports.ubuntu.com" >&2
+                exit 1
+            fi
+
+            sourceslist="$IMGROOTPATH/etc/apt/sources.list"
+            cp "$sourceslist" "${sourceslist}.bak"
+
+            echo "get distro name form $IMGROOTPATH/etc/lsb-release ......"
+            source $IMGROOTPATH/etc/lsb-release  >/dev/null 2>&1
+            if [ -z "$DISTRIB_CODENAME" ]; then
+                echo "[Error] can't get DISTRIB_CODENAME " >&2
+                exit 1
+            fi
+            echo "DISTRIB_CODENAME=$DISTRIB_CODENAME ...[OK]"
+
+            sed -i "/deb http:\\/\\/ports.ubuntu.com\\/ubuntu-ports\\/ $DISTRIB_CODENAME main/d"  $sourceslist
+            sed -i "/deb http:\\/\\/ports.ubuntu.com\\/ubuntu-ports\\/ $DISTRIB_CODENAME-updates main/d" $sourceslist
+            sed -i "/deb http:\\/\\/ports.ubuntu.com\\/ubuntu-ports\\/ $DISTRIB_CODENAME universe/d" $sourceslist
+            sed -i "/deb http:\\/\\/ports.ubuntu.com\\/ubuntu-ports\\/ $DISTRIB_CODENAME-updates universe/d" $sourceslist
+
+            cat <<-EOF >>"$sourceslist"
+deb http://ports.ubuntu.com/ubuntu-ports/ $DISTRIB_CODENAME main
+deb http://ports.ubuntu.com/ubuntu-ports/ $DISTRIB_CODENAME-updates main
+deb http://ports.ubuntu.com/ubuntu-ports/ $DISTRIB_CODENAME universe
+deb http://ports.ubuntu.com/ubuntu-ports/ $DISTRIB_CODENAME-updates universe
+EOF
+
+            chroot "$IMGROOTPATH" apt-get clean all
+            sleep 1
+            chroot "$IMGROOTPATH" apt-get update
+
+            chroot "$IMGROOTPATH" sh -c 'apt-get install -y linux-headers-$(uname -r)'
+        else #for rhels
+            chroot "$IMGROOTPATH" rpm -e --nodeps --allmatches libibverbs 2>/dev/null
+        fi
+        chroot "$IMGROOTPATH" env -i "PATH=${PATH}" /tmp/ofed/mountpoint/mlnxofedinstall "${MLNXOFED_OPTS[@]}"
     fi
 fi
-
diff --git a/xCAT-server/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install.v2 b/xCAT-server/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install.v2
deleted file mode 100755
index e16445aac..000000000
--- a/xCAT-server/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install.v2
+++ /dev/null
@@ -1,418 +0,0 @@
-#!/bin/bash
-#
-# This is the second version of Mellanox IB driver installation sample script
-# This is also the version we recommend to use right now.
-# What are changed in this version
-#    1. The usage interface is changed, using command line arguments instead of using environment attribute
-#    2. The way of downloading Mellanox OFED files.
-#    3. Some structure of code
-#
-# For AIX:
-#    TBD
-# For Linux:
-#    - For full-disk installs:
-#        - Copy Mellanox OFED ISO to node
-#        - Install IB rpms
-#    - For diskless images:
-#        - Copy the packages to the images.
-#        - Install IB rpms
-#
-#usage:
-#
-#      Copy the xCAT mlnxofed_ib_install.v2 script file to postscripts directory and rename to  mlnxofed_ib_install:
-#      cp /opt/xcat/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install.v2 /install/postscripts/mlnxofed_ib_install
-#
-#      Prepare Mellanox OFED ISO file and save it into any subdirectory under /install.
-#
-#   1. install the ofed driver for diskfull node
-#      [NOTE] step 1.1-1.2 are only needed by redhat and sles
-#      1.1  copy the pkglist to the custom directory:
-#         cp /opt/xcat/share/xcat/install/<ostype>/compute.<osver>.<arch>.pkglist /install/custom/install/<ostype>/compute.<osver>.<arch>.pkglist
-#         Edit your /install/custom/install/<ostype>/compute.<osver>.<arch>.pkglist and add:
-#             #INCLUDE:/opt/xcat/share/xcat/ib/netboot/<ostype>/ib.<osver>.<arch>.pkglist#
-#      1.2 Make the related osimage use the customized pkglist.
-#          chdef  -t osimage -o <osver>-<arch>-install-compute pkglist=/install/custom/install/<ostype>/compute.<osver>.<arch>.pkglist
-#      1.3 set mlnxofed_ib_install as postbootscripts for the target node. assign necessary attribute for mlnxofed_ib_install at same time.
-#      chdef <node> -p postbootscripts="mlnxofed_ib_install -p /install/<path>/<OFED.ISO>"
-#      [NOTE] The default options input into Mellanox are '--without-32bit --without-fw-update --force'
-#             you can appoint the options by yourslef with '-m' option of mlnxofed_ib_install
-#             In order to distinguish which options are tranfered to Mellanox and which options are belong to mlnxofed_ib_install, any options wanted to transfered to Mellanox must follow behind -m and end with "-end-", for example:
-#      chdef <node> -p postbootscripts="mlnxofed_ib_install -p /install/<path>/<OFED.ISO> -m --without-32bit --add-kernel-support --force -end-"
-#      1.4 do the diskfull installation
-#           nodeset <node> osimage=<osimage>  ......
-#
-#   2. install the ofed driver for diskless images:
-#      [NOTE] step 2.1 is only needed by redhat and sles
-#      2.1 copy the pkglist to the custom directory:
-#            cp /opt/xcat/share/xcat/netboot/<ostype>/compute.<osver>.<arch>.pkglist /install/custom/netboot/<ostype>/compute.<osver>.<arch>.pkglist
-#         Edit your /install/custom/netboot/<ostype>/<profile>.pkglist and add:
-#          #INCLUDE:/opt/xcat/share/xcat/ib/netboot/<ostype>/ib.<osver>.<arch>.pkglist#
-#       2.2 Add to postinstall scripts
-#       Edit your /install/custom/netboot/<ostype>/<profile>.postinstall and add:
-#          /install/postscripts/mlnxofed_ib_install -p /install/<path>/<OFED.ISO> -n genimage  -i $1
-#       2.3 Make sure the related osimage use the customized pkglist and customized compute.postinsall
-#          lsdef -t osimage -o  <osver>-<arch>-netboot-compute
-#       if not, change it:
-#           chdef  -t osimage -o <osver>-<arch>-netboot-compute pkglist=/install/custom/netboot/<ostype>/compute.<osver>.<arch>.pkglist postinstall=/install/custom/netboot/<ostype>/<profile>.postinstall
-#       2.4 run genimage
-#       genimage <osver>-<arch>-netboot-compute
-#
-
-#set -x
-
-OS="$(uname)"
-if [ "$OS" = "Linux" ]; then
-    str_dir_name="${0%/*}"
-    . "$str_dir_name/xcatlib.sh" 2>/dev/null
-fi
-
-#--------------------------------------------------------
-declare -a MLNXOFED_OPTS
-
-function usage() {
-    echo "Usage: mlnxofed_ib_install [-attribute]"
-    echo "  attribute include:"
-    echo "    -h: print this help message"
-    echo "    -p: the path where OFED file is saved. this is necessary attribute"
-    echo "    -m: the options inputted into mlnxofedinstall script, defualt value are --without-32bit --without-fw-update --force"
-    echo "    -i: the image root path. this is necessary attribute in diskless scenario"
-    echo "    -n: nodeset status, the value are one of install, boot or genimage"
-}
-
-while [ "$#" -gt "0" ]
-do
-    case "$1" in
-        "-p")
-            shift
-            OFED_PATH="$1"
-            ;;
-        "-m")
-            shift
-            while [ "$#" -gt "0" -a "-end-" != "$1" ]
-            do
-                MLNXOFED_OPTS=("${MLNXOFED_OPTS[@]}" "$1")
-                shift
-            done
-            ;;
-        "-i")
-            shift
-            IMGROOTPATH="$1"
-            ;;
-        "-n")
-            shift
-            NODESETSTATE="$1"
-            ;;
-        "-h")
-            usage
-            exit 0
-            ;;
-        *)
-            echo "unsupport attribute $1"
-            exit 0
-            ;;
-    esac
-    shift
-done
-
-if [ -z "$OFED_PATH" ]; then
-    echo "[Error] Without Mellanox OFED file path, please assign correct path" >&2
-    exit 1
-fi
-
-if [ "$NODESETSTATE" = "genimage"  -a  ! -d "$IMGROOTPATH" ]; then
-    echo "[Error] this is for diskless installation, please assign correct diskless image root path" >&2
-    exit 1
-fi
-
-[ "${#MLNXOFED_OPTS[@]}" = 0 ] && MLNXOFED_OPTS=(--without-32bit --without-fw-update --force)
-
-OFED_DIR=${OFED_PATH%/*}
-OFED_NAME=${OFED_PATH##*/}
-
-echo "Mellanox OFED file path is $OFED_DIR"
-echo "Mellanox OFED file is $OFED_NAME"
-echo "Mellanox OFED options are ${MLNXOFED_OPTS[@]}"
-echo "image root path is $IMGROOTPATH"
-echo "NODESETSTATE is $NODESETSTATE"
-
-function hack_uname()
-{
-    BEFORE_UNAME_R="$($1/bin/uname -r)"
-    BEFORE_UNAME_M="$($1/bin/uname -m)"
-    echo "Before hack_uname(), -r=>'${BEFORE_UNAME_R}' -m=>'${BEFORE_UNAME_M}'"
-    mv "$1/bin/uname" "$1/bin/uname.save"
-    cat <<-EOF >"$1/bin/uname"
-		#!/bin/sh
-		case "\$1" in
-		"-m")
-			ARCH="\$(dpkg --print-architecture 2>/dev/null || rpm -q kernel-\$("\$0" -r) --qf '%{arch}' 2>/dev/null)"
-			case "\$ARCH" in
-			"amd64")
-				ARCH="x86_64"
-				;;
-			"ppc64el")
-			        ARCH="ppc64le"
-				;;
-			esac
-			echo "\$ARCH"
-			;;
-		"-r")
-                        if [ -n "\$KERNELVERSION" ]; then
-                            echo \$KERNELVERSION
-                        else
-                            for d in \$(ls /lib/modules | sort -V) ; do : ; done && echo \$d
-                        fi
-			;;
-		"-s"|"")
-			echo "Linux"
-			;;
-		esac
-		exit 0
-		EOF
-
-    chmod 0755 "$1/bin/uname"
-    AFTER_UNAME_R="$($1/bin/uname -r)"
-    AFTER_UNAME_M="$($1/bin/uname -m)"
-    echo "After  hack_uname(), -r=>'${AFTER_UNAME_R}', -m=>'${AFTER_UNAME_M}'"
-}
-
-function cleanup()
-{
-    local -i i=0
-    local -i max_retry=99
-	
-    if [ "$NODESETSTATE" != "genimage" ]; then
-        # Clean up the uname hacking
-        if [ -f "/bin/uname.save" ]; then
-            mv -f "/bin/uname.save" "/bin/uname"
-        fi
-
-        if mount | grep -q "/tmp/ofed/mountpoint"; then
-            while ! umount "/tmp/ofed/mountpoint"
-            do
-                (( ++i > max_retry )) && echo "Umount /tmp/ofed/mountpoint failed" >&2 && break
-                sleep 1
-            done
-        fi
-        if [ -d "/tmp/ofed" ]; then
-            rm -rf -- /tmp/ofed
-        fi
-    else
-        # Clean up the uname hacking
-        if [ -f "$IMGROOTPATH/bin/uname.save" ]; then
-            mv -f "$IMGROOTPATH/bin/uname.save" "$IMGROOTPATH/bin/uname"
-        fi
-
-        # Clean up the ofed iso
-        tmp_imgpath=$IMGROOTPATH
-        while (echo $tmp_imgpath | grep "/$")
-        do
-            tmp_imgpath=${tmp_imgpath%/*}
-        done
-        if mount | grep -q "$tmp_imgpath/tmp/ofed/mountpoint"; then
-            while ! umount "$IMGROOTPATH/tmp/ofed/mountpoint"
-            do
-                (( ++i > max_retry )) && echo "Umount $IMGROOTPATH/tmp/ofed/mountpoint failed" >&2 && break
-                sleep 1
-            done
-        fi
-        if [ -d "$IMGROOTPATH/tmp/ofed" ]; then
-            rm -rf -- "$IMGROOTPATH/tmp/ofed"
-        fi
-		
-        i=0
-        if mount | grep -q "$IMGROOTPATH/sys"; then
-            while ! umount "$IMGROOTPATH/sys"
-            do
-                (( ++i > max_retry )) && echo "Umount $IMGROOTPATH/sys failed" >&2 && break
-                sleep 1
-            done
-        fi
-        i=0
-        if mount | grep -q "$IMGROOTPATH/proc"; then
-            while ! umount "$IMGROOTPATH/proc"
-            do
-                (( ++i > max_retry )) && echo "Umount $IMGROOTPATH/proc failed" >&2 && break
-                sleep 1
-            done
-        fi
-        i=0
-        if mount | grep -q "$IMGROOTPATH/dev"; then
-            while ! umount "$IMGROOTPATH/dev"
-            do
-                (( ++i > max_retry )) && echo "Umount $IMGROOTPATH/dev failed" >&2 && break
-                sleep 1
-            done
-        fi 		
-    fi
-}
-trap 'cleanup' 0
-
-
-if [ "$OS" = "Linux" ]; then
-    if [ "$NODESETSTATE" = "install" -o "$NODESETSTATE" = "boot" ]; then
-
-        #if the host is ubuntn, need to do some network check and configuration
-        if grep -q Ubuntu /etc/os-release 2>/dev/null
-        then
-            echo "$HOSTNAME 's operating system is Ubuntu."
-            echo "If you want to install Mellanox_OFED in $HOSTNAME, $HOSTNAME must have ability to access ports.ubuntu.com"
-            echo -n "checking $HOSTNAME 's ability to access ports.ubuntu.com..........."
-            if ping -c 3 ports.ubuntu.com > /dev/null;then
-                echo "[OK]"
-            else
-                echo "[Failed]" >&2
-                echo "[Error] please make your $HOSTNAME has ability to access ports.ubuntu.com" >&2
-                exit 1
-            fi
-
-
-            echo "get distro name form /etc/lsb-release ......"
-            source /etc/lsb-release >/dev/null 2>&1
-            if [ -z "$DISTRIB_CODENAME" ]; then
-                echo "[Error] can't get DISTRIB_CODENAME " >&2
-                exit 1
-            fi
-            echo "DISTRIB_CODENAME=$DISTRIB_CODENAME ...[OK]"
-
-            cp /etc/apt/sources.list /etc/apt/sources.list.bak
-            sed -i "/deb http:\\/\\/ports.ubuntu.com\\/ubuntu-ports\\/ $DISTRIB_CODENAME main/d"  /etc/apt/sources.list
-            sed -i "/deb http:\\/\\/ports.ubuntu.com\\/ubuntu-ports\\/ $DISTRIB_CODENAME-updates main/d"  /etc/apt/sources.list
-            sed -i "/deb http:\\/\\/ports.ubuntu.com\\/ubuntu-ports\\/ $DISTRIB_CODENAME universe/d" /etc/apt/sources.list
-            sed -i "/deb http:\\/\\/ports.ubuntu.com\\/ubuntu-ports\\/ $DISTRIB_CODENAME-updates universe/d" /etc/apt/sources.list
-
-            cat <<-EOF >>/etc/apt/sources.list
-deb http://ports.ubuntu.com/ubuntu-ports/ $DISTRIB_CODENAME main
-deb http://ports.ubuntu.com/ubuntu-ports/ $DISTRIB_CODENAME-updates main
-deb http://ports.ubuntu.com/ubuntu-ports/ $DISTRIB_CODENAME universe
-deb http://ports.ubuntu.com/ubuntu-ports/ $DISTRIB_CODENAME-updates universe
-EOF
-
-            apt-get clean all
-            sleep 1
-            apt-get update
-        fi
-
-        #  Being run from a stateful install postscript
-        #  Copy ISO directly from the xCAT management node and install
-        rm -rf -- /tmp/ofed
-        mkdir -p /tmp/ofed/mountpoint
-        if [ "$?" != "0" ] ;then
-            echo "[Error] We are in trouble to mkdir /tmp/ofed/mountpoint, please check your node" >&2
-            exit 1
-        fi
-
-        cd /tmp/ofed/
-        echo "Downloading Mellanox OFED file $OFED_NAME form http://$MASTER/$OFED_DIR .........."
-        wget -l inf -N --waitretry=10 --random-wait --retry-connrefused -t 10 -T 60 -nH --no-parent "http://$MASTER/$OFED_DIR/$OFED_NAME" 2> /tmp/wget.log
-        if [ "$?" != "0" ]; then
-            echo "[Error] Downloading Mellanox OFED file $OFED_NAME failed" >&2
-            exit 1
-        fi
-        if [ ! -f "/tmp/ofed/$OFED_NAME" ]; then
-            echo "[Failed]" >&2
-            exit 1
-        fi
-        echo "[OK]"
-
-        echo "Mounting Mellanox OFED file $OFED_NAME ........."
-        mount -o loop "/tmp/ofed/$OFED_NAME"  /tmp/ofed/mountpoint
-        if [ ! -f "/tmp/ofed/mountpoint/mlnxofedinstall" -o ! -x "/tmp/ofed/mountpoint/mlnxofedinstall" ]; then
-            echo "[Failed]" >&2
-            exit 1
-        fi
-        echo "[OK]"
-
-        if [ "$NODESETSTATE" = "install" ]; then
-            hack_uname
-        fi
-
-        echo "Start Mellanox OFED installation ........."
-        env -i "PATH=${PATH}" /tmp/ofed/mountpoint/mlnxofedinstall "${MLNXOFED_OPTS[@]}"
-
-        #force openibd load all modules in need, restart again
-        if [ "$NODESETSTATE" = "boot" ]; then
-            sleep 1
-            service openibd restart
-            if [ "$?" != "0" ]; then
-                echo "[Error] service openibd restart failed."
-                exit 1
-            fi
-        fi
-    fi
-
-    if [[ "$NODESETSTATE" == "genimage" ]]; then
-        rm -rf -- "$IMGROOTPATH/tmp/ofed"
-        mkdir -p "$IMGROOTPATH/tmp/ofed/mountpoint"
-        if [ "$?" != "0" ] ;then
-           echo "[Error] We are in trouble to mkdir $IMGROOTPATH/tmp/ofed/mountpoint, please check your node" >&2
-           exit 1
-        fi
-
-        echo "Mounting Mellanox OFED file $OFED_DIR/$OFED_NAME ........."
-        mount -o loop "$OFED_DIR/$OFED_NAME"  "$IMGROOTPATH/tmp/ofed/mountpoint"
-        if [ ! -f "$IMGROOTPATH/tmp/ofed/mountpoint/mlnxofedinstall" -o ! -x "$IMGROOTPATH/tmp/ofed/mountpoint/mlnxofedinstall" ]; then
-            echo "[Failed]" >&2
-            exit 1
-        fi
-        echo "[OK]"
-
-        echo "Start Mellanox OFED installation ........."
-
-        mount --bind  /dev   "$IMGROOTPATH/dev/"
-        mount --bind  /proc  "$IMGROOTPATH/proc/"
-        mount --bind  /sys   "$IMGROOTPATH/sys/"
-
-        hack_uname "${IMGROOTPATH}"
-
-        # Being called from <image>.postinstall script
-        # Assume we are on the same machine
-        if [ -f /etc/SuSE-release ]; then
-            chroot "$IMGROOTPATH" rpm -e --noscripts --allmatches mlnx-ofa_kernel-kmp-default 2>/dev/null
-            chroot "$IMGROOTPATH" rpm -e --nodeps --allmatches libibverbs 2>/dev/null
-        elif grep -q Ubuntu /etc/os-release 2>/dev/null; then
-            echo "$HOSTNAME 's operating system is Ubuntu."
-            echo "If you want to install Mellanox_OFED in $HOSTNAME, $HOSTNAME must have ability to access ports.ubuntu.com"
-            echo -n "checking $HOSTNAME 's ability to access ports.ubuntu.com..........."
-            if ping -c 3 ports.ubuntu.com > /dev/null; then
-                echo "[OK]"
-            else
-                echo "[Failed]" >&2
-                echo "please make your $HOSTNAME has ability to access ports.ubuntu.com" >&2
-                exit 1
-            fi
-
-            sourceslist="$IMGROOTPATH/etc/apt/sources.list"
-            cp "$sourceslist" "${sourceslist}.bak"
-
-            echo "get distro name form $IMGROOTPATH/etc/lsb-release ......"
-            source $IMGROOTPATH/etc/lsb-release  >/dev/null 2>&1
-            if [ -z "$DISTRIB_CODENAME" ]; then
-                echo "[Error] can't get DISTRIB_CODENAME " >&2
-                exit 1
-            fi
-            echo "DISTRIB_CODENAME=$DISTRIB_CODENAME ...[OK]"
-
-            sed -i "/deb http:\\/\\/ports.ubuntu.com\\/ubuntu-ports\\/ $DISTRIB_CODENAME main/d"  $sourceslist
-            sed -i "/deb http:\\/\\/ports.ubuntu.com\\/ubuntu-ports\\/ $DISTRIB_CODENAME-updates main/d" $sourceslist
-            sed -i "/deb http:\\/\\/ports.ubuntu.com\\/ubuntu-ports\\/ $DISTRIB_CODENAME universe/d" $sourceslist
-            sed -i "/deb http:\\/\\/ports.ubuntu.com\\/ubuntu-ports\\/ $DISTRIB_CODENAME-updates universe/d" $sourceslist
-
-            cat <<-EOF >>"$sourceslist"
-deb http://ports.ubuntu.com/ubuntu-ports/ $DISTRIB_CODENAME main
-deb http://ports.ubuntu.com/ubuntu-ports/ $DISTRIB_CODENAME-updates main
-deb http://ports.ubuntu.com/ubuntu-ports/ $DISTRIB_CODENAME universe
-deb http://ports.ubuntu.com/ubuntu-ports/ $DISTRIB_CODENAME-updates universe
-EOF
-
-            chroot "$IMGROOTPATH" apt-get clean all
-            sleep 1
-            chroot "$IMGROOTPATH" apt-get update
-
-            chroot "$IMGROOTPATH" sh -c 'apt-get install -y linux-headers-$(uname -r)'
-        else #for rhels
-            chroot "$IMGROOTPATH" rpm -e --nodeps --allmatches libibverbs 2>/dev/null
-        fi
-        chroot "$IMGROOTPATH" env -i "PATH=${PATH}" /tmp/ofed/mountpoint/mlnxofedinstall "${MLNXOFED_OPTS[@]}"
-    fi
-fi
diff --git a/xCAT-test/autotest/testcase/infiniband/rhel-infiniband-diskfull-install.sh b/xCAT-test/autotest/testcase/infiniband/rhel-infiniband-diskfull-install.sh
index 5729e2f56..332a863b7 100755
--- a/xCAT-test/autotest/testcase/infiniband/rhel-infiniband-diskfull-install.sh
+++ b/xCAT-test/autotest/testcase/infiniband/rhel-infiniband-diskfull-install.sh
@@ -135,10 +135,10 @@ mkdir -p /install/custom/install/rh
 	:
 ) >"/install/custom/install/rh/mlnx.${LINUX_DISTRO%%.*}.${LINUX_ARCH}.otherpkgs.pkglist"
 
-cp /opt/xcat/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install.v2 \
-	/install/postscripts/mlnxofed_ib_install.v2
+cp /opt/xcat/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install \
+	/install/postscripts/mlnxofed_ib_install
 
-chdef "${COMPUTE_NODE}" "postscripts=syslog,remoteshell,syncfiles,mlnxofed_ib_install.v2 -p /install/mlnx/${MLNX_ISO##*/} -m --add-kernel-support"
+chdef "${COMPUTE_NODE}" "postscripts=syslog,remoteshell,syncfiles,mlnxofed_ib_install -p /install/mlnx/${MLNX_ISO##*/} -m --add-kernel-support"
 
 rm -rf "${OSIMAGE_OTHERPKGDIR}"
 mkdir -p "${OSIMAGE_OTHERPKGDIR}"
diff --git a/xCAT-test/autotest/testcase/infiniband/rhel-infiniband-diskless-install.sh b/xCAT-test/autotest/testcase/infiniband/rhel-infiniband-diskless-install.sh
index b0c646118..494b16cfb 100755
--- a/xCAT-test/autotest/testcase/infiniband/rhel-infiniband-diskless-install.sh
+++ b/xCAT-test/autotest/testcase/infiniband/rhel-infiniband-diskless-install.sh
@@ -138,13 +138,13 @@ mkdir -p /install/custom/netboot/rh
 	:
 ) >"/install/custom/netboot/rh/mlnx.${LINUX_DISTRO%%.*}.${LINUX_ARCH}.otherpkgs.pkglist"
 
-cp /opt/xcat/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install.v2 \
-	/install/postscripts/mlnxofed_ib_install.v2
+cp /opt/xcat/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install \
+	/install/postscripts/mlnxofed_ib_install
 (
 	cat "/opt/xcat/share/xcat/netboot/rh/compute.${LINUX_DISTRO%%.*}.${LINUX_ARCH}.postinstall"
 	cat <<-EOF
 
-	NODESETSTATE=genimage IMGROOTPATH=${OSIMAGE_ROOTIMGDIR}/rootimg bash -x /install/postscripts/mlnxofed_ib_install.v2 -p /install/mlnx/${MLNX_ISO##*/} -m --add-kernel-support
+	NODESETSTATE=genimage IMGROOTPATH=${OSIMAGE_ROOTIMGDIR}/rootimg bash -x /install/postscripts/mlnxofed_ib_install -p /install/mlnx/${MLNX_ISO##*/} -m --add-kernel-support
 	EOF
 ) >"/install/custom/netboot/rh/mlnx.${LINUX_DISTRO%%.*}.${LINUX_ARCH}.postinstall"
 chmod 0755 "/install/custom/netboot/rh/mlnx.${LINUX_DISTRO%%.*}.${LINUX_ARCH}.postinstall"