diff --git a/.travis.yml b/.travis.yml
index 0c936bf7e..507fd0a77 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,12 @@
 os: linux
 dist: trusty
 sudo: required
-before_install: 
+before_install:
 - sudo apt-get install -y git reprepro devscripts debhelper libsoap-lite-perl libdbi-perl quilt openssh-server dpkg looptools genometools software-properties-common
 - perl -v
 - echo "yes" | sudo cpan -f -i Capture::Tiny
 
-script: 
+script:
 - echo $TRAVIS_BUILD_ID
 - echo $TRAVIS_EVENT_TYPE
 - echo $TRAVIS_BUILD_NUMBER
diff --git a/README.rst b/README.rst
index 12c854a1f..36d9cfc0c 100644
--- a/README.rst
+++ b/README.rst
@@ -6,23 +6,11 @@ xCAT is a toolkit for the deployment and administration of clusters.
 Documentation
 -------------
 
-Latest xCAT documentation is available at: http://xcat-docs.readthedocs.io/en/latest/
+`The stable documentation of xCAT <https://xcat-docs.readthedocs.io/en/stable/>`_
 
-`document for xCAT 2.14.1 <http://xcat-docs.readthedocs.io/en/2.14.1/>`_
+`The latest documentation of xCAT <http://xcat-docs.readthedocs.io/en/latest/index.html>`_
 
-`document for xCAT 2.14 <http://xcat-docs.readthedocs.io/en/2.14.0/>`_
-
-`document for xCAT 2.13.11 <http://xcat-docs.readthedocs.io/en/2.13.11/>`_
-
-`document for xCAT 2.13.10 <http://xcat-docs.readthedocs.io/en/2.13.10/>`_
-
-`document for xCAT 2.13.9 <http://xcat-docs.readthedocs.io/en/2.13.9/>`_
-
-`document for xCAT 2.13 <http://xcat-docs.readthedocs.io/en/2.13.0/>`_
-
-`document for xCAT 2.12 <http://xcat-docs.readthedocs.io/en/2.12/>`_
-
-`document for xCAT 2.11 <http://xcat-docs.readthedocs.io/en/2.11/>`_
+`The documentation of xCAT each release <http://readthedocs.org/projects/xcat-docs/versions/>`_
 
 
 Open Source License
diff --git a/Version b/Version
index 7243b12cf..cf28a128f 100644
--- a/Version
+++ b/Version
@@ -1 +1 @@
-2.14.2
+2.14.3
diff --git a/build-ubunturepo b/build-ubunturepo
index a44c886c8..76d981c21 100755
--- a/build-ubunturepo
+++ b/build-ubunturepo
@@ -8,7 +8,7 @@
 # Getting Started:
 #  - Clone the xcat-core git repository under a directory named "xcat-core/src"
 #  - make sure reprepro is installed on the build machine
-#  - Run this script from the local git repository you just created.  
+#  - Run this script from the local git repository you just created.
 #       ./build-ubunturepo -c BUILDALL=1
 
 # Usage:  attr=value attr=value ... ./build-ubunturepo { -c | -d }
@@ -22,10 +22,12 @@
 #                           When you are ready to release this build, use PROMOTE=1 without PREGA
 #               BUILDALL=1 - build all rpms, whether they changed or not.  Should be used for snap builds that are in
 #                            prep for a release.
-#               GPGSIGN=0 -  Do not sign the repo in the end of the build. The repo will be signed by default 
-#                            
+#               GPGSIGN=0 -  Do not sign the repo in the end of the build. The repo will be signed by default
+#
 #               LOG=<filename> - provide an LOG file option to redirect some output into log file
 #
+#               DEST=<directory> - provide a directory to contains the build result
+#
 # For the dependency packages 1. All the xcat dependency deb packages should be uploaded to
 #                                "pokgsa/projects/x/xcat/build/ubuntu/xcat-dep/debs/" on GSA
 #                             2. run ./build-ubunturepo -d
@@ -47,7 +49,7 @@ fi
 . /etc/lsb-release
 
 # Check the necessary packages before starting the build
-declare -a packages=( "reprepro" "devscripts" "debhelper" "libsoap-lite-perl" "libdbi-perl" "quilt" )
+declare -a packages=( "reprepro" "devscripts" "debhelper" "libsoap-lite-perl" "libdbi-perl" "quilt" "git")
 
 for package in ${packages[@]}; do
     RC=`dpkg -l | grep $package >> /dev/null 2>&1; echo $?`
@@ -59,7 +61,7 @@ done
 
 # Process cmd line variable assignments, assigning each attr=val pair to a variable of same name
 for i in $*; do
-        echo $i | grep '='
+        echo $i | grep '=' -q
         if [ $? != 0 ];then
             continue
         fi
@@ -102,24 +104,38 @@ if [ "$c_flag" -a "$d_flag" ];then
     exit 2
 fi
 
+if [ -z "$BUILDALL" ]; then
+    BUILDALL=1
+fi
 
 # Find where this script is located to set some build variables
 old_pwd=`pwd`
 cd `dirname $0`
 curdir=`pwd`
 
-#define the dep source code path, core build target path and dep build target path
-local_core_repo_path="$curdir/../../xcat-core"
-local_dep_repo_path="$curdir/../../xcat-dep/xcat-dep"
-
 # Use flock to only one person build at the same time
 # Get a lock, so can not do 2 builds at once
 exec 8>/var/lock/xcatbld.lock
 if ! flock -n 8; then
-    echo "Can't get lock /var/lock/xcatbld.lock.  Someone else must be doing a build right now.  Exiting...."
+    echo "ERROR: Can't get lock /var/lock/xcatbld.lock.  Someone else must be doing a build right now.  Exiting...."
     exit 1
 fi
 
+# for the git case, query the current branch and set REL (changing master to devel if necessary)
+function setbranch {
+    # Get the current branch name
+    branch=`git rev-parse --abbrev-ref HEAD`
+    if [ "$branch" = "master" ]; then
+        REL="devel"
+    elif [ "$branch" = "HEAD" ]; then
+        # Special handling when in a 'detached HEAD' state
+        branch=`git describe --abbrev=0 HEAD`
+        [[ -n "$branch" ]] && REL=`echo $branch|cut -d. -f 1,2`
+    else
+        REL=$branch
+    fi
+}
+
 export HOME=/root
 
 WGET_CMD="wget"
@@ -142,31 +158,31 @@ else
     done
 fi
 
+REL=xcat-core
 if [ "$c_flag" ]
 then
-    # 
-    # The format of the directory for Ubuntu builds needs to be "xcat-core/src/xcat-core" so 
-    # that the output build files are created under "xcat-core". 
-    # TODO: This should be fixed in the future....
-    #
-    if [ -z "$REL" ]; then
-        t=${curdir%/src/xcat-core}
-        REL=`basename $t`
+    setbranch
+    package_dir_name=debs$REL
+
+    #define the dep source code path, core build target path and dep build target path
+    if [ -z "$DEST" ]; then
+        local_core_repo_path="$curdir/../../xcat-core"
+        PKGDIR="../../$package_dir_name"
+    else
+        local_core_repo_path="$DEST/$package_dir_name/xcat-core"
+        PKGDIR="$DEST/$package_dir_name/$package_dir_name"
     fi
-    if [ "$REL" != "xcat-core" ]; then
-        echo "ERROR: REL='$REL'needs to be 'xcat-core'.  Ensure the path is 'xcat-core/src/xcat-core'"
-        exit 1
+    if [ ! -d "$PKGDIR" ];then
+        mkdir -p "$PKGDIR"
     fi
 
+    echo "#############################################################"
+    echo "Building xcat-core on branch ($REL) to $local_core_repo_path"
+    echo "#############################################################"
     if [ "$PROMOTE" != 1 ]; then
         code_change=0
         update_log=''
-        # get the version
-        git_flag=1
-        REL=`git rev-parse --abbrev-ref HEAD`
-        if [ "$REL" = "master" ]; then
-            REL="devel"
-        fi
+
         if [ -z "$GITUP" ];then
             update_log=../coregitup
             echo "git pull > $update_log"
@@ -186,12 +202,8 @@ then
         commit_id_long=`git rev-parse HEAD`
         commit_id="${commit_id_long:0:7}"
 
-        package_dir_name=debs$REL
-        #TODO: define the core path and tarball name
-        tarball_name="core-debs-snap.tar.bz2"
-
         if [ $code_change == 0 -a "$UP" != 1 -a "$BUILDALL" != 1 ]; then
-            echo "Nothing new detected"
+            echo "Nothing new detected.  Exiting...."
             exit 0
         fi
 
@@ -205,9 +217,6 @@ then
         xcat_release="snap$(date '+%Y%m%d%H%M')"
         pkg_version="${ver}-${xcat_release}"
 
-        if [ ! -d ../../$package_dir_name ];then
-            mkdir -p "../../$package_dir_name"
-        fi
         packages="xCAT-client xCAT-genesis-scripts perl-xCAT xCAT-server xCAT xCATsn xCAT-test xCAT-buildkit xCAT-vlan xCAT-confluent xCAT-probe"
         target_archs=(amd64 ppc64el)
         for file in $packages
@@ -221,7 +230,7 @@ then
             for target_arch in $target_archs
             do
                 if grep -q $file $update_log || [ "$BUILDALL" == 1 -o "$file" = "perl-xCAT" ]; then
-                    rm -f ../../$package_dir_name/${file_low}_*.$target_arch.deb
+                    rm -f $PKGDIR/${file_low}_*.$target_arch.deb
                     cd $file
                     CURDIR=$(pwd)
                     dch -v $pkg_version -b -c debian/changelog $build_string
@@ -278,21 +287,12 @@ then
                     cd -
                     find $file -maxdepth 3 -type d -name "${file_low}*" | grep debian | xargs rm -rf
                     find $file -maxdepth 3 -type f -name "files" | grep debian | xargs rm -rf
-                    mv ${file_low}* ../../$package_dir_name/
+                    mv ${file_low}* $PKGDIR/
                 fi
             done
         done
 
-        find ../../$package_dir_name/* ! -name *.deb | xargs rm -f
-    else
-        if [ "$REL" = "xcat-core" ];then
-            git_flag=1
-            REL=`git rev-parse --abbrev-ref HEAD`
-            if [ "$REL" = "master" ]; then
-                REL="devel"
-            fi
-        fi
-        package_dir_name=debs$REL
+        find $PKGDIR/* ! -name *.deb | xargs rm -f
     fi
 
     if [ "$PROMOTE" = 1 ]; then
@@ -332,9 +332,9 @@ Description: Repository automatically genereted conf
 __EOF__
 
        if [ "$GPGSIGN" = "0" ];then
-           echo "GPGSIGN=$GPGSIGN specified, the repo will not be signed"
+           #echo "GPGSIGN=$GPGSIGN specified, the repo will not be signed"
            echo "" >> conf/distributions
-       else 
+       else
            echo "SignWith: 5619700D" >> conf/distributions
            echo "" >> conf/distributions
        fi
@@ -375,7 +375,7 @@ __EOF__
     chmod 775 mklocalrepo.sh
 
     #
-    # Add a buildinfo file into the tar.bz2 file to track information about the build 
+    # Add a buildinfo file into the tar.bz2 file to track information about the build
     #
     BUILDINFO=$local_core_repo_path/buildinfo
     echo "VERSION=$ver" > $BUILDINFO
@@ -396,10 +396,18 @@ __EOF__
     chmod -R g+w xcat-core
 
     #build the tar ball
+    echo "Creating `pwd`/$tar_name ..."
     tar -hjcf $tar_name xcat-core
     chgrp root $tar_name
     chmod g+w $tar_name
 
+    if [ -n "$DEST" ]; then
+        ln -sf $(basename `pwd`)/$tar_name ../$tar_name
+        if [ $? != 0 ]; then
+            echo "ERROR: Failed to make symbol link $DEST/$tar_name"
+        fi
+    fi
+
     if [ ! -e core-snap ]; then
         ln -s xcat-core core-snap
     fi
@@ -422,6 +430,13 @@ then
        exit 1;
     fi
 
+    #define the dep source code path, core build target path and dep build target path
+    if [ -z "$DEST" ]; then
+        local_dep_repo_path="$curdir/../../xcat-dep/xcat-dep"
+    else
+        local_dep_repo_path="$DEST/xcat-dep/xcat-dep"
+    fi
+
     # Sync from the GSA master copy of the dep rpms
     echo "Creating directory $local_dep_repo_path"
     mkdir -p $local_dep_repo_path/
@@ -526,7 +541,7 @@ __EOF__
     APT_DIR="${FRS}/xcat"
     APT_REPO_DIR="${APT_DIR}/repos/apt/devel"
 
-    # Decide whether to upload the xcat-dep package or NOT (default is to NOT upload xcat-dep 
+    # Decide whether to upload the xcat-dep package or NOT (default is to NOT upload xcat-dep
     if [ "$UP" != "1" ]; then
         echo "Upload not specified, Done! (rerun with UP=1, to upload)"
         cd $old_pwd
diff --git a/buildcore.sh b/buildcore.sh
index af5d75776..25c9c986a 100755
--- a/buildcore.sh
+++ b/buildcore.sh
@@ -29,8 +29,8 @@
 #        EMBED=<embedded-environment> - the environment for which a minimal version of xcat should be built, e.g. zvm or flex
 #        VERBOSE=1 - to see lots of verbose output
 #        LOG=<filename> - provide an LOG file option to redirect some output into log file
-#        RPMSIGN=0 or RPMSIGN=1 - Sign the RPMs using the keys on GSA, the default is to sign the rpms without RPMSIGN specified
-
+#        GPGSIGN/RPMSIGN=0 or GPGSIGN/RPMSIGN=1 - Sign the RPMs using the keys on GSA, the default is to sign the rpms without GPGSIGN/RPMSIGN specified
+#        DEST=<directory> - provide a directory to contains the build result
 #
 # The following environment variables can be modified if you need
 #
@@ -51,24 +51,10 @@ YUMREPOURL="http://${SERVER}/${FILES_PATH}/xcat/repos/yum"
 if [ "$1" = "-h"  ] || [ "$1" = "-help"  ] || [ "$1" = "--help"  ]; then
     echo "Usage:"
     echo "      ./buildcore.sh [-h | --help]"
-    echo "      ./buildcore.sh [UP=1] [RPMSIGN=1] [EMBED=<embedded-environment>] [COMMITID=<id>] [GITPULL=0]"
+    echo "      ./buildcore.sh [UP=1] [GPGSIGN=1] [EMBED=<embedded-environment>] [COMMITID=<id>] [GITPULL=0]"
     exit 0
 fi
 
-# For users to build from source code, simply run ./buildcore.sh
-#  1. Do not sign RPM by default
-#  2. Build all packages by default
-#  3. Do not upload to sourcefore by default
-if [ -z "$RPMSIGN" ]; then
-    RPMSIGN=0
-fi
-if [ -z "$BUILDALL" ]; then
-    BUILDALL=1
-fi
-if [ -z "$UP" ]; then
-    UP=0
-fi
-
 # These are the rpms that should be built for each kind of xcat build
 ALLBUILD="perl-xCAT xCAT-client xCAT-server xCAT-test xCAT-buildkit xCAT xCATsn xCAT-genesis-scripts xCAT-SoftLayer xCAT-vlan xCAT-confluent xCAT-probe xCAT-csm"
 ALLBUILD="perl-xCAT xCAT-client xCAT-server xCAT-test xCAT-buildkit xCAT xCATsn xCAT-genesis-scripts xCAT-SoftLayer xCAT-vlan xCAT-confluent xCAT-probe xCAT-csm xCAT-openbmc-py"
@@ -96,6 +82,26 @@ if [ "$VERBOSE" = "1" -o "$VERBOSE" = "yes" ]; then
     VERBOSEMODE=1
 fi
 
+# For users to build from source code, simply run ./buildcore.sh
+#  1. Do not sign RPM by default
+#  2. Build all packages by default
+#  3. Do not upload to sourcefore by default
+
+if [ -z "$RPMSIGN" ] && [ -z "$GPGSIGN" ]; then
+    RPMSIGN=0
+elif [ -n "$GPGSIGN" ]; then # use GPGSIGN in first
+    RPMSIGN=$GPGSIGN
+fi
+if [ -z "$RPMSIGN" -o "$RPMSIGN" != "1" ]; then
+    RPMSIGN=0
+fi
+if [ -z "$BUILDALL" ]; then
+    BUILDALL=1
+fi
+if [ -z "$UP" ]; then
+    UP=0
+fi
+
 # Find where this script is located to set some build variables
 cd `dirname $0`
 # strip the /src/xcat-core from the end of the dir to get the next dir up and use as the release
@@ -123,9 +129,16 @@ fi
 
 # for the git case, query the current branch and set REL (changing master to devel if necessary)
 function setbranch {
-    REL=`git name-rev --name-only HEAD`
-    if [ "$REL" = "master" ]; then
+    # Get the current branch name
+    branch=`git rev-parse --abbrev-ref HEAD`
+    if [ "$branch" = "master" ]; then
         REL="devel"
+    elif [ "$branch" = "HEAD" ]; then
+        # Special handling when in a 'detached HEAD' state
+        branch=`git describe --abbrev=0 HEAD`
+        [[ -n "$branch" ]] && REL=`echo $branch|cut -d. -f 1,2`
+    else
+        REL=$branch
     fi
 }
 
@@ -159,15 +172,16 @@ else
 fi
 
 XCATCORE="xcat-core"        # core-snap is a sym link to xcat-core
+SRCD=core-snap-srpms
 
 if [ "$GIT" = "1" ]; then    # using git - need to include REL in the path where we put the built rpms
     #DESTDIR=../../$REL$EMBEDDIR/$XCATCORE
-        DESTDIR=$HOME/xcatbuild/$REL$EMBEDDIR/$XCATCORE
+    [ -z "$DEST" ] && DESTDIR=$HOME/xcatbuild/$REL$EMBEDDIR/$XCATCORE \
+                   || DESTDIR=$DEST/$REL$EMBEDDIR/$XCATCORE
 else
-    #DESTDIR=../..$EMBEDDIR/$XCATCORE
-        DESTDIR=$HOME/xcatbuild/..$EMBEDDIR/$XCATCORE
+    [ -z "$DEST" ] && DESTDIR=$HOME/xcatbuild/..$EMBEDDIR/$XCATCORE \
+                   || DESTDIR=$DEST/xcatbuild/..$EMBEDDIR/$XCATCORE
 fi
-SRCD=core-snap-srpms
 
 # currently aix builds ppc rpms, but someday it should build noarch
 if [ "$OSNAME" = "AIX" ]; then
@@ -437,7 +451,7 @@ fi
 
 # get gpg keys in place
 if [ "$OSNAME" != "AIX" ]; then
-    if [ -z "$RPMSIGN" -o "$RPMSIGN" == "1" ]; then
+    if [ "$RPMSIGN" == "1" ]; then
         mkdir -p $HOME/.gnupg
         for i in pubring.gpg secring.gpg trustdb.gpg; do
             if [ ! -f $HOME/.gnupg/$i ] ||
@@ -453,17 +467,20 @@ if [ "$OSNAME" != "AIX" ]; then
             echo '%_signature gpg' >> $MACROS
         fi
         if ! $GREP '%_gpg_name' $MACROS 2>/dev/null; then
-            echo '%_gpg_name xCAT Security Key' >> $MACROS
+            echo '%_gpg_name xCAT Automatic Signing Key' >> $MACROS
         fi
         echo "Signing RPMs..."
         build-utils/rpmsign.exp `find $DESTDIR -type f -name '*.rpm'` | grep -v -E '(already contains identical signature|was already signed|rpm --quiet --resign|WARNING: standard input reopened)'
         build-utils/rpmsign.exp $SRCDIR/*rpm | grep -v -E '(already contains identical signature|was already signed|rpm --quiet --resign|WARNING: standard input reopened)'
-        createrepo --checksum sha $DESTDIR            # specifying checksum so the repo will work on rhel5
-        createrepo --checksum sha $SRCDIR
+        # RHEL5 is archaic. Use the default hash algorithm to do the checksum.
+        # Which is SHA-256 on RHEL6.
+        createrepo $DESTDIR
+        createrepo $SRCDIR
         rm -f $SRCDIR/repodata/repomd.xml.asc
         rm -f $DESTDIR/repodata/repomd.xml.asc
-        gpg -a --detach-sign $DESTDIR/repodata/repomd.xml
-        gpg -a --detach-sign $SRCDIR/repodata/repomd.xml
+        # Use the xCAT Automatic Signing Key to do the signing
+        gpg -a --detach-sign --default-key 5619700D $DESTDIR/repodata/repomd.xml
+        gpg -a --detach-sign --default-key 5619700D $SRCDIR/repodata/repomd.xml
         if [ ! -f $DESTDIR/repodata/repomd.xml.key ]; then
             ${WGET_CMD} -q -P $DESTDIR/repodata $GSA/keys/repomd.xml.key
         fi
@@ -471,8 +488,8 @@ if [ "$OSNAME" != "AIX" ]; then
             ${WGET_CMD} -P $SRCDIR/repodata $GSA/keys/repomd.xml.key
         fi
     else
-        createrepo --checksum sha $DESTDIR
-        createrepo --checksum sha $SRCDIR
+        createrepo $DESTDIR
+        createrepo $SRCDIR
     fi
 fi
 
@@ -574,6 +591,13 @@ fi
 chgrp $SYSGRP $TARNAME
 chmod g+w $TARNAME
 
+if [ -n "$DEST" ]; then
+    ln -sf $(basename `pwd`)/$TARNAME ../$TARNAME
+    if [ $? != 0 ]; then
+        echo "ERROR: Failed to make symbol link $DEST/$TARNAME"
+    fi
+fi
+
 # Decide whether to upload or not
 if [ -n "$UP" ] && [ "$UP" == 0 ]; then
     exit 0;
diff --git a/builddep.sh b/builddep.sh
index 7a4e4de8f..2d7b221c1 100755
--- a/builddep.sh
+++ b/builddep.sh
@@ -3,21 +3,21 @@
 #
 # Package up all the xCAT open source dependencies
 # - creating the yum repos
-# - tar up the deps package 
+# - tar up the deps package
 #
 # This script assumes that the individual rpms have already been compiled
 # for the relevant architectures from the src & spec files in git.
 #
 # Dependencies:
-# - createrepo command needs to be present on the build machine 
+# - createrepo command needs to be present on the build machine
 #
 # Usage:  builddep.sh [attr=value attr=value ...]
-#       DESTDIR=<dir> - the dir to place the dep tarball in.  The default is ../../../xcat-dep, 
+#       DESTDIR=<dir> - the dir to place the dep tarball in.  The default is ../../../xcat-dep,
 #                       relative to where this script is located.
-#       UP=0 or UP=1  - override the default upload behavior 
-#       FRSYUM=0      - put the directory of individual rpms in the project web area instead 
+#       UP=0 or UP=1  - override the default upload behavior
+#       FRSYUM=0      - put the directory of individual rpms in the project web area instead
 #                       of the FRS area.
-#       VERBOSE=1     - Set to 1 to see more VERBOSE output 
+#       VERBOSE=1     - Set to 1 to see more VERBOSE output
 
 # you can change this if you need to
 USER=xcat
@@ -45,7 +45,7 @@ fi
 
 if [ ! -d $GSA ]; then
 	echo "ERROR: This script is intended to be used by xCAT development..."
-	echo "ERROR: The GSA directory ($GSA) directory does not appear to be mounted, cannot continue!" 
+	echo "ERROR: The GSA directory ($GSA) directory does not appear to be mounted, cannot continue!"
 	exit 1
 fi
 
@@ -73,7 +73,7 @@ XCATCOREDIR=`/bin/pwd`
 if [ -z "$DESTDIR" ]; then
 	# This is really a hack here because it depends on the build
 	# environment structure.  However, it's not expected that
-	# users are building the xcat-dep packages 
+	# users are building the xcat-dep packages
 	DESTDIR=../../xcat-dep
 fi
 
@@ -129,7 +129,7 @@ if [ "$OSNAME" != "AIX" ]; then
 	echo "===> Modifying the xcat-dep.repo files to point to the correct location..."
 	# 10/01/2015 - vkhu
 	# The URLs have been updated in GSA, this section is not needed at the moment
-	# 
+	#
 	#if [ "$FRSYUM" != 0 ]; then
 	#	newurl="$YUMREPOURL2"
 	#	oldurl="$YUMREPOURL1"
@@ -218,12 +218,12 @@ fi
 
 # Get the permissions and group correct
 if [ "$OSNAME" == "AIX" ]; then
-	# AIX 
+	# AIX
 	SYSGRP=system
 	YUM=aix
 	FRSDIR='2.x_AIX'
 else
-	# Linux 
+	# Linux
 	SYSGRP=root
 	YUM=yum/devel
 	FRSDIR='2.x_Linux'
@@ -232,9 +232,9 @@ chgrp -R -h $SYSGRP *
 chmod -R g+w *
 
 echo "===> Building the tarball..."
-# 
+#
 # Want to stay above xcat-dep so we can rsync the whole directory
-# DO NOT CHANGE DIRECTORY AFTER THIS POINT!! 
+# DO NOT CHANGE DIRECTORY AFTER THIS POINT!!
 #
 cd ..
 pwd
@@ -254,12 +254,12 @@ else
 	tar $verbosetar -jcf $DFNAME xcat-dep
 fi
 
-if [[ ${UP} -eq 0 ]]; then 
+if [[ ${UP} -eq 0 ]]; then
 	echo "Upload not being done, set UP=1 to upload to xcat.org"
 	exit 0;
 fi
 
-# Upload the directory structure to xcat.org yum area (xcat/repos/yum). 
+# Upload the directory structure to xcat.org yum area (xcat/repos/yum).
 if [ "$FRSYUM" != 0 ]; then
 	links="-L"	# FRS does not support rsyncing sym links
 else
@@ -284,7 +284,7 @@ echo "Uploading README to $FRS/xcat-dep/$FRSDIR/ ..."
 while [ $((i+=1)) -le 5 ] && ! rsync -v README  $USER@$TARGET_MACHINE:$FRS/xcat-dep/$FRSDIR/
 do : ; done
 
-# For some reason the README is not updated 
+# For some reason the README is not updated
 echo "Uploading README to $YUMDIR/$YUM/ ..."
 while [ $((i+=1)) -le 5 ] && ! rsync -v README  $USER@$TARGET_MACHINE:$YUMDIR/$YUM/
 do : ; done
diff --git a/buildlocal.sh b/buildlocal.sh
index 60da105aa..54bd06a86 100755
--- a/buildlocal.sh
+++ b/buildlocal.sh
@@ -35,7 +35,7 @@ ls $CURDIR/makerpm
 
 if [ $? -gt 0 ]; then
                 echo "Error:no repo exist, exit 1."
-                exit 1 
+                exit 1
 fi
 
 # Get a lock, so can not do 2 builds at once
@@ -77,8 +77,8 @@ echo "This is an Ubuntu system"
      fi
      cd -
      mv ${rpmname_low}* $CURDIR/build
- 
- done 
+
+ done
      #delete all files except  .deb file
      find $CURDIR/build/* ! -name *.deb | xargs rm -f
 
@@ -97,31 +97,31 @@ echo "This is an $OSNAME system"
      fi
 
      mkdir -p $CURDIR/build/
-  
+
    #always build perl-xCAT
-   $CURDIR/makerpm  perl-xCAT  
- 
+   $CURDIR/makerpm  perl-xCAT
+
 
    # Build the rest of the noarch rpms
    for rpmname in xCAT-client xCAT-server xCAT-IBMhpc xCAT-rmc xCAT-test xCAT-buildkit xCAT-vlan; do
-        if [ "$OSNAME" = "AIX" -a "$rpmname" = "xCAT-buildkit" ]; then continue; fi     
+        if [ "$OSNAME" = "AIX" -a "$rpmname" = "xCAT-buildkit" ]; then continue; fi
         $CURDIR/makerpm $rpmname
    done
-  
+
   #build xCAT-genesis-scripts if it is x86_64 platform
   ARCH=$(uname -p)
-  if [ "$ARCH" = "x86_64" ]; then 
-       $CURDIR/makerpm xCAT-genesis-scripts x86_64  
+  if [ "$ARCH" = "x86_64" ]; then
+       $CURDIR/makerpm xCAT-genesis-scripts x86_64
   else
        $CURDIR/makerpm xCAT-genesis-scripts ppc64
   fi
 
-  
+
   # Build the xCAT and xCATsn rpms for all platforms
   for rpmname in xCAT xCATsn; do
                 if [ "$OSNAME" = "AIX" ]; then
                         $CURDIR/makerpm $rpmname
-                        if [ $? -ne 0 ]; then FAILEDRPMS="$FAILEDRPMS $rpmname"; fi 
+                        if [ $? -ne 0 ]; then FAILEDRPMS="$FAILEDRPMS $rpmname"; fi
                 else
                         for arch in x86_64 ppc64 s390x; do
                                 $CURDIR/makerpm $rpmname $arch
@@ -133,7 +133,7 @@ echo "This is an $OSNAME system"
   if [ "$OS" = "SUSE" ]; then
       cp /usr/src/packages/RPMS/noarch/* $CURDIR/build/
       cp /usr/src/packages/RPMS/x86_64/* $CURDIR/build/
-      cp /usr/src/packages/RPMS/ppc64/* $CURDIR/build/ 
+      cp /usr/src/packages/RPMS/ppc64/* $CURDIR/build/
   else
       cp /root/rpmbuild/RPMS/noarch/* $CURDIR/build/
       cp /root/rpmbuild/RPMS/x86_64/* $CURDIR/build/
@@ -158,7 +158,7 @@ EOF
      rm -f /etc/zypp/repos.d/xcat-core.repo
      zypper ar file://$CURDIR/build xcat-core
   fi
-   
+
 fi
 
 
diff --git a/create_man_pages.py b/create_man_pages.py
index 2a5ff368a..01f24b03e 100755
--- a/create_man_pages.py
+++ b/create_man_pages.py
@@ -20,15 +20,15 @@ parser.add_option("--prefix", dest="PREFIX", help="Specify the location of the P
 POD2RST="pod2rst"
 
 def cmd_exists(cmd):
-    return subprocess.call("type " + cmd, shell=True, 
+    return subprocess.call("type " + cmd, shell=True,
         stdout=subprocess.PIPE, stderr=subprocess.PIPE) == 0
 
 prefix_path = None
 prefix_lib_path = None
 
-if options.PREFIX: 
+if options.PREFIX:
     if '~' in options.PREFIX:
-        # else assume full path is provided 
+        # else assume full path is provided
         prefix_path = os.path.expanduser(options.PREFIX)
     else:
         prefix_path = options.PREFIX
@@ -39,13 +39,13 @@ if options.PREFIX:
         sys.exit(1)
 
     prefix_lib_path = "%s/lib" %(prefix_path)
-    if not os.path.isdir(prefix_lib_path): 
+    if not os.path.isdir(prefix_lib_path):
         prefix_lib_path = "%s/lib64" %(prefix_path)
         if not os.path.isdir(prefix_lib_path):
             print "ERROR, Cannot find the Perl lib directory in %s/lib or %s/lib64" %(prefix_path, prefix_path)
             sys.exit(1)
 
-else: 
+else:
     if not cmd_exists(POD2RST):
         print "ERROR, %s requires pod2rst to continue!" %(os.path.basename(__file__))
         parser.print_help()
@@ -57,13 +57,13 @@ MANPAGE_DEST="./docs/source/guides/admin-guides/references/man"
 
 #
 # add the following to delete the generate files before creating them
-# essentially this allows us to remove man pages and they will be 
+# essentially this allows us to remove man pages and they will be
 # removed in the generation
 print "Cleaning up the generated man pages in %s" %(MANPAGE_DEST)
 allfiles = glob("%s*/*.rst" %(MANPAGE_DEST))
-for d in allfiles: 
-    # Skip over the index.rst file 
-    if not "index.rst" in d: 
+for d in allfiles:
+    # Skip over the index.rst file
+    if not "index.rst" in d:
         print "Removing file %s" %(d)
         os.remove(d)
 
@@ -93,18 +93,18 @@ def fix_double_dash(rst_file):
     os.system(sed_cmd)
     #remove intermediate .sed1 file
     rm_sed1file_cmd = "rm %s.sed1" %(rst_file)
-    os.system(rm_sed1file_cmd)   
+    os.system(rm_sed1file_cmd)
 
 build_db_man_pages()
 
 # List the xCAT component directory which contain pod pages
 COMPONENTS = ['xCAT-SoftLayer', 'xCAT-test', 'xCAT-client', 'xCAT-vlan', 'perl-xCAT', 'xCAT-buildkit']
 
-for component in COMPONENTS: 
+for component in COMPONENTS:
     for root,dirs,files in os.walk("%s" %(component)):
 
         for file in files:
-            # only interested in .pod files 
+            # only interested in .pod files
             if file.endswith(".pod"):
                 pod_input = os.path.join(root,file)
 
@@ -130,7 +130,7 @@ for component in COMPONENTS:
                     cmd = "perl -I %s/share/perl5 %s/bin/%s " %(prefix_path, prefix_path, POD2RST)
 
                 cmd += " --infile=%s --outfile=%s --title=%s.%s" %(pod_input, rst_output, title, man_ver)
-                # print cmd 
+                # print cmd
                 os.system(cmd)
 		if man_ver == '1' or man_ver == '8':
                     fix_vertical_bar(rst_output)
diff --git a/docs/README.md b/docs/README.md
index 67a8b8ac0..8b4779eaf 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -10,11 +10,11 @@ The documentation project is written in restructured text (.rst) using Sphinx an
 
 * Using pip, install or update sphinx (See: http://pip.readthedocs.org/)
    ```
-    pip install sphinx  
+    pip install sphinx
    ```
    or
    ```
-    pip install sphinx --upgrade 
+    pip install sphinx --upgrade
    ```
 
 * Using pip, install ReadTheDocs theme
diff --git a/docs/source/QA/index.rst b/docs/source/QA/index.rst
index 2c8c72c0c..ed7466fed 100644
--- a/docs/source/QA/index.rst
+++ b/docs/source/QA/index.rst
@@ -5,4 +5,4 @@ Questions & Answers
    :maxdepth: 2
 
 
-   makehosts.rst
\ No newline at end of file
+   makehosts.rst
diff --git a/docs/source/QA/makehosts.rst b/docs/source/QA/makehosts.rst
index ba9755033..2c34bb586 100644
--- a/docs/source/QA/makehosts.rst
+++ b/docs/source/QA/makehosts.rst
@@ -67,15 +67,15 @@ Q: How to configure aliases?
 There are 3 methods to configure aliases:
 
 #. Use ``hostnames`` in ``hosts`` table to configure aliases for the installnic.
-#. If you want to use script ``confignetwork`` to configure secondary NICs, suggest to use ``aliases`` in ``nics`` table to configure aliases.  Refer to :doc:`Configure Aliases <../guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_aliases>` 
-#. If you want to generate aliases records in ``/etc/hosts`` for secondary NICs and you don't want to use the script ``confignetwork`` to configure these NICs, suggest to use ``otherinterfaces`` in ``hosts`` table to configure aliases.  Refer to following example: 
-       
+#. If you want to use script ``confignetwork`` to configure secondary NICs, suggest to use ``aliases`` in ``nics`` table to configure aliases.  Refer to :doc:`Configure Aliases <../guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_aliases>`
+#. If you want to generate aliases records in ``/etc/hosts`` for secondary NICs and you don't want to use the script ``confignetwork`` to configure these NICs, suggest to use ``otherinterfaces`` in ``hosts`` table to configure aliases.  Refer to following example:
+
     * If you want to add ``node1-hd`` ``20.1.1.1`` in ``hosts`` table, and don't use ``confignetwork`` to configure it, you can add ``otherinterfaces`` like this: ::
 
-        chdef node1 otherinterfaces="node1-hd:20.1.1.1" 
+        chdef node1 otherinterfaces="node1-hd:20.1.1.1"
 
     * After executing ``makehosts -n``, you can get records in ``/etc/hosts`` like following: ::
-    
+
         20.1.1.1 node1-hd
 
 **Note**: If suffixes or aliases for the same IP are configured in both ``hosts`` table and ``nics`` table, will cause conflicts. ``makehosts`` will use values from ``nics`` table. The values from ``nics`` table will over-write that from ``hosts`` table to create ``/etc/hosts`` records.
@@ -90,7 +90,7 @@ You can follow the best practice example.
     * There are 2 networks in different domains: ``mgtnetwork`` and ``pubnetwork``
     * ``mgtnetwork`` is xCAT management network
     * Generate 2 records with the same hostname in ``/etc/hosts``, like: ::
-   
+
         10.5.106.101 node1.cluster.com
         192.168.20.101 node1.public.com
 
@@ -101,11 +101,11 @@ You can follow the best practice example.
     #. Add networks entry in ``networks`` table: ::
 
         chdef -t network mgtnetwork net=10.0.0.0 mask=255.0.0.0 domain=cluster.com
-        chdef -t network pubnetwork net=192.168.30.0 mask=255.255.255.0 domain=public.com 
-     
+        chdef -t network pubnetwork net=192.168.30.0 mask=255.255.255.0 domain=public.com
+
     #. Create ``node1`` with ``ip=10.5.106.101``, xCAT can manage and install this node: ::
-   
-        chdef node1 ip=10.5.106.101 groups=all 
+
+        chdef node1 ip=10.5.106.101 groups=all
 
     #. Create ``node1-pub`` with ``ip=192.168.30.101``, this node is only used to generate ``/etc/hosts`` records for public network, can use ``_unmanaged`` group name to label it: ::
 
@@ -114,9 +114,9 @@ You can follow the best practice example.
     #. Execute ``makehosts -n`` to generate ``/etc/hosts`` records: ::
 
         makehosts -n
-    
+
     #. Check results in ``/etc/hosts``: ::
-     
+
         10.5.106.101 node1 node1.cluster.com
         192.168.30.101 node1-pub node1.public.com
 
diff --git a/docs/source/QA/makehosts_qa.rst b/docs/source/QA/makehosts_qa.rst
index f0c425b87..375c4c75b 100644
--- a/docs/source/QA/makehosts_qa.rst
+++ b/docs/source/QA/makehosts_qa.rst
@@ -66,15 +66,15 @@ Q: How to configure aliases?
 There are 3 methods to configure aliases:
 
 #. Use ``hostnames`` in ``hosts`` table to configure aliases for the installnic.
-#. If you want to use script ``confignetwork`` to configure secondary NICs, suggest to use ``aliases`` in ``nics`` table to configure aliases, you can refer to :doc:`Configure Aliases <../guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_aliases>` 
-#. If you want to generate aliases records in ``/etc/hosts`` for secondary NICs, and don't want to use script ``confignetwork`` to configure these NICs, suggest to use ``otherinterfaces`` in ``hosts`` table to configure aliases. You can refer to following example: 
-       
+#. If you want to use script ``confignetwork`` to configure secondary NICs, suggest to use ``aliases`` in ``nics`` table to configure aliases, you can refer to :doc:`Configure Aliases <../guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_aliases>`
+#. If you want to generate aliases records in ``/etc/hosts`` for secondary NICs, and don't want to use script ``confignetwork`` to configure these NICs, suggest to use ``otherinterfaces`` in ``hosts`` table to configure aliases. You can refer to following example:
+
     * If you want to add ``node1-hd`` ``20.1.1.1`` in ``hosts`` table, and don't use ``confignetwork`` to configure it, you can add ``otherinterfaces`` like this: ::
 
-        chdef node1 otherinterfaces="node1-hd:20.1.1.1" 
+        chdef node1 otherinterfaces="node1-hd:20.1.1.1"
 
     * After executing ``makehosts -n``, you can get records in ``/etc/hosts`` like following: ::
-    
+
         20.1.1.1 node1-hd
 
 **Note**: If suffixes or aliases for the same IP are configured in both ``hosts`` table and ``nics`` table, will cause conflicts. ``makehosts`` will use values from ``nics`` table. The values from ``nics`` table will over-write that from ``hosts`` table to create ``/etc/hosts`` records.
@@ -89,7 +89,7 @@ You can follow the best practice example.
     * There are 2 networks in different domains: ``mgtnetwork`` and ``pubnetwork``
     * ``mgtnetwork`` is xCAT management network
     * Generate 2 records with the same hostname in ``/etc/hosts``, like: ::
-   
+
         10.5.106.101 node1.cluster.com
         192.168.20.101 node1.public.com
 
@@ -100,11 +100,11 @@ You can follow the best practice example.
     #. Add networks entry in ``networks`` table: ::
 
         chdef -t network mgtnetwork net=10.0.0.0 mask=255.0.0.0 domain=cluster.com
-        chdef -t network pubnetwork net=192.168.30.0 mask=255.255.255.0 domain=public.com 
-     
+        chdef -t network pubnetwork net=192.168.30.0 mask=255.255.255.0 domain=public.com
+
     #. Create ``node1`` with ``ip=10.5.106.101``, xCAT can manage and install this node: ::
-   
-        chdef node1 ip=10.5.106.101 groups=all 
+
+        chdef node1 ip=10.5.106.101 groups=all
 
     #. Create ``node1-pub`` with ``ip=192.168.30.101``, this node is only used to generate ``/etc/hosts`` records for public network, can use ``_unmanaged`` group name to label it: ::
 
@@ -113,9 +113,9 @@ You can follow the best practice example.
     #. Execute ``makehosts -n`` to generate ``/etc/hosts`` records: ::
 
         makehosts -n
-    
+
     #. Check results in ``/etc/hosts``: ::
-     
+
         10.5.106.101 node1 node1.cluster.com
         192.168.30.101 node1-pub node1.public.com
 
diff --git a/docs/source/advanced/chain/chain_table.rst b/docs/source/advanced/chain/chain_table.rst
index b12a86863..1cee2d238 100644
--- a/docs/source/advanced/chain/chain_table.rst
+++ b/docs/source/advanced/chain/chain_table.rst
@@ -7,8 +7,8 @@ The chain table (``tabdump chain``) is an xCAT database table that holds the cha
  * currchain
  * chain
 
-To know how are those three attributes used, reference the picture: 
+To know how are those three attributes used, reference the picture:
+
+.. image:: chain_tasks_logic.png
 
-.. image:: chain_tasks_logic.png 
- 
 
diff --git a/docs/source/advanced/chain/chain_tasks.rst b/docs/source/advanced/chain/chain_tasks.rst
index 4c840ef5f..725752ae5 100644
--- a/docs/source/advanced/chain/chain_tasks.rst
+++ b/docs/source/advanced/chain/chain_tasks.rst
@@ -18,14 +18,14 @@ Currently only the ``bmcsetup`` command is officially supplied by xCAT to run to
     runimage=<URL>
 
 **URL** is a string which can be run by ``wget`` to download the image from the URL. The example could be: ::
-  
+
     runimage=http://<IP of xCAT Management Node>/<dir>/image.tgz
 
 The ``image.tgz`` **must** have the following properties:
   * Created using the ``tar zcvf`` command
   * The tarball must include a ``runme.sh`` script to initiate the execution of the runimage
 
-To create your own image, reference :ref:`creating image for runimage <create_image_for_runimage>`. 
+To create your own image, reference :ref:`creating image for runimage <create_image_for_runimage>`.
 
 **Tip**: You could try to run ``wget http://<IP of xCAT Management Node>/<dir>/image.tgz`` manually to make sure the path has been set correctly.
 
@@ -41,5 +41,5 @@ Causes the genesis kernel to create a shell for the administrator to log in and
 
 * standby
 
-Causes the genesis kernel to go into standby and wait for tasks from the chain. ... 
+Causes the genesis kernel to go into standby and wait for tasks from the chain. ...
 
diff --git a/docs/source/advanced/chain/create_image_for_runimage.rst b/docs/source/advanced/chain/create_image_for_runimage.rst
index fe029e1b0..a8d68339b 100644
--- a/docs/source/advanced/chain/create_image_for_runimage.rst
+++ b/docs/source/advanced/chain/create_image_for_runimage.rst
@@ -14,7 +14,7 @@ How to prepare a image for ``runimage`` in ``chain``
     * go to the directory and run `tar -zcvf <image> .`
 
 * Example
-    In the example, it shows how to install an independent pkg a.rpm 
+    In the example, it shows how to install an independent pkg a.rpm
 
     * Create the directory for the image: ::
 
@@ -29,7 +29,7 @@ How to prepare a image for ``runimage`` in ``chain``
 
          cat runme.sh
          echo "start installing a.rpm"
-         rpm -ivh a.rpm  
+         rpm -ivh a.rpm
 
     * modify the runme.sh script permission: ::
 
diff --git a/docs/source/advanced/chain/index.rst b/docs/source/advanced/chain/index.rst
index 48b556b2e..7cbce0ca0 100644
--- a/docs/source/advanced/chain/index.rst
+++ b/docs/source/advanced/chain/index.rst
@@ -12,4 +12,4 @@ The **chain** mechanism is implemented in xCAT genesis system. The genesis is a
     chain_tasks.rst
     run_tasks_during_discovery.rst
     run_tasks_to_configure.rst
-     
+
diff --git a/docs/source/advanced/cluster_maintenance/compute_node/index.rst b/docs/source/advanced/cluster_maintenance/compute_node/index.rst
index 87bc1c733..6f5374589 100644
--- a/docs/source/advanced/cluster_maintenance/compute_node/index.rst
+++ b/docs/source/advanced/cluster_maintenance/compute_node/index.rst
@@ -4,5 +4,5 @@ Compute Node
 .. toctree::
    :maxdepth: 2
 
-   changing_hostname_ip.rst 
+   changing_hostname_ip.rst
    replace/index.rst
diff --git a/docs/source/advanced/cluster_maintenance/compute_node/replace/openpower.rst b/docs/source/advanced/cluster_maintenance/compute_node/replace/openpower.rst
index 018de0672..39b2a4e2f 100644
--- a/docs/source/advanced/cluster_maintenance/compute_node/replace/openpower.rst
+++ b/docs/source/advanced/cluster_maintenance/compute_node/replace/openpower.rst
@@ -4,7 +4,7 @@ OpenPOWER Nodes
 
 When compute nodes are physically replaced in the frame, leverage xCAT to re-discover the compute nodes.  The following guide can be used for:
 
-  * IBM OpenPOWER S822LC for HPC 
+  * IBM OpenPOWER S822LC for HPC
 
 
 #. Identify the machine(s) to be replaced: ``frame10cn02``.
@@ -15,24 +15,24 @@ When compute nodes are physically replaced in the frame, leverage xCAT to re-dis
 
 #. Set the outgoing machine to ``offline`` and remove attributes of the machine: ::
 
-    nodeset frame10cn02 offline 
+    nodeset frame10cn02 offline
     chdef frame10cn02 mac=""
 
 #. If using **MTMS**-based discovery, fill in the Model-Type and Serial Number for the machine: ::
 
     chdef frame10cn02 mtm=8335-GTB serial=<NEW SERIAL NUMBER>
 
-#. If using **SWITCH**-based discovery, go on to the next step. The ``switch`` and ``switch-port`` should already be set in the compute node definition. 
+#. If using **SWITCH**-based discovery, go on to the next step. The ``switch`` and ``switch-port`` should already be set in the compute node definition.
 
    Node attributes will be replaced during the discovery process (mtm, serial, mac, etc.)
 
 #. Search for the new BMC in the open range: ::
 
-    bmcdiscover --range <IP open range> -w -z 
+    bmcdiscover --range <IP open range> -w -z
 
 #. When the BMC is found, start the discovery with the following commands: ::
 
     rsetboot /node-8335.* net
-    rpower /node-8335.* boot 
+    rpower /node-8335.* boot
 
 
diff --git a/docs/source/advanced/cluster_maintenance/index.rst b/docs/source/advanced/cluster_maintenance/index.rst
index e4fcb7ff7..de21e9e6d 100644
--- a/docs/source/advanced/cluster_maintenance/index.rst
+++ b/docs/source/advanced/cluster_maintenance/index.rst
@@ -4,7 +4,7 @@ Cluster Maintenance
 .. toctree::
    :maxdepth: 2
 
-   compute_node/index.rst 
+   compute_node/index.rst
    mgmt_node/index.rst
    service_node/index.rst
    sw_fw_inventory.rst
diff --git a/docs/source/advanced/cluster_maintenance/mgmt_node/changing_hostname_ip.rst b/docs/source/advanced/cluster_maintenance/mgmt_node/changing_hostname_ip.rst
index 5dbccfa64..e0d4724b5 100644
--- a/docs/source/advanced/cluster_maintenance/mgmt_node/changing_hostname_ip.rst
+++ b/docs/source/advanced/cluster_maintenance/mgmt_node/changing_hostname_ip.rst
@@ -70,7 +70,7 @@ Nothing to do.
 PostgreSQL
 ^^^^^^^^^^
 
-- Edit ``/etc/xcat/cfgloc`` file... 
+- Edit ``/etc/xcat/cfgloc`` file...
 
    Replace ``Pg:dbname=xcatdb;host=<old_MN_ip>|xcatadm|xcat20`` with ``Pg:dbname=xcatdb;host=<new_MN_ip>|xcatadm|xcat20``.
 
@@ -81,7 +81,7 @@ PostgreSQL
 MySQL
 ^^^^^
 
-- Edit ``/etc/xcat/cfglooc``... 
+- Edit ``/etc/xcat/cfglooc``...
     Replace ``mysql:dbname=xcatdb;host=<old_MN_ip>|xcatadmin|xcat20`` with ``mysql:dbname=xcatdb;host=<new_MN_ip>|xcatadmin|xcat20``
 
 Start the database
@@ -151,7 +151,7 @@ For example, the old IP address was "10.6.0.1"
 
     chdef -t node cn1-cn4 conserver=<new_ip_address>
 
-* Repeat the same process for the other attributes containing the old IP address. 
+* Repeat the same process for the other attributes containing the old IP address.
 
 Change networks table
 ^^^^^^^^^^^^^^^^^^^^^
@@ -178,7 +178,7 @@ If the old address still exists in the ``*.csv`` file, you can edit this file, t
 Generate SSL credentials(optional)
 ----------------------------------
 
-Use the following command to generate new SSL credentials: ``xcatconfig -c``. 
+Use the following command to generate new SSL credentials: ``xcatconfig -c``.
 
 Then update the following in xCAT:
 
diff --git a/docs/source/advanced/cluster_maintenance/mgmt_node/index.rst b/docs/source/advanced/cluster_maintenance/mgmt_node/index.rst
index 2cda13bd9..e97f304db 100644
--- a/docs/source/advanced/cluster_maintenance/mgmt_node/index.rst
+++ b/docs/source/advanced/cluster_maintenance/mgmt_node/index.rst
@@ -4,4 +4,4 @@ Management Node
 .. toctree::
    :maxdepth: 2
 
-   changing_hostname_ip.rst 
+   changing_hostname_ip.rst
diff --git a/docs/source/advanced/cluster_maintenance/service_node/index.rst b/docs/source/advanced/cluster_maintenance/service_node/index.rst
index bf5a4e05d..532e9758a 100644
--- a/docs/source/advanced/cluster_maintenance/service_node/index.rst
+++ b/docs/source/advanced/cluster_maintenance/service_node/index.rst
@@ -4,4 +4,4 @@ Service Node
 .. toctree::
    :maxdepth: 2
 
-   changing_hostname_ip.rst 
+   changing_hostname_ip.rst
diff --git a/docs/source/advanced/confluent/client/confluent_client.rst b/docs/source/advanced/confluent/client/confluent_client.rst
index 335ed8c6c..7873c6e2f 100644
--- a/docs/source/advanced/confluent/client/confluent_client.rst
+++ b/docs/source/advanced/confluent/client/confluent_client.rst
@@ -5,7 +5,7 @@ Starting the confetty client
 As the root user, running ``/opt/confluent/bin/confetty`` will open the confetty prompt ::
 
       [root@c910f02c05p03 ~]# /opt/confluent/bin/confetty
-      / -> 
+      / ->
 
 Creating a non root user
 ========================
@@ -26,19 +26,19 @@ It's recommenteed to create a non root user to use to connect to confetty
       password="********"
 
 
-Connecting to a remote server 
+Connecting to a remote server
 =============================
 
 
 In order to do remote sessions, keys must first be added to ``/etc/confluent``
 
-* /etc/confluent/privkey.pem - private key 
+* /etc/confluent/privkey.pem - private key
 * /etc/confluent/srvcert.pem - server cert
 
 If you want to use the xCAT Keys, you can simple copy them into ``/etc/confluent`` ::
 
     cp /etc/xcat/cert/server-key.pem /etc/confluent/privkey.pem
-    cp /etc/xcat/cert/server-cert.pem /etc/confluent/srvcert.pem 
+    cp /etc/xcat/cert/server-cert.pem /etc/confluent/srvcert.pem
 
 The user and password may alternatively be provided via environment variables: ::
 
@@ -55,4 +55,4 @@ If you want to run a confluent command against another host, could set the CONFL
     CONFLUENT_HOST=<remote_ip>
     export CONFLUENT_HOST
 
- 
+
diff --git a/docs/source/advanced/confluent/client/index.rst b/docs/source/advanced/confluent/client/index.rst
index 8058d7437..81e2078eb 100644
--- a/docs/source/advanced/confluent/client/index.rst
+++ b/docs/source/advanced/confluent/client/index.rst
@@ -4,4 +4,4 @@ confluent-client
 .. toctree::
    :maxdepth: 2
 
-   confluent_client.rst 
+   confluent_client.rst
diff --git a/docs/source/advanced/confluent/index.rst b/docs/source/advanced/confluent/index.rst
index dc8bb7737..9cbc0cd04 100644
--- a/docs/source/advanced/confluent/index.rst
+++ b/docs/source/advanced/confluent/index.rst
@@ -1,9 +1,9 @@
-Confluent 
+Confluent
 =========
 
 Confluent is a new codebase with a few goals in mind:
 
-* Augment xCAT 2.X series 
+* Augment xCAT 2.X series
 * Potentially serve in place of xCAT-server for the next generation of xCAT
 
 **Disclaimer:** *Confluent code in conjunction with xCAT 2.X is currently BETA, use at your own risk*
diff --git a/docs/source/advanced/confluent/server/confluent_server.rst b/docs/source/advanced/confluent/server/confluent_server.rst
index 6eccd2d71..233f9a1fa 100644
--- a/docs/source/advanced/confluent/server/confluent_server.rst
+++ b/docs/source/advanced/confluent/server/confluent_server.rst
@@ -1,8 +1,8 @@
 
-Getting Started 
+Getting Started
 ===============
 
-Confluent is intended to be used in conjunction with xCAT. 
+Confluent is intended to be used in conjunction with xCAT.
 The following documentation assumes that xCAT is already installed and configured on the management node.
 
 Download confluent
@@ -20,7 +20,7 @@ To build from source, ensure your machine has the correct development packages t
         cd confluent/confluent_client ; ./buildrpm ; cd -
 
 
-Install 
+Install
 =======
 
 dependency
@@ -59,7 +59,7 @@ To start confluent::
     service confluent start
 
 To stop confluent::
-   
+
     service confluent stop
 
 If you want confluent daemon to start automatically at bootup, add confluent service to ``chkconfig``::
@@ -113,11 +113,11 @@ Configure the httpd configuration for confluent-api by creating a ``confluent.co
     <Location /confluent-api>
             ProxyPass http://10.2.5.3:4005
     </Location>
-    
-    # restart httpd  
+
+    # restart httpd
     service httpd restart
 
-Now point your browser to: ``http://<server ip>:<port>`` and log in with the non-root user and password created above. 
+Now point your browser to: ``http://<server ip>:<port>`` and log in with the non-root user and password created above.
 
 Confluent consoles
 ==================
diff --git a/docs/source/advanced/confluent/server/index.rst b/docs/source/advanced/confluent/server/index.rst
index 4af5f08c1..3f439d78d 100644
--- a/docs/source/advanced/confluent/server/index.rst
+++ b/docs/source/advanced/confluent/server/index.rst
@@ -1,8 +1,8 @@
-confluent-server 
+confluent-server
 ================
 
 
 .. toctree::
    :maxdepth: 2
 
-   confluent_server.rst 
+   confluent_server.rst
diff --git a/docs/source/advanced/docker/docker_registry.rst b/docs/source/advanced/docker/docker_registry.rst
index 591f20d49..f088fbe57 100644
--- a/docs/source/advanced/docker/docker_registry.rst
+++ b/docs/source/advanced/docker/docker_registry.rst
@@ -36,7 +36,7 @@ Create Configuration File
 '''''''''''''''''''''''''
 
 Define configuration file ``docker-registry`` under ``/docker-registry/`` folder as below. ::
-  
+
     #!/bin/bash
 
     docker_command=$1
@@ -84,7 +84,7 @@ Start registry service: ::
 Method 2: Managing Docker Registry with Compose
 ```````````````````````````````````````````````
 
-Docker Compose it is a tool for defining and running Docker applications. It could help setting up registry. 
+Docker Compose it is a tool for defining and running Docker applications. It could help setting up registry.
 
 Install Docker Compose
 ''''''''''''''''''''''
@@ -147,10 +147,10 @@ List Available Images in Registry
 `````````````````````````````````````
 ::
 
-    curl -k https://domainname:5000/v2/_catalog 
+    curl -k https://domainname:5000/v2/_catalog
 
 Pull Images from Registry
-`````````````````````````  
+`````````````````````````
 Just use the "tag" image name, which includes the domain name, port, and image name. ::
 
     docker pull domainname:5000/imagename
diff --git a/docs/source/advanced/docker/dockerized_xcat/dockerized_xcat.rst b/docs/source/advanced/docker/dockerized_xcat/dockerized_xcat.rst
index e1d9dba6b..e6eb29fff 100644
--- a/docs/source/advanced/docker/dockerized_xcat/dockerized_xcat.rst
+++ b/docs/source/advanced/docker/dockerized_xcat/dockerized_xcat.rst
@@ -16,7 +16,7 @@ Overview
    :align: right
 
 
-**Compose** is a native tool shipped by Docker to define and run applications in Docker containers. You use a Compose file to configure your applications/services. Then, using a single command, you create and start all the services from your configuration.  
+**Compose** is a native tool shipped by Docker to define and run applications in Docker containers. You use a Compose file to configure your applications/services. Then, using a single command, you create and start all the services from your configuration.
 
 By pulling xCAT Docker image and running xCAT Docker image in a container, you get a well-configured xCAT Management Node to start cluster management work, without worrying about the xCAT installation and configuration on different OS and various hardware platforms.
 
@@ -24,10 +24,10 @@ By pulling xCAT Docker image and running xCAT Docker image in a container, you g
 xCAT Docker images
 ------------------
 
-xCAT ships 2 Docker images for Docker host with different architecture: 
+xCAT ships 2 Docker images for Docker host with different architecture:
 
 * "xcat/xcat-ubuntu-x86_64": run on x86_64 Docker host
-* "xcat/xcat-ubuntu-ppc64le": run on ppc64le Docker host 
+* "xcat/xcat-ubuntu-ppc64le": run on ppc64le Docker host
 
 Each of the xCAT Docker images above has 3 tags corresponding to different xCAT release inside Docker image:
 
@@ -44,7 +44,7 @@ Run xCAT in Docker
 Each container with xCAT Docker image running inside is a xCAT management node, the container connects to the compute nodes and hardware control points in the cluster via "bridge" network on the Docker host. Generally, a xCAT container should connect to 2 types of networks( the 2 types of networks might be one network in some cluster):
 
 * "mgtnet": Management network, the network used by the Management Node to install operating systems and manage the nodes. The Management Node and in-band Network Interface Card (NIC) of the nodes are connected to this network. A bridge "mgtbr" will be created and attached to the network interface facing the compute nodes on Docker host
-* "svcnet": Service network, the network used by the Management Node to control the nodes using out-of-band management using the Service Processor. A bridge "svcbr" will be created and attached to the network interface facing the hardware control points 
+* "svcnet": Service network, the network used by the Management Node to control the nodes using out-of-band management using the Service Processor. A bridge "svcbr" will be created and attached to the network interface facing the hardware control points
 
 You are required to determine and specify some necessary information, so that xCAT is well configured and running when the container is started. This includes:
 
@@ -52,7 +52,7 @@ You are required to determine and specify some necessary information, so that xC
 * network information: the network configuration of the xCAT container
 * cluster information: the domain of the cluster
 
-The information can be specified in 2 ways to run xCAT container: 
+The information can be specified in 2 ways to run xCAT container:
 
 * in options and arguments of docker commands such as ``docker network create`` or ``docker run``
 * in the "docker-compose.yml", which contains all the configuration to start xCAT containers with Compose. This is the recommended way to start xCAT container.
@@ -66,7 +66,7 @@ When xCAT Docker container is started, you can access it with ``sudo docker atta
 .. toctree::
    :maxdepth: 2
 
-   setup_docker_host.rst 
+   setup_docker_host.rst
    run_xcat_in_docker_compose.rst
    run_xcat_in_docker_native.rst
 
@@ -77,21 +77,21 @@ Work with xCAT
 
 Once xCAT Docker container is running, you can use xCAT with the shell inside the container. Since the ssh service has been enabled on the Docker container startup, you can connect to the container via ssh. The default root password is "cluster".
 
-Once you attach or ssh to the container, you will find that xCAT is running and configured, you can play with xCAT and manage your cluster now. 
+Once you attach or ssh to the container, you will find that xCAT is running and configured, you can play with xCAT and manage your cluster now.
 
 Currently, since xCAT can only generate the diskless osimages of Linux distributions with the same OS version and architecture with xCAT MN. If you need to provision diskless osimages besides ubuntu x86_64 with xCAT running in the Docker, you can use ``imgexport`` and ``imgimport`` to import the diskless osimages generated before.
 
 If you start up the xCAT Docker container by following the steps described in sections above strictly, without specifying "--dns=IP_ADDRESS...", "--dns-search=DOMAIN...", or "--dns-opt=OPTION..." options, Docker uses the /etc/resolv.conf of the host machine (where the docker daemon runs). Any DNS problem inside container, make sure the DNS server on the Docker host works well.
 
-Save and Restore xCAT data 
+Save and Restore xCAT data
 ----------------------------
 
-According to the policy of Docker, Docker image should only be the service deployment unit, it is not recommended to save data in Docker image. Docker uses "Data Volume" to save persistent data inside container, which can be simply taken as a shared directory between Docker host and Docker container. 
+According to the policy of Docker, Docker image should only be the service deployment unit, it is not recommended to save data in Docker image. Docker uses "Data Volume" to save persistent data inside container, which can be simply taken as a shared directory between Docker host and Docker container.
 
 For dockerized xCAT, there are 3 volumes recommended to save and restore xCAT user data.
 
-* "/install":        save the osimage resources under "/install" directory 
-* "/var/log/xcat/":  save xCAT logs 
+* "/install":        save the osimage resources under "/install" directory
+* "/var/log/xcat/":  save xCAT logs
 * "/.dbbackup":      save and restore xCAT DB tables. You can save the xCAT DB tables with ``dumpxCATdb -p /.dbbackup/`` inside container and xCAT will restore the tables on the container start up.
 
 
diff --git a/docs/source/advanced/docker/dockerized_xcat/run_xcat_in_docker_compose.rst b/docs/source/advanced/docker/dockerized_xcat/run_xcat_in_docker_compose.rst
index 5a21e83d8..c50d05e68 100644
--- a/docs/source/advanced/docker/dockerized_xcat/run_xcat_in_docker_compose.rst
+++ b/docs/source/advanced/docker/dockerized_xcat/run_xcat_in_docker_compose.rst
@@ -3,14 +3,14 @@ Run xCAT in Docker with Compose (Recommended)
 
 
 An example configuration in the documentation
---------------------------------------------- 
+---------------------------------------------
 
 To demonstrate the steps to run xCAT in a Docker container, take a cluster with the following configuration as an example ::
 
 
-    The name of the docker container running xCAT: xcatmn 
+    The name of the docker container running xCAT: xcatmn
     The hostname of container xcatmn: xcatmn
-    The dns domain of the cluster: clusters.com 
+    The dns domain of the cluster: clusters.com
 
     The management network object: mgtnet
     The network bridge of management network on Docker host: mgtbr
@@ -24,7 +24,7 @@ To demonstrate the steps to run xCAT in a Docker container, take a cluster with
     The IP address of eno2 on Docker host: 192.168.0.1/8
     The IP address of xCAT container in service network: 192.168.0.101
 
- 
+
 Install Compose on Docker host
 ------------------------------
 
@@ -34,27 +34,27 @@ Compose v1.7.0 or above should be installed on Docker host: ::
     chmod +x /usr/local/bin/docker-compose
 
 
-Customize docker-compose file 
+Customize docker-compose file
 -----------------------------
 
-xCAT ships a docker-compose template `docker-compose.yml <https://github.com/immarvin/xcat-docker/blob/master/docker-compose.yml>`_, which is a self-description file including all the configurations to run xCAT in container. You can make up your compose file based on it if you are familiar with `Compose file <https://docs.docker.com/compose/compose-file/>`_ , otherwise, you can simply customize it with the following steps: 
+xCAT ships a docker-compose template `docker-compose.yml <https://github.com/immarvin/xcat-docker/blob/master/docker-compose.yml>`_, which is a self-description file including all the configurations to run xCAT in container. You can make up your compose file based on it if you are familiar with `Compose file <https://docs.docker.com/compose/compose-file/>`_ , otherwise, you can simply customize it with the following steps:
 
 1. Specify the xCAT Docker image
 
 ::
 
-    image: [xCAT Docker image name]:[tag]  
- 
-specify the name and tag of xCAT Docker image, for example "xcat/xcat-ubuntu-x86_64:2.11" 
+    image: [xCAT Docker image name]:[tag]
 
-2. Specify the cluster domain name 
+specify the name and tag of xCAT Docker image, for example "xcat/xcat-ubuntu-x86_64:2.11"
 
-:: 
+2. Specify the cluster domain name
+
+::
 
     extra_hosts:
        - "xcatmn.[cluster domain name] xcatmn:[Container's IP address in management network]"
 
-specify the cluster domain name,i.e, "site.domain" on xCAT Management Node, for example "clusters.com", and the IP address of xCAT Docker container in the management network, such as "10.5.107.101" 
+specify the cluster domain name,i.e, "site.domain" on xCAT Management Node, for example "clusters.com", and the IP address of xCAT Docker container in the management network, such as "10.5.107.101"
 
 3. Specify the IP address of xCAT container in service network and management network
 
@@ -66,7 +66,7 @@ specify the cluster domain name,i.e, "site.domain" on xCAT Management Node, for
         ipv4_address : [Container's IP address in service network]
 
       mgtnet:
-        ipv4_address : [Container's IP address in management network]  
+        ipv4_address : [Container's IP address in management network]
 
 specify the IP address of Docker container in service network and management network. If the "svcnet" is the same as "mgtnet", the 2 "svcnet" lines should be commented out.
 
@@ -75,30 +75,30 @@ specify the IP address of Docker container in service network and management net
 ::
 
     networks:
-      
-      #management network, attached to the network interface on Docker host 
+
+      #management network, attached to the network interface on Docker host
       #facing the nodes to provision
       mgtnet:
         driver: "bridge"
-        driver_opts: 
-          com.docker.network.bridge.name: "mgtbr" 
-        ipam: 
-          config: 
+        driver_opts:
+          com.docker.network.bridge.name: "mgtbr"
+        ipam:
+          config:
             - subnet: [subnet of mgtbr in CIDR]
               gateway:[IP address of mgtbr]
-        
+
       #service network, attached to the network interface on
       #Docker host facing the bmc network
       svcnet:
         driver: "bridge"
-        driver_opts: 
-          com.docker.network.bridge.name: "svcbr" 
-        ipam: 
-          config: 
+        driver_opts:
+          com.docker.network.bridge.name: "svcbr"
+        ipam:
+          config:
             - subnet: [subnet of svcbr in CIDR]
               gateway: [IP address of svcbr]
-    
-specify the network configuration of bridge networks "mgtnet" and "svcnet", the network configuration of the bridge networks should be same as the network interfaces attached to the bridges. The "mgtnet" and "svcnet" might the same network in some cluster, in this case, you can ignore the lines for "svcnet".  
+
+specify the network configuration of bridge networks "mgtnet" and "svcnet", the network configuration of the bridge networks should be same as the network interfaces attached to the bridges. The "mgtnet" and "svcnet" might the same network in some cluster, in this case, you can ignore the lines for "svcnet".
 
 5. Specify the Data Volumes for xCAT Docker container
 
@@ -114,16 +114,16 @@ specify the network configuration of bridge networks "mgtnet" and "svcnet", the
       #"dumpxCATdb -p /.dbbackup" should be run manually to save xCAT DB inside container
       - [The directory on Docker host mounted to save xCAT DB inside container]:/.dbbackup
       #the "/.logs" value is used to keep xCAT logs
-      #the xCAT logs will be kept if specified 
+      #the xCAT logs will be kept if specified
       - [The directory on Docker host to save xCAT logs inside container]:/var/log/xcat/
 
 specify the volumes of the xCAT container used to save and restore xCAT data
 
 
-Start xCAT Docker container with Compose 
+Start xCAT Docker container with Compose
 ----------------------------------------
 After the "docker-compose.yml" is ready, the xCAT Docker container can be started with [1]_ ::
-  
+
    docker-compose -f "docker-compose.yml" up -d; \
    ifconfig eno1 0.0.0.0; \
    brctl addif mgtbr eno1; \
@@ -139,7 +139,7 @@ To remove the container, you can run ::
   ifup eno1
 
 To update the xCAT Docker image, you can run ::
-  
+
   docker-compose -f "docker-compose.yml" pull
 
 
@@ -151,6 +151,6 @@ Known Issues
 When you start up xCAT Docker container, you might see an error message at the end of the output like ::
 
   Couldn't connect to Docker daemon at http+unix://var/run/docker.sock - is it running? If it's at a non-standard location, specify the URL with the DOCKER_HOST environment variable.
-   
+
 You can ignore it, the container has already been running. It is a Docker bug `#1214 <https://github.com/docker/compose/issues/1214>`_
-   
+
diff --git a/docs/source/advanced/docker/dockerized_xcat/run_xcat_in_docker_native.rst b/docs/source/advanced/docker/dockerized_xcat/run_xcat_in_docker_native.rst
index 2dc90076c..7fec49456 100644
--- a/docs/source/advanced/docker/dockerized_xcat/run_xcat_in_docker_native.rst
+++ b/docs/source/advanced/docker/dockerized_xcat/run_xcat_in_docker_native.rst
@@ -9,7 +9,7 @@ Now xCAT ships xCAT Docker images(x86_64 and ppc64le) on the `DockerHub <https:/
 
 To pull the latest xCAT Docker image for x86_64, run ::
 
-    sudo docker pull xcat/xcat-ubuntu-x86_64        
+    sudo docker pull xcat/xcat-ubuntu-x86_64
 
 On success, you will see the pulled Docker image on Docker host ::
 
@@ -19,12 +19,12 @@ On success, you will see the pulled Docker image on Docker host ::
 
 
 An example configuration in the documentation
---------------------------------------------- 
+---------------------------------------------
 
 To demonstrate the steps to run xCAT in a Docker container, take a cluster with the following configuration as an example ::
 
     Docker host: dockerhost1
-    The name of the docker container running xCAT: xcatmn 
+    The name of the docker container running xCAT: xcatmn
     The hostname of container xcatmn: xcatmn
 
     The management network object: mgtnet
@@ -33,15 +33,15 @@ To demonstrate the steps to run xCAT in a Docker container, take a cluster with
     The IP address of eno1 on Docker host: 10.5.107.1/8
     The IP address of xCAT container in management network: 10.5.107.101
 
-    The dns domain of the cluster: clusters.com 
+    The dns domain of the cluster: clusters.com
 
 
 Create a customized Docker network on the Docker host
 -----------------------------------------------------
 
-**Docker Networks** provide complete isolation for containers, which gives you control over the networks your containers run on. To run xCAT in Docker, you should create a customized bridge network according to the cluster network plan, instead of using the default bridge network created on Docker installation. 
+**Docker Networks** provide complete isolation for containers, which gives you control over the networks your containers run on. To run xCAT in Docker, you should create a customized bridge network according to the cluster network plan, instead of using the default bridge network created on Docker installation.
 
-As an example, we create a customized bridge network "mgtbr" which is attached to the network interface "eno1" facing the compute nodes and inherits the network configuration of "eno1". Since the commands to create the network will break the network connection on "eno1", you'd better run the commands in one line instead of running them seperatly ::   
+As an example, we create a customized bridge network "mgtbr" which is attached to the network interface "eno1" facing the compute nodes and inherits the network configuration of "eno1". Since the commands to create the network will break the network connection on "eno1", you'd better run the commands in one line instead of running them seperatly ::
 
     sudo docker network create --driver=bridge --gateway=10.5.107.1 --subnet=10.5.107.0/8 -o "com.docker.network.bridge.name"="mgtbr" mgtnet; \
     ifconfig eno1 0.0.0.0; \
@@ -51,7 +51,7 @@ As an example, we create a customized bridge network "mgtbr" which is attached t
 * ``--driver=bridge`` specify the network driver to be "bridge"
 * ``--gateway=10.5.107.1`` specify the network gateway to be the IP address of "eno1" on Docker host. which will also be the IP address of network bridge "mgtbr"
 * ``--subnet=10.5.107.0/8`` speify the subnet in CIDR format to be the subnet of "eno1"
-* ``com.docker.network.bridge.name"="mgtbr"`` specify the bridge name of management network 
+* ``com.docker.network.bridge.name"="mgtbr"`` specify the bridge name of management network
 * ``ifconfig eno1 0.0.0.0`` delete the IP address of "eno1"
 * ``brctl addif mgtbr eno1`` attach the bridge "br0" to network interface "eno1"
 * ``ip link set mgtbr up`` change the state of "br0" to UP
@@ -68,7 +68,7 @@ Now run the xCAT Docker container with the Docker image "xcat/xcat-ubuntu-x86_64
 
 * use ``--privileged=true`` to give extended privileges to this container
 * use ``--hostname`` to specify the hostname of the container, which is available inside the container
-* use ``--name`` to assign a name to the container, this name can be used to manipulate the container on Docker host 
+* use ``--name`` to assign a name to the container, this name can be used to manipulate the container on Docker host
 * use ``--add-host="xcatmn.clusers.com xcatmn:10.5.107.101"`` to write the ``/etc/hosts`` entries of Docker container inside container. Since xCAT use the FQDN(Fully Qualified Domain Name) to determine the cluster domain on startup, make sure the format to be "<FQDN> <hostname>: <IP Address>", otherwise, you need to set the cluster domain with ``chdef -t site -o clustersite domain="clusters.com"`` inside the container manually
 * use ``--volume /docker/xcatdata/:/install`` to mount a pre-created "/docker/xcatdata" directory on Docker host to "/install" directory inside container as a data volume. This is optional, it is mandatory if you want to backup and restore xCAT data.
 * use ``--net=mgtnet`` to connect the container to the Docker network "mgtnet"
diff --git a/docs/source/advanced/docker/dockerized_xcat/setup_docker_host.rst b/docs/source/advanced/docker/dockerized_xcat/setup_docker_host.rst
index 9ce4aa4e1..f0014130c 100644
--- a/docs/source/advanced/docker/dockerized_xcat/setup_docker_host.rst
+++ b/docs/source/advanced/docker/dockerized_xcat/setup_docker_host.rst
@@ -4,14 +4,14 @@ Setup Docker host
 Install Docker Engine
 ---------------------
 
-The Docker host to run xCAT Docker image should be a baremental or virtual server with Docker v1.10 or above installed. For the details on system requirements and Docker installation, refer to `Docker Installation Docs <https://docs.docker.com/engine/installation/>`_. 
+The Docker host to run xCAT Docker image should be a baremental or virtual server with Docker v1.10 or above installed. For the details on system requirements and Docker installation, refer to `Docker Installation Docs <https://docs.docker.com/engine/installation/>`_.
 
 .. note:: Docker images can only run on Docker hosts with the same architecture.  Since xCAT only ships x86_64 and ppc64le Docker images, running xCAT in Docker requires x86_64 or ppc64 Docker Hosts.
 
 Shutdown the SELinux/Apparmor on Docker host
 --------------------------------------------
 
-If the SELinux or Apparmor on Docker host is enabled, the services/applications inside Docker Container might be confined. To run xCAT in Docker container, SELinux and Apparmor on the Docker host must be disabled. 
+If the SELinux or Apparmor on Docker host is enabled, the services/applications inside Docker Container might be confined. To run xCAT in Docker container, SELinux and Apparmor on the Docker host must be disabled.
 
 SELinux can be disabled with: ::
 
diff --git a/docs/source/advanced/docker/index.rst b/docs/source/advanced/docker/index.rst
index a3353e1d8..7d275a49f 100644
--- a/docs/source/advanced/docker/index.rst
+++ b/docs/source/advanced/docker/index.rst
@@ -4,6 +4,6 @@ Docker
 .. toctree::
    :maxdepth: 2
 
-   dockerized_xcat/dockerized_xcat.rst   
+   dockerized_xcat/dockerized_xcat.rst
    lifecycle_management.rst
    docker_registry.rst
diff --git a/docs/source/advanced/docker/lifecycle_management.rst b/docs/source/advanced/docker/lifecycle_management.rst
index 9f7b8db7c..3bc48a0c8 100644
--- a/docs/source/advanced/docker/lifecycle_management.rst
+++ b/docs/source/advanced/docker/lifecycle_management.rst
@@ -3,9 +3,9 @@ Docker life-cycle management in xCAT
 
 The Docker linux container technology is currently very popular. xCAT can help managing Docker containers. xCAT, as a system management tool has the natural advantage for supporting multiple operating systems, multiple architectures and large scale clusters.
 
-This document describes how to use xCAT for docker management, from Docker Host setup to docker container operations. 
+This document describes how to use xCAT for docker management, from Docker Host setup to docker container operations.
 
-.. note:: This document was verified with: 
+.. note:: This document was verified with:
              * Docker Version 1.10, 1.11
              * Docker API version 1.22
 
@@ -19,7 +19,7 @@ This document describes how to use xCAT for docker management, from Docker Host
 Setting up Docker Host
 ----------------------
 
-The **Docker Host** is the bare metal server or virtual machine where Docker containers can run. It will be called *dockerhost* in the following sections. 
+The **Docker Host** is the bare metal server or virtual machine where Docker containers can run. It will be called *dockerhost* in the following sections.
 
 The *dockerhost* at a minimum must provide the following:
 
@@ -28,12 +28,12 @@ The *dockerhost* at a minimum must provide the following:
 
 Preparing osimage for docker host
 `````````````````````````````````
-The osimage represents the image of the Operating System which will be deployed on the dockerhost. 
+The osimage represents the image of the Operating System which will be deployed on the dockerhost.
 
-Copy files out from DVDs/ISOs and generate  
+Copy files out from DVDs/ISOs and generate
 """"""""""""""""""""""""""""""""""""""""""
-**[ubuntu x86_64]** ::  
-   
+**[ubuntu x86_64]** ::
+
   copycds ubuntu-xxx-server-amd64.iso
 
 **[ubuntu16.04 ppc64el]** ::
@@ -52,31 +52,31 @@ The pkglist file should contain the following: ::
  nfs-common
  snmpd
  bridge-utils
- 
-The otherpkglist file should contain the following: 
 
-**[ubuntu x86_64]** ::  
+The otherpkglist file should contain the following:
+
+**[ubuntu x86_64]** ::
 
  # cat /install/custom/ubuntu/ubuntu_docker.pkglist
  docker-engine
 
-**[ubuntu16.04 ppc64el]** 
- 
+**[ubuntu16.04 ppc64el]**
+
 At the time of this writing (February 2016), docker package is not available for **ppc64el** architecture from docker.org. You can follow instructions below on how to manually download and install it.
 
-* Download docker engine for ppc64el: 
+* Download docker engine for ppc64el:
 
 ::
- 
+
  wget http://launchpadlibrarian.net/251622081/docker.io_1.10.3-0ubuntu4_ppc64el.deb  -O /install/docker_ppc64el/docker.io_1.10.3-0ubuntu4_ppc64el.deb
 
-* Configure **otherpkgdir** like this: 
+* Configure **otherpkgdir** like this:
 
 ::
 
  otherpkgdir=/install/docker_ppc64el
 
-* The **otherpkglist** file should be: 
+* The **otherpkglist** file should be:
 
 ::
 
@@ -87,7 +87,7 @@ Create the osimage for dockerhost
 """""""""""""""""""""""""""""""""
 The osimage for dockerhost will be like this:
 
-**[ubuntu x86_64]** ::  
+**[ubuntu x86_64]** ::
 
  # lsdef -t osimage ub14.04.03-x86_64-dockerhost
  Object name: ub14.04.03-x86_64-dockerhost
@@ -125,9 +125,9 @@ Currently, a customer defined network object is needed when create a docker cont
 
  chdef host01 -p postbootscripts="setupdockerhost <netobj_name>=<subnet>/<netmask>@<gateway>[:nicname]"
 
-* netobj_name: the network object to be created, it will be used in *dockernics* when creating docker container 
+* netobj_name: the network object to be created, it will be used in *dockernics* when creating docker container
 * subnet/netmask@gateway: the network which the IP address of docker container running on the docker host must be located in. If *nicname* is specified, the *subnet/netmask* must be the subnet of the nic *nicname* located in. And *gateway* shall be the IP address of the nic *nicname*.
-* nicname: the physical nic name which will be attached to the network object 
+* nicname: the physical nic name which will be attached to the network object
 
 For example, a network object *mynet0* with subnet *10.0.0.0/16* and gateway *10.0.101.1* on nic *eth0* can be created with the command: ::
 
@@ -170,7 +170,7 @@ Create docker instance
 * dockerflag - A JSON string which will be used as parameters to create a docker. Reference `docker API v1.22 <https://docs.docker.com/engine/reference/api/docker_remote_api_v1.22/>`_ for more information about which parameters can be specified for "dockerflag".
 
 To create the docker instance *host01c01* with image *ubuntu* and command */bin/bash*, use: ::
- 
+
  mkdocker host01c01 image=ubuntu command=/bin/bash dockerflag="{\"AttachStdin\":true,\"AttachStdout\":true,\"AttachStderr\":true,\"OpenStdin\":true}"
 
 Remove docker instance
@@ -242,13 +242,13 @@ If things go wrong:
 
  ip addr show dev <nicname>
 
-* Run **ps -ef | grep docker** to verify docker engine is running with configured options. It should look something like 
+* Run **ps -ef | grep docker** to verify docker engine is running with configured options. It should look something like
 
 ::
 
  root      3703     1  0 Apr15 ?        00:12:28 /usr/bin/docker daemon -H unix:///var/run/docker.sock -H tcp://host01:2375 --tls --tlscacert=/root/.docker/ca-cert.pem --tlscert=/root/.docker/dockerhost-cert.pem --tlskey=/root/.docker/dockerhost-cert.pem --tlsverify=true --raw-logs
 
-If the output is missing some options, verify that file **/lib/systemd/system/docker.service** contains the following lines 
+If the output is missing some options, verify that file **/lib/systemd/system/docker.service** contains the following lines
 
 ::
 
diff --git a/docs/source/advanced/domain_name_resolution/domain_name_resolution.rst b/docs/source/advanced/domain_name_resolution/domain_name_resolution.rst
index 6009eb083..b5ff7c3da 100644
--- a/docs/source/advanced/domain_name_resolution/domain_name_resolution.rst
+++ b/docs/source/advanced/domain_name_resolution/domain_name_resolution.rst
@@ -78,7 +78,7 @@ Preparing for Using a DNS
 
 If you are choosing any of the options for using DNS, follow these steps:
 
-NOTE: This documentation only applies to the xCAT makedns command using the ddns.pm plugin. The ddns.pm plugin is based on named9/bind9, and can not support named8/bind8 due to syntax difference. 
+NOTE: This documentation only applies to the xCAT makedns command using the ddns.pm plugin. The ddns.pm plugin is based on named9/bind9, and can not support named8/bind8 due to syntax difference.
 
     * Set the **nameservers** and **forwarders** attributes in the xCAT site table. The **nameservers** attribute identifies the DNS server hostname/ip that the nodes point to in their **/etc/resolv.conf** files. The forwarders attribute are the DNS server's ip that can resolve external hostnames. If you are running a DNS on the xCAT MN, it will use the forwarders DNS server to resolve any hostnames it can't.
 
@@ -88,7 +88,7 @@ For example: ::
 
     * Create an /etc/resolv.conf file on the management node
 
-Edit **/etc/resolv.conf** to contain the cluster domain value you set in the site table's **domain**  attribute above, and to point to the same DNS server you will be using for your nodes (if you are using DNS). 
+Edit **/etc/resolv.conf** to contain the cluster domain value you set in the site table's **domain**  attribute above, and to point to the same DNS server you will be using for your nodes (if you are using DNS).
 
 Option #1: Running DNS on Your Management Node
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -132,7 +132,7 @@ If you already have a DNS on your site network and you want to use it to solve t
    * Set the site **nameservers** value to the IP address of the external name server. ::
 
         chdef -t site nameservers=<external dns IP>
- 
+
    * Set the correct information of external dns into the /etc/resolv.conf on your xCAT MN.
 
 The **domain** and **nameservers** values must be set correctly in **/etc/resolv.conf**. Which should have the same values with the ones your set in the site table.
@@ -159,7 +159,7 @@ The **domain** and **nameservers** values must be set correctly in **/etc/resolv
               file "db.192.168.1";
          };
 
-    * To update the name resolution entries from ``/etc/hosts`` or hosts table of xCAT MN to external DNS, run ``makedns -e`` 
+    * To update the name resolution entries from ``/etc/hosts`` or hosts table of xCAT MN to external DNS, run ``makedns -e``
 
       Alternatively, you can set site.externaldns=1 and run ``makedns``
 
@@ -191,7 +191,7 @@ The configurations are described below for the two options, note the differences
 
 Once **/etc/hosts** is populated with all of the nodes' hostnames and IP addresses, configure DNS on the management node and start it: ::
 
-    makedns -n       
+    makedns -n
 
 When the **/etc/resolv.conf** files for the compute nodes are created the value of the **nameserver**  in /etc/resolv.conf is gotten from **site.nameservers** or **networks.nameservers** if it's specified.
 
diff --git a/docs/source/advanced/domain_name_resolution/index.rst b/docs/source/advanced/domain_name_resolution/index.rst
index 7b98533b8..13e5c4955 100644
--- a/docs/source/advanced/domain_name_resolution/index.rst
+++ b/docs/source/advanced/domain_name_resolution/index.rst
@@ -4,4 +4,4 @@ Domain Name Resolution
 .. toctree::
    :maxdepth: 2
 
-   domain_name_resolution.rst 
+   domain_name_resolution.rst
diff --git a/docs/source/advanced/goconserver/quickstart.rst b/docs/source/advanced/goconserver/quickstart.rst
index 96559668b..bf4b873e9 100644
--- a/docs/source/advanced/goconserver/quickstart.rst
+++ b/docs/source/advanced/goconserver/quickstart.rst
@@ -1,20 +1,30 @@
 Quickstart
 ==========
 
-To enable ``goconserver``, execute the following steps:
+#. For refresh xCAT installation, run the command below to start and configure ``goconserver``
 
-#. Install the ``goconserver`` RPM: ::
+    makegocons
 
-      yum install goconserver
+  The new console logs will start logging to ``/var/log/consoles/<node>.log``
 
+#. For xCAT updating, and use ``conserver`` before, following the step below to enable ``goconserver``
 
-#. If upgrading xCAT running ``conserver``, stop it first: ::
+   #. stop ``conserver`` on management node
 
-      systemctl stop conserver.service
+       systemctl stop conserver.service
 
+   #. For hierarchical cluster, shall also stop ``conserver`` on **service nodes**, and config ``goconserver`` as console server:
 
-#. Start ``goconserver`` and create the console configuration files with a single command ::
+       xdsh service 'systemctl stop conserver.service'
 
-      makegocons
+       chdef -t group -o service setupconserver=2
 
-   The new console logs will start logging to ``/var/log/consoles/<node>.log``
\ No newline at end of file
+   #. start and configure ``goconserver``
+
+       makegocons
+
+     The new console logs will start logging to ``/var/log/consoles/<node>.log``
+
+#. To check the console status of nodes, use:
+
+       makegocons -q
diff --git a/docs/source/advanced/gpu/nvidia/management.rst b/docs/source/advanced/gpu/nvidia/management.rst
index 057c625e7..fed4f5221 100644
--- a/docs/source/advanced/gpu/nvidia/management.rst
+++ b/docs/source/advanced/gpu/nvidia/management.rst
@@ -1,7 +1,7 @@
 GPU Management and Monitoring
 =============================
 
-The ``nvidia-smi`` command provided by NVIDIA can be used to manage and monitor GPUs enabled Compute Nodes. In conjunction with the xCAT``xdsh`` command, you can easily manage and monitor the entire set of GPU enabled Compute Nodes remotely from the Management Node. 
+The ``nvidia-smi`` command provided by NVIDIA can be used to manage and monitor GPUs enabled Compute Nodes. In conjunction with the xCAT``xdsh`` command, you can easily manage and monitor the entire set of GPU enabled Compute Nodes remotely from the Management Node.
 
 Example: ::
 
@@ -14,7 +14,7 @@ Example: ::
 Management
 ----------
 
-Some useful ``nvidia-smi`` example commands for management.  
+Some useful ``nvidia-smi`` example commands for management.
 
 	
     * Set persistence mode, When persistence mode is enabled the NVIDIA driver remains loaded even when no active clients, DISABLED by default::
@@ -29,11 +29,11 @@ Some useful ``nvidia-smi`` example commands for management.
 
         nvidia-smi -i 0 -p 0/1
 
-    * Set MODE for compute applications, query with --query-gpu=compute_mode:: 
+    * Set MODE for compute applications, query with --query-gpu=compute_mode::
 
         nvidia-smi -i 0 -c 0/1/2/3
 
-    * Trigger reset of the GPU :: 
+    * Trigger reset of the GPU ::
 
         nvidia-smi -i 0 -r
 
@@ -48,7 +48,7 @@ Some useful ``nvidia-smi`` example commands for management.
 Monitoring
 ----------
 
-Some useful ``nvidia-smi`` example commands for monitoring.  
+Some useful ``nvidia-smi`` example commands for monitoring.
 
     * The number of NVIDIA GPUs in the system ::
 
@@ -75,7 +75,7 @@ Some useful ``nvidia-smi`` example commands for monitoring.
         nvidia-smi -i 0 --query-gpu=compute_mode --format=csv,noheader
 
     * Percent of time over the past sample period during which one or more kernels was executing on the GPU::
- 
+
         nvidia-smi -i 0 --query-gpu=utilization.gpu --format=csv,noheader
 
     * Total errors detected across entire chip. Sum of device_memory, register_file, l1_cache, l2_cache and texture_memory ::
@@ -86,14 +86,14 @@ Some useful ``nvidia-smi`` example commands for monitoring.
 
         nvidia-smi -i 0 --query-gpu=temperature.gpu --format=csv,noheader
 
-    * The ECC mode that the GPU is currently operating under:: 
+    * The ECC mode that the GPU is currently operating under::
 
         nvidia-smi -i 0 --query-gpu=ecc.mode.current --format=csv,noheader
 
     * The power management status::
 
         nvidia-smi -i 0 --query-gpu=power.management --format=csv,noheader
- 
+
     * The last measured power draw for the entire board, in watts::
 
         nvidia-smi -i 0 --query-gpu=power.draw --format=csv,noheader
diff --git a/docs/source/advanced/gpu/nvidia/osimage/postscripts.rst b/docs/source/advanced/gpu/nvidia/osimage/postscripts.rst
index b0c392c39..6800fe021 100644
--- a/docs/source/advanced/gpu/nvidia/osimage/postscripts.rst
+++ b/docs/source/advanced/gpu/nvidia/osimage/postscripts.rst
@@ -16,7 +16,7 @@ Add this script to your node object using the ``chdef`` command: ::
 Setting GPU Configurations
 --------------------------
 
-NVIDIA allows for changing GPU attributes using the ``nvidia-smi`` commands.  These settings do not persist when a compute node is rebooted.  One way set these attributes is to use an xCAT postscript to set the values every time the node is rebooted.  
+NVIDIA allows for changing GPU attributes using the ``nvidia-smi`` commands.  These settings do not persist when a compute node is rebooted.  One way set these attributes is to use an xCAT postscript to set the values every time the node is rebooted.
 
 
 * Set the power limit to 175W: ::
diff --git a/docs/source/advanced/gpu/nvidia/osimage/ubuntu.rst b/docs/source/advanced/gpu/nvidia/osimage/ubuntu.rst
index f56f8b9ed..37be35353 100644
--- a/docs/source/advanced/gpu/nvidia/osimage/ubuntu.rst
+++ b/docs/source/advanced/gpu/nvidia/osimage/ubuntu.rst
@@ -12,7 +12,7 @@ xCAT provides a sample package list files for CUDA. You can find them at:
     * ``/opt/xcat/share/xcat/install/ubuntu/cudafull.ubuntu14.04.3.ppc64el.pkglist``
     * ``/opt/xcat/share/xcat/install/ubuntu/cudaruntime.ubuntu14.04.3.ppc64el.pkglist``
 
-**[diskful note]**: There is a requirement to reboot the machine after the CUDA drivers are installed.  To satisfy this requirement, the CUDA software is installed in the ``pkglist`` attribute of the osimage definition where the reboot happens after the Operating System is installed. 
+**[diskful note]**: There is a requirement to reboot the machine after the CUDA drivers are installed.  To satisfy this requirement, the CUDA software is installed in the ``pkglist`` attribute of the osimage definition where the reboot happens after the Operating System is installed.
 
 cudafull
 ^^^^^^^^
@@ -21,13 +21,13 @@ cudafull
 
     lsdef -t osimage -z ubuntu14.04.3-ppc64el-install-compute \
       | sed 's/install-compute:/install-cudafull:/' \
-      | mkdef -z 
+      | mkdef -z
 
 #. Add the CUDA repo created in the previous step to the ``pkgdir`` attribute.
 
    If your Management Node IP is 10.0.0.1, the URL for the repo would be ``http://10.0.0.1/install/cuda-repo/ppc64el/var/cuda-repo-7-5-local``, add it to the pkgdir::
 
-    chdef -t osimage -o ubuntu14.04.3-ppc64el-install-cudafull \ 
+    chdef -t osimage -o ubuntu14.04.3-ppc64el-install-cudafull \
      -p pkgdir=http://10.0.0.1/install/cuda-repo/ppc64el/var/cuda-repo-7-5-local
 
 
@@ -45,7 +45,7 @@ cudaruntime
 
     lsdef -t osimage -z ubuntu14.04.3-ppc64el-install-compute \
       | sed 's/install-compute:/install-cudaruntime:/' \
-      | mkdef -z 
+      | mkdef -z
 
 #. Add the CUDA repo created in the previous step to the ``pkgdir`` attribute:
 
@@ -64,14 +64,14 @@ cudaruntime
 Diskless images
 ---------------
 
-The following examples will create diskless images for ``cudafull`` and ``cudaruntime``.  The osimage definitions will be created from the base ``ubuntu14.04.3-ppc64el-netboot-compute`` osimage. 
+The following examples will create diskless images for ``cudafull`` and ``cudaruntime``.  The osimage definitions will be created from the base ``ubuntu14.04.3-ppc64el-netboot-compute`` osimage.
 
 xCAT provides a sample package list files for CUDA. You can find them at:
 
     * ``/opt/xcat/share/xcat/netboot/ubuntu/cudafull.ubuntu14.04.3.ppc64el.pkglist``
     * ``/opt/xcat/share/xcat/netboot/ubuntu/cudaruntime.ubuntu14.04.3.ppc64el.pkglist``
 
-**[diskless note]**: For diskless images, the requirement for rebooting the machine is not applicable because the images is loaded on each reboot.  The install of the CUDA packages is required to be done in the ``otherpkglist`` **NOT** the ``pkglist``. 
+**[diskless note]**: For diskless images, the requirement for rebooting the machine is not applicable because the images is loaded on each reboot.  The install of the CUDA packages is required to be done in the ``otherpkglist`` **NOT** the ``pkglist``.
 
 cudafull
 ^^^^^^^^
@@ -80,9 +80,9 @@ cudafull
 
     lsdef -t osimage -z ubuntu14.04.3-ppc64el-netboot-compute \
       | sed 's/netboot-compute:/netboot-cudafull:/' \
-      | mkdef -z 
+      | mkdef -z
 
-#. Add the CUDA repo created in the previous step to the ``otherpkgdir`` attribute. 
+#. Add the CUDA repo created in the previous step to the ``otherpkgdir`` attribute.
 
    If your Management Node IP is 10.0.0.1, the URL for the repo would be ``http://10.0.0.1/install/cuda-repo/ppc64el/var/cuda-repo-7-5-local``, add it to the ``otherpkgdir``::
 
@@ -98,7 +98,7 @@ cudafull
 
 #. Verify that ``acpid`` is installed on the Management Node or on the Ubuntu host where you are generating the diskless image: ::
 
-    apt-get install -y acpid 
+    apt-get install -y acpid
 
 #. Generate the image: ::
 
@@ -115,9 +115,9 @@ cudaruntime
 
     lsdef -t osimage -z ubuntu14.04.3-ppc64el-netboot-compute \
       | sed 's/netboot-compute:/netboot-cudaruntime:/' \
-      | mkdef -z 
+      | mkdef -z
 
-#. Add the CUDA repo created in the previous step to the ``otherpkgdir`` attribute. 
+#. Add the CUDA repo created in the previous step to the ``otherpkgdir`` attribute.
 
    If your Management Node IP is 10.0.0.1, the URL for the repo would be ``http://10.0.0.1/install/cuda-repo/ppc64el/var/cuda-repo-7-5-local``, add it to the ``otherpkgdir``::
 
@@ -133,7 +133,7 @@ cudaruntime
 
 #. Verify that ``acpid`` is installed on the Management Node or on the Ubuntu host where you are generating the diskless image: ::
 
-    apt-get install -y acpid 
+    apt-get install -y acpid
 
 #. Generate the image: ::
 
diff --git a/docs/source/advanced/gpu/nvidia/repo/index.rst b/docs/source/advanced/gpu/nvidia/repo/index.rst
index 13965d5b5..5d91fbe7c 100644
--- a/docs/source/advanced/gpu/nvidia/repo/index.rst
+++ b/docs/source/advanced/gpu/nvidia/repo/index.rst
@@ -1,7 +1,7 @@
 Create CUDA software repository
 ===============================
 
-The NVIDIA CUDA Toolkit is available to download at http://developer.nvidia.com/cuda-downloads.  
+The NVIDIA CUDA Toolkit is available to download at http://developer.nvidia.com/cuda-downloads.
 
 Download the toolkit and prepare the software repository on the xCAT Management Node to server the NVIDIA CUDA files.
 
diff --git a/docs/source/advanced/gpu/nvidia/repo/nvml.rst b/docs/source/advanced/gpu/nvidia/repo/nvml.rst
index 8453700dc..7f74a3040 100644
--- a/docs/source/advanced/gpu/nvidia/repo/nvml.rst
+++ b/docs/source/advanced/gpu/nvidia/repo/nvml.rst
@@ -3,9 +3,9 @@ Install NVIDIA Management Library (optional)
 
 See https://developer.nvidia.com/nvidia-management-library-nvml for more information.
 
-The .run file can be downloaded from NVIDIAs website and placed into the ``/install/postscripts`` directory on the Management Node. 
+The .run file can be downloaded from NVIDIAs website and placed into the ``/install/postscripts`` directory on the Management Node.
 
-To enable installation of the management library after the node is install, add the .run file to the ``postbootscripts`` attribute for the nodes: :: 
+To enable installation of the management library after the node is install, add the .run file to the ``postbootscripts`` attribute for the nodes: ::
 
    # ensure the .run file has execute permission
    chmod +x /install/postscripts/<gpu_deployment_kit>.run
diff --git a/docs/source/advanced/gpu/nvidia/repo/ubuntu.rst b/docs/source/advanced/gpu/nvidia/repo/ubuntu.rst
index ac31ca6dd..96ea8eb95 100644
--- a/docs/source/advanced/gpu/nvidia/repo/ubuntu.rst
+++ b/docs/source/advanced/gpu/nvidia/repo/ubuntu.rst
@@ -9,14 +9,14 @@ Local
 A local package repo will contain all of the CUDA packages.  Extract the CUDA packages into ``/install/cuda-repo/ppc64le``: ::
 
     # For CUDA toolkit: /root/cuda-repo-ubuntu1404-7-5-local_7.5-18_ppc64el.deb
-    
+
     # Create the repo directory under xCAT /install dir
     mkdir -p /install/cuda-repo/ppc64el
 
     # extract the package
     dpkg -x /root/cuda-repo-ubuntu1404-7-5-local_7.5-18_ppc64el.deb /install/cuda-repo/ppc64el
 
-    
+
 
 Network
 -------
@@ -31,7 +31,7 @@ The ``sources.list`` entry may look similar to: ::
 Authorize the CUDA repo
 -----------------------
 
-In order to access the CUDA repository you must import the CUDA GPGKEY into the ``apt_key`` trust list.  xCAT provides a sample postscript ``/install/postscripts/addcudakey`` to help with this task: :: 
+In order to access the CUDA repository you must import the CUDA GPGKEY into the ``apt_key`` trust list.  xCAT provides a sample postscript ``/install/postscripts/addcudakey`` to help with this task: ::
 
    chdef -t node -o <noderange> -p postscripts=addcudakey
 
diff --git a/docs/source/advanced/gpu/nvidia/verify_cuda_install.rst b/docs/source/advanced/gpu/nvidia/verify_cuda_install.rst
index 63587b67d..793331c2c 100644
--- a/docs/source/advanced/gpu/nvidia/verify_cuda_install.rst
+++ b/docs/source/advanced/gpu/nvidia/verify_cuda_install.rst
@@ -4,10 +4,10 @@ Verify CUDA Installation
 **The following verification steps only apply to the ``cudafull`` installations.**
 
 #. Verify driver version by looking at: ``/proc/driver/nvidia/version``: ::
-  
+
     # cat /proc/driver/nvidia/version
      NVRM version: NVIDIA UNIX ppc64le Kernel Module  352.39  Fri Aug 14 17:10:41 PDT 2015
-     GCC version:  gcc version 4.8.5 20150623 (Red Hat 4.8.5-4) (GCC) 
+     GCC version:  gcc version 4.8.5 20150623 (Red Hat 4.8.5-4) (GCC)
 
 #. Verify the CUDA Toolkit version ::
 
@@ -19,7 +19,7 @@ Verify CUDA Installation
 
 #. Verify running CUDA GPU jobs by compiling the samples and executing the ``deviceQuery`` or ``bandwidthTest`` programs.
 
-   * Compile the samples: 
+   * Compile the samples:
 
      **[RHEL]:** ::
 
@@ -32,13 +32,13 @@ Verify CUDA Installation
 
         cd ~/
         apt-get install cuda-samples-7-0 -y
-        cd /usr/local/cuda-7.0/samples 
-        make 
+        cd /usr/local/cuda-7.0/samples
+        make
 
 
    * Run the ``deviceQuery`` sample: ::
 
-        # ./bin/ppc64le/linux/release/deviceQuery   
+        # ./bin/ppc64le/linux/release/deviceQuery
           ./deviceQuery Starting...
           CUDA Device Query (Runtime API) version (CUDART static linking)
           Detected 4 CUDA Capable device(s)
@@ -54,9 +54,9 @@ Verify CUDA Installation
             ............
             deviceQuery, CUDA Driver = CUDART, CUDA Driver Version = 7.5, CUDA Runtime Version = 7.5, NumDevs = 4, Device0 = Tesla K80, Device1 = Tesla K80, Device2 = Tesla K80, Device3 = Tesla K80
             Result = PASS
-   
+
    * Run the ``bandwidthTest`` sample: ::
- 
+
         # ./bin/ppc64le/linux/release/bandwidthTest
           [CUDA Bandwidth Test] - Starting...
           Running on...
@@ -75,6 +75,6 @@ Verify CUDA Installation
             Transfer Size (Bytes)        Bandwidth(MB/s)
             33554432                     141485.3
           Result = PASS
-    
+
     NOTE: The CUDA Samples are not meant for performance measurements. Results may vary when GPU Boost is enabled.
-    
+
diff --git a/docs/source/advanced/hamn/high_available_management_node.rst b/docs/source/advanced/hamn/high_available_management_node.rst
index ebd78cf57..bf06d2216 100644
--- a/docs/source/advanced/hamn/high_available_management_node.rst
+++ b/docs/source/advanced/hamn/high_available_management_node.rst
@@ -1,42 +1,42 @@
 Configuration considerations
 ============================
 
-xCAT provides several configuration options for the HAMN, you can select one of the option based on your failover requirements and hardware configuration, the following configuration considerations should be able to help you to make the decision. 
+xCAT provides several configuration options for the HAMN, you can select one of the option based on your failover requirements and hardware configuration, the following configuration considerations should be able to help you to make the decision.
 
 Data synchronization mechanism
 ------------------------------
 
-The data synchronization is important for any high availability configuration. When the xCAT management node failover occurs, the xCAT data needs to be exactly the same before failover, and some of the operating system configuration should also be synchronized between the two management nodes. To be specific, the following data should be synchronized between the two management nodes to make the xCAT HAMN work: 
+The data synchronization is important for any high availability configuration. When the xCAT management node failover occurs, the xCAT data needs to be exactly the same before failover, and some of the operating system configuration should also be synchronized between the two management nodes. To be specific, the following data should be synchronized between the two management nodes to make the xCAT HAMN work:
 
-* xCAT database 
-* xCAT configuration files, like ``/etc/xcat``, ``~/.xcat``, ``/opt/xcat`` 
-* The configuration files for the services that are required by xCAT, like named, DHCP, apache, nfs, ssh, etc. 
-* The operating systems images repository and users customization data repository, the ``/install`` directory contains these repositories in most cases. 
+* xCAT database
+* xCAT configuration files, like ``/etc/xcat``, ``~/.xcat``, ``/opt/xcat``
+* The configuration files for the services that are required by xCAT, like named, DHCP, apache, nfs, ssh, etc.
+* The operating systems images repository and users customization data repository, the ``/install`` directory contains these repositories in most cases.
 
-There are a lot of ways for data synchronization, but considering the specific xCAT HAMN requirements, only several of the data synchronization options are practical for xCAT HAMN. 
+There are a lot of ways for data synchronization, but considering the specific xCAT HAMN requirements, only several of the data synchronization options are practical for xCAT HAMN.
 
-**1\. Move physical disks between the two management nodes**: if we could physically move the hard disks from the failed management node to the backup management node, and bring up the backup management node, then both the operating system and xCAT data will be identical between the new management node and the failed management node. RAID1 or disk mirroring could be used to avoid the disk be a single point of failure. 
+**1\. Move physical disks between the two management nodes**: if we could physically move the hard disks from the failed management node to the backup management node, and bring up the backup management node, then both the operating system and xCAT data will be identical between the new management node and the failed management node. RAID1 or disk mirroring could be used to avoid the disk be a single point of failure.
 
-**2\. Shared data**: the two management nodes use the single copy of xCAT data, no matter which management node is the primary MN, the cluster management capability is running on top of the single data copy. The access to the data could be done through various ways like shared storage, NAS, NFS, samba etc. Based on the protocol being used, the data might be accessible only on one management node at a time or be accessible on both management nodes in parallel. If the data could only be accessed from one management node, the failover process need to take care of the data access transition; if the data could be accessed on both management nodes, the failover does not need to consider the data access transition, it usually means the failover process could be faster. 
+**2\. Shared data**: the two management nodes use the single copy of xCAT data, no matter which management node is the primary MN, the cluster management capability is running on top of the single data copy. The access to the data could be done through various ways like shared storage, NAS, NFS, samba etc. Based on the protocol being used, the data might be accessible only on one management node at a time or be accessible on both management nodes in parallel. If the data could only be accessed from one management node, the failover process need to take care of the data access transition; if the data could be accessed on both management nodes, the failover does not need to consider the data access transition, it usually means the failover process could be faster.
 
-Warning: Running database through network file system has a lot of potential problems and is not practical, however, most of the database system provides database replication feature that can be used to synchronize the database between the two management nodes. 
+Warning: Running database through network file system has a lot of potential problems and is not practical, however, most of the database system provides database replication feature that can be used to synchronize the database between the two management nodes.
 
-**3\. Mirroring**: each of the management node has its own copy of the xCAT data, and the two copies of data are synchronized through mirroring mechanism. DRBD is used widely in the high availability configuration scenarios, to provide data replication by mirroring a whole block device via network. If we put all the important data for xCAT onto the DRBD devices, then it could assure the data is synchronized between the two management nodes. Some parallel file system also provides capability to mirror data through network. 
+**3\. Mirroring**: each of the management node has its own copy of the xCAT data, and the two copies of data are synchronized through mirroring mechanism. DRBD is used widely in the high availability configuration scenarios, to provide data replication by mirroring a whole block device via network. If we put all the important data for xCAT onto the DRBD devices, then it could assure the data is synchronized between the two management nodes. Some parallel file system also provides capability to mirror data through network.
 
 Manual vs. Automatic Failover
 -----------------------------
 
-When the primary management node fails, the backup management node could automatically take over, or the administrator has to perform some manual procedure to finish the failover. In general, the automatic failover takes less time to detect the failure and perform and failover, comparing with the manual failover, but the automatic failover requires more complex configuration. We could not say the automatic failover is better than the manual failover in all cases, the following factors should be considered when deciding the manual failover or automatic failover: 
+When the primary management node fails, the backup management node could automatically take over, or the administrator has to perform some manual procedure to finish the failover. In general, the automatic failover takes less time to detect the failure and perform and failover, comparing with the manual failover, but the automatic failover requires more complex configuration. We could not say the automatic failover is better than the manual failover in all cases, the following factors should be considered when deciding the manual failover or automatic failover:
 
 **1\. How long the cluster could survive if the management node is down?**
 
-If the cluster could not survive for more than several minutes, then the automatic failover might be the only option; if the compute nodes could run without the management node, at least for a while, then the manual failover could be an option. 
+If the cluster could not survive for more than several minutes, then the automatic failover might be the only option; if the compute nodes could run without the management node, at least for a while, then the manual failover could be an option.
 
-From xCAT perspective, if the management node needs to provide network services like DHCP, named, ntp or nfs to the compute nodes, then the cluster probably could not survive too long if the management node is down; if the management node only performs hardware control and some other management capabilities, then the failed management node may not cause too much trouble for the cluster. xCAT provides various options for configuring if the compute nodes rely on the network services on the management node. 
+From xCAT perspective, if the management node needs to provide network services like DHCP, named, ntp or nfs to the compute nodes, then the cluster probably could not survive too long if the management node is down; if the management node only performs hardware control and some other management capabilities, then the failed management node may not cause too much trouble for the cluster. xCAT provides various options for configuring if the compute nodes rely on the network services on the management node.
 
 **2\. Configuration complexity**
 
-The configuration for the high availability applications is usually complex, it may take a long time to configure, debug and stabilize the high availability configuration. 
+The configuration for the high availability applications is usually complex, it may take a long time to configure, debug and stabilize the high availability configuration.
 
 **3\. Maintenance effort**
 
@@ -45,7 +45,7 @@ The automatic failover brings in several high availability applications, after t
 Configuration Options
 =====================
 
-The combinations of data synchronization mechanism and manual/automatic failover indicates different HAMN configuration options, the table below list all the combinations (the bold numbers are the combinations xCAT has documented and tested): 
+The combinations of data synchronization mechanism and manual/automatic failover indicates different HAMN configuration options, the table below list all the combinations (the bold numbers are the combinations xCAT has documented and tested):
 
 +-------------------+-------------------------+-----------------+--------------+
 |#                  | **Move physical disks** | **Shared data** | **Mirroring**|
@@ -55,14 +55,14 @@ The combinations of data synchronization mechanism and manual/automatic failover
 |Automatic Failover | 4                       | **5**           | **6**        |
 +-------------------+-------------------------+-----------------+--------------+
 
-Option 1, :ref:`setup_ha_mgmt_node_with_raid1_and_disks_move` 
+Option 1, :ref:`setup_ha_mgmt_node_with_raid1_and_disks_move`
 
-Option 2, :ref:`setup_ha_mgmt_node_with_shared_data` 
+Option 2, :ref:`setup_ha_mgmt_node_with_shared_data`
 
 Option 3, it is doable but not currently supported.
 
 Option 4, it is not practical.
 
-Option 5, :ref:`setup_xcat_high_available_management_node_with_nfs` 
+Option 5, :ref:`setup_xcat_high_available_management_node_with_nfs`
 
 Option 6, :ref:`setup_ha_mgmt_node_with_drbd_pacemaker_corosync`
diff --git a/docs/source/advanced/hamn/index.rst b/docs/source/advanced/hamn/index.rst
index 1d7bcecab..51448bb80 100644
--- a/docs/source/advanced/hamn/index.rst
+++ b/docs/source/advanced/hamn/index.rst
@@ -6,7 +6,7 @@ The xCAT management node plays an important role in the cluster, if the manageme
 The goal of the HAMN (High Availability Management Node) configuration is, when the primary xCAT management node fails, the standby management node can take over the role of the management node, either through automatic failover or through manual procedure performed by the administrator, and thus avoid long periods of time during which your cluster does not have active cluster management function available.
 
 
-The following pages describes ways to configure the xCAT Management Node for High Availability. 
+The following pages describes ways to configure the xCAT Management Node for High Availability.
 
 .. toctree::
    :maxdepth: 2
diff --git a/docs/source/advanced/hamn/setup_ha_mgmt_node_with_drbd_pacemaker_corosync.rst b/docs/source/advanced/hamn/setup_ha_mgmt_node_with_drbd_pacemaker_corosync.rst
index 91f9c6cd9..6118ba479 100644
--- a/docs/source/advanced/hamn/setup_ha_mgmt_node_with_drbd_pacemaker_corosync.rst
+++ b/docs/source/advanced/hamn/setup_ha_mgmt_node_with_drbd_pacemaker_corosync.rst
@@ -1651,7 +1651,7 @@ which should result in the following output: ::
       x3550m4n01 x3550m4n02
      Pacemaker Nodes:
       x3550m4n01 x3550m4n02
-     
+
      Resources:
       Resource: ip_xCAT (class=ocf provider=heartbeat type=IPaddr2)
        Attributes: ip=10.1.0.1 iflabel=xCAT cidr_netmask=22 nic=eno2
@@ -1714,10 +1714,10 @@ which should result in the following output: ::
         Operations: start interval=0s timeout=1m (symlinks_xCAT-start-timeout-1m)
                     stop interval=0s timeout=1m (symlinks_xCAT-stop-timeout-1m)
                     monitor interval=31s on-fail=ignore (symlinks_xCAT-monitor-interval-31s)
-     
+
      Stonith Devices:
      Fencing Levels:
-     
+
      Location Constraints:
      Ordering Constraints:
        promote ms_drbd_xCAT then start grp_xCAT (kind:Mandatory) (id:order-ms_drbd_xCAT-grp_xCAT-mandatory)
@@ -1756,7 +1756,7 @@ which should result in the following output: ::
        gmetad with grp_xCAT (score:INFINITY) (id:colocation-gmetad-grp_xCAT-INFINITY)
        icinga with grp_xCAT (score:INFINITY) (id:colocation-icinga-grp_xCAT-INFINITY)
        ip_xCAT with grp_xCAT (score:INFINITY) (id:colocation-ip_xCAT-grp_xCAT-INFINITY)
-     
+
      Cluster Properties:
       cluster-infrastructure: corosync
       cluster-name: ucl_cluster
@@ -1780,12 +1780,12 @@ And the resulting output should be the following: ::
      Version: 1.1.12-a14efad
      2 Nodes configured
      17 Resources configured
-     
-     
+
+
      Online: [ x3550m4n01 x3550m4n02 ]
-     
+
      Full list of resources:
-     
+
       ip_xCAT        (ocf::heartbeat:IPaddr2):       Started x3550m4n01
       NFS_xCAT       (ocf::heartbeat:nfsserver):     Started x3550m4n01
       apache_xCAT    (ocf::heartbeat:apache):        Started x3550m4n01
@@ -1802,7 +1802,7 @@ And the resulting output should be the following: ::
       Resource Group: grp_xCAT
           fs_xCAT    (ocf::heartbeat:Filesystem):    Started x3550m4n01
           symlinks_xCAT      (ocf::tummy:drbdlinks): Started x3550m4n01
-     
+
      PCSD Status:
        x3550m4n01: Online
        x3550m4n02: Online
@@ -1818,7 +1818,7 @@ Further from this, the following changes needed to be made for nfs in el7 ::
      Description=RPC Pipe File System
      DefaultDependencies=no
      Conflicts=umount.target
-     
+
      [Mount]
      What=sunrpc
      Where=/var/lib/nfs_local/rpc_pipefs
@@ -1849,9 +1849,9 @@ Further from this, the following changes needed to be made for nfs in el7 ::
      -After=var-lib-nfs-rpc_pipefs.mount
      +Requires=var-lib-nfs_local-rpc_pipefs.mount
      +After=var-lib-nfs_local-rpc_pipefs.mount
-     
+
       ConditionPathExists=/etc/krb5.keytab
-     
+
 
      --- /usr/lib/systemd/system/nfs-secure.service	2015-01-23 16:30:26.000000000 +0000
      +++ /etc/systemd/system/nfs-secure.service	2015-10-13 01:39:36.000000000 +0100
@@ -1863,9 +1863,9 @@ Further from this, the following changes needed to be made for nfs in el7 ::
      -After=var-lib-nfs-rpc_pipefs.mount
      +Requires=var-lib-nfs_local-rpc_pipefs.mount
      +After=var-lib-nfs_local-rpc_pipefs.mount
-     
+
       ConditionPathExists=/etc/krb5.keytab
-     
+
 
      --- /usr/lib/systemd/system/nfs-secure-server.service	2015-01-23 16:30:26.000000000 +0000
      +++ /etc/systemd/system/nfs-secure-server.service	2015-10-13 01:39:36.000000000 +0100
@@ -1878,7 +1878,7 @@ Further from this, the following changes needed to be made for nfs in el7 ::
      +After=var-lib-nfs_local-rpc_pipefs.mount
       PartOf=nfs-server.service
       PartOf=nfs-utils.service
-     
+
 
      --- /usr/lib/systemd/system/nfs-blkmap.service	2015-01-23 16:30:26.000000000 +0000
      +++ /etc/systemd/system/nfs-blkmap.service	2015-10-13 01:39:36.000000000 +0100
@@ -1890,7 +1890,7 @@ Further from this, the following changes needed to be made for nfs in el7 ::
      -Requires=var-lib-nfs-rpc_pipefs.mount
      +After=var-lib-nfs_local-rpc_pipefs.mount
      +Requires=var-lib-nfs_local-rpc_pipefs.mount
-     
+
       Requisite=nfs-blkmap.target
       After=nfs-blkmap.target
 
diff --git a/docs/source/advanced/hamn/setup_ha_mgmt_node_with_raid1_and_disks_move.rst b/docs/source/advanced/hamn/setup_ha_mgmt_node_with_raid1_and_disks_move.rst
index 895775f5e..b93047eb8 100644
--- a/docs/source/advanced/hamn/setup_ha_mgmt_node_with_raid1_and_disks_move.rst
+++ b/docs/source/advanced/hamn/setup_ha_mgmt_node_with_raid1_and_disks_move.rst
@@ -81,4 +81,4 @@ The failover procedure is simple and straightforward:
 
 #. Boot up the standby management node
 
-#. Verify the standby management node could now perform all the cluster management operations. 
+#. Verify the standby management node could now perform all the cluster management operations.
diff --git a/docs/source/advanced/hamn/setup_ha_mgmt_node_with_shared_data.rst b/docs/source/advanced/hamn/setup_ha_mgmt_node_with_shared_data.rst
index a694ad0d6..ab574af45 100644
--- a/docs/source/advanced/hamn/setup_ha_mgmt_node_with_shared_data.rst
+++ b/docs/source/advanced/hamn/setup_ha_mgmt_node_with_shared_data.rst
@@ -54,7 +54,7 @@ The configuration procedure will be quite different based on the shared data mec
     /install
     ~/.xcat
     /<dbdirectory>
-    /tftpboot 
+    /tftpboot
 
 
 .. note:: * For MySQL, the database directory is ``/var/lib/mysql``
@@ -100,7 +100,7 @@ Setup xCAT on the Primary Management Node
 
    Add the two management nodes into policy table: ::
 
-    tabdump policy  
+    tabdump policy
     "1.2","rhmn1",,,,,,"trusted",,
     "1.3","rhmn2",,,,,,"trusted",,
     "1.4","rhmn",,,,,,"trusted",,
@@ -109,7 +109,7 @@ Setup xCAT on the Primary Management Node
 
     chdef -t site databaseloc=/dbdirectory
 
-#. Install and configure database. Refer to the doc [**doto:** choosing_the_Database] to configure the database on the xCAT management node. For PostgreSql, add primary and standby IP addresses access to database, use ``pgsqlsetup -i -a 9.114.47.103 -a 9.114.47.104`` to migrate an existing xCAT database from SQLite to PostgreSQL.  
+#. Install and configure database. Refer to the doc [**doto:** choosing_the_Database] to configure the database on the xCAT management node. For PostgreSql, add primary and standby IP addresses access to database, use ``pgsqlsetup -i -a 9.114.47.103 -a 9.114.47.104`` to migrate an existing xCAT database from SQLite to PostgreSQL.
 
    Verify xcat is running on correct database by running: ::
 
@@ -135,7 +135,7 @@ Setup xCAT on the Primary Management Node
 #. Stop the xcatd daemon and some related network services from starting on reboot: ::
 
     service xcatd stop
-    chkconfig --level 345 xcatd off  
+    chkconfig --level 345 xcatd off
     service conserver off
     chkconfig --level 2345 conserver off
     service dhcpd stop
@@ -148,8 +148,8 @@ Setup xCAT on the Primary Management Node
 
 #. (Optional) If DFM is being used for hardware control capabilities, install DFM package, setup xCAT to communicate directly to the System P server's service processor.::
 
-    xCAT-dfm RPM 
-    ISNM-hdwr_svr RPM  
+    xCAT-dfm RPM
+    ISNM-hdwr_svr RPM
 
 #. If there is any node that is already managed by the Management Node,change the noderes table tftpserver & xcatmaster & nfsserver attributes to the Virtual ip
 
@@ -160,7 +160,7 @@ Setup xCAT on the Primary Management Node
 Setup xCAT on the Standby Management Node
 =========================================
 
-#. Make sure the standby management node is NOT using the shared data. 
+#. Make sure the standby management node is NOT using the shared data.
 
 #. Add the alias ip address ``9.114.47.97`` into the ``/etc/resolv.conf`` as the nameserver. Change the hostname resolution order to be using ``/etc/hosts`` before using name server. Change "hosts: files dns" in /etc/nsswitch.conf.
 
@@ -174,8 +174,8 @@ Setup xCAT on the Standby Management Node
 
 #. (Optional) DFM only, Install DFM package: ::
 
-    xCAT-dfm RPM 
-    ISNM-hdwr_svr RPM 
+    xCAT-dfm RPM
+    ISNM-hdwr_svr RPM
 
 #. Setup hostname resolution between the primary management node and standby management node. Make sure the primary management node can resolve the hostname of the standby management node, and vice versa.
 
@@ -190,7 +190,7 @@ Setup xCAT on the Standby Management Node
 #. Stop the xcatd daemon and related network services from starting on reboot: ::
 
     service xcatd stop
-    chkconfig --level 345 xcatd off  
+    chkconfig --level 345 xcatd off
     service conserver off
     chkconfig --level 2345 conserver off
     service dhcpd stop
@@ -458,7 +458,7 @@ The operating system is installed on the internal disks.
 
 #. Connect the shared disk to both management nodes
 
-   To verify the shared disks are connected correctly, run the sginfo command on both management nodes and look for the same serial number in the output. Be aware that the sginfo command may not be installed by default on Linux, the sginfo command is shipped with package sg3_utils, you can manually install the package sg3_utils on both management nodes. 
+   To verify the shared disks are connected correctly, run the sginfo command on both management nodes and look for the same serial number in the output. Be aware that the sginfo command may not be installed by default on Linux, the sginfo command is shipped with package sg3_utils, you can manually install the package sg3_utils on both management nodes.
 
    Once the sginfo command is installed, run sginfo -l command on both management nodes to list all the known SCSI disks, for example, enter: ::
 
@@ -473,9 +473,9 @@ The operating system is installed on the internal disks.
     /dev/sg3 [=/dev/sdd  scsi0 ch=0 id=4 lun=0]
     /dev/sg4 [=/dev/sde  scsi0 ch=0 id=5 lun=0]
 
-   Use the ``sginfo -s <device_name>`` to identify disks with the same serial number on both management nodes, for example: 
+   Use the ``sginfo -s <device_name>`` to identify disks with the same serial number on both management nodes, for example:
 
-   On the primary management node: :: 
+   On the primary management node: ::
 
     [root@rhmn1 ~]# sginfo -s /dev/sdb
     Serial Number '1T23043224      '
@@ -487,7 +487,7 @@ The operating system is installed on the internal disks.
     [root@rhmn2~]# sginfo -s /dev/sdb
     Serial Number '1T23043224      '
 
-   We can see that the ``/dev/sdb`` is a shared disk on both management nodes. In some cases, as with mirrored disks and when there is no matching of serial numbers between the two management nodes, multiple disks on a single server can have the same serial number, In these cases, format the disks, mount them on both management nodes, and then touch files on the disks to determine if they are shared between the management nodes. 
+   We can see that the ``/dev/sdb`` is a shared disk on both management nodes. In some cases, as with mirrored disks and when there is no matching of serial numbers between the two management nodes, multiple disks on a single server can have the same serial number, In these cases, format the disks, mount them on both management nodes, and then touch files on the disks to determine if they are shared between the management nodes.
 
 #. Create partitions on shared disks
 
@@ -495,7 +495,7 @@ The operating system is installed on the internal disks.
 
     fdisk /dev/sdc
 
-   Verify the partitions are created by running ``fdisk -l``. 
+   Verify the partitions are created by running ``fdisk -l``.
 
 #. Create file systems on shared disks
 
@@ -507,9 +507,9 @@ The operating system is installed on the internal disks.
     mkfs.ext3 -v /dev/sdc4
     mkfs.ext3 -v /dev/sdc5
 
-   If you place entries for the disk in ``/etc/fstab``, which is not required, ensure that the entries do not have the system automatically mount the disk. 
+   If you place entries for the disk in ``/etc/fstab``, which is not required, ensure that the entries do not have the system automatically mount the disk.
 
-   .. note::  Since the file systems will not be mounted automatically during system reboot this must be manually done and xCAT should be started **after** the filesystem is mounted. 
+   .. note::  Since the file systems will not be mounted automatically during system reboot this must be manually done and xCAT should be started **after** the filesystem is mounted.
 
 #. Verify the file systems on the primary management node.
 
@@ -525,7 +525,7 @@ The operating system is installed on the internal disks.
 
      umount /etc/xcat
      umount /install
-     umount ~/.xcat 
+     umount ~/.xcat
      umount /<dbdirectory>
      umount /tftpboot
 
@@ -539,9 +539,9 @@ The operating system is installed on the internal disks.
      mount /dev/sdc4 /<dbdirectory>
      mount /dev/sdc5/tftpboot
 
-   You may get errors "mount: you must specify the filesystem type" or "mount: special device /dev/sdb1 does not exist" when trying to mount the file systems on the standby management node, this is caused by the missing devices files on the standby management node, run ``fidsk /dev/sdx`` and simply select "w write table to disk and exit" in the fdisk menu, then retry the mount. 
+   You may get errors "mount: you must specify the filesystem type" or "mount: special device /dev/sdb1 does not exist" when trying to mount the file systems on the standby management node, this is caused by the missing devices files on the standby management node, run ``fidsk /dev/sdx`` and simply select "w write table to disk and exit" in the fdisk menu, then retry the mount.
 
-   After that, umount the file system on the standby management node: :: 
+   After that, umount the file system on the standby management node: ::
 
     umount /etc/xcat
     umount /install
diff --git a/docs/source/advanced/hamn/setup_xcat_high_available_management_node_in_softlayer.rst b/docs/source/advanced/hamn/setup_xcat_high_available_management_node_in_softlayer.rst
index a8b40f11a..50ae5614d 100644
--- a/docs/source/advanced/hamn/setup_xcat_high_available_management_node_in_softlayer.rst
+++ b/docs/source/advanced/hamn/setup_xcat_high_available_management_node_in_softlayer.rst
@@ -1,6 +1,6 @@
 .. _setup_xcat_high_available_management_node_with_nfs:
 
-Setup xCAT HA Mgmt with NFS pacemaker and corosync 
+Setup xCAT HA Mgmt with NFS pacemaker and corosync
 ====================================================================================
 
 In this doc, we will configure a xCAT HA cluster using ``pacemaker`` and ``corosync`` based on NFS server. ``pacemaker`` and ``corosync`` only support ``x86_64`` systems, more information about ``pacemaker`` and ``corosync`` refer to doc :ref:`setup_ha_mgmt_node_with_drbd_pacemaker_corosync`.
@@ -24,19 +24,19 @@ The DB is SQLlite. There is no service node in this example.
 Prepare NFS server
 --------------------
 
-In NFS server 10.2.2.44, execute commands to export fs; If you want to use another non-root user to manage xCAT, such as hpcpeadmin. 
+In NFS server 10.2.2.44, execute commands to export fs; If you want to use another non-root user to manage xCAT, such as hpcpeadmin.
 You should create a directory for ``/home/hpcpeadmin``; Execute commands in NFS server c902f02x44. ::
 
     # service nfs start
-    # mkdir ~/.xcat 
+    # mkdir ~/.xcat
     # mkdir -p /etc/xcat
     # mkdir -p /disk1/install/
     # mkdir -p /disk1/hpcpeadmin
     # mkdir -p /disk1/install/xcat
 
-    # vi /etc/exports 
-    /disk1/install *(rw,no_root_squash,sync,no_subtree_check) 
-    /etc/xcat *(rw,no_root_squash,sync,no_subtree_check) 
+    # vi /etc/exports
+    /disk1/install *(rw,no_root_squash,sync,no_subtree_check)
+    /etc/xcat *(rw,no_root_squash,sync,no_subtree_check)
     /root/.xcat *(rw,no_root_squash,sync,no_subtree_check)
     /root/.ssh *(rw,no_root_squash,sync,no_subtree_check)
     /disk1/hpcpeadmin *(rw,no_root_squash,sync,no_subtree_check)
@@ -75,12 +75,12 @@ Execute steps on xCAT MN rhmn1
 
    Mount share nfs from 10.2.2.44: ::
 
-    # mkdir -p /install 
+    # mkdir -p /install
     # mkdir -p /etc/xcat
     # mkdir -p /home/hpcpeadmin
     # mount 10.2.2.44:/disk1/install /install
     # mount 10.2.2.44:/etc/xcat /etc/xcat
-    # mkdir -p /root/.xcat 
+    # mkdir -p /root/.xcat
     # mount 10.2.2.44:/root/.xcat /root/.xcat
     # mount 10.2.2.44:/root/.ssh /root/.ssh
     # mount 10.2.2.44:/disk1/hpcpeadmin /home/hpcpeadmin
@@ -113,16 +113,16 @@ Execute steps on xCAT MN rhmn1
 
    Download xcat-core tar ball and xcat-dep tar ball from github, and untar them: ::
 
-    # mkdir /install/xcat 
-    # mv xcat-core-2.8.4.tar.bz2 /install/xcat/ 
+    # mkdir /install/xcat
+    # mv xcat-core-2.8.4.tar.bz2 /install/xcat/
     # mv xcat-dep-201404250449.tar.bz2 /install/xcat/
-    # cd /install/xcat 
+    # cd /install/xcat
     # tar -jxvf xcat-core-2.8.4.tar.bz2
     # tar -jxvf xcat-dep-201404250449.tar.bz2
     # cd xcat-core
     # ./mklocalrepo.sh
     # cd ../xcat-dep/rh6/x86_64/
-    # ./mklocalrepo.sh 
+    # ./mklocalrepo.sh
     # yum clean metadata
     # yum install xCAT
     # source /etc/profile.d/xcat.sh
@@ -232,7 +232,7 @@ Install corosync and pacemaker on both rhmn2 and rhmn1
     enabled=1
     gpgcheck=0
 
-#. Install ``corosync`` and ``pacemaker``, then generate ssh key: 
+#. Install ``corosync`` and ``pacemaker``, then generate ssh key:
 
    Install ``corosync`` and ``pacemaker``: ::
 
@@ -333,15 +333,15 @@ Be aware that you need to apply ALL the configuration at once. You cannot pick a
 
     Check that both rhmn2 and chetha are standby state now: ::
 
-     rhmn1 ~]# crm status 
-     Last updated: Wed Aug 13 22:57:58 2014 
-     Last change: Wed Aug 13 22:40:31 2014 via cibadmin on rhmn1 
-     Stack: classic openais (with plugin) 
-     Current DC: rhmn2 - partition with quorum 
-     Version: 1.1.8-7.el6-394e906 
-     2 Nodes configured, 2 expected votes 
-     14 Resources configured. 
-     Node rhmn1: standby 
+     rhmn1 ~]# crm status
+     Last updated: Wed Aug 13 22:57:58 2014
+     Last change: Wed Aug 13 22:40:31 2014 via cibadmin on rhmn1
+     Stack: classic openais (with plugin)
+     Current DC: rhmn2 - partition with quorum
+     Version: 1.1.8-7.el6-394e906
+     2 Nodes configured, 2 expected votes
+     14 Resources configured.
+     Node rhmn1: standby
      Node rhmn2: standby
 
     Execute ``crm configure edit`` to add all configure at once: ::
@@ -481,29 +481,29 @@ Verify auto fail over
 #. Let rhmn1 standby and rhmn2 online, xcat will run on rhmn2: ::
 
      rhmn2 /]# crm node online rhmn2
-     rhmn2 /]# crm node standby rhmn1 
-     rhmn2 /]# crm status 
-     Last updated: Mon Aug 4 23:19:33 2014 
-     Last change: Mon Aug 4 23:19:40 2014 via crm_attribute on rhmn2 
-     Stack: classic openais (with plugin) 
-     Current DC: rhmn1 - partition with quorum 
-     Version: 1.1.8-7.el6-394e906 
-     2 Nodes configured, 2 expected votes 
-     12 Resources configured. 
+     rhmn2 /]# crm node standby rhmn1
+     rhmn2 /]# crm status
+     Last updated: Mon Aug 4 23:19:33 2014
+     Last change: Mon Aug 4 23:19:40 2014 via crm_attribute on rhmn2
+     Stack: classic openais (with plugin)
+     Current DC: rhmn1 - partition with quorum
+     Version: 1.1.8-7.el6-394e906
+     2 Nodes configured, 2 expected votes
+     12 Resources configured.
 
-     Node rhmn1: standby 
-     Online: [ rhmn2 ] 
+     Node rhmn1: standby
+     Online: [ rhmn2 ]
 
-     Resource Group: XCAT_GROUP 
-     xCATmnVIP (ocf::heartbeat:IPaddr2): Started rhmn2 
-     INSTALLFS (ocf::heartbeat:Filesystem): Started rhmn2 
-     ETCXCATFS (ocf::heartbeat:Filesystem): Started rhmn2 
-     ROOTXCATFS (ocf::heartbeat:Filesystem): Started rhmn2 
-     NFSlock_xCAT (lsb:nfslock): Started rhmn2 
-     xCAT (lsb:xcatd): Started rhmn2 
-     Clone Set: clone_named [named] 
-     Started: [ rhmn2 ] 
-     Stopped: [ named:1 ] 
+     Resource Group: XCAT_GROUP
+     xCATmnVIP (ocf::heartbeat:IPaddr2): Started rhmn2
+     INSTALLFS (ocf::heartbeat:Filesystem): Started rhmn2
+     ETCXCATFS (ocf::heartbeat:Filesystem): Started rhmn2
+     ROOTXCATFS (ocf::heartbeat:Filesystem): Started rhmn2
+     NFSlock_xCAT (lsb:nfslock): Started rhmn2
+     xCAT (lsb:xcatd): Started rhmn2
+     Clone Set: clone_named [named]
+     Started: [ rhmn2 ]
+     Stopped: [ named:1 ]
 
      rhmn2 /]#lsxcatd -v
      Version 2.8.4 (git commit 7306ca8abf1c6d8c68d3fc3addc901c1bcb6b7b3, built Mon Apr 21 20:48:59 EDT 2014)
diff --git a/docs/source/advanced/hierarchy/appendix/appendix_a_setup_backup_service_nodes.rst b/docs/source/advanced/hierarchy/appendix/appendix_a_setup_backup_service_nodes.rst
index d36a0a0cc..41b13259d 100644
--- a/docs/source/advanced/hierarchy/appendix/appendix_a_setup_backup_service_nodes.rst
+++ b/docs/source/advanced/hierarchy/appendix/appendix_a_setup_backup_service_nodes.rst
@@ -95,7 +95,7 @@ procedure to move its CNs over to the backup SN.
 Move the nodes to the new service nodes
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Use the :doc:`snmove </guides/admin-guides/references/man1/snmove.1>` command to make the database changes necessary to move a set of compute nodes from one Service Node to another. 
+Use the :doc:`snmove </guides/admin-guides/references/man1/snmove.1>` command to make the database changes necessary to move a set of compute nodes from one Service Node to another.
 
 To switch all the compute nodes from Service Node ``sn1`` to the backup Service Node ``sn2``, run: ::
 
diff --git a/docs/source/advanced/hierarchy/appendix/appendix_c_migrating_mn_to_sn.rst b/docs/source/advanced/hierarchy/appendix/appendix_c_migrating_mn_to_sn.rst
index 10b20cdcc..15a4dda30 100644
--- a/docs/source/advanced/hierarchy/appendix/appendix_c_migrating_mn_to_sn.rst
+++ b/docs/source/advanced/hierarchy/appendix/appendix_c_migrating_mn_to_sn.rst
@@ -1,10 +1,10 @@
 Appendix C: Migrating a Management Node to a Service Node
 =========================================================
 
-Directly converting an existing Management Node to a Service Node may have some issues and is not recommended.  Do the following steps to convert the xCAT Management Node into a Service node: 
+Directly converting an existing Management Node to a Service Node may have some issues and is not recommended.  Do the following steps to convert the xCAT Management Node into a Service node:
 
 #. backup your xCAT database on the Management Node
 #. Install a new xCAT Management node
 #. Restore your xCAT database into the new Management Node
-#. Re-provision the old xCAT Management Node as a new Service Node 
+#. Re-provision the old xCAT Management Node as a new Service Node
 
diff --git a/docs/source/advanced/hierarchy/configure_dhcp.rst b/docs/source/advanced/hierarchy/configure_dhcp.rst
index f2dca9fa7..06fe9e258 100644
--- a/docs/source/advanced/hierarchy/configure_dhcp.rst
+++ b/docs/source/advanced/hierarchy/configure_dhcp.rst
@@ -7,7 +7,7 @@ Add the defined nodes into the DHCP configuration, refer to:
 `XCAT_pLinux_Clusters/#configure-dhcp <http://localhost/fake_todo>`_
 
 In the large cluster, the size of dhcp lease file "/var/lib/dhcpd/dhcpd.leases" on the DHCP server will grow over time. At around 100MB in size, the DHCP server will take a long time to respond to DHCP requests from clients and cause DHCP timeouts: ::
- 
+
    ...
    Mar  2 01:59:10 c656ems2 dhcpd: DHCPDISCOVER from 00:0a:f7:73:7d:d0 via eth0
    Mar  2 01:59:10 c656ems2 dhcpd: DHCPOFFER on 9.114.39.101 to 00:0a:f7:73:7d:d0 via eth0
diff --git a/docs/source/advanced/hierarchy/databases/mysql_configure.rst b/docs/source/advanced/hierarchy/databases/mysql_configure.rst
index a7404c2b6..6145e6aab 100644
--- a/docs/source/advanced/hierarchy/databases/mysql_configure.rst
+++ b/docs/source/advanced/hierarchy/databases/mysql_configure.rst
@@ -21,7 +21,7 @@ where the /tmp/servicenodes contains a host per line: ::
       10.%.%.%
       node2.cluster.net
 
-**While not recommended**, if you wish to manually migrate your xCAT database, see the following documentation: 
+**While not recommended**, if you wish to manually migrate your xCAT database, see the following documentation:
 `Manually set up MySQL <https://sourceforge.net/p/xcat/wiki/Setting_Up_MySQL_as_the_xCAT_DB/#configure-mysql-manually>`_
 
 .. _grante_revoke_mysql_access_label:
@@ -36,7 +36,7 @@ Granting/Revoking access to the database for Service Node Clients
 * Granting access to the xCAT database.  Service Nodes are required for xCAT hierarchical support.  Compute nodes may also need access that depends on which application is going to run. (xcat201 is xcatadmin's password for following examples) ::
 
     MariaDB > GRANT ALL on xcatdb.* TO xcatadmin@<servicenode(s)> IDENTIFIED BY 'xcat201';
- 
+
   Use the wildcards to do a GRANT ALL to every ipaddress or nodename that need to access the database. ::
 
     MariaDB > GRANT ALL on xcatdb.* TO xcatadmin@'%.cluster.net' IDENTIFIED BY 'xcat201';
@@ -50,4 +50,4 @@ Granting/Revoking access to the database for Service Node Clients
 
    MariaDB > SELECT host, user FROM mysql.user;
 
-  
+
diff --git a/docs/source/advanced/hierarchy/databases/mysql_install.rst b/docs/source/advanced/hierarchy/databases/mysql_install.rst
index 497296bbc..366a083fc 100644
--- a/docs/source/advanced/hierarchy/databases/mysql_install.rst
+++ b/docs/source/advanced/hierarchy/databases/mysql_install.rst
@@ -15,7 +15,7 @@ The MySQL database is supported by xCAT since xCAT 2.1.  MariaDB is a fork of th
 | xCAT 2.10+ | Yes        | Yes        |
 +------------+------------+------------+
 
-MySQL/MariaDB packages are shipped as part of most Linux Distributions. 
+MySQL/MariaDB packages are shipped as part of most Linux Distributions.
 
 
 Red Hat Enterprise Linux
@@ -55,12 +55,12 @@ Suse Linux Enterprise Server
        libqt4-sql-mysql-*
        libmysqlclient18-*
        perl-DBD-mysql-*
-       
 
-Debian/Ubuntu 
+
+Debian/Ubuntu
 -------------
 
-* MySQL - Using ``apt-get``, ensure that the following packages are installed on the management node: :: 
+* MySQL - Using ``apt-get``, ensure that the following packages are installed on the management node: ::
 
         mysql-server
         mysql-common
diff --git a/docs/source/advanced/hierarchy/databases/mysql_remove.rst b/docs/source/advanced/hierarchy/databases/mysql_remove.rst
index 6a25ab488..e8c71c951 100644
--- a/docs/source/advanced/hierarchy/databases/mysql_remove.rst
+++ b/docs/source/advanced/hierarchy/databases/mysql_remove.rst
@@ -12,18 +12,18 @@ If you no longer want to use MySQL/MariaDB to maintain ``xcatdb``, and like to s
 
       XCATBYPASS=1 restorexCATdb -p ~/xcat-dbback
 
-*  Change to PostgreSQL, following documentation: :doc:`/advanced/hierarchy/databases/postgres_install` 
+*  Change to PostgreSQL, following documentation: :doc:`/advanced/hierarchy/databases/postgres_install`
 
 
 *  Change back to default xCAT database, SQLite (**Note**:  xCAT Hierarchy cluster will no longer work)
 
-  #. Stop the ``xcatd`` daemon on the management node. :: 
+  #. Stop the ``xcatd`` daemon on the management node. ::
 
       service xcatd stop
 
-  #. Remove the ``xatdb`` from MySQL/MariaDB (optional): :: 
+  #. Remove the ``xatdb`` from MySQL/MariaDB (optional): ::
 
-      /usr/bin/mysql -u root -p 
+      /usr/bin/mysql -u root -p
 
      drop the xcatdb: ::
 
@@ -34,10 +34,10 @@ If you no longer want to use MySQL/MariaDB to maintain ``xcatdb``, and like to s
        mysql> drop user xcatadm;
 
   #. Move, or remove, the  ``/etc/xcat/cfglog`` file as it points xCAT to MySQL/MariaDB.  (without this file, xCAT defaults to SQLite): ::
-   
-      rm /etc/xcat/cfgloc 
+
+      rm /etc/xcat/cfgloc
 
   #. Restart ``xcatd``: ::
 
-      service xcatd start 
+      service xcatd start
 
diff --git a/docs/source/advanced/hierarchy/databases/mysql_using.rst b/docs/source/advanced/hierarchy/databases/mysql_using.rst
index 899e90a8a..6c97859e5 100644
--- a/docs/source/advanced/hierarchy/databases/mysql_using.rst
+++ b/docs/source/advanced/hierarchy/databases/mysql_using.rst
@@ -20,17 +20,17 @@ Start/Stop MySQL/MariaDB service
     service mysql stop
 
 
-Basic MySQL/MariaDB commands 
+Basic MySQL/MariaDB commands
 -----------------------------
 
 Refer to `<https://www.mariadb.org/>`_ for the latest documentation.
 
 * Using ``mysql``, connect to the xcat database:  ::
-   
+
     mysql -u root -p
 
 * List the hosts and users which managed by this xcat MN: ::
-   
+
     MariaDB> SELECT host, user FROM mysql.user;
 
 * List the databases: ::
diff --git a/docs/source/advanced/hierarchy/databases/postgres_configure.rst b/docs/source/advanced/hierarchy/databases/postgres_configure.rst
index c9ce1e014..c3a1bb449 100644
--- a/docs/source/advanced/hierarchy/databases/postgres_configure.rst
+++ b/docs/source/advanced/hierarchy/databases/postgres_configure.rst
@@ -8,13 +8,13 @@ A utility is provided to migrate an existing xCAT database from SQLite to Postgr
 
     pgsqlsetup -i -V
 
-**While not recommended**, if you wish to manually migrate your xCAT database, see the following documentation: 
+**While not recommended**, if you wish to manually migrate your xCAT database, see the following documentation:
 `Manually set up PostgreSQL <https://sourceforge.net/p/xcat/wiki/Setting_Up_PostgreSQL_as_the_xCAT_DB/#manually-setup-postgresql>`_
 
-Setting up the Service Nodes 
+Setting up the Service Nodes
 ----------------------------
 
-For service nodes, add the IP address of each service nodes to the postgres configuration file: ``/var/lib/pgsql/data/pg_hba.conf``  
+For service nodes, add the IP address of each service nodes to the postgres configuration file: ``/var/lib/pgsql/data/pg_hba.conf``
 
 If you had the following two service nodes: ::
 
@@ -29,10 +29,10 @@ You would add the following to ``/var/lib/pgsql/data/pg_hba.conf`` ::
 
 Restart PostgreSQL after editing the file: ::
 
-    service postgresql restart 
+    service postgresql restart
 
 
-For more information about changing the ``pg_hab.conf`` file and ``postgresql.conf`` files, see the following documentation: 
+For more information about changing the ``pg_hab.conf`` file and ``postgresql.conf`` files, see the following documentation:
 `Setup the PostgreSQL Configuration Files <https://sourceforge.net/p/xcat/wiki/Setting_Up_PostgreSQL_as_the_xCAT_DB/#setup-the-postgresql-configuration-files>`_
 
 .. _modify_postgresql_database_diretory:
diff --git a/docs/source/advanced/hierarchy/databases/postgres_install.rst b/docs/source/advanced/hierarchy/databases/postgres_install.rst
index a87f81f09..666258c2e 100644
--- a/docs/source/advanced/hierarchy/databases/postgres_install.rst
+++ b/docs/source/advanced/hierarchy/databases/postgres_install.rst
@@ -16,7 +16,7 @@ Using yum, install the following rpms: ::
 Suse Linux Enterprise Server
 ----------------------------
 
-**Note:** On SLES, ``perl-DBD`` packages are provided on the SDK iso images. 
+**Note:** On SLES, ``perl-DBD`` packages are provided on the SDK iso images.
 
 Using zyppr, install the following rpms: ::
 
@@ -24,7 +24,7 @@ Using zyppr, install the following rpms: ::
     zypper install perl-DBD-Pg
 
 
-Debian/Ubuntu 
+Debian/Ubuntu
 -------------
 
 Using apt, install the following packages: ::
diff --git a/docs/source/advanced/hierarchy/databases/postgres_remove.rst b/docs/source/advanced/hierarchy/databases/postgres_remove.rst
index 16807d1d2..245018853 100644
--- a/docs/source/advanced/hierarchy/databases/postgres_remove.rst
+++ b/docs/source/advanced/hierarchy/databases/postgres_remove.rst
@@ -8,12 +8,12 @@ To remove ``xcatdb`` completely from the PostgreSQL database:
       mkdir -p ~/xcat-dbback
       dumpxCATdb -p ~/xcat-dbback
 
-#. Stop the ``xcatd`` daemon on the management node.  
+#. Stop the ``xcatd`` daemon on the management node.
    **Note:** If you are using *xCAT Hierarchy (service nodes)* and removing ``xcatdb`` from postgres, hierarchy will no longer work. You will need to configure another database which supports remote database access to continue using the hierarchy feature. ::
 
       service xcatd stop
 
-#. Remove the ``xatdb`` from PostgreSQL: :: 
+#. Remove the ``xatdb`` from PostgreSQL: ::
 
       su - postgres
 
@@ -31,7 +31,7 @@ To remove ``xcatdb`` completely from the PostgreSQL database:
       rm -rf *
 
 #. Move, or remove, the  ``/etc/xcat/cfglog`` file as it points xCAT to PostgreSQL.  (without this file, xCAT defaults to SQLite): ::
-   
+
       mv /etc/xcat/cfgloc /etc/xcat/cfglog.postgres
 
 #. Restore the PostgreSQL database into SQLite: ::
@@ -40,5 +40,5 @@ To remove ``xcatdb`` completely from the PostgreSQL database:
 
 #. Restart ``xcatd``: ::
 
-      service xcatd start 
+      service xcatd start
 
diff --git a/docs/source/advanced/hierarchy/databases/postgres_tips.rst b/docs/source/advanced/hierarchy/databases/postgres_tips.rst
index 82df8ac42..00d1ba886 100644
--- a/docs/source/advanced/hierarchy/databases/postgres_tips.rst
+++ b/docs/source/advanced/hierarchy/databases/postgres_tips.rst
@@ -9,13 +9,13 @@ Using PostgreSQL
 Use the psql command line utility to connect to the PostgreSQL database: ::
 
     su - postgres
-    psql -h <hostname> -U xcatadm -d xcatdb 
+    psql -h <hostname> -U xcatadm -d xcatdb
 
 
 Useful Commands
 ---------------
 
-* Show create statement for a table, for example prescripts table. :: 
+* Show create statement for a table, for example prescripts table. ::
 
     /usr/bin/pg_dump xcatdb -U xcatadm -t prescripts
 
@@ -26,7 +26,7 @@ Useful Commands
     # drop the xcatdb
     dropdb xcatdb
 
-    # remove the xcatadm database owner 
+    # remove the xcatadm database owner
     dropuser xcatadm
 
     # clean up the postgresql files (necessary if you want to re-create the database)
@@ -38,7 +38,7 @@ Useful Commands
     su - postgres
     psql -l
 
-* Access the database: :: 
+* Access the database: ::
 
     su - postgres
     psql xcatdb
diff --git a/docs/source/advanced/hierarchy/databases/postgres_using.rst b/docs/source/advanced/hierarchy/databases/postgres_using.rst
index b757333c9..fe56eed5e 100644
--- a/docs/source/advanced/hierarchy/databases/postgres_using.rst
+++ b/docs/source/advanced/hierarchy/databases/postgres_using.rst
@@ -12,8 +12,8 @@ Using ``psql``, connect to the xcat database: ::
 list the xCAT tables: ::
 
       xcatdb=> \dt
- 
-show the entries in the nodelist table: :: 
+
+show the entries in the nodelist table: ::
 
       xcatdb=> select * from nodelist;
 
@@ -29,7 +29,7 @@ Show the SQL create statement for a table: ::
 
       /usr/bin/pg_dump_xcatdb -U xcatadm -t <table_name>
 
-      # example, for prescripts table: 
+      # example, for prescripts table:
       /usr/bin/pg_dump xcatdb -U xcatadm -t prescripts
 
 List all databases in postgres: ::
diff --git a/docs/source/advanced/hierarchy/define_and_install_compute_node.rst b/docs/source/advanced/hierarchy/define_and_install_compute_node.rst
index 952dd3d6b..f3e637d1a 100644
--- a/docs/source/advanced/hierarchy/define_and_install_compute_node.rst
+++ b/docs/source/advanced/hierarchy/define_and_install_compute_node.rst
@@ -4,16 +4,16 @@ Define and install your Compute Nodes
 Make /install available on the Service Nodes
 --------------------------------------------
 
-Note that all of the files and directories pointed to by your osimages should 
-be placed under the directory referred to in site.installdir (usually 
-/install), so they will be available to the service nodes. The installdir 
-directory is mounted or copied to the service nodes during the hierarchical 
+Note that all of the files and directories pointed to by your osimages should
+be placed under the directory referred to in site.installdir (usually
+/install), so they will be available to the service nodes. The installdir
+directory is mounted or copied to the service nodes during the hierarchical
 installation.
 
-If you are not using the NFS-based statelite method of booting your compute 
-nodes and you are not using service node pools, set the installloc attribute 
-to "/install". This instructs the service node to mount /install from the 
-management node. (If you don't do this, you have to manually sync /install 
+If you are not using the NFS-based statelite method of booting your compute
+nodes and you are not using service node pools, set the installloc attribute
+to "/install". This instructs the service node to mount /install from the
+management node. (If you don't do this, you have to manually sync /install
 between the management node and the service nodes.)
 
 ::
@@ -23,17 +23,17 @@ between the management node and the service nodes.)
 Make compute node syncfiles available on the servicenodes
 ---------------------------------------------------------
 
-If you are not using the NFS-based statelite method of booting your compute 
-nodes, and you plan to use the syncfiles postscript to update files on the 
-nodes during install, you must ensure that those files are sync'd to the 
-servicenodes before the install of the compute nodes. To do this after your 
-nodes are defined, you will need to run the following whenever the files in 
+If you are not using the NFS-based statelite method of booting your compute
+nodes, and you plan to use the syncfiles postscript to update files on the
+nodes during install, you must ensure that those files are sync'd to the
+servicenodes before the install of the compute nodes. To do this after your
+nodes are defined, you will need to run the following whenever the files in
 your synclist change on the Management Node:
 ::
 
   updatenode <computenoderange> -f
 
-At this point you can return to the documentation for your cluster environment 
+At this point you can return to the documentation for your cluster environment
 to define and deploy your compute nodes.
 
 
diff --git a/docs/source/advanced/hierarchy/define_service_node.rst b/docs/source/advanced/hierarchy/define_service_node.rst
index 6c5b5b3ef..81e6c8557 100644
--- a/docs/source/advanced/hierarchy/define_service_node.rst
+++ b/docs/source/advanced/hierarchy/define_service_node.rst
@@ -16,8 +16,8 @@ group called **service**. Some of the commands in this document will use the
 group **service** to update all service nodes.
 
 Note: a Service Node's service node is the Management Node; so a service node
-must have a direct connection to the management node. The compute nodes do not 
-have to be directly attached to the Management Node, only to their service 
+must have a direct connection to the management node. The compute nodes do not
+have to be directly attached to the Management Node, only to their service
 node. This will all have to be defined in your networks table.
 
 Add Service Nodes to the nodelist Table
@@ -25,11 +25,11 @@ Add Service Nodes to the nodelist Table
 
 Define your service nodes (if not defined already), and by convention we put
 them in a **service** group. We usually have a group compute for our compute
-nodes, to distinguish between the two types of nodes. (If you want to use your 
-own group name for service nodes, rather than service, you need to change some 
-defaults in the xCAT db that use the group name service. For example, in the 
-postscripts table there is by default a group entry for service, with the 
-appropriate postscripts to run when installing a service node. Also, the 
+nodes, to distinguish between the two types of nodes. (If you want to use your
+own group name for service nodes, rather than service, you need to change some
+defaults in the xCAT db that use the group name service. For example, in the
+postscripts table there is by default a group entry for service, with the
+appropriate postscripts to run when installing a service node. Also, the
 default ``kickstart/autoyast`` template, pkglist, etc that will be used have
 files names based on the profile name service.) ::
 
@@ -44,7 +44,7 @@ appropriate for SNs. Display the list of osimages and choose one with
 
    lsdef -t osimage
 
-For this example, let's assume you chose the stateful osimage definition for 
+For this example, let's assume you chose the stateful osimage definition for
 rhels 7: rhels7-x86_64-install-service . If you want to modify any of the
 osimage attributes (e.g. ``kickstart/autoyast`` template, pkglist, etc),
 make a copy of the osimage definition and also copy to ``/install/custom``
@@ -63,16 +63,16 @@ Now set some of the common attributes for the SNs at the group level: ::
 Add Service Nodes to the servicenode Table
 ------------------------------------------
 
-An entry must be created in the servicenode table for each service node or the 
-service group. This table describes all the services you would like xcat to 
-setup on the service nodes. (Even if you don't want xCAT to set up any 
-services - unlikely - you must define the service nodes in the servicenode 
-table with at least one attribute set (you can set it to 0), otherwise it will 
+An entry must be created in the servicenode table for each service node or the
+service group. This table describes all the services you would like xcat to
+setup on the service nodes. (Even if you don't want xCAT to set up any
+services - unlikely - you must define the service nodes in the servicenode
+table with at least one attribute set (you can set it to 0), otherwise it will
 not be recognized as a service node.)
 
-When the xcatd daemon is started or restarted on the service node, it will 
-make sure all of the requested services are configured and started. (To 
-temporarily avoid this when restarting xcatd, use "service xcatd reload" 
+When the xcatd daemon is started or restarted on the service node, it will
+make sure all of the requested services are configured and started. (To
+temporarily avoid this when restarting xcatd, use "service xcatd reload"
 instead.)
 
 To set up the minimum recommended services on the service nodes: ::
@@ -138,9 +138,9 @@ value as the node's servicenode attribute.
 
 Host name resolution must have been setup in advance, with ``/etc/hosts``, DNS
 or dhcp to ensure that the names put in this table can be resolved on the
-Management Node, Service nodes, and the compute nodes. It is easiest to have a 
-node group of the compute nodes for each service node. For example, if all the 
-nodes in node group compute1 are serviced by sn1 and all the nodes in node 
+Management Node, Service nodes, and the compute nodes. It is easiest to have a
+node group of the compute nodes for each service node. For example, if all the
+nodes in node group compute1 are serviced by sn1 and all the nodes in node
 group compute2 are serviced by sn2:
 
 ::
@@ -148,18 +148,18 @@ group compute2 are serviced by sn2:
   chdef -t group compute1 servicenode=sn1 xcatmaster=sn1-c
   chdef -t group compute2 servicenode=sn2 xcatmaster=sn2-c
 
-Note: in this example, sn1 and sn2 are the node names of the service nodes 
-(and therefore the hostnames associated with the NICs that the MN talks to). 
-The hostnames sn1-c and sn2-c are associated with the SN NICs that communicate 
+Note: in this example, sn1 and sn2 are the node names of the service nodes
+(and therefore the hostnames associated with the NICs that the MN talks to).
+The hostnames sn1-c and sn2-c are associated with the SN NICs that communicate
 with their compute nodes.
 
 Note: if not set, the attribute tftpserver's default value is xcatmaster,
 but in some releases of xCAT it has not defaulted correctly, so it is safer
 to set the tftpserver to the value of xcatmaster.
 
-These attributes will allow you to specify which service node should run the 
-conserver (console) and monserver (monitoring) daemon for the nodes in the 
-group specified in the command. In this example, we are having each node's 
+These attributes will allow you to specify which service node should run the
+conserver (console) and monserver (monitoring) daemon for the nodes in the
+group specified in the command. In this example, we are having each node's
 primary SN also act as its conserver and monserver (the most typical setup).
 ::
 
@@ -169,43 +169,43 @@ primary SN also act as its conserver and monserver (the most typical setup).
 Service Node Pools
 ^^^^^^^^^^^^^^^^^^
 
-Service Node Pools are multiple service nodes that service the same set of 
-compute nodes. Having multiple service nodes allows backup service node(s) for 
-a compute node when the primary service node is unavailable, or can be used 
-for work-load balancing on the service nodes. But note that the selection of 
-which SN will service which compute node is made at compute node boot time. 
-After that, the selection of the SN for this compute node is fixed until the 
-compute node is rebooted or the compute node is explicitly moved to another SN 
+Service Node Pools are multiple service nodes that service the same set of
+compute nodes. Having multiple service nodes allows backup service node(s) for
+a compute node when the primary service node is unavailable, or can be used
+for work-load balancing on the service nodes. But note that the selection of
+which SN will service which compute node is made at compute node boot time.
+After that, the selection of the SN for this compute node is fixed until the
+compute node is rebooted or the compute node is explicitly moved to another SN
 using the `snmove <http://localhost/fake_todo>`_  command.
 
-To use Service Node pools, you need to architect your network such that all of 
-the compute nodes and service nodes in a particular pool are on the same flat 
+To use Service Node pools, you need to architect your network such that all of
+the compute nodes and service nodes in a particular pool are on the same flat
 network. If you don't want the management node to respond to manage some of
-the compute nodes, it shouldn't be on that same flat network. The 
+the compute nodes, it shouldn't be on that same flat network. The
 site, dhcpinterfaces attribute should be set such that the SNs' DHCP daemon
-only listens on the NIC that faces the compute nodes, not the NIC that faces 
-the MN. This avoids some timing issues when the SNs are being deployed (so 
-that they don't respond to each other before they are completely ready). You 
+only listens on the NIC that faces the compute nodes, not the NIC that faces
+the MN. This avoids some timing issues when the SNs are being deployed (so
+that they don't respond to each other before they are completely ready). You
 also need to make sure the `networks <http://localhost/fake_todo>`_ table
 accurately reflects the physical network structure.
 
-To define a list of service nodes that support a set of compute nodes, set the 
-servicenode attribute to a comma-delimited list of the service nodes. When 
-running an xCAT command like xdsh or updatenode for compute nodes, the list 
-will be processed left to right, picking the first service node on the list to 
-run the command. If that service node is not available, then the next service 
-node on the list will be chosen until the command is successful. Errors will 
-be logged. If no service node on the list can process the command, then the 
-error will be returned. You can provide some load-balancing by assigning your 
+To define a list of service nodes that support a set of compute nodes, set the
+servicenode attribute to a comma-delimited list of the service nodes. When
+running an xCAT command like xdsh or updatenode for compute nodes, the list
+will be processed left to right, picking the first service node on the list to
+run the command. If that service node is not available, then the next service
+node on the list will be chosen until the command is successful. Errors will
+be logged. If no service node on the list can process the command, then the
+error will be returned. You can provide some load-balancing by assigning your
 service nodes as we do below.
 
-When using service node pools, the intent is to have the service node that 
-responds first to the compute node's DHCP request during boot also be the 
-xcatmaster, the tftpserver, and the NFS/http server for that node. Therefore, 
-the xcatmaster and nfsserver attributes for nodes should not be set. When 
-nodeset is run for the compute nodes, the service node interface on the 
-network to the compute nodes should be defined and active, so that nodeset 
-will default those attribute values to the "node ip facing" interface on that 
+When using service node pools, the intent is to have the service node that
+responds first to the compute node's DHCP request during boot also be the
+xcatmaster, the tftpserver, and the NFS/http server for that node. Therefore,
+the xcatmaster and nfsserver attributes for nodes should not be set. When
+nodeset is run for the compute nodes, the service node interface on the
+network to the compute nodes should be defined and active, so that nodeset
+will default those attribute values to the "node ip facing" interface on that
 service node.
 
 For example: ::
@@ -213,7 +213,7 @@ For example: ::
   chdef -t node compute1 servicenode=sn1,sn2 xcatmaster="" nfsserver=""
   chdef -t node compute2 servicenode=sn2,sn1 xcatmaster="" nfsserver=""
 
-You need to set the sharedtftp site attribute to 0 so that the SNs will not 
+You need to set the sharedtftp site attribute to 0 so that the SNs will not
 automatically mount the ``/tftpboot`` directory from the management node:
 ::
 
@@ -233,8 +233,8 @@ from this rsync.
 
   rsync -auv --exclude 'autoinst' /install sn1:/
 
-Note: If your service nodes are stateless and site.sharedtftp=0, if you reboot 
-any service node when using servicenode pools, any data written to the local 
+Note: If your service nodes are stateless and site.sharedtftp=0, if you reboot
+any service node when using servicenode pools, any data written to the local
 ``/tftpboot`` directory of that SN is lost. You will need to run nodeset for
 all of the compute nodes serviced by that SN again.
 
@@ -244,14 +244,14 @@ networks table, see ref: networks table, see :ref:`setup_networks_table_label`.
 Conserver and Monserver and Pools
 """""""""""""""""""""""""""""""""
 
-The support of conserver and monserver with Service Node Pools is still not 
-supported. You must explicitly assign these functions to a service node using 
+The support of conserver and monserver with Service Node Pools is still not
+supported. You must explicitly assign these functions to a service node using
 the nodehm.conserver and noderes.monserver attribute as above.
 
 Setup Site Table
 ----------------
 
-If you are not using the NFS-based statelite method of booting your compute 
+If you are not using the NFS-based statelite method of booting your compute
 nodes, set the installloc attribute to ``/install``. This instructs the
 service node to mount ``/install`` from the management node. (If you don't do
 this, you have to manually sync ``/install`` between the management node and
@@ -259,11 +259,11 @@ the service nodes.) ::
 
   chdef -t site  clustersite installloc="/install"
 
-For IPMI controlled nodes, if you want the out-of-band IPMI operations to be 
-done directly from the management node (instead of being sent to the 
+For IPMI controlled nodes, if you want the out-of-band IPMI operations to be
+done directly from the management node (instead of being sent to the
 appropriate service node), set site.ipmidispatch=n.
 
-If you want to throttle the rate at which nodes are booted up, you can set the 
+If you want to throttle the rate at which nodes are booted up, you can set the
 following site attributes:
 
 
@@ -278,7 +278,7 @@ See the `site table man page <http://localhost/fack_todo>`_ for details.
 Setup networks Table
 --------------------
 
-All networks in the cluster must be defined in the networks table. When xCAT 
+All networks in the cluster must be defined in the networks table. When xCAT
 is installed, it runs makenetworks, which creates an entry in the networks
 table for each of the networks the management node is on. You need to add
 entries for each network the service nodes use to communicate to the compute
@@ -288,22 +288,22 @@ For example: ::
 
   mkdef -t network net1 net=10.5.1.0 mask=255.255.255.224 gateway=10.5.1.1
 
-If you want to set the nodes' xcatmaster as the default gateway for the nodes, 
-the gateway attribute can be set to keyword "<xcatmaster>". In this case, xCAT 
-code will automatically substitute the IP address of the node's xcatmaster for 
+If you want to set the nodes' xcatmaster as the default gateway for the nodes,
+the gateway attribute can be set to keyword "<xcatmaster>". In this case, xCAT
+code will automatically substitute the IP address of the node's xcatmaster for
 the keyword. Here is an example:
 ::
 
   mkdef -t network net1 net=10.5.1.0 mask=255.255.255.224 gateway=<xcatmaster>
 
-The ipforward attribute should be enabled on all the xcatmaster nodes that 
-will be acting as default gateways. You can set ipforward to 1 in the 
-servicenode table or add the line "net.ipv4.ip_forward = 1" in file 
+The ipforward attribute should be enabled on all the xcatmaster nodes that
+will be acting as default gateways. You can set ipforward to 1 in the
+servicenode table or add the line "net.ipv4.ip_forward = 1" in file
 ``/etc/sysctl.conf`` and then run "sysctl -p /etc/sysctl.conf" manually to
 enable the ipforwarding.
 
-Note:If using service node pools, the networks table dhcpserver attribute can 
-be set to any single service node in your pool. The networks tftpserver, and 
+Note:If using service node pools, the networks table dhcpserver attribute can
+be set to any single service node in your pool. The networks tftpserver, and
 nameserver attributes should be left blank.
 
 Verify the Tables
@@ -317,17 +317,17 @@ compute1, compute2: ::
 Add additional adapters configuration script (optional)
 ------------------------------------------------------------
 
-It is possible to have additional adapter interfaces automatically configured 
-when the nodes are booted. XCAT provides sample configuration scripts for 
-ethernet, IB, and HFI adapters. These scripts can be used as-is or they can be 
-modified to suit your particular environment. The ethernet sample is 
+It is possible to have additional adapter interfaces automatically configured
+when the nodes are booted. XCAT provides sample configuration scripts for
+ethernet, IB, and HFI adapters. These scripts can be used as-is or they can be
+modified to suit your particular environment. The ethernet sample is
 ``/install/postscript/configeth``. When you have the configuration script that
 you want you can add it to the "postscripts" attribute as mentioned above. Make
 sure your script is in the ``/install/postscripts`` directory and that it is
 executable.
 
-Note: For system p servers, if you plan to have your service node perform the 
-hardware control functions for its compute nodes, it is necessary that the SN 
+Note: For system p servers, if you plan to have your service node perform the
+hardware control functions for its compute nodes, it is necessary that the SN
 ethernet network adapters connected to the HW service VLAN be configured.
 
 Configuring Secondary Adapters
diff --git a/docs/source/advanced/hierarchy/define_service_nodes.rst b/docs/source/advanced/hierarchy/define_service_nodes.rst
index 63137f989..5e1d14785 100644
--- a/docs/source/advanced/hierarchy/define_service_nodes.rst
+++ b/docs/source/advanced/hierarchy/define_service_nodes.rst
@@ -3,7 +3,7 @@ Define Service Nodes
 
 This next part shows how to configure a xCAT Hierarchy and provision xCAT service nodes from an existing xCAT cluster.
 
-*The document assumes that the compute nodes that are part of your cluster have already been defined into the xCAT database and you have successfully provisioned the compute nodes using xCAT* 
+*The document assumes that the compute nodes that are part of your cluster have already been defined into the xCAT database and you have successfully provisioned the compute nodes using xCAT*
 
 
 The following table illustrates the cluster being used in this example:
@@ -33,8 +33,8 @@ The following table illustrates the cluster being used in this example:
 
        chdef -t site hierarchicalattrs="postscripts"
 
-#. Select the compute nodes that will become service nodes 
-     
+#. Select the compute nodes that will become service nodes
+
         The first node in each rack, ``r1n01`` and ``r2n01``, is selected to become the xCAT service nodes and manage the compute nodes in that rack
 
 
@@ -53,7 +53,7 @@ The following table illustrates the cluster being used in this example:
 
         chdef -t group -o service setupnfs=1 \
                                   setupdhcp=1 \
-                                  setuptftp=1 \ 
+                                  setuptftp=1 \
                                   setupnameserver=1 \
                                   setupconserver=2
 
@@ -63,26 +63,26 @@ The following table illustrates the cluster being used in this example:
       * For clusters with subnetted management networks, you might want to set ``setupupforward=1``
       * For the ``setupconserver`` attribute, if ``conserver`` is used, set to ``1``, if ``goconserver`` is used, set to ``2``
 
-#. Add additional postscripts for Service Nodes (optional) 
+#. Add additional postscripts for Service Nodes (optional)
 
    By default, xCAT will execute the ``servicenode`` postscript when installed or diskless booted.  This postscript will set up the necessary credentials and installs the xCAT software on the Service Nodes.  If you have additional postscripts that you want to execute on the service nodes, copy to ``/install/postscripts`` and run the following: ::
 
         chdef -t group -o service -p postscripts=<mypostscript>
 
-#. Assigning Compute Nodes to their Service Nodes 
+#. Assigning Compute Nodes to their Service Nodes
+
+   The node attributes ``servicenode`` and ``xcatmaster``, define which Service node will serve the particular compute node.
 
-   The node attributes ``servicenode`` and ``xcatmaster``, define which Service node will serve the particular compute node. 
-   
    * ``servicenode`` - defines which Service Node the **Management Node** should send commands to (e.g ``xdsh``) and should be set to the hostname or IP address of the service node that the management node can contact it by.
    * ``xcatmaster`` - defines which Service Node the **Compute Node** should boot from and should be set to the hostname or IP address of the service node that the compute node can contact it by.
 
    You must set both ``servicenode`` and ``xcatmaster`` regardless of whether or not you are using service node pools, for most scenarios, the value will be identical. ::
 
-        chdef -t group -o rack1 servicenode=r1n01 xcatmaster=r1n01 
+        chdef -t group -o rack1 servicenode=r1n01 xcatmaster=r1n01
         chdef -t group -o rack2 servicenode=r2n01 xcatmaster=r2n01
 
 #. Set the conserver and monserver attributes
- 
+
    Set which service node should run the conserver (console) and monserver (monitoring) daemon for the nodes in the group. The most typical setup is to have the service node also ad as it's conserver and monserver. ::
 
         chdef -t group -o rack1 conserver=r1n01 monserver=r1n01
@@ -101,7 +101,7 @@ The following table illustrates the cluster being used in this example:
 
          chdef -t site clustersite sharedtftp=0
          chdef -t site clustersite installloc=
-         rsync -auv --exclude 'autoinst' /install r1n01:/ 
-         rsync -auv --exclude 'autoinst' /install r2n01:/ 
-         rsync -auv --exclude 'autoinst' /tftpboot r1n01:/ 
-         rsync -auv --exclude 'autoinst' /tftpboot r2n01:/ 
+         rsync -auv --exclude 'autoinst' /install r1n01:/
+         rsync -auv --exclude 'autoinst' /install r2n01:/
+         rsync -auv --exclude 'autoinst' /tftpboot r1n01:/
+         rsync -auv --exclude 'autoinst' /tftpboot r2n01:/
diff --git a/docs/source/advanced/hierarchy/index.rst b/docs/source/advanced/hierarchy/index.rst
index 4439ff4e6..52ed9ac80 100644
--- a/docs/source/advanced/hierarchy/index.rst
+++ b/docs/source/advanced/hierarchy/index.rst
@@ -1,7 +1,7 @@
 Hierarchical Clusters / Large Cluster Support
 =============================================
 
-xCAT supports management of very large sized cluster by creating a **Hierarchical Cluster** and the concept of **xCAT Service Nodes**.  
+xCAT supports management of very large sized cluster by creating a **Hierarchical Cluster** and the concept of **xCAT Service Nodes**.
 
 When dealing with large clusters, to balance the load, it is recommended to have more than one node (Management Node, "MN") handling the installation and management of the Compute Nodes ("CN").  These additional *helper* nodes are referred to as **Service Nodes** ("SN").  The Management Node can delegate all management operational needs to the Service Node responsible for a set of compute node.
 
diff --git a/docs/source/advanced/hierarchy/provision/diskful_sn.rst b/docs/source/advanced/hierarchy/provision/diskful_sn.rst
index 552d0f39a..e72b9ba6a 100644
--- a/docs/source/advanced/hierarchy/provision/diskful_sn.rst
+++ b/docs/source/advanced/hierarchy/provision/diskful_sn.rst
@@ -11,7 +11,7 @@ Any cluster using statelite compute nodes must use a stateful (diskful) Service
 Configure ``otherpkgdir`` and ``otherpkglist`` for service node osimage
 -----------------------------------------------------------------------
 
- * Create a subdirectory ``xcat`` under a path specified by ``otherpkgdir`` attribute of the service node os image, selected during the :doc:`../define_service_nodes` step. 
+ * Create a subdirectory ``xcat`` under a path specified by ``otherpkgdir`` attribute of the service node os image, selected during the :doc:`../define_service_nodes` step.
 
    For example, for osimage *rhels7-x86_64-install-service* ::
 
@@ -114,17 +114,17 @@ Watch the installation progress using either wcons or rcons: ::
 Update Service Node Diskful Image
 ---------------------------------
 
-To update the xCAT software on the Service Node: 
+To update the xCAT software on the Service Node:
 
 #. Remove previous xcat-core, xcat-dep, and tar files in the NFS mounted ``/install/post/otherpkgs/`` directory: ::
-    
+
     rm /install/post/otherpkgs/<os>/<arch>/xcat/xcat-core
     rm /install/post/otherpkgs/<os>/<arch>/xcat/xcat-dep
     rm /install/post/otherpkgs/<os>/<arch>/xcat/<xcat-core.tar>
     rm /install/post/otherpkgs/<os>/<arch>/xcat/<xcat-dep.tar>
 
 #. Download the desired tar files from xcat.org on to the Management Node, and untar them in the same NFS mounted ``/install/post/otherpkgs/`` directory: ::
- 
+
     cd /install/post/otherpkgs/<os>/<arch>/xcat/
     tar jxvf <new-xcat-core.tar>
     tar jxvf <new-xcat-dep.tar>
diff --git a/docs/source/advanced/hierarchy/provision/diskless_sn.rst b/docs/source/advanced/hierarchy/provision/diskless_sn.rst
index 8825a1ad1..3412f01e7 100644
--- a/docs/source/advanced/hierarchy/provision/diskless_sn.rst
+++ b/docs/source/advanced/hierarchy/provision/diskless_sn.rst
@@ -67,7 +67,7 @@ When you run ``copycds``, xCAT will only create a Service Node stateful osimage
 
   If you would like to change any of these files, copy them to a custom
   directory. This can be any directory you choose, but we recommend that you
-  keep it /install somewhere. A good location is something like ``/install/custom/netboot/<osimage>``. 
+  keep it /install somewhere. A good location is something like ``/install/custom/netboot/<osimage>``.
 
   ::
 
@@ -172,8 +172,8 @@ When you run ``copycds``, xCAT will only create a Service Node stateful osimage
   If you installed your management node directly from the online
   repository, you will need to download the ``xcat-core`` and ``xcat-dep`` tarballs
 
-  - From http://xcat.org/download.html, download the ``xcat-core`` and ``xcat-dep`` tarball files.  
-    Copy these into a subdirectory in the ``otherpkgdir`` directory. 
+  - From http://xcat.org/download.html, download the ``xcat-core`` and ``xcat-dep`` tarball files.
+    Copy these into a subdirectory in the ``otherpkgdir`` directory.
 
     ::
 
@@ -184,9 +184,9 @@ When you run ``copycds``, xCAT will only create a Service Node stateful osimage
       cd /install/post/otherpkgs/rhels7.3/ppc64le
       mkdir xcat
       cd xcat
-      
+
       # copy the <xcat-core> and <xcat-deb> tarballs here
-      
+
       # extract the tarballs
       tar -jxvf <xcat-core>.tar.bz2
       tar -jxvf <xcat-dep>.tar.bz2
diff --git a/docs/source/advanced/hierarchy/service_nodes.rst b/docs/source/advanced/hierarchy/service_nodes.rst
index 7a6462a04..a1c99d57c 100644
--- a/docs/source/advanced/hierarchy/service_nodes.rst
+++ b/docs/source/advanced/hierarchy/service_nodes.rst
@@ -1,7 +1,7 @@
 Service Nodes
 =============
 
-Service Nodes are similar to the xCAT Management Node in that each service Nodes runs an instance of the xCAT daemon: ``xcatd``.  ``xcatd``'s communicate with each other using the same XML/SSL protocol that the xCAT client uses to communicate with ``xcatd`` on the Management Node. 
+Service Nodes are similar to the xCAT Management Node in that each service Nodes runs an instance of the xCAT daemon: ``xcatd``.  ``xcatd``'s communicate with each other using the same XML/SSL protocol that the xCAT client uses to communicate with ``xcatd`` on the Management Node.
 
 The Service Nodes need to communicate with the xCAT database running on the Management Node.  This is done using the remote client capabilities of the database.  This is why the default SQLite database cannot be used.
 
diff --git a/docs/source/advanced/kit/custom/build/createkit.rst b/docs/source/advanced/kit/custom/build/createkit.rst
index fbb0e6118..2c712c8ff 100644
--- a/docs/source/advanced/kit/custom/build/createkit.rst
+++ b/docs/source/advanced/kit/custom/build/createkit.rst
@@ -6,15 +6,15 @@ Use the :doc:`buildkit </guides/admin-guides/references/man1/buildkit.1>` comman
     buildkit create <kitbasename> [-l|--kitloc <kit location>]
 
 
-Kit Directory 
+Kit Directory
 -------------
 
-The Kit directory location will be automatically  populated with additional subdirecotries and samples: 
+The Kit directory location will be automatically  populated with additional subdirecotries and samples:
 
 **buildkit.conf** -  The sample Kit build configuration file.
 
 **source_packages** - This directory stores the source packages for Kit Packages and Non-Native Packages.  The **buildkit** command will search these directories for source packages when building packages.  This directory stores:
-  
+
   * RPM spec and tarballs. (A sample spec file is provided.)
   * Source RPMs.
   * Pre-built RPMs (contained in a subdirectory of source_packages)
@@ -42,7 +42,7 @@ The Kit directory location will be automatically  populated with additional subd
 Kit Configuration File
 ----------------------
 
-The ``buildkit.conf`` file is a sample file that contains a description of all the supported attributes and indicates required or optional fields.  The user needs to modify this file for the software kit to be built. [#]_ 
+The ``buildkit.conf`` file is a sample file that contains a description of all the supported attributes and indicates required or optional fields.  The user needs to modify this file for the software kit to be built. [#]_
 
 **kit** --- This stanza defines general information for the Kit.  There must be exactly one kit stanza in a kit build file.  ::
 
@@ -71,12 +71,12 @@ The ``buildkit.conf`` file is a sample file that contains a description of all t
       osarch=x86_64
 
 minor version can be support following format: ::
-    
+
     osminorversion=2  <<-- minor version has to be exactly matched to 2
     osminorversion=>=2  <<-- minor version can be 2 or greater than 2
-    osminorversion=<=2  <<-- minor version can be 2 or less than 2 
+    osminorversion=<=2  <<-- minor version can be 2 or less than 2
     osminorversion=>2  <<-- minor version has to be greater than 2
-    osminorversion=<2  <<-- minor version has to be less than 2 
+    osminorversion=<2  <<-- minor version has to be less than 2
 
 **kitcomponent** --- This stanza defines one Kit Component. A kitcomponent definition is a way of specifying a subset of the product Kit that may be installed into an xCAT osimage.  A kitcomponent may or may not be dependent on other kitcomponents.If user want to build a component which supports multiple OSes, need to create one kitcomponent stanza for each OS.  ::
 
@@ -106,13 +106,13 @@ minor version can be support following format: ::
        serverroles=compute
        ospkgdeps=at,rsh-server,xinetd,sudo,libibverbs-32bit,libibverbs,insserv
        kitrepoid=sles11_x86_64
-       kitpkgdeps=ppe_rte_license  
+       kitpkgdeps=ppe_rte_license
 
 
-**kitpackage** --- This stanza defines Kit Package (ie. RPM). There can be zero or more kitpackage stanzas.  For multiple package supports,  need to 
+**kitpackage** --- This stanza defines Kit Package (ie. RPM). There can be zero or more kitpackage stanzas.  For multiple package supports,  need to
 
   #. Define one kitpackage section per supported OS.  or
-  #. Define one kitpacakge stanza which contains multiple kitrepoid lines. For the RPM packages, users need to responsible for creating an RPM spec file that can run on multiple OSes.  
+  #. Define one kitpacakge stanza which contains multiple kitrepoid lines. For the RPM packages, users need to responsible for creating an RPM spec file that can run on multiple OSes.
 
 ::
 
@@ -149,7 +149,7 @@ minor version can be support following format: ::
 Partial vs. Complete Kits
 -------------------------
 
-A **complete** software kits includes all the product software and is ready to be consumed as is.   A **partial** software kit is one that does not include all the product packages and requires the consumer to download the product software and complete the kit before it can be consumed.  
+A **complete** software kits includes all the product software and is ready to be consumed as is.   A **partial** software kit is one that does not include all the product packages and requires the consumer to download the product software and complete the kit before it can be consumed.
 
 To build partial kits, the ``isexternalpkg=yes`` needs to be set in the ``kitpackage`` stanza in the ``buildkit.conf`` file: ::
 
diff --git a/docs/source/advanced/kit/custom/build/kitrepo.rst b/docs/source/advanced/kit/custom/build/kitrepo.rst
index 964c203a1..a2f757ac1 100644
--- a/docs/source/advanced/kit/custom/build/kitrepo.rst
+++ b/docs/source/advanced/kit/custom/build/kitrepo.rst
@@ -25,4 +25,4 @@ If the Kit Package Repository is not fully built, the command builds it as follo
     #. Build the Component Meta-Packages associated with this Kit Package Repository. Create the packages under the Kit Package Repository directory
     #. Build the Kit Packages associated with this Kit Package Repository. Create the packages under the Kit Package Repository directory
     #. Build the repository meta-data for the Kit Package Repository. The repository meta-data is based on the OS native package format. For example, for RHEL, we build the YUM repository meta-data with the createrepo command.
- 
+
diff --git a/docs/source/advanced/kit/custom/build/kittarfile.rst b/docs/source/advanced/kit/custom/build/kittarfile.rst
index 5246b35f3..0a8e39e9a 100644
--- a/docs/source/advanced/kit/custom/build/kittarfile.rst
+++ b/docs/source/advanced/kit/custom/build/kittarfile.rst
@@ -37,7 +37,7 @@ Follow these steps to complete the kit build process for a partial kit.
   #. copy the partial kit to a working directory
   #. copy the product software packages to a convenient location or locations
   #. cd to the working directory
-  #. Build the complete kit tarfile 
+  #. Build the complete kit tarfile
 
 ::
 
diff --git a/docs/source/advanced/kit/custom/build/validatekit.rst b/docs/source/advanced/kit/custom/build/validatekit.rst
index ea2f108ec..7f9c64554 100644
--- a/docs/source/advanced/kit/custom/build/validatekit.rst
+++ b/docs/source/advanced/kit/custom/build/validatekit.rst
@@ -5,5 +5,5 @@ After modifying the ``buildkit.conf`` file and copying all the necessary files t
 
     buildkit chkconfig
 
-This command will verify all required fields defined in the buildkit.conf.  If errors are found, fix the specified error and rerun the command until all fields are validated. 
+This command will verify all required fields defined in the buildkit.conf.  If errors are found, fix the specified error and rerun the command until all fields are validated.
 
diff --git a/docs/source/advanced/kit/custom/introduction.rst b/docs/source/advanced/kit/custom/introduction.rst
index febb1dbde..3d7042166 100644
--- a/docs/source/advanced/kit/custom/introduction.rst
+++ b/docs/source/advanced/kit/custom/introduction.rst
@@ -1,4 +1,4 @@
-Introduction 
+Introduction
 ============
 
 Contents
@@ -6,10 +6,10 @@ Contents
 
 A Software Kit is a tar file that contains the following:
 
-**Kit Configuration File** --- A file describing the contents of this kit and contains following information 
+**Kit Configuration File** --- A file describing the contents of this kit and contains following information
 
   * Kit name, version, description, supported OS distributions, license information, and deployment parameters
-  * Kit repository information including name, supported OS distributions, and supported architectures 
+  * Kit repository information including name, supported OS distributions, and supported architectures
   * Kit component information including name, version, description, server roles, scripts, and other data
 
 **Kit Repositories** --- A directory for each operating system version this kit is supported in. Each directory contains all of the product software packages required for that environment along with repository metadata.
@@ -42,14 +42,14 @@ Once the kit components are added to xCAT osimage definitions, administrators ca
 #. ``genimage`` command to create a diskless OS image installing the kit components for diskless OS provisioning
 #. ``updatenode`` command to install the kit components on existing deployed nodes
 
-The ``kitcomponent`` metadata defines the kit packages as dependency packages and the OS package manager (``yum``, ``zypper``, ``apt-get``) automatically installes the required packages during the xCAT ``otherpkgs`` install process. 
+The ``kitcomponent`` metadata defines the kit packages as dependency packages and the OS package manager (``yum``, ``zypper``, ``apt-get``) automatically installes the required packages during the xCAT ``otherpkgs`` install process.
 
 Kit Framework
 -------------
 
-With time, the implementation of the xCAT Software Kit support may change.  
+With time, the implementation of the xCAT Software Kit support may change.
 
-In order to process a kit successfully, the kit must be compatible with the level of xCAT code that was used to build the kit.  The xCAT kit commands and software kits contain the framework version and compatible supported versions. 
+In order to process a kit successfully, the kit must be compatible with the level of xCAT code that was used to build the kit.  The xCAT kit commands and software kits contain the framework version and compatible supported versions.
 
 To view the framework version, use the ``-v | --version`` option on :doc:`addkit </guides/admin-guides/references/man1/addkit.1>`  ::
 
@@ -59,7 +59,7 @@ To view the framework version, use the ``-v | --version`` option on :doc:`addkit
             compatible_frameworks = 0,1,2
 
 
-If the commands in the xCAT installation is not compatible with the Software Kit obtained, update xCAT to a more recent release. 
+If the commands in the xCAT installation is not compatible with the Software Kit obtained, update xCAT to a more recent release.
 
 
-.. [#] PCM is IBM Platform Cluster Manager 
+.. [#] PCM is IBM Platform Cluster Manager
diff --git a/docs/source/advanced/kit/custom/using/update.rst b/docs/source/advanced/kit/custom/using/update.rst
index 2651a6e93..210912189 100644
--- a/docs/source/advanced/kit/custom/using/update.rst
+++ b/docs/source/advanced/kit/custom/using/update.rst
@@ -24,6 +24,6 @@ updating diskful nodes
 
 For existing active nodes, use the updatenode command to update the OS on those nodes. The updatenode command will use the osimage assigned to the node to determine the software to be updated. Once the osimage has been updated, make sure the correct image is assigned to the node and then run updatenode: ::
 
-  chdef <nodelist> provmethod=<osimage>      
+  chdef <nodelist> provmethod=<osimage>
   updatenode <nodelist>
 
diff --git a/docs/source/advanced/kit/hpc/quickstart.rst b/docs/source/advanced/kit/hpc/quickstart.rst
index 74b8d83e4..90e16f973 100644
--- a/docs/source/advanced/kit/hpc/quickstart.rst
+++ b/docs/source/advanced/kit/hpc/quickstart.rst
@@ -1,9 +1,9 @@
 Quick Start Guide
 =================
 
-This quick start is provided to guide users through the steps required to install the IBM High Performance Computing (HPC) software stack on a cluster managed by xCAT. (*NOTE:* xCAT provides XLC and XLF partial kits, but all other HPC kits are provided by the HPC products teams, xCAT may not have any knowledges of their dependencies and requirements)  
+This quick start is provided to guide users through the steps required to install the IBM High Performance Computing (HPC) software stack on a cluster managed by xCAT. (*NOTE:* xCAT provides XLC and XLF partial kits, but all other HPC kits are provided by the HPC products teams, xCAT may not have any knowledges of their dependencies and requirements)
 
-The following software kits will be used to install the IBM HPC software stack on to a RedHat Enterprise Linux 7.2 operating system running on ppc64le architecture. 
+The following software kits will be used to install the IBM HPC software stack on to a RedHat Enterprise Linux 7.2 operating system running on ppc64le architecture.
 
     * ``xlc-13.1.3-0-ppc64le.tar.bz2`` [1]_
     * ``xlf-15.1.3-0-ppc64le.tar.bz2`` [1]_
@@ -16,7 +16,7 @@ The following software kits will be used to install the IBM HPC software stack o
 .. [1] This guide assumes that the **complete** software kit is available for all the products listed below. For the IBM XL compilers, follow the :doc:`IBM XL Compiler </advanced/kit/hpc/software/compilers>` documentation to obtain the software and create the **complete** kit before proceeding.
 
 1. Using the ``addkit`` command, add each software kit package into xCAT: ::
-  
+
     addkit xlc-13.1.3-0-ppc64le.tar.bz2,xlf-15.1.3-0-ppc64le.tar.bz2
     addkit pperte-2.3.0.0-1547a-ppc64le.tar.bz2,pperte-2.3.0.2-s002a-ppc64le.tar.bz2
     addkit pessl-5.2.0-0-ppc64le.tar.bz2,essl-5.4.0-0-ppc64le.tar.bz2
@@ -25,15 +25,15 @@ The following software kits will be used to install the IBM HPC software stack o
    The ``lskit`` command can be used to view the kits after adding to xCAT.
 
 
-2. Using the ``addkitcomp`` command, add the kitcomponent to the target osimage.  
+2. Using the ``addkitcomp`` command, add the kitcomponent to the target osimage.
 
-   The order that the kit components are added to the osimage is important due to dependencies that kits may have with one another, a feature to help catch potential issues ahead of time.  There are a few different types of dependencies: 
+   The order that the kit components are added to the osimage is important due to dependencies that kits may have with one another, a feature to help catch potential issues ahead of time.  There are a few different types of dependencies:
 
       * **internal kit dependencies** - kit components within the software kit have dependencies.  For example, the software has a dependency on it's license component.  The ``-a`` option will automatically resolve internal kit dependencies.
-      * **external kit dependencies** - a software kit depends on another software provided in a separate kit.  The dependency kit must be added first.  ``addkitcomp`` will complain if it cannot resolve the dependency. 
-      * **runtime dependencies** - the software provided in the kit has rpm requirements for external 3rd party RPMs not shipped with the kit.  The administrator needs to configure these before deploying the osimage and ``addkitcomp`` cannot detect this dependencies. 
+      * **external kit dependencies** - a software kit depends on another software provided in a separate kit.  The dependency kit must be added first.  ``addkitcomp`` will complain if it cannot resolve the dependency.
+      * **runtime dependencies** - the software provided in the kit has rpm requirements for external 3rd party RPMs not shipped with the kit.  The administrator needs to configure these before deploying the osimage and ``addkitcomp`` cannot detect this dependencies.
 
-  In the following examples, the ``rhels7.2-ppc64le-install-compute`` osimage is used and the ``-a`` option is specified to resolve internal dependencies. 
+  In the following examples, the ``rhels7.2-ppc64le-install-compute`` osimage is used and the ``-a`` option is specified to resolve internal dependencies.
 
     #. Add the **XLC** kitcomponents to the osimage:  ::
 
@@ -42,7 +42,7 @@ The following software kits will be used to install the IBM HPC software stack o
 
 
     #. Add the **XLF** kitcomponents to the osimage:  ::
-  
+
         addkitcomp -a -i rhels7.2-ppc64le-install-compute \
             xlf.compiler-compute-15.1.3-0-rhels-7.2-ppc64le
 
@@ -59,11 +59,11 @@ The following software kits will be used to install the IBM HPC software stack o
             min-pperte-compute-2.3.0.0-1547a-rhels-7.2-ppc64le
 
 
-    #. Add the PE RTE PTF2, **pperte-s002a**, kitcomponents to the osimage. 
+    #. Add the PE RTE PTF2, **pperte-s002a**, kitcomponents to the osimage.
 
        The PTF2 update requires the ``pperte-license`` component, which is provided by the GA software kit.  The ``addkitcomp -n`` option allows for multiple versions of the same kit component to be installed into the osimage.  If only the PTF2 version is intended to be installed, you can skip the previous step for adding the GA ppetre kit component, but the GA software kit must have been added to xCAT with the ``addkit`` command in order to resolve the license dependency.  ::
 
-        addkitcomp -a -n -i rhels7.2-ppc64le-install-compute \ 
+        addkitcomp -a -n -i rhels7.2-ppc64le-install-compute \
             pperte-login-2.3.0.2-s002a-rhels-7.2-ppc64le
 
         addkitcomp -a -n -i rhels7.2-ppc64le-install-compute \
@@ -73,7 +73,7 @@ The following software kits will be used to install the IBM HPC software stack o
             min-pperte-compute-2.3.0.2-s002a-rhels-7.2-ppc64le
 
 
-    #. Add the **ESSL** kitcomponents to the osimage.  
+    #. Add the **ESSL** kitcomponents to the osimage.
 
        The ESSL software kit has an *external dependency* to the ``libxlf`` which is provided in the XLF software kit.  Since it's already added in the above step, there is no action needed here.
 
@@ -101,9 +101,9 @@ The following software kits will be used to install the IBM HPC software stack o
         addkitcomp -a -i rhels7.2-ppc64le-install-compute \
             essl-computenode-3264rtecuda-5.4.0-0-rhels-7.2-ppc64le
 
-      If the system doesn't have GPU and the CUDA toolkit is not needed,  the administrator should not add the following kit components that requires the CUDA packages: ``essl-loginnode-5.4.0-0-rhels-7.2-ppc64le``, ``essl-computenode-3264rte-5.4.0-0-rhels-7.2-ppc64le`` and ``essl-computenode-3264rtecuda-5.4.0-0-rhels-7.2-ppc64le``.  Check the ESSL installation guide: http://www.ibm.com/support/knowledgecenter/SSFHY8_5.4.0/com.ibm.cluster.essl.v5r4.essl300.doc/am5il_xcatinstall.htm 
+      If the system doesn't have GPU and the CUDA toolkit is not needed,  the administrator should not add the following kit components that requires the CUDA packages: ``essl-loginnode-5.4.0-0-rhels-7.2-ppc64le``, ``essl-computenode-3264rte-5.4.0-0-rhels-7.2-ppc64le`` and ``essl-computenode-3264rtecuda-5.4.0-0-rhels-7.2-ppc64le``.  Check the ESSL installation guide: http://www.ibm.com/support/knowledgecenter/SSFHY8_5.4.0/com.ibm.cluster.essl.v5r4.essl300.doc/am5il_xcatinstall.htm
 
-    #. Add the **Parallel ESSL** kitcomponents to osimage.  
+    #. Add the **Parallel ESSL** kitcomponents to osimage.
 
        **Note:** ESSL kitcomponents are required for the PESSL.  ::
 
@@ -115,7 +115,7 @@ The following software kits will be used to install the IBM HPC software stack o
 
         addkitcomp -a -i rhels7.2-ppc64le-install-compute \
             pessl-computenode-3264rtempich-5.2.0-0-rhels-7.2-ppc64le
- 
+
 
     #. Add the **PE DE** kitcomponents to osimage:  ::
 
@@ -124,11 +124,11 @@ The following software kits will be used to install the IBM HPC software stack o
 
         addkitcomp -a -i rhels7.2-ppc64le-install-compute \
             ppedev.compute-2.2.0-0-rhels-7.2-ppc64le
-    
+
 
 3. The updated osimage now contains the configuration to install using xCAT software kits: ::
 
-     lsdef -t osimage rhels7.2-ppc64le-install-compute 
+     lsdef -t osimage rhels7.2-ppc64le-install-compute
         Object name: rhels7.2-ppc64le-install-compute
         exlist=/install/osimages/rhels7.2-ppc64le-install-compute-kits/kits/KIT_COMPONENTS.exlist
         imagetype=linux
@@ -146,4 +146,4 @@ The following software kits will be used to install the IBM HPC software stack o
         provmethod=install
         template=/opt/xcat/share/xcat/install/rh/compute.rhels7.tmpl
 
-4. The osimage is now ready to deploy to the compute nodes. 
+4. The osimage is now ready to deploy to the compute nodes.
diff --git a/docs/source/advanced/kit/hpc/software/compilers.rst b/docs/source/advanced/kit/hpc/software/compilers.rst
index 736262e42..467781b2f 100644
--- a/docs/source/advanced/kit/hpc/software/compilers.rst
+++ b/docs/source/advanced/kit/hpc/software/compilers.rst
@@ -1,13 +1,13 @@
 IBM XL Compilers
 ================
 
-IBM provides XL compilers with advanced optimizing on IBM Power Systems running Linux. 
+IBM provides XL compilers with advanced optimizing on IBM Power Systems running Linux.
 For more information, http://www-03.ibm.com/software/products/en/xlcpp-linux
 
 Partial Kits
 ------------
 
-The IBM XL compilers are dependencies for some of the HPC software products and is **not** available in xCAT Software Kit format.  
+The IBM XL compilers are dependencies for some of the HPC software products and is **not** available in xCAT Software Kit format.
 
 To assist customers in creating a software kit for the IBM XL compilers, xCAT provides partial kits at: https://xcat.org/files/kits/hpckits/
 
@@ -46,7 +46,7 @@ To use software kits that require compiler kit components, a compiler software k
         xlsmp.lib-3.1.0.8-151013.ppc64.rpm
         xlsmp.msg.rte-3.1.0.8-151013.ppc64.rpm
         xlsmp.rte-3.1.0.8-151013.ppc64.rpm
-  
+
 #. Obtain the corresponding compiler partial kit from https://xcat.org/files/kits/hpckits/. [#]_
 
    **xlc-12.1.0.8-151013-ppc64.NEED_PRODUCT_PKGS.tar.bz2** is downloaded to ``/tmp/kits``: ::
@@ -56,11 +56,11 @@ To use software kits that require compiler kit components, a compiler software k
 
 #. Complete the partial kit by running the ``buildkit addpkgs`` command: ::
 
-       buildkit addpkgs xlc-12.1.0.8-151013-ppc64.NEED_PRODUCT_PKGS.tar.bz2 \ 
+       buildkit addpkgs xlc-12.1.0.8-151013-ppc64.NEED_PRODUCT_PKGS.tar.bz2 \
           --pkgdir /tmp/kits/xlc-12.1.0.8
 
    Sample output: ::
- 
+
        Extracting tar file /tmp/kits/xlc-12.1.0.8-151013-ppc64.NEED_PRODUCT_PKGS.tar.bz2. Please wait.
        Spawning worker 0 with 5 pkgs
        Spawning worker 1 with 5 pkgs
@@ -73,7 +73,7 @@ To use software kits that require compiler kit components, a compiler software k
        Generating sqlite DBs
        Sqlite DBs complete
        Creating tar file /tmp/kits/xlc-12.1.0.8-151013-ppc64.tar.bz2.
-       Kit tar file /tmp/kits/xlc-12.1.0.8-151013-ppc64.tar.bz2 successfully built. 
+       Kit tar file /tmp/kits/xlc-12.1.0.8-151013-ppc64.tar.bz2 successfully built.
 
 
 
diff --git a/docs/source/advanced/kit/hpc/software/index.rst b/docs/source/advanced/kit/hpc/software/index.rst
index 2ec80c8fc..1ae8bb3dd 100644
--- a/docs/source/advanced/kit/hpc/software/index.rst
+++ b/docs/source/advanced/kit/hpc/software/index.rst
@@ -10,4 +10,4 @@ Refer to the following pages for product specific details and known issues.
    pe_rte.rst
    pe_de.rst
    essl.rst
-   pessl.rst 
+   pessl.rst
diff --git a/docs/source/advanced/kit/hpc/software/pe_de.rst b/docs/source/advanced/kit/hpc/software/pe_de.rst
index 2f05f9bff..400f7035b 100644
--- a/docs/source/advanced/kit/hpc/software/pe_de.rst
+++ b/docs/source/advanced/kit/hpc/software/pe_de.rst
@@ -3,7 +3,7 @@ Parallel Environment Developer Edition (PE DE)
 
 xCAT software kits for PE DE for Linux is available on: [#]_
 
-   * PE DE 1.2.0.1 and newer (SystemX) 
+   * PE DE 1.2.0.1 and newer (SystemX)
    * PE DE 1.2.0.3 and newer (SystemP)
 
 
diff --git a/docs/source/advanced/kit/hpc/software/pe_rte.rst b/docs/source/advanced/kit/hpc/software/pe_rte.rst
index 5db73c479..900c2d0fe 100644
--- a/docs/source/advanced/kit/hpc/software/pe_rte.rst
+++ b/docs/source/advanced/kit/hpc/software/pe_rte.rst
@@ -7,7 +7,7 @@ xCAT software kits for PE RTE for Linux is available on: [#]_
 
 
 
-PE RTE and ``mlnxofed_ib_install`` Conflict 
+PE RTE and ``mlnxofed_ib_install`` Conflict
 -------------------------------------------
 
 PPE requires the 32-bit version of ``libibverbs``.  The default behavior of the ``mlnxofed_ib_install`` postscript used to install the Mellanox OFED Infiniband (IB) driver is to remove any of the old IB related packages when installing.  To bypass this behavior, set the variable ``mlnxofed_options=--force`` when running the ``mlnxofed_ib_install`` script.
@@ -18,8 +18,8 @@ Install Multiple Versions
 
 Beginning with **PE RTE 1.2.0.10**, the packages are designed to allow for multiple versions of PE RTE to coexist on the same machine.
 
-The default behavior of xCAT software kits is to only allow one version of a ``kitcomponent`` to be associated with an xCAT osimage.  
-When using ``addkitcomp`` to add a newer version of a kit component, xCAT will first remove the old version of the kit component before adding the new one.  
+The default behavior of xCAT software kits is to only allow one version of a ``kitcomponent`` to be associated with an xCAT osimage.
+When using ``addkitcomp`` to add a newer version of a kit component, xCAT will first remove the old version of the kit component before adding the new one.
 
 To add multiple versions of PE RTE kit components to the same osimage, use the ``-n | --noupgrade`` option.  For example, to add PE RTE 1.3.0.1 and PE RTE 1.3.0.2 to the ``compute`` osimage: ::
 
@@ -36,11 +36,11 @@ When running parallel jobs, POE requires the user pass it a host list file.  xCA
 Known Issues
 ------------
 
-* **[PE RTE 1.3.0.7]** - For developers creating the complete software kit.  The src rpm is no longer required.   It is recommended to create the new software kit for PE RTE 1.3.0.7 from scratch and not to use the older kits as a starting point. 
+* **[PE RTE 1.3.0.7]** - For developers creating the complete software kit.  The src rpm is no longer required.   It is recommended to create the new software kit for PE RTE 1.3.0.7 from scratch and not to use the older kits as a starting point.
 
-* **[PE RTE 1.3.0.7]** - When upgrading ``ppe_rte_man`` in a diskless image, there may be errors reported during the genimage process.  The new packages are actually upgraded, so the errors can be ignored with low risk. 
+* **[PE RTE 1.3.0.7]** - When upgrading ``ppe_rte_man`` in a diskless image, there may be errors reported during the genimage process.  The new packages are actually upgraded, so the errors can be ignored with low risk.
 
-* **[PE RTE 1.3.0.1 to 1.3.0.6]** - When uninstalling or upgrading ppe_rte_man in an diskless image, ``genimage <osimage>`` may fail and stop an an error.  To workaround, simply rerun ``genimage <osimage>`` to finish the creation of the diskless image 
+* **[PE RTE 1.3.0.1 to 1.3.0.6]** - When uninstalling or upgrading ppe_rte_man in an diskless image, ``genimage <osimage>`` may fail and stop an an error.  To workaround, simply rerun ``genimage <osimage>`` to finish the creation of the diskless image
 
 
 
diff --git a/docs/source/advanced/kit/index.rst b/docs/source/advanced/kit/index.rst
index 83f4d44c1..fda29f7f2 100644
--- a/docs/source/advanced/kit/index.rst
+++ b/docs/source/advanced/kit/index.rst
@@ -1,9 +1,9 @@
 Software Kits
 =============
 
-xCAT supports a unique software bundling concept called **software kits**.  Software kit combines all of the required product components (packages, license, configuration, scripts, etc) to assist the administrator in the installation of software onto machines managed by xCAT.  Software kits are made up of a collection of "kit components", each of which is tailored to one specific environment for that particular version of the software product. 
+xCAT supports a unique software bundling concept called **software kits**.  Software kit combines all of the required product components (packages, license, configuration, scripts, etc) to assist the administrator in the installation of software onto machines managed by xCAT.  Software kits are made up of a collection of "kit components", each of which is tailored to one specific environment for that particular version of the software product.
 
-Prebuilt software kits are available as a tar file which can be downloaded and then added to the xCAT installation.  After the kits are added to xCAT, kit components are then added to specific xCAT osimages to automatically install the software bundled with the kit during OS deployment.  In some instances, software kits may be provided as partial kits.  Partial kits need additional effort to complete the kit before it can be used by xCAT. 
+Prebuilt software kits are available as a tar file which can be downloaded and then added to the xCAT installation.  After the kits are added to xCAT, kit components are then added to specific xCAT osimages to automatically install the software bundled with the kit during OS deployment.  In some instances, software kits may be provided as partial kits.  Partial kits need additional effort to complete the kit before it can be used by xCAT.
 
 Software kits are supported for both diskful and diskless image provisioning.
 
diff --git a/docs/source/advanced/migration/migration.rst b/docs/source/advanced/migration/migration.rst
index 46d84c6af..ebd057929 100644
--- a/docs/source/advanced/migration/migration.rst
+++ b/docs/source/advanced/migration/migration.rst
@@ -12,24 +12,24 @@ Backup Old xCAT Management Node
 
 Backup xCAT management node data to backup server:
 
-1.1 Backup xCAT important files and directories: 
+1.1 Backup xCAT important files and directories:
 
-    #. Get ``installdir`` from ``site`` table, backup ``installdir`` directory, 
+    #. Get ``installdir`` from ``site`` table, backup ``installdir`` directory,
        in this case, back up ``install`` directory: ::
-       
+
         lsdef -t site  clustersite -i installdir
             Object name: clustersite
             installdir=/install
-    
-    #. Backup these two xCAT directories: :: 
+
+    #. Backup these two xCAT directories: ::
 
         ~/.xcat
         /etc/xcat
 
-       .. note:: Backing up ``~/.xcat`` is for all users who have xCAT client certs. 
+       .. note:: Backing up ``~/.xcat`` is for all users who have xCAT client certs.
 
     #. If there are customized files and directories for ``otherpkgdir``, ``pkgdir``, ``pkglist`` or ``template`` in some `osimage` definitions, backup these files and directories. for example: ::
-        
+
         lsdef -t osimage customized_rhels7.4-x86_64-install-compute -i otherpkgdir,pkgdir,pkglist,template
             Object name: customized_rhels7.4-x86_64-install-compute
                 otherpkgdir=/<customized_dir>/post/otherpkgs/rhels7.4/x86_64
@@ -87,10 +87,10 @@ Backup xCAT management node data to backup server:
 
     /etc/ntp.conf
 
-1.11 Backup database configure files (optional): 
+1.11 Backup database configure files (optional):
 
     * **[PostgreSQL]** ::
-      
+
       /var/lib/pgsql/data/pg_hba.conf
       /var/lib/pgsql/data/postgresql.conf
 
@@ -140,17 +140,17 @@ Restore xCAT management node
 2.1 Power off old xCAT management server before configuring new xCAT management server
 
 2.2 Configure new xCAT management server using the same ip and hostname as old xCAT management server. Configure the same additional network for hardware management network if needed, for example, bmc network or hmc network. xCAT management server setup refer to :doc:`Prepare the Management Node <../../guides/install-guides/yum/prepare_mgmt_node>`
-    
+
 2.3 Overwrite files/directories methioned in above 1.2, 1.3, 1.4 from backup server to new xCAT management server
 
 2.4 Download xcat-core and xcat-dep tar ball, then install xCAT in new xCAT management server, refer to :doc:`install xCAT <../../guides/install-guides/yum/install>`
 
-2.5 Use ``rpm -qa|grep -i xCAT`` to list all xCAT RPMs in new xCAT management node, compare these RPMs base name with those in ``xcat_rpm_names`` from above 1.15. If some RPMs are missing, use ``yum install <rpm_package_basename>`` to install missing RPMs. 
+2.5 Use ``rpm -qa|grep -i xCAT`` to list all xCAT RPMs in new xCAT management node, compare these RPMs base name with those in ``xcat_rpm_names`` from above 1.15. If some RPMs are missing, use ``yum install <rpm_package_basename>`` to install missing RPMs.
 
 2.6 If use ``MySQL``/``MariaDB``/``PostgreSQL``, migrate xCAT to use ``MySQL/MariaDB/PostgreSQL`` refer to :doc:`Configure a Database <../hierarchy/databases/index>`
 
 2.7 To restore the xCAT database
-  
+
     a. Restore xCAT database from the ``/dbbackup/db`` directory without ``auditlog`` and ``eventlog``, enter: ::
 
         restorexCATdb -p /dbbackup/db
@@ -160,7 +160,7 @@ Restore xCAT management node
         restorexCATdb -a -p /dbbackup/db
 
     c. (optinal) Overwrite files in above 1.11, restart ``PostgreSQL``: ::
-     
+
         service postgresql restart
 
 2.8 Overwrite remaining files/directories methioned in above 1.1, 1.5, 1.6, 1.7, 1.8, 1.9, 1.10, 1.12; If needed, check if files exist based on above 1.13 and 1.16.
diff --git a/docs/source/advanced/mixed_cluster/building_stateless_images.rst b/docs/source/advanced/mixed_cluster/building_stateless_images.rst
index 4c9f9a344..daec246f5 100644
--- a/docs/source/advanced/mixed_cluster/building_stateless_images.rst
+++ b/docs/source/advanced/mixed_cluster/building_stateless_images.rst
@@ -3,11 +3,11 @@ Building Stateless/Diskless Images
 
 A **stateless**, or **diskless**, provisioned nodes is one where the operating system image is deployed and loaded into memory.  The Operating System (OS) does not store its files directly onto persistent storage (i.e. hard disk drive, shared drive, usb, etc) and so subsequent rebooting of the machine results in loss of any state changes that happened while the machine was running.
 
-To deploy stateless compute nodes, you must first create a stateless image.  The "netboot" osimages created from ``copycds`` in the **osimage** table are sample osimage definitions that can be used for deploying stateless nodes. 
+To deploy stateless compute nodes, you must first create a stateless image.  The "netboot" osimages created from ``copycds`` in the **osimage** table are sample osimage definitions that can be used for deploying stateless nodes.
 
-In a homogeneous cluster, the management node is the same hardware architecture and running the same Operating System (OS) as the compute nodes, so ``genimage`` can directly be executed from the management node. 
+In a homogeneous cluster, the management node is the same hardware architecture and running the same Operating System (OS) as the compute nodes, so ``genimage`` can directly be executed from the management node.
 
-The issues arises in a heterogeneous cluster, where the management node is running a different level operating system *or* hardware architecture as the compute nodes in which to deploy the image.  The ``genimage`` command that builds stateless images depends on various utilities provided by the base operating system and needs to be run on a node with the same hardware architecture and *major* Operating System release as the nodes that will be booted from the image. 
+The issues arises in a heterogeneous cluster, where the management node is running a different level operating system *or* hardware architecture as the compute nodes in which to deploy the image.  The ``genimage`` command that builds stateless images depends on various utilities provided by the base operating system and needs to be run on a node with the same hardware architecture and *major* Operating System release as the nodes that will be booted from the image.
 
 Same Operating System, Different Architecture
 ---------------------------------------------
@@ -19,9 +19,9 @@ The following describes creating stateless images of the same Operating System,
 
 #. On xCAT management node, ``xcatmn``, select the osimage you want to create from the list of osimage definitions.  To list out the osimage definitions: ::
 
-        lsdef -t osimage 
+        lsdef -t osimage
 
-#. **optional:** Create a copy of the osimage definition that you want to modify.  
+#. **optional:** Create a copy of the osimage definition that you want to modify.
 
    To take the sample ``rhels6.3-x86_64-netboot-compute`` osimage definition and create a copy called ``mycomputeimage``, run the following command: ::
 
@@ -38,15 +38,15 @@ The following describes creating stateless images of the same Operating System,
         ./genimage -a x86_64 -o rhels6.3 -p compute --permission 755 --srcdir /install/rhels6.3/x86_64 --pkglist \
         /opt/xcat/share/xcat/netboot/rh/compute.rhels6.x86_64.pkglist --otherpkgdir /install/post/otherpkgs/rhels6.3/x86_64 --postinstall \
         /opt/xcat/share/xcat/netboot/rh/compute.rhels6.x86_64.postinstall --rootimgdir /install/netboot/rhels6.3/x86_64/compute mycomputeimage
- 
-          
+
+
 #. Go to the target node, ``n01`` and run the following:
 
    #. mount the ``/install`` directory from the xCAT Management Node: ::
-        
+
        mkdir /install
        mount -o soft xcatmn:/install /install
-        
+
    #. Copy the executable files from the ``/opt/xcat/share/xcat/netboot`` from the xCAT Management node to the target node: ::
 
        mkdir -p /opt/xcat/share/xcat/
@@ -61,7 +61,7 @@ The following describes creating stateless images of the same Operating System,
 
 
    **If problems creating the stateless image, provide a local directory for --rootimgdir:** ::
-  
+
         mkdir -p /tmp/compute
 
    Rerun ``genimage``, replacing ``--rootimgdir /tmp/compute``: ::
@@ -70,8 +70,8 @@ The following describes creating stateless images of the same Operating System,
         ./genimage -a x86_64 -o rhels6.3 -p compute --permission 755 --srcdir /install/rhels6.3/x86_64 --pkglist \
          /opt/xcat/share/xcat/netboot/rh/compute.rhels6.x86_64.pkglist --otherpkgdir /install/post/otherpkgs/rhels6.3/x86_64 --postinstall \
          /opt/xcat/share/xcat/netboot/rh/compute.rhels6.x86_64.postinstall --rootimgdir /tmp/compute mycomputeimage
- 
-   Then copy the contents from ``/tmp/compute`` to ``/install/netboot/rhels6.3/compute`` 
+
+   Then copy the contents from ``/tmp/compute`` to ``/install/netboot/rhels6.3/compute``
 
 
 #. Now return to the management node and execute ``packimage`` on the osimage and continue provisioning the node ::
diff --git a/docs/source/advanced/mixed_cluster/power/diskless.rst b/docs/source/advanced/mixed_cluster/power/diskless.rst
index d5ac96e0b..88ca74a9b 100644
--- a/docs/source/advanced/mixed_cluster/power/diskless.rst
+++ b/docs/source/advanced/mixed_cluster/power/diskless.rst
@@ -8,8 +8,8 @@ Troubleshooting
 
     Error: Unable to find pxelinux.0 at /opt/xcat/share/xcat/netboot/syslinux/pxelinux.0
 
-**Resolution:** 
+**Resolution:**
 
-The syslinux network booting files are missing.  
+The syslinux network booting files are missing.
 Install the sylinux-xcat package provided in the xcat-deps repository: ``yum -y install syslinux-xcat``
 
diff --git a/docs/source/advanced/mixed_cluster/x86/index.rst b/docs/source/advanced/mixed_cluster/x86/index.rst
index 9dfd77d06..f95a042b1 100644
--- a/docs/source/advanced/mixed_cluster/x86/index.rst
+++ b/docs/source/advanced/mixed_cluster/x86/index.rst
@@ -4,4 +4,4 @@ x86 Management Node
 .. toctree::
    :maxdepth: 2
 
-   
+
diff --git a/docs/source/advanced/networks/ethernet_switches/ethernet_switches.rst b/docs/source/advanced/networks/ethernet_switches/ethernet_switches.rst
index 905baba92..2ce4ba05d 100644
--- a/docs/source/advanced/networks/ethernet_switches/ethernet_switches.rst
+++ b/docs/source/advanced/networks/ethernet_switches/ethernet_switches.rst
@@ -9,9 +9,9 @@ It is recommended that lldp protocol in the switches is enabled to collect the s
 
 xCAT will use the ethernet switches during node discovery to find out which switch port a particular MAC address is communicating over. This allows xCAT to match a random booting node with the proper node name in the database. To set up a switch, give it an IP address on its management port and enable basic **SNMP** functionality. (Typically, the **SNMP** agent in the switches is disabled by default.) The easiest method is to configure the switches to give the **SNMP** version 1 community string called "public" read access. This will allow xCAT to communicate to the switches without further customization. (xCAT will get the list of switches from the **switch** table.) If you want to use **SNMP** version 3 (e.g. for better security), see the example below. With **SNMP** V3 you also have to set the user/password and AuthProto (default is **md5**) in the switches table.
 
-If for some reason you can't configure **SNMP** on your switches, you can use sequential discovery or the more manual method of entering the nodes' MACs into the database. 
+If for some reason you can't configure **SNMP** on your switches, you can use sequential discovery or the more manual method of entering the nodes' MACs into the database.
 
-**SNMP** V3 Configuration example:   
+**SNMP** V3 Configuration example:
 
 xCAT supports many switch types, such as **BNT** and **Cisco**. Here is an example of configuring **SNMP V3** on the **Cisco** switch 3750/3650:
 
@@ -62,14 +62,14 @@ Switch Management
 
 When managing Ethernet switches, the admin often logs into the switches one by one using SSH or Telnet and runs the switch commands. However, it becomes time consuming when there are a lot of switches in a cluster. In a very large cluster, the switches are often identical and the configurations are identical. It helps to configure and monitor them in parallel from a single command.
 
-For managing Mellanox IB switches and  Qlogic IB switches, see :doc:`Mellanox IB switches and Qlogic IB switches </advanced/networks/infiniband/index>` 
+For managing Mellanox IB switches and  Qlogic IB switches, see :doc:`Mellanox IB switches and Qlogic IB switches </advanced/networks/infiniband/index>`
 
 xCAT will not do a lot of switch management functions. Instead, it will configure the switch so that the admin can run remote command such as ``xdsh`` for it. Thus, the admin can use the ``xdsh`` to run proprietary switch commands remotely from the xCAT mn to enable **VLAN**, **bonding**, **SNMP** and others.
 
 Running Remote Commands in Parallel
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-You can use xdsh to run parallel commands on Ethernet switches. The following shows how to configure xCAT to run xdsh on the switches: 
+You can use xdsh to run parallel commands on Ethernet switches. The following shows how to configure xCAT to run xdsh on the switches:
 
 .. note:: For this to work, configure the switch to allow **ssh** or **telnet**. The procedure varies from switch to switch, consult the reference guides for your switch to find out how to do this.
 
@@ -82,7 +82,7 @@ Set the ssh or telnet username an d password. ::
        chdef bntc125 username=admin \
                      password=password \
                      protocol=ssh
-       or 
+       or
        chdef bntc125 username=admin \
                      password=password \
                      protocol=telnet
@@ -101,8 +101,8 @@ Set the ssh or telnet username an d password. ::
 
 Also note that --devicetype is used here. xCAT supports the following switch types out of the box: ::
 
-             * BNT 
-             * Cisco 
+             * BNT
+             * Cisco
              * Juniper
              * Mellanox (for IB and Ethernet switches)
 
@@ -121,7 +121,7 @@ Here is what result will look like: ::
        bntc125: end
        bntc125: show vlan
        bntc125: VLAN                Name                Status            Ports
-       bntc125:  ----  --------------------------------  ------  ------------------------ 
+       bntc125:  ----  --------------------------------  ------  ------------------------
        bntc125:  1     Default VLAN                      ena     45-XGE4
        bntc125:  3     VLAN 3                            dis     empty
        bntc125:  101   xcatpriv101                       ena     24-44
diff --git a/docs/source/advanced/networks/getadapter.rst b/docs/source/advanced/networks/getadapter.rst
index 38188f486..b3aa71fd8 100644
--- a/docs/source/advanced/networks/getadapter.rst
+++ b/docs/source/advanced/networks/getadapter.rst
@@ -39,4 +39,4 @@ Below are the information ``getadapter`` trying to inspect:
 
 * **candidatename**: All the names which satisfy predictable network device naming scheme, if customer needs to customize their network adapter name, they can choose one of them. (``confignetwork`` needs to do more work to support this. if customer want to use their own name, xcat should offer a interface to get customer’s input and change this column)
 
-* **linkstate**:  The link state of network device
\ No newline at end of file
+* **linkstate**:  The link state of network device
diff --git a/docs/source/advanced/networks/infiniband/firmware_updates.rst b/docs/source/advanced/networks/infiniband/firmware_updates.rst
index aaec19b64..2c2eb653a 100644
--- a/docs/source/advanced/networks/infiniband/firmware_updates.rst
+++ b/docs/source/advanced/networks/infiniband/firmware_updates.rst
@@ -21,9 +21,9 @@ Burn new firmware on each ibaX: ::
 
 	mstflint -d 0002:01:00.0 -i <image location> b
 
-.. note:: If this is a PureFlex MezzanineP adapter, you must select the correct image for each ibaX device. 
+.. note:: If this is a PureFlex MezzanineP adapter, you must select the correct image for each ibaX device.
 
-          The difference in the firmware image at the end of the file name: 
+          The difference in the firmware image at the end of the file name:
             * _0.bin (iba0/iba2)
             * _1.bin (iba1/iba3)
 
@@ -96,7 +96,7 @@ Save the changes made for new IB image: ::
 	configuration write
 
 Activate the new IB image (reboot switch): ::
-      
+
 	reload
 
 
diff --git a/docs/source/advanced/networks/infiniband/mlnxofed_configuration.rst b/docs/source/advanced/networks/infiniband/mlnxofed_configuration.rst
index 24e9e912a..046e0a0a7 100644
--- a/docs/source/advanced/networks/infiniband/mlnxofed_configuration.rst
+++ b/docs/source/advanced/networks/infiniband/mlnxofed_configuration.rst
@@ -1,11 +1,11 @@
 Configuration
 =============
 
-The process to configure the osimage to install the Mellanox OFED Drivers for Diskful and Diskless scenarios are outlined below. 
+The process to configure the osimage to install the Mellanox OFED Drivers for Diskful and Diskless scenarios are outlined below.
 
 .. toctree::
    :maxdepth: 2
 
    mlnxofed_ib_install_v2_diskful.rst
    mlnxofed_ib_install_v2_diskless.rst
-   
+
diff --git a/docs/source/advanced/networks/infiniband/mlnxofed_ib_install_v2.rst b/docs/source/advanced/networks/infiniband/mlnxofed_ib_install_v2.rst
index 8a3a5a75c..25f856007 100644
--- a/docs/source/advanced/networks/infiniband/mlnxofed_ib_install_v2.rst
+++ b/docs/source/advanced/networks/infiniband/mlnxofed_ib_install_v2.rst
@@ -1,7 +1,7 @@
 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.v2``.
 
 .. toctree::
    :maxdepth: 2
@@ -10,4 +10,4 @@ Mellanox provides a tested and packaged version of the OpenFabrics Enterprise Di
    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_v2_diskful.rst
index 689c7d265..5c476ab19 100644
--- a/docs/source/advanced/networks/infiniband/mlnxofed_ib_install_v2_diskful.rst
+++ b/docs/source/advanced/networks/infiniband/mlnxofed_ib_install_v2_diskful.rst
@@ -11,16 +11,16 @@ Diskful Installation
 
 #. Configure the ``mlnxofed_ib_install`` script to install the MNLX_OFED drivers
 
-   xCAT has a concept of postscripts that can be used to customize the node after the operating system is installed.  
+   xCAT has a concept of postscripts that can be used to customize the node after the operating system is installed.
 
    Mellanox recommends that the operating system is rebooted after the drivers are installed, so xCAT recommends using the ``postscripts`` attribute to avoid the need for a second reboot.  To invoke the ``mlnxofed_ib_install`` as a postscript ::
- 
-       chdef -t node -o <node_name> \ 
+
+       chdef -t node -o <node_name> \
           -p postscripts="mlnxofed_ib_install -p /install/<path-to>/<MLNX_OFED_LINUX.iso>"
 
    **[kernel mismatch issue]** The Mellanox OFED ISO is built against a series of specific kernel version.  If the version of the linux kernel does not match any of the Mellanox offered pre-built kernel modules, you can pass the ``--add-kernel-support --force`` argument to the Mellanox installation script to build the kernel modules based on the version you are using. ::
 
-       chdef -t node -o <node_name> \ 
+       chdef -t node -o <node_name> \
           -p postscripts="mlnxofed_ib_install -p /install/<path-to>/<MLNX_OFED_LINUX.iso> \
           -m --add-kernel-support --force -end-"
 
@@ -37,8 +37,8 @@ Diskful Installation
          service openibd status
 
      systemd: ::
-    
-         systemctl status openibd.service 
+
+         systemctl status openibd.service
 
    * Verify that the Mellanox IB drivers are located at: ``/lib/modules/<kernel_version>/extra/``
 
diff --git a/docs/source/advanced/networks/infiniband/mlnxofed_ib_install_v2_diskless.rst b/docs/source/advanced/networks/infiniband/mlnxofed_ib_install_v2_diskless.rst
index e708f912c..185129a99 100644
--- a/docs/source/advanced/networks/infiniband/mlnxofed_ib_install_v2_diskless.rst
+++ b/docs/source/advanced/networks/infiniband/mlnxofed_ib_install_v2_diskless.rst
@@ -1,7 +1,7 @@
 Diskless Installation
 =====================
 
-#. Prepare dependency packages in the pkglist 
+#. Prepare dependency packages in the pkglist
 
    In order for the Mellanox installation script to execute successfully, certain dependency packages are required to be installed on the compute node.  xCAT provides sample package list files to help resolve these dependencies.  The samples are located at ``/opt/xcat/share/xcat/ib/netboot/<os>/``.
 
@@ -11,26 +11,26 @@ Diskless Installation
 
 #. Configure the ``mlnxofed_ib_install`` script to install the MNLX_OFED drivers
 
-   Edit the ``postinstall`` script on the osimage to invoke the ``mlnxofed_ib_install`` install script.  
+   Edit the ``postinstall`` script on the osimage to invoke the ``mlnxofed_ib_install`` install script.
 
-       For example, take ``rhels7.2-ppc64le-netboot-compute``: 
+       For example, take ``rhels7.2-ppc64le-netboot-compute``:
+
+           #. Find the path to the ``postinstall`` script: ::
 
-           #. Find the path to the ``postinstall`` script: :: 
-    
                   # lsdef -t osimage -o rhels7.2-ppc64le-netboot-compute -i postinstall
                   Object name: rhels7.2-ppc64le-netboot-compute
                       postinstall=/opt/xcat/share/xcat/netboot/rh/compute.rhels7.ppc64le.postinstall
 
            #. Edit the ``/opt/xcat/share/xcat/netboot/rh/compute.rhels7.ppc64le.postinstall`` and add the following: ::
-    
+
                   /install/postscripts/mlnxofed_ib_install \
                      -p /install/<path-to>/<MLNX_OFED_LINUX.iso> -i $1 -n genimage
-    
+
               .. note:: The ``$1`` is a argument that is passed to the the postinstall script at runtime.
 
-   .. tip:: **Kernel Mismatch** 
-      
-            The Mellanox OFED ISO is built against a series of specific kernel version. If the version of the linux kernel being used does not match any of the pre-built kernels, pass ``--add-kernel-support --without-32bit --without-fw-update --force`` to the Mellanox installation script to build the kernel modules based on the kernel you are using.  Example: :: 
+   .. tip:: **Kernel Mismatch**
+
+            The Mellanox OFED ISO is built against a series of specific kernel version. If the version of the linux kernel being used does not match any of the pre-built kernels, pass ``--add-kernel-support --without-32bit --without-fw-update --force`` to the Mellanox installation script to build the kernel modules based on the kernel you are using.  Example: ::
 
                  /install/postscripts/mlnxofed_ib_install \
                  -p /install/<path-to>/<MLNX_OFED_LINUX.iso> -m --add-kernel-support --without-32bit --without-fw-update --force -end- \
@@ -39,7 +39,7 @@ Diskless Installation
 #. Generate the diskless image 
 
    Use the ``genimage`` command to generate the diskless image from the osimage definition ::
-        
+
 	genimage <osimage>
 
    Use the ``packimage`` command to pack the diskless image for deployment ::
@@ -49,7 +49,7 @@ Diskless Installation
 #. Provision the node ::
 
      rinstall <node> osimage=rhels7.2-ppc64le-netboot-compute
-   
+
 #. Verification
 
    * Check the status of ``openibd`` service
@@ -59,8 +59,8 @@ Diskless Installation
          service openibd status
 
      systemd: ::
-    
-         systemctl status openibd.service 
+
+         systemctl status openibd.service
 
    * Verify that the Mellanox IB drivers are located at: ``/lib/modules/<kernel_version>/extra/``
 
diff --git a/docs/source/advanced/networks/infiniband/mlnxofed_ib_install_v2_preparation.rst b/docs/source/advanced/networks/infiniband/mlnxofed_ib_install_v2_preparation.rst
index 48e40f8a2..b4a646868 100644
--- a/docs/source/advanced/networks/infiniband/mlnxofed_ib_install_v2_preparation.rst
+++ b/docs/source/advanced/networks/infiniband/mlnxofed_ib_install_v2_preparation.rst
@@ -4,7 +4,7 @@ Preparation
 Download MLNX_OFED ISO
 ----------------------
 
-**xCAT only supports installation using the ISO format.** 
+**xCAT only supports installation using the ISO format.**
 
 Download the Mellanox OFED ISO file `here (MLNX_OFED) <http://www.mellanox.com/page/products_dyn?product_family=26&mtag=linux_sw_drivers>`_.
 
@@ -22,7 +22,7 @@ The ``mlnxofed_ib_install.v2`` is a sample script intended to assist with the in
        # ensure the script has execute permission
        chmod +x /install/postscripts/mlnxofed_ib_install
 
-#. Familiarize the options available for the xCAT ``mlnxofed_ib_install`` script. 
+#. Familiarize the options available for the xCAT ``mlnxofed_ib_install`` script.
 
    +---------+------------------+----------------------------------------------------------+
    | Option  | Required         | Description                                              |
@@ -55,5 +55,5 @@ The ``mlnxofed_ib_install.v2`` is a sample script intended to assist with the in
    To pass the ``--add-kernel-support`` option to ``mlnxofedinstall``, use the following command: ::
 
        /install/postscripts/mlnxofed_ib_install -p /install/<path-to>/<MLNX_OFED_LINUX.iso> \
-           -m --without-32bit --without-fw-update --add-kernel-support --force -end- 
+           -m --without-32bit --without-fw-update --add-kernel-support --force -end-
 
diff --git a/docs/source/advanced/networks/infiniband/mlnxofed_ib_known_issue.rst b/docs/source/advanced/networks/infiniband/mlnxofed_ib_known_issue.rst
index 2d337a588..8fa26c52c 100644
--- a/docs/source/advanced/networks/infiniband/mlnxofed_ib_known_issue.rst
+++ b/docs/source/advanced/networks/infiniband/mlnxofed_ib_known_issue.rst
@@ -4,16 +4,16 @@ Known Issues
 Preventing upgrade of the Mellanox Drivers
 ------------------------------------------
 
-On RedHat operating systems, after the Mellanox drivers are installed, you may have a requirement to update your operating system to a later version. 
-Some operating systems may ship InfiniBand drivers that are higher version than the Mellanox drivers you have installed and therefor may update the existing drivers. 
+On RedHat operating systems, after the Mellanox drivers are installed, you may have a requirement to update your operating system to a later version.
+Some operating systems may ship InfiniBand drivers that are higher version than the Mellanox drivers you have installed and therefor may update the existing drivers.
 
 To prevent this from happening, add the following in the ``/etc/yum.conf`` ::
 
     exclude=dapl* libib* ibacm infiniband* libmlx* librdma* opensm* ibutils*
 
 
-Development packages in SLES 
+Development packages in SLES
 ----------------------------
 
-If using the ``--add-kernel-support`` attribute on SLES operating systems, you may find problems with installing some dependency packages which are not shipped by the SLES server DVDs.  The development rpms are provided by the SDK DVDs.  Refer to :doc:`Add Additional Software Packages </guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/additional_pkg>` to configure the SDK repositories. 
+If using the ``--add-kernel-support`` attribute on SLES operating systems, you may find problems with installing some dependency packages which are not shipped by the SLES server DVDs.  The development rpms are provided by the SDK DVDs.  Refer to :doc:`Add Additional Software Packages </guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/additional_pkg>` to configure the SDK repositories.
 
diff --git a/docs/source/advanced/networks/infiniband/mlnxofed_ib_verified_scenario_matrix.rst b/docs/source/advanced/networks/infiniband/mlnxofed_ib_verified_scenario_matrix.rst
index 9849d2091..ad8f9c733 100644
--- a/docs/source/advanced/networks/infiniband/mlnxofed_ib_verified_scenario_matrix.rst
+++ b/docs/source/advanced/networks/infiniband/mlnxofed_ib_verified_scenario_matrix.rst
@@ -1,7 +1,7 @@
 MLNX_OFED Support Matrix
 ========================
 
-The following ISO images and attributes have been verified by the xCAT Team. 
+The following ISO images and attributes have been verified by the xCAT Team.
 
 **RedHat Enterprise Linux**
 
diff --git a/docs/source/advanced/networks/infiniband/network_configuration.rst b/docs/source/advanced/networks/infiniband/network_configuration.rst
index bd8eca1db..ba2716a3d 100644
--- a/docs/source/advanced/networks/infiniband/network_configuration.rst
+++ b/docs/source/advanced/networks/infiniband/network_configuration.rst
@@ -11,7 +11,7 @@ If your target Mellanox IB adapter has 2 ports, and you plan to give port ib0 4
 
 1. Define your networks in networks table ::
 
-	chdef -t network -o ib0ipv41 net=20.0.0.0 mask=255.255.255.0 mgtifname=ib0 
+	chdef -t network -o ib0ipv41 net=20.0.0.0 mask=255.255.255.0 mgtifname=ib0
 	chdef -t network -o ib0ipv42 net=30.0.0.0 mask=255.255.255.0 mgtifname=ib0
 	chdef -t network -o ib0ipv61 net=1:2::/64 mask=/64 mgtifname=ib0 gateway=1:2::2
 	chdef -t network -o ib0ipv62 net=2:2::/64 mask=/64 mgtifname=ib0 gateway=
diff --git a/docs/source/advanced/networks/infiniband/switch_configuration.rst b/docs/source/advanced/networks/infiniband/switch_configuration.rst
index bdb647741..ab1d45c12 100644
--- a/docs/source/advanced/networks/infiniband/switch_configuration.rst
+++ b/docs/source/advanced/networks/infiniband/switch_configuration.rst
@@ -18,7 +18,7 @@ Add the login user name and password to the switches table: ::
 
 The switches table will look like this: ::
 
-	#switch,...,sshusername,sshpassword,switchtype,....  
+	#switch,...,sshusername,sshpassword,switchtype,....
 	"mswitch",,,,,,,"admin","admin","MellanoxIB",,
 
 If there is only one admin and one password for all the switches then put the entry in the xCAT passwd table for the admin id and password to use to login. ::
diff --git a/docs/source/advanced/networks/infiniband/ufm_configuration.rst b/docs/source/advanced/networks/infiniband/ufm_configuration.rst
index 3c64c079e..1bce7e480 100644
--- a/docs/source/advanced/networks/infiniband/ufm_configuration.rst
+++ b/docs/source/advanced/networks/infiniband/ufm_configuration.rst
@@ -75,4 +75,4 @@ If it is not running, then run the following commands: ::
 	monadd snmpmon
 	monstart snmpmon
 
-	
\ No newline at end of file
+	
diff --git a/docs/source/advanced/networks/onie_switches/index.rst b/docs/source/advanced/networks/onie_switches/index.rst
index 8c59c6c46..44b381f77 100644
--- a/docs/source/advanced/networks/onie_switches/index.rst
+++ b/docs/source/advanced/networks/onie_switches/index.rst
@@ -1,13 +1,13 @@
-Open Network Install Environment Switches 
+Open Network Install Environment Switches
 =========================================
 
-The Open Network Install Environment, or "ONIE" [1]_. is an open source project definining an **install environment** for bare metal switches.  This environment allows choice for the end users when selecting a network operating system to install onto these bare metal switches.  
+The Open Network Install Environment, or "ONIE" [1]_. is an open source project definining an **install environment** for bare metal switches.  This environment allows choice for the end users when selecting a network operating system to install onto these bare metal switches.
 
 .. toctree::
    :maxdepth: 2
 
-   os_cumulus/index.rst 
-   os_cumulus/ztp.rst 
+   os_cumulus/index.rst
+   os_cumulus/ztp.rst
 
 
 .. [1] Open Network Install Environment: Created by Cumulus Networks, Inc. in 2012, the Open Network Install Environment (ONIE) Project is a small operating system, pre-installed as firmware on bare metal network switches, that provides an environment for automated operating system provisioning.
diff --git a/docs/source/advanced/networks/onie_switches/os_cumulus/install.rst b/docs/source/advanced/networks/onie_switches/os_cumulus/install.rst
index 8e40e0007..ca7dcdf76 100644
--- a/docs/source/advanced/networks/onie_switches/os_cumulus/install.rst
+++ b/docs/source/advanced/networks/onie_switches/os_cumulus/install.rst
@@ -10,18 +10,18 @@ xCAT provides support for detecting and installing the Cumulus Linux OS into ONI
 
 #. Create a pre-defined switch definition for the ONIE switch using the ``onieswitch`` template.
 
-   The mac address of the switch management port is required for xCAT to configure the DHCP information and send over the OS to install on the switch. 
+   The mac address of the switch management port is required for xCAT to configure the DHCP information and send over the OS to install on the switch.
 
-   **Small Clusters** 
+   **Small Clusters**
 
    If you know the mac address of the management port on the switch, create the pre-defined switch definition providing the mac address. ::
 
        mkdef frame01sw1 --template onieswitch arch=armv71 \
            ip=192.168.1.1 mac="aa:bb:cc:dd:ee:ff"
 
-   **Large Clusters** 
+   **Large Clusters**
 
-   xCAT's :doc:`switchdiscover </guides/admin-guides/references/man1/switchdiscover.1>` command can be used to discover the mac address and fill in the predefined switch definitions based on the switch/switchport mapping.  
+   xCAT's :doc:`switchdiscover </guides/admin-guides/references/man1/switchdiscover.1>` command can be used to discover the mac address and fill in the predefined switch definitions based on the switch/switchport mapping.
 
 
     #. Define all the switch objects providing the switch/switchport mapping: ::
@@ -34,8 +34,8 @@ xCAT provides support for detecting and installing the Cumulus Linux OS into ONI
              ip=192.168.3.1 switch=coresw1 switchport=3
          mkdef frame04sw1 --template onieswitch arch=armv71 \
              ip=192.168.4.1 switch=coresw1 switchport=4
-         ... 
-  
+         ...
+
     #. Leverage ``switchdiscover`` over the DHCP range to automatically detect the MAC address and write them into the predefined switches above. ::
 
          switchdiscover --range <IP range>
@@ -43,9 +43,9 @@ xCAT provides support for detecting and installing the Cumulus Linux OS into ONI
 
 #. Run the ``nodeset`` command to set the ``provmethod`` attribute of the target switch(es) to the Cumulus Linux install image and prepare the DHCP/BOOTP lease information for the switch:  ::
 
-    # nodeset frame01sw1 osimage=cumulus3.5.2-armel 
+    # nodeset frame01sw1 osimage=cumulus3.5.2-armel
     # lsdef frame01sw1
-    Object name: frame01sw1 
+    Object name: frame01sw1
     arch=armv7l
     groups=switch,edge_switch
     ip=172.21.208.03
@@ -82,11 +82,11 @@ Configure xCAT Remote Commands
 
 After Cumulus Linux OS is installed, a default user ``cumulus`` will be created with default password: ``CumulusLinux!``.
 
-To ease in the management of the switch, xCAT provides a script to help configure password-less ssh as the ``root`` user.  This script sends over the xCAT ssh keys so that the xCAT remote commands (``xdsh``, ``xdcp``, etc) can be run against the ONIE switches.  
+To ease in the management of the switch, xCAT provides a script to help configure password-less ssh as the ``root`` user.  This script sends over the xCAT ssh keys so that the xCAT remote commands (``xdsh``, ``xdcp``, etc) can be run against the ONIE switches.
 
 Execute the following to sync the xCAT keys to the switch: ::
 
-    /opt/xcat/share/xcat/scripts/configonie --switches frame01sw1 --ssh 
+    rspconfig frame01sw1 sshcfg 
 
 Validate the ssh keys are correctly configured by running a ``xdsh`` command: ::
 
@@ -98,7 +98,7 @@ Validate the ssh keys are correctly configured by running a ``xdsh`` command: ::
 Activate the License
 --------------------
 
-After Cumulus Linux OS is installed onto the ONIE switch, only the serial port console and the management ethernet port is enabled.  To activate the rest of the switch ports, the license file needs to be installed onto the switch. 
+After Cumulus Linux OS is installed onto the ONIE switch, only the serial port console and the management ethernet port is enabled.  To activate the rest of the switch ports, the license file needs to be installed onto the switch.
 
 #. Copy the license file to the switch: ::
 
@@ -159,6 +159,6 @@ To verify the SNMPv3 configuration, run ``xcatprobe switch_macmap`` command, wil
     ...........................more output.....................
 
 
- 
+
 
 
diff --git a/docs/source/advanced/networks/onie_switches/os_cumulus/manage.rst b/docs/source/advanced/networks/onie_switches/os_cumulus/manage.rst
index 232cbe9bf..325e0f1f6 100644
--- a/docs/source/advanced/networks/onie_switches/os_cumulus/manage.rst
+++ b/docs/source/advanced/networks/onie_switches/os_cumulus/manage.rst
@@ -4,9 +4,9 @@ Switch Management
 Sync File support
 ------------------
 
-xCAT supports synchronize of configuration files for cumulus switches.  
+xCAT supports synchronize of configuration files for cumulus switches.
 
-#. Use instructions in doc: :ref:`The_synclist_file` to set up syncfile.  
+#. Use instructions in doc: :ref:`The_synclist_file` to set up syncfile.
 #. Add syncfile to cumulus osimage. ::
 
     # chdef -t osimage cumulus3.5.2-armel synclists=/tmp/synclists
@@ -24,12 +24,12 @@ Switch Port and VLAN Configuration
 
 xCAT places the front-panel port configuration in ``/etc/network/interfaces.d/xCAT.intf``.
 
-The ``configinterface`` postscript can be used to pull switch interface configuration from the xCAT Management Node (MN) to the switch.  Place the switch specific confguration files in the following directory on the MN: ``/install/custom/sw_os/cumulus/interface/``.  
+The ``configinterface`` postscript can be used to pull switch interface configuration from the xCAT Management Node (MN) to the switch.  Place the switch specific confguration files in the following directory on the MN: ``/install/custom/sw_os/cumulus/interface/``.
 
 xCAT will look for files in the above directory in the following order:
 
-   1. file name that matches the switch hostname 
-   2. file name that matches the switch group name 
+   1. file name that matches the switch hostname
+   2. file name that matches the switch group name
    3. file name that has the word 'default'
 
    .. note:: If the postscript cannot find a configuration file on the MN, it will set all ports on the switch to be part of VLAN 1.
@@ -42,7 +42,7 @@ Execute the script using the following command: ::
 Re-install OS
 -------------
 
-There may be occasions where a re-install of the Cumulus Linux OS is required.   The following commands can be used to invoke the install: 
+There may be occasions where a re-install of the Cumulus Linux OS is required.   The following commands can be used to invoke the install:
 
 .. important:: This assumes that the Cumulus Linux files are on the xCAT MN in the correct place.
 
@@ -50,11 +50,11 @@ There may be occasions where a re-install of the Cumulus Linux OS is required.
 
     # to clear out all the previous configuration, use the -k option (optional)
     xdsh <switch> "/usr/cumulus/bin/onie-select -k
-    
+
     # to invoke the reinstall of the OS
     xdsh <switch> "/usr/cumulus/bin/onie-select -i -f;reboot"
 
 * **Manually**, log into the switch and run the following commands: ::
 
     sudo onie-select -i
-    sudo reboot 
+    sudo reboot
diff --git a/docs/source/advanced/networks/onie_switches/os_cumulus/prepare.rst b/docs/source/advanced/networks/onie_switches/os_cumulus/prepare.rst
index 8fbdc1073..e38d97f65 100644
--- a/docs/source/advanced/networks/onie_switches/os_cumulus/prepare.rst
+++ b/docs/source/advanced/networks/onie_switches/os_cumulus/prepare.rst
@@ -1,7 +1,7 @@
 Preparation
 ===========
 
-Prepare the Cumulus Linux files on the xCAT Management Node. 
+Prepare the Cumulus Linux files on the xCAT Management Node.
 
 #. Obtain a valid Cumulus Linux License and download the Cumulus Linux OS installer.
 
@@ -10,18 +10,18 @@ Prepare the Cumulus Linux files on the xCAT Management Node.
     # Create a directory to hold the cumulus linux files
     mkdir -p /install/custom/sw_os/cumulus/
 
-    # copy the license file 
+    # copy the license file
     cp licensefile.txt /install/custom/sw_os/cumulus/
 
-    # copy the installer     
+    # copy the installer
     cp cumulus-linux-3.1.0-bcm-armel.bin /install/custom/sw_os/cumulus/
 
 
-Cumulus osimage 
+Cumulus osimage
 ---------------
 
 xCAT can able to create a cumulus osimage defintion via ``copycds`` command.  ``copycds`` will copy cumulus installer to a destination directory, and create several relevant osimage definitions. **cumulus<release>-<arch>** is the default osimage name. ::
- 
+
     #run copycds command
     # copycds cumulus-linux-3.5.2-bcm-armel.bin
 
diff --git a/docs/source/advanced/networks/onie_switches/os_cumulus/upgrade.rst b/docs/source/advanced/networks/onie_switches/os_cumulus/upgrade.rst
index fdbae9844..dda586c88 100644
--- a/docs/source/advanced/networks/onie_switches/os_cumulus/upgrade.rst
+++ b/docs/source/advanced/networks/onie_switches/os_cumulus/upgrade.rst
@@ -6,23 +6,23 @@ The Cumulus OS on the ONIE switches can be upgraded using one of the following m
 Full Install
 ------------
 
-Perform a full install from the ``.bin`` file of the new Cumulus Linux OS version, using ONIE.  
+Perform a full install from the ``.bin`` file of the new Cumulus Linux OS version, using ONIE.
 
-.. important:: Make sure you back up all your data and configuration files as the binary install will erase all previous configuration. 
- 
-#. Place the binary image under ``/install`` on the xCAT MN node. 
+.. important:: Make sure you back up all your data and configuration files as the binary install will erase all previous configuration.
+
+#. Place the binary image under ``/install`` on the xCAT MN node.
 
    In this example, IP=172.21.253.37 is the IP on the Management Node. ::
 
       mkdir -p /install/onie/
       cp cumulus-linux-3.4.1.bin /install/onie/
-      
+
 #. Invoke the upgrade on the switches using :doc:`xdsh </guides/admin-guides/references/man1/xdsh.1>`: ::
-    
+
       xdsh switch1 "/usr/cumulus/bin/onie-install -a -f -i \
       http://172.21.253.37/install/onie/cumulus-linux-3.4.1.bin && reboot"
 
-   .. attention:: The full upgrade process may run 30 minutes or longer. 
+   .. attention:: The full upgrade process may run 30 minutes or longer.
 
 #. After upgrading, the license should be installed, see :ref:`Activate the License <activate-the-license>` for details.
 
@@ -33,35 +33,35 @@ Perform a full install from the ``.bin`` file of the new Cumulus Linux OS versio
 Update Changed Packages
 -----------------------
 
-This is the preferred method for upgrading the switch OS for incremental OS updates. 
+This is the preferred method for upgrading the switch OS for incremental OS updates.
 
 Create Local Mirror
 ```````````````````
 
-If the switches do not have access to the public Internet, you can create a local mirror of the Cumulus Linux repo. 
+If the switches do not have access to the public Internet, you can create a local mirror of the Cumulus Linux repo.
 
 #. Create a local mirror on the Management Node: ::
- 
+
     mkdir -p /install/mirror/cumulus
     cd /install/mirror/cumulus
-    wget -m --no-parent http://repo3.cumulusnetworks.com/repo/ 
-   
+    wget -m --no-parent http://repo3.cumulusnetworks.com/repo/
+
 #. Create a ``sources.list`` file to point to the local repo on the Management node.  In this example, IP=172.21.253.37 is the IP on the Management Node. ::
 
     # cat /tmp/sources.list
     deb     http://172.21.253.37/install/mirror/cumulus/repo3.cumulusnetworks.com/repo CumulusLinux-3 cumulus upstream
     deb-src http://172.21.253.37/install/mirror/cumulus/repo3.cumulusnetworks.com/repo CumulusLinux-3 cumulus upstream
-    
+
     deb     http://172.21.253.37/install/mirror/cumulus/repo3.cumulusnetworks.com/repo CumulusLinux-3-security-updates cumulus upstream
     deb-src http://172.21.253.37/install/mirror/cumulus/repo3.cumulusnetworks.com/repo CumulusLinux-3-security-updates cumulus upstream
-    
+
     deb     http://172.21.253.37/install/mirror/cumulus/repo3.cumulusnetworks.com/repo CumulusLinux-3-updates cumulus upstream
-    deb-src http://172.21.253.37/install/mirror/cumulus/repo3.cumulusnetworks.com/repo CumulusLinux-3-updates cumulus upstream   
+    deb-src http://172.21.253.37/install/mirror/cumulus/repo3.cumulusnetworks.com/repo CumulusLinux-3-updates cumulus upstream
 
 
 #. Distribute the ``sources.list`` file to your switches using :doc:`xdcp </guides/admin-guides/references/man1/xdcp.1>`. ::
 
-    xdcp switch1 /tmp/sources.list  /etc/apt/sources.list 
+    xdcp switch1 /tmp/sources.list  /etc/apt/sources.list
 
 Invoke the Update
 `````````````````
@@ -69,11 +69,11 @@ Invoke the Update
 #. Use xCAT :doc:`xdsh </guides/admin-guides/references/man1/xdsh.1>` to invoke the update: ::
 
     #
-    # A reboot may be needed after the upgrade 
-    # 
+    # A reboot may be needed after the upgrade
+    #
     xdsh switch1 'apt-get update && apt-get upgrade && reboot'
 
-#. Check in ``/etc/os-release`` file to verify that the OS has been upgraded.  
+#. Check in ``/etc/os-release`` file to verify that the OS has been upgraded.
 
 
 
diff --git a/docs/source/advanced/networks/onie_switches/os_cumulus/ztp.rst b/docs/source/advanced/networks/onie_switches/os_cumulus/ztp.rst
index b620683e0..c8ba68d6b 100644
--- a/docs/source/advanced/networks/onie_switches/os_cumulus/ztp.rst
+++ b/docs/source/advanced/networks/onie_switches/os_cumulus/ztp.rst
@@ -1,4 +1,4 @@
-Setup ONIE switches with ZTP in large cluster 
+Setup ONIE switches with ZTP in large cluster
 =============================================
 
 Zero Touch Provisioning  (ZTP) is a feature shipped in many network devices to enable them to be quickly deployed in large-scale environments. In Cumulus OS on ONIE switches with ZTP enabled, the URL of an user provided script can be specified in the DHCP response for the DHCP request trigged by one of the following events:
@@ -14,29 +14,29 @@ Leveraging the ZTP mechanism, xCAT provides the capability to setup ONIE switche
 1. Ensure that xCAT is configured with an DHCP open range to detect when new switches request DHCP IPs
 
    (1). Make sure the network in which the management interface of the ONIE switches are connected has been defined in ``networks`` table ::
-   
+
        # tabdump networks
        #netname,net,mask,mgtifname,gateway,dhcpserver,tftpserver,nameservers,ntpservers,logservers,dynamicrange,staticrange,staticrangeincrement,nodehostname,ddnsdomain,vlanid,domain,mtu,comments,disable
        "172_21_0_0-255_255_0_0","172.21.0.0","255.255.0.0","enP3p3s0d1","<xcatmaster>","172.21.253.27","172.21.253.27",,,,"172.21.253.100-172.21.253.200",,,,,,,,,
-      
+
    (2). Prepare the DHCP configuration for ONIE switches setup
-   
+
       Add the management node's NIC facing the ONIE switches' management interface to the ``site.dhcpinterfaces`` ::
-     
-        chdef -t site -p dhcpinterfaces=enP3p3s0d1 
-   
+
+        chdef -t site -p dhcpinterfaces=enP3p3s0d1
+
       Add dynamic range for the temporary IP addresses used in the OS provision and discovery of ONIE switches ::
-       
+
         chdef -t network 172_21_0_0-255_255_0_0 dynamicrange="172.21.253.100-172.21.253.200"
-      
+
       Update DHCP configuration file ::
-       
+
         makedhcp -n
 
 2. Predefine ONIE switches according to the network plan ::
 
-     mkdef mid05tor10 --template onieswitch ip=172.21.205.10 switch=mgmtsw01 switchport=10 
- 
+     mkdef mid05tor10 --template onieswitch ip=172.21.205.10 switch=mgmtsw01 switchport=10
+
    ``ip`` is the IP address of the management interface of the ONIE switch
 
    ``switch`` is the core switch to which the management interface of ONIE switch is connected.
@@ -44,16 +44,16 @@ Leveraging the ZTP mechanism, xCAT provides the capability to setup ONIE switche
    ``switchport`` is the port on the core switch to which the management interface of ONIE switch is connected.
 
 3. Add the predefined switches into ``/etc/hosts`` ::
-    
+
      makehosts mid05tor10
 
 4. [If the Cumulus OS have been installed on the ONIE switches, please skip this step] Prepare the Cumulus installation image, ``/install/onie/onie-installer`` is the hard-coded path of the Cumulus installation image, or the link to the Cumulus installation image on the management node ::
-  
+
      mkdir -p /install/onie/
-     cp /install/custom/sw_os/cumulus/cumulus-linux-3.1.0-bcm-armel.bin /install/onie/ 
+     cp /install/custom/sw_os/cumulus/cumulus-linux-3.1.0-bcm-armel.bin /install/onie/
      ln -s /install/onie/cumulus-linux-3.1.0-bcm-armel.bin /install/onie/onie-installer
 
-5. Plug the ONIE switches into the cluster according to the network plan and power on them. 
+5. Plug the ONIE switches into the cluster according to the network plan and power on them.
 
    For the white-box ONIE switches, the Cumulus OS will be installed, then the switches will be discovered and configured automaticaly, the whole process will take about 1 hour.
 
@@ -88,4 +88,4 @@ Leveraging the ZTP mechanism, xCAT provides the capability to setup ONIE switche
          switchport=10
          switchtype=Edgecore Networks Switch
 
-   ``status=configured`` indicates that the switch has been discovered and configured. 
+   ``status=configured`` indicates that the switch has been discovered and configured.
diff --git a/docs/source/advanced/networks/switchdiscover/index.rst b/docs/source/advanced/networks/switchdiscover/index.rst
index 73f7e8178..f60e90c8b 100644
--- a/docs/source/advanced/networks/switchdiscover/index.rst
+++ b/docs/source/advanced/networks/switchdiscover/index.rst
@@ -1,8 +1,8 @@
-Switch Discover 
+Switch Discover
 ===============
 
 .. toctree::
    :maxdepth: 2
 
-   switches_discovery.rst 
+   switches_discovery.rst
    switch_based_switch_discovery.rst
diff --git a/docs/source/advanced/networks/switchdiscover/switch_based_switch_discovery.rst b/docs/source/advanced/networks/switchdiscover/switch_based_switch_discovery.rst
index 2f207d0ff..c2ef30876 100644
--- a/docs/source/advanced/networks/switchdiscover/switch_based_switch_discovery.rst
+++ b/docs/source/advanced/networks/switchdiscover/switch_based_switch_discovery.rst
@@ -1,12 +1,12 @@
 Switch-based Switch Discovery
 =============================
 
-Currently, xCAT supports switch based hardware discovery, the servers are identified through the switches and switch ports they are directly connected to.  A similar method can be used to discover switches using switch-based discovery within the user defined dynamic IP range. 
+Currently, xCAT supports switch based hardware discovery, the servers are identified through the switches and switch ports they are directly connected to.  A similar method can be used to discover switches using switch-based discovery within the user defined dynamic IP range.
 
 Pre-requirement
 ~~~~~~~~~~~~~~~
 
-In order to do switch-based switch discovery, the admin 
+In order to do switch-based switch discovery, the admin
 
 1.  Needs to manually setup and configure core-switch, SNMP v3 needs to be enabled in order for xCAT access to it. **username** and **userpassword** attributes are for the remote login. It can be for **ssh** or **telnet**. If it is for **telnet**, set protocol to “telnet”. If the **username** is blank, the **username** and **password** will be retrieved from the passwd table with “switch” as the key. SNMP attributes will used for SNMPv3 communication.  **nodetype** has to be set to "switch" to differentiate between switch-based node discovery or switch-based switch discovery. Refer to switches table attributes.  Example of core-switch definition:  ::
 
@@ -71,10 +71,10 @@ For the switch-based switch discovery, we add **–setup** flag:  ::
 
 if **--setup** flag is specified, the command will perform following steps:
 
-1.  Use snmp or nmap scan methods to find all switches in the dynamic IP ranges specified by --range, the available switches will be stored in switch hash table with hostname, switchtype, vendor info and mac address.  
+1.  Use snmp or nmap scan methods to find all switches in the dynamic IP ranges specified by --range, the available switches will be stored in switch hash table with hostname, switchtype, vendor info and mac address.
 
 
-2.  Based on mac address for each switch defined in the hash table, call **find_mac** subroutine.   The **find_mac** subroutine will go thought the switch and switch ports and find matched mac address.    
+2.  Based on mac address for each switch defined in the hash table, call **find_mac** subroutine.   The **find_mac** subroutine will go thought the switch and switch ports and find matched mac address.
 
 * If discovered switch didn't find any predefined switch matches, it will log the message ``NO predefined switch matched``.
 * If discovered switch matched with one of pre-defined switch, it will update the predefined switch with ::
@@ -87,7 +87,7 @@ if **--setup** flag is specified, the command will perform following steps:
 
 3.  After switches are matched, the command will call config files to set up static IP address, hostname and enable the snmpv3.  Currently, BNT and Mellanox switches are supported.  The two config files are located in the **/opt/xcat/share/xcat/scripts/config.BNT** and **/opt/xcat/share/xcat/scripts/config.Mellanox**.  the log message ``the switch type is not support for config`` is displayed if switchtype is something other than BNT or Mellanox.
 
-4.  After discovery process, the predefined node attribute in the xCATdb will be updated. 
+4.  After discovery process, the predefined node attribute in the xCATdb will be updated.
 
 ::
 
@@ -119,9 +119,9 @@ if **--setup** flag is specified, the command will perform following steps:
 Configure switches
 ~~~~~~~~~~~~~~~~~~
 
-The **switchdiscover** command with ``--setup`` flag will set up switches with static IP address, change the hostname from predefine switches and enable snmpv3 configuration.  For other switches configuration, refer to :doc:`/advanced/networks/ethernet_switches/ethernet_switches` and :doc:`/advanced/networks/infiniband/switch_configuration`. 
+The **switchdiscover** command with ``--setup`` flag will set up switches with static IP address, change the hostname from predefine switches and enable snmpv3 configuration.  For other switches configuration, refer to :doc:`/advanced/networks/ethernet_switches/ethernet_switches` and :doc:`/advanced/networks/infiniband/switch_configuration`.
 
-These two config files are located in the **/opt/xcat/share/xcat/scripts** directory.  The **switchdiscover** process will call the config files with ``--all`` option.  User can call these scripts to setup one of options manually. 
+These two config files are located in the **/opt/xcat/share/xcat/scripts** directory.  The **switchdiscover** process will call the config files with ``--all`` option.  User can call these scripts to setup one of options manually.
 
 1.  **configBNT** is for configure BNT switches.  ::
 
@@ -142,7 +142,7 @@ These two config files are located in the **/opt/xcat/share/xcat/scripts** direc
        * set logging destination to xCAT MN
 
     ::
- 
+
       ./configMellanox --help
       Usage:
           configMellonax [-?│-h│--help]
@@ -155,7 +155,7 @@ These two config files are located in the **/opt/xcat/share/xcat/scripts** direc
 Switch Status
 ~~~~~~~~~~~~~
 
-During the switch-based switch discovery process, there are four states displayed.  User may only see **switch_configured** status on node definition if discovery process successfully finished.  
+During the switch-based switch discovery process, there are four states displayed.  User may only see **switch_configured** status on node definition if discovery process successfully finished.
 
 **Matched** --- Discovered switch is matched to predefine switch, **otherinterfaces** attribute is updated to dhcp IP address, and mac address, **switch type** and **usercomment** also updated with vendor information for the predefined switch.
 
diff --git a/docs/source/advanced/networks/vlan/vlan.rst b/docs/source/advanced/networks/vlan/vlan.rst
index 927d5d177..3eaf469b1 100644
--- a/docs/source/advanced/networks/vlan/vlan.rst
+++ b/docs/source/advanced/networks/vlan/vlan.rst
@@ -18,7 +18,7 @@ These VLAN functions are supported for stand-alone nodes as well as virtual mach
 Install the package
 -------------------
 
-Install the ``xCAT-vlan`` package using the package manager on the OS. 
+Install the ``xCAT-vlan`` package using the package manager on the OS.
 
 [RHEL] ::
 
@@ -220,7 +220,7 @@ To make the vlan more secure, the root guard and the bpdu guard are enabled for
 Limitation
 ----------
 
-Current xCAT-vlan package does not work on the following os distributions. More work will be done in the future releases. 
+Current xCAT-vlan package does not work on the following os distributions. More work will be done in the future releases.
 
 * ubuntu
 * rhel7 and later
diff --git a/docs/source/advanced/pdu/crpdu.rst b/docs/source/advanced/pdu/crpdu.rst
index 9933a80bc..6db7151ca 100644
--- a/docs/source/advanced/pdu/crpdu.rst
+++ b/docs/source/advanced/pdu/crpdu.rst
@@ -1,7 +1,7 @@
 Collaborative PDU
 =================
 
-Collaborative PDU is also referred as Coral PDU, it controls power for compute Rack. User can access PDU via SSH and can use the **PduManager** command to configure and manage the PDU product.  
+Collaborative PDU is also referred as Coral PDU, it controls power for compute Rack. User can access PDU via SSH and can use the **PduManager** command to configure and manage the PDU product.
 
 
 Pre-Defined PDU Objects
@@ -61,7 +61,7 @@ After pre-defining PDUs, user can use **pdudisocver --range ip_range --setup** t
 Remote Power Control of PDU
 ---------------------------
 
-Use the rpower command to remotely power on and off PDU. 
+Use the rpower command to remotely power on and off PDU.
 
     * To check power stat of PDU: ::
 
@@ -85,7 +85,7 @@ Coral PDUs have three relays, the following commands are for individual relay su
 
         # rpower coralpdu relay=2 off
 
-    * To power on the relay: :: 
+    * To power on the relay: ::
 
         # rpower coralpdu relay=3 on
 
diff --git a/docs/source/advanced/pdu/index.rst b/docs/source/advanced/pdu/index.rst
index 625bfb269..4438d4368 100644
--- a/docs/source/advanced/pdu/index.rst
+++ b/docs/source/advanced/pdu/index.rst
@@ -1,9 +1,9 @@
 PDUs
 ====
 
-Power Distribution Units (PDUs) are devices that distribute power to servers in a frame.  They have the capability of monitoring the amount of power that is being used by devices plugged into it and cycle power to individual receptacles.  xCAT can support two kinds of PDUs, infrastructure PDU (irpdu) and collaborative PDU (crpdu).  
+Power Distribution Units (PDUs) are devices that distribute power to servers in a frame.  They have the capability of monitoring the amount of power that is being used by devices plugged into it and cycle power to individual receptacles.  xCAT can support two kinds of PDUs, infrastructure PDU (irpdu) and collaborative PDU (crpdu).
 
-The Infrastructure rack PDUs are switched and monitored 1U PDU products which can connect up to nine C19 devices or up to 12 C13 devices and an additional three C13 peripheral devices to a signle dedicated power source.  The Collaborative PDU is on the compute rack and has the 6x IEC 320-C13 receptacles that feed the rack switches. These two types of PDU have different design and implementation.  xCAT has different code path to maintains PDU commands via **pdutype**.  
+The Infrastructure rack PDUs are switched and monitored 1U PDU products which can connect up to nine C19 devices or up to 12 C13 devices and an additional three C13 peripheral devices to a signle dedicated power source.  The Collaborative PDU is on the compute rack and has the 6x IEC 320-C13 receptacles that feed the rack switches. These two types of PDU have different design and implementation.  xCAT has different code path to maintains PDU commands via **pdutype**.
 
 
 .. toctree::
diff --git a/docs/source/advanced/pdu/irpdu.rst b/docs/source/advanced/pdu/irpdu.rst
index dccaf049a..c42541172 100644
--- a/docs/source/advanced/pdu/irpdu.rst
+++ b/docs/source/advanced/pdu/irpdu.rst
@@ -18,34 +18,34 @@ Add a ``pdu`` attribute to the compute node definition in the form "PDU_Name:out
     chdef cn01 pdu=f5pdu3:6,f5pdu3:7
 
 
-The following commands are supported against a compute node: 
+The following commands are supported against a compute node:
 
    * Check the pdu status for a compute node: ::
-   
+
        # rpower cn01 pdustat
          cn01: f5pdu3 outlet 6 is on
          cn01: f5pdu3 outlet 7 is on
 
 
-   * Power off the PDU outlets for a compute node: :: 
-   
+   * Power off the PDU outlets for a compute node: ::
+
        # rpower cn01 pduoff
          cn01: f5pdu3 outlet 6 is off
          cn01: f5pdu3 outlet 7 is off
 
-   * Power on the PDU outlets for a compute node: :: 
-   
+   * Power on the PDU outlets for a compute node: ::
+
        # rpower cn01 pduon
          cn01: f5pdu3 outlet 6 is on
          cn01: f5pdu3 outlet 7 is on
 
-   * Power cycling the PDU outlets for a compute node: :: 
-   
+   * Power cycling the PDU outlets for a compute node: ::
+
        # rpower cn01 pdureset
-         cn01: f5pdu3 outlet 6 is reset 
+         cn01: f5pdu3 outlet 6 is reset
          cn01: f5pdu3 outlet 7 is reset
 
-The following commands are supported against a PDU: 
+The following commands are supported against a PDU:
 
    * To change hostname of IR PDU: ::
 
@@ -72,7 +72,7 @@ The following commands are supported against a PDU:
          f5pdu3: outlet 12 is on
 
    * Power off the full PDU: ::
-   
+
        # rpower f5pdu3 off
          f5pdu3: outlet 1 is off
          f5pdu3: outlet 2 is off
@@ -104,7 +104,7 @@ The following commands are supported against a PDU:
          f5pdu3: outlet 12 is on
 
    * Power reset the full PDU: ::
-   
+
        # rpower f5pdu3 reset
          f5pdu3: outlet 1 is reset
          f5pdu3: outlet 2 is reset
@@ -148,9 +148,9 @@ The following commands are supported against a PDU:
          f6pdu15: outlet 3 Max Capacity of the current: 16000 mA
          f6pdu15: outlet 3 Current Threshold Warning: 9600 mA
          f6pdu15: outlet 3 Current Threshold Critical: 12800 mA
-         f6pdu15: outlet 3 Last Power Reading: 217 Wattsv  
-   
-**Note:** For BMC based compute nodes, turning the PDU outlet power on does not automatically power on the compute side.  Users will need to issue ``rpower <node> on`` to power on the compute side after the BMC boots. 
+         f6pdu15: outlet 3 Last Power Reading: 217 Wattsv
+
+**Note:** For BMC based compute nodes, turning the PDU outlet power on does not automatically power on the compute side.  Users will need to issue ``rpower <node> on`` to power on the compute side after the BMC boots.
 
 
 
diff --git a/docs/source/advanced/pdu/pdu.rst b/docs/source/advanced/pdu/pdu.rst
index 6e0ca6862..84a00e486 100644
--- a/docs/source/advanced/pdu/pdu.rst
+++ b/docs/source/advanced/pdu/pdu.rst
@@ -41,6 +41,6 @@ Define PDU Objects
 
 #. Verify the SNMP command responds against the PDU: ::
 
-    snmpwalk -v1 -cpublic -mALL f5pdu3 system 
+    snmpwalk -v1 -cpublic -mALL f5pdu3 system
 
 
diff --git a/docs/source/advanced/performance_tuning/httpd_tuning.rst b/docs/source/advanced/performance_tuning/httpd_tuning.rst
new file mode 100644
index 000000000..867fdb036
--- /dev/null
+++ b/docs/source/advanced/performance_tuning/httpd_tuning.rst
@@ -0,0 +1,57 @@
+Tuning httpd for xCAT node deployments
+======================================
+
+In xCAT, the Operation System provisioning over network is heavily relying on the web server (Apache 2.x). However, Apache 2.x is a general-purpose web server, the default settings may not allow enough simultaneous HTTP client connections to support a large cluster.
+
+
+#. Tuning MaxRequestWorkers directive
+
+By default, httpd is configured to use ``prefork`` module for **MPM**, which has a limit of 256 simultaneous requests. If any slow httpd response issue was hit during OS provisioning, you can increase **MaxRequestWorkers** directive for greater performance.
+
+For example, to avoid some nodes provisioning failure when rebooting all nodes in a large hierarchy stateless cluster ( one service node is serving 270 compute nodes ). It is suggested to increased the value from 256 to 1000.
+
+    On Red Hat, change (or add) these directives in
+    ::
+
+        /etc/httpd/conf/httpd.conf
+
+
+    On SLES (with Apache2), change (or add) these directives in
+    ::
+
+        /etc/apache2/server-tuning.conf
+
+
+#. Having httpd Cache the Files It Is Serving
+
+Note: this information was contributed by Jonathan Dye and is provided here as an example. The details may have to be changed for distro or apache version.
+
+This is simplest if you set noderes.nfsserver to a separate apache server, and then you can configure it to reverse proxy and cache. For some reason mod_mem_cache doesn't seem to behave as expected, so you can use mod_disk_cache to achieve a similar result: make a tmpfs on the apache server and configure its mountpoint to be the directory that CacheRoot points to. Also tell it to ignore /install/autoinst since the caching settings are really aggressive. Do a recursive wget to warm the cache and watch the tmpfs fill up. Then do a bunch of kickstart installs. Before this, the apache server on the xcat management node may have been a bottleneck during kickstart installs. After this change, it no longer should be.
+
+Here is the apache config file:
+::
+
+    ProxyRequests Off # don't be a proxy, just allow the reverse proxy
+
+    CacheIgnoreCacheControl On
+    CacheStoreNoStore On
+    CacheIgnoreNoLastMod On
+
+    CacheRoot /var/cache/apache2/tmpfs
+    CacheEnable disk /install
+    CacheDisable /install/autoinst
+    CacheMaxFileSize 1073741824
+
+    # CacheEnable mem /                   # failed attempt to do in-memory caching
+    # MCacheSize 20971520
+    # MCacheMaxObjectSize 524288000
+
+    # through ethernet network
+    # ProxyPass /install http://172.21.254.201/install
+
+    # through IB network
+    ProxyPass /install http://192.168.111.2/install
+
+
+For more Apache 2.x tuning, see the external web page: `Apache Performance Tuning <http://httpd.apache.org/docs/2.4/misc/perf-tuning.html>`_
+
diff --git a/docs/source/advanced/performance_tuning/index.rst b/docs/source/advanced/performance_tuning/index.rst
index 30a4fc635..50cd0b2c8 100644
--- a/docs/source/advanced/performance_tuning/index.rst
+++ b/docs/source/advanced/performance_tuning/index.rst
@@ -10,4 +10,5 @@ The information in this document should be viewed as example data only. Many of
 
    linux_os_tuning.rst
    xcatd_tuning.rst
-   database_tuning.rst
\ No newline at end of file
+   database_tuning.rst
+   httpd_tuning.rst
diff --git a/docs/source/advanced/performance_tuning/linux_os_tuning.rst b/docs/source/advanced/performance_tuning/linux_os_tuning.rst
index 331d140c0..c45a9a65c 100644
--- a/docs/source/advanced/performance_tuning/linux_os_tuning.rst
+++ b/docs/source/advanced/performance_tuning/linux_os_tuning.rst
@@ -4,8 +4,8 @@ System Tuning Settings for Linux
 Adjusting Operating System tunables can improve large scale cluster performance, avoid bottlenecks, and prevent failures. The following sections are a collection of suggestions that have been gathered from various large scale HPC clusters. You should investigate and evaluate the validity of each suggestion before applying them to your cluster.
 
 
-#. Tuning Linux ulimits:  
-   
+#. Tuning Linux ulimits:
+
     The open file limits are important to high concurrence network services, such as ``xcatd``. For a large cluster, it is required to increase the number of open file limit to avoid **Too many open files** error. The default value is *1024* in most OS distributions, to add below configuration in ``/etc/security/limits.conf`` to increase to *14096*.
     ::
 
@@ -24,7 +24,7 @@ Adjusting Operating System tunables can improve large scale cluster performance,
         net.core.rmem_default = 65536
         net.core.wmem_default = 65536
         net.core.somaxconn = 8192
-        
+
         net.ipv4.tcp_rmem = 4096 33554432 33554432
         net.ipv4.tcp_wmem = 4096 33554432 33554432
         net.ipv4.tcp_mem= 33554432 33554432 33554432
diff --git a/docs/source/advanced/performance_tuning/xcatd_tuning.rst b/docs/source/advanced/performance_tuning/xcatd_tuning.rst
index 577038326..571639f5c 100644
--- a/docs/source/advanced/performance_tuning/xcatd_tuning.rst
+++ b/docs/source/advanced/performance_tuning/xcatd_tuning.rst
@@ -22,4 +22,4 @@ For large clusters, you consider changing the default settings in ``site`` table
 **useflowcontrol** : If ``yes``, the postscript processing on each node contacts ``xcatd`` on the MN/SN using a lightweight UDP packet to wait until ``xcatd`` is ready to handle the requests associated with postscripts.  This prevents deploying nodes from flooding ``xcatd`` and locking out admin interactive use. This value works with the **xcatmaxconnections** and **xcatmaxbatch** attributes. If the value is ``no``, nodes sleep for a random time before contacting ``xcatd``, and retry. The default is ``no``. Not supported on AIX.
 
 
-These attributes may be changed based on the size of your cluster. For a large cluster, it is better to enable **useflowcontrol** and set ``xcatmaxconnection = 128``, ``xcatmaxbatchconnections = 100``. Then the daemon will only allow 100 concurrent connections from the nodes. This will allow 28 connections still to be available on the management node for xCAT commands (e.g ``nodels``).
+These attributes may be changed based on the size of your cluster. For a large cluster, it is better to enable **useflowcontrol** and set ``xcatmaxconnection = 356``, ``xcatmaxbatchconnections = 300``. Then the daemon will only allow 300 concurrent connections from the nodes. This will allow 56 connections still to be available on the management node for xCAT commands (e.g ``nodels``).
diff --git a/docs/source/advanced/ports/xcat_ports.rst b/docs/source/advanced/ports/xcat_ports.rst
index 910764007..744b0a94b 100644
--- a/docs/source/advanced/ports/xcat_ports.rst
+++ b/docs/source/advanced/ports/xcat_ports.rst
@@ -110,7 +110,7 @@ xCAT Port Usage Table
 
 * xcatlport
 
-  The port used by xcatd to record command log, you can customize it by edit site table, if you don't configure it, 3003 will be used by default. 
+  The port used by xcatd to record command log, you can customize it by edit site table, if you don't configure it, 3003 will be used by default.
 
 * echo-udp
 
@@ -126,9 +126,9 @@ xCAT Port Usage Table
 
 * domain-tcp
 
-  Used when Domain Name Services (DNS) traffic from the Non-trusted nodes and the firewall node to a DNS server is explicitly handled by the firewall. Some firewall applications can be configured to explicitly handle all DNS traffic. This for tcp DNS traffic. 
+  Used when Domain Name Services (DNS) traffic from the Non-trusted nodes and the firewall node to a DNS server is explicitly handled by the firewall. Some firewall applications can be configured to explicitly handle all DNS traffic. This for tcp DNS traffic.
 
-* domain-udp 
+* domain-udp
 
   Used when Domain Name Services (DNS) traffic from the Non-trusted nodes and the firewall node to a DNS server is explicitly handled by the firewall. Some firewall applications can be configured to explicitly handle all DNS traffic. This for udp DNS traffic.
 
@@ -174,9 +174,9 @@ xCAT Port Usage Table
 
 * sunrpc-udp
 
-  The portmapper service. Needed when installing a Non-trusted node through the firewall. Specifically required mount request that takes place during node install. 
+  The portmapper service. Needed when installing a Non-trusted node through the firewall. Specifically required mount request that takes place during node install.
 
-* shell 
+* shell
 
   Used when rsh/rcp is enabled for Standard (std) authentication protocol. Needed for xdsh operations when using rsh for remote commands.
 
@@ -219,7 +219,7 @@ xCAT Port Usage Table
 * rpc-mount
 
   Remote Procedure Call (RPM) used in conjunction with NFS mount request. See note 2. ssh-tcp Needed to use ssh. This service defines the protocol for tcp. This is required when installing or running updatenode through the firewall.
- 
+
 * mount-tcp
 
   Needed to use the AIX mount command. This service defines the protocol for tcp. Required when installing an Non-trusted node through the firewall. Needed when installp is issued on an Non-trusted node and the resource exists on the Trusted side. Needed to run updatenode command. See note 1.
@@ -277,7 +277,7 @@ Produces output similar to: ::
 
     100005 1 udp 37395 mountd 100005 2 udp 37395 mountd 100005 3 udp 37395 mountd 100005 1 tcp 34095 mountd 100005 2 tcp 34095 mountd 100005 3 tcp 34095 mountd
 
-Then :: 
+Then ::
 
     stopsrc -s rpc.mount
 
diff --git a/docs/source/advanced/probe/index.rst b/docs/source/advanced/probe/index.rst
index 4e6932de7..c77283c3e 100644
--- a/docs/source/advanced/probe/index.rst
+++ b/docs/source/advanced/probe/index.rst
@@ -21,7 +21,7 @@ You can use ``xcatprobe -l`` to list all valid subcommands, output will be as be
    image.rst
    osdeploy.rst
    discovery.rst
-   switch-macmap.rst 
+   switch-macmap.rst
    nodecheck.rst
    osimagecheck.rst
 
diff --git a/docs/source/advanced/probe/osdeploy.rst b/docs/source/advanced/probe/osdeploy.rst
index c9a36f2f1..1c6eef7df 100644
--- a/docs/source/advanced/probe/osdeploy.rst
+++ b/docs/source/advanced/probe/osdeploy.rst
@@ -2,9 +2,9 @@ osdeploy
 ========
 
 **osdeploy** operating system provision process. Supports two modes - 'Realtime monitor' and 'Replay history'.
-  
+
 Realtime monitor: This is a default. This tool with monitor provision state of the node. Trigger 'Realtime monitor' before rebooting target node to do provisioning.
-    
+
 Replay history: Used after provisioning is finished to probe the previously completed provisioning.
 
 **Note**: Currently, hierarchical structure is not supported.
@@ -56,7 +56,7 @@ When all the nodes complete provisioning, the probe will exit and display output
     -------------------------------------------------------------
     Start capturing every message during OS provision process......
     -------------------------------------------------------------
-    
+
     [c910f03c17k20] Use command rinstall to reboot node c910f03c17k20
     [c910f03c17k20] Node status is changed to powering-on
     [c910f03c17k20] Receive DHCPDISCOVER via enp0s1
@@ -75,7 +75,7 @@ When all the nodes complete provisioning, the probe will exit and display output
     ==================osdeploy_probe_report=================
     All nodes provisioned successfully                                                                                [ OK ]
 
-    
+
 If there is something wrong when provisioning, this probe will exit when timeout is reached or ``Ctrl+C`` is pressed by user. The maximum time can be set by using ``-t`` as below(default 30 minutes) ::
 
 
diff --git a/docs/source/advanced/raid/hardware_raid.rst b/docs/source/advanced/raid/hardware_raid.rst
index 915f2b241..890272369 100644
--- a/docs/source/advanced/raid/hardware_raid.rst
+++ b/docs/source/advanced/raid/hardware_raid.rst
@@ -6,9 +6,9 @@ Overview
 
 In many new compute machines, disks have been formatted into RAID oriented format in manufacturer, so admin must create raid arrays using these disks manually before provisioning OS. How to configure raid arrays in unattended way for hundreds of machines turns to be a problem.
 
-IBM has offered a tool ``iprconfig`` to configure raid for IBM power machine. To leverage this tool, xCAT enabled it in xCAT genesis.ppc64 so that admin can use genesis.ppc64 to configure RAID arrays. 
+IBM has offered a tool ``iprconfig`` to configure raid for IBM power machine. To leverage this tool, xCAT enabled it in xCAT genesis.ppc64 so that admin can use genesis.ppc64 to configure RAID arrays.
 
-There are two commands (``diskdiscover`` and ``configraid``) shipped in ``xCAT-genesis-scripts`` package to support RAID arrays configuration using ``iprconfig``, you can use the ``runcmd`` facility to configure raid in the hardware discovery procedure using them, ``runcmd`` is a facility which will be run in xcat genesis system. You can also use separated manual steps to use ``configraid`` in xcat genesis system shell.  
+There are two commands (``diskdiscover`` and ``configraid``) shipped in ``xCAT-genesis-scripts`` package to support RAID arrays configuration using ``iprconfig``, you can use the ``runcmd`` facility to configure raid in the hardware discovery procedure using them, ``runcmd`` is a facility which will be run in xcat genesis system. You can also use separated manual steps to use ``configraid`` in xcat genesis system shell.
 
 * **diskdiscover** : Scan disk devices in xcat genesis system, give out disks and RAID arrays information.
 * **configraid** : Delete RAID arrays, create RAID arrays in xcat genesis system.
@@ -38,7 +38,7 @@ Here are steps to use ``diskdiscover``:
     xdsh cn1 'diskdiscover <pci_id>'
 
    The outputs format is as following: ::
-   
+
     # xdsh cn1 diskdiscover
     cn1: --------------------------------------------------------------------------
     cn1: PCI_ID     PCI_SLOT_NAME  Resource_Path  Device  Description   Status
@@ -76,12 +76,12 @@ Here are the input parameters introduction:
 
 #. **stripe_size** : It is optional used when creating RAID arrays. If stripe size is not specified, it will default to the recommended stripe size for the selected RAID level.
 
-#. **create_raid** : To create a raid array, add a line beginning with create_raid, all attributes keys and values are separated by ``#``. The formats are as followings: 
+#. **create_raid** : To create a raid array, add a line beginning with create_raid, all attributes keys and values are separated by ``#``. The formats are as followings:
 
      * ``rl`` means RAID level, RAID level can be any supported RAID level for the given adapter, such as 0, 10,  5,  6. ``rl`` is a mandatory attribute for every create_raid. Supported RAID level is depend on physical server's RAID adapter.
 
      * User can select disks based on following attributes value. User can find these value based on ``diskdiscover`` outputs as above section described.
- 
+
          a. ``pci_id`` is PCI vendor and device ID.
          b. ``pci_slot_name`` is the specified PCI location. If using ``pci_slot_name``, this RAID array will be created using disks from it.
          c. ``disk_names`` is a list of advanced format disk names. If using ``disk_names``, this RAID array will be created using these disks.
@@ -104,7 +104,7 @@ More examples of input parameters:
 
     #. Create two RAID arrays, RAID level is 0, one array uses one disks from pci_id 1014:034a, the other array uses two disks from pci_slot_name ``0001:08:00.0``: ::
 
-        create_raid="rl#0|pci_id#1014:034a|disk_num#1" create_raid="rl#0|pci_slot_name#0001:08:00.0|disk_num#2" 
+        create_raid="rl#0|pci_id#1014:034a|disk_num#1" create_raid="rl#0|pci_slot_name#0001:08:00.0|disk_num#2"
 
     #. Create two RAID arrays, RAID level is 0, one array uses disks sg0 and sg1, the other array uses disks sg2 and sg3: ::
 
@@ -119,7 +119,7 @@ Configuring RAID in hardware discovery procedure
 '''''''''''''''''''''''''''''''''''''''''''''''''
 
 #. Using ``runcmd`` facility to configure raid in the hardware discovery procedure, after configuring RAID, compute node enter xcat genesis system shell. In the following example, ``configraid`` deletes all original RAID arrays, it creates one RAID 0 array with first two disks from pci_id ``1014:034a``: ::
-    
+
     nodeset cn1 runcmd="configraid delete_raid=all create_raid=rl#0|pci_id#1014:034a|disk_num#2",shell
     rpower cn1 reset
 
@@ -149,5 +149,5 @@ Monitoring and debuging RAID configuration process
 #. Logs for ``configraid`` is saved under ``tmp`` in compute node genesis system. User can login compute node and check ``configraid`` logs to debug.
 
 #. When configuring RAID in hardware discovery procedure, user can use ``rcons`` command to monitor or debug the process: ::
- 
+
     rcons cn1
diff --git a/docs/source/advanced/restapi/index.rst b/docs/source/advanced/restapi/index.rst
index 78ee41b96..9c4c77eee 100644
--- a/docs/source/advanced/restapi/index.rst
+++ b/docs/source/advanced/restapi/index.rst
@@ -11,4 +11,4 @@ xCAT provides REST API (also called a web services API) that is currently implem
    restapi_setup/index
    restapi_usage/index
    restapi_resource/index
-   
+
diff --git a/docs/source/advanced/restapi/restapi_resource/restapi_reference.rst b/docs/source/advanced/restapi/restapi_resource/restapi_reference.rst
index 1d5c37fb5..42c849d72 100644
--- a/docs/source/advanced/restapi/restapi_resource/restapi_reference.rst
+++ b/docs/source/advanced/restapi/restapi_resource/restapi_reference.rst
@@ -13,9 +13,9 @@ POST - Create a token.
 
 * An array of all the global configuration list.
 
-**Example:** 
+**Example:**
 
-Acquire a token for user 'root'. :: 
+Acquire a token for user 'root'. ::
 
 
     curl -X POST -k 'https://127.0.0.1/xcatws/tokens?userName=root&userPW=cluster&pretty=1' -H Content-Type:application/json --data '{"userName":"root","userPW":"cluster"}'
@@ -47,9 +47,9 @@ Refer to the man page: :doc:`lsdef </guides/admin-guides/references/man1/lsdef.1
 
 * Json format: An array of node names.
 
-**Example:** 
+**Example:**
 
-Get all the node names from xCAT database. :: 
+Get all the node names from xCAT database. ::
 
 
     curl -X GET -k 'https://127.0.0.1/xcatws/nodes?userName=root&userPW=cluster&pretty=1'
@@ -73,9 +73,9 @@ Refer to the man page: :doc:`lsdef </guides/admin-guides/references/man1/lsdef.1
 
 * Json format: An object which includes multiple '<name> : {att:value, attr:value ...}' pairs.
 
-**Example:** 
+**Example:**
 
-Get all the attributes for node 'node1'. :: 
+Get all the attributes for node 'node1'. ::
 
 
     curl -X GET -k 'https://127.0.0.1/xcatws/nodes/node1?userName=root&userPW=cluster&pretty=1'
@@ -103,9 +103,9 @@ Refer to the man page: :doc:`chdef </guides/admin-guides/references/man1/chdef.1
 
 * No output when execution is successful. Otherwise output the error information in the Standard Error Format: {error:[msg1,msg2...],errocode:errornum}.
 
-**Example:** 
+**Example:**
 
-Change the attributes mgt=dfm and netboot=yaboot. :: 
+Change the attributes mgt=dfm and netboot=yaboot. ::
 
 
     curl -X PUT -k 'https://127.0.0.1/xcatws/nodes/node1?userName=root&userPW=cluster&pretty=1' -H Content-Type:application/json --data '{"mgt":"dfm","netboot":"yaboot"}'
@@ -122,9 +122,9 @@ Refer to the man page: :doc:`mkdef </guides/admin-guides/references/man1/mkdef.1
 
 * No output when execution is successful. Otherwise output the error information in the Standard Error Format: {error:[msg1,msg2...],errocode:errornum}.
 
-**Example:** 
+**Example:**
 
-Create a node with attributes groups=all, mgt=dfm and netboot=yaboot :: 
+Create a node with attributes groups=all, mgt=dfm and netboot=yaboot ::
 
 
     curl -X POST -k 'https://127.0.0.1/xcatws/nodes/node1?userName=root&userPW=cluster&pretty=1' -H Content-Type:application/json --data '{"options":{"--template":"x86_64kvmguest-template"},'
@@ -137,9 +137,9 @@ Refer to the man page: :doc:`rmdef </guides/admin-guides/references/man1/rmdef.1
 
 * No output when execution is successful. Otherwise output the error information in the Standard Error Format: {error:[msg1,msg2...],errocode:errornum}.
 
-**Example:** 
+**Example:**
 
-Delete the node node1 :: 
+Delete the node node1 ::
 
 
     curl -X DELETE -k 'https://127.0.0.1/xcatws/nodes/node1?userName=root&userPW=cluster&pretty=1'
@@ -157,9 +157,9 @@ Refer to the man page: :doc:`lsdef </guides/admin-guides/references/man1/lsdef.1
 
 * Json format: An object which includes multiple '<name> : {att:value, attr:value ...}' pairs.
 
-**Example:** 
+**Example:**
 
-Get the attributes {groups,mgt,netboot} for node node1 :: 
+Get the attributes {groups,mgt,netboot} for node node1 ::
 
 
     curl -X GET -k 'https://127.0.0.1/xcatws/nodes/node1/attrs/groups,mgt,netboot?userName=root&userPW=cluster&pretty=1'
@@ -183,9 +183,9 @@ Refer to the man page: :doc:`makehosts </guides/admin-guides/references/man8/mak
 
 * No output when execution is successful. Otherwise output the error information in the Standard Error Format: {error:[msg1,msg2...],errocode:errornum}.
 
-**Example:** 
+**Example:**
 
-Create the mapping of ip and hostname record for node 'node1'. :: 
+Create the mapping of ip and hostname record for node 'node1'. ::
 
 
     curl -X POST -k 'https://127.0.0.1/xcatws/nodes/node1/host?userName=root&userPW=cluster&pretty=1'
@@ -203,9 +203,9 @@ Refer to the man page: :doc:`makedns </guides/admin-guides/references/man8/maked
 
 * No output when execution is successful. Otherwise output the error information in the Standard Error Format: {error:[msg1,msg2...],errocode:errornum}.
 
-**Example:** 
+**Example:**
 
-Create the dns record for node 'node1'. :: 
+Create the dns record for node 'node1'. ::
 
 
     curl -X POST -k 'https://127.0.0.1/xcatws/nodes/node1/dns?userName=root&userPW=cluster&pretty=1'
@@ -218,9 +218,9 @@ Refer to the man page: :doc:`makedns </guides/admin-guides/references/man8/maked
 
 * No output when execution is successful. Otherwise output the error information in the Standard Error Format: {error:[msg1,msg2...],errocode:errornum}.
 
-**Example:** 
+**Example:**
 
-Delete the dns record for node node1 :: 
+Delete the dns record for node node1 ::
 
 
     curl -X DELETE -k 'https://127.0.0.1/xcatws/nodes/node1/dns?userName=root&userPW=cluster&pretty=1'
@@ -236,9 +236,9 @@ Refer to the man page: :doc:`makedhcp </guides/admin-guides/references/man8/make
 
 * No output when execution is successful. Otherwise output the error information in the Standard Error Format: {error:[msg1,msg2...],errocode:errornum}.
 
-**Example:** 
+**Example:**
 
-Create the dhcp record for node 'node1'. :: 
+Create the dhcp record for node 'node1'. ::
 
 
     curl -X POST -k 'https://127.0.0.1/xcatws/nodes/node1/dhcp?userName=root&userPW=cluster&pretty=1'
@@ -251,9 +251,9 @@ Refer to the man page: :doc:`makedhcp </guides/admin-guides/references/man8/make
 
 * No output when execution is successful. Otherwise output the error information in the Standard Error Format: {error:[msg1,msg2...],errocode:errornum}.
 
-**Example:** 
+**Example:**
 
-Delete the dhcp record for node node1 :: 
+Delete the dhcp record for node node1 ::
 
 
     curl -X DELETE -k 'https://127.0.0.1/xcatws/nodes/node1/dhcp?userName=root&userPW=cluster&pretty=1'
@@ -269,9 +269,9 @@ Refer to the man page: :doc:`nodestat </guides/admin-guides/references/man1/node
 
 * An object which includes multiple entries like: <nodename> : { nodestat : <node state> }
 
-**Example:** 
+**Example:**
 
-Get the running status for node node1 :: 
+Get the running status for node node1 ::
 
 
     curl -X GET -k 'https://127.0.0.1/xcatws/nodes/node1/nodestat?userName=root&userPW=cluster&pretty=1'
@@ -293,9 +293,9 @@ Refer to the man page: :doc:`nodels </guides/admin-guides/references/man1/nodels
 
 * Json format: An array of node names.
 
-**Example:** 
+**Example:**
 
-Get the node names from xCAT database. :: 
+Get the node names from xCAT database. ::
 
 
     curl -X GET -k 'https://127.0.0.1/xcatws/nodes/node[1-3]/nodels?userName=root&userPW=cluster&pretty=1'
@@ -317,9 +317,9 @@ Refer to the man page: :doc:`rscan </guides/admin-guides/references/man1/rscan.1
 
 * Json format: An object which includes multiple '<name> : {att:value, attr:value ...}' pairs.
 
-**Example:** 
+**Example:**
 
-Get all the children nodes for node 'node1'. :: 
+Get all the children nodes for node 'node1'. ::
 
 
     curl -X GET -k 'https://127.0.0.1/xcatws/nodes/node1/subnodes?userName=root&userPW=cluster&pretty=1'
@@ -354,9 +354,9 @@ Refer to the man page: :doc:`rpower </guides/admin-guides/references/man1/rpower
 
 * An object which includes multiple entries like: <nodename> : { power : <powerstate> }
 
-**Example:** 
+**Example:**
 
-Get the power status. :: 
+Get the power status. ::
 
 
     curl -X GET -k 'https://127.0.0.1/xcatws/nodes/node1/power?userName=root&userPW=cluster&pretty=1'
@@ -379,9 +379,9 @@ Refer to the man page: :doc:`rpower </guides/admin-guides/references/man1/rpower
 
 * No output when execution is successful. Otherwise output the error information in the Standard Error Format: {error:[msg1,msg2...],errocode:errornum}.
 
-**Example:** 
+**Example:**
 
-Change the power status to on :: 
+Change the power status to on ::
 
 
     curl -X PUT -k 'https://127.0.0.1/xcatws/nodes/node1/power?userName=root&userPW=cluster&pretty=1' -H Content-Type:application/json --data '{"action":"on"}'
@@ -397,9 +397,9 @@ Refer to the man page: :doc:`renergy </guides/admin-guides/references/man1/rener
 
 * Json format: An object which includes multiple '<name> : {att:value, attr:value ...}' pairs.
 
-**Example:** 
+**Example:**
 
-Get all the energy attributes. :: 
+Get all the energy attributes. ::
 
 
     curl -X GET -k 'https://127.0.0.1/xcatws/nodes/node1/energy?userName=root&userPW=cluster&pretty=1'
@@ -424,9 +424,9 @@ Refer to the man page: :doc:`renergy </guides/admin-guides/references/man1/rener
 
 * No output when execution is successful. Otherwise output the error information in the Standard Error Format: {error:[msg1,msg2...],errocode:errornum}.
 
-**Example:** 
+**Example:**
 
-Turn on the cappingstatus to [on] :: 
+Turn on the cappingstatus to [on] ::
 
 
     curl -X PUT -k 'https://127.0.0.1/xcatws/nodes/node1/energy?userName=root&userPW=cluster&pretty=1' -H Content-Type:application/json --data '{"cappingstatus":"on"}'
@@ -442,9 +442,9 @@ Refer to the man page: :doc:`renergy </guides/admin-guides/references/man1/rener
 
 * Json format: An object which includes multiple '<name> : {att:value, attr:value ...}' pairs.
 
-**Example:** 
+**Example:**
 
-Get the energy attributes which are specified in the URI. :: 
+Get the energy attributes which are specified in the URI. ::
 
 
     curl -X GET -k 'https://127.0.0.1/xcatws/nodes/node1/energy/cappingmaxmin,cappingstatus?userName=root&userPW=cluster&pretty=1'
@@ -467,9 +467,9 @@ Refer to the man page: :doc:`rspconfig </guides/admin-guides/references/man1/rsp
 
 * Json format: An object which includes multiple '<name> : {att:value, attr:value ...}' pairs.
 
-**Example:** 
+**Example:**
 
-Get the snmp community for the service processor of node1. :: 
+Get the snmp community for the service processor of node1. ::
 
 
     curl -X GET -k 'https://127.0.0.1/xcatws/nodes/node1/sp/community?userName=root&userPW=cluster&pretty=1'
@@ -479,7 +479,7 @@ Get the snmp community for the service processor of node1. ::
        }
     }
 
-PUT - Change the specific attributes for the service processor resource. 
+PUT - Change the specific attributes for the service processor resource.
 `````````````````````````````````````````````````````````````````````````
 
 Refer to the man page: :doc:`rspconfig </guides/admin-guides/references/man1/rspconfig.1>`
@@ -492,9 +492,9 @@ Refer to the man page: :doc:`rspconfig </guides/admin-guides/references/man1/rsp
 
 * No output when execution is successful. Otherwise output the error information in the Standard Error Format: {error:[msg1,msg2...],errocode:errornum}.
 
-**Example:** 
+**Example:**
 
-Set the snmp community to [mycommunity]. :: 
+Set the snmp community to [mycommunity]. ::
 
 
     curl -X PUT -k 'https://127.0.0.1/xcatws/nodes/node1/sp/community?userName=root&userPW=cluster&pretty=1' -H Content-Type:application/json --data '{"value":"mycommunity"}'
@@ -510,9 +510,9 @@ Refer to the man page: :doc:`rsetboot </guides/admin-guides/references/man1/rset
 
 * Json format: An object which includes multiple '<name> : {att:value, attr:value ...}' pairs.
 
-**Example:** 
+**Example:**
 
-Get the bootorder for the next boot. (It's only valid after setting.) :: 
+Get the bootorder for the next boot. (It's only valid after setting.) ::
 
 
     curl -X GET -k 'https://127.0.0.1/xcatws/nodes/node1/nextboot?userName=root&userPW=cluster&pretty=1'
@@ -522,7 +522,7 @@ Get the bootorder for the next boot. (It's only valid after setting.) ::
        }
     }
 
-PUT - Change the next boot order. 
+PUT - Change the next boot order.
 ``````````````````````````````````
 
 Refer to the man page: :doc:`rsetboot </guides/admin-guides/references/man1/rsetboot.1>`
@@ -535,9 +535,9 @@ Refer to the man page: :doc:`rsetboot </guides/admin-guides/references/man1/rset
 
 * No output when execution is successful. Otherwise output the error information in the Standard Error Format: {error:[msg1,msg2...],errocode:errornum}.
 
-**Example:** 
+**Example:**
 
-Set the bootorder for the next boot. :: 
+Set the bootorder for the next boot. ::
 
 
     curl -X PUT -k 'https://127.0.0.1/xcatws/nodes/node1/nextboot?userName=root&userPW=cluster&pretty=1' -H Content-Type:application/json --data '{"order":"net"}'
@@ -553,9 +553,9 @@ Refer to the man page: :doc:`nodeset </guides/admin-guides/references/man1/nimno
 
 * Json format: An object which includes multiple '<name> : {att:value, attr:value ...}' pairs.
 
-**Example:** 
+**Example:**
 
-Get the next boot state for the node1. :: 
+Get the next boot state for the node1. ::
 
 
     curl -X GET -k 'https://127.0.0.1/xcatws/nodes/node1/bootstate?userName=root&userPW=cluster&pretty=1'
@@ -578,9 +578,9 @@ Refer to the man page: :doc:`nodeset </guides/admin-guides/references/man1/nimno
 
 * No output when execution is successful. Otherwise output the error information in the Standard Error Format: {error:[msg1,msg2...],errocode:errornum}.
 
-**Example:** 
+**Example:**
 
-Set the next boot state for the node1. :: 
+Set the next boot state for the node1. ::
 
 
     curl -X PUT -k 'https://127.0.0.1/xcatws/nodes/node1/bootstate?userName=root&userPW=cluster&pretty=1' -H Content-Type:application/json --data '{"osimage":"rhels6.4-x86_64-install-compute"}'
@@ -596,9 +596,9 @@ Refer to the man page: :doc:`rvitals </guides/admin-guides/references/man1/rvita
 
 * Json format: An object which includes multiple '<name> : {att:value, attr:value ...}' pairs.
 
-**Example:** 
+**Example:**
 
-Get all the vitails attributes for the node1. :: 
+Get all the vitails attributes for the node1. ::
 
 
     curl -X GET -k 'https://127.0.0.1/xcatws/nodes/node1/vitals?userName=root&userPW=cluster&pretty=1'
@@ -627,9 +627,9 @@ Refer to the man page: :doc:`rvitals </guides/admin-guides/references/man1/rvita
 
 * Json format: An object which includes multiple '<name> : {att:value, attr:value ...}' pairs.
 
-**Example:** 
+**Example:**
 
-Get the 'fanspeed' vitals attribute. :: 
+Get the 'fanspeed' vitals attribute. ::
 
 
     curl -X GET -k 'https://127.0.0.1/xcatws/nodes/node1/vitals/fanspeed?userName=root&userPW=cluster&pretty=1'
@@ -658,9 +658,9 @@ Refer to the man page: :doc:`rinv </guides/admin-guides/references/man1/rinv.1>`
 
 * Json format: An object which includes multiple '<name> : {att:value, attr:value ...}' pairs.
 
-**Example:** 
+**Example:**
 
-Get all the inventory attributes for node1. :: 
+Get all the inventory attributes for node1. ::
 
 
     curl -X GET -k 'https://127.0.0.1/xcatws/nodes/node1/inventory?userName=root&userPW=cluster&pretty=1'
@@ -689,9 +689,9 @@ Refer to the man page: :doc:`rinv </guides/admin-guides/references/man1/rinv.1>`
 
 * Json format: An object which includes multiple '<name> : {att:value, attr:value ...}' pairs.
 
-**Example:** 
+**Example:**
 
-Get the 'model' inventory attribute for node1. :: 
+Get the 'model' inventory attribute for node1. ::
 
 
     curl -X GET -k 'https://127.0.0.1/xcatws/nodes/node1/inventory/model?userName=root&userPW=cluster&pretty=1'
@@ -714,9 +714,9 @@ Refer to the man page: :doc:`reventlog </guides/admin-guides/references/man1/rev
 
 * Json format: An object which includes multiple '<name> : {att:value, attr:value ...}' pairs.
 
-**Example:** 
+**Example:**
 
-Get all the eventlog for node1. :: 
+Get all the eventlog for node1. ::
 
 
     curl -X GET -k 'https://127.0.0.1/xcatws/nodes/node1/eventlog?userName=root&userPW=cluster&pretty=1'
@@ -737,9 +737,9 @@ Refer to the man page: :doc:`reventlog </guides/admin-guides/references/man1/rev
 
 * No output when execution is successful. Otherwise output the error information in the Standard Error Format: {error:[msg1,msg2...],errocode:errornum}.
 
-**Example:** 
+**Example:**
 
-Delete all the event log for node1. :: 
+Delete all the event log for node1. ::
 
 
     curl -X DELETE -k 'https://127.0.0.1/xcatws/nodes/node1/eventlog?userName=root&userPW=cluster&pretty=1'
@@ -764,9 +764,9 @@ Refer to the man page: :doc:`rbeacon </guides/admin-guides/references/man1/rbeac
 
 * Json format: An object which includes multiple '<name> : {att:value, attr:value ...}' pairs.
 
-**Example:** 
+**Example:**
 
-Get beacon for node1. :: 
+Get beacon for node1. ::
 
 
     curl -X GET -k 'https://127.0.0.1/xcatws/nodes/node1/beacon?userName=root&userPW=cluster&pretty=1'
@@ -791,9 +791,9 @@ Refer to the man page: :doc:`rbeacon </guides/admin-guides/references/man1/rbeac
 
 * No output when execution is successful. Otherwise output the error information in the Standard Error Format: {error:[msg1,msg2...],errocode:errornum}.
 
-**Example:** 
+**Example:**
 
-Turn on the beacon. :: 
+Turn on the beacon. ::
 
 
     curl -X PUT -k 'https://127.0.0.1/xcatws/nodes/node1/beacon?userName=root&userPW=cluster&pretty=1' -H Content-Type:application/json --data '{"action":"on"}'
@@ -809,9 +809,9 @@ Refer to the man page: :doc:`updatenode </guides/admin-guides/references/man1/up
 
 * An array of messages for performing the node updating.
 
-**Example:** 
+**Example:**
 
-Initiate an updatenode process. :: 
+Initiate an updatenode process. ::
 
 
     curl -X POST -k 'https://127.0.0.1/xcatws/nodes/node2/updating?userName=root&userPW=cluster&pretty=1'
@@ -835,9 +835,9 @@ Refer to the man page: :doc:`updatenode </guides/admin-guides/references/man1/up
 
 * An array of messages for performing the file syncing for the node.
 
-**Example:** 
+**Example:**
 
-Initiate an file syncing process. :: 
+Initiate an file syncing process. ::
 
 
     curl -X POST -k 'https://127.0.0.1/xcatws/nodes/node2/filesyncing?userName=root&userPW=cluster&pretty=1'
@@ -857,9 +857,9 @@ Refer to the man page: :doc:`updatenode </guides/admin-guides/references/man1/up
 
 * Json format: An object which includes multiple '<name> : {att:value, attr:value ...}' pairs.
 
-**Example:** 
+**Example:**
 
-Initiate an software maintenance process. :: 
+Initiate an software maintenance process. ::
 
 
     curl -X POST -k 'https://127.0.0.1/xcatws/nodes/node2/sw?userName=root&userPW=cluster&pretty=1'
@@ -891,9 +891,9 @@ Refer to the man page: :doc:`updatenode </guides/admin-guides/references/man1/up
 
 * Json format: An object which includes multiple '<name> : {att:value, attr:value ...}' pairs.
 
-**Example:** 
+**Example:**
 
-Initiate an updatenode process. :: 
+Initiate an updatenode process. ::
 
 
     curl -X POST -k 'https://127.0.0.1/xcatws/nodes/node2/postscript?userName=root&userPW=cluster&pretty=1' -H Content-Type:application/json --data '{"scripts":["syslog","remoteshell"]}'
@@ -927,9 +927,9 @@ Refer to the man page: :doc:`xdsh </guides/admin-guides/references/man1/xdsh.1>`
 
 * Json format: An object which includes multiple '<name> : {att:value, attr:value ...}' pairs.
 
-**Example:** 
+**Example:**
 
-Run the 'date' command on the node2. :: 
+Run the 'date' command on the node2. ::
 
 
     curl -X POST -k 'https://127.0.0.1/xcatws/nodes/node2/nodeshell?userName=root&userPW=cluster&pretty=1' -H Content-Type:application/json --data '{"command":["date","ls"]}'
@@ -957,9 +957,9 @@ Refer to the man page: :doc:`xdcp </guides/admin-guides/references/man1/xdcp.1>`
 
 * No output when execution is successful. Otherwise output the error information in the Standard Error Format: {error:[msg1,msg2...],errocode:errornum}.
 
-**Example:** 
+**Example:**
 
-Copy files /tmp/f1 and /tmp/f2 from xCAT MN to the node2:/tmp. :: 
+Copy files /tmp/f1 and /tmp/f2 from xCAT MN to the node2:/tmp. ::
 
 
     curl -X POST -k 'https://127.0.0.1/xcatws/nodes/node2/nodecopy?userName=root&userPW=cluster&pretty=1' -H Content-Type:application/json --data '{"src":["/tmp/f1","/tmp/f2"],"target":"/tmp"}'
@@ -977,7 +977,7 @@ Refer to the man page: :doc:`chvm </guides/admin-guides/references/man1/chvm.1>`
 
 **Parameters:**
 
-* Json format: An object which includes multiple 'att:value' pairs. DataBody: 
+* Json format: An object which includes multiple 'att:value' pairs. DataBody:
     Set memory size - {"memorysize":"sizeofmemory(MB)"}
     Add new disk - {"adddisk":"sizeofdisk1(GB),sizeofdisk2(GB)"}
     Purge disk - {"purgedisk":"scsi_id1,scsi_id2"}
@@ -986,21 +986,21 @@ Refer to the man page: :doc:`chvm </guides/admin-guides/references/man1/chvm.1>`
 
 * No output when execution is successful. Otherwise output the error information in the Standard Error Format: {error:[msg1,msg2...],errocode:errornum}.
 
-**Example1:** 
+**Example1:**
 
-Set memory to 3000MB. :: 
+Set memory to 3000MB. ::
 
 
     curl -X PUT -k 'https://127.0.0.1/xcatws/nodes/node1/vm?userName=root&userPW=cluster&pretty=1' -H Content-Type:application/json --data '{"memorysize":"3000"}'
-**Example2:** 
+**Example2:**
 
-Add a new 20G disk. :: 
+Add a new 20G disk. ::
 
 
     curl -X PUT -k 'https://127.0.0.1/xcatws/nodes/node1/vm?userName=root&userPW=cluster&pretty=1' -H Content-Type:application/json --data '{"adddisk":"20G"}'
-**Example3:** 
+**Example3:**
 
-Purge the disk 'hdb'. :: 
+Purge the disk 'hdb'. ::
 
 
     curl -X PUT -k 'https://127.0.0.1/xcatws/nodes/node1/vm?userName=root&userPW=cluster&pretty=1' -H Content-Type:application/json --data '{"purgedisk":"hdb"}'
@@ -1011,7 +1011,7 @@ Refer to the man page: :doc:`mkvm </guides/admin-guides/references/man1/mkvm.1>`
 
 **Parameters:**
 
-* Json format: An object which includes multiple 'att:value' pairs. DataBody: 
+* Json format: An object which includes multiple 'att:value' pairs. DataBody:
     Set CPU count - {"cpucount":"numberofcpu"}
     Set memory size - {"memorysize":"sizeofmemory(MB)"}
     Set disk size - {"disksize":"sizeofdisk"}
@@ -1021,9 +1021,9 @@ Refer to the man page: :doc:`mkvm </guides/admin-guides/references/man1/mkvm.1>`
 
 * No output when execution is successful. Otherwise output the error information in the Standard Error Format: {error:[msg1,msg2...],errocode:errornum}.
 
-**Example:** 
+**Example:**
 
-Create the vm node1 with a 30G disk, 2048M memory and 2 cpus. :: 
+Create the vm node1 with a 30G disk, 2048M memory and 2 cpus. ::
 
 
     curl -X POST -k 'https://127.0.0.1/xcatws/nodes/node1/vm?userName=root&userPW=cluster&pretty=1' -H Content-Type:application/json --data '{"disksize":"30G","memorysize":"2048","cpucount":"2"}'
@@ -1034,7 +1034,7 @@ Refer to the man page: :doc:`rmvm </guides/admin-guides/references/man1/rmvm.1>`
 
 **Parameters:**
 
-* Json format: An object which includes multiple 'att:value' pairs. DataBody: 
+* Json format: An object which includes multiple 'att:value' pairs. DataBody:
     Purge disk - {"purge":"yes"}
     Do it by force - {"force":"yes"}
 
@@ -1042,9 +1042,9 @@ Refer to the man page: :doc:`rmvm </guides/admin-guides/references/man1/rmvm.1>`
 
 * No output when execution is successful. Otherwise output the error information in the Standard Error Format: {error:[msg1,msg2...],errocode:errornum}.
 
-**Example:** 
+**Example:**
 
-Remove the vm node1 by force and purge the disk. :: 
+Remove the vm node1 by force and purge the disk. ::
 
 
     curl -X DELETE -k 'https://127.0.0.1/xcatws/nodes/node1/vm?userName=root&userPW=cluster&pretty=1' -H Content-Type:application/json --data '{"force":"yes","purge":"yes"}'
@@ -1060,7 +1060,7 @@ Refer to the man page: :doc:`clonevm </guides/admin-guides/references/man1/clone
 
 **Parameters:**
 
-* Json format: An object which includes multiple 'att:value' pairs. DataBody: 
+* Json format: An object which includes multiple 'att:value' pairs. DataBody:
     Clone a master named "mastername" - {"tomaster":"mastername"}
     Clone a node from master "mastername" - {"frommaster":"mastername"}
     Use Detach mode - {"detach":"yes"}
@@ -1070,9 +1070,9 @@ Refer to the man page: :doc:`clonevm </guides/admin-guides/references/man1/clone
 
 * The messages of creating Clone target.
 
-**Example1:** 
+**Example1:**
 
-Create a clone master named "vmmaster" from the node1. :: 
+Create a clone master named "vmmaster" from the node1. ::
 
 
     curl -X POST -k 'https://127.0.0.1/xcatws/nodes/node1/vmclone?userName=root&userPW=cluster&pretty=1' -H Content-Type:application/json --data '{"tomaster":"vmmaster","detach":"yes"}'
@@ -1082,9 +1082,9 @@ Create a clone master named "vmmaster" from the node1. ::
        }
     }
 
-**Example2:** 
+**Example2:**
 
-Clone the node1 from the clone master named "vmmaster". :: 
+Clone the node1 from the clone master named "vmmaster". ::
 
 
     curl -X POST -k 'https://127.0.0.1/xcatws/nodes/node1/vmclone?userName=root&userPW=cluster&pretty=1' -H Content-Type:application/json --data '{"frommaster":"vmmaster"}'
@@ -1102,9 +1102,9 @@ Refer to the man page: :doc:`rmigrate </guides/admin-guides/references/man1/rmig
 
 * Json format: An object which includes multiple 'att:value' pairs. DataBody: {"target":"targethost"}.
 
-**Example:** 
+**Example:**
 
-Migrate node1 to target host host2. :: 
+Migrate node1 to target host host2. ::
 
 
     curl -X POST -k 'https://127.0.0.1/xcatws/nodes/node1/vmmigrate?userName=root&userPW=cluster&pretty=1' -H Content-Type:application/json --data '{"target":"host2"}'
@@ -1125,9 +1125,9 @@ Refer to the man page: :doc:`lsdef </guides/admin-guides/references/man1/lsdef.1
 
 * Json format: An array of osimage names.
 
-**Example:** 
+**Example:**
 
-Get all the osimage names. :: 
+Get all the osimage names. ::
 
 
     curl -X GET -k 'https://127.0.0.1/xcatws/osimages?userName=root&userPW=cluster&pretty=1'
@@ -1151,15 +1151,15 @@ Refer to the man page: :doc:`copycds </guides/admin-guides/references/man8/copyc
 
 * No output when execution is successful. Otherwise output the error information in the Standard Error Format: {error:[msg1,msg2...],errocode:errornum}.
 
-**Example1:** 
+**Example1:**
 
-Create osimage resources based on the ISO specified :: 
+Create osimage resources based on the ISO specified ::
 
 
     curl -X POST -k 'https://127.0.0.1/xcatws/osimages?userName=root&userPW=cluster&pretty=1' -H Content-Type:application/json --data '{"iso":"/iso/RHEL6.4-20130130.0-Server-ppc64-DVD1.iso"}'
-**Example2:** 
+**Example2:**
 
-Create osimage resources based on an xCAT image or configuration file :: 
+Create osimage resources based on an xCAT image or configuration file ::
 
 
     curl -X POST -k 'https://127.0.0.1/xcatws/osimages?userName=root&userPW=cluster&pretty=1' -H Content-Type:application/json --data '{"file":"/tmp/sles11.2-x86_64-install-compute.tgz"}'
@@ -1177,9 +1177,9 @@ Refer to the man page: :doc:`lsdef </guides/admin-guides/references/man1/lsdef.1
 
 * Json format: An object which includes multiple '<name> : {att:value, attr:value ...}' pairs.
 
-**Example:** 
+**Example:**
 
-Get the attributes for the specified osimage. :: 
+Get the attributes for the specified osimage. ::
 
 
     curl -X GET -k 'https://127.0.0.1/xcatws/osimages/sles11.2-x86_64-install-compute?userName=root&userPW=cluster&pretty=1'
@@ -1212,9 +1212,9 @@ Refer to the man page: :doc:`chdef </guides/admin-guides/references/man1/chdef.1
 
 * No output when execution is successful. Otherwise output the error information in the Standard Error Format: {error:[msg1,msg2...],errocode:errornum}.
 
-**Example:** 
+**Example:**
 
-Change the 'osvers' and 'osarch' attributes for the osiamge. :: 
+Change the 'osvers' and 'osarch' attributes for the osiamge. ::
 
 
     curl -X PUT -k 'https://127.0.0.1/xcatws/osimages/sles11.2-ppc64-install-compute/?userName=root&userPW=cluster&pretty=1' -H Content-Type:application/json --data '{"osvers":"sles11.3","osarch":"x86_64"}'
@@ -1231,9 +1231,9 @@ Refer to the man page: :doc:`mkdef </guides/admin-guides/references/man1/mkdef.1
 
 * No output when execution is successful. Otherwise output the error information in the Standard Error Format: {error:[msg1,msg2...],errocode:errornum}.
 
-**Example:** 
+**Example:**
 
-Create a osimage obj with the specified parameters. :: 
+Create a osimage obj with the specified parameters. ::
 
 
     curl -X POST -k 'https://127.0.0.1/xcatws/osimages/sles11.3-ppc64-install-compute?userName=root&userPW=cluster&pretty=1' -H Content-Type:application/json --data '{"osvers":"sles11.3","osarch":"ppc64","osname":"Linux","provmethod":"install","profile":"compute"}'
@@ -1246,9 +1246,9 @@ Refer to the man page: :doc:`rmdef </guides/admin-guides/references/man1/rmdef.1
 
 * No output when execution is successful. Otherwise output the error information in the Standard Error Format: {error:[msg1,msg2...],errocode:errornum}.
 
-**Example:** 
+**Example:**
 
-Delete the specified osimage. :: 
+Delete the specified osimage. ::
 
 
     curl -X DELETE -k 'https://127.0.0.1/xcatws/osimages/sles11.3-ppc64-install-compute?userName=root&userPW=cluster&pretty=1'
@@ -1266,9 +1266,9 @@ Refer to the man page: :doc:`lsdef </guides/admin-guides/references/man1/lsdef.1
 
 * Json format: An array of attr:value pairs for the specified osimage.
 
-**Example:** 
+**Example:**
 
-Get the specified attributes. :: 
+Get the specified attributes. ::
 
 
     curl -X GET -k 'https://127.0.0.1/xcatws/osimages/sles11.2-ppc64-install-compute/attrs/imagetype,osarch,osname,provmethod?userName=root&userPW=cluster&pretty=1'
@@ -1297,21 +1297,21 @@ Refer to the man page: :doc:` </guides/admin-guides/references/>`
 
 * No output when execution is successful. Otherwise output the error information in the Standard Error Format: {error:[msg1,msg2...],errocode:errornum}.
 
-**Example1:** 
+**Example1:**
 
-Generates a stateless image based on the specified osimage :: 
+Generates a stateless image based on the specified osimage ::
 
 
     curl -X POST -k 'https://127.0.0.1/xcatws/osimages/sles11.2-x86_64-install-compute/instance?userName=root&userPW=cluster&pretty=1' -H Content-Type:application/json --data '{"action":"gen"}'
-**Example2:** 
+**Example2:**
 
-Packs the stateless image from the chroot file system based on the specified osimage :: 
+Packs the stateless image from the chroot file system based on the specified osimage ::
 
 
     curl -X POST -k 'https://127.0.0.1/xcatws/osimages/sles11.2-x86_64-install-compute/instance?userName=root&userPW=cluster&pretty=1' -H Content-Type:application/json --data '{"action":"pack"}'
-**Example3:** 
+**Example3:**
 
-Exports an xCAT image based on the specified osimage :: 
+Exports an xCAT image based on the specified osimage ::
 
 
     curl -X POST -k 'https://127.0.0.1/xcatws/osimages/sles11.2-x86_64-install-compute/instance?userName=root&userPW=cluster&pretty=1' -H Content-Type:application/json --data '{"action":"export"}'
@@ -1324,9 +1324,9 @@ Refer to the man page: :doc:`rmimage </guides/admin-guides/references/man1/rmima
 
 * No output when execution is successful. Otherwise output the error information in the Standard Error Format: {error:[msg1,msg2...],errocode:errornum}.
 
-**Example:** 
+**Example:**
 
-Delete the stateless image for the specified osimage :: 
+Delete the stateless image for the specified osimage ::
 
 
     curl -X DELETE -k 'https://127.0.0.1/xcatws/osimages/sles11.2-x86_64-install-compute/instance?userName=root&userPW=cluster&pretty=1'
@@ -1351,9 +1351,9 @@ Refer to the man page: :doc:`lsdef </guides/admin-guides/references/man1/lsdef.1
 
 * Json format: An array of networks names.
 
-**Example:** 
+**Example:**
 
-Get all the networks names from xCAT database. :: 
+Get all the networks names from xCAT database. ::
 
 
     curl -X GET -k 'https://127.0.0.1/xcatws/networks?userName=root&userPW=cluster&pretty=1'
@@ -1376,9 +1376,9 @@ Refer to the man page: :doc:`makenetworks </guides/admin-guides/references/man8/
 
 * No output when execution is successful. Otherwise output the error information in the Standard Error Format: {error:[msg1,msg2...],errocode:errornum}.
 
-**Example:** 
+**Example:**
 
-Create the networks resources base on the network configuration on xCAT MN. :: 
+Create the networks resources base on the network configuration on xCAT MN. ::
 
 
     curl -X POST -k 'https://127.0.0.1/xcatws/networks?userName=root&userPW=cluster&pretty=1'
@@ -1396,9 +1396,9 @@ Refer to the man page: :doc:`lsdef </guides/admin-guides/references/man1/lsdef.1
 
 * Json format: An object which includes multiple '<name> : {att:value, attr:value ...}' pairs.
 
-**Example:** 
+**Example:**
 
-Get all the attributes for network 'network1'. :: 
+Get all the attributes for network 'network1'. ::
 
 
     curl -X GET -k 'https://127.0.0.1/xcatws/networks/network1?userName=root&userPW=cluster&pretty=1'
@@ -1426,9 +1426,9 @@ Refer to the man page: :doc:`chdef </guides/admin-guides/references/man1/chdef.1
 
 * No output when execution is successful. Otherwise output the error information in the Standard Error Format: {error:[msg1,msg2...],errocode:errornum}.
 
-**Example:** 
+**Example:**
 
-Change the attributes mgtifname=eth0 and net=10.1.0.0. :: 
+Change the attributes mgtifname=eth0 and net=10.1.0.0. ::
 
 
     curl -X PUT -k 'https://127.0.0.1/xcatws/networks/network1?userName=root&userPW=cluster&pretty=1' -H Content-Type:application/json --data '{"mgtifname":"eth0","net":"10.1.0.0"}'
@@ -1445,9 +1445,9 @@ Refer to the man page: :doc:`mkdef </guides/admin-guides/references/man1/mkdef.1
 
 * No output when execution is successful. Otherwise output the error information in the Standard Error Format: {error:[msg1,msg2...],errocode:errornum}.
 
-**Example:** 
+**Example:**
 
-Create a network with attributes gateway=10.1.0.1, mask=255.255.0.0  :: 
+Create a network with attributes gateway=10.1.0.1, mask=255.255.0.0  ::
 
 
     curl -X POST -k 'https://127.0.0.1/xcatws/networks/network1?userName=root&userPW=cluster&pretty=1' -H Content-Type:application/json --data '{"gateway":"10.1.0.1","mask":"255.255.0.0"}'
@@ -1460,9 +1460,9 @@ Refer to the man page: :doc:`rmdef </guides/admin-guides/references/man1/rmdef.1
 
 * No output when execution is successful. Otherwise output the error information in the Standard Error Format: {error:[msg1,msg2...],errocode:errornum}.
 
-**Example:** 
+**Example:**
 
-Delete the network network1 :: 
+Delete the network network1 ::
 
 
     curl -X DELETE -k 'https://127.0.0.1/xcatws/networks/network1?userName=root&userPW=cluster&pretty=1'
@@ -1480,9 +1480,9 @@ Refer to the man page: :doc:`lsdef </guides/admin-guides/references/man1/lsdef.1
 
 * Json format: An object which includes multiple '<name> : {att:value, attr:value ...}' pairs.
 
-**Example:** 
+**Example:**
 
-Get the attributes {groups,mgt,netboot} for network network1 :: 
+Get the attributes {groups,mgt,netboot} for network network1 ::
 
 
     curl -X GET -k 'https://127.0.0.1/xcatws/networks/network1/attrs/gateway,mask,mgtifname,net,tftpserver?userName=root&userPW=cluster&pretty=1'
@@ -1512,9 +1512,9 @@ Refer to the man page: :doc:`lsdef </guides/admin-guides/references/man1/lsdef.1
 
 * Json format: An object which includes multiple '<name> : {att:value, attr:value ...}' pairs.
 
-**Example:** 
+**Example:**
 
-Get all the policy objects. :: 
+Get all the policy objects. ::
 
 
     curl -X GET -k 'https://127.0.0.1/xcatws/policy?userName=root&userPW=cluster&pretty=1'
@@ -1541,9 +1541,9 @@ Refer to the man page: :doc:`lsdef </guides/admin-guides/references/man1/lsdef.1
 
 * Json format: An object which includes multiple '<name> : {att:value, attr:value ...}' pairs.
 
-**Example:** 
+**Example:**
 
-Get all the attribute for policy 1. :: 
+Get all the attribute for policy 1. ::
 
 
     curl -X GET -k 'https://127.0.0.1/xcatws/policy/1?userName=root&userPW=cluster&pretty=1'
@@ -1569,9 +1569,9 @@ Refer to the man page: :doc:`chdef </guides/admin-guides/references/man1/chdef.1
 
 * No output when execution is successful. Otherwise output the error information in the Standard Error Format: {error:[msg1,msg2...],errocode:errornum}.
 
-**Example:** 
+**Example:**
 
-Set the name attribute for policy 3. :: 
+Set the name attribute for policy 3. ::
 
 
     curl -X PUT -k 'https://127.0.0.1/xcatws/policy/3?userName=root&userPW=cluster&pretty=1' -H Content-Type:application/json --data '{"name":"root"}'
@@ -1590,9 +1590,9 @@ Refer to the man page: :doc:`chdef </guides/admin-guides/references/man1/chdef.1
 
 * No output when execution is successful. Otherwise output the error information in the Standard Error Format: {error:[msg1,msg2...],errocode:errornum}.
 
-**Example:** 
+**Example:**
 
-Create a new policy 10. :: 
+Create a new policy 10. ::
 
 
     curl -X POST -k 'https://127.0.0.1/xcatws/policy/10?userName=root&userPW=cluster&pretty=1' -H Content-Type:application/json --data '{"name":"root","commands":"rpower"}'
@@ -1607,9 +1607,9 @@ Refer to the man page: :doc:`rmdef </guides/admin-guides/references/man1/rmdef.1
 
 * No output when execution is successful. Otherwise output the error information in the Standard Error Format: {error:[msg1,msg2...],errocode:errornum}.
 
-**Example:** 
+**Example:**
 
-Delete the policy 10. :: 
+Delete the policy 10. ::
 
 
     curl -X DELETE -k 'https://127.0.0.1/xcatws/policy/10?userName=root&userPW=cluster&pretty=1'
@@ -1629,9 +1629,9 @@ Refer to the man page: :doc:`lsdef </guides/admin-guides/references/man1/lsdef.1
 
 * Json format: An object which includes multiple '<name> : {att:value, attr:value ...}' pairs.
 
-**Example:** 
+**Example:**
 
-Get the name and rule attributes for policy 1. :: 
+Get the name and rule attributes for policy 1. ::
 
 
     curl -X GET -k 'https://127.0.0.1/xcatws/policy/1/attrs/name,rule?userName=root&userPW=cluster&pretty=1'
@@ -1663,9 +1663,9 @@ Refer to the man page: :doc:`lsdef </guides/admin-guides/references/man1/lsdef.1
 
 * Json format: An array of group names.
 
-**Example:** 
+**Example:**
 
-Get all the group names from xCAT database. :: 
+Get all the group names from xCAT database. ::
 
 
     curl -X GET -k 'https://127.0.0.1/xcatws/groups?userName=root&userPW=cluster&pretty=1'
@@ -1689,9 +1689,9 @@ Refer to the man page: :doc:`lsdef </guides/admin-guides/references/man1/lsdef.1
 
 * Json format: An object which includes multiple '<name> : {att:value, attr:value ...}' pairs.
 
-**Example:** 
+**Example:**
 
-Get all the attributes for group 'all'. :: 
+Get all the attributes for group 'all'. ::
 
 
     curl -X GET -k 'https://127.0.0.1/xcatws/groups/all?userName=root&userPW=cluster&pretty=1'
@@ -1714,9 +1714,9 @@ Refer to the man page: :doc:`chdef </guides/admin-guides/references/man1/chdef.1
 
 * No output when execution is successful. Otherwise output the error information in the Standard Error Format: {error:[msg1,msg2...],errocode:errornum}.
 
-**Example:** 
+**Example:**
 
-Change the attributes mgt=dfm and netboot=yaboot. :: 
+Change the attributes mgt=dfm and netboot=yaboot. ::
 
 
     curl -X PUT -k 'https://127.0.0.1/xcatws/groups/all?userName=root&userPW=cluster&pretty=1' -H Content-Type:application/json --data '{"mgt":"dfm","netboot":"yaboot"}'
@@ -1732,9 +1732,9 @@ Refer to the man page: :doc:`lsdef </guides/admin-guides/references/man1/lsdef.1
 
 * Json format: An object which includes multiple '<name> : {att:value, attr:value ...}' pairs.
 
-**Example:** 
+**Example:**
 
-Get the attributes {mgt,netboot} for group all :: 
+Get the attributes {mgt,netboot} for group all ::
 
 
     curl -X GET -k 'https://127.0.0.1/xcatws/groups/all/attrs/mgt,netboot?userName=root&userPW=cluster&pretty=1'
@@ -1766,9 +1766,9 @@ Refer to the man page: :doc:`lsdef </guides/admin-guides/references/man1/lsdef.1
 
 * Json format: An object which includes multiple '<name> : {att:value, attr:value ...}' pairs.
 
-**Example:** 
+**Example:**
 
-Get all the global configuration :: 
+Get all the global configuration ::
 
 
     curl -X GET -k 'https://127.0.0.1/xcatws/globalconf?userName=root&userPW=cluster&pretty=1'
@@ -1794,9 +1794,9 @@ Refer to the man page: :doc:`lsdef </guides/admin-guides/references/man1/lsdef.1
 
 * Json format: An object which includes multiple '<name> : {att:value, attr:value ...}' pairs.
 
-**Example:** 
+**Example:**
 
-Get the 'master' and 'domain' configuration. :: 
+Get the 'master' and 'domain' configuration. ::
 
 
     curl -X GET -k 'https://127.0.0.1/xcatws/globalconf/attrs/master,domain?userName=root&userPW=cluster&pretty=1'
@@ -1822,9 +1822,9 @@ Refer to the man page: :doc:`chdef </guides/admin-guides/references/man1/chdef.1
 
 * No output when execution is successful. Otherwise output the error information in the Standard Error Format: {error:[msg1,msg2...],errocode:errornum}.
 
-**Example:** 
+**Example:**
 
-Change/Add the domain attribute. :: 
+Change/Add the domain attribute. ::
 
 
     curl -X PUT -k 'https://127.0.0.1/xcatws/globalconf/attrs/domain?userName=root&userPW=cluster&pretty=1' -H Content-Type:application/json --data '{"domain":"cluster.com"}'
@@ -1839,9 +1839,9 @@ Refer to the man page: :doc:`chdef </guides/admin-guides/references/man1/chdef.1
 
 * No output when execution is successful. Otherwise output the error information in the Standard Error Format: {error:[msg1,msg2...],errocode:errornum}.
 
-**Example:** 
+**Example:**
 
-Remove the domain configure. :: 
+Remove the domain configure. ::
 
 
     curl -X DELETE -k 'https://127.0.0.1/xcatws/globalconf/attrs/domain?userName=root&userPW=cluster&pretty=1'
@@ -1862,9 +1862,9 @@ Refer to the man page: :doc:`makedns </guides/admin-guides/references/man8/maked
 
 * No output when execution is successful. Otherwise output the error information in the Standard Error Format: {error:[msg1,msg2...],errocode:errornum}.
 
-**Example:** 
+**Example:**
 
-Initialize the dns service. :: 
+Initialize the dns service. ::
 
 
     curl -X POST -k 'https://127.0.0.1/xcatws/services/dns?userName=root&userPW=cluster&pretty=1'
@@ -1880,9 +1880,9 @@ Refer to the man page: :doc:`makedhcp </guides/admin-guides/references/man8/make
 
 * No output when execution is successful. Otherwise output the error information in the Standard Error Format: {error:[msg1,msg2...],errocode:errornum}.
 
-**Example:** 
+**Example:**
 
-Create the dhcpd.conf and restart the dhcpd. :: 
+Create the dhcpd.conf and restart the dhcpd. ::
 
 
     curl -X POST -k 'https://127.0.0.1/xcatws/services/dhcp?userName=root&userPW=cluster&pretty=1'
@@ -1898,9 +1898,9 @@ Refer to the man page: :doc:`makehosts </guides/admin-guides/references/man8/mak
 
 * No output when execution is successful. Otherwise output the error information in the Standard Error Format: {error:[msg1,msg2...],errocode:errornum}.
 
-**Example:** 
+**Example:**
 
-Create the ip/hostname records for all the nodes to /etc/hosts. :: 
+Create the ip/hostname records for all the nodes to /etc/hosts. ::
 
 
     curl -X POST -k 'https://127.0.0.1/xcatws/services/host?userName=root&userPW=cluster&pretty=1'
@@ -1916,9 +1916,9 @@ Refer to the man page: :doc:`lsslp </guides/admin-guides/references/man1/lsslp.1
 
 * Json format: An object which includes multiple '<name> : {att:value, attr:value ...}' pairs.
 
-**Example:** 
+**Example:**
 
-Get all the nodes which support slp in the network. :: 
+Get all the nodes which support slp in the network. ::
 
 
     curl -X GET -k 'https://127.0.0.1/xcatws/services/slpnodes?userName=root&userPW=cluster&pretty=1'
@@ -1952,9 +1952,9 @@ Refer to the man page: :doc:`lsslp </guides/admin-guides/references/man1/lsslp.1
 
 * Json format: An object which includes multiple '<name> : {att:value, attr:value ...}' pairs.
 
-**Example:** 
+**Example:**
 
-Get all the CMM nodes which support slp in the network. :: 
+Get all the CMM nodes which support slp in the network. ::
 
 
     curl -X GET -k 'https://127.0.0.1/xcatws/services/slpnodes/CMM?userName=root&userPW=cluster&pretty=1'
@@ -2006,9 +2006,9 @@ GET - Get attributes of tables for a noderange.
 
 * An object containing each table.  Within each table object is an array of node objects containing the attributes.
 
-**Example1:** 
+**Example1:**
 
-Get all the columns from table nodetype for node1 and node2. :: 
+Get all the columns from table nodetype for node1 and node2. ::
 
 
     curl -X GET -k 'https://127.0.0.1/xcatws/tables/nodetype/nodes/node1,node2?userName=root&userPW=cluster&pretty=1'
@@ -2031,9 +2031,9 @@ Get all the columns from table nodetype for node1 and node2. ::
        ]
     }
 
-**Example2:** 
+**Example2:**
 
-Get all the columns from tables nodetype and noderes for node1 and node2. :: 
+Get all the columns from tables nodetype and noderes for node1 and node2. ::
 
 
     curl -X GET -k 'https://127.0.0.1/xcatws/tables/nodetype,noderes/nodes/node1,node2?userName=root&userPW=cluster&pretty=1'
@@ -2081,9 +2081,9 @@ PUT - Change the node table attributes for {noderange}.
 
 * No output when execution is successful. Otherwise output the error information in the Standard Error Format: {error:[msg1,msg2...],errocode:errornum}.
 
-**Example:** 
+**Example:**
 
-Change the nodetype.arch and noderes.netboot attributes for nodes node1,node2. :: 
+Change the nodetype.arch and noderes.netboot attributes for nodes node1,node2. ::
 
 
     curl -X PUT -k 'https://127.0.0.1/xcatws/tables/nodetype,noderes/nodes/node1,node2?userName=root&userPW=cluster&pretty=1' -H Content-Type:application/json --data '{"nodetype":{"arch":"x86_64"},"noderes":{"netboot":"xnba"}}'
@@ -2099,9 +2099,9 @@ GET - Get table attributes for a noderange.
 
 * An object containing each table.  Within each table object is an array of node objects containing the attributes.
 
-**Example:** 
+**Example:**
 
-Get OS and ARCH attributes from nodetype table for node1 and node2. :: 
+Get OS and ARCH attributes from nodetype table for node1 and node2. ::
 
 
     curl -X GET -k 'https://127.0.0.1/xcatws/tables/nodetype/nodes/node1,node2/os,arch?userName=root&userPW=cluster&pretty=1'
@@ -2132,9 +2132,9 @@ GET - Get all rows from non-node tables.
 
 * An object containing each table.  Within each table object is an array of row objects containing the attributes.
 
-**Example:** 
+**Example:**
 
-Get all rows from networks table. :: 
+Get all rows from networks table. ::
 
 
     curl -X GET -k 'https://127.0.0.1/xcatws/tables/networks/rows?userName=root&userPW=cluster&pretty=1'
@@ -2171,9 +2171,9 @@ GET - Get attributes for rows from non-node tables.
 
 * An object containing each table.  Within each table object is an array of row objects containing the attributes.
 
-**Example:** 
+**Example:**
 
-Get rows from networks table where net=192.168.1.0,mask=255.255.255.0. :: 
+Get rows from networks table where net=192.168.1.0,mask=255.255.255.0. ::
 
 
     curl -X GET -k 'https://127.0.0.1/xcatws/tables/networks/rows/net=192.168.1.0,mask=255.255.255.0?userName=root&userPW=cluster&pretty=1'
@@ -2202,9 +2202,9 @@ PUT - Change the non-node table attributes for the row that matches the {keys}.
 
 * No output when execution is successful. Otherwise output the error information in the Standard Error Format: {error:[msg1,msg2...],errocode:errornum}.
 
-**Example:** 
+**Example:**
 
-Create a route row in the routes table. :: 
+Create a route row in the routes table. ::
 
 
     curl -X PUT -k 'https://127.0.0.1/xcatws/tables/routes/rows/routename=privnet?userName=root&userPW=cluster&pretty=1' -H Content-Type:application/json --data '{"net":"10.0.1.0","mask":"255.255.255.0","gateway":"10.0.1.254","ifname":"eth1"}'
@@ -2215,9 +2215,9 @@ DELETE - Delete rows from a non-node table that have the attribute values specif
 
 * No output when execution is successful. Otherwise output the error information in the Standard Error Format: {error:[msg1,msg2...],errocode:errornum}.
 
-**Example:** 
+**Example:**
 
-Delete rows from routes table where routename=privnet. :: 
+Delete rows from routes table where routename=privnet. ::
 
 
     curl -X DELETE -k 'https://127.0.0.1/xcatws/tables/routes/rows/routename=privnet?userName=root&userPW=cluster&pretty=1'
@@ -2233,9 +2233,9 @@ GET - Get specific attributes for rows from non-node tables.
 
 * An object containing each table.  Within each table object is an array of row objects containing the attributes.
 
-**Example:** 
+**Example:**
 
-Get attributes mgtifname and tftpserver from networks table for each row where net=192.168.1.0,mask=255.255.255.0. :: 
+Get attributes mgtifname and tftpserver from networks table for each row where net=192.168.1.0,mask=255.255.255.0. ::
 
 
     curl -X GET -k 'https://127.0.0.1/xcatws/tables/networks/rows/net=192.168.1.0,mask=255.255.255.0/mgtifname,tftpserver?userName=root&userPW=cluster&pretty=1'
diff --git a/docs/source/advanced/restapi/restapi_setup/restapi_setup.rst b/docs/source/advanced/restapi/restapi_setup/restapi_setup.rst
index b7e6454d7..634876446 100644
--- a/docs/source/advanced/restapi/restapi_setup/restapi_setup.rst
+++ b/docs/source/advanced/restapi/restapi_setup/restapi_setup.rst
@@ -1,7 +1,7 @@
-Enable the HTTPS service for REST API 
+Enable the HTTPS service for REST API
 =====================================
 
-To improve the security between the REST API client and server, enabling the HTTPS service on the xCAT MN is recommended. And the REST API client should use the 'https' to access web server instead of the 'http'. 
+To improve the security between the REST API client and server, enabling the HTTPS service on the xCAT MN is recommended. And the REST API client should use the 'https' to access web server instead of the 'http'.
 
 * **[RHEL6/7 (x86_64/ppc64) and RHEL5 (x86_64)]** ::
 
@@ -13,7 +13,7 @@ To improve the security between the REST API client and server, enabling the HTT
 
   Uninstall httpd.ppc64 and install httpd.ppc: ::
 
-    rpm -e --nodeps httpd.ppc64 
+    rpm -e --nodeps httpd.ppc64
     rpm -i httpd.ppc mod_ssl.ppc
 
 * **[SLES10/11/12 (x86_64/ppc64)]** ::
@@ -31,7 +31,7 @@ To improve the security between the REST API client and server, enabling the HTT
     sudo a2enmod ssl
     ln -s ../sites-available/default-ssl.conf  /etc/apache2/sites-enabled/ssl.conf
     sudo service apache2 restart
-    
+
     # verify it is loaded:
 
     sudo apache2ctl -t -D DUMP_MODULES | grep ssl
@@ -40,11 +40,11 @@ To improve the security between the REST API client and server, enabling the HTT
 Enable the Certificate of HTTPs Server (Optional)
 =================================================
 
-Enabling the certificate functionality of https server is useful for the Rest API client to authenticate the server. 
+Enabling the certificate functionality of https server is useful for the Rest API client to authenticate the server.
 
-The certificate for xcatd has already been generated when installing xCAT, it can be reused by the https server. To enable the server certificate authentication, the hostname of xCAT MN must be a fully qualified domain name (FQDN). The REST API client also must use this FQDN when accessing the https server. If the hostname of the xCAT MN is not a FQDN, you need to change the hostname first. 
+The certificate for xcatd has already been generated when installing xCAT, it can be reused by the https server. To enable the server certificate authentication, the hostname of xCAT MN must be a fully qualified domain name (FQDN). The REST API client also must use this FQDN when accessing the https server. If the hostname of the xCAT MN is not a FQDN, you need to change the hostname first.
 
-Typically the hostname of the xCAT MN is initially set to the NIC which faces to the cluster (usually an internal/private NIC). If you want to enable the REST API for public client, set the hostname of xCAT MN to one of the public NIC. 
+Typically the hostname of the xCAT MN is initially set to the NIC which faces to the cluster (usually an internal/private NIC). If you want to enable the REST API for public client, set the hostname of xCAT MN to one of the public NIC.
 
 To change the hostname, edit /etc/sysconfig/network (RHEL) or /etc/HOSTNAME (SLES) and run:  ::
 
@@ -62,9 +62,9 @@ The steps to configure the certificate for https server: ::
     export sslcfgfile=/etc/apache2/vhosts.d/vhost-ssl.conf    # sles
     export sslcfgfile=/etc/apache2/sites-enabled/ssl.conf     # ubuntu
 
-    sed -i 's/^\(\s*\)SSLCertificateFile.*$/\1SSLCertificateFile \/etc\/xcat\/cert\/server-cred.pem/' $sslcfgfile    
+    sed -i 's/^\(\s*\)SSLCertificateFile.*$/\1SSLCertificateFile \/etc\/xcat\/cert\/server-cred.pem/' $sslcfgfile
     sed -i 's/^\(\s*SSLCertificateKeyFile.*\)$/#\1/' $sslcfgfile
-        
+
     service httpd restart        # rhel
     service apache2 restart      # sles/ubuntu
 
@@ -92,11 +92,11 @@ Some operations like 'create osimage' (copycds) need a long time (longer than 3
 Set Up an Account for Web Service Access
 ========================================
 
-User needs a username and password to access the REST API. When the REST API request is passed to xcatd, the username and password will be verified based on the :doc:`xCAT passwd Table </guides/admin-guides/references/man5/passwd.5>`, and then xcatd will look in the :doc:`xCAT policy Table </guides/admin-guides/references/man5/policy.5>` to see if the user is allowed to perform the requested operation. 
+User needs a username and password to access the REST API. When the REST API request is passed to xcatd, the username and password will be verified based on the :doc:`xCAT passwd Table </guides/admin-guides/references/man5/passwd.5>`, and then xcatd will look in the :doc:`xCAT policy Table </guides/admin-guides/references/man5/policy.5>` to see if the user is allowed to perform the requested operation.
 
-The account with key of **xcat** will be used for the REST API authentication. The username and password should be passed in as the attirbutes of URL: 
+The account with key of **xcat** will be used for the REST API authentication. The username and password should be passed in as the attirbutes of URL:
 
-* userName: Pass the username of the account 
+* userName: Pass the username of the account
 * userPW:   Pass the password of the account (xCAT 2.10)
 * password: Pass the password of the account (xCAT earlier than 2.10)
 
@@ -123,7 +123,7 @@ Create new user and setup the password and policy rules. ::
     # add user to policy table
     mkdef -t policy 6 name=<wsuser> rule=allow
 
-``Note:`` in the tabch command above you can put the salted password (from /etc/shadow) in the xCAT passwd table instead of the clear text password, if you prefer. 
+``Note:`` in the tabch command above you can put the salted password (from /etc/shadow) in the xCAT passwd table instead of the clear text password, if you prefer.
 
 Identical user with the same name and uid need to be created on each compute node. ::
 
@@ -136,7 +136,7 @@ Create the SSL certificate under that user's home directory so that user can be
 
     /opt/xcat/share/xcat/scripts/setup-local-client.sh <wsuser>
 
-When running this command you'll see SSL certificates created. Enter "y" where prompted and take the defaults. 
+When running this command you'll see SSL certificates created. Enter "y" where prompted and take the defaults.
 
 To enable the POST method of resources like nodeshell, nodecopy, updating and filesyncing for the non-root user, you need to enable the ssh communication between xCAT MN and CN without password. Log in as <username> and run following command: ::
 
@@ -150,9 +150,9 @@ or if you did not set up the certificate: ::
 
     curl -X GET -k 'https://<xcat-mn-host>/xcatws/nodes?userName=<wsuser>&userPW=<wspw>'
 
-You should see some output that includes your list of nodes. 
+You should see some output that includes your list of nodes.
 
 If errors returned, check `/var/log/httpd/ssl_error_log` on xCAT MN.
 
-``Note:`` if passwords need to be changed in the future, make sure to update the xCAT passwd table. xCAT REST API uses passwords stored in that table to authenticate users. 
+``Note:`` if passwords need to be changed in the future, make sure to update the xCAT passwd table. xCAT REST API uses passwords stored in that table to authenticate users.
 
diff --git a/docs/source/advanced/restapi/restapi_usage/restapi_usage.rst b/docs/source/advanced/restapi/restapi_usage/restapi_usage.rst
index 53490eb13..ecca3b8e8 100644
--- a/docs/source/advanced/restapi/restapi_usage/restapi_usage.rst
+++ b/docs/source/advanced/restapi/restapi_usage/restapi_usage.rst
@@ -58,7 +58,7 @@ Then in the subsequent REST API access, the token can be used to replace the use
 
     curl -X GET -k -H X-Auth-Token:5cabd675-bc2e-4318-b1d6-831fd1f32f97 'https://<FQDN of xCAT MN>/xcatws/<resource>?<parameters>
 
-The default validity of a token is 1 day. This default can be changed by the setting of `tokenexpiredays` attribute in `site` table. :: 
+The default validity of a token is 1 day. This default can be changed by the setting of `tokenexpiredays` attribute in `site` table. ::
 
     chdef -t site clustersite tokenexpiredays=<days>
 
diff --git a/docs/source/advanced/security/certs.rst b/docs/source/advanced/security/certs.rst
index f23fe1a83..ee6e98b01 100644
--- a/docs/source/advanced/security/certs.rst
+++ b/docs/source/advanced/security/certs.rst
@@ -10,47 +10,47 @@ The xCAT daemon on the management node and service node listens on a SSL socket
 
 xCAT creates 1 CA certificate and 2 credentials (private key and certificate pairs):
 
-   1. xCAT CA certificate(ca.pem): 
+   1. xCAT CA certificate(ca.pem):
 
       * a self-signed certificate used as Certificate Authority in xcatd SSL communication;
-      * generated by ``/opt/xcat/share/xcat/scripts/setup-xcat-ca.sh`` script on xCAT installation; 
+      * generated by ``/opt/xcat/share/xcat/scripts/setup-xcat-ca.sh`` script on xCAT installation;
       * will be generated (or updated) on xCAT management node when:
-         * install or update xCAT when "/etc/xcat/ca" directory does not exist 
-         * or run ``xcatconfig -f|--force`` 
+         * install or update xCAT when "/etc/xcat/ca" directory does not exist
+         * or run ``xcatconfig -f|--force``
          * or run ``xcatconfig -c|--credentials``
-      * files on management node: 
+      * files on management node:
          * ``/etc/xcat/ca/ca-cert.pem``
          * ``/etc/xcat/cert/ca.pem`` ,copied by ``/opt/xcat/share/xcat/scripts/setup-server-cert.sh``
          * ``/root/.xcat/ca.pem`` ,copied by ``/opt/xcat/share/xcat/scripts/setup-local-client.sh``
       * file on service node: ``/root/.xcat/ca.pem``
-      * distribution path: 
+      * distribution path:
         **/etc/xcat/cert/ca.pem (MN)** ===(run ``xcatconfig`` command)===> **/install/postscripts/_xcat/ca.pem (MN)** ===(node provision/updatenode)==> **/xcatpost/_xcat/ca.pem (SN and CN)** ==(run "servicenode" postscript)==> **/root/.xcat/ca.pem (SN)**
 
-   2. xCAT server credential(server-cred.pem): 
+   2. xCAT server credential(server-cred.pem):
 
       * a concatenation of server private key and certificate(signed with xCAT CA certificate)
       * generated by ``/opt/xcat/share/xcat/scripts/setup-server-cert.sh`` on xCAT installation;
       * will be generated (or updated) on xCAT management node when:
-         * install or update xCAT when ``/etc/xcat/cert`` directory does not exist 
-         * or run ``xcatconfig -f|--force`` 
+         * install or update xCAT when ``/etc/xcat/cert`` directory does not exist
+         * or run ``xcatconfig -f|--force``
          * or run ``xcatconfig -c|--credentials``
       * file on management node: ``/etc/xcat/cert/server-cred.pem``
-      * file on service node: ``/etc/xcat/cert/server-cred.pem`` 
-      * distribution path: 
+      * file on service node: ``/etc/xcat/cert/server-cred.pem``
+      * distribution path:
         **/etc/xcat/cert/server-cred.pem (MN)** ==(run ``xcatserver`` script called by ``servicenode`` postscript)===> **/etc/xcat/cert/server-cred.pem(SN)**
 
    3. xCAT client credential(client-cred.pem):
 
       * a concatenation of client private key and certificate (signed with xCAT CA certificate)
       * generated by ``/opt/xcat/share/xcat/scripts/setup-local-client.sh`` on xCAT installation
-      * will be generated (or updated) on xCAT management node when: 
-         * install or update xCAT when ``/root/.xcat/client-key.pem``  does not exist; 
-         * or run ``xcatconfig -f|--force`` 
+      * will be generated (or updated) on xCAT management node when:
+         * install or update xCAT when ``/root/.xcat/client-key.pem``  does not exist;
+         * or run ``xcatconfig -f|--force``
          * or run ``xcatconfig -c|--credentials``
       * file on management node: ``/root/.xcat/client-cred.pem``
-      * file on service node: ``/root/.xcat/client-cred.pem`` 
-      * distribution path: 
-        **/root/.xcat/client-cred.pem (MN)** ===(run ``xcatclient`` script called by ``servicenode`` postscript")===> **/root/.xcat/client-cred.pem(SN)** 
+      * file on service node: ``/root/.xcat/client-cred.pem``
+      * distribution path:
+        **/root/.xcat/client-cred.pem (MN)** ===(run ``xcatclient`` script called by ``servicenode`` postscript")===> **/root/.xcat/client-cred.pem(SN)**
 
 The usage of the credentials in the xCAT SSL communication is:
 
diff --git a/docs/source/advanced/security/security.rst b/docs/source/advanced/security/security.rst
index e47ca74e9..2d3e16fb4 100644
--- a/docs/source/advanced/security/security.rst
+++ b/docs/source/advanced/security/security.rst
@@ -12,7 +12,7 @@ The xCAT daemon uses SSL to only allow authorized users to run xCAT commands. Al
 Commands Access Control
 -----------------------
 
-Except SSL channel, xCAT only authorize root on the management node to run **xCAT** commands by default. But xCAT can be configured to allow both **non-root users** and **remote users** to run limited xCAT commands. For remote users, we mean the users who triggers the xCAT commands from other nodes and not have to login to the management node. xCAT uses the **policy** table to control who has authority to run specific xCAT commands. For a full explanation of the **policy** table, refer to :doc:`policy </guides/admin-guides/references/man5/policy.5>` man page. 
+Except SSL channel, xCAT only authorize root on the management node to run **xCAT** commands by default. But xCAT can be configured to allow both **non-root users** and **remote users** to run limited xCAT commands. For remote users, we mean the users who triggers the xCAT commands from other nodes and not have to login to the management node. xCAT uses the **policy** table to control who has authority to run specific xCAT commands. For a full explanation of the **policy** table, refer to :doc:`policy </guides/admin-guides/references/man5/policy.5>` man page.
 
 .. _granting_xcat_privileges:
 
@@ -40,17 +40,17 @@ CLI can also be used: ::
 **Note** Make sure the directories that contain the xCAT commands are in the user's ``$PATH``. If not, add them to ``$PATH`` as appropriate in your system. ::
 
     echo $PATH | grep xcat
-    /opt/xcat/bin:/opt/xcat/sbin: ....... 
+    /opt/xcat/bin:/opt/xcat/sbin: .......
 
 Extra Setup for Remote Commands
 ```````````````````````````````
 
 To give a user the ability to run remote commands (``xdsh``, ``xdcp``, ``psh``, ``pcp``) in some node, in addition to above steps, also need to run below steps:  ::
-  
+
     su - <username>
     xdsh <noderange> -K
 
-This will setup the user and root ssh keys for the user under the ``$HOME/.ssh`` directory of the user on the nodes. The root ssh keys are needed for the user to run the xCAT commands under the xcatd daemon, where the user will be running as root. **Note**: the uid and the password for the user on the management node, should match the uid and password on the managed nodes. 
+This will setup the user and root ssh keys for the user under the ``$HOME/.ssh`` directory of the user on the nodes. The root ssh keys are needed for the user to run the xCAT commands under the xcatd daemon, where the user will be running as root. **Note**: the uid and the password for the user on the management node, should match the uid and password on the managed nodes.
 
 
 Set Up Login Node (Remote Client)
@@ -67,25 +67,25 @@ Below are the steps of how to set up a login node.
   * :doc:`Configure xCAT Software Repository in RHEL</guides/install-guides/yum/configure_xcat>`
 
   * :ref:`Configure the Base OS Repository in SUSE <zypper_configure_the_base_os_repository>`
- 
+
   * :ref:`Configure the Base OS Repository in Ubuntu <apt_configure_the_base_os_repository>`
 
 
   Then install ``xCAT-client``.
 
   **[RHEL]** ::
-  
+
       yum install  xCAT-client
 
   **[SUSE]** ::
-      
+
       zypper install  xCAT-client
 
   **[Ubuntu]** ::
 
       apt-get install  xCAT-client
 
-2. Configure login node 
+2. Configure login node
 
   When running on the login node, the environment variable **XCATHOST** must be export to the name or address of the management node and the port for connections (usually 3001). ::
 
@@ -99,11 +99,11 @@ Below are the steps of how to set up a login node.
 
   The remote not-root user still needs to set up the credentials for communication with management node. By running the ``/opt/xcat/share/xcat/scripts/setup-local-client.sh <username>`` command as root in management node, the credentials are generated in <username>'s ``$HOME/.xcat`` directory in management node. These credential files must be copied to the <username>'s ``$HOME/.xcat`` directory on the login node.  **Note**: After ``scp``, in the login node, you must make sure the owner of the credentials is <username>.
 
-  Setup your ``policy`` table on the management node with the permissions that you would like the non-root id to have. 
+  Setup your ``policy`` table on the management node with the permissions that you would like the non-root id to have.
 
   At this time, the non-root id should be able to execute any commands that have been set in the ``policy`` table from the Login Node.
 
-  If any remote shell commands (psh,xdsh) are needed, then you need to follow `Extra Setup For Remote Commands`_. 
+  If any remote shell commands (psh,xdsh) are needed, then you need to follow `Extra Setup For Remote Commands`_.
 
 
 Auditing
@@ -122,7 +122,7 @@ xCAT logs all xCAT commands run by the xcatd daemon to both the syslog and the a
     args:	The command argument list.
     status:	Allowed or Denied.
     comments:	Any user-provided notes.
-    disable:	Do not use.  tabprune will not work if set to yes or 1 
+    disable:	Do not use.  tabprune will not work if set to yes or 1
 
 
 Password Management
@@ -130,7 +130,7 @@ Password Management
 
 xCAT is required to store passwords for various logons so that the application can login to the devices without having to prompt for a password. The issue is how to securely store these passwords.
 
-Currently xCAT stores passwords in ``passwd`` table. You can store them as plain text, you can also store them as MD5 ciphertext.  
+Currently xCAT stores passwords in ``passwd`` table. You can store them as plain text, you can also store them as MD5 ciphertext.
 
 Here is an example about how to store a MD5 encrypted password for root in ``passwd`` table.  ::
 
@@ -151,7 +151,7 @@ Nodes Inter-Access in The Cluster
 ---------------------------------
 
 
-xCAT performs the setup for root to be able to ssh without password from the Management Node(MN) to all the nodes in the cluster. All nodes are able to ssh to each other without password or being prompted for a ``known_host`` entry, unless restricted. Nodes cannot ssh back to the Management Node or Service Nodes without a password by default. 
+xCAT performs the setup for root to be able to ssh without password from the Management Node(MN) to all the nodes in the cluster. All nodes are able to ssh to each other without password or being prompted for a ``known_host`` entry, unless restricted. Nodes cannot ssh back to the Management Node or Service Nodes without a password by default.
 
 xCAT generates, on the MN, a new set of ssh hostkeys for the nodes to share, which are distributed to all the nodes during install. If ssh keys do not already exist for root on the MN, it will generate an id_rsa public and private key pair.
 
@@ -160,7 +160,7 @@ During node install, xCAT sends the ssh hostkeys to ``/etc/ssh`` on the node, th
 On the MN and the nodes, xCAT sets the ssh configuration file to ``strictHostKeyChecking no``, so that a ``known_host`` file does not have to be built in advanced. Each node can ssh to every other cluster node without being prompted for a password, and because they share the same ssh host keys there will be no prompting to add entries to ``known_hosts``.
 
 On the MN, you will be prompted to add entries to ``known_hosts`` file for each node once. See makeknownhosts command for a quick way to build a ``known_hosts`` file on the MN, if your nodes are defined in the xCAT database.
-   
+
 
 Restricting Node to Node SSH
 ````````````````````````````
@@ -169,7 +169,7 @@ By default, all nodes installed by one management node are able to ssh to each w
 
 This setting of site.sshbetweennodes will only enable root ssh between nodes of the compute1 and compute 2 groups and all service nodes. ::
 
-    "sshbetweennodes","compute1,compute2",, 
+    "sshbetweennodes","compute1,compute2",,
 
 
 Secure Zones
diff --git a/docs/source/advanced/security/ssl_config.rst b/docs/source/advanced/security/ssl_config.rst
index 3ea6f360b..58f01bc3a 100644
--- a/docs/source/advanced/security/ssl_config.rst
+++ b/docs/source/advanced/security/ssl_config.rst
@@ -3,7 +3,7 @@ OpenSSL Configuration
 
 xCAT does not ship OpenSSL RPMS nor does it statically link to any OpenSSL libraries.  Communication between the xCAT client and daemon utilizes OpenSSL and the administrator can configure SSL_version and SSL_cipher that should be used by xCAT daemons.
 
-The configuration is stored in the xCAT site table using the ``site.xcatsslversion`` and ``site.xcatsslciphers`` variables. 
+The configuration is stored in the xCAT site table using the ``site.xcatsslversion`` and ``site.xcatsslciphers`` variables.
 
 Configuration
 -------------
@@ -14,7 +14,7 @@ By default, xCAT ships with ``TLSv1`` configured.  The current highest SSL versi
 
     chtab key=xcatsslversion site.value=TLSv12
 
-* For ubuntu 14.x and higher: :: 
+* For ubuntu 14.x and higher: ::
 
     chtab key=xcatsslversion site.value=TLSv1_2
 
@@ -40,13 +40,13 @@ If any mistakes have been made and communiation is lost to xCAT, use ``XCATBYPAS
 Validation
 ----------
 
-Use the ``openssl`` command to validate the SSL configuration is valid and expected. 
+Use the ``openssl`` command to validate the SSL configuration is valid and expected.
 
-* To check whether TLSv1 is supported by xcatd: :: 
+* To check whether TLSv1 is supported by xcatd: ::
 
     openssl s_client -connect 127.0.0.1:3001 -tls1
 
-* To check if SSLv3 is disabled on ``xcatd``: :: 
+* To check if SSLv3 is disabled on ``xcatd``: ::
 
     openssl s_client -connect localhost:3001 -ssl3
 
diff --git a/docs/source/advanced/sysclone/sysclone.rst b/docs/source/advanced/sysclone/sysclone.rst
index 2f3dbe583..7e1fbebbe 100644
--- a/docs/source/advanced/sysclone/sysclone.rst
+++ b/docs/source/advanced/sysclone/sysclone.rst
@@ -1,7 +1,7 @@
 Using System Clone to Deploy Diskful Node
 =========================================
 
-When we want to deploy large numbers of nodes which have the same configuration, the simplest way is to clone. This means the user can customize and tweak one node's configuration according to his needs. They can verify it's proper operation, then make this node as template. They can capture an osimage from this template node, and deploy the rest of the nodes with this osimage quickly. xCat (2.8.2 and above) provides this feature which we call Sysclone to help you handle this scenario. 
+When we want to deploy large numbers of nodes which have the same configuration, the simplest way is to clone. This means the user can customize and tweak one node's configuration according to his needs. They can verify it's proper operation, then make this node as template. They can capture an osimage from this template node, and deploy the rest of the nodes with this osimage quickly. xCat (2.8.2 and above) provides this feature which we call Sysclone to help you handle this scenario.
 
 List of Supported Arch and OS
 -----------------------------
@@ -35,7 +35,7 @@ List of Supported Arch and OS
 Using Sysclone to Install Nodes
 -------------------------------
 
-This document describes how to install and configure a template node (called golden client), capture an image from this template node, then using this image to deploy other nodes (called target nodes) quickly. 
+This document describes how to install and configure a template node (called golden client), capture an image from this template node, then using this image to deploy other nodes (called target nodes) quickly.
 
 Prepare the xCAT Management Node for Support Sysclone
 `````````````````````````````````````````````````````
@@ -65,10 +65,10 @@ To support Sysclone, we need to install some extra rpms on management node and t
     Compilation failed in require at /usr/sbin/si_mkrsyncd_conf line 28.
     BEGIN failed--compilation aborted at /usr/sbin/si_mkrsyncd_conf line 28.
 
-3. Copy the xcat-dep-XXX.tar.bz2 file to directory ``/install/post/otherpkgs/<os>/<arch>/xcat/`` of the management node according your golden client's OS version and system architecture, then decompress it: 
+3. Copy the xcat-dep-XXX.tar.bz2 file to directory ``/install/post/otherpkgs/<os>/<arch>/xcat/`` of the management node according your golden client's OS version and system architecture, then decompress it:
 
 * **[CentOS6.3 and x86_64]**::
-    
+
     mkdir -p /install/post/otherpkgs/CentOS6.3/x86_64/xcat
     cp xcat-dep-*.tar.bz2  /install/post/otherpkgs/CentOS6.3/x86_64/xcat
     cd /install/post/otherpkgs/CentOS6.3/x86_64/xcat
@@ -82,7 +82,7 @@ To support Sysclone, we need to install some extra rpms on management node and t
     tar jxvf xcat-dep-*.tar.bz2
 
 * **[RHEL6.4 and ppc64]**::
-    
+
     mkdir -p /install/post/otherpkgs/rhels6.4/ppc64/xcat
     cp xcat-dep-*.tar.bz2  /install/post/otherpkgs/rhels6.4/ppc64/xcat
     cd /install/post/otherpkgs/rhels6.4/ppc64/xcat
@@ -95,7 +95,7 @@ The Golden Client acts as a regular node for xCAT, it just has some extra rpms t
 
 For information of how to install a regular node, refer to section :ref:`Diskful Installation <diskful_installation>`
 
-To support clone, add 'otherpkglist' and 'otherpkgdir' attributes to the image definition which will be used to deploy golden client, then deploy golden client as normal. Once deployed, the golden client will have extra rpms to support cloning. If you have deployed your golden client already, use **updatenode** command to push these extra rpms to golden client. CentOS shares the same pkglist file with RHEL. For example: 
+To support clone, add 'otherpkglist' and 'otherpkgdir' attributes to the image definition which will be used to deploy golden client, then deploy golden client as normal. Once deployed, the golden client will have extra rpms to support cloning. If you have deployed your golden client already, use **updatenode** command to push these extra rpms to golden client. CentOS shares the same pkglist file with RHEL. For example:
 
 * **[RH6.4 and x86_64]**::
 
@@ -110,7 +110,7 @@ To support clone, add 'otherpkglist' and 'otherpkgdir' attributes to the image d
     updatenode <golden-cilent> -S
 
 * **[SLES11.3 and x86_64]**::
- 
+
     chdef -t osimage -o <osimage-name> otherpkglist=/opt/xcat/share/xcat/install/sles/sysclone.sles11.x86_64.otherpkgs.pkglist
     chdef -t osimage -o <osimage-name> -p otherpkgdir=/install/post/otherpkgs/SLES11.3/x86_64
     updatenode <golden-cilent> -S
@@ -126,7 +126,7 @@ To support clone, add 'otherpkglist' and 'otherpkgdir' attributes to the image d
 Capture Image from Golden Client
 ````````````````````````````````
 
-On Management node, use xCAT command **imgcapture** to capture an image from the golden-client.:: 
+On Management node, use xCAT command **imgcapture** to capture an image from the golden-client.::
 
     imgcapture <golden-client> -t sysclone -o <mycomputeimage>
 
@@ -212,7 +212,7 @@ If you install systemimager RPMs on CentOS 6.5 node using **yum**, you may exper
 * **On golden client**::
 
     [root@CentOS6.5 node]# cd /<savepath>
-    [root@CentOS6.5 node]# rpm -ivh perl-AppConfig-1.52-4.noarch.rpm 
+    [root@CentOS6.5 node]# rpm -ivh perl-AppConfig-1.52-4.noarch.rpm
     [root@CentOS6.5 node]# rpm -ivh systemconfigurator-2.2.11-1.noarch.rpm
     [root@CentOS6.5 node]# rpm -ivh systemimager-common-4.3.0-0.1.noarch.rpm
     [root@CentOS6.5 node]# rpm -ivh systemimager-client-4.3.0-0.1.noarch.rpm
@@ -220,4 +220,4 @@ If you install systemimager RPMs on CentOS 6.5 node using **yum**, you may exper
 Kernel panic at times when install target node with rhels7.0 in Power 7 server
 ``````````````````````````````````````````````````````````````````````````````
 
-When you clone rhels7.0 image to target node which is Power 7 server lpar, you may hit Kernel panic problem at times after boot loader grub2 download kernel and initrd. This is an known issue but without a resolution. For now, we recommend you try again. 
+When you clone rhels7.0 image to target node which is Power 7 server lpar, you may hit Kernel panic problem at times after boot loader grub2 download kernel and initrd. This is an known issue but without a resolution. For now, we recommend you try again.
diff --git a/docs/source/advanced/xcat-inventory/define_create_cluster.rst b/docs/source/advanced/xcat-inventory/define_create_cluster.rst
index 9a2dce023..f7cfb43dc 100644
--- a/docs/source/advanced/xcat-inventory/define_create_cluster.rst
+++ b/docs/source/advanced/xcat-inventory/define_create_cluster.rst
@@ -5,8 +5,8 @@ The inventory templates for 2 kinds of typical xCAT cluster is shipped. You can
 
 Currently, the inventory templates includes:
 
-1. flat_cluster_template.yaml:  
-   
+1. flat_cluster_template.yaml:
+
    a flat baremetal cluster, including **openbmc controlled PowerLE servers**, **IPMI controlled Power servers(commented out)**, **X86_64 servers(commented out)**
 
 2. flat_kvm_cluster_template.yaml: a flat KVM based Virtual Machine cluster, including **PowerKVM based VM nodes**, **KVM based X86_64 VM nodes(commented out)**
@@ -14,15 +14,15 @@ Currently, the inventory templates includes:
 The steps to create your first xCAT cluster is:
 
 1. create a customized cluster inventory file "mycluster.yaml" based on ``flat_cluster_template.yaml`` ::
-   
+
     cp /opt/xcat/share/xcat/inventory_templates/flat_cluster_template.yaml /git/cluster/mycluster.yaml
 
 2. custmize the cluster inventory file "mycluster.yaml" by modifying the attributs in the line under token ``#CHANGEME`` according to the setup of your phisical cluster. You can create new node definition by duplicating and modifying the node definition in the template.
 
 3. import the cluster inventory file ::
-   
+
     xcat-inventory import -f /git/cluster/mycluster.yaml
-   
-Now you have your 1st xCAT cluster, you can start bring up the cluster by provision nodes.      
+
+Now you have your 1st xCAT cluster, you can start bring up the cluster by provision nodes.
 
 
diff --git a/docs/source/advanced/xcat-inventory/index.rst b/docs/source/advanced/xcat-inventory/index.rst
index 5c7c4829b..46ed319e6 100644
--- a/docs/source/advanced/xcat-inventory/index.rst
+++ b/docs/source/advanced/xcat-inventory/index.rst
@@ -12,10 +12,10 @@ xcat-inventory
 * ability to intergrate with Ansible(Comming Soon)
 
 
-This section presents 2 typical user case of ``xcat-inventory`` 
+This section presents 2 typical user case of ``xcat-inventory``
 
 .. toctree::
    :maxdepth: 2
 
    version_control_inventory.rst
-   define_create_cluster.rst 
+   define_create_cluster.rst
diff --git a/docs/source/advanced/xcat-inventory/version_control_inventory.rst b/docs/source/advanced/xcat-inventory/version_control_inventory.rst
index adc311e01..3669dc103 100644
--- a/docs/source/advanced/xcat-inventory/version_control_inventory.rst
+++ b/docs/source/advanced/xcat-inventory/version_control_inventory.rst
@@ -1,7 +1,7 @@
 Manage the xCAT Cluster Definition under Source Control
 =======================================================
 
-The xCAT cluster inventory data, including global configuration and object definitions(node/osimage/passwd/policy/network/router), and the relationship of the objects, can be exported to a YAML/JSON file(**inventory file**) from xCAT Database, or be imported to xCAT Database from the inventory file. 
+The xCAT cluster inventory data, including global configuration and object definitions(node/osimage/passwd/policy/network/router), and the relationship of the objects, can be exported to a YAML/JSON file(**inventory file**) from xCAT Database, or be imported to xCAT Database from the inventory file.
 
 By managing the inventory file under source control system, you can manage the xCAT cluster definition under source control. This section presents a typical step-by-step scenario on how to manage cluster inventory data under ``git``.
 
@@ -30,11 +30,11 @@ By managing the inventory file under source control system, you can manage the x
     xcat-inventory export --format=yaml >/git/cluster/mycluster.yaml
     cd /git/cluster
     git diff
-    git add xcat-inventory export --format=yaml >/git/cluster/mycluster.yaml
+    git add /git/cluster/mycluster.yaml
     git commit /git/cluster/mycluster.yaml -m "$(date "+%Y_%m_%d_%H_%M_%S"): replaced bad nodes; turn on xcatdebugmode; blah-blah"
 
 6. ordinary cluster maintenance and operation, some issues are founded in current cluster, need to restore the current cluster configuration to commit no c95673 [1]_ ::
-   
+
     cd /git/cluster
     git checkout c95673
     xcat-inventory import -f /git/cluster/mycluster.yaml
@@ -43,7 +43,7 @@ By managing the inventory file under source control system, you can manage the x
 
 1. The cluster inventory data exported by ``xcat-inventory`` does not include intermidiate data, transiate data and historical data in xCAT DataBase, such as node status, auditlog table
 
-2.  We suggest you backup your xCAT database by ``dumpxCATdb`` before your trial on this feature, although we have run sufficient test on this 
+2.  We suggest you backup your xCAT database by ``dumpxCATdb`` before your trial on this feature, although we have run sufficient test on this
 
 .. [1] When you import the inventory data to xCAT Database in step 6, there are 2 modes: ``clean mode`` and ``update mode``. If you choose the ``clean mode`` by ``xcat-inventory import -c|--clean``, all the objects definitions that are not included in the inventory file will be removed; Otherwise, only the objects included in the inventory file will be updated or inserted. Please choose the proper mode according to your need
 
diff --git a/docs/source/advanced/zones/change_zones.rst b/docs/source/advanced/zones/change_zones.rst
index 3814c3b4b..bd9c6d437 100644
--- a/docs/source/advanced/zones/change_zones.rst
+++ b/docs/source/advanced/zones/change_zones.rst
@@ -28,7 +28,7 @@ The following command will change zone1 such that root cannot ssh between the no
        sshbetweennodes=no
        sshkeydir=/etc/xcat/sshkeys/zone1/.ssh
 
-The following command will change zone1 to the default zone. 
+The following command will change zone1 to the default zone.
 
 **Note**: you must use the ``-f`` flag to force the change. There can only be one default zone in the ``zone`` table. ::
 
diff --git a/docs/source/advanced/zones/index.rst b/docs/source/advanced/zones/index.rst
index 20a65445f..d0f552dc7 100644
--- a/docs/source/advanced/zones/index.rst
+++ b/docs/source/advanced/zones/index.rst
@@ -8,4 +8,4 @@ Zones
    configure_zones.rst
    create_zones.rst
    change_zones.rst
-   remove_zones.rst 
+   remove_zones.rst
diff --git a/docs/source/advanced/zones/overview.rst b/docs/source/advanced/zones/overview.rst
index 73fa5b1bc..bae5dba44 100644
--- a/docs/source/advanced/zones/overview.rst
+++ b/docs/source/advanced/zones/overview.rst
@@ -1,7 +1,7 @@
 Overview
 ========
 
-XCAT supports the concept of zones within a single xCAT cluster managed by one Management Node.  The nodes in the cluster can be divided up into multiple zones that have different ssh keys managed separately. 
+XCAT supports the concept of zones within a single xCAT cluster managed by one Management Node.  The nodes in the cluster can be divided up into multiple zones that have different ssh keys managed separately.
 
 Each defined zone has it own root's ssh RSA keys, so that any node can ssh without a password to any other node in the same zone,  cannot ssh without being prompted for a password to nodes in another zone.
 
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 834fc0065..4402d6d7f 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -59,7 +59,7 @@ author = u'IBM Corporation'
 # The short X.Y version.
 version = '2'
 # The full version, including alpha/beta/rc tags.
-release = '2.14.2'
+release = '2.14.3'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -80,7 +80,7 @@ language = None
 # Adding a pattern or a file on this list will still make file available in the documentation,
 # but will eliminate the warning message "document isn't included in any toctree"
 # However, some files that generate such warning contain labels being referred to from other files,
-# if put on the exclude_patters list, such labels are not visible. The commented out files in the 
+# if put on the exclude_patters list, such labels are not visible. The commented out files in the
 # exclude_patters list below, are such files. They generate a warning, but contain reference labels.
 exclude_patterns = ['guides/install-guides/common_sections.rst',
                     '**manage_clusters/common/deployment/*.rst',
diff --git a/docs/source/developers/github/change_code.rst b/docs/source/developers/github/change_code.rst
index e62064a32..dc7e5f807 100644
--- a/docs/source/developers/github/change_code.rst
+++ b/docs/source/developers/github/change_code.rst
@@ -14,12 +14,12 @@ Checkout and switch to the branch using ``git checkout -b`` ::
 Changing the code
 -----------------
 
-Now you are ready to make changes related to your function in this branch 
+Now you are ready to make changes related to your function in this branch
 
 Multiple Remote Branches
 ^^^^^^^^^^^^^^^^^^^^^^^^
 
-It may take days before your pull request is properly reviewed and you want to keep changes out of that branch so in the event that you are asked to fix something, you can push directly to the branch with the active pull request.  
+It may take days before your pull request is properly reviewed and you want to keep changes out of that branch so in the event that you are asked to fix something, you can push directly to the branch with the active pull request.
 
 Creating additional branches will allow you to work on different tasks/enhancements at the same time.  You can easily manage your working changes between branches with ``git stash.``.
 
@@ -31,7 +31,7 @@ Once your code is ready....
 
 #. Commit the code to your local branch: ::
 
-        $ git add <files> 
+        $ git add <files>
         $ git commit | git commit -m "<comments>"
 
 #. Push the changes to your remote branch: ::
diff --git a/docs/source/developers/github/create_branches.rst b/docs/source/developers/github/create_branches.rst
index 48227ea9a..a69093e8e 100644
--- a/docs/source/developers/github/create_branches.rst
+++ b/docs/source/developers/github/create_branches.rst
@@ -6,14 +6,14 @@ Creating Branches
 Local Branches
 --------------
 
-Git branches are very light weight and easy to create.  Simply use the ``git branch <branch_name>`` command. 
+Git branches are very light weight and easy to create.  Simply use the ``git branch <branch_name>`` command.
 
 Since we are using pull requests to merge changes back to the upstream project, you will need to have your changes committed to a branch on GitHub (calling this a "remote branch") so that GitHub can detect differences and pull requests can be created.
 
 Remote Branches
 ---------------
 
-Reference articles: 
+Reference articles:
 * http://www.gitguys.com/topics/adding-and-removing-remote-branches/
 
 
@@ -31,7 +31,7 @@ From GitHub
 * Since we created the branch from the UI, a refresh needs to be done in order to see the new branch.  Refresh by fetching from the origin repository: ::
 
         $ git fetch origin
-        Enter passphrase for key '/home/vhu/.ssh/github/id_rsa': 
+        Enter passphrase for key '/home/vhu/.ssh/github/id_rsa':
         From github.com:whowutwut/xcat-doc
          * [new branch]      DOC_MERGE  -> origin/DOC_MERGE
 
@@ -54,25 +54,25 @@ From Command Line (CLI)
       $ git branch
       * master
 
-      $ git branch skeleton 
+      $ git branch skeleton
 
-      $ git branch 
+      $ git branch
       * master
         skeleton
 
 * Push the newly created branch to origin (on GitHub): ::
 
-      $ git push origin skeleton 
-      Enter passphrase for key '/home/vhu/.ssh/github/id_rsa': 
+      $ git push origin skeleton
+      Enter passphrase for key '/home/vhu/.ssh/github/id_rsa':
       Total 0 (delta 0), reused 0 (delta 0)
       To git@github.com:whowutwut/xcat-doc.git
        * [new branch]      skeleton -> skeleton
 
-  Verify that the branch is there by looking at the remote branches: :: 
+  Verify that the branch is there by looking at the remote branches: ::
 
       $ git branch -r
         origin/HEAD -> origin/master
         origin/master
-        origin/skeleton   <=== HERE IT IS 
+        origin/skeleton   <=== HERE IT IS
         upstream/master
 
diff --git a/docs/source/developers/github/delete_branches.rst b/docs/source/developers/github/delete_branches.rst
index c4eae7218..4c9872117 100644
--- a/docs/source/developers/github/delete_branches.rst
+++ b/docs/source/developers/github/delete_branches.rst
@@ -12,7 +12,7 @@ Switch off the branch that you want to delete. Most of the time, switching to ma
 Delete the remote branch off GitHub: ::
 
         $ git push origin --delete mybranch
-        Enter passphrase for key '/home/vhu/.ssh/github/id_rsa': 
+        Enter passphrase for key '/home/vhu/.ssh/github/id_rsa':
         To git@github.com:whowutwut/xcat-doc.git
          - [deleted]         mybranch
 
@@ -32,4 +32,4 @@ Sync up GitHub and Local Machine
 
 There are times when you delete the branch off your local machine or from GitHub and it's become out of sync, you sync up the list, run the following: ::
 
-        git remote prune origin 
+        git remote prune origin
diff --git a/docs/source/developers/github/forks.rst b/docs/source/developers/github/forks.rst
index 2807e4009..f8bc90987 100644
--- a/docs/source/developers/github/forks.rst
+++ b/docs/source/developers/github/forks.rst
@@ -3,9 +3,9 @@ Fork a repository
 
 Forking a repository is taking a copy of a GitHub repository and associating it to your own account space so you can make changes to the code base.  Since you own this copy, you will have fetch/push access to the repository.
 
-We will first create a fork on the xcat2/xcat-core project so that we can work on functions without affecting the mainline (or *upstream*) code.  Additionally, by creating a fork, you are able to generate *pull request* so that the changes can be easily seen and reviewed by other community members. 
+We will first create a fork on the xcat2/xcat-core project so that we can work on functions without affecting the mainline (or *upstream*) code.  Additionally, by creating a fork, you are able to generate *pull request* so that the changes can be easily seen and reviewed by other community members.
 
-* In GitHub UI, find a project that you want to fork and click on the "Fork" icon.  
+* In GitHub UI, find a project that you want to fork and click on the "Fork" icon.
 
   .. image:: github-fork.png
 
@@ -15,13 +15,13 @@ We will first create a fork on the xcat2/xcat-core project so that we can work o
 
   ``<userid>/xcat-core`` <-- forked copy
 
-  ``xcat2/xcat-core``     <-- upstream 
+  ``xcat2/xcat-core``     <-- upstream
 
 
 Clone the forked repository
 ===========================
 
-* On your development machine, clone the forked repository from **your** account: 
+* On your development machine, clone the forked repository from **your** account:
 
   **Note:** Ensure the clone is from *<userid>/xcat-core* and **not** *xcat2/xcat-core* ::
 
@@ -29,7 +29,7 @@ Clone the forked repository
 
   This now becomes the origin remote repository: ::
 
-      $ git remote -v 
+      $ git remote -v
       origin  git@github.com:<userid>/xcat-core.git (fetch)
       origin  git@github.com:<userid>/xcat-core.git (push)
 
@@ -43,7 +43,7 @@ Configure an ``upstream`` repository
 
   View the configured repositories: ::
 
-      $ git remote -v 
+      $ git remote -v
       origin  git@github.com:<userid>/xcat-core.git (fetch)
       origin  git@github.com:<userid>/xcat-core.git (push)
       upstream        git@github.com:xcat2/xcat-core.git (fetch)
diff --git a/docs/source/developers/github/index.rst b/docs/source/developers/github/index.rst
index 6e059b700..d4d6885b7 100644
--- a/docs/source/developers/github/index.rst
+++ b/docs/source/developers/github/index.rst
@@ -2,9 +2,9 @@
 GitHub
 ======
 
-Developers are encouraged to fork the `xcat2 <https://github.com/xcat2>`_ repositories, make changes, and submit pull requests.  This mechanism allows for better collaboration and gives the community a chance to review and provide feedback before the code is pulled into the product. 
+Developers are encouraged to fork the `xcat2 <https://github.com/xcat2>`_ repositories, make changes, and submit pull requests.  This mechanism allows for better collaboration and gives the community a chance to review and provide feedback before the code is pulled into the product.
 
-GitHub provides excellent documentation on `Collaborating <https://help.github.com/categories/collaborating/>`_ and the following is only provided as a quick reference. 
+GitHub provides excellent documentation on `Collaborating <https://help.github.com/categories/collaborating/>`_ and the following is only provided as a quick reference.
 
 Getting Started
 ---------------
@@ -12,7 +12,7 @@ Getting Started
 .. toctree::
    :maxdepth: 2
 
-   forks.rst 
+   forks.rst
 
 
 Changing Code and Pull Requests
@@ -21,9 +21,9 @@ Changing Code and Pull Requests
 .. toctree::
    :maxdepth: 2
 
-   syncing_forks.rst 
-   create_branches.rst 
-   change_code.rst 
+   syncing_forks.rst
+   create_branches.rst
+   change_code.rst
    pull_request.rst
    delete_branches.rst
 
diff --git a/docs/source/developers/github/pull_request.rst b/docs/source/developers/github/pull_request.rst
index 80593db5e..3ebf532ba 100644
--- a/docs/source/developers/github/pull_request.rst
+++ b/docs/source/developers/github/pull_request.rst
@@ -4,7 +4,7 @@ Pull Requests
 Creating Pull Requests
 ----------------------
 
-Once your changes are ready to be submitted to the xcat team, the easiest way to generate a pull request is from the GitHub UI. 
+Once your changes are ready to be submitted to the xcat team, the easiest way to generate a pull request is from the GitHub UI.
 
 #. Under your project, click on the "branches" link
 
@@ -65,19 +65,19 @@ During the reviewing of your pull request, another pull request may be merged wh
 
     $ git push origin <mybranch> -f
 
-If all the conflicts are resolved, the pull request should automatically turn green again and is able to be merged automatically. 
+If all the conflicts are resolved, the pull request should automatically turn green again and is able to be merged automatically.
 
 Reviewing Pull Requests as a Maintainer
 ---------------------------------------
 
-When you are looking over a pull request, you can merge the changes into your own temporary branch to give the code or changes a try before merging into the parent project. 
+When you are looking over a pull request, you can merge the changes into your own temporary branch to give the code or changes a try before merging into the parent project.
 
-#. From the merge request, click on the ``command line instructions`` link: 
+#. From the merge request, click on the ``command line instructions`` link:
 
    .. image:: github-merge_command_line.png
 
-#. Then under **Step 1:**, there are instruction for creating a temp branch and pulling the changes from the pull request: 
+#. Then under **Step 1:**, there are instruction for creating a temp branch and pulling the changes from the pull request:
 
-   .. image:: github-merge_step1.png 
+   .. image:: github-merge_step1.png
 
 
diff --git a/docs/source/developers/github/syncing_forks.rst b/docs/source/developers/github/syncing_forks.rst
index 20b01fa98..364956f1c 100644
--- a/docs/source/developers/github/syncing_forks.rst
+++ b/docs/source/developers/github/syncing_forks.rst
@@ -8,7 +8,7 @@ Before the Syncing
 
 References: https://help.github.com/articles/syncing-a-fork/
 
-From time to time, your master branch will start to **fall behind** the upstream/master because changes are being pulled into the ``xcat2/xcat-core`` project from other developers. 
+From time to time, your master branch will start to **fall behind** the upstream/master because changes are being pulled into the ``xcat2/xcat-core`` project from other developers.
 
 .. image:: github-behind_master.png
 
@@ -58,7 +58,7 @@ After the Syncing
 
 Your fork master branch should now be **even** with ``xcat2/xcat-core``
 
-.. image:: github-even_with_master.png 
+.. image:: github-even_with_master.png
 
 
 Unstashing work (optional)
diff --git a/docs/source/developers/guides/code/builds.rst b/docs/source/developers/guides/code/builds.rst
index 28aba3d02..8ffb9eef9 100644
--- a/docs/source/developers/guides/code/builds.rst
+++ b/docs/source/developers/guides/code/builds.rst
@@ -7,12 +7,12 @@ xcat-core
 Clone the xCAT project from `GitHub <https://github.com/xcat2/xcat-core>`_::
 
     cd xcat-core
-    ./buildcore.sh 
+    ./buildcore.sh
 
 xcat-deps
 ---------
 
-The ``xcat-deps`` package is currently owned and maintained by the core development on our internal servers. Use the packages created at: http://xcat.org/download.html#xcat-dep 
+The ``xcat-deps`` package is currently owned and maintained by the core development on our internal servers. Use the packages created at: http://xcat.org/download.html#xcat-dep
 
 
 man pages
@@ -20,7 +20,7 @@ man pages
 
 The xCAT man pages are written in Perl POD files and automatically get built into the xCAT rpms.  The content in the .pod files are always the master.
 
-In the past, the man pages were converted into html files and uploaded to SourceForge.  In moving to `ReadTheDocs <http://xcat-docs.readthedocs.org>`_ we want to also provide the man pages as references in the documentation.  To convert the ``pods`` to ``rst``, we are using The Perl module: `pod2rst <http://search.cpan.org/~dowens/Pod-POM-View-Restructured-0.02/bin/pod2rst>`_.  
+In the past, the man pages were converted into html files and uploaded to SourceForge.  In moving to `ReadTheDocs <http://xcat-docs.readthedocs.org>`_ we want to also provide the man pages as references in the documentation.  To convert the ``pods`` to ``rst``, we are using The Perl module: `pod2rst <http://search.cpan.org/~dowens/Pod-POM-View-Restructured-0.02/bin/pod2rst>`_.
 
 The following steps will help configure ``pod2rst`` and be able to generate the changes .rst files to push to GitHub.
 
@@ -32,25 +32,25 @@ The following steps will help configure ``pod2rst`` and be able to generate the
 #. For each of the above Perl modules:
 
     * **[as root]** Extract and build the Perl module ::
-    
+
         perl Makefile.PL
         make
         make install
-    
+
     * **[as non-root]** Extract and build the Perl module using PREFIX to specify a directory that you have write permission ::
-    
+
         mkdir ~/perllib
         perl Makefile.PL PREFIX=~/perllib
         make
         make install
-    
+
 #. Execute the script ``create_man_pages.py`` to generate the .rst files into ``xcat-core/docs`` :
 
     * **[as root]** ::
- 
+
         cd xcat-core
         ./create_man_pages.py
- 
+
     * **[as non root]** ::
 
         cd xcat-core
diff --git a/docs/source/developers/guides/code/code_standard.rst b/docs/source/developers/guides/code/code_standard.rst
index c4a896a0e..ccab7f79a 100644
--- a/docs/source/developers/guides/code/code_standard.rst
+++ b/docs/source/developers/guides/code/code_standard.rst
@@ -20,7 +20,7 @@ How to install ``perltidy`` tool:
 * **[RHEL]** ::
 
     yum install perltidy.noarch
-    
+
 * **[UBUNTU]** ::
 
     apt-get install perltidy
@@ -31,15 +31,15 @@ Code Standard Example:
 ::
 
     #! /usr/bin/perl
-    
+
     # This is a perl program example to demo the recommended
     # style to write perl code
-    
+
     use strict;
     use warnings;
-    
+
     #--------------------------------------------------------------------------------
-    
+
     =head3   subroutine_example
         Descriptions:
             This a subroutine to demo how to write perl code
@@ -51,46 +51,46 @@ Code Standard Example:
             0 - success
             0 - fail
     =cut
-    
+
     #--------------------------------------------------------------------------------
     sub subroutine_example {
         my ($param1, $param2, $param3) = @_;
-    
+
         print "In the subroutine subroutine_example.\n";
-    
+
         return 0;
     }
-    
-    
+
+
     # Declare variables
     my $a_local_scale;
     my @a_local_array;
     my %a_local_hash;
-    
+
     $a_local_scale = 1;
-    
+
     @a_local_array = ("a", "b", "c");
-    
+
     %a_local_hash = (
         "v1" => 1,
         "v2" => 2,
         "v3" => 3,
     );
-    
+
     # Demo how to check the key of hash
     if (%a_local_hash and
         defined($a_local_hash{v1}) and
         defined($a_local_hash{v2}) and
         defined($a_local_hash{v3})) {
-    
+
         # Calculate the sum of values
         my $sum_of_values = $a_local_hash{v1}
           + $a_local_hash{v2}
           + $a_local_hash{v3};
-    
+
         print "The sum of values: $sum_of_values.\n";
     }
-    
+
     # Demo how to check whether the array is empty
     if (@a_local_array) {
         print "Has element in array: " . join(',', @a_local_array) . "\n";
@@ -102,8 +102,8 @@ Code Standard Example:
         # None of above
         print "Get into the default path.\n";
     }
-    
+
     # Call the subroutine subroutine_example()
     subroutine_example($a_local_scale, \@a_local_array, %a_local_hash);
-    
+
     exit 0;
diff --git a/docs/source/developers/guides/code/index.rst b/docs/source/developers/guides/code/index.rst
index cfd9d43ad..f98b47657 100644
--- a/docs/source/developers/guides/code/index.rst
+++ b/docs/source/developers/guides/code/index.rst
@@ -4,7 +4,7 @@ Code Development
 .. toctree::
    :maxdepth: 2
 
-   code_standard.rst 
-   builds.rst  
+   code_standard.rst
+   builds.rst
    debug.rst
    tips.rst
diff --git a/docs/source/developers/guides/docs/doc_guidelines.rst b/docs/source/developers/guides/docs/doc_guidelines.rst
index 4e13e7b1c..ce121d4f5 100644
--- a/docs/source/developers/guides/docs/doc_guidelines.rst
+++ b/docs/source/developers/guides/docs/doc_guidelines.rst
@@ -12,13 +12,13 @@ xCAT doc page may have 4 levels of title at most: ::
 
     The First Title
     ===============
-    
+
     The Second Title
     ----------------
-    
+
     The Third Title
     ```````````````
-    
+
     The Forth Title
     '''''''''''''''
 
@@ -131,9 +131,9 @@ Add links to refer other web page  is a very common way in writing document, it'
 
     :doc:`support list <../overview/support_list>`
 
-.. 
+..
 
-  ``Usage:`` When you want to link to another whole page but don't want to make a ``Customized Link Target`` in that source page, you can use the file path to link it directly. 
+  ``Usage:`` When you want to link to another whole page but don't want to make a ``Customized Link Target`` in that source page, you can use the file path to link it directly.
 
 * **Add an External Link**
 
@@ -223,16 +223,16 @@ Add a Table
 
 Add a table in the doc:
 
-+------------+------------+-----------+ 
-| Header 1   | Header 2   | Header 3  | 
-+============+============+===========+ 
-| body row 1 | column 2   | column 3  | 
-+------------+------------+-----------+ 
-| body row 2 | Cells may span columns.| 
-+------------+------------+-----------+ 
-| body row 3 | Cells may  | - Cells   | 
-+------------+ span rows. | - contain | 
-| body row 4 |            | - blocks. | 
++------------+------------+-----------+
+| Header 1   | Header 2   | Header 3  |
++============+============+===========+
+| body row 1 | column 2   | column 3  |
++------------+------------+-----------+
+| body row 2 | Cells may span columns.|
++------------+------------+-----------+
+| body row 3 | Cells may  | - Cells   |
++------------+ span rows. | - contain |
+| body row 4 |            | - blocks. |
 +------------+------------+-----------+
 
 ::
diff --git a/docs/source/developers/guides/index.rst b/docs/source/developers/guides/index.rst
index a30897263..dc6b8dd95 100644
--- a/docs/source/developers/guides/index.rst
+++ b/docs/source/developers/guides/index.rst
@@ -3,6 +3,6 @@ Guides
 
 .. toctree::
    :maxdepth: 2
-   
+
    docs/index.rst
    code/index.rst
diff --git a/docs/source/developers/license/contributors.rst b/docs/source/developers/license/contributors.rst
index de0d03c45..363e98fcc 100644
--- a/docs/source/developers/license/contributors.rst
+++ b/docs/source/developers/license/contributors.rst
@@ -2,7 +2,7 @@ Contributors
 ------------
 
 * Sign our Contributor License Agreement (CLA).  You can find the :download:`CLA here <xcat-project-individual-cla.pdf>`
- 
+
 * If you are contributing on behalf of your employer, we'll need a signed copy of our Corporate Contributor License Agreement (CCLA).  You can find the :download:`CCLA here <xcat-project-corporate-ccla.pdf>`.
 
 * Fork the repo, make your changes, and open pull requests!
diff --git a/docs/source/developers/license/index.rst b/docs/source/developers/license/index.rst
index 3725a1d9c..1d8189255 100644
--- a/docs/source/developers/license/index.rst
+++ b/docs/source/developers/license/index.rst
@@ -1,15 +1,15 @@
 Contributor and Maintainer Agreements
 =====================================
 
-We welcome developers willing to contribute to the xCAT project to help make it better. 
+We welcome developers willing to contribute to the xCAT project to help make it better.
 
-Follow the guidelines below. 
+Follow the guidelines below.
 
 .. toctree::
    :maxdepth: 1
 
    contributors.rst
-   maintainers.rst 
+   maintainers.rst
 
 xCAT is licensed under the `Eclipse Public License <http://www.opensource.org/licenses/eclipse-1.0.php>`_.
 
diff --git a/docs/source/developers/license/maintainers.rst b/docs/source/developers/license/maintainers.rst
index 379ed919f..89c987624 100644
--- a/docs/source/developers/license/maintainers.rst
+++ b/docs/source/developers/license/maintainers.rst
@@ -7,7 +7,7 @@ If you are an experienced xCAT user and plan to contribute to the xCAT code regu
 
 * Additional information can be found in our :ref:`maintainers guide <xcat-maintainer-guide-label>` below:
 
-.. _xcat-maintainer-guide-label: 
+.. _xcat-maintainer-guide-label:
 
 Maintainers Guide
 -----------------
diff --git a/docs/source/developers/license/xcat_corporate_contributor_license_agreement.rst b/docs/source/developers/license/xcat_corporate_contributor_license_agreement.rst
index 2e0ec40c6..b1790d4f6 100644
--- a/docs/source/developers/license/xcat_corporate_contributor_license_agreement.rst
+++ b/docs/source/developers/license/xcat_corporate_contributor_license_agreement.rst
@@ -3,9 +3,9 @@
 The xCAT Community Software Grant and Corporate Contributor License Agreement ("Agreement")
 -------------------------------------------------------------------------------------------
 
-In order to clarify the intellectual property license granted with Contributions from any person or entity made for the benefit of the xCAT Community, a Contributor License Agreement (CLA) must be on file that has been signed by each Contributor, indicating agreement to the license terms below. This license is for your protection as a Contributor as well as the protection of the xCAT Community and its users; it does not change your rights to use your own Contributions for any other purpose. 
+In order to clarify the intellectual property license granted with Contributions from any person or entity made for the benefit of the xCAT Community, a Contributor License Agreement (CLA) must be on file that has been signed by each Contributor, indicating agreement to the license terms below. This license is for your protection as a Contributor as well as the protection of the xCAT Community and its users; it does not change your rights to use your own Contributions for any other purpose.
 
-This version of the Agreement allows an entity (the "Corporation") to submit Contributions to the xCAT Community, to authorize Contributions submitted by its designated employees to the xCAT Community, and to grant copyright and patent licenses thereto. 
+This version of the Agreement allows an entity (the "Corporation") to submit Contributions to the xCAT Community, to authorize Contributions submitted by its designated employees to the xCAT Community, and to grant copyright and patent licenses thereto.
 
 If you have not already done so, complete and sign, then scan and email a PDF file of this Agreement to: **xcat-legal@lists.sourceforge.net**.  Read this document carefully before signing and keep a copy for your records.
 
@@ -19,82 +19,82 @@ If you have not already done so, complete and sign, then scan and email a PDF fi
 
 
     Point of Contact: ___________________________________________________
-    
+
 
     E-Mail: _____________________________________________________________
 
 
     Telephone: __________________________ Fax: __________________________
 
-  
-You accept and agree to the following terms and conditions for Your present and future Contributions submitted to the xCAT Community. Except for the license granted herein to the xCAT Community, You reserve all right, title, and interest in and to Your Contributions. 
 
-  
-1\. Definitions. 
+You accept and agree to the following terms and conditions for Your present and future Contributions submitted to the xCAT Community. Except for the license granted herein to the xCAT Community, You reserve all right, title, and interest in and to Your Contributions.
 
-"You" (or "Your") shall mean the copyright owner or legal entity authorized by the copyright owner that is making this Agreement. For legal entities, the entity making a Contribution and all other entities that control, are controlled by, or are under common control with that entity are considered to be a single Contributor. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. 
 
-"Contribution" shall mean the code, documentation or other original works of authorship expressly identified in Schedule B, as well as any original work of authorship, including any modifications or additions to an existing work, that is intentionally submitted by You to the xCAT Community for inclusion in, or documentation of, any of the products owned or managed by members of the xCAT Community (the "Work"). For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to members of the xCAT Community, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the xCAT Community for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by You as "Not a Contribution." 
+1\. Definitions.
 
-“xCAT Community” shall mean International Business Machines Corporation and other users of xCAT. Accepted Contributions will be made available to the xCAT Community at large through sourceforge.net or other open source community. 
+"You" (or "Your") shall mean the copyright owner or legal entity authorized by the copyright owner that is making this Agreement. For legal entities, the entity making a Contribution and all other entities that control, are controlled by, or are under common control with that entity are considered to be a single Contributor. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
 
-  
-2\. Grant of Copyright License. Subject to the terms and conditions of this Agreement, You hereby grant to the xCAT Community a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, sublicense, and distribute Your Contributions and such derivative works. 
+"Contribution" shall mean the code, documentation or other original works of authorship expressly identified in Schedule B, as well as any original work of authorship, including any modifications or additions to an existing work, that is intentionally submitted by You to the xCAT Community for inclusion in, or documentation of, any of the products owned or managed by members of the xCAT Community (the "Work"). For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to members of the xCAT Community, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the xCAT Community for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by You as "Not a Contribution."
 
-  
-3\. Grant of Patent License. Subject to the terms and conditions of this Agreement, You hereby grant to the xCAT Community a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by You that are necessarily infringed by Your Contribution(s) alone or by combination of Your Contribution(s) with the Work to which such Contribution(s) were submitted. If any entity institutes patent litigation against You or any other entity (including a cross-claim or counterclaim in a lawsuit) alleging that Your Contribution, or the Work to which You have contributed, constitutes direct or contributory patent infringement, then any patent licenses granted to that entity under this Agreement for that Contribution or Work shall terminate as of the date such litigation is filed. 
+“xCAT Community” shall mean International Business Machines Corporation and other users of xCAT. Accepted Contributions will be made available to the xCAT Community at large through sourceforge.net or other open source community.
 
-  
-4\. You represent that You are legally entitled to grant the above license. You represent further that each employee of the Corporation designated on Schedule A below (or in a subsequent written modification to that Schedule) is authorized to submit Contributions on behalf of the Corporation. 
 
-  
-5\. You represent that each of Your Contributions is Your original creation (see section 7 for submissions on behalf of others). 
+2\. Grant of Copyright License. Subject to the terms and conditions of this Agreement, You hereby grant to the xCAT Community a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, sublicense, and distribute Your Contributions and such derivative works.
+
+
+3\. Grant of Patent License. Subject to the terms and conditions of this Agreement, You hereby grant to the xCAT Community a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by You that are necessarily infringed by Your Contribution(s) alone or by combination of Your Contribution(s) with the Work to which such Contribution(s) were submitted. If any entity institutes patent litigation against You or any other entity (including a cross-claim or counterclaim in a lawsuit) alleging that Your Contribution, or the Work to which You have contributed, constitutes direct or contributory patent infringement, then any patent licenses granted to that entity under this Agreement for that Contribution or Work shall terminate as of the date such litigation is filed.
+
+
+4\. You represent that You are legally entitled to grant the above license. You represent further that each employee of the Corporation designated on Schedule A below (or in a subsequent written modification to that Schedule) is authorized to submit Contributions on behalf of the Corporation.
+
+
+5\. You represent that each of Your Contributions is Your original creation (see section 7 for submissions on behalf of others).
+
+
+6\. You are not expected to provide support for Your Contributions, except to the extent You desire to provide support. You may provide support for free, for a fee, or not at all. Unless required by applicable law or agreed to in writing, You provide Your Contributions on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE.
+
+
+7\. Should You wish to submit work that is not Your original creation, You may submit it to the xCAT Community separately from any Contribution, identifying the complete details of its source and of any license or other restriction (including, but not limited to, related patents, trademarks, and license agreements) of which You are personally aware, and conspicuously marking the work as "Submitted on behalf of a third-party: [named here]".
+
+
+8\. It is Your responsibility to notify the xCAT Community (xcat-legal@lists.sourceforge.net) when any change is required to the list of designated employees authorized to submit Contributions on behalf of the Corporation, or to the Corporation's Point of Contact with the xCAT Community.
+
+
+9\. You agree that your signature, as received by e-mail, will constitute an “original” signature of this Agreement.
 
-  
-6\. You are not expected to provide support for Your Contributions, except to the extent You desire to provide support. You may provide support for free, for a fee, or not at all. Unless required by applicable law or agreed to in writing, You provide Your Contributions on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. 
 
-  
-7\. Should You wish to submit work that is not Your original creation, You may submit it to the xCAT Community separately from any Contribution, identifying the complete details of its source and of any license or other restriction (including, but not limited to, related patents, trademarks, and license agreements) of which You are personally aware, and conspicuously marking the work as "Submitted on behalf of a third-party: [named here]". 
 
-  
-8\. It is Your responsibility to notify the xCAT Community (xcat-legal@lists.sourceforge.net) when any change is required to the list of designated employees authorized to submit Contributions on behalf of the Corporation, or to the Corporation's Point of Contact with the xCAT Community. 
 
-  
-9\. You agree that your signature, as received by e-mail, will constitute an “original” signature of this Agreement. 
 
-  
 
-    
-    
-    
     Please sign: __________________________________   Date: _______________
-    
-    
+
+
     Title: __________________________________
-    
-    
+
+
     Corporation: __________________________________
-    
-
-  
 
 
-  
 
 
-Schedule A 
-
-  
-[Initial list of designated employees. NB: authorization is not tied to particular Contributions.] 
-
-  
 
 
-  
 
 
-Schedule B 
+Schedule A
 
-  
-[Identification of optional concurrent software grant. Would be left blank or omitted if there is no concurrent software grant.] 
+
+[Initial list of designated employees. NB: authorization is not tied to particular Contributions.]
+
+
+
+
+
+
+
+Schedule B
+
+
+[Identification of optional concurrent software grant. Would be left blank or omitted if there is no concurrent software grant.]
 
diff --git a/docs/source/developers/license/xcat_individual_contributor_license_agreement.rst b/docs/source/developers/license/xcat_individual_contributor_license_agreement.rst
index d85e87a2f..7592a4e17 100644
--- a/docs/source/developers/license/xcat_individual_contributor_license_agreement.rst
+++ b/docs/source/developers/license/xcat_individual_contributor_license_agreement.rst
@@ -2,8 +2,8 @@
 
 The xCAT Community Individual Contributor License Agreement ("Agreement")
 =========================================================================
-  
-In order to clarify the intellectual property license granted with Contributions from any person or entity made for the benefit of the xCAT Community, a Contributor License Agreement ("CLA") must be on file that has been signed by each Contributor, indicating agreement to the license terms below. This license is for your protection as a Contributor as well as the protection of the xCAT Community and its users; it does not change your rights to use your own Contributions for any other purpose. 
+
+In order to clarify the intellectual property license granted with Contributions from any person or entity made for the benefit of the xCAT Community, a Contributor License Agreement ("CLA") must be on file that has been signed by each Contributor, indicating agreement to the license terms below. This license is for your protection as a Contributor as well as the protection of the xCAT Community and its users; it does not change your rights to use your own Contributions for any other purpose.
 
 If you have not already done so, complete and sign, then scan and email a PDF file of this Agreement to: **xcat-legal@lists.sourceforge.net**.
 
@@ -19,52 +19,52 @@ If you have not already done so, complete and sign, then scan and email a PDF fi
 
 
     __________________________________________  Country: ______________________
-    
 
-  
-You accept and agree to the following terms and conditions for Your present and future Contributions submitted to the xCAT Community. Except for the license granted herein to the xCAT Community, You reserve all right, title, and interest in and to Your Contributions. 
 
-  
-1\. Definitions. 
 
-"You" (or "Your") shall mean the copyright owner or legal entity authorized by the copyright owner that is making this Agreement. For legal entities, the entity making a Contribution and all other entities that control, are controlled by, or are under common control with that entity are considered to be a single Contributor. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. 
+You accept and agree to the following terms and conditions for Your present and future Contributions submitted to the xCAT Community. Except for the license granted herein to the xCAT Community, You reserve all right, title, and interest in and to Your Contributions.
 
-"Contribution" shall mean any original work of authorship, including any modifications or additions to an existing work, that is intentionally submitted by You to the xCAT Community for inclusion in, or documentation of, any of the products owned or managed by members of the xCAT Community (the "Work"). For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to members of the xCAT Community, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the xCAT Community for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by You as "Not a Contribution." 
 
-  
-“xCAT Community” shall mean International Business Machines Corporation and other users of xCAT. Accepted Contributions will be made available to the xCAT Community at large through sourceforge.net or other open source community. 
+1\. Definitions.
 
-  
-2\. Grant of Copyright License. Subject to the terms and conditions of this Agreement, You hereby grant to the xCAT Community a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, sublicense, and distribute Your Contributions and such derivative works. 
+"You" (or "Your") shall mean the copyright owner or legal entity authorized by the copyright owner that is making this Agreement. For legal entities, the entity making a Contribution and all other entities that control, are controlled by, or are under common control with that entity are considered to be a single Contributor. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
 
-  
-3\. Grant of Patent License. Subject to the terms and conditions of this Agreement, You hereby grant to the xCAT Community a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by You that are necessarily infringed by Your Contribution(s) alone or by combination of Your Contribution(s) with the Work to which such Contribution(s) was submitted. If any entity institutes patent litigation against You or any other entity (including a cross-claim or counterclaim in a lawsuit) alleging that your Contribution, or the Work to which You have contributed, constitutes direct or contributory patent infringement, then any patent licenses granted to that entity under this Agreement for that Contribution or Work shall terminate as of the date such litigation is filed. 
+"Contribution" shall mean any original work of authorship, including any modifications or additions to an existing work, that is intentionally submitted by You to the xCAT Community for inclusion in, or documentation of, any of the products owned or managed by members of the xCAT Community (the "Work"). For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to members of the xCAT Community, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the xCAT Community for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by You as "Not a Contribution."
 
-  
-4\. You represent that You are legally entitled to grant the above license. If Your employer(s) has rights to intellectual property that You create that includes Your Contributions, You represent 
 
-that You have received permission to make Contributions on behalf of that employer, that Your employer has waived such rights for Your Contributions to the xCAT Community, or that Your employer has executed a separate Corporate CLA with the xCAT Community. 
+“xCAT Community” shall mean International Business Machines Corporation and other users of xCAT. Accepted Contributions will be made available to the xCAT Community at large through sourceforge.net or other open source community.
 
-  
-5\. You represent that each of Your Contributions is Your original creation (see section 7 for submissions on behalf of others). You represent that Your Contribution submissions include complete details of any third-party license or other restriction (including, but not limited to, related patents and trademarks) of which You are personally aware and which are associated with any part of Your Contributions. 
 
-  
-6\. You are not expected to provide support for Your Contributions, except to the extent You desire to provide support. You may provide support for free, for a fee, or not at all. Unless required by applicable law or agreed to in writing, You provide Your Contributions on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. 
+2\. Grant of Copyright License. Subject to the terms and conditions of this Agreement, You hereby grant to the xCAT Community a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, sublicense, and distribute Your Contributions and such derivative works.
+
+
+3\. Grant of Patent License. Subject to the terms and conditions of this Agreement, You hereby grant to the xCAT Community a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by You that are necessarily infringed by Your Contribution(s) alone or by combination of Your Contribution(s) with the Work to which such Contribution(s) was submitted. If any entity institutes patent litigation against You or any other entity (including a cross-claim or counterclaim in a lawsuit) alleging that your Contribution, or the Work to which You have contributed, constitutes direct or contributory patent infringement, then any patent licenses granted to that entity under this Agreement for that Contribution or Work shall terminate as of the date such litigation is filed.
+
+
+4\. You represent that You are legally entitled to grant the above license. If Your employer(s) has rights to intellectual property that You create that includes Your Contributions, You represent
+
+that You have received permission to make Contributions on behalf of that employer, that Your employer has waived such rights for Your Contributions to the xCAT Community, or that Your employer has executed a separate Corporate CLA with the xCAT Community.
+
+
+5\. You represent that each of Your Contributions is Your original creation (see section 7 for submissions on behalf of others). You represent that Your Contribution submissions include complete details of any third-party license or other restriction (including, but not limited to, related patents and trademarks) of which You are personally aware and which are associated with any part of Your Contributions.
+
+
+6\. You are not expected to provide support for Your Contributions, except to the extent You desire to provide support. You may provide support for free, for a fee, or not at all. Unless required by applicable law or agreed to in writing, You provide Your Contributions on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE.
+
+
+7\. Should You wish to submit work that is not Your original creation, You may submit it to the xCAT Community separately from any Contribution, identifying the complete details of its source and of any license or other restriction (including, but not limited to, related patents, trademarks, and license agreements) of which You are personally aware, and conspicuously marking the work as
+
+"Submitted on behalf of a third-party: [named here]".
+
+
+8\. You agree to notify the xCAT Community (xcat-legal@lists.sourceforge.net) of any facts or circumstances of which You become aware that would make these representations inaccurate in any respect.
+
+
+9\. You agree that your signature, as received by e-mail, will constitute an “original” signature of this Agreement.
 
-  
-7\. Should You wish to submit work that is not Your original creation, You may submit it to the xCAT Community separately from any Contribution, identifying the complete details of its source and of any license or other restriction (including, but not limited to, related patents, trademarks, and license agreements) of which You are personally aware, and conspicuously marking the work as 
 
-"Submitted on behalf of a third-party: [named here]". 
 
-  
-8\. You agree to notify the xCAT Community (xcat-legal@lists.sourceforge.net) of any facts or circumstances of which You become aware that would make these representations inaccurate in any respect. 
 
-  
-9\. You agree that your signature, as received by e-mail, will constitute an “original” signature of this Agreement. 
-    
-    
-    
-    
     Please sign: __________________________________ Date: ________________
-    
+
 
diff --git a/docs/source/guides/admin-guides/basic_concepts/global_cfg/index.rst b/docs/source/guides/admin-guides/basic_concepts/global_cfg/index.rst
index 1ad7a72ff..5101f8cf0 100644
--- a/docs/source/guides/admin-guides/basic_concepts/global_cfg/index.rst
+++ b/docs/source/guides/admin-guides/basic_concepts/global_cfg/index.rst
@@ -1,7 +1,7 @@
 Global Configuration
 ====================
 
-All the xCAT global configurations are stored in site table, xCAT Admin can adjust the configuration by modifying the site attribute with ``tabedit``.    
+All the xCAT global configurations are stored in site table, xCAT Admin can adjust the configuration by modifying the site attribute with ``tabedit``.
 
 This section only presents some key global configurations, for the complete reference on the xCAT global configurations, refer to the ``tabdump -d site``.
 
@@ -9,29 +9,29 @@ This section only presents some key global configurations, for the complete refe
 Database Attributes
 -------------------
 
-* excludenodes: 
+* excludenodes:
   A set of comma separated nodes and/or groups that would automatically be subtracted from any noderange, it can be used for excluding some failed nodes from any xCAT command. See :doc:`noderange </guides/admin-guides/references/man3/noderange.3>` for details on supported formats.
 
-* nodestatus:  
+* nodestatus:
   If set to ``n``, the ``nodelist.status`` column will not be updated during the node deployment, node discovery and power operations. The default is to update.
 
 
 DHCP Attributes
 ---------------
 
-* dhcpinterfaces:  
+* dhcpinterfaces:
   The network interfaces DHCP should listen on.  If it is the same for all nodes, use a simple comma-separated list of NICs.  To specify different NICs for different nodes ::
 
      xcatmn|eth1,eth2;service|bond0.
 
   In this example xcatmn is the name of the xCAT MN, and DHCP there should listen on eth1 and eth2.  On all of the nodes in group ``service`` DHCP should listen on the bond0 nic.
 
-* dhcplease:  
+* dhcplease:
   The lease time for the dhcp client. The default value is 43200.
 
 
-* managedaddressmode: 
-  The mode of networking configuration during node provision. 
+* managedaddressmode:
+  The mode of networking configuration during node provision.
   If set to ``static``, the network configuration will be configured in static mode based on the node and network definition on MN.
   If set to ``dhcp``, the network will be configured with dhcp protocol.
   The default is ``dhcp``.
@@ -40,21 +40,21 @@ DHCP Attributes
 DNS Attributes
 --------------
 
-* domain:  
+* domain:
   The DNS domain name used for the cluster.
 
-* forwarders:  
+* forwarders:
   The DNS servers at your site that can provide names outside of the cluster. The ``makedns`` command will configure the DNS on the management node to forward requests it does not know to these servers.
   **Note** that the DNS servers on the service nodes will ignore this value and always be configured to forward requests to the management node.
 
-* master:  
+* master:
   The hostname of the xCAT management node, as known by the nodes.
 
-* nameservers:  
+* nameservers:
   A comma delimited list of DNS servers that each node in the cluster should use. This value will end up in the nameserver settings of the ``/etc/resolv.conf`` on each node. It is common (but not required) to set this attribute value to the IP addr of the xCAT management node, if you have set up the DNS on the management node by running ``makedns``. In a hierarchical cluster, you can also set this attribute to ``<xcatmaster>`` to mean the DNS server for each node should be the node that is managing it (either its service node or the management node).
 
 
-* dnsinterfaces:  
+* dnsinterfaces:
   The network interfaces DNS server should listen on.  If it is the same for all nodes, use a simple comma-separated list of NICs.  To specify different NICs for different nodes ::
 
      xcatmn|eth1,eth2;service|bond0.
@@ -67,18 +67,18 @@ DNS Attributes
 Install/Deployment Attributes
 -----------------------------
 
-* installdir:  
+* installdir:
   The local directory name used to hold the node deployment packages.
 
-* runbootscripts:  
-  If set to ``yes`` the scripts listed in the postbootscripts attribute in the osimage and postscripts tables will be run during each reboot of stateful (diskful) nodes. This attribute has no effect on stateless nodes. Run the following command after you change the value of this attribute :: 
+* runbootscripts:
+  If set to ``yes`` the scripts listed in the postbootscripts attribute in the osimage and postscripts tables will be run during each reboot of stateful (diskful) nodes. This attribute has no effect on stateless nodes. Run the following command after you change the value of this attribute ::
 
    updatenode <nodes> -P setuppostbootscripts
 
-* precreatemypostscripts: 
+* precreatemypostscripts:
   (``yes/1`` or ``no/0``). Default is ``no``. If yes, it will instruct xCAT at ``nodeset`` and ``updatenode`` time to query the db once for all of the nodes passed into the cmd and create the mypostscript file for each node, and put them in a directory of tftpdir(such as: /tftpboot). If no, it will not generate the mypostscript file in the ``tftpdir``.
 
-* xcatdebugmode:  
+* xcatdebugmode:
   the xCAT debug level. xCAT provides a batch of techniques to help user debug problems while using xCAT, especially on OS provision, such as collecting logs of the whole installation process and accessing the installing system via ssh, etc. These techniques will be enabled according to different xCAT debug levels specified by 'xcatdebugmode', currently supported values: ::
 
     '0':  disable debug mode
@@ -91,49 +91,49 @@ Install/Deployment Attributes
 Remoteshell Attributes
 ----------------------
 
-* sshbetweennodes: 
+* sshbetweennodes:
   Comma separated list of groups of compute nodes to enable passwordless root ssh during install, or ``xdsh -K``. Default is ``ALLGROUPS``. Set to ``NOGROUPS`` if you do not wish to enable it for any group of compute nodes. If using the ``zone`` table, this attribute in not used.
 
 
 Services Attributes
 -------------------
 
-* consoleondemand:  
+* consoleondemand:
   When set to ``yes``, conserver connects and creates the console output only when the user opens the console. Default is ``no`` on Linux, ``yes`` on AIX.
 
-* timezone:  
+* timezone:
   The timezone for all the nodes in the cluster(e.g. ``America/New_York``).
 
-* tftpdir:  
+* tftpdir:
   tftp directory path. Default is /tftpboot.
 
-* tftpflags:  
+* tftpflags:
   The flags used to start tftpd. Default is ``-v -l -s /tftpboot -m /etc/tftpmapfile4xcat.conf`` if ``tftplfags`` is not set.
 
 
 Virtualization Attributes
 --------------------------
 
-* persistkvmguests:  
+* persistkvmguests:
   Keep the kvm definition on the kvm hypervisor when you power off the kvm guest node. This is useful for you to manually change the kvm xml definition file in ``virsh`` for debugging. Set anything means ``enable``.
 
 
 xCAT Daemon attributes
 ----------------------
 
-* xcatdport:  
+* xcatdport:
   The port used by xcatd daemon for client/server communication.
 
-* xcatiport:  
+* xcatiport:
   The port used by xcatd to receive installation status updates from nodes.
 
-* xcatlport:  
+* xcatlport:
   The port used by xcatd command log writer process to collect command output.
 
-* xcatsslversion:  
+* xcatsslversion:
   The ssl version by xcatd. Default is ``SSLv3``.
 
-* xcatsslciphers:  
+* xcatsslciphers:
   The ssl cipher by xcatd. Default is ``3DES``.
 
 
diff --git a/docs/source/guides/admin-guides/basic_concepts/network_planning/index.rst b/docs/source/guides/admin-guides/basic_concepts/network_planning/index.rst
index f88967131..c88bfaa59 100644
--- a/docs/source/guides/admin-guides/basic_concepts/network_planning/index.rst
+++ b/docs/source/guides/admin-guides/basic_concepts/network_planning/index.rst
@@ -46,7 +46,7 @@ For a cluster, several networks are necessary to enable the cluster management a
 
 From the system management perspective, the **Management network** and **Service network** are necessary to perform the hardware control and OS deployment.
 
-**xCAT Network Planning for a New Cluster:** 
+**xCAT Network Planning for a New Cluster:**
 
 .. toctree::
    :maxdepth: 2
diff --git a/docs/source/guides/admin-guides/basic_concepts/network_planning/xcat_net_planning.rst b/docs/source/guides/admin-guides/basic_concepts/network_planning/xcat_net_planning.rst
index 598173d11..8f1bd4ee5 100644
--- a/docs/source/guides/admin-guides/basic_concepts/network_planning/xcat_net_planning.rst
+++ b/docs/source/guides/admin-guides/basic_concepts/network_planning/xcat_net_planning.rst
@@ -13,7 +13,7 @@ For very large clusters, xCAT has the ability to distribute the management opera
 * **[Linux]:**
         * Stateful or Stateless: 500 nodes
         * Statelite: 250 nodes
-* **[AIX]:** 
+* **[AIX]:**
         150 nodes
 
 These numbers can be higher (approximately double) if you are willing to "stage" the more intensive operations, like node deployment.
@@ -60,4 +60,4 @@ If you still have reasons to pursue HA service nodes:
 
 *   For **[AIX]** , see [TODO XCAT_HASN_with_GPFS]
 *   For **[Linux]** , a couple prototype clusters have been set up in which the NFS service on the SNs is provided by GPFS CNFS (Clustered NFS). A howto is being written to describe the setup as an example. Stay tuned.
- 
+
diff --git a/docs/source/guides/admin-guides/basic_concepts/node_type.rst b/docs/source/guides/admin-guides/basic_concepts/node_type.rst
index 235286218..78ba05e2f 100644
--- a/docs/source/guides/admin-guides/basic_concepts/node_type.rst
+++ b/docs/source/guides/admin-guides/basic_concepts/node_type.rst
@@ -13,24 +13,24 @@ Traditional cluster with OS on each node's local disk.
 * Main advantage
 
   This approach is familiar to most admins, and they typically have many years of experience with it.
-        
+
 * Main disadvantage
 
   Admin has to manage all of the individual OS copies, has to face the failure of hard disk. For certain application which requires all the compute nodes have exactly same state, this is also changeable for admin.
-    
+
 
 Stateless (diskless)
 --------------------
 
 Nodes boot from a RAMdisk OS image downloaded from the xCAT mgmt node or service node at boot time.
 
-* Main advantage 
+* Main advantage
 
   Central management of OS image, but nodes are not tethered to the mgmt node or service node it booted from. Whenever you need a new OS for the node, just reboot the node.
-        
+
 * Main disadvantage
 
-  You can't use a large image with many different applications in the image for varied users, because it uses too much of the node's memory to store the ramdisk.  (To mitigate this disadvantage, you can put your large application binaries and libraries in shared storage to reduce the ramdisk size. This requires some manual configuration of the image). 
+  You can't use a large image with many different applications in the image for varied users, because it uses too much of the node's memory to store the ramdisk.  (To mitigate this disadvantage, you can put your large application binaries and libraries in shared storage to reduce the ramdisk size. This requires some manual configuration of the image).
 
    Each node can also have a local "scratch" disk for ``swap``, ``/tmp``, ``/var``, ``log`` files, dumps, etc.  The purpose of the scratch disk is to provide a location for files that are written to by the node that can become quite large or for files that you don't want to disappear when the node reboots.  There should be nothing put on the scratch disk that represents the node's "state", so that if the disk fails you can simply replace it and reboot the node. A scratch disk would typically be used for situations like: job scheduling preemption is required (which needs a lot of swap space), the applications write large temp files, or you want to keep gpfs log or trace files persistently. (As a partial alternative to using the scratch disk, customers can choose to put ``/tmp`` ``/var/tmp``, and log files (except GPFS logs files) in GPFS, but must be willing to accept the dependency on GPFS). This can be done by enabling the 'localdisk' support. For the details, refer to the section [TODO Enabling the localdisk Option].
 
diff --git a/docs/source/guides/admin-guides/basic_concepts/xcat_db/index.rst b/docs/source/guides/admin-guides/basic_concepts/xcat_db/index.rst
index b6351d6ca..3610cbf92 100644
--- a/docs/source/guides/admin-guides/basic_concepts/xcat_db/index.rst
+++ b/docs/source/guides/admin-guides/basic_concepts/xcat_db/index.rst
@@ -9,7 +9,7 @@ You can run ``tabdump`` command to get all the xCAT database tables. Or run ``ta
 
     $ tabdump
     $ tabdump site
-    $ tabdump -d site 
+    $ tabdump -d site
     $ man site
 
 For a complete reference, see the man page for xcatdb: ``man xcatdb``.
@@ -22,7 +22,7 @@ For a complete reference, see the man page for xcatdb: ``man xcatdb``.
 
 * **policy table**
 
-  Controls who has authority to run specific xCAT operations. It is the Access Control List (ACL) in xCAT. 
+  Controls who has authority to run specific xCAT operations. It is the Access Control List (ACL) in xCAT.
 
 * **passwd table**
 
@@ -34,7 +34,7 @@ For a complete reference, see the man page for xcatdb: ``man xcatdb``.
 
   You can manipulate the networks through ``*def command`` against the **network object**. ::
 
-    $ lsdef -t network 
+    $ lsdef -t network
 
 * **...**
 
@@ -66,5 +66,5 @@ xCAT offers 5 commands to manipulate the database tables:
 
 .. toctree::
    :maxdepth: 2
-          
-   regexp_db.rst 
+
+   regexp_db.rst
diff --git a/docs/source/guides/admin-guides/basic_concepts/xcat_db/regexp_db.rst b/docs/source/guides/admin-guides/basic_concepts/xcat_db/regexp_db.rst
index a39bf7c9d..d1ff05af1 100644
--- a/docs/source/guides/admin-guides/basic_concepts/xcat_db/regexp_db.rst
+++ b/docs/source/guides/admin-guides/basic_concepts/xcat_db/regexp_db.rst
@@ -31,7 +31,7 @@ In this example, the regular expression in the ``ip`` attribute uses ``|`` to se
 A more involved example is with the ``vm`` table. If your kvm nodes have node names c01f01x01v01, c01f02x03v04, etc., and the kvm host names are c01f01x01, c01f02x03, etc., then you might have an ``vm`` table like ::
 
     #node,mgr,host,migrationdest,storage,storagemodel,storagecache,storageformat,cfgstore,memory,cpus,nics,nicmodel,bootorder,clockoffset,virtflags,master,vncport,textconsole,powerstate,beacon,datacenter,cluster,guestostype,othersettings,physlots,vidmodel,vidproto,vidpassword,comments,disable
-   "kvms",,"|\D+(\d+)\D+(\d+)\D+(\d+)\D+(\d+)|c($1)f($2)x($3)|",,"|\D+(\d+)\D+(\d+)\D+(\d+)\D+(\d+)|dir:///install/vms/vm($4+0)|",,,,,"3072","2","virbr2","virtio",,,,,,,,,,,,,,,,,,   
+   "kvms",,"|\D+(\d+)\D+(\d+)\D+(\d+)\D+(\d+)|c($1)f($2)x($3)|",,"|\D+(\d+)\D+(\d+)\D+(\d+)\D+(\d+)|dir:///install/vms/vm($4+0)|",,,,,"3072","2","virbr2","virtio",,,,,,,,,,,,,,,,,,
 
 Before you panic, let me explain each column:
 
@@ -72,7 +72,7 @@ See `perlre <http://www.perl.com/doc/manual/html/pod/perlre.html>`_ for more inf
 Easy Regular expressions
 ------------------------
 
-As of xCAT 2.8.1, you can use a modified version of the regular expression support described in the previous section. You do not need to enter the node information (1st part of the expression), it will be derived from the input nodename. You only need to supply the 2nd part of the expression to determine the value to give the attribute. 
+As of xCAT 2.8.1, you can use a modified version of the regular expression support described in the previous section. You do not need to enter the node information (1st part of the expression), it will be derived from the input nodename. You only need to supply the 2nd part of the expression to determine the value to give the attribute.
 
 For example:
 
@@ -149,7 +149,7 @@ xCAT provides several functions that can simplify regular expressions.
 \ **ipadd** Add to an IP address\
   Usage: ``ipadd(octet1, octet2, octet3, octet4, toadd, skipstart, skipend)``
 
-  This function is useful when you need to cross octets. Optionally skip addresses at the start and end of octets (like .0 or .255 - technically those are valid IP addresses, but sometimes software makes poor assumptions about which broadcast and gateway addresses). 
+  This function is useful when you need to cross octets. Optionally skip addresses at the start and end of octets (like .0 or .255 - technically those are valid IP addresses, but sometimes software makes poor assumptions about which broadcast and gateway addresses).
 
 
 Verify your regular expression
diff --git a/docs/source/guides/admin-guides/basic_concepts/xcat_object/index.rst b/docs/source/guides/admin-guides/basic_concepts/xcat_object/index.rst
index 7c11a9e0a..fa007fbd2 100644
--- a/docs/source/guides/admin-guides/basic_concepts/xcat_object/index.rst
+++ b/docs/source/guides/admin-guides/basic_concepts/xcat_object/index.rst
@@ -14,25 +14,25 @@ You can get the detail description of each object by ``man <object type>`` e.g.
 
 * **node Object**
 
-  The **node** is the most important object in xCAT. Any physical server, virtual machine or SP (Service Processor for Hardware Control) can be defined as a node object. 
+  The **node** is the most important object in xCAT. Any physical server, virtual machine or SP (Service Processor for Hardware Control) can be defined as a node object.
 
   For example, I have a physical server which has the following attributes: ::
 
-    groups: all,x86_64 
+    groups: all,x86_64
         The groups that this node belongs to.
-    arch: x86_64 
+    arch: x86_64
         The architecture of the server is x86_64.
-    bmc: 10.4.14.254 
+    bmc: 10.4.14.254
         The IP of BMC which will be used for hardware control.
-    bmcusername: ADMIN 
+    bmcusername: ADMIN
         The username of bmc.
     bmcpassword: admin
         The password of bmc.
     mac: 6C:AE:8B:1B:E8:52
-        The mac address of the ethernet adapter that will be used to 
+        The mac address of the ethernet adapter that will be used to
         deploy OS for the node.
     mgt: ipmi
-        The management method which will be used to manage the node. 
+        The management method which will be used to manage the node.
         This node will use ipmi protocol.
     netboot: xnba
         The network bootloader that will be used to deploy OS for the node.
@@ -41,8 +41,8 @@ You can get the detail description of each object by ``man <object type>`` e.g.
 
   I want to name the node to be **cn1** (Compute Node #1) in xCAT. Then I define this node in xCAT with following command: ::
 
-    $mkdef -t node cn1 groups=all,x86_64 arch=x86_64 bmc=10.4.14.254 
-                       bmcusername=ADMIN bmcpassword=admin mac=6C:AE:8B:1B:E8:52 
+    $mkdef -t node cn1 groups=all,x86_64 arch=x86_64 bmc=10.4.14.254
+                       bmcusername=ADMIN bmcpassword=admin mac=6C:AE:8B:1B:E8:52
                        mgt=ipmi netboot=xnba provmethod=rhels7.1-x86_64-install-compute
 
   After the define, I can use ``lsdef`` command to display the defined node: ::
@@ -131,19 +131,19 @@ You can get the detail description of each object by ``man <object type>`` e.g.
 
   Display the detail attributes of one **osimage** named **rhels7.1-x86_64-install-compute**: ::
 
-    $ lsdef -t osimage rhels7.1-x86_64-install-compute  
-    Object name: rhels7.1-x86_64-install-compute        
-        imagetype=linux                                 
-        osarch=x86_64                                   
-        osdistroname=rhels7.1-x86_64                    
-        osname=Linux                                    
-        osvers=rhels7.1                                 
+    $ lsdef -t osimage rhels7.1-x86_64-install-compute
+    Object name: rhels7.1-x86_64-install-compute
+        imagetype=linux
+        osarch=x86_64
+        osdistroname=rhels7.1-x86_64
+        osname=Linux
+        osvers=rhels7.1
         otherpkgdir=/install/post/otherpkgs/rhels7.1/x86_64
-        pkgdir=/install/rhels7.1/x86_64                 
+        pkgdir=/install/rhels7.1/x86_64
         pkglist=/opt/xcat/share/xcat/install/rh/compute.rhels7.pkglist
-        profile=compute                                 
-        provmethod=install                              
-        synclists=/root/syncfiles.list                  
+        profile=compute
+        provmethod=install
+        synclists=/root/syncfiles.list
         template=/opt/xcat/share/xcat/install/rh/compute.rhels7.tmpl
 
   This **osimage** represents a **Linux** **rhels7.1** Operating System. The package repository is in **/install/rhels7.1/x86_64** and the packages which will be installed is listed in the file **/opt/xcat/share/xcat/install/rh/compute.rhels7.pkglist** ...
@@ -161,7 +161,7 @@ You can get the detail description of each object by ``man <object type>`` e.g.
   * ``mkdef`` : create object definitions
   * ``chdef`` : modify object definitions
   * ``lsdef`` : list object definitions
-  * ``rmdef`` : remove object definitions 
+  * ``rmdef`` : remove object definitions
 
   To get the detail usage of the commands, refer to the man page. e.g. ``man mkdef``
 
diff --git a/docs/source/guides/admin-guides/basic_concepts/xcat_object/node.rst b/docs/source/guides/admin-guides/basic_concepts/xcat_object/node.rst
index c94c576a2..ce02b697e 100644
--- a/docs/source/guides/admin-guides/basic_concepts/xcat_object/node.rst
+++ b/docs/source/guides/admin-guides/basic_concepts/xcat_object/node.rst
@@ -4,54 +4,54 @@ node
 Description
 -----------
 
-The definition of physical units in the cluster, such as lpar, virtual machine, frame, cec, hmc, switch. 
+The definition of physical units in the cluster, such as lpar, virtual machine, frame, cec, hmc, switch.
 
 Key Attributes
 --------------
 
-* os: 
+* os:
     The operating system deployed on this node. Valid values: AIX, rhels*, rhelc*, rhas*, centos*, SL*, fedora*, sles* (where * is the version #)
 
-* arch: 
+* arch:
     The hardware architecture of this node. Valid values: x86_64, ppc64, x86, ia64.
 
 * groups:
     Usually, there are a set of nodes with some attributes in common, xCAT admin can define a node group containing these nodes, so that the management task can be issued against the group instead of individual nodes. A node can be a member of different groups, so the value of this attributes is a comma-delimited list of groups. At least one group is required to create a node. The new created group names should not be prefixed with "__" as this token has been preserved as the internal group name.
 
 * mgt:
-    The method to do general hardware management of the node. This attribute can be determined by the machine type of the node. Valid values: ipmi, blade, hmc, ivm, fsp, bpa, kvm, esx, rhevm. 
+    The method to do general hardware management of the node. This attribute can be determined by the machine type of the node. Valid values: ipmi, blade, hmc, ivm, fsp, bpa, kvm, esx, rhevm.
 
-* mac: 
+* mac:
     The mac address of the network card on the node, which is connected with the installation server and can be used as the network installation device.
-     
-* ip: 
+
+* ip:
     The IP address of the node.
 
-* netboot: 
+* netboot:
     The type of network boot method for this node, determined by the OS to provision, the architecture and machine type of the node. Valid values:
 
-              +--------------------------+----------------------+-----------------------------------+        
+              +--------------------------+----------------------+-----------------------------------+
               | Arch and Machine Type    |   OS                 |       valid netboot options       |
               +==========================+======================+===================================+
               |       x86, x86_64        |   ALL                |       pxe, xnba                   |
               +--------------------------+----------------------+-----------------------------------+
               |         ppc64            | <=rhel6, <=sles11.3  |       yaboot                      |
-              +--------------------------+----------------------+-----------------------------------+       
+              +--------------------------+----------------------+-----------------------------------+
               |         ppc64            | >=rhels7, >=sles11.4 |       grub2,grub2-http,grub2-tftp |
-              +--------------------------+----------------------+-----------------------------------+ 
+              +--------------------------+----------------------+-----------------------------------+
               |   ppc64le NonVirtualize  |    ALL               |       petitboot                   |
               +--------------------------+----------------------+-----------------------------------+
               |   ppc64le PowerKVM Guest |    ALL               |       grub2,grub2-http,grub2-tftp |
               +-------------------------------------------------+-----------------------------------+
- 
-* postscripts: 
-    Comma separated list of scripts, that should be run on this node after diskful installation or diskless boot, finish some system configuration and maintenance work. For installation of RedHat, CentOS, Fedora, the scripts will be run before the reboot. For installation of SLES, the scripts will be run after the reboot but before the init.d process. 
 
-* postbootscripts: 
-    Comma separated list of scripts, that should be run on this node as a SysV init job on the 1st reboot after installation or diskless boot, finish some system configuration and maintenance work. 
+* postscripts:
+    Comma separated list of scripts, that should be run on this node after diskful installation or diskless boot, finish some system configuration and maintenance work. For installation of RedHat, CentOS, Fedora, the scripts will be run before the reboot. For installation of SLES, the scripts will be run after the reboot but before the init.d process.
+
+* postbootscripts:
+    Comma separated list of scripts, that should be run on this node as a SysV init job on the 1st reboot after installation or diskless boot, finish some system configuration and maintenance work.
 
 * provmethod:
-    The provisioning method for node deployment. Usually, this attribute is an ``osimage`` object name. 
+    The provisioning method for node deployment. Usually, this attribute is an ``osimage`` object name.
 
 * status:
     The current status of the node, which is updated by xCAT. This value can be used to monitor the provision process. Valid values: powering-off, installing, booting/netbooting, booted.
@@ -59,7 +59,7 @@ Key Attributes
 Use Cases
 ---------
 
-* Case 1: 
+* Case 1:
   There is a ppc64le node named "cn1", the mac of installation NIC is "ca:68:d3:ae:db:03", the ip assigned is "10.0.0.100", the network boot method is "grub2", place it into the group "all". Use the following command ::
 
     mkdef -t node -o cn1 arch=ppc64 mac="ca:68:d3:ae:db:03" ip="10.0.0.100" netboot="grub2" groups="all"
@@ -79,13 +79,13 @@ Use Cases
 
     lsdef -t node -o cn1 -i mac
 
-* Case 4: 
+* Case 4:
   There is a node definition "cn1", modify its network boot method  to "yaboot" ::
 
     chdef -t node -o cn1 netboot=yaboot
-    
+
 * Case 5:
-  There is a node definition "cn1", create a node definition "cn2" with the same attributes with "cn1", except the mac addr(ca:68:d3:ae:db:04) and ip address(10.0.0.101) 
+  There is a node definition "cn1", create a node definition "cn2" with the same attributes with "cn1", except the mac addr(ca:68:d3:ae:db:04) and ip address(10.0.0.101)
 
   *step 1*:  write the definition of "cn1" to a stanza file named "cn.stanza" ::
 
@@ -100,9 +100,9 @@ Use Cases
           ip=10.0.0.100
           mac=ca:68:d3:ae:db:03
           netboot=grub2
-  
+
   *step 2*: modify the "/tmp/cn.stanza" according to the "cn2" attributes ::
-  
+
       # <xCAT data object stanza file>
       cn2:
           objtype=node
@@ -110,8 +110,8 @@ Use Cases
           ip=10.0.0.101
           mac=ca:68:d3:ae:db:04
           netboot=grub2
-  
+
   *step 3*: create "cn2" definition with "cn.stanza" ::
 
-      cat /tmp/cn.stanza |mkdef -z   
+      cat /tmp/cn.stanza |mkdef -z
 
diff --git a/docs/source/guides/admin-guides/basic_concepts/xcat_object/osimage.rst b/docs/source/guides/admin-guides/basic_concepts/xcat_object/osimage.rst
index 63d3d2680..e9db2fbfd 100644
--- a/docs/source/guides/admin-guides/basic_concepts/xcat_object/osimage.rst
+++ b/docs/source/guides/admin-guides/basic_concepts/xcat_object/osimage.rst
@@ -13,8 +13,8 @@ Key Attributes
    The type of operating system this definition represents (linux, AIX).
 
 * osarch:
-   The hardware architecture of the nodes this image supports. Valid values: x86_64, ppc64, ppc64le. 
- 
+   The hardware architecture of the nodes this image supports. Valid values: x86_64, ppc64, ppc64le.
+
 * osvers:
    The Linux distribution name and release number of the image. Valid values: rhels*, rhelc*, rhas*, centos*, SL*, fedora*, sles* (where * is the version #).
 
@@ -38,13 +38,13 @@ Key Attributes
 Use Cases
 ---------
 
-* Case 1: 
+* Case 1:
 
 List all the osimage objects ::
 
    lsdef -t osimage
 
-* Case 2: 
+* Case 2:
 
 Create a osimage definition "customized-rhels7-ppc64-install-compute" based on an existing osimage "rhels7-ppc64-install-compute", the osimage "customized-rhels7-ppc64-install-compute" will inherit all the attributes of "rhels7-ppc64-install-compute" except installing the additional packages specified in the file "/tmp/otherpkg.list":
 
@@ -55,7 +55,7 @@ Create a osimage definition "customized-rhels7-ppc64-install-compute" based on a
 The content will look like ::
 
    # <xCAT data object stanza file>
-   
+
    rhels7-ppc64-install-compute:
        objtype=osimage
        imagetype=linux
@@ -69,11 +69,11 @@ The content will look like ::
        profile=compute
        provmethod=install
        template=/opt/xcat/share/xcat/install/rh/compute.rhels7.tmpl
- 
+
 *step 2* : modify the stanza file according to the attributes of "customized-rhels7-ppc64-install-compute" ::
-  
+
    # <xCAT data object stanza file>
-   
+
    customized-rhels7-ppc64-install-compute:
        objtype=osimage
        imagetype=linux
diff --git a/docs/source/guides/admin-guides/index.rst b/docs/source/guides/admin-guides/index.rst
index 992ad6cef..ccd196909 100644
--- a/docs/source/guides/admin-guides/index.rst
+++ b/docs/source/guides/admin-guides/index.rst
@@ -1,7 +1,7 @@
 Admin Guide
 ===========
 
-The admin guide is intended to help with learning how to manage a cluster using xCAT with the following major sections: 
+The admin guide is intended to help with learning how to manage a cluster using xCAT with the following major sections:
 
 
 * **Basic Concepts** Introduces some of the basic concepts in xCAT.
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/acc_initrd_rootimg_gen.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/acc_initrd_rootimg_gen.rst
index 9cc18ec36..635905e82 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/acc_initrd_rootimg_gen.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/acc_initrd_rootimg_gen.rst
@@ -8,50 +8,50 @@ Generating diskless initrd with ``genimage`` and compressed rootimg with ``packi
 Enabling the ``pigz`` for diskless initrd and rootimg generating
 ----------------------------------------------------------------
 
-The parallel compression tool ``pigz`` can be enabled by installing ``pigz`` package on the management server or diskless rootimg. Depending on the method of generating the initrd and compressed rootimg, the steps differ in different Linux distributions. 
+The parallel compression tool ``pigz`` can be enabled by installing ``pigz`` package on the management server or diskless rootimg. Depending on the method of generating the initrd and compressed rootimg, the steps differ in different Linux distributions.
 
-* **[RHEL]** 
+* **[RHEL]**
 
   The package ``pigz`` is shipped in Extra Packages for Enterprise Linux (or EPEL) instead of RedHat iso, this involves some complexity.
-  
+
   Extra Packages for Enterprise Linux (or EPEL) is a Fedora Special Interest Group that creates, maintains, and manages a high quality set of additional packages for Enterprise Linux, including, but not limited to, Red Hat Enterprise Linux (RHEL), CentOS and Scientific Linux (SL), Oracle Linux (OL).
-  
-  EPEL has an ``epel-release`` package that includes gpg keys for package signing and repository information. Installing this package for your Enterprise Linux version should allow you to use normal tools such as ``yum`` to install packages and their dependencies. 
-  
+
+  EPEL has an ``epel-release`` package that includes gpg keys for package signing and repository information. Installing this package for your Enterprise Linux version should allow you to use normal tools such as ``yum`` to install packages and their dependencies.
+
   Refer to the http://fedoraproject.org/wiki/EPEL for more details on EPEL
-  
+
   1) Enabling the ``pigz`` in ``genimage`` (only supported in RHELS6 or above)
-  
+
      ``pigz`` should be installed in the diskless rootimg. Download ``pigz`` package from https://dl.fedoraproject.org/pub/epel/ , then customize the diskless osimage to install ``pigz`` as the additional packages, see :doc:`Install Additional Other Packages</guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/additional_pkg>` for more details.
-  
+
   2) Enabling the ``pigz`` in ``packimage``
-  
+
      ``pigz`` should be installed on the management server. Download ``pigz`` package from https://dl.fedoraproject.org/pub/epel/ , then install the ``pigz`` with  ``yum`` or ``rpm``.
 
 * **[UBUNTU]**
 
   Make sure the ``pigz`` is installed on the management node with the following command::
-  
+
      dpkg -l|grep pigz
-  
+
   If not, ``pigz`` can be installed with the following command::
-     
+
      apt-get install pigz
 
-* **[SLES]** 
+* **[SLES]**
+
+  1) Enabling the ``pigz`` in ``genimage`` (only supported in SLES12 or above)
 
-  1) Enabling the ``pigz`` in ``genimage`` (only supported in SLES12 or above) 
-  
      ``pigz`` should be installed in the diskless rootimg, since``pigz`` is shipped in the SLES iso, this can be done by adding ``pigz`` into the ``pkglist`` of diskless osimage.
-  
+
   2) Enabling the ``pigz`` in ``packimage``
-  
+
      Make sure the ``pigz`` is installed on the management node with the following command::
-     
+
         rpm -qa|grep pigz
-     
+
      If not, ``pigz`` can be installed with the following command::
-     
+
         zypper install pigz
 
 
@@ -62,14 +62,14 @@ Appendix: An example on ``packimage`` performance optimization with "pigz" enabl
 
 This is an example on performance optimization with ``pigz`` enabled.
 
-In this example, a xCAT command ``packimage rhels7-ppc64-netboot-compute`` is run on a Power 7 machine with 4 cores.   
+In this example, a xCAT command ``packimage rhels7-ppc64-netboot-compute`` is run on a Power 7 machine with 4 cores.
 
 The system info: ::
 
     # uname -a
     Linux c910f03c01p03 3.10.0-123.el7.ppc64 #1 SMP Mon May 5 11:18:37 EDT 2014 ppc64 ppc64 ppc64 GNU/Linux
 
-    # cat /etc/os-release 
+    # cat /etc/os-release
     NAME="Red Hat Enterprise Linux Server"
     VERSION="7.0 (Maipo)"
     ID="rhel"
@@ -80,7 +80,7 @@ The system info: ::
     CPE_NAME="cpe:/o:redhat:enterprise_linux:7.0:GA:server"
     HOME_URL="https://www.redhat.com/"
     BUG_REPORT_URL="https://bugzilla.redhat.com/"
-    
+
     REDHAT_BUGZILLA_PRODUCT="Red Hat Enterprise Linux 7"
     REDHAT_BUGZILLA_PRODUCT_VERSION=7.0
     REDHAT_SUPPORT_PRODUCT="Red Hat Enterprise Linux"
@@ -88,27 +88,27 @@ The system info: ::
 
 The CPU info: ::
 
-    # cat /proc/cpuinfo 
+    # cat /proc/cpuinfo
     processor       : 0
     cpu             : POWER7 (architected), altivec supported
     clock           : 3550.000000MHz
     revision        : 2.0 (pvr 003f 0200)
-    
+
     processor       : 1
     cpu             : POWER7 (architected), altivec supported
     clock           : 3550.000000MHz
     revision        : 2.0 (pvr 003f 0200)
-    
+
     processor       : 2
     cpu             : POWER7 (architected), altivec supported
     clock           : 3550.000000MHz
     revision        : 2.0 (pvr 003f 0200)
-    
+
     processor       : 3
     cpu             : POWER7 (architected), altivec supported
     clock           : 3550.000000MHz
     revision        : 2.0 (pvr 003f 0200)
-    
+
     timebase        : 512000000
     platform        : pSeries
     model           : IBM,8233-E8B
@@ -119,8 +119,8 @@ The time spent on ``packimage`` with ``gzip``: ::
     # time packimage rhels7-ppc64-netboot-compute
     Packing contents of /install/netboot/rhels7/ppc64/compute/rootimg
     compress method:gzip
-    
-    
+
+
     real    1m14.896s
     user    0m0.159s
     sys     0m0.019s
@@ -130,7 +130,7 @@ The time spent on ``packimage`` with ``pigz``: ::
     # time packimage rhels7-ppc64-netboot-compute
     Packing contents of /install/netboot/rhels7/ppc64/compute/rootimg
     compress method:pigz
-    
+
     real    0m23.177s
     user    0m0.176s
     sys     0m0.016s
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/additionalpkg/additional_pkg_overview.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/additionalpkg/additional_pkg_overview.rst
index 79aaff3f8..f867e901a 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/additionalpkg/additional_pkg_overview.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/additionalpkg/additional_pkg_overview.rst
@@ -8,7 +8,7 @@ The name of the packages that will be installed on the node are stored in the pa
 
 The path to the package lists will be read from the osimage definition. Which osimage a node is using is specified by the provmethod attribute. To display this value for a node: ::
 
-     lsdef node1 -i provmethod 
+     lsdef node1 -i provmethod
      Object name: node
      provmethod=<osimagename>
 
@@ -31,7 +31,7 @@ You can display this details of this osimage by running the following command, s
         rootimgdir=/install/<inst_type>/<os>/<arch>/<profile>
         synclists=/install/custom/<inst_type>/<profile>.synclist
 
-You can set the pkglist and otherpkglist using the following command: :: 
+You can set the pkglist and otherpkglist using the following command: ::
 
         chdef -t osimage <osimagename> pkglist=/opt/xcat/share/xcat/<inst_type>/<distro>/<profile>.pkglist\
                                                  otherpkglist=/install/custom/<inst_type>/<distro>/my.otherpkgs.pkglist
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/additionalpkg/nonubuntu_os_pkg.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/additionalpkg/nonubuntu_os_pkg.rst
index dcf8c350b..09003fc57 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/additionalpkg/nonubuntu_os_pkg.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/additionalpkg/nonubuntu_os_pkg.rst
@@ -82,7 +82,7 @@ Group/Pattern Names
 
 It is only supported for stateful deployment.
 
-In Linux, a groups of rpms can be packaged together into one package. It is called a group on RedHat, CentOS, Fedora and Scientific Linux. To get the a list of available groups, run 
+In Linux, a groups of rpms can be packaged together into one package. It is called a group on RedHat, CentOS, Fedora and Scientific Linux. To get the a list of available groups, run
 
 * **[RHEL]** ::
 
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/additionalpkg/ubuntu_os_other_pkg.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/additionalpkg/ubuntu_os_other_pkg.rst
index f8caa0e95..941c5150a 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/additionalpkg/ubuntu_os_other_pkg.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/additionalpkg/ubuntu_os_other_pkg.rst
@@ -19,7 +19,7 @@ Compute nodes can access the internet
 
     chdef -t osimage <osimage name> otherpkglist=/install/custom/install/ubuntu/compute.otherpkgs.pkglist
 
-#. Run ``updatenode <noderange> -S`` or ``updatenode <noderange> -P otherpkgs`` 
+#. Run ``updatenode <noderange> -S`` or ``updatenode <noderange> -P otherpkgs``
 
    Run ``updatenode -S`` to **install/update** the packages on the compute nodes ::
 
@@ -34,6 +34,12 @@ Compute nodes can not access the internet
 
 If compute nodes cannot access the internet, there are two ways to install additional packages
 
-   * use apt proxy 
-   * use local mirror 
-
+   * Use local mirror
+      Please refer the Ubuntu document below for how to set up your own local Ubuntu mirror.
+      https://help.ubuntu.com/community/Rsyncmirror
+   * Use apt-proxy
+      Please refer the Ubuntu document below for how to setup a apt-proxy server.
+      https://help.ubuntu.com/community/AptProxy
+   * Setting up apt-get to use a http-proxy.
+      Please refer the Ubuntu document below for how to do set up it.
+      https://help.ubuntu.com/community/AptGet/Howto#Setting_up_apt-get_to_use_a_http-proxy
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_partition.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_partition.rst
index 0efb5d793..20836e356 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_partition.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_partition.rst
@@ -3,16 +3,16 @@
 By default, xCAT will install the operating system on the first disk and with default partitions layout in the node. However, you may choose to customize the disk partitioning during the install process and define a specific disk layout. You can do this in one of two ways: '**partition definition file**' or '**partition definition script**'.
 
 **Notes**
-.. note:: ``partition definition file`` can be used for RedHat, SLES, and Ubuntu.  Because disk configuraiton for Ubuntu is different from RedHat, there may be some special sections required for Ubuntu. 
+.. note:: ``partition definition file`` can be used for RedHat, SLES, and Ubuntu.  Because disk configuraiton for Ubuntu is different from RedHat, there may be some special sections required for Ubuntu.
 
-.. warning:: ``partition  definition script`` has only been tested on RedHat and Ubuntu, use at your own risk for SLES. 
+.. warning:: ``partition  definition script`` has only been tested on RedHat and Ubuntu, use at your own risk for SLES.
 
 .. END_Overview
 
 
 .. BEGIN_partition_definition_file_Overview
 
-You could create a customized osimage partition file, say /install/custom/my-partitions, that contains the disk partitioning definition, then associate the partition file with osimage, the nodeset command will insert the contents of this file directly into the generated autoinst configuration file that will be used by the OS installer. 
+You could create a customized osimage partition file, say /install/custom/my-partitions, that contains the disk partitioning definition, then associate the partition file with osimage, the nodeset command will insert the contents of this file directly into the generated autoinst configuration file that will be used by the OS installer.
 
 .. END_partition_definition_file_Overview
 
@@ -108,7 +108,7 @@ Here is partition definition file example for SLES standard partition in X86_64
             </partition>
         </partitions>
     </drive>
-	   
+	
 .. END_partition_definition_file_example_SLES_Standard_Partitions_for_X86_64
 
 .. BEGIN_partition_definition_file_example_SLES_LVM_for_ppc64
@@ -223,7 +223,7 @@ The following is an example of a partition definition file for a SLES LVM Partit
 	  <type config:type="symbol">CT_LVM</type>
 	  <use>all</use>
 	</drive>
-	   
+	
 .. END_partition_definition_file_example_SLES_LVM_for_ppc64
 
 .. BEGIN_partition_definition_file_example_SLES_Standard_partition_for_ppc64
@@ -286,7 +286,7 @@ Here is partition definition file example for SLES standard partition in ppc64 m
 
 .. BEGIN_partition_definition_file_example_SLES_RAID1
 
-To partition definition file example for SLES RAID1 refer to `Configure RAID before Deploy OS <http://xcat-docs.readthedocs.org/en/latest/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/raid_cfg.html>`_ 
+To partition definition file example for SLES RAID1 refer to `Configure RAID before Deploy OS <http://xcat-docs.readthedocs.org/en/latest/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/raid_cfg.html>`_
 
 .. END_partition_definition_file_example_SLES_RAID1
 
@@ -357,14 +357,14 @@ Run the following commands to associate the partition with the osimage: ::
 
 - For RedHat, when nodeset runs and generates the /install/autoinst file for a node, it will replace the #XCAT_PARTITION_START#...#XCAT_PARTITION_END# directives from your osimage template with the contents of your custom partitionfile.
 
-- For Ubuntu, when nodeset runs and generates the /install/autoinst file for a node, it will generate a script to write the partition configuration to /tmp/partitionfile, this script will replace the #XCA_PARTMAN_RECIPE_SCRIPT# directive in /install/autoinst/<node>.pre. 
+- For Ubuntu, when nodeset runs and generates the /install/autoinst file for a node, it will generate a script to write the partition configuration to /tmp/partitionfile, this script will replace the #XCA_PARTMAN_RECIPE_SCRIPT# directive in /install/autoinst/<node>.pre.
 
 .. END_partition_definition_file_Associate_partition_file_with_osimage_common
 
 
 .. BEGIN_Partition_Definition_Script_overview
 
-Create a shell script that will be run on the node during the install process to dynamically create the disk partitioning definition. This script will be run during the OS installer %pre script on RedHat or preseed/early_command on Unbuntu execution and must write the correct partitioning definition into the file /tmp/partitionfile on the node 
+Create a shell script that will be run on the node during the install process to dynamically create the disk partitioning definition. This script will be run during the OS installer %pre script on RedHat or preseed/early_command on Unbuntu execution and must write the correct partitioning definition into the file /tmp/partitionfile on the node
 
 .. END_Partition_Definition_Script_overview
 
@@ -466,7 +466,7 @@ If not specified, the default value will be used.
     nodeset <nodename> osimage=<osimage>
 
 - the 'd:' preceding the filename tells nodeset that this is a partition disk file.
-- For Ubuntu, when nodeset runs and generates the /install/autoinst file for a node, it will generate a script to write the content of the partition disk file to /tmp/install_disk, this context to run the script will replace the #XCA_PARTMAN_DISK_SCRIPT# directive in /install/autoinst/<node>.pre. 
+- For Ubuntu, when nodeset runs and generates the /install/autoinst file for a node, it will generate a script to write the content of the partition disk file to /tmp/install_disk, this context to run the script will replace the #XCA_PARTMAN_DISK_SCRIPT# directive in /install/autoinst/<node>.pre.
 
 .. END_Partition_Disk_File_ubuntu_only
 
@@ -474,23 +474,23 @@ If not specified, the default value will be used.
 
 The disk script contains a script to generate a partitioning disk file named "/tmp/install_disk". for example: ::
 
-    rm /tmp/devs-with-boot 2>/dev/null || true; 
-    for d in $(list-devices partition); do 
-        mkdir -p /tmp/mymount; 
-        rc=0; 
-        mount $d /tmp/mymount || rc=$?; 
-        if [[ $rc -eq 0 ]]; then 
-            [[ -d /tmp/mymount/boot ]] && echo $d >>/tmp/devs-with-boot; 
-            umount /tmp/mymount; 
-        fi 
-    done; 
-    if [[ -e /tmp/devs-with-boot ]]; then 
-        head -n1 /tmp/devs-with-boot | egrep  -o '\S+[^0-9]' > /tmp/install_disk; 
-        rm /tmp/devs-with-boot 2>/dev/null || true; 
-    else 
-        DEV=`ls /dev/disk/by-path/* -l | egrep -o '/dev.*[s|h|v]d[^0-9]$' | sort -t : -k 1 -k 2 -k 3 -k 4 -k 5 -k 6 -k 7 -k 8 -g | head -n1 | egrep -o '[s|h|v]d.*$'`; 
-        if [[ "$DEV" == "" ]]; then DEV="sda"; fi; 
-        echo "/dev/$DEV" > /tmp/install_disk; 
+    rm /tmp/devs-with-boot 2>/dev/null || true;
+    for d in $(list-devices partition); do
+        mkdir -p /tmp/mymount;
+        rc=0;
+        mount $d /tmp/mymount || rc=$?;
+        if [[ $rc -eq 0 ]]; then
+            [[ -d /tmp/mymount/boot ]] && echo $d >>/tmp/devs-with-boot;
+            umount /tmp/mymount;
+        fi
+    done;
+    if [[ -e /tmp/devs-with-boot ]]; then
+        head -n1 /tmp/devs-with-boot | egrep  -o '\S+[^0-9]' > /tmp/install_disk;
+        rm /tmp/devs-with-boot 2>/dev/null || true;
+    else
+        DEV=`ls /dev/disk/by-path/* -l | egrep -o '/dev.*[s|h|v]d[^0-9]$' | sort -t : -k 1 -k 2 -k 3 -k 4 -k 5 -k 6 -k 7 -k 8 -g | head -n1 | egrep -o '[s|h|v]d.*$'`;
+        if [[ "$DEV" == "" ]]; then DEV="sda"; fi;
+        echo "/dev/$DEV" > /tmp/install_disk;
     fi;
 
 If not specified, the default value will be used.
@@ -501,7 +501,7 @@ If not specified, the default value will be used.
     nodeset <nodename> osimage=<osimage>
 
 - the 's:' prefix tells nodeset that is a script, the 's:d:' preceding the filename tells nodeset that this is a script to generate the partition disk file.
-- For Ubuntu, when nodeset runs and generates the /install/autoinst file for a node, this context to run the script will replace the #XCA_PARTMAN_DISK_SCRIPT# directive in /install/autoinst/<node>.pre. 
+- For Ubuntu, when nodeset runs and generates the /install/autoinst file for a node, this context to run the script will replace the #XCA_PARTMAN_DISK_SCRIPT# directive in /install/autoinst/<node>.pre.
 
 .. END_Partition_Disk_Script_ubuntu_only
 
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/create_img.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/create_img.rst
index 6de3688dd..4fcb28264 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/create_img.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/create_img.rst
@@ -11,11 +11,11 @@ If using an ISO, copy it to (or NFS mount it on) the management node, and then r
 	
 If using a DVD, put it in the DVD drive of the management node and run: ::
 
-    copycds /dev/<dvd-drive-name> 
+    copycds /dev/<dvd-drive-name>
 
 To see the list of osimages: ::
 
-    lsdef -t osimage 
+    lsdef -t osimage
 	
 To see the attributes of a particular osimage: ::
 
@@ -31,7 +31,7 @@ Below is an example of osimage definitions created by ``copycds``: ::
 	rhels7.2-ppc64le-netboot-compute  (osimage)
 	rhels7.2-ppc64le-stateful-mgmtnode  (osimage)
 
-In these osimage definitions shown above 
+In these osimage definitions shown above
 
 * **<os>-<arch>-install-compute** is the default osimage definition used for diskful installation
 * **<os>-<arch>-netboot-compute** is the default osimage definition used for diskless installation
@@ -39,7 +39,7 @@ In these osimage definitions shown above
 
 **Note**: There are more things needed for **ubuntu ppc64le** osimages:
 
-For ubuntu ppc64le, the initrd.gz shipped with the ISO does not support network booting. In order to install ubuntu with xCAT, you need to follow the steps below to complete the osimage definition.
+For pre-18.04 version of Ubuntu for ppc64el, the initrd.gz shipped with the ISO does not support network booting. In order to install ubuntu with xCAT, you need to follow the steps below to complete the osimage definition.
 
 * Download mini.iso from
 
@@ -48,9 +48,9 @@ For ubuntu ppc64le, the initrd.gz shipped with the ISO does not support network
   [ubuntu 14.04.2]: http://xcat.org/files/netboot/ubuntu14.04.2/ppc64el/mini.iso
 
   [ubuntu 14.04.3]: http://xcat.org/files/netboot/ubuntu14.04.3/ppc64el/mini.iso
-  
+
   [ubuntu 14.04.4]: http://xcat.org/files/netboot/ubuntu14.04.4/ppc64el/mini.iso
-  
+
   [ubuntu 16.04]: http://xcat.org/files/netboot/ubuntu16.04/ppc64el/mini.iso
 
   [ubuntu 16.04.1]: http://xcat.org/files/netboot/ubuntu16.04.1/ppc64el/mini.iso
@@ -65,7 +65,7 @@ For ubuntu ppc64le, the initrd.gz shipped with the ISO does not support network
     mkdir -p /install/<ubuntu-version>/ppc64el/install/netboot
     cp /tmp/iso/install/initrd.gz /install/<ubuntu-version>/ppc64el/install/netboot
 
-**[Below tips maybe helpful for you]** 
+**[Below tips maybe helpful for you]**
 
 **[Tips 1]**
 
@@ -82,7 +82,7 @@ In this way, if you need to install some additional RPMs into your MN later, you
 **[Tips 2]**
 
 You can create/modify an osimage definition easily with any existing osimage definition, the command is ::
-    
+
     mkdef -t osimage -o <new osimage> --template <existing osimage> [<attribute>=<value>, ...]
 
 Except the specified attributes *<attribute>*, the attributes of *<new osimage>* will inherit the values of template osimage *<existing osimage>*.
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/deploy_os.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/deploy_os.rst
index 4a358b41e..a72a74c23 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/deploy_os.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/deploy_os.rst
@@ -1,7 +1,7 @@
 Initialize the Compute for Deployment
 =====================================
 
-XCAT use '**nodeset**' command to associate a specific image to a node which will be installed with this image. :: 
+XCAT use '**nodeset**' command to associate a specific image to a node which will be installed with this image. ::
 
     nodeset <nodename> osimage=<osimage>
 
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/driver_update_disk.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/driver_update_disk.rst
index 717469dc3..19d232d97 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/driver_update_disk.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/driver_update_disk.rst
@@ -25,7 +25,7 @@ There are two approaches for xCAT to find the driver disk (pick one):
 
       chdef -t osimage <osimagename> driverupdatesrc=dud:<full path of driver disk>
 
-#. Put the driver update disk in the directory ``<installroot>/driverdisk/<os>/<arch>`` (example: ``/install/driverdisk/sles11.1/x86_64``). 
+#. Put the driver update disk in the directory ``<installroot>/driverdisk/<os>/<arch>`` (example: ``/install/driverdisk/sles11.1/x86_64``).
 
    During the running of the ``genimage``, ``geninitrd``, or ``nodeset`` commands, xCAT will look for driver update disks in the directory ``<installroot>/driverdisk/<os>/<arch>``.
 
@@ -68,22 +68,22 @@ If 'osupdatename' is specified, the kernel shipped with the 'osupdatename' will
 
   #. ::
       nodeset <noderange> osimage=<osimagename>
-   
+
   #. ::
       geninitrd <osimagename>
       nodeset <noderange> osimage=<osimagename> --noupdateinitrd
 
 **Note:** 'geninitrd' + 'nodeset --noupdateinitrd' is useful when you need to run nodeset frequently for a diskful node. 'geninitrd' only needs be run once to rebuild the initrd and 'nodeset --noupdateinitrd' will not touch the initrd and kernel in /tftpboot/xcat/osimage/<osimage name>/.
 
-- If putting the driver disk in <installroot>/driverdisk/<os>/<arch>: 
+- If putting the driver disk in <installroot>/driverdisk/<os>/<arch>:
 
 Running 'nodeset <nodenrage>' in anyway will load the driver disk
 
-.. END_inject_into_initrd__for_diskful_for_DUD     
+.. END_inject_into_initrd__for_diskful_for_DUD
 
-.. BEGIN__inject_into_initrd__for_diskful_for_RPM  
+.. BEGIN__inject_into_initrd__for_diskful_for_RPM
 
-There are two ways to inject drivers: 
+There are two ways to inject drivers:
 
    #. Using nodeset command only: ::
 
@@ -97,7 +97,7 @@ There are two ways to inject drivers:
 **Note:** 'geninitrd' + 'nodeset --noupdateinitrd' is useful when you need to run nodeset frequently for diskful nodes. 'geninitrd' only needs to be run once to rebuild the initrd and 'nodeset --noupdateinitrd' will not touch the initrd and kernel in /tftpboot/xcat/osimage/<osimage name>/.
 
 The option '--ignorekernelchk' is used to skip the kernel version checking when injecting drivers from osimage.driverupdatesrc. To use this flag, you should make sure the drivers in the driver rpms are usable for the target kernel.
-.. END_inject_into_initrd__for_diskful_for_RPM  
+.. END_inject_into_initrd__for_diskful_for_RPM
 
 .. BEGIN_inject_into_initrd__for_diskless_for_DUD
 
@@ -106,20 +106,20 @@ The option '--ignorekernelchk' is used to skip the kernel version checking when
 Run the following command: ::
 
       genimage <osimagename>
-    
-- If putting the driver disk in <installroot>/driverdisk/<os>/<arch>: 
+
+- If putting the driver disk in <installroot>/driverdisk/<os>/<arch>:
 
 Running 'genimage' in anyway will load the driver disk
 .. END_inject_into_initrd__for_diskless_for_DUD
-      
-.. BEGIN_inject_into_initrd__for_diskless_for_RPM 
+
+.. BEGIN_inject_into_initrd__for_diskless_for_RPM
 
 Run the following command:  ::
 
    genimage <osimagename> [--ignorekernelchk]
 
 The option '--ignorekernelchk' is used to skip the kernel version checking when injecting drivers from osimage.driverupdatesrc. To use this flag, you should make sure the drivers in the driver rpms are usable for the target kernel.
-.. END_inject_into_initrd__for_diskless_for_RPM 
+.. END_inject_into_initrd__for_diskless_for_RPM
 
 .. BEGIN_node
 
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/enable_kdump.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/enable_kdump.rst
index 10f5ec4eb..d3cc84a67 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/enable_kdump.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/enable_kdump.rst
@@ -22,10 +22,10 @@ The following attributes of an osimage should be modified to enable ``kdump``:
 Configure the ``pkglist`` file
 ------------------------------
 
-The ``pkglist`` for the osimage needs to include the appropriate RPMs.  The following list of RPMs are provided as a sample, always refer to the Operating System specific documentataion to ensure the required packages are there for ``kdump`` support. 
+The ``pkglist`` for the osimage needs to include the appropriate RPMs.  The following list of RPMs are provided as a sample, always refer to the Operating System specific documentataion to ensure the required packages are there for ``kdump`` support.
 
 * **[RHELS]** ::
-    
+
     kexec-tools
     crash
 
@@ -42,7 +42,7 @@ The ``pkglist`` for the osimage needs to include the appropriate RPMs.  The foll
 Modify the ``exlist`` file
 --------------------------
 
-The default diskless image created by ``copycds`` excludes the ``/boot`` directory in the exclude list file, but this is required for ``kdump``.  
+The default diskless image created by ``copycds`` excludes the ``/boot`` directory in the exclude list file, but this is required for ``kdump``.
 
 Update the ``exlist`` for the target osimage and remove the line ``/boot``: ::
 
@@ -67,10 +67,10 @@ The kdump will create a new initrd which used in the dumping stage. The ``/tmp``
 
     <TODO>
 
-The ``dump`` attribute 
+The ``dump`` attribute
 ----------------------
 
-To support kernel dumps, the ``dump`` attribute **must** be set on the osimage definition.  If not set, kdump service will not be enabled.  The ``dump`` attribute defines the NFS remote path where the crash information is to be stored. 
+To support kernel dumps, the ``dump`` attribute **must** be set on the osimage definition.  If not set, kdump service will not be enabled.  The ``dump`` attribute defines the NFS remote path where the crash information is to be stored.
 
 Use the ``chdef`` command to set a value of the ``dump`` attribute: ::
 
@@ -86,9 +86,9 @@ If the NFS server is the Service Node or Management Node, the server can be left
 The ``crashkernelsize`` attribute
 ---------------------------------
 
-To allow the Operating System to automatically reserve the appropriate amount of memory for the ``kdump`` kernel, set ``crashkernelsize=auto``. 
+To allow the Operating System to automatically reserve the appropriate amount of memory for the ``kdump`` kernel, set ``crashkernelsize=auto``.
 
-For setting specific sizes, use the following example: 
+For setting specific sizes, use the following example:
 
 * For System X machines, set the ``crashkernelsize`` using this format: ::
 
@@ -98,7 +98,7 @@ For setting specific sizes, use the following example:
 
     chdef -t osimage <image name> crashkernelsize=<size>M
 
-* For System P machines, set the ``crashkernelsize`` using this format: :: 
+* For System P machines, set the ``crashkernelsize`` using this format: ::
 
     chdef -t osimage <image name> crashkernelsize=<size>@32M
 
@@ -113,7 +113,7 @@ The ``crashkernelsize`` is not large enough, you should change the ``crashkernel
 The ``enablekdump`` postscript
 ------------------------------
 
-xCAT provides a postscript ``enablekdump`` that can be added to the Nodes to automatically start the ``kdump`` service when the node boots.  Add to the nodes using the following command: :: 
+xCAT provides a postscript ``enablekdump`` that can be added to the Nodes to automatically start the ``kdump`` service when the node boots.  Add to the nodes using the following command: ::
 
     chdef -t node <node range> -p postscripts=enablekdump
 
@@ -123,7 +123,7 @@ Manually trigger a kernel panic on Linux
 
 Normally, kernel ``panic()`` will trigger booting into capture kernel. Once the kernel panic is triggered, the node will reboot into the capture kernel, and a kernel dump (vmcore) will be automatically saved to the directory on the specified NFS server (``<nfs_server_ip>``).
 
-Check your Operating System specific documentation for the path where the kernel dump is saved.  For example: 
+Check your Operating System specific documentation for the path where the kernel dump is saved.  For example:
 
 * **[RHELS6]** ::
 
@@ -143,13 +143,13 @@ This will force the Linux kernel to crash, and the ``address-YYYY-MM-DD-HH:MM:SS
 Dump Analysis
 -------------
 
-Once the system has returned from recovering the crash, you can analyze the kernel dump using the ``crash`` tool. 
+Once the system has returned from recovering the crash, you can analyze the kernel dump using the ``crash`` tool.
 
 #. Locate the recent vmcore dump file.
 
 #. Locate the kernel file for the crash server. The kernel is under ``/tftpboot/xcat/netboot/<OS name="">/<ARCH>/<profile>/kernel`` on the managenent node.
 
-#. Once you have located a vmcore dump file and kernel file, call ``crash``: :: 
+#. Once you have located a vmcore dump file and kernel file, call ``crash``: ::
 
     crash <vmcore_dump_file> <kernel_file>
 
@@ -158,7 +158,7 @@ Once the system has returned from recovering the crash, you can analyze the kern
 Appedix
 -------
 
-#. OS Documentations on kdump configuration: 
+#. OS Documentations on kdump configuration:
 
     * http://www.novell.com/support/kb/doc.php?id=3374462.
 
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/generate_img.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/generate_img.rst
index e5886603d..ad459e7a5 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/generate_img.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/generate_img.rst
@@ -3,8 +3,8 @@ Generate Diskless Image
 
 The ``copycds`` command copies the contents of the Linux media to ``/install/<os>/<arch>`` so that it will be available for installing nodes or creating diskless images.  After executing ``copycds``, there are several ``osimage`` definitions created by default.  Run ``tabdump osimage`` to view these images: ::
 
-        tabdump osimage 
-   
+        tabdump osimage
+
 The output should be similar to the following: ::
 
         "rhels7.1-ppc64le-install-compute",,"compute","linux",,"install",,"rhels7.1-ppc64le",,,"Linux","rhels7.1","ppc64le",,,,,,,,
@@ -16,7 +16,7 @@ The ``netboot-compute`` is the default **diskless** osimage created rhels7.1 ppc
 
         genimage rhels7.1-ppc64le-netboot-compute
 
-Before packing the diskless image, you have the opportunity to change any files in the image by changing to the ``rootimgdir`` and making modifications.  (e.g. ``/install/netboot/rhels7.1/ppc64le/compute/rootimg``). 
+Before packing the diskless image, you have the opportunity to change any files in the image by changing to the ``rootimgdir`` and making modifications.  (e.g. ``/install/netboot/rhels7.1/ppc64le/compute/rootimg``).
 
 However it's recommended that all changes to the image are made via post install scripts so that it's easily repeatable. Although, instead, we recommend that you make all changes to the image via your postinstall script, so that it is repeatable.  Refer to :doc:`/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/pre_post_script` for more details.
 
@@ -104,7 +104,7 @@ Skip this section if you want to use the image as is.
 
 * Modify .pkglist file to add or remove packages that are from the os distro
 
-* Modify .otherpkgs.pkglist to add or remove packages from other sources. Refer to ``Using_Updatenode`` for details 
+* Modify .otherpkgs.pkglist to add or remove packages from other sources. Refer to ``Using_Updatenode`` for details
 
 * For diskful, modify the .tmpl file to change the kickstart/autoyast configuration
 
@@ -125,7 +125,7 @@ Skip this section if you want to use the image as is.
 Deploying nodes
 ---------------
 
-You can change the provmethod of the node to the new image_name if different: :: 
+You can change the provmethod of the node to the new image_name if different: ::
 
         chdef <noderange> provmethod=<image_name>
         nodeset <noderange> osimage=<image_name>
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/install_new_kernel.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/install_new_kernel.rst
index 8a292edcf..8c0653fa6 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/install_new_kernel.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/install_new_kernel.rst
@@ -4,7 +4,7 @@ Installing a New Kernel in the Diskless Image
 
 Note: This procedure assumes you are using xCAT 2.6.1 or later.
 
-The kerneldir attribute in linuximage table can be used to assign a directory containing kernel RPMs that can be installed into diskless images. The default for kernerdir is /install/kernels. To add a new kernel, create a directory named <kernelver> under the kerneldir, and genimage will pick them up from there. 
+The kerneldir attribute in linuximage table can be used to assign a directory containing kernel RPMs that can be installed into diskless images. The default for kernerdir is /install/kernels. To add a new kernel, create a directory named <kernelver> under the kerneldir, and genimage will pick them up from there.
 
 The following examples assume you have the kernel RPM in /tmp and is using the default value for kerneldir (/install/kernels).
 
@@ -15,42 +15,42 @@ The RPM names below are only examples, substitute your specific level and archit
 * **[RHEL]**
 
 The RPM kernel package is usually named: kernel-<kernelver>.rpm.
-For example, kernel-3.10.0-229.ael7b.ppc64le.rpm means kernelver=3.10.0-229.ael7b.ppc64le. :: 
+For example, kernel-3.10.0-229.ael7b.ppc64le.rpm means kernelver=3.10.0-229.ael7b.ppc64le. ::
 
         mkdir -p /install/kernels/3.10.0-229.ael7b.ppc64le
         cp /tmp/kernel-3.10.0-229.ael7b.ppc64le.rpm /install/kernels/3.10.0-229.ael7b.ppc64le
         createrepo /install/kernels/3.10.0-229.ael7b.ppc64le/
         chdef -t osimage <imagename> -p pkgdir=/install/kernels/3.10.0-229.ael7b.ppc64le/
 
-Run genimage/packimage to update the image with the new kernel. 
+Run genimage/packimage to update the image with the new kernel.
 Note: If downgrading the kernel, you may need to first remove the rootimg directory. ::
 
-        genimage <imagename> -k 3.10.0-229.ael7b.ppc64le 
+        genimage <imagename> -k 3.10.0-229.ael7b.ppc64le
         packimage <imagename>
 
 * **[SLES]**
 
-The RPM kernel package is usually separated into two parts: kernel-<arch>-base and kernel<arch>. 
+The RPM kernel package is usually separated into two parts: kernel-<arch>-base and kernel<arch>.
 For example, /tmp contains the following two RPMs: ::
 
          kernel-default-3.12.28-4.6.ppc64le.rpm
          kernel-default-base-3.12.28-4.6.ppc64le.rpm
          kernel-default-devel-3.12.28-4.6.ppc64le.rpm
 
- 
+
 3.12.28-4.6.ppc64le is NOT the kernel version,3.12.28-4-ppc64le is the kernel version.
 The "4.6.ppc64le" is replaced with "4-ppc64le": ::
 
          mkdir -p /install/kernels/3.12.28-4-ppc64le/
          cp /tmp/kernel-default-3.12.28-4.6.ppc64le.rpm /install/kernels/3.12.28-4-ppc64le/
-         cp /tmp/kernel-default-base-3.12.28-4.6.ppc64le.rpm /install/kernels/3.12.28-4-ppc64le/ 
+         cp /tmp/kernel-default-base-3.12.28-4.6.ppc64le.rpm /install/kernels/3.12.28-4-ppc64le/
          cp /tmp/kernel-default-devel-3.12.28-4.6.ppc64le.rpm /install/kernels/3.12.28-4-ppc64le/
          chdef -t osimage <imagename> -p pkgdir=/install/kernels/3.12.28-4-ppc64le/
 
-Run genimage/packimage to update the image with the new kernel. 
+Run genimage/packimage to update the image with the new kernel.
 Note: If downgrading the kernel, you may need to first remove the rootimg directory.
 
-Since the kernel version name is different from the kernel rpm package name, the -k flag MUST to be specified on the genimage command. :: 
+Since the kernel version name is different from the kernel rpm package name, the -k flag MUST to be specified on the genimage command. ::
 
          genimage <imagename> -k 3.12.28-4-ppc64le 3.12.28-4.6
          packimage <imagename>
@@ -60,16 +60,16 @@ Installing New Kernel Drivers to Diskless Initrd
 =================================================
 
 
-The kernel drivers in the diskless initrd are used for the devices during the netboot. If you are missing one or more kernel drivers for specific devices (especially for the network device), the netboot process will fail. xCAT offers two approaches to add additional drivers to the diskless initrd during the running of genimage. 
+The kernel drivers in the diskless initrd are used for the devices during the netboot. If you are missing one or more kernel drivers for specific devices (especially for the network device), the netboot process will fail. xCAT offers two approaches to add additional drivers to the diskless initrd during the running of genimage.
 
-Use the '-n' flag to add new drivers to the diskless initrd: :: 
+Use the '-n' flag to add new drivers to the diskless initrd: ::
 
          genimage <imagename> -n <new driver list>
 
 
-Generally, the genimage command has a default driver list which will be added to the initrd. But if you specify the '-n' flag, the default driver list will be replaced with your <new driver list>. That means you need to include any drivers that you need from the default driver list into your <new driver list>. 
+Generally, the genimage command has a default driver list which will be added to the initrd. But if you specify the '-n' flag, the default driver list will be replaced with your <new driver list>. That means you need to include any drivers that you need from the default driver list into your <new driver list>.
 
-The default driver list: :: 
+The default driver list: ::
 
          rh-x86:   tg3 bnx2 bnx2x e1000 e1000e igb mlx4_en virtio_net be2net
          rh-ppc:   e1000 e1000e igb ibmveth ehea
@@ -78,6 +78,6 @@ The default driver list: ::
          sels-ppc: tg3 e1000 e1000e igb ibmveth ehea be2net
          sles-ppcle: scsi_mod libata scsi_tgt jbd2 mbcache crc16 virtio virtio_ring libahci crc-t10dif scsi_transport_srp af_packet ext3 ext4 virtio_pci virtio_blk scsi_dh ahci megaraid_sas sd_mod ibmvscsi
 
-Note: With this approach, xCAT will search for the drivers in the rootimage. You need to make sure the drivers have been included in the rootimage before generating the initrd. You can install the drivers manually in an existing rootimage (using chroot) and run genimage again, or you can use a postinstall script to install drivers to the rootimage during your initial genimage run. 
+Note: With this approach, xCAT will search for the drivers in the rootimage. You need to make sure the drivers have been included in the rootimage before generating the initrd. You can install the drivers manually in an existing rootimage (using chroot) and run genimage again, or you can use a postinstall script to install drivers to the rootimage during your initial genimage run.
 
-Use the driver rpm package to add new drivers from rpm packages to the diskless initrd. Refer to the :doc:`/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/cfg_second_adapter` for details. 
+Use the driver rpm package to add new drivers from rpm packages to the diskless initrd. Refer to the :doc:`/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/cfg_second_adapter` for details.
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond.rst
index 0ed1084d4..59d950d03 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond.rst
@@ -3,9 +3,9 @@ Configure Bond using two Ethernet Adapters
 
 The following example sets the xCAT properties for compute node ``cn1`` to create:
 
-  * Compute node ``cn1`` with two physical NICs: ``eth2`` and ``eth3``  
-  * Bond eth2 and eth3 as ``bond0`` 
-  * Assign ip ``40.0.0.1`` to the bonded interface ``bond0`` 
+  * Compute node ``cn1`` with two physical NICs: ``eth2`` and ``eth3``
+  * Bond eth2 and eth3 as ``bond0``
+  * Assign ip ``40.0.0.1`` to the bonded interface ``bond0``
 
 Add network object into the networks table
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -18,9 +18,9 @@ Define attributes in the ``nics`` table
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 #. Compute node ``cn1`` has two physical NICs: ``eth2`` and ``eth3`` ::
- 
+
     chdef cn1 nictypes.eth2=ethernet nictypes.eth3=ethernet
-   
+
 #. Define ``bond0`` and bond ``eth2`` and ``eth3`` as ``bond0`` ::
 
     chdef cn1 nictypes.bond0=bond nicdevices.bond0="eth2|eth3"
@@ -49,5 +49,5 @@ Login to compute node cn1 and check bonding options in ``/etc/sysconfig/network-
    BONDING_OPTS="mode=802.3ad xmit_hash_policy=layer2+3"
 
 
-* ``mode=802.3ad`` requires additional configuration on the switch. 
+* ``mode=802.3ad`` requires additional configuration on the switch.
 * ``mode=2`` can be used for bonding without additional switch configuration.
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_bridge.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_bridge.rst
index fec33c383..4ccffed17 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_bridge.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_bridge.rst
@@ -3,10 +3,10 @@ Configure Bridge Based on Bond Adapters
 
 The following example sets the xCAT properties for compute node ``cn1`` to create:
 
-  * Compute node ``cn1`` with two physical NICs: ``eth2`` and ``eth3``  
-  * Bond eth2 and eth3 as ``bond0`` 
+  * Compute node ``cn1`` with two physical NICs: ``eth2`` and ``eth3``
+  * Bond eth2 and eth3 as ``bond0``
   * Create bridge ``br0`` based on ``bond0``
-  * Assign ip ``40.0.0.1`` to the bridge interface ``br0`` 
+  * Assign ip ``40.0.0.1`` to the bridge interface ``br0``
 
 Add network object into the networks table
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -19,9 +19,9 @@ Define attributes in the ``nics`` table
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 #. Compute node ``cn1`` has two physical NICs: ``eth2`` and ``eth3`` ::
- 
+
     chdef cn1 nictypes.eth2=ethernet nictypes.eth3=ethernet
-   
+
 #. Define ``bond0`` and bond ``eth2`` and ``eth3`` as ``bond0`` ::
 
     chdef cn1 nictypes.bond0=bond nicdevices.bond0="eth2|eth3"
@@ -62,7 +62,7 @@ Login to compute node cn1 and check bonding options in ``/etc/sysconfig/network-
     BRIDGE=br0
 
 Check ``ifcfg-br0`` under ``/etc/sysconfig/network-scripts/`` ::
-   
+
    DEVICE="br0"
    BOOTPROTO="static"
    IPADDR="40.0.0.1"
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_vlan.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_vlan.rst
index ba249126f..caf970ba6 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_vlan.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_vlan.rst
@@ -3,10 +3,10 @@ Configure VLAN Based on Bond Adapters
 
 The following example sets the xCAT properties for compute node ``cn1`` to create:
 
-  * Compute node ``cn1`` with two physical NICs: ``eth2`` and ``eth3`` 
-  * Bond eth2 and eth3 as ``bond0`` 
+  * Compute node ``cn1`` with two physical NICs: ``eth2`` and ``eth3``
+  * Bond eth2 and eth3 as ``bond0``
   * Create bridge ``bond0.1`` based on ``bond0``
-  * Assign ip ``40.0.0.1`` to the bridge interface ``bond0.1`` 
+  * Assign ip ``40.0.0.1`` to the bridge interface ``bond0.1``
 
 Add network object into the networks table
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -19,9 +19,9 @@ Define attributes in the ``nics`` table
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 #. Compute node ``cn1`` has two physical NICs: ``eth2`` and ``eth3`` ::
- 
+
     chdef cn1 nictypes.eth2=ethernet nictypes.eth3=ethernet
-   
+
 #. Define ``bond0`` and bond ``eth2`` and ``eth3`` as ``bond0`` ::
 
     chdef cn1 nictypes.bond0=bond nicdevices.bond0="eth2|eth3"
@@ -36,7 +36,7 @@ Define attributes in the ``nics`` table
 
 #. Define ``nichostnamesuffixes`` for ``bond0.1`` in case ``makehosts`` to update ``/etc/hosts``, since the value for ``nichostnamesuffixes`` cannot contain ".", other characters are recommended instead of ".", like following: ::
 
-    chdef cn1 nichostnamesuffixes.bond0.1=-bond0-1 
+    chdef cn1 nichostnamesuffixes.bond0.1=-bond0-1
 
 Enable ``confignetwork`` to configure bridge
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -53,7 +53,7 @@ Verify VLAN
 ~~~~~~~~~~~
 
 Login to compute node cn1 and check ``ifcfg-bond0.1`` under ``/etc/sysconfig/network-scripts/`` ::
-   
+
    DEVICE="bond0.1"
    BOOTPROTO="static"
    IPADDR="40.0.0.1"
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_vlan_bridge.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_vlan_bridge.rst
index 317946682..70bf4e6ba 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_vlan_bridge.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_vlan_bridge.rst
@@ -3,8 +3,8 @@ Configure BOND, VLAN and BRIDGES
 
 The following example set the xCAT properties for compute node ``cn1`` to achieve the following network configuration using the ``confignetwork`` postscript:
 
-  * Compute node ``cn1`` has two physical NICs: ``eth2`` and ``eth3``  
-  * Bond ``eth2`` and ``eth3`` as ``bond0`` 
+  * Compute node ``cn1`` has two physical NICs: ``eth2`` and ``eth3``
+  * Bond ``eth2`` and ``eth3`` as ``bond0``
   * From ``bond0``, create 2 VLANs: ``bond0.1`` and ``bond0.2``
   * Make bridge ``br1`` using ``bond0.1`` with IP (10.0.0.1)
   * Make bridge ``br2`` using ``bond0.2`` with IP (20.0.0.1)
@@ -27,16 +27,16 @@ Define attributes in the ``nics`` table
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 #. Compute node ``cn1`` has two physical NICs: ``eth2`` and ``eth3`` ::
- 
+
     chdef cn1 nictypes.eth2=ethernet nictypes.eth3=ethernet
-   
+
 #. Define ``bond0`` and bond ``eth2`` and ``eth3`` as ``bond0`` ::
 
     chdef cn1 nictypes.bond0=bond \
               nicdevices.bond0="eth2|eth3"
 
 #. From ``bond0``, create 2 VLANs: ``bond0.1`` and ``bond0.2`` ::
-    
+
     chdef cn1 nictypes.bond0.1=vlan \
               nictypes.bond0.2=vlan \
               nicdevices.bond0.1=bond0 \
@@ -71,7 +71,7 @@ Check result
 ~~~~~~~~~~~~
 
 Use ``ip`` command on ``cn1`` to check all NICs ::
-   
+
     xdsh cn1 "ip addr"
 
 Check all network configuration files under ``/etc/sysconfig/network-scripts/``.
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bridge.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bridge.rst
index 02c0a1075..816e8fc08 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bridge.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bridge.rst
@@ -23,7 +23,7 @@ Define attributes in the ``nics`` table
 
 #. Define bridge ``br1`` based on ``eth1`` ::
 
-    chdef cn1 nictypes.br1=bridge nicdevices.br1="eth1" 
+    chdef cn1 nictypes.br1=bridge nicdevices.br1="eth1"
     chdef cn1 nicips.br1=30.5.106.9
 
 #. Define ``nicnetworks`` for ``br1`` ::
@@ -50,7 +50,7 @@ Login to compute node cn1 and check configure files in ``ifcfg-br1`` under ``/et
     STP=on
 
 Check ``ifcfg-eth1`` under ``/etc/sysconfig/network-scripts/`` ::
-   
+
     BRIDGE=br1
 
 Use ``ip addr`` command to check if ``br1``, ``eth0.6`` and ``eth0.7`` are correct.
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_custom_scripts.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_custom_scripts.rst
index 8b352f3f3..37c5183ac 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_custom_scripts.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_custom_scripts.rst
@@ -26,5 +26,5 @@ If using customized script to configure NIC, ``niccustomscripts`` for the specif
 
   #. Use ``xdsh cn1 "ip addr show eth1"`` to check the NIC
 
-  #. Check ``ifcfg-eth1`` under ``/etc/sysconfig/network-scripts/`` 
+  #. Check ``ifcfg-eth1`` under ``/etc/sysconfig/network-scripts/``
 
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_ethernet_nic.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_ethernet_nic.rst
index 5e5755deb..abf105bb4 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_ethernet_nic.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_ethernet_nic.rst
@@ -12,9 +12,9 @@ The following example sets the xCAT properties for compute node ``cn1`` to creat
 Add/update networks into the xCAT DB
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Add/update additional networks ``net11`` and ``net13`` into ``networks`` table::    
+Add/update additional networks ``net11`` and ``net13`` into ``networks`` table::
 
-    chdef -t network net11 net=11.1.89.0 mask=255.255.255.0 
+    chdef -t network net11 net=11.1.89.0 mask=255.255.255.0
     chdef -t network net13 net=13.1.89.0 mask=255.255.255.0
 
 **Note:** MTU can be customized as ``mtu`` in ``networks`` table for specified network.
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_vlan_bridge.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_vlan_bridge.rst
index ebbf9fa12..35982cac5 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_vlan_bridge.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_vlan_bridge.rst
@@ -30,7 +30,7 @@ Add network object into the networks table
 
 Use the ``chdef`` command to add/modify the networks in the ``networks`` table ::
 
-    chdef -t network net60 net=60.0.0.0 mask=255.0.0.0 
+    chdef -t network net60 net=60.0.0.0 mask=255.0.0.0
     chdef -t network net70 net=70.0.0.0 mask=255.0.0.0
     chdef cn1 nicnetworks.br1=net60 nicnetworks.br2=net70
 
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_routes.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_routes.rst
index b1903bc93..507171bbc 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_routes.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_routes.rst
@@ -3,7 +3,7 @@ Configure routes
 
 There are 2 ways to configure OS route in xCAT:
 
-  * ``makeroutes``: command to add or delete routes on the management node or any given nodes. 
+  * ``makeroutes``: command to add or delete routes on the management node or any given nodes.
   * ``setroute``: script to replace/add the routes to the node, it can be used in postscripts/postbootscripts.
 
 ``makeroutes`` or ``setroute`` will modify OS temporary route, it also modifies persistent route in ``/etc/sysconfig/static-routes`` file.
@@ -29,7 +29,7 @@ Configure ``routes`` table
     #routename,net,mask,gateway,ifname,comments,disable
     "30net","30.0.0.0","255.0.0.0","0.0.0.0","eth2",,
     "20net","20.0.0.0","255.0.0.0","0.0.0.0","eth1",,
-    "defaultroute","default","255.0.0.0","10.0.0.101",,, 
+    "defaultroute","default","255.0.0.0","10.0.0.101",,,
 
 Use ``makeroutes`` to configure OS route on xCAT management node
 ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
@@ -58,7 +58,7 @@ Use ``makeroutes`` to configure OS route for compute node
 
 #. define the names of the routes to be setup on the compute node: ::
 
-    chdef -t cn1 routenames="defaultroute,20net" 
+    chdef -t cn1 routenames="defaultroute,20net"
 
 #. add all routes from the ``routenames`` to the OS route table for the compute node: ::
 
@@ -70,7 +70,7 @@ Use ``makeroutes`` to configure OS route for compute node
 
 #. delete route ``20net`` from the OS route table for the compute node: ::
 
-    makeroutes cn1,cn2 -d -r 20net  
+    makeroutes cn1,cn2 -d -r 20net
 
 Use ``setroute`` to configure OS route for compute node
 '''''''''''''''''''''''''''''''''''''''''''''''''''''''
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_second_adapter.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_second_adapter.rst
index 8e4fda2c1..ded30393c 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_second_adapter.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_second_adapter.rst
@@ -17,7 +17,7 @@ There are 3 ways to complete this operation.
 
     # mkdef cn1 groups=all nicips.eth1="11.1.89.7|12.1.89.7" nicnetworks.eth1="net11|net12" nictypes.eth1="Ethernet"
     1 object definitions have been created or modified.
-    
+
     # chdef cn1 nicips.eth2="13.1.89.7|14.1.89.7" nicnetworks.eth2="net13|net14" nictypes.eth2="Ethernet"
     1 object definitions have been created or modified.
 
@@ -45,9 +45,9 @@ There are 3 ways to complete this operation.
 
 3. Using ``tabedit`` to edit the ``nics`` database table directly
 
-   The ``tabedit`` command opens the specified xCAT database table in a vi like editor and allows the user to edit any text and write the changes back to the database table. 
+   The ``tabedit`` command opens the specified xCAT database table in a vi like editor and allows the user to edit any text and write the changes back to the database table.
 
-   *WARNING:* Using the ``tabedit`` command is not the recommended method because it is tedious and error prone. 
+   *WARNING:* Using the ``tabedit`` command is not the recommended method because it is tedious and error prone.
 
    After changing the content of the ``nics`` table, here is the result from ``tabdump nics`` ::
 
@@ -84,8 +84,8 @@ Option "-s" writes the install nic's information into configuration file for per
 Add network object into the networks table
 ------------------------------------------
 
-The ``nicnetworks`` attribute only defines the nic that uses the IP address.  
-Other information about the network should be defined in the ``networks`` table.  
+The ``nicnetworks`` attribute only defines the nic that uses the IP address.
+Other information about the network should be defined in the ``networks`` table.
 
 Use the ``tabedit`` command to add/modify the networks in the``networks`` table ::
 
@@ -100,7 +100,7 @@ Use the ``tabedit`` command to add/modify the networks in the``networks`` table
 Option -r to remove the undefined NICS
 --------------------------------------
 
-If the compute node's nics were configured by ``confignics`` and the nics configuration changed in the nics table, user the ``confignics -r`` to remove the undefined nic.  
+If the compute node's nics were configured by ``confignics`` and the nics configuration changed in the nics table, user the ``confignics -r`` to remove the undefined nic.
 
 For example, if on a compute node the ``eth0``, ``eth1``, and ``eth2`` nics were configured: ::
 
@@ -112,7 +112,7 @@ For example, if on a compute node the ``eth0``, ``eth1``, and ``eth2`` nics were
     eth2      Link encap:Ethernet  HWaddr 00:14:5e:d9:6c:e8
     ...
 
-Delete the eth2 definition in nics table using the ``chdef`` command. 
+Delete the eth2 definition in nics table using the ``chdef`` command.
 Then run the following to remove the undefined ``eth2`` nic on the compute node: ::
 
     updatenode <noderange> -P "confignics -r"
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/prepostscripts/post_script.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/prepostscripts/post_script.rst
index 47984faf8..f976329ec 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/prepostscripts/post_script.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/prepostscripts/post_script.rst
@@ -8,7 +8,7 @@ xCAT automatically runs a few postscripts and postbootscripts that are delivered
 Types of scripts
 ~~~~~~~~~~~~~~~~
 
-There are two types of scripts in the postscripts table ( postscripts and postbootscripts). The types are based on when in the install process they will be executed. Run the following for more information:  
+There are two types of scripts in the postscripts table ( postscripts and postbootscripts). The types are based on when in the install process they will be executed. Run the following for more information:
 
     ``man postscripts``
 
@@ -17,14 +17,14 @@ There are two types of scripts in the postscripts table ( postscripts and postbo
            * **[RHEL]**
 
            Postscripts will be run before the reboot.
-           
+
            * **[SLES]**
 
            Postscripts will be run after the reboot but before the init.d process. For Linux diskless deployment, the postscripts will be run at the init.d time, and xCAT will automatically add the list of postscripts from the postbootscripts attribute to run after postscripts list.
 
 * **postbootscripts attribute** - list of postbootscripts that should be run on this Linux node at the init.d time after diskful installation reboot or diskless boot
-* **xCAT**, by default, for diskful installs only runs the postbootscripts on the install and not on reboot. In xCAT a site table attribute runbootscripts is available to change this default behavior. If set to yes, then the postbootscripts will be run on install and on reboot. 
- 
+* **xCAT**, by default, for diskful installs only runs the postbootscripts on the install and not on reboot. In xCAT a site table attribute runbootscripts is available to change this default behavior. If set to yes, then the postbootscripts will be run on install and on reboot.
+
 **xCAT automatically adds the postscripts from the xcatdefaults.postscripts attribute of the table to run first on the nodes after install or diskless boot.**
 
 Adding your own postscripts
@@ -35,7 +35,7 @@ To add your own script, place it in /install/postscripts on the management node.
 To check what scripts will be run on your node during installation: ::
 
        lsdef node1 | grep scripts
-       postbootscripts=otherpkgs 
+       postbootscripts=otherpkgs
        postscripts=syslog,remoteshell,syncfiles
 
 You can pass parameters to the postscripts. For example: ::
@@ -47,7 +47,7 @@ You can pass parameters to the postscripts. For example: ::
 p1 p2 are the parameters to script1.
 
 Postscripts could be placed in the subdirectories in /install/postscripts on management node, and specify "subdir/postscriptname" in the postscripts table to run the postscripts in the subdirectories. This feature could be used to categorize the postscripts for different purposes. Here is an example: ::
-     
+
        mkdir -p /install/postscripts/subdir1
        mkdir -p /install/postscripts/subdir2
        cp postscript1 /install/postscripts/subdir1/
@@ -69,7 +69,7 @@ We could write a script, say, /install/postscripts/nicbondscript, the nicbondscr
 
        [root@xcatmn ~]#
 
-Then :: 
+Then ::
 
        chdef <nodename> -p postbootscripts=nicbondscript
 
@@ -239,7 +239,7 @@ If the site table precreatemypostscripts attribute is set to 1 or yes, it will i
 
 If the precreatemyposcripts attribute is yes, and a database change is made or xCAT code is upgraded, then you should run a new nodeset or updatenode to regenerate the /tftpboot/mypostscript/mypostscript.<nodename>. file to pick up the latest database setting. The default for precreatemypostscripts is no/0.
 
-When you run nodeset or updatenode, it will search the **/install/postscripts/mypostscript.tmpl** first. If the **/install/postscripts/mypostscript.tmpl** exists, it will use that template to generate the mypostscript for each node. Otherwise, it will use **/opt/xcat/share/xcat/mypostscript/mypostscript.tmpl**. 
+When you run nodeset or updatenode, it will search the **/install/postscripts/mypostscript.tmpl** first. If the **/install/postscripts/mypostscript.tmpl** exists, it will use that template to generate the mypostscript for each node. Otherwise, it will use **/opt/xcat/share/xcat/mypostscript/mypostscript.tmpl**.
 
 
 Content of the template for mypostscript
@@ -247,7 +247,7 @@ Content of the template for mypostscript
 
 **The attributes that are defined in the shipped mypostscript.tmpl file** should not be removed. The xCAT default postscripts rely on that information to run successfully. **The following will explain the entries in the mypostscript.tmpl file**.
 
-The SITE_TABLE_ALL_ATTRIBS_EXPORT line in the file directs the code to export all attributes defined in the site table. 
+The SITE_TABLE_ALL_ATTRIBS_EXPORT line in the file directs the code to export all attributes defined in the site table.
 Note: the attributes are not always defined exactly as in the site table to avoid conflict with other table attributes of the same name. For example, the site table master attribute is named SITEMASTER in the generated mypostscript file. ::
 
         #SITE_TABLE_ALL_ATTRIBS_EXPORT#
@@ -257,7 +257,7 @@ The following line exports ENABLESSHBETWEENNODES by running the internal xCAT ro
        ENABLESSHBETWEENNODES=#Subroutine:xCAT::Template::enablesshbetweennodes:$NODE#
        export ENABLESSHBETWEENNODES
 
-**tabdump(<TABLENAME>)** is used to get all the information in the **<TABLENAME>** table :: 
+**tabdump(<TABLENAME>)** is used to get all the information in the **<TABLENAME>** table ::
 
       tabdump(networks)
 
@@ -446,7 +446,7 @@ Note: Type4 is not an open interface to add extensions to the templatel.
 
 **Type 5:** Get all the data from the specified table. The **<TABLENAME>** should not be a node table, like nodelist. This should be handles with TYPE 2 syntax to get specific attributes for the **$NODE**. tabdump would result in too much data for a nodetype table. Also the auditlog, eventlog should not be in tabdump for the same reason. site table should not be specified, it is already provided with the **#SITE_TABLE_ALL_ATTRIBS_EXPORT#** flag. It can be used to get the data from the two key tables (like switch). ::
 
-  The syntax is: 
+  The syntax is:
 
   tabdump(<TABLENAME>)
 
@@ -479,10 +479,10 @@ If you want to remove an attribute that you have added, you should remove all th
 Test the new template
 ''''''''''''''''''''''
 
-There are two quick ways to test the template. 
+There are two quick ways to test the template.
 
 #.
-If the node is up: :: 
+If the node is up: ::
 
    updatenode <nodename> -P syslog
 
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/prepostscripts/pre_script.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/prepostscripts/pre_script.rst
index 3bbeb566f..4ca419812 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/prepostscripts/pre_script.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/prepostscripts/pre_script.rst
@@ -3,18 +3,18 @@
 Using Prescript
 ---------------
 
-The prescript table will allow you to run scripts before the install process. This can be helpful for performing advanced actions such as manipulating system services or configurations before beginning to install a node, or to prepare application servers for the addition of new nodes. Check the man page for more information. 
+The prescript table will allow you to run scripts before the install process. This can be helpful for performing advanced actions such as manipulating system services or configurations before beginning to install a node, or to prepare application servers for the addition of new nodes. Check the man page for more information.
 
 ``man prescripts``
 
 The scripts will be run as root on the MASTER for the node. If there is a service node for the node, then the scripts will be run on the service node.
 
-Identify the scripts to be run for each node by adding entries to the prescripts table: :: 
+Identify the scripts to be run for each node by adding entries to the prescripts table: ::
 
    tabedit prescripts
-   Or: 
+   Or:
    chdef -t node -o <noderange> prescripts-begin=<beginscripts> prescripts-end=<endscripts>
-   Or: 
+   Or:
    chdef -t group -o <nodegroup> prescripts-begin=<beginscripts> prescripts-end=<endscripts>
 
    tabdump prescripts
@@ -22,19 +22,19 @@ Identify the scripts to be run for each node by adding entries to the prescripts
 
    begin or prescripts-begin - This attribute lists the scripts to be run at the beginning of the nodeset.
    end or prescripts-end - This attribute lists the scripts to be run at the end of the nodeset.
- 
+
 Format for naming prescripts
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The general format for the prescripts-begin or prescripts-end attribute is: ::
 
-    [action1:]s1,s2...[|action2:s3,s4,s5...] 
+    [action1:]s1,s2...[|action2:s3,s4,s5...]
 
-    where: 
+    where:
 
-    - action1 and action2 are the nodeset actions ( 'install', 'netboot',etc) specified in the command . 
+    - action1 and action2 are the nodeset actions ( 'install', 'netboot',etc) specified in the command .
 
-    - s1 and s2 are the scripts to run for _action1_ in order. 
+    - s1 and s2 are the scripts to run for _action1_ in order.
 
     - s3, s4, and s5 are the scripts to run for action2.
 
@@ -42,7 +42,7 @@ If actions are omitted, the scripts apply to all actions.
 
 Examples:
 
-    * myscript1,myscript2 - run scripts for all supported commands 
+    * myscript1,myscript2 - run scripts for all supported commands
     * install:myscript1,myscript2|netboot:myscript3
 
 Run scripts 1,2 for nodeset(install), runs script3 for nodeset(netboot).
@@ -54,7 +54,7 @@ The following two environment variables will be passed to each script:
     * NODES - a comma separated list of node names on which to run the script
     * ACTION - current nodeset action.
 
-By default, the script will be invoked once for all nodes. However, if **'#xCAT setting:MAX_INSTANCE=number'** is specified in the script, the script will be invoked for each node in parallel, but no more than number of instances specified in **number** will be invoked at at a time. 
+By default, the script will be invoked once for all nodes. However, if **'#xCAT setting:MAX_INSTANCE=number'** is specified in the script, the script will be invoked for each node in parallel, but no more than number of instances specified in **number** will be invoked at at a time.
 
 Exit values for prescripts
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/raid_cfg.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/raid_cfg.rst
index 752f38412..0efa6b9ff 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/raid_cfg.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/raid_cfg.rst
@@ -14,7 +14,7 @@ xCAT provides a partition script `raid1_rh.sh <https://raw.githubusercontent.com
 
 In most scenarios, the sample partitioning script is sufficient to create a basic RAID1 across two disks and is provided as a sample to build upon.
 
-1. Obtain the partition script: :: 
+1. Obtain the partition script: ::
 
      mkdir -p /install/custom/partition/
      wget https://raw.githubusercontent.com/xcat2/xcat-extensions/master/partition/raid1_rh.sh \
@@ -22,13 +22,13 @@ In most scenarios, the sample partitioning script is sufficient to create a basi
 
 2. Associate the partition script to the osimage: ::
 
-     chdef -t osimage -o rhels7.3-ppc64le-install-compute \ 
+     chdef -t osimage -o rhels7.3-ppc64le-install-compute \
            partitionfile="s:/install/custom/partition/raid1_rh.sh"
 
 3. Provision the node: ::
 
      rinstall cn1 osimage=rhels7.3-ppc64le-install-compute
- 
+
 After the diskful nodes are up and running, you can check the RAID1 settings with the following process:
 
 ``mount`` command shows the ``/dev/mdx`` devices are mounted to various file systems, the ``/dev/mdx`` indicates that the RAID is being used on this node. ::
@@ -37,7 +37,7 @@ After the diskful nodes are up and running, you can check the RAID1 settings wit
      ...
      /dev/md1 on / type xfs (rw,relatime,attr2,inode64,noquota)
      /dev/md0 on /boot type xfs (rw,relatime,attr2,inode64,noquota)
-     /dev/md2 on /var type xfs (rw,relatime,attr2,inode64,noquota)     
+     /dev/md2 on /var type xfs (rw,relatime,attr2,inode64,noquota)
 
 The file ``/proc/mdstat`` includes the RAID devices status on the system, here is an example of ``/proc/mdstat`` in the non-multipath environment: ::
 
@@ -47,20 +47,20 @@ The file ``/proc/mdstat`` includes the RAID devices status on the system, here i
            1047552 blocks super 1.2 [2/2] [UU]
              resync=DELAYED
            bitmap: 1/1 pages [64KB], 65536KB chunk
-     
+
      md3 : active raid1 sdk3[0] sdj3[1]
            1047552 blocks super 1.2 [2/2] [UU]
              resync=DELAYED
-     
+
      md0 : active raid1 sdk5[0] sdj5[1]
            524224 blocks super 1.0 [2/2] [UU]
            bitmap: 0/1 pages [0KB], 65536KB chunk
-     
+
      md1 : active raid1 sdk6[0] sdj6[1]
            973998080 blocks super 1.2 [2/2] [UU]
            [==>..................]  resync = 12.8% (125356224/973998080) finish=138.1min speed=102389K/sec
            bitmap: 1/1 pages [64KB], 65536KB chunk
-     
+
      unused devices: <none>
 
 On the system with multipath configuration, the ``/proc/mdstat`` looks like: ::
@@ -90,7 +90,7 @@ Deploy Diskful Nodes with RAID1 Setup on SLES
 
 xCAT provides one sample autoyast template files with the RAID1 settings ``/opt/xcat/share/xcat/install/sles/service.raid1.sles11.tmpl``. You can customize the template file and put it under ``/install/custom/install/<platform>/`` if the default one does not match your requirements.
 
-Here is the RAID1 partitioning section in service.raid1.sles11.tmpl: :: 
+Here is the RAID1 partitioning section in service.raid1.sles11.tmpl: ::
 
      <partitioning config:type="list">
         <drive>
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/syncfile/syncfile_diskless.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/syncfile/syncfile_diskless.rst
index 6aabb8994..bb19c11af 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/syncfile/syncfile_diskless.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/syncfile/syncfile_diskless.rst
@@ -5,7 +5,7 @@ Different approaches are used to create the diskless image. The **Sync'ing** Fil
 
 The ``packimage`` command is used to prepare the root image files and package the root image. The Syncing File action is performed here.
 
-Steps to make the Sync'ing File working in the packimage command: 
+Steps to make the Sync'ing File working in the packimage command:
 
     1. Prepare the synclist file and put it into the appropriate location as describe above in (refer :ref:`the_localtion_of_synclist_file_for_updatenode_label`)
     2. Run packimage as is normally done.
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/syncfile/syncfile_install.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/syncfile/syncfile_install.rst
index f8b7d23da..5139616fa 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/syncfile/syncfile_install.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/syncfile/syncfile_install.rst
@@ -15,7 +15,7 @@ The policy table must have the entry to allow syncfiles postscript to access the
 Hierarchy and Service Nodes
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-If using Service nodes to manage you nodes, you should make sure that the service nodes have been synchronized with the latest files from the Management Node before installing. If you have a group of compute nodes (compute) that are going to be installed that are serviced by SN1, then run the following before the install to sync the current files to SN1. Note: the noderange is the compute node names, updatenode will figure out which service nodes need updating. 
+If using Service nodes to manage you nodes, you should make sure that the service nodes have been synchronized with the latest files from the Management Node before installing. If you have a group of compute nodes (compute) that are going to be installed that are serviced by SN1, then run the following before the install to sync the current files to SN1. Note: the noderange is the compute node names, updatenode will figure out which service nodes need updating.
 
 ``updatenode compute -f``
 
@@ -28,8 +28,8 @@ The 'syncfiles' postscript is in the defaults section of the postscripts table.
 
    * Create the synclist file with the entries indicating which files should be synced.  (refer to :ref:`The_Format_of_synclist_file_label` )
    * Put the synclist into the proper location for the node type (refer to :ref:`the_localtion_of_synclist_file_for_updatenode_label`)
-     
-Make sure your postscripts table has the syncfiles postscript listed 
+
+Make sure your postscripts table has the syncfiles postscript listed
 
 ``tabdump postscripts`` ::
 
@@ -43,5 +43,5 @@ The diskless boot is similar with the diskful installation for the synchronizing
 
 Creating the synclist file as the steps in Diskful installation section, then the synced files will be synced to the os image during the packimage and mkdsklsnode commands running.
 
-Also the files will always be re-synced during the booting up of the diskless node. 
+Also the files will always be re-synced during the booting up of the diskless node.
 
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/syncfile/syncfile_periodically.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/syncfile/syncfile_periodically.rst
index 512463eb8..adaa6b332 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/syncfile/syncfile_periodically.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/syncfile/syncfile_periodically.rst
@@ -6,7 +6,7 @@ If the admins want to run the Syncing File action automatically or periodically,
 For example:
 
 Use the cron daemon to sync files in the **/install/custom/<inst_type>/<distro>/<profile>.<os>.synclist** to the nodegroup 'compute' every 10 minutes by the xdcp command by adding this to crontab. : ::
-      
+
        */10 * * * * root /opt/xcat/bin/xdcp compute -F /install/custom/<inst_type>/<distro>/<profile>.<distro>.synclist
 
 Use the cron daemon to sync files for the nodegroup 'compute' every 10 minutes by updatenode command. ::
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/syncfile/syncfile_synclist_file.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/syncfile/syncfile_synclist_file.rst
index 4cd8e81e4..13e599054 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/syncfile/syncfile_synclist_file.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/syncfile/syncfile_synclist_file.rst
@@ -12,14 +12,14 @@ The synclist file contains the configuration entries that specify where the file
 The basic entry format looks like following: ::
 
        path_of_src_file1 -> path_of_dst_file1
-       path_of_src_file1 -> path_of_dst_directory 
+       path_of_src_file1 -> path_of_dst_directory
        path_of_src_file1 path_of_src_file2 ... -> path_of_dst_directory
 
 The path_of_src_file* should be the full path of the source file on the Management Node.
 
 The path_of_dst_file* should be the full path of the destination file on target node. Please make sure path_of_dst_file* is not a existing directory on target node, otherwise, the file sync with ``updatenode -r /usr/bin/scp`` or ``xdcp -r /usr/bin/scp`` will fail.
 
-The path_of_dst_directory should be the full path of the destination directory. Please make sure *eth_of_dst_directory is not a existing file on target node, otherwise, the file sync with ``updatenode -r /usr/bin/scp`` or ``xdcp -r /usr/bin/scp`` will fail. 
+The path_of_dst_directory should be the full path of the destination directory. Please make sure *eth_of_dst_directory is not a existing file on target node, otherwise, the file sync with ``updatenode -r /usr/bin/scp`` or ``xdcp -r /usr/bin/scp`` will fail.
 
 Since the synclist file is for common purpose, the target node need not be configured in it.
 
@@ -30,19 +30,19 @@ sync file **/etc/file2** to the file **/etc/file2** on the node (with same file
        /etc/file2 -> /etc/file2
 
 sync file **/etc/file2** to the file **/etc/file3** on the node (with different file name) ::
-       
-       /etc/file2 -> /etc/file3 
+
+       /etc/file2 -> /etc/file3
 
 sync file **/etc/file4** to the file **/etc/tmp/file5** on the node( different file name and directory). The directory will be automatically created for you. ::
 
       /etc/file4 -> /etc/tmp/file5
 
 sync the multiple files **/etc/file1**, **/etc/file2**, **/etc/file3**, ... to the directory **/tmp/etc** (**/tmp/etc** must be a directory when multiple files are synced at one time). If the directory does not exist,**xdcp** will create it. ::
-     
+
       /etc/file1 /etc/file2 /etc/file3 -> /tmp/etc
 
 sync file **/etc/file2** to the file /etc/file2 on the node   ::
- 
+
        /etc/file2 -> /etc/
 
 sync all files in **/home/mikev** to directory **/home/mikev** on the node  ::
@@ -54,34 +54,34 @@ Note: Don't try to sync files to the read only directory on the target node.
 An example of synclist file
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Assume a user wants to sync files to a node as following, the corresponding entries should be added in a synclist file. 
+Assume a user wants to sync files to a node as following, the corresponding entries should be added in a synclist file.
 
 Sync the file **/etc/common_hosts** to the two places on the target node: put one to the **/etc/hosts**, the other to the **/tmp/etc/hosts**. Following configuration entries should be added ::
 
        /etc/common_hosts -> /etc/hosts
-       /etc/common_hosts -> /tmp/etc/hosts 
- 
+       /etc/common_hosts -> /tmp/etc/hosts
+
 Sync files in the directory **/tmp/prog1** to the directory **/prog1** on the target node, and the postfix **'.tmpl'** needs to be removed on the target node. (directory **/tmp/prog1/** contains two files: **conf1.tmpl** and **conf2.tmpl**) Following configuration entries should be added ::
 
        /tmp/prog1/conf1.tmpl -> /prog1/conf1
        /tmp/prog1/conf2.tmpl -> /prog1/conf2
 
 Sync the files in the directory **/tmp/prog2** to the directory **/prog2** with same name on the target node. (directory **/tmp/prog2** contains two files: **conf1** and **conf2**) Following configuration entries should be added: ::
-       
+
        /tmp/prog2/conf1 /tmp/prog2/conf2 -> /prog2
 
 Sample synclist file ::
- 
+
       /etc/common_hosts -> /etc/hosts
       /etc/common_hosts -> /tmp/etc/hosts
       /tmp/prog1/conf1.tmpl -> /prog1/conf1
       /tmp/prog1/conf2.tmpl -> /prog1/conf2
       /tmp/prog2/conf1 /tmp/prog2/conf2 -> /prog2
-      /tmp/* -> /tmp/ 
-      /etc/testfile -> /etc/     
+      /tmp/* -> /tmp/
+      /etc/testfile -> /etc/
 
 If the above syncfile is performed by the **updatenode/xdcp** commands, or performed in a node installation process, the following files will exist on the target node with the following contents. ::
- 
+
        /etc/hosts(It has the same content with /etc/common_hosts on the MN)
        /tmp/etc/hosts(It has the same content with /etc/common_hosts on the MN)
        /prog1/conf1(It has the same content with /tmp/prog1/conf1.tmpl on the MN)
@@ -109,12 +109,12 @@ The noderange would have several format. Following examples show that /etc/hosts
 postscript support
 ~~~~~~~~~~~~~~~~~~
 
-Putting the filename.post in the **rsyncfile** to ``rsync`` to the node is required for hierarchical clusters. It is optional for non-hierarchical cluster. 
+Putting the filename.post in the **rsyncfile** to ``rsync`` to the node is required for hierarchical clusters. It is optional for non-hierarchical cluster.
 
-Advanced synclist file features 
+Advanced synclist file features
 ''''''''''''''''''''''''''''''''''
 
-After you define the files to rsync in the syncfile, you can add an **EXECUTEALWAYS** clause in the syncfile. The **EXECUTEALWAYS** clause will list all the postscripts you would always like to run after the files are sync'd, whether or not any file is actually updated. The files in this list must be added to the list of files to rsync, if hierarchical. 
+After you define the files to rsync in the syncfile, you can add an **EXECUTEALWAYS** clause in the syncfile. The **EXECUTEALWAYS** clause will list all the postscripts you would always like to run after the files are sync'd, whether or not any file is actually updated. The files in this list must be added to the list of files to rsync, if hierarchical.
 
 For example, your rsyncfile may look like this. **Note: the path to the file to EXECUTE, is the location of the *.post file on the MN**. ::
 
@@ -129,15 +129,15 @@ For example, your rsyncfile may look like this. **Note: the path to the file to
        EXECUTE:
        /tmp/share/file2.post
        /tmp/share/file3.post
-       EXECUTEALWAYS:  
+       EXECUTEALWAYS:
        /tmp/myscript1
-       /tmp/myscript2 
+       /tmp/myscript2
 
 If **/tmp/file2** is updated on the node in **/tmp/file2**, then **/tmp/file2**.post is automatically run on that node. If **/tmp/file3** is updated on the node in **/tmp/filex**, then **/tmp/file3**.post is automatically run on that node.
 
 You can add an **APPEND** clause to your syncfile.
 
-The **APPEND** clause is used to append the contents of the input file to an existing file on the node. The file to be appended must already exist on the node and not be part of the synclist that contains the **APPEND** clause. 
+The **APPEND** clause is used to append the contents of the input file to an existing file on the node. The file to be appended must already exist on the node and not be part of the synclist that contains the **APPEND** clause.
 
 For example, your synclist file may look like this: ::
 
@@ -164,7 +164,7 @@ Note:no order of execution may be assumed by the order that the **EXECUTE,EXECUT
 
 You can add an **MERGE** clause to your syncfile. This is only supported on Linux.
 
-The **MERGE** clause is used to append the contents of the input file to either the **/etc/passwd**, **/etc/shadow** or **/etc/group** files. They are the only supported files. You must not put the **/etc/passwd**, **/etc/shadow**, **/etc/group** files in an **APPEND** clause if using a **MERGE** clause. For these three file you should use a **MERGE** clause. The **APPEND** will add the information to the end of the file. The **MERGE** will add or replace the information and insure that there are no duplicate entries in these files. 
+The **MERGE** clause is used to append the contents of the input file to either the **/etc/passwd**, **/etc/shadow** or **/etc/group** files. They are the only supported files. You must not put the **/etc/passwd**, **/etc/shadow**, **/etc/group** files in an **APPEND** clause if using a **MERGE** clause. For these three file you should use a **MERGE** clause. The **APPEND** will add the information to the end of the file. The **MERGE** will add or replace the information and insure that there are no duplicate entries in these files.
 
 For example, your synclist file may look like this ::
 
@@ -184,16 +184,16 @@ For example, your synclist file may look like this ::
        /etc/mydir/mergeshadow -> /etc/shadow
        /etc/mydir/mergegroup -> /etc/group
 
-When you use the **MERGE** clause, the file (left) of the arrow is merged into the file right of the arrow. It will replace any common userid's found in those files and add new userids. The /opt/xcat/share/xcat/scripts/xdcpmerge.sh is used to accomplish this. 
+When you use the **MERGE** clause, the file (left) of the arrow is merged into the file right of the arrow. It will replace any common userid's found in those files and add new userids. The /opt/xcat/share/xcat/scripts/xdcpmerge.sh is used to accomplish this.
 
-Note: no order of execution may be assumed by the order that the **EXECUTE,EXECUTEALWAYS,APPEND and MERGE** clause fall in the synclist file. 
+Note: no order of execution may be assumed by the order that the **EXECUTE,EXECUTEALWAYS,APPEND and MERGE** clause fall in the synclist file.
 
 .. _the_localtion_of_synclist_file_for_updatenode_label:
 
 The location of synclist file for updatenode and install process
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-In the installation process or updatenode process, xCAT needs to figure out the location of the synclist file automatically, so the synclist should be put into the specified place with the proper name. 
+In the installation process or updatenode process, xCAT needs to figure out the location of the synclist file automatically, so the synclist should be put into the specified place with the proper name.
 
 If the provisioning method for the node is an osimage name, then the path to the synclist will be read from the osimage definition synclists attribute. You can display this information by running the following command, supplying your osimage name. ::
 
@@ -212,7 +212,7 @@ If the provisioning method for the node is an osimage name, then the path to the
        rootimgdir=/install/netboot/<os>/<arch>/compute
        **synclists=/install/custom/netboot/compute.synclist**
 
-You can set the synclist path using the following command :: 
+You can set the synclist path using the following command ::
 
        chdef -t osimage -o  <os>-<arch>-netboot-compute synclists="/install/custom/netboot/compute.synclist
 
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/syncfile/syncfile_xdcp.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/syncfile/syncfile_xdcp.rst
index 184cd3261..20d1bb84c 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/syncfile/syncfile_xdcp.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/syncfile/syncfile_xdcp.rst
@@ -17,14 +17,14 @@ Specifies the full path to the install image on the local node. By default, if t
 
 For example: ::
 
-    Using xdcp '-F' option to sync files which are listed in the /install/custom/commonsyncfiles/<profile>.synclist directory to the node group named 'compute'. If the node group compute is serviced by servicenodes, then the files will be automatically staged to the correct service nodes, and then synced to the compute nodes from those service nodes. The files will be stored in /var/xcat/syncfiles directory on the service nodes by default, or in the directory indicated in the site.SNsyncfiledir attribute. See -s option below. 
+    Using xdcp '-F' option to sync files which are listed in the /install/custom/commonsyncfiles/<profile>.synclist directory to the node group named 'compute'. If the node group compute is serviced by servicenodes, then the files will be automatically staged to the correct service nodes, and then synced to the compute nodes from those service nodes. The files will be stored in /var/xcat/syncfiles directory on the service nodes by default, or in the directory indicated in the site.SNsyncfiledir attribute. See -s option below.
     xdcp compute -F /install/custom/commonsynfiles/<profile>.synclist
 
 For Linux nodes, using **xdcp '-i'** option with **'-F'** to sync files created in the **/install/custom/<inst_type>/<os><profile>.synclist** to the osimage in the directory **/install/<inst_type>/<os>/<arch>/<profile>/rootimg**: ::
-      
+
     xdcp -i /install/<inst_type>/<os>/<arch>/<profile>/rootimg -F /install/custom/<inst_type>/<os>/<profile>.synclist
 
 Using the **xdcp '-s'** option to sync the files only to the service nodes for the node group named 'compute'. The files will be placed in the default **/var/xcat/syncfiles** directory or in the directory as indicated in the **site.SNsyncfiledir** attribute. If you want the files synched to the same directory on the service node that they come from on the Management Node, set **site.SNsyncfiledir=/**. This can be setup before a node install, to have the files available to be synced during the install: ::
-   
+
     xdcp compute -s -F /install/custom/<inst_type>/<os>/<profile>.synclist
 
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/trim_diskless_rootimg.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/trim_diskless_rootimg.rst
index e417ca402..3bc1e2d32 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/trim_diskless_rootimg.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/trim_diskless_rootimg.rst
@@ -6,7 +6,7 @@ To reduce the memory and boot-up time for the diskless node, the initrd and root
 Exclude list
 ------------
 
-xCAT provides an attribute ``exlist`` in the **osimage** object definition, that allows the user to select files to exclude when building the ``rootimg.gz`` file for the diskless node. 
+xCAT provides an attribute ``exlist`` in the **osimage** object definition, that allows the user to select files to exclude when building the ``rootimg.gz`` file for the diskless node.
 
 
 Take the osimage **sles12.1-ppc64le-netboot-compute** for example::
@@ -29,7 +29,7 @@ The following is a sample of ``exlist`` file ::
   +./usr/share/X11/locale/C*
   ...
 
-The content above presents some syntax supported in exlist file: 
+The content above presents some syntax supported in exlist file:
 
 * Exclude files::
 
@@ -54,10 +54,10 @@ The content above presents some syntax supported in exlist file:
   It is useful to include files following an exclude entry to quickly remove a larger set of files using a wildcard and then adding back the few necessary files using the + sign. In the above example, all the files and sub-directories matching the pattern ``/usr/share/locale/C*`` will be included in the ``rootimg.gz`` file.
 
 
-Customize the ``exlist`` file and the osimage definition 
+Customize the ``exlist`` file and the osimage definition
 --------------------------------------------------------
 
-Check the default exlist file and make sure: 
+Check the default exlist file and make sure:
 
  * all files and directories you do not want in the image will be excluded from the rootimg.
 
@@ -68,10 +68,10 @@ If you want to customize the osimage ``sles12.1-ppc64le-netboot-compute`` with y
 
   #create a customized exlist file based on the default one
   cp /opt/xcat/share/xcat/netboot/sles/compute.sles12.ppc64le.exlist /install/custom/netboot/sles/compute.sles12.ppc64le.exlist
-   
+
   #edit the newly created exlist file according to your need
-  vi /install/custom/netboot/sles/compute.sles12.ppc64le.exlist 
-   
+  vi /install/custom/netboot/sles/compute.sles12.ppc64le.exlist
+
   #specify the newly created exlist file in the osimage definition
   chdef -t osimage -o sles12.1-ppc64le-netboot-compute exlist=/install/custom/netboot/sles/compute.sles12.ppc64le.exlist
 
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/use_kernel_patch.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/use_kernel_patch.rst
index 6ad4b7782..f2c4f4b65 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/use_kernel_patch.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/use_kernel_patch.rst
@@ -15,10 +15,10 @@ The RPM names below are only examples, substitute your specific level and archit
 
 #. Inject the drivers from the new kernel RPMs into the initrd ::
 
-        mkdef -t osdistroupdate kernelupdate dirpath=/install/kernels/<kernelver>/ 
+        mkdef -t osdistroupdate kernelupdate dirpath=/install/kernels/<kernelver>/
         chdef -t osimage rhels7.3-ppc64le-install-compute osupdatename=kernelupdate
         chdef -t osimage rhels7.3-ppc64le-install-compute netdrivers=updateonly
         genitrd rhels7.3-ppc64le-install-compute --ignorekernelchk
-        nodeset <CN> osimage=rhels7.3-ppc64le-install-compute --noupdateinitrd     
+        nodeset <CN> osimage=rhels7.3-ppc64le-install-compute --noupdateinitrd
 
 #. Boot CN from net normallly.
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/kvm/manage_vm.rst b/docs/source/guides/admin-guides/manage_clusters/common/kvm/manage_vm.rst
index 16d6012d9..a40b77e1f 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/kvm/manage_vm.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/kvm/manage_vm.rst
@@ -20,10 +20,10 @@ Update DNS configuration and database: ::
   makedns -n
   makedns -a
 
-Specify VM attributes 
+Specify VM attributes
 `````````````````````
 
-After the VM object is created, several key attributes need to be specified with ``chdef`` : 
+After the VM object is created, several key attributes need to be specified with ``chdef`` :
 
 1. the hardware management module, "kvm" for PowerKVM: ::
 
@@ -34,21 +34,21 @@ After the VM object is created, several key attributes need to be specified with
      chdef vm1 vmcpus=2
 
 3. the kvm hypervisor of the VM: ::
- 
+
      chdef vm1 vmhost=kvmhost1
 
 4. the virtual memory size, with the unit "Megabit". Specify 1GB memory to "vm1" here: ::
 
      chdef vm1 vmmemory=1024
 
-**Note**: For diskless node, the **vmmemory** should be at least 2048 MB, otherwise the node cannot boot up. 
+**Note**: For diskless node, the **vmmemory** should be at least 2048 MB, otherwise the node cannot boot up.
 
 5. Define the virtual network card, it should be set to the bridge "br0" which has been created in the hypervisor. If no bridge is specified, no network device will be created for the VM node "vm1": ::
 
     chdef vm1 vmnics=br0
 
 6. The **vmnicnicmodel** attribute is used to set the type and corresponding driver for the nic. If not set, the default value is 'virtio'.
-   :: 
+   ::
 
     chdef vm1 vmnicnicmodel=virtio
 
@@ -72,7 +72,7 @@ After the VM object is created, several key attributes need to be specified with
 
         chdef vm1 vmstorage=dir:///var/lib/libvirt/images
 
-   **Note**: The attribute **vmstorage** is only valid for diskful VM node. 
+   **Note**: The attribute **vmstorage** is only valid for diskful VM node.
 
 8. Define the **console** attributes for VM: ::
 
@@ -84,13 +84,13 @@ After the VM object is created, several key attributes need to be specified with
 
 10. (optional)For assigning PCI devices to the VM, set **othersettings** value: ::
 
-     chtab node=vm1 vm.othersettings="devpassthrough:0000:01:00.2" 
+     chtab node=vm1 vm.othersettings="devpassthrough:0000:01:00.2"
 
     Or: ::
 
      chtab node=vm1 vm.othersettings="devpassthrough:pci_0000_01_00_2"
 
-    Take assigning SR-IOV VFs to the VM as an example: 
+    Take assigning SR-IOV VFs to the VM as an example:
 
     * Use ``lspci`` to get VFs PCI from hypervisor: ::
 
@@ -99,17 +99,17 @@ After the VM object is created, several key attributes need to be specified with
           0000:01:00.2 Infiniband controller: Mellanox Technologies MT27700 Family [ConnectX-4 Virtual Function]
 
     * Set the VFs PCI into ``vm`` table on MN: ::
-     
+
         chtab node=vm1 vm.othersettings="devpassthrough:0000:01:00.1,0000:01:00.2"
 
 11. Set **netboot** attribute
 
     * **[x86_64]** ::
- 
+
         chdef vm1 netboot=xnba
 
     * **[PPC64LE]** ::
-  
+
         chdef vm1 netboot=grub2
 
     Make sure "grub2" had been installed on the management node: ::
@@ -118,7 +118,7 @@ After the VM object is created, several key attributes need to be specified with
         grub2-xcat-1.0-1.noarch
 
 
-Make virtual machine 
+Make virtual machine
 ````````````````````
 
 If **vmstorage** is a NFS mounted directory or a device on hypervisor, run ::
@@ -128,7 +128,7 @@ If **vmstorage** is a NFS mounted directory or a device on hypervisor, run ::
 To create the virtual machine "vm1" with 20G hard disk on a hypervisor directory, run ::
 
   mkvm vm1 -s 20G
-   
+
 When "vm1" is created successfully, a VM hard disk file with a name like "vm1.sda.qcow2" will be found in the location specified by **vmstorage**. What's more, the **mac** attribute of "vm1" is set automatically, check it with: ::
 
   lsdef vm1 -i mac
@@ -145,14 +145,14 @@ or running the following command on the kvm hypervisor "kvmhost1" ::
 
     #virsh list
      Id Name                 State
-    --------------------------------   
+    --------------------------------
       6 vm1                 running
 
 
 Monitoring the Virtual Machine
 ``````````````````````````````
 
-When the VM has been created and powered on, choose one of the following methods to monitor and access it. 
+When the VM has been created and powered on, choose one of the following methods to monitor and access it.
 
 * Open the console on kvm hypervisor: ::
 
@@ -176,11 +176,11 @@ When the VM has been created and powered on, choose one of the following methods
     vm1: server: kvmhost1
     vm1: vidport: 5900
 
-  **Note**: Now just pick a favorite vnc client to connect the hypervisor, with the password generated by ``getrvidparms``. If the vnc client complains "the password is not valid",  the reason might be that the hypervisor and headnode clocks are out of sync! Please try to sync them by running ``ntpdate <ntp server>`` on both the hypervisor and the headnode. 
+  **Note**: Now just pick a favorite vnc client to connect the hypervisor, with the password generated by ``getrvidparms``. If the vnc client complains "the password is not valid",  the reason might be that the hypervisor and headnode clocks are out of sync! Please try to sync them by running ``ntpdate <ntp server>`` on both the hypervisor and the headnode.
 
 
 * Use wvid on management node
- 
+
   Make sure **firewalld** service is stopped, disable it if not: ::
 
     chkconfig firewalld off
@@ -212,14 +212,14 @@ Remove the definition of "vm1" and related storage: ::
 Clone the virtual machine
 -------------------------
 
-**Clone** is an operation that creating a VM from an existed one by inheriting most of its attributes and data. 
+**Clone** is an operation that creating a VM from an existed one by inheriting most of its attributes and data.
 
 The general step of **clone** a VM is like this: first creating a **VM master** , then creating a VM with the newly created **VM master** in **attaching** or **detaching** mode.
 
 
 **In attaching mode**
 
-In this mode, all the newly created VMs are attached to the VM master. Since the image of the newly created VM only includes the differences from the VM master, which requires less disk space. The newly created VMs can NOT run without the VM master. 
+In this mode, all the newly created VMs are attached to the VM master. Since the image of the newly created VM only includes the differences from the VM master, which requires less disk space. The newly created VMs can NOT run without the VM master.
 
 An example is shown below:
 
@@ -233,7 +233,7 @@ Create the VM master "vm5" from a VM node "vm1": ::
 
 The newly created VM master "vm5" can be found in the **vmmaster** table. ::
 
-    #tabdump vmmaster  
+    #tabdump vmmaster
     name,os,arch,profile,storage,storagemodel,nics,vintage,originator,comments,disable
     "vm5","<os>","<arch>","compute","nfs://<storage_server_ip>/vms/kvm",,"br0","<date>","root",,
 
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/management/rbeacon.rst b/docs/source/guides/admin-guides/manage_clusters/common/management/rbeacon.rst
index a55f4e30b..f656ba5aa 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/management/rbeacon.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/management/rbeacon.rst
@@ -1,2 +1,2 @@
 ``rbeacon``
-===========
\ No newline at end of file
+===========
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/management/rcons.rst b/docs/source/guides/admin-guides/manage_clusters/common/management/rcons.rst
index 0857a2db7..b844b0d96 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/management/rcons.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/management/rcons.rst
@@ -1,2 +1,2 @@
 ``rcons``
-=========
\ No newline at end of file
+=========
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/management/renergy.rst b/docs/source/guides/admin-guides/manage_clusters/common/management/renergy.rst
index 3ca21667a..bfb747e51 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/management/renergy.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/management/renergy.rst
@@ -1,2 +1,2 @@
 ``renergy``
-===========
\ No newline at end of file
+===========
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/management/reventlog.rst b/docs/source/guides/admin-guides/manage_clusters/common/management/reventlog.rst
index b701de10a..7c905b2d0 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/management/reventlog.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/management/reventlog.rst
@@ -1,2 +1,2 @@
 ``reventlog``
-=============
\ No newline at end of file
+=============
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/management/rflash.rst b/docs/source/guides/admin-guides/manage_clusters/common/management/rflash.rst
index 438bb80cf..904c5e12c 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/management/rflash.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/management/rflash.rst
@@ -1,2 +1,2 @@
 ``rflash``
-==========
\ No newline at end of file
+==========
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/management/rinv.rst b/docs/source/guides/admin-guides/manage_clusters/common/management/rinv.rst
index dad597a14..b217aa9fc 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/management/rinv.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/management/rinv.rst
@@ -1,2 +1,2 @@
 ``rinv``
-========
\ No newline at end of file
+========
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/management/rpower.rst b/docs/source/guides/admin-guides/manage_clusters/common/management/rpower.rst
index 06329fba8..e60dd550d 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/management/rpower.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/management/rpower.rst
@@ -4,7 +4,7 @@
 rpower1
 -------
 
-Here is some common rpower information! 
+Here is some common rpower information!
 
 rpower2
 -------
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/management/rspconfig.rst b/docs/source/guides/admin-guides/manage_clusters/common/management/rspconfig.rst
index 7506db83c..e4fcb85f9 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/management/rspconfig.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/management/rspconfig.rst
@@ -1,2 +1,2 @@
 ``rspconfig``
-=============
\ No newline at end of file
+=============
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/management/rvitals.rst b/docs/source/guides/admin-guides/manage_clusters/common/management/rvitals.rst
index f60600b93..997c5c70a 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/management/rvitals.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/management/rvitals.rst
@@ -1,2 +1,2 @@
 ``rvitals``
-===========
\ No newline at end of file
+===========
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/parallel_cmd.rst b/docs/source/guides/admin-guides/manage_clusters/common/parallel_cmd.rst
index f1ad71ba3..07b52060a 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/parallel_cmd.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/parallel_cmd.rst
@@ -3,7 +3,7 @@ Parallel Commands
 
 xCAT provides a set of commands that can run common remote commands (``ssh, scp, rsh, rcp, rsync, ping, cons``) in parallel on xCAT managed nodes.  The xCAT commands will format the output making the results easier to parse and help administrators manage large clusters.
 
-The following commands are provided: 
+The following commands are provided:
 
     * ``pcons`` - runs a command on the noderange using the out-of-band console
     * ``pping`` - parallel ping
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/updatenode.rst b/docs/source/guides/admin-guides/manage_clusters/common/updatenode.rst
index 5a505a57b..e31ba49b8 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/updatenode.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/updatenode.rst
@@ -16,7 +16,7 @@ Each of these will be explained in the document. The basic way to use ``updateno
 Most of what is described in this document applies to **stateful** and **stateless** nodes.
 In addition to the information in this document, check out the ``updatenode`` man page.
 
-Add Additional Software 
+Add Additional Software
 -------------------------
 
 The packages that will be installed on the node are stored in the packages list files. There are **two kinds of package list files**:
@@ -64,13 +64,13 @@ Updatenode can also be used in Sysclone environment to push delta changes to tar
 
     updatenode <targetnoderange> -S
 
-Rerun Postscripts or Run Additional Postcripts 
+Rerun Postscripts or Run Additional Postcripts
 --------------------------------------------------------------------------
 
 You can use the ``updatenode`` command to perform the following functions after the nodes are up and running:
 
   * Rerun postscripts defined in the postscripts table.
-  * Run any additional postscript one time. 
+  * Run any additional postscript one time.
 
 Go to :ref:`Using-Postscript-label` to see how to configure postscript.
 
@@ -99,7 +99,7 @@ You can customize what attributes you want made available to the postscript, usi
 Synchronize new/updated configuration files
 -------------------------------------------
 
-Setting up syncfile 
+Setting up syncfile
 ```````````````````
 
 Use instructions in doc: :ref:`The_synclist_file`.
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/configure/index.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/configure/index.rst
index 766981112..705eff054 100644
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/configure/index.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/configure/index.rst
@@ -2,7 +2,7 @@ Configure xCAT
 ==============
 
 After installing xCAT onto the management node, configure some basic attributes for your cluster into xCAT.
- 
+
 .. toctree::
    :maxdepth: 2
 
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/configure/networks.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/configure/networks.rst
index 7d10ecd29..806f751bd 100644
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/configure/networks.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/configure/networks.rst
@@ -1,8 +1,8 @@
-Set attributes in the ``networks`` table 
+Set attributes in the ``networks`` table
 ========================================
 
 #. Display the network settings defined in the xCAT ``networks`` table using: ``tabdump networks`` ::
-  
+
        #netname,net,mask,mgtifname,gateway,dhcpserver,tftpserver,nameservers,ntpservers,logservers,
        dynamicrange,staticrange,staticrangeincrement,nodehostname,ddnsdomain,vlanid,domain,mtu,
        comments,disable
@@ -26,7 +26,7 @@ Set attributes in the ``networks`` table
 
           makenetworks
 
-#. Verify the network statements 
+#. Verify the network statements
 
    **Domain** and **nameserver** attributes must be configured in the ``networks`` table or in the ``site`` table for xCAT to function properly.
 
@@ -37,7 +37,7 @@ Initialize DHCP services
 
 Configure DHCP to listen on different network interfaces [**Optional**]
 
-   The default behavior of xCAT is to configure DHCP to listen on all interfaces defined in the ``networks`` table.  
+   The default behavior of xCAT is to configure DHCP to listen on all interfaces defined in the ``networks`` table.
 
    The ``dhcpinterfaces`` keyword in the ``site`` table allows administrators to limit the interfaces that DHCP will listen over.  If the management node has 4 interfaces, (eth0, eth1, eth2, and eth3), and you want DHCP to listen only on "eth1" and "eth3", set ``dhcpinterfaces`` using: ::
 
@@ -54,14 +54,14 @@ Configure DHCP to listen on different network interfaces [**Optional**]
 **noboot**
 ``````````
    For the *IBM OpenPOWER S822LC for HPC ("Minsky")* nodes, the BMC and compute "eth0" share the left-side integrated ethernet port and compute "eth1" is the right-side integrated ethernet port.  For these servers, it is recommended to use two physical cables allowing the BMC port to be dedicated and "eth1" used by the OS.  When an open range is configured on the two networks, the xCAT Genesis kernel will be sent to the BMC interface and causes problems during hardware discovery.  To support this scenario, on the xCAT management node, if "eth1" is connected to the BMC network and "eth3" is connected to the compute network, disable genesis boot for the BMC network by setting ``:noboot`` in ``dhcpinterfaces`` using: ::
-     
-      chdef -t site dhcpinterfaces="eth1:noboot,eth3" 
 
-      # run the mknb command to remove the genesis 
+      chdef -t site dhcpinterfaces="eth1:noboot,eth3"
+
+      # run the mknb command to remove the genesis
       # configuration file for the specified network
       mknb ppc64
 
-   
+
 For more information, see ``dhcpinterfaces`` keyword in the :doc:`site </guides/admin-guides/references/man5/site.5>` table.
 
 
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/configure/password.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/configure/password.rst
index 362a1abcd..91f2b0f8b 100644
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/configure/password.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/configure/password.rst
@@ -14,7 +14,7 @@ Configure passwords
 
 #. Configure the passwords for Management modules of the compute nodes.
 
-   * For OpenBMC managed systems: :: 
+   * For OpenBMC managed systems: ::
 
          chtab key=openbmc passwd.username=root passwd.password=0penBmc
 
@@ -24,13 +24,13 @@ Configure passwords
 
    * For HMC managed systems: ::
 
-         chtab key=hmc passwd.username=hscroot passwd.password=abc123 
+         chtab key=hmc passwd.username=hscroot passwd.password=abc123
 
      If the username/password is different for multiple HMCs, set the ``username`` and ``password`` attribute for each HMC node object in xCAT
 
    * For Blade managed systems: ::
 
-         chtab key=blade passwd.username=USERID passwd.password=PASSW0RD 
+         chtab key=blade passwd.username=USERID passwd.password=PASSW0RD
 
    * For FSP/BPA (Flexible Service Processor/Bulk Power Assembly) the factory default passwords must be changed before running commands against them. ::
 
@@ -52,7 +52,7 @@ Configure passwords
 
     #. Set a policy in the xCAT ``policy`` table to allow the user to make calls against xCAT. ::
 
-        mkdef -t policy 6 name=xcatws rule=allow 
+        mkdef -t policy 6 name=xcatws rule=allow
 
 
     When making calls to the xCAT REST API, pass in the credentials using the following attributes: ``userName`` and ``userPW``
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/configure/site.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/configure/site.rst
index 49911d4d2..d8193e778 100644
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/configure/site.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/configure/site.rst
@@ -1,7 +1,7 @@
 Set attributes in the ``site`` table
 ====================================
 
-#. Verify the following attributes have been correctly set in the xCAT ``site`` table. 
+#. Verify the following attributes have been correctly set in the xCAT ``site`` table.
 
     * domain
     * forwarders
@@ -24,13 +24,13 @@ Initialize DNS services
 
 #. Initialize the DNS [#]_ services on the xCAT Management Node: ::
 
-      makedns -n 
+      makedns -n
 
    Verify DNS is working by running ``nslookup`` against your Management Node: ::
 
       nslookup <management_node_hostname>
 
    For more information on DNS, refer to :ref:`dns_label`
- 
+
 
 .. [#] Setting up name resolution and the ability to have hostname resolved to IP addresses is **required** for xCAT.
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/config_environment.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/config_environment.rst
index 18098e0c4..a8ea81228 100644
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/config_environment.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/config_environment.rst
@@ -48,10 +48,10 @@ For hardware management with ipmi, add the following line::
 Verify the genesis packages
 ```````````````````````````
 
-The **xcat-genesis** packages should have been installed when xCAT was installed, but would cause problems if missing.  **xcat-genesis** packages are required to create the genesis root image to do hardware discovery and the genesis kernel sits in ``/tftpboot/xcat/``.  Verify that the ``genesis-scripts`` and ``genesis-base`` packages are installed: 
+The **xcat-genesis** packages should have been installed when xCAT was installed, but would cause problems if missing.  **xcat-genesis** packages are required to create the genesis root image to do hardware discovery and the genesis kernel sits in ``/tftpboot/xcat/``.  Verify that the ``genesis-scripts`` and ``genesis-base`` packages are installed:
 
 * **[RHEL/SLES]**: ``rpm -qa | grep -i genesis``
 
-* **[Ubuntu]**: ``dpkg -l | grep -i genesis`` 
+* **[Ubuntu]**: ``dpkg -l | grep -i genesis``
 
-If missing, install them from the ``xcat-deps`` package and run ``mknb ppc64`` to create the genesis network boot root image. 
+If missing, install them from the ``xcat-deps`` package and run ``mknb ppc64`` to create the genesis network boot root image.
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/manually_define.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/manually_define.rst
index 01150949d..c0e7a156c 100644
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/manually_define.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/manually_define.rst
@@ -34,7 +34,7 @@ The manually defined node will be like this::
 ``mkdef --template`` can be used to create node definitions easily from the typical node definition templates or existing node definitions, some examples:
 
 * creating node definition "cn2" with an existing node definition "cn1" ::
- 
+
      # mkdef -t node -o cn2 --template cn1 mac=66:55:44:33:22:11 ip=172.12.139.2 bmc=172.11.139.2
      1 object definitions have been created or modified.
 
@@ -45,16 +45,16 @@ The manually defined node will be like this::
      # mkdef -t node -o cn2 --template ppc64le-openbmc-template mac=66:55:44:33:22:11 ip=172.12.139.2 bmc=172.11.139.2 bmcpassword=USERID bmcusername=PASSW0RD
      1 object definitions have been created or modified.
 
-  the unspecified attributes of newly created node "cn2" will be assigned with the default values in the template 
+  the unspecified attributes of newly created node "cn2" will be assigned with the default values in the template
 
   to list all the node definition templates available in xCAT, run ::
 
-     # lsdef -t node --template 
+     # lsdef -t node --template
 
   to display the full definition of template "ppc64le-openbmc-template", run ::
-     
-     # lsdef -t node --template ppc64le-openbmc-template 
 
-  the mandatory attributes, which must be specified while creating definitions  with templates, are denoted with the value ``MANDATORY:<attribute description>`` in template definition. 
+     # lsdef -t node --template ppc64le-openbmc-template
+
+  the mandatory attributes, which must be specified while creating definitions  with templates, are denoted with the value ``MANDATORY:<attribute description>`` in template definition.
 
   the optional attributes, which can be specified optionally, are denoted with the value ``OPTIONAL:<attribute description>`` in template definition
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/manually_discovery.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/manually_discovery.rst
index 6568422e9..13c1856a0 100644
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/manually_discovery.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/manually_discovery.rst
@@ -5,10 +5,10 @@ If you have a few nodes which were not discovered by automated hardware discover
 Display the undefined nodes with the ``nodediscoverls`` command::
 
     #nodediscoverls -t undef
-    UUID                                    NODE                METHOD         MTM       SERIAL   
+    UUID                                    NODE                METHOD         MTM       SERIAL
     fa2cec8a-b724-4840-82c7-3313811788cd    undef               undef          8247-22L  10112CA
 
-If you want to manually define an 'undefined' node to a specific free node name, use the nodediscoverdef(TODO) command. 
+If you want to manually define an 'undefined' node to a specific free node name, use the nodediscoverdef(TODO) command.
 
 Before doing that, a node with desired IP address for host and FSP/BMC must be defined first::
 
@@ -22,6 +22,6 @@ For example, if you want to assign the undefined node whose uuid is ``fa2cec8a-b
 After manually defining it, the 'node name' and 'discovery method' attributes of the node will be changed. You can display the changed attributes using the ``nodediscoverls`` command::
 
      #nodediscoverls
-     UUID                                    NODE                METHOD         MTM       SERIAL  
+     UUID                                    NODE                METHOD         MTM       SERIAL
      fa2cec8a-b724-4840-82c7-3313811788cd    cn1                manual          8247-22L  10112CA
 
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/discovery.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/discovery.rst
index 45e69d072..f4857bedb 100644
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/discovery.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/discovery.rst
@@ -3,7 +3,7 @@ Discovery
 
 When the IPMI-based servers are connected to power, the BMCs will boot up and attempt to obtain an IP address from an open range dhcp server on your network.  In the case for xCAT managed networks, xCAT should be configured serve an open range dhcp IP addresses with the ``dynamicrange`` attribute in the networks table.
 
-When the BMCs have an IP address and is pingable from the xCAT management node, administrators can discover the BMCs using the xCAT's :doc:`bmcdiscover </guides/admin-guides/references/man1/bmcdiscover.1>` command and obtain basic information to start the hardware discovery process.  
+When the BMCs have an IP address and is pingable from the xCAT management node, administrators can discover the BMCs using the xCAT's :doc:`bmcdiscover </guides/admin-guides/references/man1/bmcdiscover.1>` command and obtain basic information to start the hardware discovery process.
 
 xCAT Hardware discover uses the xCAT genesis kernel (diskless) to discover additional attributes of the compute node and automatically populate the node definitions in xCAT.
 
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/discovery_using_defined.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/discovery_using_defined.rst
index 26042970c..03a207d8e 100644
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/discovery_using_defined.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/discovery_using_defined.rst
@@ -1,7 +1,7 @@
-Set static BMC IP using different IP address (recommended) 
+Set static BMC IP using different IP address (recommended)
 ==========================================================
 
-The following example outlines the MTMS based hardware discovery for a single IPMI-based compute node.  
+The following example outlines the MTMS based hardware discovery for a single IPMI-based compute node.
 
 +------------------------------+------------+
 | Compute Node Information     | Value      |
@@ -27,7 +27,7 @@ The BMC IP address is obtained by the open range dhcp server and the plan in thi
 
 #. Detect the BMCs and add the node definitions into xCAT.
 
-   Use the :doc:`bmcdiscover </guides/admin-guides/references/man1/bmcdiscover.1>` command to discover the BMCs responding over an IP range and write the output into the xCAT database.  This discovered BMC node is used to control the physical server during hardware discovery and will be deleted after the correct server node object is matched to a pre-defined node.  You **must** use the ``-w`` option to write the output into the xCAT database. 
+   Use the :doc:`bmcdiscover </guides/admin-guides/references/man1/bmcdiscover.1>` command to discover the BMCs responding over an IP range and write the output into the xCAT database.  This discovered BMC node is used to control the physical server during hardware discovery and will be deleted after the correct server node object is matched to a pre-defined node.  You **must** use the ``-w`` option to write the output into the xCAT database.
 
    To discover the BMC with an IP address range of 50.0.100.1-100: ::
 
@@ -61,7 +61,7 @@ The BMC IP address is obtained by the open range dhcp server and the plan in thi
         serial=10112CA
 
 
-#. Edit the ``predefined.stanzas`` file and change the discovered nodes to the intended ``hostname`` and ``IP address``. 
+#. Edit the ``predefined.stanzas`` file and change the discovered nodes to the intended ``hostname`` and ``IP address``.
 
     #. Edit the ``predefined.stanzas`` file: ::
 
@@ -91,11 +91,11 @@ The BMC IP address is obtained by the open range dhcp server and the plan in thi
           mgt=ipmi
           mtm=8247-22L
           serial=10112CA
-          ip=10.0.101.1 
+          ip=10.0.101.1
 
 #. Define the compute nodes into xCAT: ::
 
-       cat predefined.stanzas | mkdef -z 
+       cat predefined.stanzas | mkdef -z
 
 #. Set the chain table to run the ``bmcsetup`` script, this will set the BMC IP to static. ::
 
@@ -113,9 +113,9 @@ The BMC IP address is obtained by the open range dhcp server and the plan in thi
 
        chdef cn01 -p chain="osimage=<osimage_name>"
 
-#. Change the BMC IP address 
+#. Change the BMC IP address
 
-   Set the BMC IP address to a different value for the **predefined** compute node definitions.  
+   Set the BMC IP address to a different value for the **predefined** compute node definitions.
 
    To change the dhcp obtained IP address of 50.0.100.1 to a static IP address of 50.0.101.1, run the following command: ::
 
@@ -133,7 +133,7 @@ The BMC IP address is obtained by the open range dhcp server and the plan in thi
 
 #. Refresh the DNS configuration for the new hosts: ::
 
-       makedns -n 
+       makedns -n
 
 #. **[Optional]**  Monitor the node discovery process using rcons
 
@@ -150,4 +150,4 @@ The BMC IP address is obtained by the open range dhcp server and the plan in thi
        rsetboot node-8247-22l-10112ca net
        rpower node-8247-22l-10112ca on
 
-#. The discovery process will network boot the machine into the diskless xCAT genesis kernel and perform the discovery process. When the discovery process is complete, doing ``lsdef`` on the compute nodes should show discovered attributes for the machine.  The important ``mac`` information should be discovered, which is necessary for xCAT to perform OS provisioning. 
+#. The discovery process will network boot the machine into the diskless xCAT genesis kernel and perform the discovery process. When the discovery process is complete, doing ``lsdef`` on the compute nodes should show discovered attributes for the machine.  The important ``mac`` information should be discovered, which is necessary for xCAT to perform OS provisioning.
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/discovery_using_dhcp.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/discovery_using_dhcp.rst
index 17a7843c9..3bc786f7a 100644
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/discovery_using_dhcp.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/discovery_using_dhcp.rst
@@ -1,7 +1,7 @@
 Set static BMC IP using dhcp provided IP address
 ================================================
 
-The following example outlines the MTMS based hardware discovery for a single IPMI-based compute node.  
+The following example outlines the MTMS based hardware discovery for a single IPMI-based compute node.
 
 +------------------------------+------------+
 | Compute Node Information     | Value      |
@@ -15,7 +15,7 @@ The following example outlines the MTMS based hardware discovery for a single IP
 | IP address                   | 10.0.101.1 |
 +------------------------------+------------+
 
-The BMC IP address is obtained by the open range dhcp server and the plan is to leave the IP address the same, except we want to change the IP address to be static in the BMC. 
+The BMC IP address is obtained by the open range dhcp server and the plan is to leave the IP address the same, except we want to change the IP address to be static in the BMC.
 
 +------------------------------+------------+
 | BMC Information              | Value      |
@@ -47,7 +47,7 @@ The BMC IP address is obtained by the open range dhcp server and the plan is to
         serial=10112CA
 
 
-#. Edit the ``predefined.stanzas`` file and change the discovered nodes to the intended ``hostname`` and ``IP address``. 
+#. Edit the ``predefined.stanzas`` file and change the discovered nodes to the intended ``hostname`` and ``IP address``.
 
     #. Edit the ``predefined.stanzas`` file: ::
 
@@ -79,7 +79,7 @@ The BMC IP address is obtained by the open range dhcp server and the plan is to
 
 #. Define the compute nodes into xCAT: ::
 
-       cat predefined.stanzas | mkdef -z 
+       cat predefined.stanzas | mkdef -z
 
 #. Set the chain table to run the ``bmcsetup`` script, this will set the BMC IP to static. ::
 
@@ -103,7 +103,7 @@ The BMC IP address is obtained by the open range dhcp server and the plan is to
 
 #. Refresh the DNS configuration for the new hosts: ::
 
-       makedns -n 
+       makedns -n
 
 #. **[Optional]**  Monitor the node discovery process using rcons
 
@@ -120,5 +120,5 @@ The BMC IP address is obtained by the open range dhcp server and the plan is to
        rsetboot cn01 net
        rpower cn01 on
 
-#. The discovery process will network boot the machine into the diskless xCAT genesis kernel and perform the discovery process. When the discovery process is complete, doing ``lsdef`` on the compute nodes should show discovered attributes for the machine.  The important ``mac`` information should be discovered, which is necessary for xCAT to perform OS provisioning. 
+#. The discovery process will network boot the machine into the diskless xCAT genesis kernel and perform the discovery process. When the discovery process is complete, doing ``lsdef`` on the compute nodes should show discovered attributes for the machine.  The important ``mac`` information should be discovered, which is necessary for xCAT to perform OS provisioning.
 
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/index.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/index.rst
index c4c998c9e..d9c41254e 100644
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/index.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/index.rst
@@ -1,7 +1,7 @@
 MTMS-based Discovery
 ====================
 
-MTMS stands for  **M**\ achine  **T**\ ype/\ **M**\ odel and **S**\ erial.  This is one way to uniquely identify each physical server.  
+MTMS stands for  **M**\ achine  **T**\ ype/\ **M**\ odel and **S**\ erial.  This is one way to uniquely identify each physical server.
 
 MTMS-based hardware discovery assumes the administrator has the model type and serial number information for the physical servers and a plan for mapping the servers to intended hostname/IP addresses.
 
@@ -24,4 +24,4 @@ MTMS-based hardware discovery assumes the administrator has the model type and s
    :maxdepth: 2
 
    verification.rst
-   discovery.rst 
+   discovery.rst
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/verification.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/verification.rst
index a77acd58c..973c0a68f 100644
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/verification.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/verification.rst
@@ -1,7 +1,7 @@
 Verification
 ============
 
-Before starting hardware discovery, ensure the following is configured to make the discovery process as smooth as possible. 
+Before starting hardware discovery, ensure the following is configured to make the discovery process as smooth as possible.
 
 Password Table
 --------------
@@ -15,10 +15,10 @@ If not configured, use the following command to set ``usernam=ADMIN`` and ``pass
     chtab key=ipmi passwd.username=ADMIN passwd.password=admin
 
 
-Genesis Package 
+Genesis Package
 ---------------
 
-The **xCAT-genesis** packages provides the utility to create the genesis network boot rootimage used by xCAT when doing hardware discovery.  It should be installed during the xCAT install and would cause problems if missing.  
+The **xCAT-genesis** packages provides the utility to create the genesis network boot rootimage used by xCAT when doing hardware discovery.  It should be installed during the xCAT install and would cause problems if missing.
 
 Verify that the ``genesis-scripts`` and ``genesis-base`` packages are installed:
 
@@ -47,7 +47,7 @@ If missing:
 
            apt-get install xCAT-genesis
 
-    #. Create the network boot rootimage with the following command: ``mknb ppc64``.  
+    #. Create the network boot rootimage with the following command: ``mknb ppc64``.
 
        The genesis kernel should be copied to ``/tftpboot/xcat``.
 
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/pbmc_discovery_with_bmcdiscover.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/pbmc_discovery_with_bmcdiscover.rst
index bea12d592..92a8c2401 100644
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/pbmc_discovery_with_bmcdiscover.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/pbmc_discovery_with_bmcdiscover.rst
@@ -3,7 +3,7 @@ Discover server and define
 
 After environment is ready, and the server is powered, we can start server discovery process. The first thing to do is discovering the FSP/BMC of the server. It is automatically powered on when the physical server is powered.
 
-Use the :doc:`bmcdiscover </guides/admin-guides/references/man1/bmcdiscover.1>` command to discover the BMCs responding over an IP range and write the output into the xCAT database.  This discovered BMC node is used to control the physical server during hardware discovery and will be deleted after the correct server node object is matched to a pre-defined node.  You **must** use the ``-w`` option to write the output into the xCAT database.  
+Use the :doc:`bmcdiscover </guides/admin-guides/references/man1/bmcdiscover.1>` command to discover the BMCs responding over an IP range and write the output into the xCAT database.  This discovered BMC node is used to control the physical server during hardware discovery and will be deleted after the correct server node object is matched to a pre-defined node.  You **must** use the ``-w`` option to write the output into the xCAT database.
 
 To discover the BMC with an IP address range of 50.0.100.1-100: ::
 
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/pbmc_discovery_with_lsslp.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/pbmc_discovery_with_lsslp.rst
index 9f9b682d9..f398fc57a 100644
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/pbmc_discovery_with_lsslp.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/pbmc_discovery_with_lsslp.rst
@@ -8,7 +8,7 @@ The following command can be used to discovery FSP/BMC within an IP range and wr
   lsslp -s PBMC -u --range 50.0.100.1-100 -z > ./pbmc.stanza
 
 You need to modify the node definition in stanza file before using them, the stanza file will be like this::
- 
+
   # cat pbmc.stanza
   cn1:
       objtype=node
@@ -21,7 +21,7 @@ You need to modify the node definition in stanza file before using them, the sta
       hidden=0
 
 Then, define it into xCATdb::
-  
+
   # cat pbmc.stanza | mkdef -z
   1 object definitions have been created or modified.
 
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/seq_discovery.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/seq_discovery.rst
index aea009420..81df59ae5 100644
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/seq_discovery.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/seq_discovery.rst
@@ -8,7 +8,7 @@ When the physical location of the server is not so important, sequential-based h
 Prepare node pool
 -----------------
 
-To prepare the node pool, shall predefine nodes first, then initialize the discovery process with the predefined nodes. 
+To prepare the node pool, shall predefine nodes first, then initialize the discovery process with the predefined nodes.
 
 Predefine nodes
 ```````````````
@@ -58,15 +58,15 @@ There are additional `nodediscover*` commands you can run during the discovery p
 
 
 Verify the status of discovery using :doc:`nodediscoverstatus </guides/admin-guides/references/man1/nodediscoverstatus.1>`::
-    
+
     nodediscoverstatus
 
 Show the nodes that have been discovered using :doc:`nodediscoverls </guides/admin-guides/references/man1/nodediscoverls.1>`::
-    
+
     nodediscoverls -t seq -l
 
 Stop the current sequential discovery process using: :doc:`nodediscoverstop </guides/admin-guides/references/man1/nodediscoverstop.1>`::
-    
+
     nodediscoverstop
 
 
@@ -80,6 +80,6 @@ To start the discovery process, the system administrator needs to power on the s
 Verify Node Definition
 ----------------------
 
-After discovery of the node, properties of the server will be added to the xCAT node definition.  
+After discovery of the node, properties of the server will be added to the xCAT node definition.
 
-Display the node definition and verify that the MAC address has been populated. 
+Display the node definition and verify that the MAC address has been populated.
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/switch_discovery.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/switch_discovery.rst
index ffa679488..e30ce9555 100644
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/switch_discovery.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/switch_discovery.rst
@@ -1,6 +1,6 @@
 .. include:: ../../common/discover/switch_discovery.rst
 
-For switch based hardware discovery, the servers are identified through the switches and switchposts they are directly connected to. 
+For switch based hardware discovery, the servers are identified through the switches and switchposts they are directly connected to.
 
 .. include:: schedule_environment.rst
 
@@ -34,7 +34,7 @@ The predefined switches will represent devices that the physical servers are con
 So the admin need to make sure those switches are configured correctly with SNMP v3 enabled. <TODO: The document that Configure Ethernet Switches>
 
 Then, define switch info into xCAT::
-    
+
     nodeadd switch1 groups=switch,all
     chdef switch1 ip=10.0.201.1
     tabch switch=switch1 switches.snmpversion=3 switches.username=xcat switches.password=passw0rd switches.auth=sha
@@ -77,7 +77,7 @@ Set the target `osimage` into the chain table to automatically provision the ope
 
     chdef cn1 -p chain="osimage=<osimage_name>"
 
-For more information about chain, refer to :doc:`Chain <../../../../../advanced/chain/index>` 
+For more information about chain, refer to :doc:`Chain <../../../../../advanced/chain/index>`
 
 Add cn1 into DNS::
 
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/cfg_partition.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/cfg_partition.rst
index 5855a231e..b4aeccd6b 100644
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/cfg_partition.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/cfg_partition.rst
@@ -1,4 +1,4 @@
-Configure Disk Partition 
+Configure Disk Partition
 ========================
 .. include:: ../../../common/deployment/cfg_partition.rst
      :start-after: BEGIN_Overview
@@ -9,9 +9,9 @@ Partition Definition File
 .. include:: ../../../common/deployment/cfg_partition.rst
      :start-after: BEGIN_partition_definition_file_Overview
      :end-before: END_partition_definition_file_Overview
-	 
+	
 Create Partition File
-````````````````````` 
+`````````````````````
 .. include:: ../../../common/deployment/cfg_partition.rst
      :start-after: BEGIN_partition_definition_file_content
      :end-before: END_partition_definition_file_content
@@ -19,7 +19,7 @@ Create Partition File
 .. include:: ../../../common/deployment/cfg_partition.rst
      :start-after: BEGIN_partition_definition_file_example_Ubuntu_Standard_partition_for_PPC64le
      :end-before: END_partition_definition_file_example_Ubuntu_Standard_partition_for_PPC64le
-	 
+	
 Associate Partition File with Osimage
 `````````````````````````````````````
 .. include:: ../../../common/deployment/cfg_partition.rst
@@ -31,33 +31,33 @@ Partitioning disk file(For Ubuntu only)
 .. include:: ../../../common/deployment/cfg_partition.rst
      :start-after: BEGIN_Partition_Disk_File_ubuntu_only
      :end-before: END_Partition_Disk_File_ubuntu_only
-	 
+	
 Additional preseed configuration file(For Ubuntu only)
 ``````````````````````````````````````````````````````
 .. include:: ../../../common/deployment/cfg_partition.rst
      :start-after: BEGIN_Additional_preseed_configuration_file_ubuntu_only
      :end-before: END_Additional_preseed_configuration_file_ubuntu_only
-	 
+	
 Partition Definition Script
 ---------------------------
 .. include:: ../../../common/deployment/cfg_partition.rst
      :start-after: BEGIN_Partition_Definition_Script_overview
      :end-before: END_Partition_Definition_Script_overview
 
-Create Partition Script	 
-```````````````````````	 
+Create Partition Script	
+```````````````````````	
 .. include:: ../../../common/deployment/cfg_partition.rst
      :start-after: BEGIN_Partition_Definition_Script_Create_partition_script_content
      :end-before: END_Partition_Definition_Script_Create_partition_script_content
-	 
+	
 .. include:: ../../../common/deployment/cfg_partition.rst
      :start-after: BEGIN_Partition_Definition_Script_Create_partition_script_example_redhat_sles
-     :end-before: END_Partition_Definition_Script_Create_partition_script_example_redhat_sles	 
+     :end-before: END_Partition_Definition_Script_Create_partition_script_example_redhat_sles	
 
 .. include:: ../../../common/deployment/cfg_partition.rst
      :start-after: BEGIN_Partition_Definition_Script_Create_partition_script_example_ubuntu
      :end-before: END_Partition_Definition_Script_Create_partition_script_example_ubuntu
-	 
+	
 Associate partition script with osimage
 ```````````````````````````````````````
 .. include:: ../../../common/deployment/cfg_partition.rst
@@ -74,4 +74,4 @@ Additional preseed configuration script(For Ubuntu only)
 ````````````````````````````````````````````````````````
 .. include:: ../../../common/deployment/cfg_partition.rst
      :start-after: BEGIN_Additional_preseed_configuration_script_ubuntu_only
-     :end-before: END_Additional_preseed_configuration_script_ubuntu_only
\ No newline at end of file
+     :end-before: END_Additional_preseed_configuration_script_ubuntu_only
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/driver_update_disk.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/driver_update_disk.rst
index bd717ba74..030d682b3 100644
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/driver_update_disk.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/driver_update_disk.rst
@@ -16,7 +16,7 @@ For Driver Update Disk
 .. include:: ../../../common/deployment/driver_update_disk.rst
      :start-after: BEGIN_locate_driver_for_DUD
      :end-before: END_locate_driver_for_DUD
-	 
+	
 For Driver RPM Packages
 ```````````````````````
 
@@ -33,14 +33,14 @@ For Driver Update Disk
 .. include:: ../../../common/deployment/driver_update_disk.rst
      :start-after: BEGIN_inject_into_initrd__for_diskful_for_DUD
      :end-before: END_inject_into_initrd__for_diskful_for_DUD
-	 
+	
 For Driver RPM Packages
 ```````````````````````
 
 .. include:: ../../../common/deployment/driver_update_disk.rst
      :start-after: BEGIN__inject_into_initrd__for_diskful_for_RPM
      :end-before: END_inject_into_initrd__for_diskful_for_RPM
-	 
+	
 Notes
 -----
 
@@ -48,4 +48,4 @@ Notes
      :start-after: BEGIN_node
      :end-before: END_node
 
-	 
+	
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/index.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/index.rst
index 059b0ef6c..d471da918 100644
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/index.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/index.rst
@@ -13,5 +13,5 @@ Optional means all the subitems in this page are not necessary to finish an OS d
    additional_pkg.rst
    use_kernel_patch.rst
    network/index.rst
-   
-   
+
+
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/network/cfg_network_adapter.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/network/cfg_network_adapter.rst
index 72631fe6b..57d206514 100644
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/network/cfg_network_adapter.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/network/cfg_network_adapter.rst
@@ -13,8 +13,8 @@ If configuring VLAN, BOND, or BRIDGES, ``nicdevices`` in ``nics`` table must be
 
 The following scenarios are examples to configure Ethernet adapters/BOND/VLAN/Bridge.
 
-    #. Configure Ethernet adapters: 
-   
+    #. Configure Ethernet adapters:
+
         * Scenario 1: :doc:`Configure Ethernet Network Interface <../../../../common/deployment/network/cfg_network_ethernet_nic>`
           To configure Ethernet install NIC or other Ethernet network adapters as static
 
@@ -28,7 +28,7 @@ The following scenarios are examples to configure Ethernet adapters/BOND/VLAN/Br
         * Scenario 4: :doc:`Configure VLAN Based on Bond Adapters <../../../../common/deployment/network/cfg_network_bond_vlan>`
 
     #. Configure Bridge **[RHEL]**:
- 
+
         * Scenario 5: :doc:`Configure Bridge Based On Ethernet NIC <../../../../common/deployment/network/cfg_network_bridge>`
         * Scenario 6: :doc:`Configure Bridge Based on Bond Adapters <../../../../common/deployment/network/cfg_network_bond_bridge>`
         * Scenario 7: :doc:`Configure Bridge Based on VLAN <../../../../common/deployment/network/cfg_network_vlan_bridge>`
@@ -36,7 +36,7 @@ The following scenarios are examples to configure Ethernet adapters/BOND/VLAN/Br
         * Scenario 8: :doc:`Configure Bridge Based on VLAN,VLAN use BOND adapter <../../../../common/deployment/network/cfg_network_bond_vlan_bridge>`
 
     #. Advanced topics:
-    
+
         * :doc:`Use Customized Scripts To Configure NIC <../../../../common/deployment/network/cfg_network_custom_scripts>`
         * :doc:`Use Extra Parameters In NIC Configuration File <../../../../common/deployment/network/cfg_network_extra_param>`
         * :doc:`Configure Aliases <../../../../common/deployment/network/cfg_network_aliases>`
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/network/index.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/network/index.rst
index 1300effb7..08945ef1c 100644
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/network/index.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/network/index.rst
@@ -1,7 +1,7 @@
 Customize network adapter
 =========================
 
-This section describes how to configure network adapters with persistent configuration using xCAT. The ``confignetwork`` postscript can be used to configure the network interfaces on the compute nodes to support Ethernet adapters, VLAN, BONDs, and BRIDGES.  
+This section describes how to configure network adapters with persistent configuration using xCAT. The ``confignetwork`` postscript can be used to configure the network interfaces on the compute nodes to support Ethernet adapters, VLAN, BONDs, and BRIDGES.
 
 .. toctree::
    :maxdepth: 1
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/driver_update_disk.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/driver_update_disk.rst
index 10b8a667b..7054ef8d1 100644
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/driver_update_disk.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/driver_update_disk.rst
@@ -16,7 +16,7 @@ For Driver Update Disk
 .. include:: ../../../common/deployment/driver_update_disk.rst
      :start-after: BEGIN_locate_driver_for_DUD
      :end-before: END_locate_driver_for_DUD
-	 
+	
 For Driver RPM Packages
 ```````````````````````
 
@@ -33,14 +33,14 @@ For Driver Update Disk
 .. include:: ../../../common/deployment/driver_update_disk.rst
      :start-after: BEGIN_inject_into_initrd__for_diskless_for_DUD
      :end-before: END_inject_into_initrd__for_diskless_for_DUD
-	 
+	
 For Driver RPM Packages
 ```````````````````````
 
 .. include:: ../../../common/deployment/driver_update_disk.rst
      :start-after: BEGIN_inject_into_initrd__for_diskless_for_RPM
      :end-before: END_inject_into_initrd__for_diskless_for_RPM
-	 
+	
 Notes
 -----
 
@@ -48,4 +48,4 @@ Notes
      :start-after: BEGIN_node
      :end-before: END_node
 
-	 
+	
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/index.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/index.rst
index 7a9554d87..96a148866 100644
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/index.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/index.rst
@@ -12,7 +12,7 @@ Optional means all the subitems in this page are not necessary to finish an OS d
    additional_pkg.rst
    network/index.rst
    enable_kdump.rst
-   install_new_kernel.rst  
-   acc_initrd_rootimg_gen_ppc64le.rst 
+   install_new_kernel.rst
+   acc_initrd_rootimg_gen_ppc64le.rst
    trim_diskless_rootimg.rst
    localdisk.rst
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/network/cfg_network_adapter.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/network/cfg_network_adapter.rst
index 72631fe6b..57d206514 100644
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/network/cfg_network_adapter.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/network/cfg_network_adapter.rst
@@ -13,8 +13,8 @@ If configuring VLAN, BOND, or BRIDGES, ``nicdevices`` in ``nics`` table must be
 
 The following scenarios are examples to configure Ethernet adapters/BOND/VLAN/Bridge.
 
-    #. Configure Ethernet adapters: 
-   
+    #. Configure Ethernet adapters:
+
         * Scenario 1: :doc:`Configure Ethernet Network Interface <../../../../common/deployment/network/cfg_network_ethernet_nic>`
           To configure Ethernet install NIC or other Ethernet network adapters as static
 
@@ -28,7 +28,7 @@ The following scenarios are examples to configure Ethernet adapters/BOND/VLAN/Br
         * Scenario 4: :doc:`Configure VLAN Based on Bond Adapters <../../../../common/deployment/network/cfg_network_bond_vlan>`
 
     #. Configure Bridge **[RHEL]**:
- 
+
         * Scenario 5: :doc:`Configure Bridge Based On Ethernet NIC <../../../../common/deployment/network/cfg_network_bridge>`
         * Scenario 6: :doc:`Configure Bridge Based on Bond Adapters <../../../../common/deployment/network/cfg_network_bond_bridge>`
         * Scenario 7: :doc:`Configure Bridge Based on VLAN <../../../../common/deployment/network/cfg_network_vlan_bridge>`
@@ -36,7 +36,7 @@ The following scenarios are examples to configure Ethernet adapters/BOND/VLAN/Br
         * Scenario 8: :doc:`Configure Bridge Based on VLAN,VLAN use BOND adapter <../../../../common/deployment/network/cfg_network_bond_vlan_bridge>`
 
     #. Advanced topics:
-    
+
         * :doc:`Use Customized Scripts To Configure NIC <../../../../common/deployment/network/cfg_network_custom_scripts>`
         * :doc:`Use Extra Parameters In NIC Configuration File <../../../../common/deployment/network/cfg_network_extra_param>`
         * :doc:`Configure Aliases <../../../../common/deployment/network/cfg_network_aliases>`
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/network/index.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/network/index.rst
index 1300effb7..08945ef1c 100644
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/network/index.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/network/index.rst
@@ -1,7 +1,7 @@
 Customize network adapter
 =========================
 
-This section describes how to configure network adapters with persistent configuration using xCAT. The ``confignetwork`` postscript can be used to configure the network interfaces on the compute nodes to support Ethernet adapters, VLAN, BONDs, and BRIDGES.  
+This section describes how to configure network adapters with persistent configuration using xCAT. The ``confignetwork`` postscript can be used to configure the network interfaces on the compute nodes to support Ethernet adapters, VLAN, BONDs, and BRIDGES.
 
 .. toctree::
    :maxdepth: 1
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/index.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/index.rst
index 9399c0405..5e786b932 100644
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/index.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/index.rst
@@ -4,14 +4,14 @@ IBM POWER LE / OpenPOWER
 Most of the content is general information for xCAT, the focus and examples are for management of IBM OpenPOWER servers.
 
 IBM OpenPOWER Servers
-  * based on POWER8 Processor Technology is IPMI managed 
+  * based on POWER8 Processor Technology is IPMI managed
   * based on POWER9 Processor Technology is OpenBMC managed [**Alpha**]
 
 
 .. toctree::
    :maxdepth: 2
 
-   configure/index.rst 
+   configure/index.rst
    discovery/index.rst
    management/index.rst
    diskful/index.rst
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/index.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/index.rst
index dce79f855..f0b7d3f77 100644
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/index.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/index.rst
@@ -3,7 +3,7 @@
 
 See :doc:`rflash manpage </guides/admin-guides/references/man1/rflash.1>` for more information.
 
-.. toctree:: 
+.. toctree::
    :maxdepth: 2
 
    ipmi.rst
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/ipmi.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/ipmi.rst
index 0e0234ac6..8256a7c39 100644
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/ipmi.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/ipmi.rst
@@ -1,7 +1,7 @@
 IPMI Firmware Update
 ====================
 
-The ``rflash`` command is provided to assist the system administrator in updating firmware. 
+The ``rflash`` command is provided to assist the system administrator in updating firmware.
 
 To check the current firmware version on the node's BMC and the HPM file: ::
 
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/index.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/index.rst
index 804913d6d..592622a7e 100644
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/index.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/index.rst
@@ -1,7 +1,7 @@
 OpenBMC Firmware Update
 =======================
 
-.. toctree:: 
+.. toctree::
    :maxdepth: 2
 
    manually.rst
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/openbmc_common.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/openbmc_common.rst
index 24cebbdc0..5f6d11318 100644
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/openbmc_common.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/openbmc_common.rst
@@ -25,19 +25,19 @@ If there are errors encountered during the flash process, take a look at the man
 
 The sequence of events that must happen to flash OpenBMC firmware is the following:
 
-#. Power off the Host 
-#. Upload and Activate BMC 
+#. Power off the Host
+#. Upload and Activate BMC
 #. Reboot the BMC (applies BMC)
 #. Upload and Activate Host
-#. Power on the Host (applies Host) 
+#. Power on the Host (applies Host)
 
 
-Power off Host 
+Power off Host
 --------------
 
 Use the rpower command to power off the host: ::
 
-   rpower <noderange> off 
+   rpower <noderange> off
 
 Upload and Activate BMC Firmware
 --------------------------------
@@ -48,18 +48,18 @@ Use the rflash command to upload and activate the Host firmware: ::
 
 If running ``rflash`` in Hierarchy, the firmware files must be accessible on the Service Nodes.
 
-**Note:** If a .tar file is provided, the ``-a`` option does an upload and activate in one step. If an ID is provided, the ``-a`` option just does activate the specified firmware. After firmware is activated, use the ``rflash <noderange> -l`` to view.  The ``rflash`` command shows ``(*)`` as the active firmware and ``(+)`` on the firmware that requires reboot to become effective. 
+**Note:** If a .tar file is provided, the ``-a`` option does an upload and activate in one step. If an ID is provided, the ``-a`` option just does activate the specified firmware. After firmware is activated, use the ``rflash <noderange> -l`` to view.  The ``rflash`` command shows ``(*)`` as the active firmware and ``(+)`` on the firmware that requires reboot to become effective.
 
 Reboot the BMC
 --------------
 
 Use the ``rpower`` command to reboot the BMC: ::
- 
+
    rpower <noderange> bmcreboot
 
-The BMC will take 2-5 minutes to reboot, check the status using: ``rpower <noderange> bmcstate`` and wait for ``BMCReady`` to be returned. 
+The BMC will take 2-5 minutes to reboot, check the status using: ``rpower <noderange> bmcstate`` and wait for ``BMCReady`` to be returned.
 
-**Known Issue:**  On reboot, the first call to the BMC after reboot, xCAT will return ``Error: BMC did not respond within 10 seconds, retry the command.``.  Please retry. 
+**Known Issue:**  On reboot, the first call to the BMC after reboot, xCAT will return ``Error: BMC did not respond within 10 seconds, retry the command.``.  Please retry.
 
 Upload and Activate Host Firmware
 ---------------------------------
@@ -70,14 +70,14 @@ Use the rflash command to upload and activate the Host firmware: ::
 
 If running ``rflash`` in Hierarchy, the firmware files must be accessible on the Service Nodes.
 
-**Note:** The ``-a`` option does an upload and activate in one step, after firmware is activated, use the ``rflash <noderange> -l`` to view.  The ``rflash`` command shows ``(*)`` as the active firmware and ``(+)`` on the firmware that requires reboot to become effective. 
+**Note:** The ``-a`` option does an upload and activate in one step, after firmware is activated, use the ``rflash <noderange> -l`` to view.  The ``rflash`` command shows ``(*)`` as the active firmware and ``(+)`` on the firmware that requires reboot to become effective.
 
 Power on Host
 -------------
 
 User the ``rpower`` command to power on the Host: ::
 
-   rpower <noderange> on 
+   rpower <noderange> on
 
 .. END_flashing_OpenBMC_Servers
 
@@ -86,15 +86,15 @@ User the ``rpower`` command to power on the Host: ::
 Validation
 ----------
 
-Use one of the following commands to validate firmware levels are in sync: 
+Use one of the following commands to validate firmware levels are in sync:
 
 * Use the ``rinv`` command to validate firmware level: ::
 
-    rinv <noderange> firm -V | grep -i ibm | grep "\*" | xcoll 
+    rinv <noderange> firm -V | grep -i ibm | grep "\*" | xcoll
 
 * Use the ``rflash`` command to validate the firmware level: ::
 
-   rflash <noderange> -l | grep "\*" | xcoll 
+   rflash <noderange> -l | grep "\*" | xcoll
 
 
 .. END_Validation_OpenBMC_firmware
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rinv.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rinv.rst
index c88daa952..c9735db85 100644
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rinv.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rinv.rst
@@ -9,7 +9,7 @@ To get all the hardware information for node ``cn1``: ::
 
     rinv cn1 all
 
-To get just the firmware information for ``cn1``: :: 
+To get just the firmware information for ``cn1``: ::
 
     rinv cn1 firm
 
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rspconfig.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rspconfig.rst
index 6eaca4a3f..e35839997 100644
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rspconfig.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rspconfig.rst
@@ -3,7 +3,7 @@
 
 See :doc:`rspconfig manpage </guides/admin-guides/references/man1/rspconfig.1>` for more information.
 
-The ``rspconfig`` command can be used to configure the service processor, or Baseboard Management Controller (BMC), of a physical machine. 
+The ``rspconfig`` command can be used to configure the service processor, or Baseboard Management Controller (BMC), of a physical machine.
 
 For example, to turn on SNMP alerts for node  ``cn5``: ::
 
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rvitals.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rvitals.rst
index 7ec80f859..056b5e6d2 100644
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rvitals.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rvitals.rst
@@ -1,9 +1,9 @@
-``rvitals`` - Remote Hardware Vitals 
-==================================== 
+``rvitals`` - Remote Hardware Vitals
+====================================
 
 See :doc:`rvitals manpage </guides/admin-guides/references/man1/rvitals.1>` for more information.
 
-Collecting runtime information from a running physical machine is an important part of system administration.  Data can be obtained from the service processor including temperature, voltage, cooling fans, etc. 
+Collecting runtime information from a running physical machine is an important part of system administration.  Data can be obtained from the service processor including temperature, voltage, cooling fans, etc.
 
 Use the ``rvitals`` command to obtain this information.  ::
 
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/basic/rbeacon.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/basic/rbeacon.rst
index f58094dd7..a94eb3f13 100644
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/basic/rbeacon.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/basic/rbeacon.rst
@@ -1,4 +1,4 @@
-``rbeacon`` - Beacon Light 
+``rbeacon`` - Beacon Light
 ==========================
 
 See :doc:`rbeacon manpage </guides/admin-guides/references/man1/rbeacon.1>` for more information.
@@ -6,4 +6,4 @@ See :doc:`rbeacon manpage </guides/admin-guides/references/man1/rbeacon.1>` for
 
 Most enterprise level servers have LEDs on their front and/or rear panels, one of which is a beacon light.  If turned on, this light can assist the system administrator in locating one physical machine in the cluster.
 
-Using xCAT, administrators can turn on and off the beacon light using: ``rbeacon <node> on|off`` 
+Using xCAT, administrators can turn on and off the beacon light using: ``rbeacon <node> on|off``
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/basic/rcons.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/basic/rcons.rst
index 1addf7997..10b395b81 100644
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/basic/rcons.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/basic/rcons.rst
@@ -12,7 +12,7 @@ Configure the correct console management by modifying the node definition:
         chdef -t node -o <noderange> cons=ipmi
 
     * For OpenPOWER, **OpenBMC** managed servers: ::
- 
+
         chdef -t node -o <noderange> cons=openbmc
 
 Open a console to ``compute1``: ::
@@ -67,9 +67,9 @@ More details for goconserver, see `goconserver documentation </advanced/goconser
          [sysvinit] service conserver status
          [systemd] systemctl status conserver.service
 
-   #. If ``conserver`` is not running, start the service using: :: 
+   #. If ``conserver`` is not running, start the service using: ::
 
-         [sysvinit] service conserver start 
+         [sysvinit] service conserver start
          [systemd] systemctl start conserver.service
 
    #. Invoke the console again: ``rcons <node>``
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/basic/rpower.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/basic/rpower.rst
index 3e9ad4a97..e6435ec43 100644
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/basic/rpower.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/basic/rpower.rst
@@ -8,8 +8,8 @@ Use the ``rpower`` command to remotely power on and off a single server or a ran
     rpower <noderange> on
     rpower <noderange> off
 
-Other actions include: 
+Other actions include:
 
    * To get the current power state of a server: ``rpower <noderange> state``
-   * To boot/reboot a server: ``rpower <noderange> boot`` 
-   * To hardware reset a server: ``rpower <noderange> reset`` 
+   * To boot/reboot a server: ``rpower <noderange> boot``
+   * To hardware reset a server: ``rpower <noderange> reset``
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/index.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/index.rst
index 006b0763a..04202e5ae 100644
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/index.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/index.rst
@@ -4,5 +4,5 @@ Hardware Management
 .. toctree::
    :maxdepth: 2
 
-   basic/index.rst 
+   basic/index.rst
    advanced/index.rst
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/statelite/advanced_features.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/statelite/advanced_features.rst
index 089b1f066..70b643be6 100644
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/statelite/advanced_features.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/statelite/advanced_features.rst
@@ -39,8 +39,8 @@ In order to describe the hierarchy scenarios we can use , ``P`` to denote parent
 +--------------+-----------------------------------------------------+-------------------------------------------------+
 | P:tmpfs      | "ALL","/root/testblank/",,,                         | Both parent and child are mounted to tmpfs      |
 | C:persistent | "ALL","/root/testblank/testpersfile","persistent",, | on the booted node following their respective   |
-|              |                                                     | options. Only the parent is mounted to the local| 
-|              |                                                     | file                                            | 
+|              |                                                     | options. Only the parent is mounted to the local|
+|              |                                                     | file                                            |
 +--------------+-----------------------------------------------------+-------------------------------------------------+
 | P:persistent | "ALL","/root/testblank/","persistent",,             | Not permitted now. But plan to support it.      |
 | C:tmpfs      | "ALL","/root/testblank/tempfschild",,,              |                                                 |
@@ -84,7 +84,7 @@ In order to describe the hierarchy scenarios we can use , ``P`` to denote parent
 | P:link       | "ALL","/root/testlink/","link",,                    | Both parent and child are created in tmpfs      |
 | C:link,ro    | "ALL","/root/testlink/testlinkro","link,ro",,       | on the booted node, there's only one symbolic   |
 |              |                                                     | link of the parent is created in the local      |
-|              |                                                     | file system.                                    | 
+|              |                                                     | file system.                                    |
 +--------------+-----------------------------------------------------+-------------------------------------------------+
 | P:link       | "ALL","/root/testlink/","link",,                    | Both parent and child are created in tmpfs      |
 | C:link,con   | "ALL","/root/testlink/testlinkconchild","link,con",,| on the booted node, there's only one symbolic   |
@@ -103,7 +103,7 @@ In order to describe the hierarchy scenarios we can use , ``P`` to denote parent
 +--------------+-----------------------------------------------------+-------------------------------------------------+
 | P:link       |                                                     | NOT Permitted                                   |
 | C:persistent |                                                     |                                                 |
-+--------------+-----------------------------------------------------+-------------------------------------------------+ 
++--------------+-----------------------------------------------------+-------------------------------------------------+
 
 litetree table
 --------------
@@ -136,7 +136,7 @@ Our example is as follows: ::
 
 The two directories ``/statelite/$node`` on the node's $noderes.nfsserver and the ``/gpfs/dallas`` on the node cnfs contain root tree structures that are sparsely populated with files that we want to place in those nodes. If files are not found in the first directory, it goes to the next directory. If none of the files can be found in the litetree hierarchy, then they are searched for in ``/.default`` on the local image.
 
-Installing a new Kernel in the statelite image 
+Installing a new Kernel in the statelite image
 ----------------------------------------------
 
 Obtain you new kernel and kernel modules on the MN, for example here we have a new SLES kernel.
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/statelite/config_statelite.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/statelite/config_statelite.rst
index 1d70c52fd..3b0ec8e4b 100644
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/statelite/config_statelite.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/statelite/config_statelite.rst
@@ -2,22 +2,22 @@ Configuration
 =============
 
 Statelite configuration is done using the following tables in xCAT:
-    * litefile 
-    * litetree 
-    * statelite 
-    * policy 
-    * noderes 
+    * litefile
+    * litetree
+    * statelite
+    * policy
+    * noderes
 
 litefile table
 --------------
 
-The litefile table specifies the directories and files on the statelite nodes that should be read/write, persistent, or read-only overlay. All other files in the statelite nodes come from the read-only statelite image. 
+The litefile table specifies the directories and files on the statelite nodes that should be read/write, persistent, or read-only overlay. All other files in the statelite nodes come from the read-only statelite image.
 
 #. The first column in the litefile table is the image name this row applies to. It can be an exact osimage definition name, an osimage group (set in the groups attribute of osimages), or the keyword ``ALL``.
 
 #. The second column in the litefile table is the full path of the directory or file on the node that you are setting options for.
 
-#. The third column in the litefile table specifies options for the directory or file: 
+#. The third column in the litefile table specifies options for the directory or file:
 
     #. tmpfs - It provides a file or directory for the node to use when booting, its permission will be the same as the original version on the server. In most cases, it is read-write; however, on the next statelite boot, the original version of the file or directory on the server will be used, it means it is non-persistent. This option can be performed on files and directories.
     #. rw - Same as above. Its name "rw" does NOT mean it always be read-write, even in most cases it is read-write. Do not confuse it with the "rw" permission in the file system.
@@ -31,7 +31,7 @@ The litefile table specifies the directories and files on the statelite nodes th
     #. link,persistent - It provides a mounted file or directory that is copied to the xCAT persistent location and then over-mounted to the tmpfs on the booted node, and finally the symbolic link in the local file system will be linked to the over-mounted tmpfs file/directory on the booted node. The file/directory will be persistent across reboots. The permission of the file/directory where the symbolic link points to will be the same as the original one in the statelite location. It requires the statelite table to be filled out with a spot for persistent statelite. The option can be performed on files and directories.
     #. localdisk - The file or directory will be stored in the local disk of the statelite node. Refer to the section To enable the localdisk option to enable the 'localdisk' support.
 
-Currently, xCAT does not handle the relative links very well. The relative links are commonly used by the system libraries, for example, under ``/lib/`` directory, there will be one relative link matching one ``.so`` file. So, when you add one relative link to the litefile table (Not recommend), make sure the real file also be included, or put its directory name into the litefile table. 
+Currently, xCAT does not handle the relative links very well. The relative links are commonly used by the system libraries, for example, under ``/lib/`` directory, there will be one relative link matching one ``.so`` file. So, when you add one relative link to the litefile table (Not recommend), make sure the real file also be included, or put its directory name into the litefile table.
 
 .. Note:: It is recommended that you specify at least the entries listed below in the litefile table, because most of these files need to be writeable for the node to boot up successfully. When any changes are made to their options, make sure they won't affect the whole system. If you want to run a command like ``/bin/ping`` using non-root users, add this command into ``litefile``, then root user have privilege to authorize the command for non-root users.
 
@@ -109,7 +109,7 @@ In the statelite table, the node or nodegroups in the table must be unique; that
 
     "compute",,"<nfssvr_ip>:/gpfs/state",,
 
-Any nodes in the compute node group will have their state stored in the ``/gpfs/state`` directory on the machine with ``<nfssvr_ip>`` as its IP address. 
+Any nodes in the compute node group will have their state stored in the ``/gpfs/state`` directory on the machine with ``<nfssvr_ip>`` as its IP address.
 
 When the node boots up, then the value of the ``statemnt`` attribute will be mounted to ``/.statelite/persistent``. The code will then create the following subdirectory ``/.statelite/persistent/<nodename>``, if there are persistent files that have been added in the litefile table. This directory will be the root of the image for this node's persistent files. By default, xCAT will do a hard NFS mount of the directory. You can change the mount options by setting the mntopts attribute in the statelite table.
 
@@ -128,7 +128,7 @@ Ensure policies are set up correctly in the Policy Table. When a node boots up,
     chdef -t policy -o 4.7 commands=litefile rule=allow
     chdef -t policy -o 4.8 commands=litetree rule=allow
 
-noderes 
+noderes
 -------
 
 ``noderes.nfsserver`` attribute can be set for the NFSroot server. If this is not set, then the default is the Management Node.
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/statelite/hierarchy_support.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/statelite/hierarchy_support.rst
index 449533bfe..63988aff8 100644
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/statelite/hierarchy_support.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/statelite/hierarchy_support.rst
@@ -13,7 +13,7 @@ Setup the diskfull service node
 Generate the statelite image
 ````````````````````````````
 
-To generate the statelite image for your own profile follow instructions in :doc:`Customize your statelite osimage <./provision_statelite>`. 
+To generate the statelite image for your own profile follow instructions in :doc:`Customize your statelite osimage <./provision_statelite>`.
 
 ``NOTE``: if the NFS directories defined in the litetree table are on the service node, it is better to setup the NFS directories in the service node following the chapter.
 
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/statelite/provision_statelite.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/statelite/provision_statelite.rst
index 240aed782..da1ae4cdf 100644
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/statelite/provision_statelite.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/statelite/provision_statelite.rst
@@ -1,14 +1,14 @@
 Provision statelite
 ===================
 
-Show current provisioning method 
+Show current provisioning method
 --------------------------------
 
 To determine the current provisioning method of your node, execute: ::
 
     lsdef <noderange> -i provmethod
 
-``Note``: syncfiles is not currently supported for statelite nodes. 
+``Note``: syncfiles is not currently supported for statelite nodes.
 
 Generate default statelite image from distoro media
 ---------------------------------------------------
@@ -21,7 +21,7 @@ Use the copycds command to copy the appropriate iso image into the ``/install``
 
 The contents are copied into ``/install/rhels7.3/ppc64le/``
 
-The configuration files pointed to by the attributes are the defaults shipped with xCAT. We will want to copy them to the ``/install`` directory, in our example the ``/install/test`` directory and modify them as needed. 
+The configuration files pointed to by the attributes are the defaults shipped with xCAT. We will want to copy them to the ``/install`` directory, in our example the ``/install/test`` directory and modify them as needed.
 
 Statelite Directory Structure
 -----------------------------
@@ -49,7 +49,7 @@ Setup your osimage/linuximage tables with new test image name, osvers,osarch, an
     mkdef rhels7.3-custom-statelite -u profile=compute provmethod=statelite
 
 Check your setup: ::
-     
+
     lsdef -t osimage rhels7.3-custom-statelite
 
 Customize the paths to your ``pkglist``, ``syncfile``, etc to the osimage definition, that you require. ``Note``, if you modify the files on the ``/opt/xcat/share/...`` path then copy to the appropriate ``/install/custom/...`` path. Remember all files must be under ``/install`` if using hierarchy (service nodes).
@@ -209,7 +209,7 @@ Make sure you have set up all the attributes in your node definitions correctly
 
 You can now deploy the node by running the following commmands: ::
 
-    rinstall <noderange> 
+    rinstall <noderange>
 
 You can then use ``rcons`` or ``wcons`` to watch the node boot up.
 
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/FAQ.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/FAQ.rst
index 214c79607..a6260fbb2 100644
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/FAQ.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/FAQ.rst
@@ -5,13 +5,13 @@ Trouble Shooting
 VNC client complains the credentials are not valid
 --------------------------------------------------
 
-   **Issue**: 
+   **Issue**:
      While connecting to the hypervisor with VNC, the vnc client complains "Authentication failed".
 
-   **Solution**: 
+   **Solution**:
      Check whether the clocks on the hypervisor and headnode are synced
 
-rpower fails with "Error: internal error Process exited while reading console log qemu: Permission denied" 
+rpower fails with "Error: internal error Process exited while reading console log qemu: Permission denied"
 ----------------------------------------------------------------------------------------------------------
 
    **Issue**: ::
@@ -21,13 +21,13 @@ rpower fails with "Error: internal error Process exited while reading console lo
     qemu: could not open disk image /var/lib/xcat/pools/2e66895a-e09a-53d5-74d3-eccdd9746eb5/vm1.sda.qcow2: Permission denied: internal error Process exited while reading console log output: char device redirected to /dev/pts/1
     qemu: could not open disk image /var/lib/xcat/pools/2e66895a-e09a-53d5-74d3-eccdd9746eb5/vm1.sda.qcow2: Permission denied
 
-   **Solution**: 
+   **Solution**:
      Usually caused by incorrect permission in NFS server/client configuration. NFSv4 is enabled in some Linux distributions such as CentOS6 by default. The solution is simply to disable NFSv4 support on the NFS server by uncommenting the following line in "/etc/sysconfig/nfs": ::
 
        RPCNFSDARGS="-N 4"
 
      Then restart the NFS services and try to power on the VM again...
-   
+
      **Note**: For stateless hypervisor, purge the VM by ``rmvm -p vm1``, reboot the hypervisor and then create the VM.
 
 rpower fails with "Error: internal error: process exited while connecting to monitor qemu: Permission denied"
@@ -73,23 +73,23 @@ rmigrate fails with "Error: 38, message: failed to create directory '<dir-name>'
 Error: Cannot communicate via libvirt to kvmhost1
 -------------------------------------------------
 
-   **Issue**: 
+   **Issue**:
      The kvm related commands complain "Error: Cannot communicate via libvirt to kvmhost1"
 
-   **Solution**: 
+   **Solution**:
      Usually caused by incorrect ssh configuration between xCAT management node and hypervisor. Make sure it is possible to access the hypervisor from management node via ssh without password.
 
 
 Fail to ping the installed VM
 -----------------------------
 
-   **Issue**: 
+   **Issue**:
      The newly installed stateful VM node is not pingable, the following message can be observed in the console during VM booting: ::
 
        ADDRCONF(NETDEV_UP): eth0 link is not ready.
 
-   **Solution**: 
-     Usually caused by the incorrect VM NIC model. Try the following steps to specify "virtio": :: 
+   **Solution**:
+     Usually caused by the incorrect VM NIC model. Try the following steps to specify "virtio": ::
 
        rmvm vm1
        chdef vm1 vmnicnicmodel=virtio
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/RHEVHypervisor.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/RHEVHypervisor.rst
index 59481768a..f9ef4dfaf 100644
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/RHEVHypervisor.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/RHEVHypervisor.rst
@@ -1,12 +1,12 @@
 
-   Red Hat Virtualization (formally known as RHEV or Red Hat Enterprise Virtualization) is a virtualization solution provided by Red Hat.  
+   Red Hat Virtualization (formally known as RHEV or Red Hat Enterprise Virtualization) is a virtualization solution provided by Red Hat.
 
-   At the time of this writing there is no RHEV-H prebuilt hypervisor image on Power LE.  The method for creating a Red Hat Hypervisor on Power LE is to first install RHEL and apply the KVM support on top with the provided RPMs. 
+   At the time of this writing there is no RHEV-H prebuilt hypervisor image on Power LE.  The method for creating a Red Hat Hypervisor on Power LE is to first install RHEL and apply the KVM support on top with the provided RPMs.
 
-   Obtain and download the RHEV RPM packages from the Red Hat download site.  
+   Obtain and download the RHEV RPM packages from the Red Hat download site.
 
        * Management-Agent-Power-7
-       * Power_Tools-7 
+       * Power_Tools-7
 
    In the following example, the RPMs are downloaded to ``/install/post/otherpkgs/rhels7.3/ppc64le/RHEV4/4.0-GA``
 
@@ -24,11 +24,11 @@
       chdef -t osimage rhels7.3-ppc64le-RHEV4-install-compute \
          otherpkgdir=/install/post/otherpkgs/rhels7.3/ppc64le/RHEV4/4.0-GA
 
-   * Create a new package list file ``/install/custom/rhels7.3/ppc64le/rhelv4.pkglist`` to include necessary packages provided from the OS. :: 
+   * Create a new package list file ``/install/custom/rhels7.3/ppc64le/rhelv4.pkglist`` to include necessary packages provided from the OS. ::
 
       #INCLUDE:/opt/xcat/share/xcat/install/rh/compute.rhels7.pkglist#
       libvirt
-      screen 
+      screen
       bridge-utils
 
    * Modify ``pkglist`` attribute to point to the package list file from the step above ::
@@ -38,9 +38,9 @@
 
    * Create a new package list file ``/install/custom/rhels7.3/ppc64le/rhev4.otherpkgs.pkglist`` to list required packages ::
 
-      qemu-kvm-rhev 
-      qemu-kvm-tools-rhev 
-      virt-manager-common 
+      qemu-kvm-rhev
+      qemu-kvm-tools-rhev
+      virt-manager-common
       virt-install
 
    * Modify ``otherpkglist`` attribute to point to the package list file from the step above ::
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/hypervisorKVM.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/hypervisorKVM.rst
index 63a2df528..f2e3bac25 100644
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/hypervisorKVM.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/hypervisorKVM.rst
@@ -30,12 +30,12 @@ Provision Hypervisor
 
         chdef kvmhost1 -p postscripts="xHRM bridgeprereq eth0:br0"
 
-   **Note**: The network bridge name you use should not be the virtual bridges (vbrX) created by libvirt installation  [1]_. 
+   **Note**: The network bridge name you use should not be the virtual bridges (vbrX) created by libvirt installation  [1]_.
 
 
 #. Customize the hypervisor node definition to mount the shared kvm storage directory on management node **(optional)**
 
-   If the shared kvm storage directory on the management node has been exported, it can be mounted on PowerKVM hypervisor for virtual machines hosting. 
+   If the shared kvm storage directory on the management node has been exported, it can be mounted on PowerKVM hypervisor for virtual machines hosting.
 
    An easy way to do this is to create another postscript named "mountvms" which creates a directory **/install/vms** on hypervisor and then mounts **/install/vms** from the management node, the content of "mountvms" can be: ::
 
@@ -56,10 +56,10 @@ Provision Hypervisor
     rpower kvmhost1 boot
 
 
-Create network bridge on hypervisor 
+Create network bridge on hypervisor
 ------------------------------------
 
-To launch VMs, a network bridge must be created on the KVM hypervisor. 
+To launch VMs, a network bridge must be created on the KVM hypervisor.
 
 If the hypervisor is provisioned successfully according to the steps described above, a network bridge will be created and attached to a physical interface. This can be checked by running ``brctl show`` on the hypervisor to show the network bridge information, please make sure a network bridge has been created and configured according to the parameters passed to postscript "xHRM" ::
 
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/index.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/index.rst
index a13f1e1c6..e304ddcc1 100644
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/index.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/index.rst
@@ -3,11 +3,11 @@ Virtual Machines
 
 
 xCAT supports the following virtualization infrastructures:
- 
-**Kernel-based Virtual Machine (KVM)**: 
+
+**Kernel-based Virtual Machine (KVM)**:
   A full virtualization solution for Enterprise Linux distributions, known as the *de facto* open source virtualization mechanism and currently used by many software companies.
 
-**IBM PowerKVM**: 
+**IBM PowerKVM**:
   A product that leverages the Power resilience and performance with the openness of KVM, which provides several advantages:
 
   *  Higher workload consolidation with processors overcommitment and memory sharing
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/kvmMN.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/kvmMN.rst
index eb33072f8..d550e857b 100644
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/kvmMN.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/kvmMN.rst
@@ -7,7 +7,7 @@ Install the kvm related packages
 
 Additional packages need to be installed on the management node for kvm support.
 
-Please make sure the following packages have been installed on the management node, if not, install them manually. 
+Please make sure the following packages have been installed on the management node, if not, install them manually.
 
 ``perl-Sys-Virt``
 
@@ -28,4 +28,4 @@ The easiest shared file system is ``/install`` directory on the management node,
       echo "/install/vms *(rw,no_root_squash,sync,fsid=0)" >> /etc/exports
       exportfs -r
 
-**Note**: make sure the root permission is turned on for nfs clients (i.e. use the ``no_root_squash`` option). Otherwise, the virtual disk file can not work.  
+**Note**: make sure the root permission is turned on for nfs clients (i.e. use the ``no_root_squash`` option). Otherwise, the virtual disk file can not work.
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/pKVMHypervisor.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/pKVMHypervisor.rst
index e75d9f5e3..ffa756943 100644
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/pKVMHypervisor.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/virtual_machines/pKVMHypervisor.rst
@@ -1,10 +1,10 @@
 
-   Obtain a PowerKVM ISO and create PowerKVM osimages with it: :: 
+   Obtain a PowerKVM ISO and create PowerKVM osimages with it: ::
 
      copycds ibm-powerkvm-3.1.0.0-39.0-ppc64le-gold-201511041419.iso
-    
+
    The following PowerKVM osimage will be created ::
-     
+
      # lsdef -t osimage -o pkvm3.1-ppc64le-install-compute
      Object name: pkvm3.1-ppc64le-install-compute
          imagetype=linux
diff --git a/docs/source/guides/admin-guides/manage_clusters/x86_64/index.rst b/docs/source/guides/admin-guides/manage_clusters/x86_64/index.rst
index 88577cbae..2effc8d80 100644
--- a/docs/source/guides/admin-guides/manage_clusters/x86_64/index.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/x86_64/index.rst
@@ -1,6 +1,6 @@
 x86_64
 ======
 
-This section is not available at this time. 
+This section is not available at this time.
 
-Refer to `xCAT Documentation <https://sourceforge.net/p/xcat/wiki/XCAT_Documentation/>`_ on SourceForge for information on System X servers. 
+Refer to `xCAT Documentation <https://sourceforge.net/p/xcat/wiki/XCAT_Documentation/>`_ on SourceForge for information on System X servers.
diff --git a/docs/source/guides/admin-guides/references/index.rst b/docs/source/guides/admin-guides/references/index.rst
index 2218a340a..c195a2858 100644
--- a/docs/source/guides/admin-guides/references/index.rst
+++ b/docs/source/guides/admin-guides/references/index.rst
@@ -15,12 +15,12 @@ These man pages are auto generated from .pod files to .rst files using the ``cre
    man5/index.rst
    man7/index.rst
    man8/index.rst
-        
+
 
 xCAT Tools
 ----------
 
-*Disclaimer:* **Use at your own risk** 
+*Disclaimer:* **Use at your own risk**
 
 The following tools are shipped with xCAT and have been contributed by various xCAT community users.  The tools are located under ``/opt/xcat/share/xcat/tools/``.
 
diff --git a/docs/source/guides/admin-guides/references/man1/addkit.1.rst b/docs/source/guides/admin-guides/references/man1/addkit.1.rst
index 7c64c139e..ee49d089f 100644
--- a/docs/source/guides/admin-guides/references/man1/addkit.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/addkit.1.rst
@@ -21,9 +21,9 @@ SYNOPSIS
 
 \ **addkit**\  [\ **-? | -h | -**\ **-help**\ ] [\ **-v | -**\ **-version**\ ]
 
-\ **addkit**\  [\ **-i | -**\ **-inspection**\ ] \ *kitlist*\ 
+\ **addkit**\  [\ **-i | -**\ **-inspection**\ ] \ *kitlist*\
 
-\ **addkit**\  [\ **-V | -**\ **-verbose**\ ] [\ **-p | -**\ **-path**\  \ *path*\ ] \ *kitlist*\ 
+\ **addkit**\  [\ **-V | -**\ **-verbose**\ ] [\ **-p | -**\ **-path**\  \ *path*\ ] \ *kitlist*\
 
 
 ***********
@@ -43,40 +43,40 @@ OPTIONS
 
 
 
-\ **-h|-**\ **-help**\ 
- 
+\ **-h|-**\ **-help**\
+
  Display usage message.
- 
 
 
-\ **-V|-**\ **-verbose**\ 
- 
+
+\ **-V|-**\ **-verbose**\
+
  Verbose mode.
- 
 
 
-\ **-v|-**\ **-version**\ 
- 
+
+\ **-v|-**\ **-version**\
+
  Command version.
- 
 
 
-\ **-i|-**\ **-inspection**\ 
- 
+
+\ **-i|-**\ **-inspection**\
+
  Show the summary of the given kits
- 
 
 
-\ **-p|-**\ **-path**\  \ *path*\ 
- 
+
+\ **-p|-**\ **-path**\  \ *path*\
+
  The destination directory to which the contents of the kit tarfiles and/or kit deploy directories will be copied.  When this option is not specified, the default destination directory will be formed from the installdir site attribute with ./kits subdirectory.
- 
 
 
-\ *kitlist*\ 
- 
+
+\ *kitlist*\
+
  A comma delimited list of kit_tarball_files or kit_deploy_directories to be added to the xCAT environment. Each entry can be an absolute or relative path.  See xCAT documentation for more information on building kits.
- 
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/addkitcomp.1.rst b/docs/source/guides/admin-guides/references/man1/addkitcomp.1.rst
index 16a43358a..698c643c5 100644
--- a/docs/source/guides/admin-guides/references/man1/addkitcomp.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/addkitcomp.1.rst
@@ -21,7 +21,7 @@ SYNOPSIS
 
 \ **addkitcomp**\  [\ **-? | -h | -**\ **-help**\ ] [\ **-v | -**\ **-version**\ ]
 
-\ **addkitcomp**\  [\ **-V | -**\ **-verbose**\ ] [\ **-a | -**\ **-adddeps**\ ] [\ **-f | -**\ **-force**\ ] [\ **-n | -**\ **-noupgrade**\ ] [\ **-**\ **-noscripts**\ ] \ **-i**\  \ *osimage*\   \ *kitcompname_list*\ 
+\ **addkitcomp**\  [\ **-V | -**\ **-verbose**\ ] [\ **-a | -**\ **-adddeps**\ ] [\ **-f | -**\ **-force**\ ] [\ **-n | -**\ **-noupgrade**\ ] [\ **-**\ **-noscripts**\ ] \ **-i**\  \ *osimage*\   \ *kitcompname_list*\
 
 
 ***********
@@ -40,60 +40,60 @@ OPTIONS
 
 
 
-\ **-a|-**\ **-adddeps**\ 
- 
+\ **-a|-**\ **-adddeps**\
+
  Assign kitcomponent dependencies to the osimage.
- 
 
 
-\ **-h|-**\ **-help**\ 
- 
+
+\ **-h|-**\ **-help**\
+
  Display usage message.
- 
 
 
-\ **-V|-**\ **-verbose**\ 
- 
+
+\ **-V|-**\ **-verbose**\
+
  Verbose mode.
- 
 
 
-\ **-v|-**\ **-version**\ 
- 
+
+\ **-v|-**\ **-version**\
+
  Command version.
- 
 
 
-\ **-f|-**\ **-force**\ 
- 
+
+\ **-f|-**\ **-force**\
+
  Add kit component to osimage even if there is a mismatch in OS, version, arch, serverrole, or kitcompdeps
- 
 
 
-\ **-i**\  \ *osimage*\ 
- 
+
+\ **-i**\  \ *osimage*\
+
  The osimage name that the kit component is assigning to.
- 
 
 
-\ **-n|-**\ **-noupgrade**\ 
- 
+
+\ **-n|-**\ **-noupgrade**\
+
  1. Allow multiple versions of kitcomponent to be installed into the osimage, instead of kitcomponent upgrade.
- 
+
  2. Kit components added by addkitcomp -n will be installed separately behind all other ones which have been added.
- 
 
 
-\ **-**\ **-noscripts**\ 
- 
+
+\ **-**\ **-noscripts**\
+
  Do not add kitcomponent's postbootscripts to osimage
- 
 
 
-\ *kitcompname_list*\ 
- 
+
+\ *kitcompname_list*\
+
  A comma-delimited list of valid full kit component names or kit component basenames that are to be added to the osimage.
- 
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/bmcdiscover.1.rst b/docs/source/guides/admin-guides/references/man1/bmcdiscover.1.rst
index 238924d21..92be62696 100644
--- a/docs/source/guides/admin-guides/references/man1/bmcdiscover.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/bmcdiscover.1.rst
@@ -23,7 +23,7 @@ SYNOPSIS
 
 \ **bmcdiscover**\  [\ **-v | -**\ **-version**\ ]
 
-\ **bmcdiscover**\  [\ **-**\ **-sn**\  \ *SN_nodename*\ ] [\ **-s**\  \ *scan_method*\ ] [\ **-u**\  \ *bmc_user*\ ] [\ **-p**\  \ *bmc_passwd*\ ] [\ **-z**\ ] [\ **-w**\ ] \ **-**\ **-range**\  \ *ip_ranges*\ 
+\ **bmcdiscover**\  [\ **-**\ **-sn**\  \ *SN_nodename*\ ] [\ **-s**\  \ *scan_method*\ ] [\ **-u**\  \ *bmc_user*\ ] [\ **-p**\  \ *bmc_passwd*\ ] [\ **-z**\ ] [\ **-w**\ ] \ **-**\ **-range**\  \ *ip_ranges*\
 
 
 ***********
@@ -46,64 +46,64 @@ OPTIONS
 
 
 
-\ **-**\ **-range**\ 
- 
+\ **-**\ **-range**\
+
  Specify one or more IP ranges acceptable to nmap.  IP range can be hostnames, IP addresses, networks, etc.  A single IP address (10.1.2.3), several IPs with commas (10.1.2.3,10.1.2.10), Ip range with "-" (10.1.2.0-100) or an IP range (10.1.2.0/24) can be specified.  If the range is very large, the \ **bmcdiscover**\  command may take a long time to return.
- 
 
 
-\ **-**\ **-sn**\ 
- 
+
+\ **-**\ **-sn**\
+
  Specify one or more service nodes on which bmcdiscover will run. In hierarchical cluster, the MN may not be able to access the BMC of CN directly, but SN can. With this option, bmcdiscover will be dispatched to the specified SNs. Then, the nodename of the service node that 'bmcdiscover' is running on will be set to the 'servicenode' attribute of the discovered BMC node.
- 
 
 
-\ **-s**\ 
- 
+
+\ **-s**\
+
  Scan method  (The only supported scan method at this time is \ **nmap**\ )
- 
 
 
-\ **-z**\ 
- 
+
+\ **-z**\
+
  List the data returned in xCAT stanza format
- 
 
 
-\ **-w**\ 
- 
+
+\ **-w**\
+
  Write to the xCAT database.
- 
 
 
-\ **-i|-**\ **-bmcip**\ 
- 
+
+\ **-i|-**\ **-bmcip**\
+
  BMC IP address.
- 
 
 
-\ **-u|-**\ **-bmcuser**\ 
- 
+
+\ **-u|-**\ **-bmcuser**\
+
  BMC user name.
- 
 
 
-\ **-p|-**\ **-bmcpasswd**\ 
- 
+
+\ **-p|-**\ **-bmcpasswd**\
+
  BMC user password.
- 
 
 
-\ **-h|-**\ **-help**\ 
- 
+
+\ **-h|-**\ **-help**\
+
  Display usage message
- 
 
 
-\ **-v|-**\ **-version**\ 
- 
+
+\ **-v|-**\ **-version**\
+
  Display version information
- 
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/buildkit.1.rst b/docs/source/guides/admin-guides/references/man1/buildkit.1.rst
index 20dd710e6..fcf4ec6ab 100644
--- a/docs/source/guides/admin-guides/references/man1/buildkit.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/buildkit.1.rst
@@ -49,23 +49,23 @@ For example, to create a new kit named "prodkit" in the directory /home/mykits/
 
 
 1.
- 
+
  If no location is provided then the command will create a subdirectory called "prodkit" in the current directory "/home/mykits" and the new kit files will be created there.
- 
- \ **cd /home/mykits**\ 
- 
- \ **buildkit create prodkit**\ 
- 
+
+ \ **cd /home/mykits**\
+
+ \ **buildkit create prodkit**\
+
  or
- 
+
 
 
 2.
- 
+
  If a location is provided then the Kit files will be created there. Note that the Kit name does not necessarily have to be the directory name where the kit files are located.
- 
- \ **buidkit create prodkit -l /home/mykits/prodkit**\ 
- 
+
+ \ **buidkit create prodkit -l /home/mykits/prodkit**\
+
 
 
 In both cases the /home/mykits/prodkit directory is created and the inital files for the kit are created in that directory.
@@ -74,77 +74,77 @@ The following example illustrates the basic process for building a new Kit. In t
 
 
 1.
- 
+
  Change to the directory where you wish to create the Kit.
- 
+
 
 
 2.
- 
+
  Create a template directory for your kit:
- 
- \ **buildkit create mytstkit**\ 
- 
+
+ \ **buildkit create mytstkit**\
+
 
 
 3.
- 
+
  Change directory to the new "mytstkit" subdirectory that was just created.
- 
- \ **cd mytstkit**\ 
- 
+
+ \ **cd mytstkit**\
+
 
 
 4.
- 
+
  Edit the buildkit configuration file for your kit:
- 
- \ **vi buildkit.conf**\ 
- 
+
+ \ **vi buildkit.conf**\
+
  (See xCAT Kit documentation for details.)
- 
+
 
 
 5.
- 
+
  Create all required files, scripts, plugins, and packages for your kit.
- 
+
 
 
 6.
- 
+
  Validate your kit build configuration and fix any errors that are reported:
- 
- \ **buildkit chkconfig**\ 
- 
+
+ \ **buildkit chkconfig**\
+
 
 
 7.
- 
+
  List the repos defined in your buildkit configuration file:
- 
- \ **buildkit listrepo**\ 
- 
+
+ \ **buildkit listrepo**\
+
 
 
 8.
- 
+
  For each repo name listed, build the repository.  Note that if you need to build repositories for OS distributions, versions, or architectures that do not match the current system, you may need to copy your kit template directory to an appropriate server to build that repository, and then copy the results back to your main build server.  For example, to build a repo named "rhels6.3" you would run the following command.
- 
- \ **buildkit buildrepo rhels6.3**\ 
- 
+
+ \ **buildkit buildrepo rhels6.3**\
+
  or, you can build all of the repos at one time if there are no OS or architecture dependencies for kitcomponent package builds or kitpackage builds:
- 
- \ **buildkit buildrepo all**\ 
- 
+
+ \ **buildkit buildrepo all**\
+
 
 
 9.
- 
+
  Build the kit tar file:
- 
- \ **buildkit buildtar**\ 
- 
+
+ \ **buildkit buildtar**\
+
 
 
 
@@ -154,46 +154,46 @@ OPTIONS
 
 
 
-\ **-h |-**\ **-help**\ 
- 
+\ **-h |-**\ **-help**\
+
  Display usage message.
- 
 
 
-\ **-k|-**\ **-kitversion**\  \ *version*\ 
- 
+
+\ **-k|-**\ **-kitversion**\  \ *version*\
+
  Product version.
- 
 
 
-\ **-l|-**\ **-kitloc**\  \ *kit_location*\ 
- 
+
+\ **-l|-**\ **-kitloc**\  \ *kit_location*\
+
  The directory location of the Kit files.
- 
 
 
-\ **-p|-**\ **-pkgdir**\  \ *package_directory_list*\ 
- 
+
+\ **-p|-**\ **-pkgdir**\  \ *package_directory_list*\
+
  A comma-separated list of directory locations for product RPMs.
- 
 
 
-\ **-r|-**\ **-kitrelease**\  \ *release*\ 
- 
+
+\ **-r|-**\ **-kitrelease**\  \ *release*\
+
  Product release.
- 
 
 
-\ **-V |-**\ **-verbose**\ 
- 
+
+\ **-V |-**\ **-verbose**\
+
  Verbose mode.
- 
 
 
-\ **-v|-**\ **-version**\ 
- 
+
+\ **-v|-**\ **-version**\
+
  Command version.
- 
+
 
 
 
@@ -203,73 +203,73 @@ SUB-COMMANDS
 
 
 
-\ **create**\  \ *kit_basename*\ 
- 
+\ **create**\  \ *kit_basename*\
+
  Creates a new kit build directory structure for kit \ *kit_basename*\  using the location specified on the command line or the current directory.  The sample kit files from /opt/xcat/share/xcat/kits/kit_template are copied over, and the buildkit.conf file is modified for the specified \ *kit_basename*\ .
- 
 
 
-\ **chkconfig**\ 
- 
+
+\ **chkconfig**\
+
  Reads the buildkit.conf file, verifies that the file syntax is correct and that all specified files exist.
- 
 
 
-\ **listrepo**\ 
- 
+
+\ **listrepo**\
+
  Reads the buildkit.conf file, lists all Kit package repositories listed in the file, and reports the build status for each repository.
- 
+
 
 
 \ **buildrepo**\  {\ *repo_name*\  | \ **all**\ }
- 
+
  Reads the buildkit.conf file, and builds the specified Kit package repository.  The built packages are placed in the directory <kit_location>/build/kit_repodir/\ *repo_name*\ .  If \ **all**\  is specified, all kit repositories are built.
- 
+
 
 
 \ **cleanrepo**\  {\ *repo_name*\  | \ **all**\ }
- 
+
  Reads the buildkit.conf file, and deletes all the package files and package meta data files from the <kit_location>/build/kit_repodir/\ *repo_name*\  directory.  If \ **all**\  is specified, all kit repository files are deleted.
- 
 
 
-\ **buildtar**\ 
- 
+
+\ **buildtar**\
+
  Reads the buildkit.conf file, validates that all kit repositories have been built, and builds the Kit tar file <kit_location>/\ *kitname*\ .tar.bz2.
- 
 
 
-\ **cleantar**\ 
- 
+
+\ **cleantar**\
+
  Reads the <kit_location>/buildkit.conf file and \ *deletes*\  the following:
- 
- 
+
+
  - Kit tar files matching <kit_location>/\ *kit_name\\*.tar.bz2*\ .
- 
- - <kit_location>/build/\ *kit_name*\ 
- 
+
+ - <kit_location>/build/\ *kit_name*\
+
  - <kit_location>/rpmbuild
- 
+
  - <kit_location>/tmp
- 
+
  - <kit_location>/debbuild
- 
+
  Caution:  Make sure you back up any tar files you would like to keep before running this subcommand.
- 
 
 
-\ **cleanall**\ 
- 
+
+\ **cleanall**\
+
  Equivalent to running \ **buildkit cleanrepo all**\  and \ **buildkit cleantar**\ .
- 
 
 
-\ **addpkgs**\ 
- 
+
+\ **addpkgs**\
+
  \ *kit_tarfile*\  {\ **-p**\  | \ **-**\ **-pkgdir**\  \ *package_directory_list*\ } [\ **-k**\  | \ **-**\ **-kitversion**\  \ *version*\ ] [\ **-r**\  | \ **-**\ **-kitrelease**\  \ *release*\ ]
- 
+
  Add product package rpms to a previously built kit tar file.  This is used for partial product kits that are built and shipped separately from the product packages, and are identified with a \ *kit_tarfile*\  name of \ *kitname*\ .\ **NEED_PRODUCT_PKGS.tar.bz2**\ . Optionally, change the kit release and version values when building the new kit tarfile.  If kitcomponent version and/or release values are defaulted to the kit values, those will also be changed and new kitcomponent rpms will be built.  If kit or kitcomponent scripts, plugins, or other files specify name, release, or version substitution strings, these will all be replaced with the new values when built into the new complete kit tarfile \ *kit_location*\ /\ *new_kitname*\ .\ **tar.bz2**\ .
- 
+
 
 
 
@@ -280,15 +280,15 @@ RETURN VALUE
 
 
 <B>0
- 
+
  The command completed successfully.
- 
+
 
 
 <B>1
- 
+
  An error has occurred.
- 
+
 
 
 
@@ -299,49 +299,49 @@ EXAMPLES
 
 
 1.
- 
+
  To create the sample kit shipped with the xCAT-buildkit rpm on a RHELS 6.3 server and naming it \ **mykit**\ , run the following commands:
- 
- \ **cd /home/myuserid/kits**\ 
- 
- \ **buildkit create mykit**\ 
- 
- \ **cd mykit**\ 
- 
- \ **vi buildkit.conf**\ 
- 
- \ **buildkit chkconfig**\ 
- 
- \ **buildkit listrepo**\ 
- 
- \ **buildkit buildrepo all**\ 
- 
- \ **buildkit buildtar**\ 
- 
+
+ \ **cd /home/myuserid/kits**\
+
+ \ **buildkit create mykit**\
+
+ \ **cd mykit**\
+
+ \ **vi buildkit.conf**\
+
+ \ **buildkit chkconfig**\
+
+ \ **buildkit listrepo**\
+
+ \ **buildkit buildrepo all**\
+
+ \ **buildkit buildtar**\
+
 
 
 2.
- 
+
  To clean up a kit repository directory after build failures on a RHELS 6.3 server to prepare for a new kit repository build, run:
- 
- \ **buildkit cleanrepo rhels6.3**\ 
- 
+
+ \ **buildkit cleanrepo rhels6.3**\
+
 
 
 3.
- 
+
  To clean up all kit build files, including a previously built kit tar file, run
- 
- \ **buildkit cleanall**\ 
- 
+
+ \ **buildkit cleanall**\
+
 
 
 4.
- 
+
  To create a kit named "tstkit" located in /home/foobar/tstkit instead of the current working directory.
- 
- \ **buildkit create tstkit -l /home/foobar/tstkit**\ 
- 
+
+ \ **buildkit create tstkit -l /home/foobar/tstkit**\
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/cfgve.1.rst b/docs/source/guides/admin-guides/references/man1/cfgve.1.rst
index 3c53d9b20..636f8aede 100644
--- a/docs/source/guides/admin-guides/references/man1/cfgve.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/cfgve.1.rst
@@ -35,16 +35,16 @@ DESCRIPTION
 ***********
 
 
-The \ **cfgve**\  command can be used to configure a virtual environment for 
+The \ **cfgve**\  command can be used to configure a virtual environment for
 'Storage Domain', 'Network' and 'Template' objects.
 
-The mandatory parameter \ **-m**\  \ *manager*\  is used to specify the address of the 
+The mandatory parameter \ **-m**\  \ *manager*\  is used to specify the address of the
 manager of virtual environment. xCAT needs it to access the RHEV manager.
 
-The mandatory parameter \ **-t**\  \ *type*\  is used to specify the type of the target 
+The mandatory parameter \ **-t**\  \ *type*\  is used to specify the type of the target
 object.
 
-Basically, \ **cfgve**\  command supports five types of object: \ **dc**\ , \ **cl**\ , 
+Basically, \ **cfgve**\  command supports five types of object: \ **dc**\ , \ **cl**\ ,
 \ **sd**\ , \ **nw**\  and \ **tpl**\ .
 
 
@@ -52,7 +52,7 @@ Basically, \ **cfgve**\  command supports five types of object: \ **dc**\ , \ **
 
 \ **cl**\  - The \ **create**\  and \ **remove**\  operations are supported.
 
-\ **sd**\   - The \ **create**\ , \ **attach**\ , \ **detach**\ , \ **activate**\ , 
+\ **sd**\   - The \ **create**\ , \ **attach**\ , \ **detach**\ , \ **activate**\ ,
 \ **deactivate**\  and \ **remove**\  operations are supported.
 
 \ **nw**\   - The \ **create**\ , \ **attach**\ , \ **detach**\  and \ **remove**\  operations are supported.
@@ -77,51 +77,51 @@ OPTIONS
 
 
 \ **-c**\  To create the target object.
- 
- For creating of \ **Storage Domain**\ , the target storage domain will be created 
+
+ For creating of \ **Storage Domain**\ , the target storage domain will be created
  first, then attached to data center and activated.
- 
- The parameters that used to create the storage domain are gotten 
+
+ The parameters that used to create the storage domain are gotten
  from 'virtsd' table. The detail parameters in the virtsd table:
- 
- 
+
+
  \ **virtsd.node**\  - The name of the storage domain.
- 
- \ **virtsd.sdtype**\  - The type of storage domain. Valid value: data, iso, export. 
+
+ \ **virtsd.sdtype**\  - The type of storage domain. Valid value: data, iso, export.
  Default value is 'data'.
- 
+
  \ **virtsd.stype**\  - The storage type. "nfs" or "localfs".
- 
- \ **virtsd.location**\  - The location of the storage. 
- \ **nfs**\ : Format: [nfsserver:nfspath]. 
- The NFS export directory must be configured for read write access and must 
+
+ \ **virtsd.location**\  - The location of the storage.
+ \ **nfs**\ : Format: [nfsserver:nfspath].
+ The NFS export directory must be configured for read write access and must
  be owned by vdsm:kvm.
  \ **localfs**\ : "/data/images/rhev" is set by default.
- 
- \ **virtsd.host**\  - A host must be specified for a storage domain as SPM 
- (Storage Pool Manager) when initialize the storage domain. The role of SPM 
- may be migrated to other host by rhev-m during the running of the datacenter 
- (For example, when the current SPM encountered issue or going to maintenance 
+
+ \ **virtsd.host**\  - A host must be specified for a storage domain as SPM
+ (Storage Pool Manager) when initialize the storage domain. The role of SPM
+ may be migrated to other host by rhev-m during the running of the datacenter
+ (For example, when the current SPM encountered issue or going to maintenance
  status.
- 
- \ **virtsd.datacenter**\  - The storage will be attached to. 'Default' data center 
+
+ \ **virtsd.datacenter**\  - The storage will be attached to. 'Default' data center
  is the default value.
- 
 
 
-\ **-d**\  \ *data center*\ 
- 
+
+\ **-d**\  \ *data center*\
+
  The name of data center.
- 
- Specify the 'Data Center' that will be used for the object to be attached to. 
+
+ Specify the 'Data Center' that will be used for the object to be attached to.
  It is used by <nw> type.
- 
+
 
 
 \ **-f**\  It can be used with \ **-r**\  to remove the target object by force.
- 
+
  For removing of \ **Storage Domain**\ , if \ **-f**\  is specified, the storage domain will be deactivated and detached from data center before the removing.
- 
+
 
 
 \ **-g**\  To activate the target object.
@@ -132,73 +132,73 @@ OPTIONS
 
 
 
-\ **-k**\  \ *storage type*\ 
- 
+\ **-k**\  \ *storage type*\
+
  To specify the type of the storage type when creating the data center.
- 
+
  Supported type: nfs; localfs.
- 
 
 
-\ **-l**\  \ *cluster*\ 
- 
+
+\ **-l**\  \ *cluster*\
+
  Specify the cluster for the network to attach to.
- 
 
 
-\ **-m**\  \ *manager*\ 
- 
+
+\ **-m**\  \ *manager*\
+
  Specify the manager of the virtual environment.
- 
- For RHEV, the FQDN (Fully Qualified Domain Name) of the rhev manager have 
+
+ For RHEV, the FQDN (Fully Qualified Domain Name) of the rhev manager have
  to be specified.
- 
 
 
-\ **-n**\  \ *vlan ID*\ 
- 
+
+\ **-n**\  \ *vlan ID*\
+
  To specify the vlan number when creating a network.
- 
 
 
-\ **-o**\  \ *object*\ 
- 
+
+\ **-o**\  \ *object*\
+
  The name of the target object.
- 
 
 
-\ **-p**\  \ *cpu type*\ 
- 
+
+\ **-p**\  \ *cpu type*\
+
  To specify the cpu type when creating the cluster.
  \ **Intel Penryn Family**\  is default type.
- 
+
  Supported type: \ **Intel Conroe Family**\ , \ **Intel Penryn Family**\ ,
  \ **Intel Nehalem Family**\ , \ **Intel Westmere Family**\ , \ **AMD Opteron G1**\ ,
- \ **AMD Opteron G2**\ , \ **AMD Opteron G3**\ 
- 
+ \ **AMD Opteron G2**\ , \ **AMD Opteron G3**\
+
 
 
 \ **-r**\  To remove the target object.
- 
+
  For removing of \ **Storage Domain**\ , the storage space will be formatted after removing.
- 
+
 
 
 \ **-s**\  To deactivate the target object.
 
 
 
-\ **-t**\  \ *type*\ 
- 
+\ **-t**\  \ *type*\
+
  Specify the \ **type**\  of the target object.
- 
+
  Supported types:
   \ **dc**\   - Data Center
   \ **cl**\   - Cluster
   \ **sd**\   - Storage Domain
   \ **nw**\   - Network
   \ **tpl**\  - Template
- 
+
 
 
 
@@ -219,53 +219,53 @@ EXAMPLES
 
 
 1. To create the Storage Domain 'sd1', enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    cfgve -t sd -m <FQDN of rhev manager> -o sd1 -c
- 
- 
+
+
 
 
 2. To deactivate the Storage Domain 'sd1' from data center, enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    cfgve -t sd -m <FQDN of rhev manager> -o sd1 -s
- 
- 
+
+
 
 
 3. To remove the Storage Domain 'sd1', enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    cfgve -t sd -m <FQDN of rhev manager> -o sd1 -r
- 
- 
+
+
 
 
 4. To create the network 'nw1', enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    cfgve -t nw -m <FQDN of rhev manager> -o nw1 -c
- 
- 
+
+
 
 
 5. To remove the template 'tpl01', enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    cfgve -t tpl -m <FQDN of rhev manager> -o tpl01 -r
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/cfm2xcat.1.rst b/docs/source/guides/admin-guides/references/man1/cfm2xcat.1.rst
index c43171ce3..e04b5e922 100644
--- a/docs/source/guides/admin-guides/references/man1/cfm2xcat.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/cfm2xcat.1.rst
@@ -15,7 +15,7 @@ NAME
 
 
 ****************
-\ **SYNOPSIS**\ 
+\ **SYNOPSIS**\
 ****************
 
 
@@ -25,7 +25,7 @@ NAME
 
 
 *******************
-\ **DESCRIPTION**\ 
+\ **DESCRIPTION**\
 *******************
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/chdef.1.rst b/docs/source/guides/admin-guides/references/man1/chdef.1.rst
index a18531e3c..dedf478e6 100644
--- a/docs/source/guides/admin-guides/references/man1/chdef.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/chdef.1.rst
@@ -44,94 +44,94 @@ OPTIONS
 
 
 
-\ *attr=val [attr=val ...]*\ 
- 
+\ *attr=val [attr=val ...]*\
+
  Specifies one or more "attribute equals value" pairs, separated by spaces. Attr=val pairs must be specified last on the command line. Use the help option to get a list of valid attributes for each object type.
- 
 
 
-\ **-d|-**\ **-dynamic**\ 
- 
+
+\ **-d|-**\ **-dynamic**\
+
  Use the dynamic option to change dynamic node groups definition. This option must be used with -w option.
- 
 
 
-\ **-h|-**\ **-help**\ 
- 
+
+\ **-h|-**\ **-help**\
+
  Display usage message.
- 
 
 
-\ **-m|-**\ **-minus**\ 
- 
+
+\ **-m|-**\ **-minus**\
+
  If the value of the attribute is a list then this option may be used to remove one or more items from the list.
- 
 
 
-\ **-n**\  \ *new-name*\ 
- 
+
+\ **-n**\  \ *new-name*\
+
  Change the current object name to the new-name which is specified by the -n option.
  Objects of type site, group and monitoring cannot be renamed with the -n option.
  Note: For the \ **-n**\  option, only one node can be specified. For some special nodes such as fsp, bpa, frame, cec etc., their name is referenced in their own hcp attribute, or the hcp attribute of other nodes. If you use \ **-n**\  option, you must manually change all hcp attributes that refer to this name.
- 
 
 
-\ *noderange*\ 
- 
+
+\ *noderange*\
+
  A set of comma delimited node names and/or group names. (must be the first parameter) See the "noderange" man page for details on supported formats.
- 
 
 
-\ **-o**\  \ *object-names*\ 
- 
+
+\ **-o**\  \ *object-names*\
+
  A set of comma delimited object names.
- 
 
 
-\ **-p|-**\ **-plus**\ 
- 
+
+\ **-p|-**\ **-plus**\
+
  This option will add the specified values to the existing value of the attribute.  It will create a comma-separated list of values.
- 
 
 
-\ **-t**\  \ *object-types*\ 
- 
+
+\ **-t**\  \ *object-types*\
+
  A set of comma delimited object types.  Use the help option to get a list of valid object types.
- 
 
 
-\ **-V|-**\ **-verbose**\ 
- 
+
+\ **-V|-**\ **-verbose**\
+
  Verbose mode.
- 
+
 
 
 \ **-w**\  \ *attr==val*\  \ **-w**\  \ *attr=~val*\  ...
- 
+
  Use one or multiple -w flags to specify the selection string that can be used to select objects. The operators ==, !=, =~ and !~ are available. Use the help option to get a list of valid attributes for each object type.
- 
+
  Operator descriptions:
          ==        Select nodes where the attribute value is exactly this value.
          !=        Select nodes where the attribute value is not this specific value.
          =~        Select nodes where the attribute value matches this regular expression.
          !~        Select nodes where the attribute value does not match this regular expression.
- 
+
  Note: the operator !~ will be parsed by shell, if you want to use !~ in the selection string, use single quote instead. For example:-w 'mgt!~ipmi'.
- 
 
 
-\ **-z|-**\ **-stanza**\ 
- 
+
+\ **-z|-**\ **-stanza**\
+
  Indicates that the file being piped to the command is in stanza format. See the xcatstanzafile man page for details on using xCAT stanza files.
- 
 
 
-\ **-u**\ 
- 
+
+\ **-u**\
+
  Fill in the attributes such as template file, pkglist file and otherpkglist file of osimage object based on the specified parameters. It will search "/install/custom/" directory first, and then "/opt/xcat/share/".
- 
+
  Note: this option only works for objtype \ **osimage**\ .
- 
+
 
 
 
@@ -152,161 +152,161 @@ EXAMPLES
 
 
 1.
- 
+
  To change a site definition.
- 
- 
+
+
  .. code-block:: perl
- 
+
    chdef -t site -o clustersite installdir=/xcatinstall
- 
- 
+
+
 
 
 2.
- 
+
  To change a basic node definition.
- 
- 
+
+
  .. code-block:: perl
- 
+
    chdef -t node -o node01 groups="all,aix"
- 
- 
+
+
  (The group definitions are also created if they don't already exist.)
- 
+
 
 
 3.
- 
+
  To add another group to the "groups" attribute in the previous example.
- 
- 
+
+
  .. code-block:: perl
- 
+
    chdef -p -t node -o node01 groups="compute"
- 
- 
+
+
 
 
 4.
- 
+
  To remove the "all" group from the "groups" attribute in the previous example.
- 
- 
+
+
  .. code-block:: perl
- 
+
    chdef -m -t node -o node01 groups="all"
- 
- 
+
+
 
 
 5.
- 
+
  To replace the current "groups" attribute value of "node01".
- 
- 
+
+
  .. code-block:: perl
- 
+
    chdef -t node -o node01 groups="linux"
- 
- 
+
+
 
 
 6.
- 
+
  To add "node01" to the "members" attribute of a group definition called "LinuxNodes".
- 
- 
+
+
  .. code-block:: perl
- 
+
    chdef -p -t group -o LinuxNodes members="node01"
- 
- 
+
+
 
 
 7.
- 
+
  To update a set of definitions based on information contained in the stanza file mystanzafile.
- 
- 
+
+
  .. code-block:: perl
- 
+
    cat mystanzafile | chdef -z
- 
- 
+
+
 
 
 8.
- 
+
  To update a dynamic node group definition to add the cons=hmc wherevals pair.
- 
- 
+
+
  .. code-block:: perl
- 
+
    chdef -t group -o dyngrp -d -p -w cons==hmc
- 
- 
+
+
 
 
 9.
- 
+
  To change the node object name from node1 to node2.
- 
- 
+
+
  .. code-block:: perl
- 
+
    chdef -t node -o node1 -n node2
- 
- 
+
+
 
 
 10.
- 
+
  To change the node hwtype, this command will change the value of ppc.nodetype.
- 
- 
+
+
  .. code-block:: perl
- 
+
    chdef -t node -o node1 hwtype=lpar
- 
- 
+
+
 
 
 11.
- 
+
  To change the policy table for policy number 7.0 for admin1
- 
- 
+
+
  .. code-block:: perl
- 
+
    chdef -t policy -o 7.0 name=admin1 rule=allow
- 
- 
+
+
 
 
 12.
- 
+
  To change the node nic attributes
- 
- 
+
+
  .. code-block:: perl
- 
+
    chdef -t node -o cn1 nicips.eth0="1.1.1.1|1.2.1.1" nicnetworks.eth0="net1|net2" nictypes.eth0="Ethernet"
- 
- 
+
+
 
 
 13.
- 
+
  To update an osimage definition.
- 
- 
+
+
  .. code-block:: perl
- 
+
    chdef redhat6img -u provmethod=install
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/chhypervisor.1.rst b/docs/source/guides/admin-guides/references/man1/chhypervisor.1.rst
index b0a3b667c..84e617cb5 100644
--- a/docs/source/guides/admin-guides/references/man1/chhypervisor.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/chhypervisor.1.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **RHEV specific :**\ 
+\ **RHEV specific :**\
 
 
 \ **chhypervisor**\  \ *noderange*\  [\ **-a**\ ]
@@ -32,7 +32,7 @@ SYNOPSIS
 
 \ **chhypervisor**\  \ *noderange*\  [\ **-d**\ ]
 
-\ **zVM specific :**\ 
+\ **zVM specific :**\
 
 
 \ **chhypervisor**\  \ *noderange*\  [\ **-**\ **-adddisk2pool**\  \ *function*\  \ *region*\  \ *volume*\  \ *group*\ ]
@@ -65,10 +65,10 @@ DESCRIPTION
 
 The \ **chhypervisor**\  command can be used to configure the RHEV-h.
 
-The rhev-h host will register to the rhev-m automatically, but admin needs to 
+The rhev-h host will register to the rhev-m automatically, but admin needs to
 approve the host can be added to the 'cluster' with \ **-a**\  flag .
 
-After registering, the network interfaces of host need to be added to the 'network' of 
+After registering, the network interfaces of host need to be added to the 'network' of
 RHEV. And the power management for the host should be configured so that
 rhev-m could make proper decision when certain host encountered error.
 
@@ -87,7 +87,7 @@ The columns of hypervisor table:
 
 \ **hypervisor.interface**\  - The configuration for the nics. Refer to \ **-n**\ .
 
-\ **hypervisor.cluster**\  - The cluster that the host will be added to. The 
+\ **hypervisor.cluster**\  - The cluster that the host will be added to. The
 default is 'Default' cluster if not specified.
 
 
@@ -102,51 +102,51 @@ RHEV specific :
 
 
 \ **-a**\  Approve the host that to be added to cluster.
- 
+
  Before approve, the status of the host must be 'pending_approval'.
- 
+
 
 
 \ **-n**\  Configure the network interfaces for the host.
- 
- Note: This operation only can be run when host is in 'maintenance mode'. 
+
+ Note: This operation only can be run when host is in 'maintenance mode'.
  Use \ **-d**\  to switch the host to 'maintenance' mode.
- 
+
  The interfaces which configured in hypervisor.interface will be added
  to the network of RHEV.
- 
+
  The format of hypervisor.interface is multiple [network:interfacename:
- protocol:IP:netmask:gateway] sections separated with '|'. For example: 
+ protocol:IP:netmask:gateway] sections separated with '|'. For example:
  [rhevm2:eth0:static:10.1.0.236:255.255.255.0:0.0.0.0].
- 
- 
- \ **network**\  - The logic network which has been created by 'cfgve -t nw' 
+
+
+ \ **network**\  - The logic network which has been created by 'cfgve -t nw'
  or the default management network 'rhevm'.
- 
+
  \ **interfacename**\  - Physical network name: 'eth0','eth1'...
- 
- \ **protocol**\  - To identify which boot protocol to use for the interface: dhcp 
+
+ \ **protocol**\  - To identify which boot protocol to use for the interface: dhcp
  or static.
- 
+
  \ **IP**\  - The IP address for the interface.
- 
+
  \ **netmask**\  - The network mask for the interface.
- 
- \ **gateway**\  - The gateay for the interface. This field only can be set when 
+
+ \ **gateway**\  - The gateay for the interface. This field only can be set when
  the interface is added to 'rhevm' network.
- 
+
 
 
 \ **-p**\  Configure the power management for the host.
- 
- The power management must be configured for the rhev-h host to make the 
- rhev-m to monitor the power status of the host, so that when certain host 
+
+ The power management must be configured for the rhev-h host to make the
+ rhev-m to monitor the power status of the host, so that when certain host
  failed to function, rhev-m will fail over certain role like SPM to other active host.
- 
- For rack mounted server, the bmc IP and user:password need to be set for the 
- power management (These parameters are gotten from ipmi table). rhev-m uses the 
+
+ For rack mounted server, the bmc IP and user:password need to be set for the
+ power management (These parameters are gotten from ipmi table). rhev-m uses the
  ipmi protocol to get the power status of the host.
- 
+
 
 
 \ **-e**\  To activate the host.
@@ -167,84 +167,84 @@ zVM specific :
 
 
 
-\ **-**\ **-adddisk2pool**\  \ *function*\  \ *region*\  \ *volume*\  \ *group*\ 
- 
- Add a disk to a disk pool defined in the EXTENT CONTROL. Function type can be 
- either: (4) Define region as full volume and add to group OR (5) Add existing 
- region to group. If the volume already exists in the EXTENT CONTROL, use 
+\ **-**\ **-adddisk2pool**\  \ *function*\  \ *region*\  \ *volume*\  \ *group*\
+
+ Add a disk to a disk pool defined in the EXTENT CONTROL. Function type can be
+ either: (4) Define region as full volume and add to group OR (5) Add existing
+ region to group. If the volume already exists in the EXTENT CONTROL, use
  function 5. If the volume does not exist in the EXTENT CONTROL, but is attached
  to SYSTEM, use function 4.
- 
 
 
-\ **-**\ **-addscsi**\  \ *device_number*\  \ *device_path*\  \ *option*\  \ *persist*\ 
- 
+
+\ **-**\ **-addscsi**\  \ *device_number*\  \ *device_path*\  \ *option*\  \ *persist*\
+
  Dynamically add a SCSI disk to a running z/VM system.
- 
 
 
-\ **-**\ **-addvlan**\  \ *name*\  \ *owner*\  \ *type*\  \ *transport*\ 
- 
+
+\ **-**\ **-addvlan**\  \ *name*\  \ *owner*\  \ *type*\  \ *transport*\
+
  Create a virtual network LAN.
- 
 
 
-\ **-**\ **-addvswitch**\  \ *name*\  \ *osa_dev_addr*\  \ *osa_exp_adapter*\  \ *controller*\  \ *connect (0, 1, or 2)*\  \ *memory_queue*\  \ *router*\  \ *transport*\  \ *vlan_id*\  \ *port_type*\  \ *update*\  \ *gvrp*\  \ *native_vlan*\ 
- 
+
+\ **-**\ **-addvswitch**\  \ *name*\  \ *osa_dev_addr*\  \ *osa_exp_adapter*\  \ *controller*\  \ *connect (0, 1, or 2)*\  \ *memory_queue*\  \ *router*\  \ *transport*\  \ *vlan_id*\  \ *port_type*\  \ *update*\  \ *gvrp*\  \ *native_vlan*\
+
  Create a virtual switch.
- 
 
 
-\ **-**\ **-addzfcp2pool**\  \ *pool*\  \ *status*\  \ *wwpn*\  \ *lun*\  \ *size*\  \ *owner*\ 
- 
- Add a zFCP device to a device pool defined in xCAT. The device must have been 
- carved up in the storage controller and configured with a WWPN/LUN before it 
- can be added to the xCAT storage pool. z/VM does not have the ability to 
+
+\ **-**\ **-addzfcp2pool**\  \ *pool*\  \ *status*\  \ *wwpn*\  \ *lun*\  \ *size*\  \ *owner*\
+
+ Add a zFCP device to a device pool defined in xCAT. The device must have been
+ carved up in the storage controller and configured with a WWPN/LUN before it
+ can be added to the xCAT storage pool. z/VM does not have the ability to
  communicate directly with the storage controller to carve up disks dynamically.
- 
 
 
-\ **-**\ **-removediskfrompool**\  \ *function*\  \ *region*\  \ *group*\ 
- 
- Remove a disk from a disk pool defined in the EXTENT CONTROL. Function type can 
- be either: (1) Remove region, (2) Remove region from group, (3) Remove region 
+
+\ **-**\ **-removediskfrompool**\  \ *function*\  \ *region*\  \ *group*\
+
+ Remove a disk from a disk pool defined in the EXTENT CONTROL. Function type can
+ be either: (1) Remove region, (2) Remove region from group, (3) Remove region
  from all groups, OR (7) Remove entire group .
- 
 
 
-\ **-**\ **-removescsi**\  \ *device_number*\  \ *persist (YES or NO)*\ 
- 
+
+\ **-**\ **-removescsi**\  \ *device_number*\  \ *persist (YES or NO)*\
+
  Delete a real SCSI disk.
- 
 
 
-\ **-**\ **-removevlan**\  \ *name*\  \ *owner*\ 
- 
+
+\ **-**\ **-removevlan**\  \ *name*\  \ *owner*\
+
  Delete a virtual network LAN.
- 
 
 
-\ **-**\ **-removevswitch**\  \ *name*\ 
- 
+
+\ **-**\ **-removevswitch**\  \ *name*\
+
  Delete a virtual switch.
- 
 
 
-\ **-**\ **-removezfcpfrompool**\  \ *pool*\  \ *lun*\ 
- 
+
+\ **-**\ **-removezfcpfrompool**\  \ *pool*\  \ *lun*\
+
  Remove a zFCP device from a device pool defined in xCAT.
- 
 
 
-\ **-**\ **-smcli**\  \ *function*\  \ *arguments*\ 
- 
- Execute a SMAPI function. A list of APIs supported can be found by using the 
- help flag, e.g. chhypervisor pokdev61 --smcli -h. Specific arguments associated 
- with a SMAPI function can be found by using the help flag for the function, 
- e.g. chhypervisor pokdev61 --smcli Image_Query_DM -h. Only z/VM 6.2 and older 
- SMAPI functions are supported at this time. Additional SMAPI functions will be 
+
+\ **-**\ **-smcli**\  \ *function*\  \ *arguments*\
+
+ Execute a SMAPI function. A list of APIs supported can be found by using the
+ help flag, e.g. chhypervisor pokdev61 --smcli -h. Specific arguments associated
+ with a SMAPI function can be found by using the help flag for the function,
+ e.g. chhypervisor pokdev61 --smcli Image_Query_DM -h. Only z/VM 6.2 and older
+ SMAPI functions are supported at this time. Additional SMAPI functions will be
  added in subsequent zHCP versions.
- 
+
 
 
 
@@ -270,53 +270,53 @@ RHEV specific :
 
 
 1. To approve the host 'host1', enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    chhypervisor host1 -a
- 
- 
+
+
 
 
 2. To configure the network interface for the host 'host1', enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    chhypervisor host1 -n
- 
- 
+
+
 
 
 3. To configure the power management for the host 'host1', enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    chhypervisor host1 -p
- 
- 
+
+
 
 
 4. To activate the host 'host1', enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    chhypervisor host1 -e
- 
- 
+
+
 
 
 5. To deactivate the host 'host1', enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    chhypervisor host1 -d
- 
- 
+
+
 
 
 
@@ -326,53 +326,53 @@ zVM specific :
 
 
 1. To add a disk to a disk pool defined in the EXTENT CONTROL, enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    chhypervisor pokdev61 --adddisk2pool 4 DM1234 DM1234 POOL1
- 
- 
+
+
 
 
 2. To add a zFCP device to a device pool defined in xCAT, enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    chhypervisor pokdev61 --addzfcp2pool zfcp1 free 500501234567C890 4012345600000000 8G
- 
- 
+
+
 
 
 3. To remove a region from a group in the EXTENT CONTROL, enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    chhypervisor pokdev61 --removediskfrompool 2 DM1234 POOL1
- 
- 
+
+
 
 
 4. To remove a zFCP device from a device pool defined in xCAT, enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    chhypervisor pokdev61 --removezfcpfrompool zfcp1 4012345600000000 500501234567C890
- 
- 
+
+
 
 
 5. To execute a SMAPI function (Image_Query_DM), enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    chhypervisor pokdev61 --smcli Image_Query_DM -T LNX3
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/chkkitcomp.1.rst b/docs/source/guides/admin-guides/references/man1/chkkitcomp.1.rst
index ffb675f04..841de9808 100644
--- a/docs/source/guides/admin-guides/references/man1/chkkitcomp.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/chkkitcomp.1.rst
@@ -21,7 +21,7 @@ SYNOPSIS
 
 \ **chkkitcomp**\  [\ **-? | -h | -**\ **-help**\ ] [\ **-v | -**\ **-version**\ ]
 
-\ **chkkitcomp**\  [\ **-V | -**\ **-verbose**\ ] \ **-i**\  \ *osimage*\   \ *kitcompname_list*\ 
+\ **chkkitcomp**\  [\ **-V | -**\ **-verbose**\ ] \ **-i**\  \ *osimage*\   \ *kitcompname_list*\
 
 
 ***********
@@ -42,34 +42,34 @@ OPTIONS
 
 
 
-\ **-h|-**\ **-help**\ 
- 
+\ **-h|-**\ **-help**\
+
  Display usage message.
- 
 
 
-\ **-V|-**\ **-verbose**\ 
- 
+
+\ **-V|-**\ **-verbose**\
+
  Verbose mode.
- 
 
 
-\ **-v|-**\ **-version**\ 
- 
+
+\ **-v|-**\ **-version**\
+
  Command version.
- 
 
 
-\ **-i**\  \ *osimage*\ 
- 
+
+\ **-i**\  \ *osimage*\
+
  The name of the osimage to check against.
- 
 
 
-\ *kitcompname_list*\ 
- 
+
+\ *kitcompname_list*\
+
  A comma-delimited list of valid full kit component names or kit component basenames that are to be checked against the osimage.
- 
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/chkosimage.1.rst b/docs/source/guides/admin-guides/references/man1/chkosimage.1.rst
index 800184021..f09ea69ae 100644
--- a/docs/source/guides/admin-guides/references/man1/chkosimage.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/chkosimage.1.rst
@@ -19,9 +19,9 @@ SYNOPSIS
 ********
 
 
-\ **chkosimage [-h | -**\ **-help ]**\ 
+\ **chkosimage [-h | -**\ **-help ]**\
 
-\ **chkosimage [-V] [-c|-**\ **-clean]**\  \ *osimage_name*\ 
+\ **chkosimage [-V] [-c|-**\ **-clean]**\  \ *osimage_name*\
 
 
 ***********
@@ -31,12 +31,12 @@ DESCRIPTION
 
 This command is currently supported for AIX osimages only.
 
-Use this command to verify if the NIM lpp_source directories contain the 
+Use this command to verify if the NIM lpp_source directories contain the
 correct software.  The lpp_source directory must contain all the software
-that is specified in the "installp_bundle" and "otherpkgs" 
+that is specified in the "installp_bundle" and "otherpkgs"
 attributes of the osimage definition.
 
-The command gets the name of the lpp_source resource from the xCAT osimage 
+The command gets the name of the lpp_source resource from the xCAT osimage
 definition and the location of the lpp_source directory from the NIM resource
 definition.
 
@@ -46,16 +46,16 @@ Note: Remember to use the prefixes, "I:", "R:", and "E:", respectively,
 when specifying package names in an installp_bundle file or an otherpkgs list.
 
 In addition to checking for missing software the chkosimage command will
-also check to see if there are multiple matches.  This could happen 
+also check to see if there are multiple matches.  This could happen
 when you use wildcards in the software file names. For example,  if you
-have perl-xCAT\* in a bundle file it could match multiple versions of the xCAT 
+have perl-xCAT\* in a bundle file it could match multiple versions of the xCAT
 rpm package saved in your lpp_source directory.
 
 If this happens you must remove the unwanted versions of the rpms.  If the
 extra rpms are not removed you will get install errors.
 
-To help with this process you can use the "-c|--clean" option.  This 
-option will keep the rpm package with the most recent timestamp and 
+To help with this process you can use the "-c|--clean" option.  This
+option will keep the rpm package with the most recent timestamp and
 remove the others.
 
 The chkosimage command should always be used to verify the lpp_source content
@@ -68,29 +68,29 @@ OPTIONS
 
 
 
-\ **-c |-**\ **-clean**\ 
- 
+\ **-c |-**\ **-clean**\
+
  Remove any older versions of the rpms.  Keep the version with the latest
  timestamp.
- 
 
 
-\ **-h |-**\ **-help**\ 
- 
+
+\ **-h |-**\ **-help**\
+
  Display usage message.
- 
 
 
-\ *osimage_name*\ 
- 
+
+\ *osimage_name*\
+
  The name of the xCAT for AIX osimage definition.
- 
 
 
-\ **-V |-**\ **-verbose**\ 
- 
+
+\ **-V |-**\ **-verbose**\
+
  Verbose mode.
- 
+
 
 
 
@@ -115,27 +115,27 @@ EXAMPLES
 
 
 
-1. Check the XCAT osimage called "61image" to verify that the lpp_source 
+1. Check the XCAT osimage called "61image" to verify that the lpp_source
 directories contain all the software that is specified in the
 "installp_bundle" and "otherpkgs" attributes.
- 
- 
+
+
  .. code-block:: perl
- 
+
    chkosimage -V 61image
- 
- 
+
+
 
 
 2. Clean up the lpp_source directory for the osimage named "61img" by removing
 any older rpms with the same names but different versions.
- 
- 
+
+
  .. code-block:: perl
- 
+
    chkosimage -c 61img
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/chvlan.1.rst b/docs/source/guides/admin-guides/references/man1/chvlan.1.rst
index 0f749399b..917f8948e 100644
--- a/docs/source/guides/admin-guides/references/man1/chvlan.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/chvlan.1.rst
@@ -21,7 +21,7 @@ SYNOPSIS
 
 \ **chvlan**\  \ *vlanid*\  \ **-n | -**\ **-nodes**\  \ *noderange*\  [\ **-i | -**\ **-interface**\  \ *nic*\ ]
 
-\ **chvlan**\  \ *vlanid*\  \ **-n | -**\ **-nodes**\  \ *noderange*\  \ **-d | -**\ **-delete**\ 
+\ **chvlan**\  \ *vlanid*\  \ **-n | -**\ **-nodes**\  \ *noderange*\  \ **-d | -**\ **-delete**\
 
 \ **chvlan**\  [\ **-h | -**\ **-help**\ ]
 
@@ -86,77 +86,77 @@ EXAMPLES
 
 
 1.
- 
+
  To add node1, node2 and node3 to vlan 3.
- 
- 
+
+
  .. code-block:: perl
- 
+
     chvlan 3 -n node1,node2,node3
- 
- 
+
+
 
 
 2.
- 
+
  To add node1, node2 and node3 to vlan 3 using eth1 interface.
- 
- 
+
+
  .. code-block:: perl
- 
+
     chvlan 3 -n node1,node2,node3 -i eth1
- 
- 
+
+
 
 
 3.
- 
+
  TO remove node1, node2 and node3 from vlan 3.
- 
- 
+
+
  .. code-block:: perl
- 
+
     chvlan -n node1,node2,node3 -d
- 
- 
+
+
 
 
 4.
- 
+
  To add KVM guests node1 and node2 to vlan 3
- 
- 
+
+
  .. code-block:: perl
- 
+
     mkdef node1 arch=x86_64 groups=kvm,all installnic=mac primarynic=mac mgt=kvm netboot=pxe nfsserver=10.1.0.204 os=rhels6 profile=compute provmethod=install serialport=0 serialspeed=115200 vmcpus=1 vmhost=x3650n01 vmmemory=512 vmnics=br0 vmstorage=nfs://10.1.0.203/vms
-  
+
     mkdef node2 arch=x86_64 groups=kvm,all installnic=mac primarynic=mac mgt=kvm netboot=pxe nfsserver=10.1.0.204 os=rhels6 profile=compute provmethod=install serialport=0 serialspeed=115200 vmcpus=1 vmhost=x3650n01 vmmemory=512 vmnics=br0 vmstorage=nfs://10.1.0.203/vms
-  
+
     chvlan 3 -n node1,node2
-  
+
     mkvm node1,node2 -s 20G
-  
+
     rpower node1,node2 on
-  
+
     rinstall node1,node2
- 
- 
+
+
 
 
 5.
- 
+
  To remove KVM guests node1 and node2 from vlan 3
- 
- 
+
+
  .. code-block:: perl
- 
+
     chvlan 3 -n node1,node2 -d
-  
+
     rpower node1,node2 off
-  
+
     rmvm node1,node2
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/chvlanports.1.rst b/docs/source/guides/admin-guides/references/man1/chvlanports.1.rst
index 1f1e27fff..3ff3d6f5f 100644
--- a/docs/source/guides/admin-guides/references/man1/chvlanports.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/chvlanports.1.rst
@@ -19,9 +19,9 @@ SYNOPSIS
 ********
 
 
-\ **chvlanports**\  \ *vlanid*\  \ **-n | -**\ **-nodes**\  \ *noderange*\  \ **-i | -**\ **-interface**\  \ *nic*\ 
+\ **chvlanports**\  \ *vlanid*\  \ **-n | -**\ **-nodes**\  \ *noderange*\  \ **-i | -**\ **-interface**\  \ *nic*\
 
-\ **chvlanports**\  \ *vlanid*\  \ **-n | -**\ **-nodes**\  \ *noderange*\  \ **-i | -**\ **-interface**\  \ *nic*\  \ **-d | -**\ **-delete**\ 
+\ **chvlanports**\  \ *vlanid*\  \ **-n | -**\ **-nodes**\  \ *noderange*\  \ **-i | -**\ **-interface**\  \ *nic*\  \ **-d | -**\ **-delete**\
 
 \ **chvlanports**\  [\ **-h | -**\ **-help**\ ]
 
@@ -81,27 +81,27 @@ EXAMPLES
 
 
 1.
- 
+
  To add node1, node2 and node3 to vlan 3 using eth1 interface.
- 
- 
+
+
  .. code-block:: perl
- 
+
     chvlanports 3 -n node1,node2,node3 -i eth1
- 
- 
+
+
 
 
 2.
- 
+
  TO remove eth1 interface of node1, node2 and node3 from vlan 3.
- 
- 
+
+
  .. code-block:: perl
- 
+
     chvlanports 3 -n node1,node2,node3 -i eth1 -d
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/chvm.1.rst b/docs/source/guides/admin-guides/references/man1/chvm.1.rst
index 14b1f28ea..a6c0f2bf7 100644
--- a/docs/source/guides/admin-guides/references/man1/chvm.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/chvm.1.rst
@@ -38,7 +38,7 @@ PPC (using Direct FSP Management) specific:
 
 \ **chvm**\  \ *noderange*\  \ **-**\ **-p775**\  [\ **-p**\  \ *profile*\ ]
 
-\ **chvm**\  \ *noderange*\  \ **-**\ **-p775**\  \ **-i id**\  [\ **-m**\  \ *memory_interleaving*\ ] \ **-r**\  \ *partition_rule*\ 
+\ **chvm**\  \ *noderange*\  \ **-**\ **-p775**\  \ **-i id**\  [\ **-m**\  \ *memory_interleaving*\ ] \ **-r**\  \ *partition_rule*\
 
 \ **chvm**\  \ *noderange*\  [\ **lparname**\ ={ \* | \ *name*\ }]
 
@@ -180,16 +180,16 @@ Common:
 
 
 
-\ **-h**\ 
- 
+\ **-h**\
+
  Display usage message.
- 
 
 
-\ **-v**\ 
- 
+
+\ **-v**\
+
  Command Version.
- 
+
 
 
 
@@ -198,22 +198,22 @@ PPC (with HMC) specific:
 
 
 
-\ **-p**\  \ *profile*\ 
- 
+\ **-p**\  \ *profile*\
+
  Name of an existing partition profile.
- 
 
 
-\ *attr*\ =\ *val*\ 
- 
+
+\ *attr*\ =\ *val*\
+
  Specifies one or more "attribute equals value" pairs, separated by spaces.
- 
 
 
-\ **-V**\ 
- 
+
+\ **-V**\
+
  Verbose output.
- 
+
 
 
 
@@ -222,80 +222,80 @@ PPC (using Direct FSP Management) specific:
 
 
 
-\ **-**\ **-p775**\ 
- 
+\ **-**\ **-p775**\
+
  Specify the operation is for Power 775 machines.
- 
 
 
-\ **-i**\ 
- 
+
+\ **-i**\
+
  Starting numeric id of the newly created partitions. For Power 775 using Direct FSP Management, the id value only could be \ **1**\ , \ **5**\ , \ **9**\ , \ **13**\ , \ **17**\ , \ **21**\ , \ **25**\  and \ **29**\ . Shall work with option \ **-**\ **-p775**\ .
- 
 
 
-\ **-m**\ 
- 
+
+\ **-m**\
+
  memory interleaving. The setting value only could be \ **1**\  or \ **2**\ . \ **2**\  means \ **non-interleaved**\  mode (also 2MC mode), the memory cannot be shared across the processors in an octant. \ **1**\  means \ **interleaved**\  mode (also 8MC mode) , the memory can be shared. The default value is \ **1**\ . Shall work with option \ **-**\ **-p775**\ .
- 
 
 
-\ **-r**\ 
- 
+
+\ **-r**\
+
  partition rule. Shall work with option \ **-**\ **-p775**\ .
- 
+
  If all the octants configuration value are same in one CEC,  it will be  " \ **-r**\   \ **0-7**\ :\ *value*\ " .
- 
+
  If the octants use the different configuration value in one cec, it will be "\ **-r**\  \ **0**\ :\ *value1*\ ,\ **1**\ :\ *value2*\ ,...\ **7**\ :\ *value7*\ ", or "\ **-r**\  \ **0**\ :\ *value1*\ ,\ **1-7**\ :\ *value2*\ " and so on.
- 
+
  The octants configuration value for one Octant could be  \ **1**\ , \ **2**\ , \ **3**\ , \ **4**\ , \ **5**\ . The meanings of the octants configuration value  are as following:
- 
- 
+
+
  .. code-block:: perl
- 
+
    1 -- 1 partition with all cpus and memory of the octant
    2 -- 2 partitions with a 50/50 split of cpus and memory
    3 -- 3 partitions with a 25/25/50 split of cpus and memory
    4 -- 4 partitions with a 25/25/25/25 split of cpus and memory
    5 -- 2 partitions with a 25/75 split of cpus and memory
- 
- 
 
 
-\ **-p**\  \ *profile*\ 
- 
+
+
+\ **-p**\  \ *profile*\
+
  Name of I/O slots assignment profile. Shall work with option \ **-**\ **-p775**\ .
- 
+
 
 
 \ **lparname**\ ={\ **\\* | name**\ }
- 
+
  Set LPAR name for the specified lpars. If '\*' specified, it means to get names from xCAT database and then set them for the specified lpars. If a string is specified, it only supports single node and the string will be set for the specified lpar. The user can use lsvm to check the lparnames for lpars.
- 
 
 
-\ **vmcpus=value**\  \ **vmmemory=value**\  \ **add_physlots=value**\  \ **vmothersetting=value**\ 
- 
+
+\ **vmcpus=value**\  \ **vmmemory=value**\  \ **add_physlots=value**\  \ **vmothersetting=value**\
+
  To specify the parameters that will be modified.
- 
+
 
 
 \ **add_vmnics=value**\  \ **add_vmstorage=value**\  [\ **-**\ **-vios**\ ]
- 
+
  To create new virtual adapter for the specified node.
- 
 
 
-\ **del_physlots=drc_index1,drc_index2...**\ 
- 
+
+\ **del_physlots=drc_index1,drc_index2...**\
+
  To delete physical slots which are specified by the \ *drc_index1,drc_index2...*\ .
- 
 
 
-\ **del_vadapter=slotid**\ 
- 
+
+\ **del_vadapter=slotid**\
+
  To delete a virtual adapter specified by the \ *slotid*\ .
- 
+
 
 
 
@@ -304,40 +304,40 @@ VMware/KVM specific:
 
 
 
-\ **-a**\  \ *size*\ 
- 
+\ **-a**\  \ *size*\
+
  Add a new Hard disk with size defaulting to GB.  Multiple can be added with comma separated values.
- 
 
 
-\ **-**\ **-cpus**\  \ *count*\ 
- 
+
+\ **-**\ **-cpus**\  \ *count*\
+
  Set the number of CPUs.
- 
 
 
-\ **-d**\  \ *disk*\ 
- 
+
+\ **-d**\  \ *disk*\
+
  Deregister the Hard disk but leave the backing files.  Multiple can be done with comma separated values.  The disks are specified by SCSI id.
- 
 
 
-\ **-**\ **-mem**\  \ *memory*\ 
- 
+
+\ **-**\ **-mem**\  \ *memory*\
+
  Set the memory, defaults to MB.
- 
 
 
-\ **-p**\  \ *disk*\ 
- 
+
+\ **-p**\  \ *disk*\
+
  Purge the Hard disk.  Deregisters and deletes the files.  Multiple can be done with comma separated values.  The disks are specified by SCSI id.
- 
 
 
-\ **-**\ **-resize**\  \ *disk*\ =\ *size*\ 
- 
+
+\ **-**\ **-resize**\  \ *disk*\ =\ *size*\
+
  Change the size of the Hard disk.  The disk in \ *qcow2*\  format can not be set to less than its current size. The disk in \ *raw*\  format can be resized smaller, use caution. Multiple disks can be resized by using comma separated \ *disk*\ \ **=**\ \ *size*\  pairs.  The disks are specified by SCSI id.  Size defaults to GB.
- 
+
 
 
 
@@ -346,38 +346,38 @@ KVM specific:
 
 
 
-\ **-**\ **-cpupin hostcpuset**\ 
- 
+\ **-**\ **-cpupin hostcpuset**\
+
  To pin guest domain virtual CPUs to physical host CPUs specified with \ *hostcpuset*\ .
  \ *hostcpuset*\  is a list of physical CPU numbers. Its syntax is a comma separated list and a special
  markup using '-' and '^' (ex. '0-4', '0-3,^2') can also be allowed. The '-' denotes the range and
  the '^' denotes exclusive.
- 
+
  Note: The expression is sequentially evaluated, so "0-15,^8" is identical to "9-14,0-7,15" but not
  identical to "^8,0-15".
- 
 
 
-\ **-**\ **-membind numanodeset**\ 
- 
- It is possible to restrict a guest to allocate memory from the specified set of NUMA nodes \ *numanodeset*\ . 
+
+\ **-**\ **-membind numanodeset**\
+
+ It is possible to restrict a guest to allocate memory from the specified set of NUMA nodes \ *numanodeset*\ .
  If the guest vCPUs are also pinned to a set of cores located on that same set of NUMA nodes, memory
  access is local and improves memory access performance.
- 
 
 
-\ **-**\ **-devpassthru pcidevice1,pcidevice2...**\ 
- 
- The PCI passthrough gives a guest VM direct access to I/O devices \ *pcidevice1,pcidevice2...*\ . 
+
+\ **-**\ **-devpassthru pcidevice1,pcidevice2...**\
+
+ The PCI passthrough gives a guest VM direct access to I/O devices \ *pcidevice1,pcidevice2...*\ .
  The PCI devices are assigned to a virtual machine, and the virtual machine can use this I/O exclusively.
  The devices list are a list of comma separated PCI device names delimited with comma, the PCI device names can be obtained by running \ **virsh nodedev-list**\  on the host.
- 
 
 
-\ **-**\ **-devdetach pcidevice1,pcidevice2...**\ 
- 
+
+\ **-**\ **-devdetach pcidevice1,pcidevice2...**\
+
  To detaching the PCI devices which are attached to VM guest via PCI passthrough from the VM guest. The devices list are a list of comma separated PCI device names delimited with comma, the PCI device names can be obtained by running \ **virsh nodedev-list**\  on the host.
- 
+
 
 
 
@@ -386,185 +386,185 @@ zVM specific:
 
 
 
-\ **-**\ **-add3390**\  \ *disk_pool*\  \ *device_address*\  \ *size*\  \ *mode*\  \ *read_password*\  \ *write_password*\  \ *multi_password*\ 
- 
+\ **-**\ **-add3390**\  \ *disk_pool*\  \ *device_address*\  \ *size*\  \ *mode*\  \ *read_password*\  \ *write_password*\  \ *multi_password*\
+
  Adds a 3390 (ECKD) disk to a virtual machine's directory entry. The device address can be automatically assigned by specifying 'auto'. The size of the disk can be specified in GB, MB, or the number of cylinders.
- 
 
 
-\ **-**\ **-add3390active**\  \ *device_address*\  \ *mode*\ 
- 
+
+\ **-**\ **-add3390active**\  \ *device_address*\  \ *mode*\
+
  Adds a 3390 (ECKD) disk that is defined in a virtual machine's directory entry to that virtual server's active configuration.
- 
 
 
-\ **-**\ **-add9336**\  \ *disk_pool*\  \ *device_address*\  \ *size*\  \ *mode*\  \ *read_password*\  \ *write_password*\  \ *multi_password*\ 
- 
+
+\ **-**\ **-add9336**\  \ *disk_pool*\  \ *device_address*\  \ *size*\  \ *mode*\  \ *read_password*\  \ *write_password*\  \ *multi_password*\
+
  Adds a 9336 (FBA) disk to a virtual machine's directory entry. The device address can be automatically assigned by specifying 'auto'. The size of the disk can be specified in GB, MB, or the number of blocks.
- 
 
 
-\ **-**\ **-adddisk2pool**\  \ *function*\  \ *region*\  \ *volume*\  \ *group*\ 
- 
+
+\ **-**\ **-adddisk2pool**\  \ *function*\  \ *region*\  \ *volume*\  \ *group*\
+
  Add a disk to a disk pool defined in the EXTENT CONTROL. Function type can be either: (4) Define region as full volume and add to group OR (5) Add existing region to group.  The disk has to already be attached to SYSTEM.
- 
 
 
-\ **-**\ **-addnic**\  \ *device_address*\  \ *type*\  \ *device_count*\ 
- 
+
+\ **-**\ **-addnic**\  \ *device_address*\  \ *type*\  \ *device_count*\
+
  Adds a network adapter to a virtual machine's directory entry (case sensitive).
- 
 
 
-\ **-**\ **-addpagespool**\  \ *volume_addr*\  \ *volume_label*\  \ *volume_use*\  \ *system_config_name*\  \ *system_config_type*\  \ *parm_disk_owner*\  \ *parm_disk_number*\  \ *parm_disk_password*\ 
- 
+
+\ **-**\ **-addpagespool**\  \ *volume_addr*\  \ *volume_label*\  \ *volume_use*\  \ *system_config_name*\  \ *system_config_type*\  \ *parm_disk_owner*\  \ *parm_disk_number*\  \ *parm_disk_password*\
+
  Add a full volume page or spool disk to the virtual machine.
- 
 
 
-\ **-**\ **-addprocessor**\  \ *device_address*\ 
- 
+
+\ **-**\ **-addprocessor**\  \ *device_address*\
+
  Adds a virtual processor to a virtual machine's directory entry.
- 
 
 
-\ **-**\ **-addprocessoractive**\  \ *device_address*\  \ *type*\ 
- 
+
+\ **-**\ **-addprocessoractive**\  \ *device_address*\  \ *type*\
+
  Adds a virtual processor to a virtual machine's active configuration (case sensitive).
- 
 
 
-\ **-**\ **-addvdisk**\  \ *device_address*\  \ *size*\ 
- 
+
+\ **-**\ **-addvdisk**\  \ *device_address*\  \ *size*\
+
  Adds a v-disk to a virtual machine's directory entry.
- 
 
 
-\ **-**\ **-addzfcp**\  \ *pool*\  \ *device_address*\  \ *loaddev*\  \ *size*\  \ *tag*\  \ *wwpn*\  \ *lun*\ 
- 
- Add a zFCP device to a device pool defined in xCAT. The device must have been 
- carved up in the storage controller and configured with a WWPN/LUN before it can 
- be added to the xCAT storage pool. z/VM does not have the ability to communicate 
- directly with the storage controller to carve up disks dynamically. xCAT will 
- find the a zFCP device in the specified pool that meets the size required, if 
- the WWPN and LUN are not given. The device address can be automatically assigned 
+
+\ **-**\ **-addzfcp**\  \ *pool*\  \ *device_address*\  \ *loaddev*\  \ *size*\  \ *tag*\  \ *wwpn*\  \ *lun*\
+
+ Add a zFCP device to a device pool defined in xCAT. The device must have been
+ carved up in the storage controller and configured with a WWPN/LUN before it can
+ be added to the xCAT storage pool. z/VM does not have the ability to communicate
+ directly with the storage controller to carve up disks dynamically. xCAT will
+ find the a zFCP device in the specified pool that meets the size required, if
+ the WWPN and LUN are not given. The device address can be automatically assigned
  by specifying 'auto'. The WWPN/LUN can be set as the LOADDEV in the directory
  entry if (1) is specified as the 'loaddev'.
- 
 
 
-\ **-**\ **-connectnic2guestlan**\  \ *device_address*\  \ *lan*\  \ *owner*\ 
- 
+
+\ **-**\ **-connectnic2guestlan**\  \ *device_address*\  \ *lan*\  \ *owner*\
+
  Connects a given network adapter to a GuestLAN.
- 
 
 
-\ **-**\ **-connectnic2vswitch**\  \ *device_address*\  \ *vswitch*\ 
- 
+
+\ **-**\ **-connectnic2vswitch**\  \ *device_address*\  \ *vswitch*\
+
  Connects a given network adapter to a VSwitch.
- 
 
 
-\ **-**\ **-copydisk**\  \ *target_address*\  \ *source_node*\  \ *source_address*\ 
- 
+
+\ **-**\ **-copydisk**\  \ *target_address*\  \ *source_node*\  \ *source_address*\
+
  Copy a disk attached to a given virtual server.
- 
 
 
-\ **-**\ **-dedicatedevice**\  \ *virtual_device*\  \ *real_device*\  \ *mode*\ 
- 
+
+\ **-**\ **-dedicatedevice**\  \ *virtual_device*\  \ *real_device*\  \ *mode*\
+
  Adds a dedicated device to a virtual machine's directory entry.
- 
 
 
-\ **-**\ **-deleteipl**\ 
- 
+
+\ **-**\ **-deleteipl**\
+
  Deletes the IPL statement from the virtual machine's directory entry.
- 
 
 
-\ **-**\ **-disconnectnic**\  \ *device_address*\ 
- 
+
+\ **-**\ **-disconnectnic**\  \ *device_address*\
+
  Disconnects a given network adapter.
- 
 
 
-\ **-**\ **-formatdisk**\  \ *disk_address*\  \ *multi_password*\ 
- 
+
+\ **-**\ **-formatdisk**\  \ *disk_address*\  \ *multi_password*\
+
  Formats a disk attached to a given virtual server (only ECKD disks supported). The disk should not be linked to any other virtual server. This command is best used after add3390().
- 
 
 
-\ **-**\ **-grantvswitch**\  \ *vswitch*\ 
- 
+
+\ **-**\ **-grantvswitch**\  \ *vswitch*\
+
  Grant vSwitch access for given virtual machine.
- 
 
 
-\ **-**\ **-purgerdr**\ 
- 
+
+\ **-**\ **-purgerdr**\
+
  Purge the reader belonging to the virtual machine
- 
 
 
-\ **-**\ **-removedisk**\  \ *device_address*\ 
- 
+
+\ **-**\ **-removedisk**\  \ *device_address*\
+
  Removes a minidisk from a virtual machine's directory entry.
- 
 
 
-\ **-**\ **-removenic**\  \ *device_address*\ 
- 
+
+\ **-**\ **-removenic**\  \ *device_address*\
+
  Removes a network adapter from a virtual machine's directory entry.
- 
 
 
-\ **-**\ **-removeprocessor**\  \ *device_address*\ 
- 
+
+\ **-**\ **-removeprocessor**\  \ *device_address*\
+
  Removes a processor from an active virtual machine's configuration.
- 
 
 
-\ **-**\ **-removeloaddev**\  \ *wwpn*\  \ *lun*\ 
- 
+
+\ **-**\ **-removeloaddev**\  \ *wwpn*\  \ *lun*\
+
  Removes the LOADDEV statement from a virtual machines's directory entry.
- 
 
 
-\ **-**\ **-removezfcp**\  \ *device_address*\  \ *wwpn*\  \ *lun*\ 
- 
+
+\ **-**\ **-removezfcp**\  \ *device_address*\  \ *wwpn*\  \ *lun*\
+
  Removes a given SCSI/FCP device belonging to the virtual machine.
- 
 
 
-\ **-**\ **-replacevs**\  \ *directory_entry*\ 
- 
+
+\ **-**\ **-replacevs**\  \ *directory_entry*\
+
  Replaces a virtual machine's directory entry. The directory entry can be echoed into stdin or a text file.
- 
 
 
-\ **-**\ **-setipl**\  \ *ipl_target*\  \ *load_parms*\  \ *parms*\ 
- 
+
+\ **-**\ **-setipl**\  \ *ipl_target*\  \ *load_parms*\  \ *parms*\
+
  Sets the IPL statement for a given virtual machine.
- 
 
 
-\ **-**\ **-setpassword**\  \ *password*\ 
- 
+
+\ **-**\ **-setpassword**\  \ *password*\
+
  Sets the password for a given virtual machine.
- 
 
 
-\ **-**\ **-setloaddev**\  \ *wwpn*\  \ *lun*\ 
- 
+
+\ **-**\ **-setloaddev**\  \ *wwpn*\  \ *lun*\
+
  Sets the LOADDEV statement in the virtual machine's directory entry.
- 
 
 
-\ **-**\ **-undedicatedevice**\  \ *device_address*\ 
- 
+
+\ **-**\ **-undedicatedevice**\  \ *device_address*\
+
  Delete a dedicated device from a virtual machine's active configuration and directory entry.
- 
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/chzone.1.rst b/docs/source/guides/admin-guides/references/man1/chzone.1.rst
index 097fab231..7e9e9dd99 100644
--- a/docs/source/guides/admin-guides/references/man1/chzone.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/chzone.1.rst
@@ -7,7 +7,7 @@ chzone.1
 
 
 ************
-\ **NAME**\ 
+\ **NAME**\
 ************
 
 
@@ -15,7 +15,7 @@ chzone.1
 
 
 ****************
-\ **SYNOPSIS**\ 
+\ **SYNOPSIS**\
 ****************
 
 
@@ -25,176 +25,176 @@ chzone.1
 
 
 *******************
-\ **DESCRIPTION**\ 
+\ **DESCRIPTION**\
 *******************
 
 
 The \ **chzone**\  command is designed to change the definition of a zone previous defined in the cluster.
 The chzone command is only supported on Linux ( No AIX support).
-The nodes are not updated with the new root ssh keys by chzone. You must run updatenode -k  or xdsh -K to the nodes to update the root ssh keys to the new generated zone keys. This will also sync any service nodes with the zone keys, if you have a hierarchical cluster.   
+The nodes are not updated with the new root ssh keys by chzone. You must run updatenode -k  or xdsh -K to the nodes to update the root ssh keys to the new generated zone keys. This will also sync any service nodes with the zone keys, if you have a hierarchical cluster.
 Note: if any zones in the zone table, there must be one and only one defaultzone. Otherwise, errors will occur.
 
 
 ***************
-\ **OPTIONS**\ 
+\ **OPTIONS**\
 ***************
 
 
 
-\ **-h | -**\ **-help**\ 
- 
+\ **-h | -**\ **-help**\
+
  Displays usage information.
- 
 
 
-\ **-v | -**\ **-version**\ 
- 
+
+\ **-v | -**\ **-version**\
+
  Displays command version and build date.
- 
 
 
-\ **-k | -**\ **-sshkeypath**\  \ *full path to the ssh RSA private key*\ 
- 
+
+\ **-k | -**\ **-sshkeypath**\  \ *full path to the ssh RSA private key*\
+
  This is the path to the id_rsa key that will be used to build new root's ssh keys for the zone. If -k is used, it will generate the ssh public key from the input ssh RSA private key, and store both in /etc/xcat/sshkeys/<zonename>/.ssh directory.
- 
 
 
-\ **-K | -**\ **-genkeys**\ 
- 
+
+\ **-K | -**\ **-genkeys**\
+
  Using this flag, will  generate new ssh RSA private and public keys for the zone into the /etc/xcat/sshkeys/<zonename>/.ssh directory.
  The nodes are not automatically updated with the new root ssh keys by chzone. You must run updatenode -k  or xdsh -K to the nodes to update the root ssh keys to the new generated zone keys. This will also sync any service nodes with the zone keys, if you have a hierarchical cluster.
- 
 
 
-\ **-**\ **-defaultzone**\ 
- 
+
+\ **-**\ **-defaultzone**\
+
  if \ **-**\ **-defaultzone**\  is input, then it will set the zone defaultzone attribute to yes.
  if \ **-**\ **-defaultzone**\  is input and another zone is currently the default,
  then the \ **-f**\  flag must be used to force a change to the new defaultzone.
- If \ **-f**\  flag is not use an error will be returned and no change made. 
+ If \ **-f**\  flag is not use an error will be returned and no change made.
  Note: if any zones in the zone table, there must be one and only one defaultzone. Otherwise, errors will occur.
- 
 
 
-\ **-a | -**\ **-addnoderange**\  \ *noderange*\ 
- 
+
+\ **-a | -**\ **-addnoderange**\  \ *noderange*\
+
  For each node in the noderange, it will set the zonename attribute for that node to the input zonename.
  If the -g flag is also on the command, then
  it will add the group name "zonename" to each node in the noderange.
- 
 
 
-\ **-r | -**\ **-rmnoderange**\  \ *noderange*\ 
- 
+
+\ **-r | -**\ **-rmnoderange**\  \ *noderange*\
+
  For each node in the noderange, if the node is a member of the input zone, it will remove the zonename attribute for that node.
  If any of the nodes in the noderange is not a member of the zone, you will get an error and nothing will be changed.
  If the -g flag is also on the command, then
  it will remove the group name "zonename" from each node in the noderange.
- 
 
 
-\ **-s| -**\ **-sshbetweennodes**\  \ **yes|no**\ 
- 
+
+\ **-s| -**\ **-sshbetweennodes**\  \ **yes|no**\
+
  If -s entered, the zone sshbetweennodes attribute will be set to yes or no based on the input. When this is set to yes, then ssh will be setup to allow passwordless root access between nodes.  If no, then root will be prompted for a password when running ssh between the nodes in the zone.
- 
 
 
-\ **-f | -**\ **-force**\ 
- 
+
+\ **-f | -**\ **-force**\
+
  Used with the \ **-**\ **-defaultzone**\  flag to override the current default zone.
- 
 
 
-\ **-g | -**\ **-assigngroup**\ 
- 
+
+\ **-g | -**\ **-assigngroup**\
+
  Used with the \ **-a**\  or \ **-r**\  flag to add or remove the group zonename for all nodes in the input noderange.
- 
 
 
-\ **-V | -**\ **-Verbose**\ 
- 
+
+\ **-V | -**\ **-Verbose**\
+
  Verbose mode.
- 
+
 
 
 
 ****************
-\ **EXAMPLES**\ 
+\ **EXAMPLES**\
 ****************
 
 
 
 1. To chzone zone1 to the default zone, enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    chzone> zone1 --default -f
- 
- 
+
+
 
 
 2. To generate new root ssh keys for zone2A using the ssh id_rsa private key in /root/.ssh:
- 
- 
+
+
  .. code-block:: perl
- 
+
    chzone zone2A -k /root/.ssh
- 
- 
+
+
  Note: you must use xdsh -K or updatenode -k to update the nodes with the new keys
- 
+
 
 
 3. To generate new root ssh keys for zone2A, enter :
- 
- 
+
+
  .. code-block:: perl
- 
+
    chzone zone2A -K
- 
- 
+
+
  Note: you must use xdsh -K or updatenode -k to update the nodes with the new keys
- 
+
 
 
 4. To add a new group of nodes (compute3) to zone3 and add zone3 group to the nodes,  enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    chzone zone3 -a compute3 -g
- 
- 
+
+
 
 
 5.
- 
+
  To remove a group of nodes (compute4) from zone4 and remove zone4 group from the nodes,  enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    chzone> zone4 -r compute4 -g
- 
- 
+
+
 
 
 6. To change the sshbetweennodes setting on the zone to not allow passwordless ssh between nodes,  enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    chzone zone5 -s no
- 
- 
+
+
  Note: you must use \ **xdsh -K**\  or \ **updatenode -k**\  to update the nodes with this new setting.
- 
+
 
 
 
 *************
-\ **FILES**\ 
+\ **FILES**\
 *************
 
 
@@ -204,7 +204,7 @@ Location of the chzone command.
 
 
 ****************
-\ **SEE ALSO**\ 
+\ **SEE ALSO**\
 ****************
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/clonevm.1.rst b/docs/source/guides/admin-guides/references/man1/clonevm.1.rst
index f97967bae..0db09970f 100644
--- a/docs/source/guides/admin-guides/references/man1/clonevm.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/clonevm.1.rst
@@ -27,19 +27,19 @@ DESCRIPTION
 ***********
 
 
-Command to promote a VM's current configuration and storage to a master as well as 
+Command to promote a VM's current configuration and storage to a master as well as
 performing the converse operation of creating VMs based on a master.
 
-By default, attempting to create a master from a running VM will produce an error. 
+By default, attempting to create a master from a running VM will produce an error.
 The \ **-**\ **-force**\  argument will request that a master be made of the VM anyway.
 
-Also, by default a VM that is used to create a master will be rebased as a thin 
+Also, by default a VM that is used to create a master will be rebased as a thin
 clone of that master. If the \ **-**\ **-force**\  argument is used to create a master of a powered
-on vm, this will not be done.  Additionally, the \ **-**\ **-detached**\  option can be used to 
-explicitly request that a clone not be tethered to a master image, allowing the 
+on vm, this will not be done.  Additionally, the \ **-**\ **-detached**\  option can be used to
+explicitly request that a clone not be tethered to a master image, allowing the
 clones to not be tied to the health of a master, at the cost of additional storage.
 
-When promoting a VM's current state to master, all related virtual disks will be 
+When promoting a VM's current state to master, all related virtual disks will be
 copied and merged with any prerequisite images.  A master will not be tethered to
 other masters.
 
@@ -50,46 +50,46 @@ OPTIONS
 
 
 
-\ **-h|-**\ **-help**\ 
- 
+\ **-h|-**\ **-help**\
+
  Display usage message.
- 
 
 
-\ **-b**\  \ *master_to_base_vms_upon*\ 
- 
+
+\ **-b**\  \ *master_to_base_vms_upon*\
+
  The master to base the clones upon
- 
 
 
-\ **-t**\  \ *master_to_be_made*\ 
- 
+
+\ **-t**\  \ *master_to_be_made*\
+
  The target master to copy a single VM's state to
- 
 
 
-\ **-d|-**\ **-detached**\ 
- 
+
+\ **-d|-**\ **-detached**\
+
  Explicitly request that the noderange be untethered from any masters.
- 
 
 
-\ **-f|-**\ **-force**\ 
- 
+
+\ **-f|-**\ **-force**\
+
  Force cloning of a powered on VM.  Implies \ **-d**\  if the VM is on.
- 
 
 
-\ **-v|-**\ **-version**\ 
- 
+
+\ **-v|-**\ **-version**\
+
  Command Version.
- 
 
 
-\ **-V|-**\ **-verbose**\ 
- 
+
+\ **-V|-**\ **-verbose**\
+
  Verbose output.
- 
+
 
 
 
@@ -110,23 +110,23 @@ EXAMPLES
 
 
 1. Creating a master named \ *appserver*\  from a node called \ *vm1*\ :
- 
- 
+
+
  .. code-block:: perl
- 
+
    clonevm vm1 -t appserver
- 
- 
+
+
 
 
 2. Cleating 30 VMs from a master named \ *appserver*\ :
- 
- 
+
+
  .. code-block:: perl
- 
+
    clonevm vm1-vm30 -b appserver
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/configfpc.1.rst b/docs/source/guides/admin-guides/references/man1/configfpc.1.rst
index 1801eeee5..71fedfd73 100644
--- a/docs/source/guides/admin-guides/references/man1/configfpc.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/configfpc.1.rst
@@ -19,9 +19,9 @@ SYNOPSIS
 ********
 
 
-\ **configfpc**\  \ **-i**\  \ *interface*\ 
+\ **configfpc**\  \ **-i**\  \ *interface*\
 
-\ **configfpc**\  \ **-i**\  \ *interface*\  \ **-**\ **-ip**\  \ *default ip address*\ 
+\ **configfpc**\  \ **-i**\  \ *interface*\  \ **-**\ **-ip**\  \ *default ip address*\
 
 \ **configfpc**\  [\ **-V | -**\ **-verbose**\ ]
 
@@ -55,22 +55,22 @@ OPTIONS
 
 
 
-\ **-i**\  \ *interface*\ 
- 
+\ **-i**\  \ *interface*\
+
  Use this flag to specify which xCAT MN interface (example: eth4) that is connected to the NeXtScale FPCs. This option is required.
- 
 
 
-\ **-**\ **-ip**\  \ *default ip address*\ 
- 
+
+\ **-**\ **-ip**\  \ *default ip address*\
+
  Use this flag to override the default ip address of 192.168.0.100 with a new address.
- 
 
 
-\ **-V | -**\ **-verbose**\ 
- 
+
+\ **-V | -**\ **-verbose**\
+
  Verbose mode
- 
+
 
 
 
@@ -81,22 +81,22 @@ EXAMPLES
 
 
 1. To discover and configure all NeXtScale Fan Power Controllers (FPCs) connected on eth0 interface.
- 
- 
+
+
  .. code-block:: perl
- 
+
    configfpc -i eth0
- 
- 
+
+
 
 
 2. To override the default ip address and run in Verbose mode.
- 
- 
+
+
  .. code-block:: perl
- 
+
    configfpc -i eth0 --ip 196.68.0.100 -V
- 
- 
+
+
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/csm2xcat.1.rst b/docs/source/guides/admin-guides/references/man1/csm2xcat.1.rst
index cd06071a9..a6ef13d9b 100644
--- a/docs/source/guides/admin-guides/references/man1/csm2xcat.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/csm2xcat.1.rst
@@ -73,7 +73,7 @@ EXAMPLES
 .. code-block:: perl
 
   cat node.stanza | chdef -z
- 
+
   cat device.stanza | chdef -z
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/db2sqlsetup.1.rst b/docs/source/guides/admin-guides/references/man1/db2sqlsetup.1.rst
index 2ea1fed24..6bb891cae 100644
--- a/docs/source/guides/admin-guides/references/man1/db2sqlsetup.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/db2sqlsetup.1.rst
@@ -48,8 +48,8 @@ When running of db2sqlsetup on the MN:
 One password must be supplied for the setup,  a password for the xcatdb unix id which will be used as the DB2 instance id and database name.  The password will be prompted for interactively or can be input with the XCATDB2PW  environment variable.
 The script will create the xcat database instance (xcatdb) in the /var/lib/db2 directory unless overridden by setting the site.databaseloc attribute.  This attribute should not be set to the directory that is defined in the installloc attribute and it is recommended that the databaseloc be a new filesystem dedicated to the DB2 database, especially in very large clusters.
 
-When running db2sqlseutp on the SN: 
-Not only will the password for the DB2 instance Id be prompted for and must match the one on the Management Node;  but also the hostname or ip address of the Management Node as known by the Service Node must be supplied , unless the XCATDB2SERVER environment variable is set.  
+When running db2sqlseutp on the SN:
+Not only will the password for the DB2 instance Id be prompted for and must match the one on the Management Node;  but also the hostname or ip address of the Management Node as known by the Service Node must be supplied , unless the XCATDB2SERVER environment variable is set.
 You can automatically install and setup of DB2 on the SN using the db2install and odbcsetup postscripts and not need to manually run the command.  See the full documentation.
 
 Note: On AIX , root must be running ksh and on Linux,  bash shell.
@@ -61,52 +61,52 @@ OPTIONS
 
 
 
-\ **-h|-**\ **-help**\ 
- 
+\ **-h|-**\ **-help**\
+
  Displays the usage message.
- 
 
 
-\ **-v|-**\ **-version**\ 
- 
+
+\ **-v|-**\ **-version**\
+
  Displays the release version of the code.
- 
 
 
-\ **-V|-**\ **-verbose**\ 
- 
+
+\ **-V|-**\ **-verbose**\
+
  Displays verbose messages.
- 
 
 
-\ **-i|-**\ **-init**\ 
- 
+
+\ **-i|-**\ **-init**\
+
  The init option is used to setup an installed DB2 database on AIX or Linux (p-Series) so that xCAT can use the database. This must be combined with either the -S or -C flag to indicate whether we are setting up the Server or the Client. With the -S flag, it involves creating the xcatdb database, the xcatdb instance id, allowing access to the xcatdb database by the Management Node. It also backs up the current xCAT database and restores it into the newly setup xcatdb DB2 database.  It creates the /etc/xcat/cfgloc file to point the xcatd daemon to the DB2 database and restarts the xcatd daemon using the database.
- 
 
 
-\ **-p|-**\ **-passwd**\ 
- 
+
+\ **-p|-**\ **-passwd**\
+
  The password change option is to change the database access password for the DB2 xcatdb database. If -S is input then it will only change the password on the DB2 Server (MN).  If -C is input it will only change on the DB2 clients (SN).  If neither -S or -C are input with this flag, then it will change both the DB2 Server and Clients. When changing the password the xcatd daemon will be stopped and restarted.  Any other tools accessing the database should also be stopped before changing and restarted after changing.
- 
 
 
-\ **-S|-C**\ 
- 
+
+\ **-S|-C**\
+
  This options says whether to setup the Server (-S) on the Management Node, or the Client (-C) on the Service Nodes.
- 
 
 
-\ **-N|-**\ **-nostart**\ 
- 
+
+\ **-N|-**\ **-nostart**\
+
  This option with the -S flag will create the database, but will not backup and restore xCAT tables into the database. It will create the cfgloc file such that the next start of xcatd will try and contact the database.  This can be used to setup the xCAT DB2 database during or before install.
- 
 
 
-\ **-o|-**\ **-setupODBC**\ 
- 
+
+\ **-o|-**\ **-setupODBC**\
+
  This option sets up the ODBC  /etc/../odbcinst.ini, /etc/../odbc.ini and the .odbc.ini file in roots home directory will be created and initialized to run off the xcatdb DB2 database.
- 
+
 
 
 
@@ -136,64 +136,64 @@ EXAMPLES
 
 
 1. To setup DB2 Server for  xCAT to run on the DB2 xcatdb database, on the MN:
- 
- 
+
+
  .. code-block:: perl
- 
+
    db2sqlsetup -i -S
- 
- 
+
+
 
 
 2. To setup DB2 Client for  xCAT to run on the DB2 xcatdb database, on the SN:
- 
- 
+
+
  .. code-block:: perl
- 
+
    db2sqlsetup -i -C
- 
- 
+
+
 
 
 3. To setup the ODBC for  DB2 xcatdb database access, on the MN :
- 
- 
+
+
  .. code-block:: perl
- 
+
    db2sqlsetup -o -S
- 
- 
+
+
 
 
 4. To setup the ODBC for  DB2 xcatdb database access, on the SN :
- 
- 
+
+
  .. code-block:: perl
- 
+
    db2sqlsetup -o -C
- 
- 
+
+
 
 
 5.
- 
+
  To setup the DB2 database but not start xcat running with it:
- 
- 
+
+
  .. code-block:: perl
- 
+
    db2sqlsetup -i -S -N
- 
- 
+
+
 
 
 6. To change the DB2 xcatdb password on both the Management and Service Nodes:
- 
- 
+
+
  .. code-block:: perl
- 
+
    db2sqlsetup -p
- 
- 
+
+
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/dumpxCATdb.1.rst b/docs/source/guides/admin-guides/references/man1/dumpxCATdb.1.rst
index af89c9fef..dabcca42b 100644
--- a/docs/source/guides/admin-guides/references/man1/dumpxCATdb.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/dumpxCATdb.1.rst
@@ -93,7 +93,7 @@ EXAMPLES
 .. code-block:: perl
 
   chtab key=skiptables site.value="hosts,passwd"
- 
+
   dumpxCATdb  -p /tmp/db
 
 
@@ -103,7 +103,7 @@ EXAMPLES
 .. code-block:: perl
 
   export XCAT_SKIPTABLES="hosts,passwd"
- 
+
   dumpxCATdb  -p /tmp/db
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/genimage.1.rst b/docs/source/guides/admin-guides/references/man1/genimage.1.rst
index d28fd3880..1e869d7ad 100644
--- a/docs/source/guides/admin-guides/references/man1/genimage.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/genimage.1.rst
@@ -19,9 +19,9 @@ SYNOPSIS
 ********
 
 
-\ **genimage**\ 
+\ **genimage**\
 
-\ **genimage**\  [\ **-o**\  \ *osver*\ ] [\ **-a**\  \ *arch*\ ] [\ **-p**\  \ *profile*\ ] [\ **-i**\  \ *nodebootif*\ ] [\ **-n**\  \ *nodenetdrivers*\ ] [\ **-**\ **-onlyinitrd**\ ] [\ **-r**\  \ *otherifaces*\ ] [\ **-k**\  \ *kernelver*\ ] [\ **-g**\  \ *krpmver*\ ] [\ **-m**\  \ *statelite*\ ] [\ **-l**\  \ *rootlimitsize*\ ] [\ **-**\ **-permission**\  \ *permission*\ ] [\ **-**\ **-interactive**\ ] [\ **-**\ **-dryrun**\ ] [\ **-**\ **-ignorekernelchk**\ ] [\ **-**\ **-noupdate**\ ] \ *imagename*\ 
+\ **genimage**\  [\ **-o**\  \ *osver*\ ] [\ **-a**\  \ *arch*\ ] [\ **-p**\  \ *profile*\ ] [\ **-i**\  \ *nodebootif*\ ] [\ **-n**\  \ *nodenetdrivers*\ ] [\ **-**\ **-onlyinitrd**\ ] [\ **-r**\  \ *otherifaces*\ ] [\ **-k**\  \ *kernelver*\ ] [\ **-g**\  \ *krpmver*\ ] [\ **-m**\  \ *statelite*\ ] [\ **-l**\  \ *rootlimitsize*\ ] [\ **-**\ **-permission**\  \ *permission*\ ] [\ **-**\ **-interactive**\ ] [\ **-**\ **-dryrun**\ ] [\ **-**\ **-ignorekernelchk**\ ] [\ **-**\ **-noupdate**\ ] \ *imagename*\
 
 \ **genimage**\  [\ **-h**\  | \ **-**\ **-help**\  | \ **-v**\  | \ **-**\ **-version**\ ]
 
@@ -42,9 +42,9 @@ The \ **genimage**\  command will generate two initial ramdisks for \ **stateles
 After your image is generated, you can chroot to the
 image, install any additional software you would like, or make modifications to files, and then run the following command to prepare the image for deployment.
 
-for stateless: \ **packimage**\ 
+for stateless: \ **packimage**\
 
-for statelite: \ **liteimg**\ 
+for statelite: \ **liteimg**\
 
 Besides prompting for some parameter values, the \ **genimage**\  command takes default guesses for the parameters not specified or not defined in the \ *osimage*\  and \ *linuximage*\  tables. It also assumes default answers for questions from the yum/zypper command when installing rpms into the image. Use \ **-**\ **-interactive**\  flag if you want the yum/zypper command to prompt you for the answers.
 
@@ -70,135 +70,135 @@ OPTIONS
 
 
 
-\ **-a**\  \ *arch*\ 
- 
+\ **-a**\  \ *arch*\
+
  The hardware architecture of this node: x86_64, ppc64, x86, ia64, etc. If omitted, the current hardware architecture will be used.
- 
 
 
-\ **-o**\  \ *osver*\ 
- 
+
+\ **-o**\  \ *osver*\
+
  The operating system for the image:  fedora8, rhel5, sles10, etc.  The OS packages must be in
  /install/<osver>/<arch> (use copycds(8)|copycds.8).
- 
 
 
-\ **-p**\  \ *profile*\ 
- 
+
+\ **-p**\  \ *profile*\
+
  The profile (e.g. compute, service) to use to create the image.  This determines what package lists are
  used from /opt/xcat/share/xcat/netboot/<os> to create the image with.  When deploying nodes with this image,
  the nodes' nodetype.profile attribute must be set to this same value.
- 
 
 
-\ **-i**\  \ *nodebootif*\ 
- 
+
+\ **-i**\  \ *nodebootif*\
+
  This argument is now optional, and allows you to specify the network boot interface to be configured in the image (e.g. eth0). If not specified, the interface will be determined and configured during the network boot process.
- 
 
 
-\ **-n**\  \ *nodenetdrivers*\ 
- 
+
+\ **-n**\  \ *nodenetdrivers*\
+
  This argument is now optional, and allows you to specify the driver
  modules needed for the network interface(s) on your stateless nodes.  If
  you do not specify this option, the default is to include all recent IBM
  xSeries network drivers.
- 
+
  If specified, \ *nodenetdrivers*\  should be a comma separated list of
  network drivers to be used by the stateless nodes (Ie.: -n tg3,e1000).
  Note that the drivers will be loaded in the order that you list them,
  which may prove important in some cases.
- 
 
 
-\ **-l**\  \ *rootlimit*\ 
- 
+
+\ **-l**\  \ *rootlimit*\
+
  The maximum size allowed for the root file system in the image.  Specify in bytes, or can append k, m, or g.
- 
 
 
-\ **-**\ **-onlyinitrd**\ 
- 
+
+\ **-**\ **-onlyinitrd**\
+
  Regenerates the initrd for a stateless image to be used for a diskless install.
- 
+
  Regenerates the initrd that is part of a stateless/statelite image that is used to boot xCAT nodes in a stateless/stateli
  te mode.
- 
+
  The \ **genimage -**\ **-onlyinitrd**\  command will generate two initial ramdisks, one is \ **initrd-statelite.gz**\  for \ **statelite**\  mode, the other one is \ **initrd-stateless.gz**\  for \ **stateless**\  mode.
- 
 
 
-\ **-**\ **-permission**\  \ *permission*\ 
- 
+
+\ **-**\ **-permission**\  \ *permission*\
+
  The mount permission of \ **/.statelite**\  directory for \ **statelite**\  mode, which is only used for \ **statelite**\  mode, and the default permission is 755.
- 
 
 
-\ **-r**\  \ *otherifaces*\ 
- 
+
+\ **-r**\  \ *otherifaces*\
+
  Other network interfaces (e.g. eth1) in the image that should be configured via DHCP.
- 
 
 
-\ **-k**\  \ *kernelver*\ 
- 
+
+\ **-k**\  \ *kernelver*\
+
  Use this flag if you want to use a specific version of the kernel in the image.  Defaults to the first kernel found
  in the install image.
- 
 
 
-\ **-g**\  \ *krpmver*\ 
- 
+
+\ **-g**\  \ *krpmver*\
+
  Use this flag to specify the rpm version for kernel packages in the image. It must be present if -k flag is specified in the command for SLES. Generally, the value of -g is the part after \ **linux-**\  and before \ **.rpm**\  in a kernel rpm name.
- 
+
 
 
 \ **-m**\  statelite
- 
+
  This flag is for Ubuntu, Debian and Fedora12 only. Use this flag to specify if you want to generate statelite image. The default is to generate stateless image for these three operating systems. For others, this flag is invalid because both stateless and statelite images will be generated with this command.
- 
 
 
-\ **-**\ **-interactive**\ 
- 
+
+\ **-**\ **-interactive**\
+
  This flag allows the user to answer questions from yum/zypper command when installing rpms into the image. If it is not specified, '-y' will be passed to the yum command and '--non-interactive --no-gpg-checks' will be passed to the zypper command as default answers.
- 
 
 
-\ **-**\ **-dryrun**\ 
- 
+
+\ **-**\ **-dryrun**\
+
  This flag shows the underlying call to the os specific genimage function. The user can copy and the paste the output to run the command on another machine that does not have xCAT installed.
- 
 
 
-\ **-t**\  \ *tmplimit*\ 
- 
+
+\ **-t**\  \ *tmplimit*\
+
  (Deprecated) This flag allows the user to setup the /tmp and the /var/tmp file system sizes. This flag is no longer supported. You can overwrite any file system size using the .postinstall script where you can create a new /etc/fstab file.
- 
 
 
-\ **-**\ **-ignorekernelchk**\ 
- 
+
+\ **-**\ **-ignorekernelchk**\
+
  Skip the kernel version checking when injecting drivers from osimage.driverupdatesrc. That means all drivers from osimage.driverupdatesrc will be injected to initrd for the specific target kernel.
- 
 
 
-\ **-**\ **-noupdate**\ 
- 
+
+\ **-**\ **-noupdate**\
+
  This flag allows the user to bypass automatic package updating when installing other packages.
- 
 
 
-\ **-v|-**\ **-version**\ 
- 
+
+\ **-v|-**\ **-version**\
+
  Display version.
- 
 
 
-\ **-h|-**\ **-help**\ 
- 
+
+\ **-h|-**\ **-help**\
+
  Display usage message.
- 
+
 
 
 
@@ -219,53 +219,53 @@ EXAMPLES
 
 
 1 To prompt the user for inputs:
- 
- 
+
+
  .. code-block:: perl
- 
+
     genimage
- 
- 
+
+
 
 
 2 To generate an image using information from an osimage definition:
- 
- 
+
+
  .. code-block:: perl
- 
+
     genimage myimagename
- 
- 
+
+
 
 
 3 To run genimage in test mode without actually generating an image:
- 
- 
+
+
  .. code-block:: perl
- 
+
     genimage --dryrun  myimagename
- 
- 
+
+
 
 
 4 To generate an image and have yum/zypper prompt for responses:
- 
- 
+
+
  .. code-block:: perl
- 
+
     genimage myimagename --interactive
- 
- 
+
+
 
 
 5 To generate an image, replacing some values in the osimage definition:
- 
- 
+
+
  .. code-block:: perl
- 
+
     genimage -i eth0 -n tg3 myimagename
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/geninitrd.1.rst b/docs/source/guides/admin-guides/references/man1/geninitrd.1.rst
index 881fff450..fa871f0aa 100644
--- a/docs/source/guides/admin-guides/references/man1/geninitrd.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/geninitrd.1.rst
@@ -31,40 +31,40 @@ DESCRIPTION
 
 Generate the initrd for the osimage: \ **imagename**\  which is an xCAT object of \ *osimage*\  type.
 
-\ **Diskful Osimage**\ 
+\ **Diskful Osimage**\
 
 
-If the \ **imagename**\  is a stateful one (The provmethod attribute for the osimage is 'install'), 
-this command is used to rebuild the initrd to inject the new drivers from driver rpms or 
-'update distro' and copy the rebuilt initrd and new kernel (If there's new kernel in 'update 
+If the \ **imagename**\  is a stateful one (The provmethod attribute for the osimage is 'install'),
+this command is used to rebuild the initrd to inject the new drivers from driver rpms or
+'update distro' and copy the rebuilt initrd and new kernel (If there's new kernel in 'update
 distro') to the directory \ */tftpboot/xcat/<imagename*\ >.
 
-If the initrd has been rebuilt by geninitrd, when run nodeset, the \ *--noupdateinitrd*\  option 
+If the initrd has been rebuilt by geninitrd, when run nodeset, the \ *--noupdateinitrd*\  option
 should be used to skip the rebuilding of initrd to improve the performance.
 
-Three attributes of osimage object can be used to specify the Driver RPM location and Driver names 
+Three attributes of osimage object can be used to specify the Driver RPM location and Driver names
 for injecting new drivers to initrd.
 
-\ **netdrivers**\  - comma separated driver names that need to be injected to the initrd. 
-The postfix '.ko' can be ignored. The netdrivers attribute must be set to specify the new driver list. 
+\ **netdrivers**\  - comma separated driver names that need to be injected to the initrd.
+The postfix '.ko' can be ignored. The netdrivers attribute must be set to specify the new driver list.
 If you want to load all the drivers from the driver rpms, using the keyword allupdate.
 
 \ **driverupdatesrc**\  - comma separated driver rpm packages (full path should be specified)
 
-\ **osupdatename**\  - comma separated 'osdistroupdate' object. Each 'osdistroupdate' object specifies a 
-Linux distro update. When run geninitrd, 'kernel-\*.rpm' will be searched from osdistroupdate.dirpath 
+\ **osupdatename**\  - comma separated 'osdistroupdate' object. Each 'osdistroupdate' object specifies a
+Linux distro update. When run geninitrd, 'kernel-\*.rpm' will be searched from osdistroupdate.dirpath
 to get all the rpm packages and then search the drivers from the rpm packages.
 
 Refer to the doc: Using_Linux_Driver_Update_Disk
 
-\ **Stateless Osimage**\ 
+\ **Stateless Osimage**\
 
 
 If the \ **imagename**\  is a stateless one (The provmethod attribute for the osimage is 'netboot'),
-this command is used to generate the initrd from the rootimg which generated by 'genimage' command. 
+this command is used to generate the initrd from the rootimg which generated by 'genimage' command.
 So the 'genimage' must be run once before running the geninitrd command.
 
-Two attributes of osimage object can be used to specify the Driver RPM location and Driver names 
+Two attributes of osimage object can be used to specify the Driver RPM location and Driver names
 for injecting new drivers to initrd.
 
 \ **netdrivers**\  - comma separated driver names that need to be injected to the initrd.
@@ -82,10 +82,10 @@ Parameters
 \ *imagename*\  specifies the name of an os image definition to be used. The specification for the image is stored in the \ *osimage*\  table and \ *linuximage*\  table.
 
 
-\ **-**\ **-ignorekernelchk**\ 
- 
+\ **-**\ **-ignorekernelchk**\
+
  Skip the kernel version checking when injecting drivers from osimage.driverupdatesrc. That means all drivers from osimage.driverupdatesrc will be injected to initrd for the specific target kernel.
- 
+
 
 
 
@@ -106,13 +106,13 @@ EXAMPLES
 
 
 1 To generate initrd for the osimage \ **myimagename**\ :
- 
- 
+
+
  .. code-block:: perl
- 
+
     geninitrd myimagename
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/getmacs.1.rst b/docs/source/guides/admin-guides/references/man1/getmacs.1.rst
index a38bc1abf..ced794535 100644
--- a/docs/source/guides/admin-guides/references/man1/getmacs.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/getmacs.1.rst
@@ -72,63 +72,63 @@ OPTIONS
 *******
 
 
-\ **-**\ **-arp**\ 
+\ **-**\ **-arp**\
 
 Read MAC address with ARP protocol.
 
-\ **-C**\ 
+\ **-C**\
 
 Specify the IP address of the partition for ping test. The default is to read from xCAT database if no \ **-C**\  specified.
 
-\ **-d**\ 
+\ **-d**\
 
 Display MAC only. The default is to write the first valid adapter MAC to the xCAT database.
 
-\ **-D**\ 
+\ **-D**\
 
 Perform discovery for mac address.  By default, it will run ping test to test the connection between adapter and xCAT management node. Use '--noping' can skip the ping test to save time. Be aware that in this way, the lpars will be reset.
 
-\ **-f**\ 
+\ **-f**\
 
 Force immediate shutdown of the partition. This flag must be used with -D flag.
 
-\ **-F**\ 
+\ **-F**\
 
 Specify filters to select the correct adapter.  Acceptable filters are Type, MAC_Address, Phys_Port_Loc, Adapter, Port_Group, Phys_Port, Logical_Port, VLan, VSwitch, Curr_Conn_Speed.
 
-\ **-G**\ 
+\ **-G**\
 
 Gateway IP address of the partition.  The default is to read from xCAT database if no \ **-G**\  specified.
 
-\ **-h**\ 
+\ **-h**\
 
 Display usage message.
 
-\ **-M**\ 
+\ **-M**\
 
 Return multiple MAC addresses for the same adapter or port, if available from the hardware.  For some network adapters (e.g. HFI) the MAC can change when there are some recoverable internal errors.  In this case, the hardware can return several MACs that the adapter can potentially have, so that xCAT can put all of them in DHCP.  This allows successful booting, even after a MAC change, but on Linux at this time, it can also cause duplicate IP addresses, so it is currently not recommended on Linux.  By default (without this flag), only a single MAC address is returned for each adapter.
 
-\ **-**\ **-noping**\ 
+\ **-**\ **-noping**\
 
 Only can be used with '-D' to display all the available adapters with mac address but do NOT run ping test.
 
-\ **-o**\ 
+\ **-o**\
 
 Read MAC address when the lpar is in openfirmware state.  This option mush be used with [\ **-D**\ ] option to perform ping test. Before use \ **-o**\ , the lpar must be in openfirmware state.
 
-\ **-S**\ 
+\ **-S**\
 
 The IP address of the machine to ping.  The default is to read from xCAT database if no \ **-S**\  specified.
 
-\ **-v**\ 
+\ **-v**\
 
 Command Version.
 
-\ **-V**\ 
+\ **-V**\
 
 Verbose output.
 
-\ **-i**\ 
+\ **-i**\
 
 Specify the interface whose mac address will be collected and written into mac table. If 4 mac addresses are returned by option '-d', they all are the mac addresses of the blade. The N can start from 0(map to the eth0 of the blade) to 3. If 5 mac addresses are returned, the 1st mac address must be the mac address of the blade's FSP, so the N will start from 1(map to the eth0 of the blade) to 4.
 
diff --git a/docs/source/guides/admin-guides/references/man1/getslnodes.1.rst b/docs/source/guides/admin-guides/references/man1/getslnodes.1.rst
index 34a34f3f3..9c4979fa5 100644
--- a/docs/source/guides/admin-guides/references/man1/getslnodes.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/getslnodes.1.rst
@@ -65,16 +65,16 @@ OPTIONS
 
 
 
-\ **-?|-h|-**\ **-help**\ 
- 
+\ **-?|-h|-**\ **-help**\
+
  Display usage message.
- 
 
 
-\ **-v|-**\ **-version**\ 
- 
+
+\ **-v|-**\ **-version**\
+
  Command Version.
- 
+
 
 
 
@@ -95,39 +95,39 @@ EXAMPLES
 
 
 1.
- 
+
  Display information about all of the nodes in your SoftLayer account:
- 
- 
+
+
  .. code-block:: perl
- 
+
    getslnodes
- 
- 
+
+
 
 
 2.
- 
+
  Display information about all of the nodes whose hostname starts with foo:
- 
- 
+
+
  .. code-block:: perl
- 
+
    getslnodes foo
- 
- 
+
+
 
 
 3.
- 
+
  Create xCAT node defintions in the xCAT DB for all of the nodes in your SoftLayer account:
- 
- 
+
+
  .. code-block:: perl
- 
+
    getslnodes | mkdef -z
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/gettab.1.rst b/docs/source/guides/admin-guides/references/man1/gettab.1.rst
index b158b6122..71bb19c0f 100644
--- a/docs/source/guides/admin-guides/references/man1/gettab.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/gettab.1.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **gettab**\  [\ **-H**\  | \ **-**\ **-with-fieldname**\ ] \ *key=value,...  table.attribute ...*\ 
+\ **gettab**\  [\ **-H**\  | \ **-**\ **-with-fieldname**\ ] \ *key=value,...  table.attribute ...*\
 
 \ **gettab**\  [\ **-?**\  | \ **-h**\  | \ **-**\ **-help**\ ]
 
@@ -41,17 +41,17 @@ OPTIONS
 
 
 
-\ **-H|-**\ **-with-fieldname**\ 
- 
+\ **-H|-**\ **-with-fieldname**\
+
  Always display table.attribute name next to result.  By default, this is done only if more than
  one table.attribute is requested.
- 
 
 
-\ **-?|-h|-**\ **-help**\ 
- 
+
+\ **-?|-h|-**\ **-help**\
+
  Display usage message.
- 
+
 
 
 
@@ -77,39 +77,39 @@ EXAMPLES
 
 
 1. To display setting for \ **master**\  (management node) in the site table:
- 
- 
+
+
  .. code-block:: perl
- 
+
    gettab -H key=master site.value
- 
- 
+
+
  The output would be similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    site.value: mgmtnode.cluster.com
- 
- 
+
+
 
 
 2. To display the first node or group name that has \ **mgt**\  set to \ **blade**\  in the nodehm table:
- 
- 
+
+
  .. code-block:: perl
- 
+
    gettab mgt=blade nodehm.node
- 
- 
+
+
  The output would be similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    blades
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/groupfiles4dsh.1.rst b/docs/source/guides/admin-guides/references/man1/groupfiles4dsh.1.rst
index 3a2675767..8ebbde2dd 100644
--- a/docs/source/guides/admin-guides/references/man1/groupfiles4dsh.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/groupfiles4dsh.1.rst
@@ -82,7 +82,7 @@ To use with dsh:
     export DSH_CONTEXT=DSH  ( default unless CSM is installed)
     export DSH_NODE_RSH=/bin/ssh   (default is rsh)
     export DSH_NODEGROUP_PATH= /tmp/nodegroupfiles
- 
+
     dsh  -N all  date   (where all is a group defined in xCAT)
     dsh -a date  (will look in all nodegroupfiles and build a list of all nodes)
 
diff --git a/docs/source/guides/admin-guides/references/man1/imgcapture.1.rst b/docs/source/guides/admin-guides/references/man1/imgcapture.1.rst
index 663064609..5e2546dbb 100644
--- a/docs/source/guides/admin-guides/references/man1/imgcapture.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/imgcapture.1.rst
@@ -58,80 +58,80 @@ OPTIONS
 
 
 
-\ **-t | -**\ **-type**\ 
- 
+\ **-t | -**\ **-type**\
+
  Specify the osimage type you want to capture, two types are supported: diskless and sysclone.
- 
 
 
-\ **-p|-**\ **-profile**\  \ *profile*\ 
- 
+
+\ **-p|-**\ **-profile**\  \ *profile*\
+
  Assign \ *profile*\  as the profile of the image to be created.
- 
 
 
-\ **-o|-**\ **-osimage**\  \ *osimage*\ 
- 
+
+\ **-o|-**\ **-osimage**\  \ *osimage*\
+
  The osimage name.
- 
 
 
-\ **-i**\  \ *nodebootif*\ 
- 
+
+\ **-i**\  \ *nodebootif*\
+
  The network interface the diskless node will boot over (e.g. eth0), which is used by the \ **genimage**\  command to generate initial ramdisks.
- 
 
 
-\ **-n**\  \ *nodenetdrivers*\ 
- 
+
+\ **-n**\  \ *nodenetdrivers*\
+
  The driver modules needed for the network interface, which is used by the \ **genimage**\  command to generate initial ramdisks.
- 
+
  By default, the \ **genimage**\  command can provide drivers for the following network interfaces:
- 
+
  For x86 or x86_64 platform:
- 
- 
+
+
  .. code-block:: perl
- 
+
       tg3 bnx2 bnx2x e1000 e1000e igb m1x_en
- 
- 
+
+
  For ppc64 platform:
- 
- 
+
+
  .. code-block:: perl
- 
+
       e1000 e1000e igb ibmveth ehea
- 
- 
+
+
  For S390x:
- 
- 
+
+
  .. code-block:: perl
- 
+
       qdio ccwgroup
- 
- 
+
+
  If the network interface is not in the above list, you'd better specify the driver modules with this option.
- 
 
 
-\ **-h|-**\ **-help**\ 
- 
+
+\ **-h|-**\ **-help**\
+
  Display the usage message.
- 
 
 
-\ **-v|-**\ **-version**\ 
- 
+
+\ **-v|-**\ **-version**\
+
  Display the version.
- 
 
 
-\ **-V|-**\ **-verbose**\ 
- 
+
+\ **-V|-**\ **-verbose**\
+
  Verbose output.
- 
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/imgexport.1.rst b/docs/source/guides/admin-guides/references/man1/imgexport.1.rst
index 3626725f1..c9359d8cf 100644
--- a/docs/source/guides/admin-guides/references/man1/imgexport.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/imgexport.1.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **imgexport [-h| -**\ **-help]**\ 
+\ **imgexport [-h| -**\ **-help]**\
 
 \ **imgexport**\  \ *image_name*\  [\ *destination*\ ] [[\ **-e | -**\ **-extra**\  \ *file:dir*\ ] ... ] [\ **-p | -**\ **-postscripts**\  \ *node_name*\ ] [\ **-v | -**\ **-verbose**\ ]
 
@@ -72,40 +72,40 @@ OPTIONS
 
 
 
-\ **-e|-**\ **-extra**\  \ *srcfile:destdir*\ 
- 
+\ **-e|-**\ **-extra**\  \ *srcfile:destdir*\
+
  Pack up extra files. If \ *destdir*\  is omitted, the destination directory will be the same as the source directory.
- 
 
 
-\ **-h|-**\ **-help**\ 
- 
+
+\ **-h|-**\ **-help**\
+
  Display usage message.
- 
 
 
-\ **-p|-**\ **-postscripts**\  \ *node_name*\ 
- 
+
+\ **-p|-**\ **-postscripts**\  \ *node_name*\
+
  Get the names of the postscripts and postbootscripts for the given node and pack them into the image.
- 
 
 
-\ **-v|-**\ **-verbose**\ 
- 
+
+\ **-v|-**\ **-verbose**\
+
  Verbose output.
- 
 
 
-\ *image_name*\ 
- 
+
+\ *image_name*\
+
  The name of the image. Use \ **lsdef -t osimage**\  to find out all the image names.
- 
 
 
-\ *destination*\ 
- 
+
+\ *destination*\
+
  The output bundle file name.
- 
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/imgimport.1.rst b/docs/source/guides/admin-guides/references/man1/imgimport.1.rst
index 6359d535d..df19fae09 100644
--- a/docs/source/guides/admin-guides/references/man1/imgimport.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/imgimport.1.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **imgimport [-h|-**\ **-help]**\ 
+\ **imgimport [-h|-**\ **-help]**\
 
 \ **imgimport**\  \ *bundle_file_name*\  [\ **-p | -**\ **-postscripts**\  \ *nodelist*\ ] [\ **-f | -**\ **-profile**\  \ *new_profile*\ ] [\ **-v | -**\ **-verbose**\ ]
 
@@ -74,7 +74,7 @@ After this command, you can run the \ **nodeset**\  command and then start deplo
 For stateful:
   nodeset
 
-For stateless: 
+For stateless:
   genimage
   packimage
   nodeset
@@ -91,28 +91,28 @@ OPTIONS
 
 
 
-\ **-f|-**\ **-profile**\  \ *new_profile*\ 
- 
+\ **-f|-**\ **-profile**\  \ *new_profile*\
+
  Import the image with a new profile name.
- 
 
 
-\ **-h|-**\ **-help**\ 
- 
+
+\ **-h|-**\ **-help**\
+
  Display usage message.
- 
 
 
-\ **-p|-**\ **-postscripts**\  \ *nodelist*\ 
- 
+
+\ **-p|-**\ **-postscripts**\  \ *nodelist*\
+
  Import the postscripts. The postscripts contained in the image will be set in the postscripts table for \ *nodelist*\ .
- 
 
 
-\ **-v|-**\ **-verbose**\ 
- 
+
+\ **-v|-**\ **-verbose**\
+
  Verbose output.
- 
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/liteimg.1.rst b/docs/source/guides/admin-guides/references/man1/liteimg.1.rst
index 266f59b73..8235e1717 100644
--- a/docs/source/guides/admin-guides/references/man1/liteimg.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/liteimg.1.rst
@@ -19,11 +19,11 @@ SYNOPSIS
 ********
 
 
-\ **liteimg [-h| -**\ **-help]**\ 
+\ **liteimg [-h| -**\ **-help]**\
 
-\ **liteimg  [-v| -**\ **-version]**\ 
+\ **liteimg  [-v| -**\ **-version]**\
 
-\ **liteimg**\  \ *imagename*\ 
+\ **liteimg**\  \ *imagename*\
 
 
 ***********
@@ -31,29 +31,29 @@ DESCRIPTION
 ***********
 
 
-This command modifies the statelite image by creating a series of links. 
+This command modifies the statelite image by creating a series of links.
 It creates 2 levels of indirection so that files can be modified while in
 their image state as well as during runtime. For example, a file like
 <$imgroot>/etc/ntp.conf will have the following operations done to it:
 
-\ *    mkdir -p $imgroot/.default/etc*\ 
+\ *    mkdir -p $imgroot/.default/etc*\
 
-\ *    mkdir -p $imgroot/.statelite/tmpfs/etc*\ 
+\ *    mkdir -p $imgroot/.statelite/tmpfs/etc*\
 
-\ *    mv $imgroot/etc/ntp.conf $imgroot/.default/etc*\ 
+\ *    mv $imgroot/etc/ntp.conf $imgroot/.default/etc*\
 
-\ *    cd $imgroot/.statelite/tmpfs/etc*\ 
+\ *    cd $imgroot/.statelite/tmpfs/etc*\
 
-\ *    ln -sf ../../../.default/etc/ntp.conf .*\ 
+\ *    ln -sf ../../../.default/etc/ntp.conf .*\
 
-\ *    cd $imgroot/etc*\ 
+\ *    cd $imgroot/etc*\
 
-\ *    ln -sf ../.statelite/tmpfs/etc/ntp.conf .*\ 
+\ *    ln -sf ../.statelite/tmpfs/etc/ntp.conf .*\
 
 When finished, the original file will reside in
 \ *$imgroot/.default/etc/ntp.conf*\ . \ *$imgroot/etc/ntp.conf*\  will link to
 \ *$imgroot/.statelite/tmpfs/etc/ntp.conf*\  which will in turn link to
-\ *$imgroot/.default/etc/ntp.conf*\ 
+\ *$imgroot/.default/etc/ntp.conf*\
 
 Note: If you make any changes to your litefile table after running liteimg then you will need to rerun liteimg again.
 
diff --git a/docs/source/guides/admin-guides/references/man1/lsdef.1.rst b/docs/source/guides/admin-guides/references/man1/lsdef.1.rst
index 5e4bbe84d..85cf5b30f 100644
--- a/docs/source/guides/admin-guides/references/man1/lsdef.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/lsdef.1.rst
@@ -21,12 +21,12 @@ SYNOPSIS
 
 \ **lsdef**\  [\ **-h | -**\ **-help**\ ] [\ **-t**\  \ *object-types*\ ] [\ **-i**\  \ *attr-list*\ ]
 
-\ **lsdef**\  [\ **-V | -**\ **-verbose**\ ] [\ **-l | -**\ **-long**\ ] [\ **-s | -**\ **-short**\ ] [\ **-a | -**\ **-all**\ ] [\ **-S**\ ] 
+\ **lsdef**\  [\ **-V | -**\ **-verbose**\ ] [\ **-l | -**\ **-long**\ ] [\ **-s | -**\ **-short**\ ] [\ **-a | -**\ **-all**\ ] [\ **-S**\ ]
 [\ **-t**\  \ *object-types*\ ] [\ **-o**\  \ *object-names*\ ] [\ **-z | -**\ **-stanza**\ ] [\ **-i**\  \ *attr-list*\ ]
 [\ **-c | -**\ **-compress**\ ] [\ **-**\ **-osimage**\ ] [\ **-**\ **-nics**\ ] [[\ **-w**\  \ *attr*\ ==\ *val*\ ]
 [\ **-w**\  \ *attr*\ =~\ *val*\ ] ...] [\ *noderange*\ ]
 
-\ **lsdef**\  [\ **-l | -**\ **-long**\ ] [\ **-a | -**\ **-all**\ ] [\ **-t**\  \ *object-types*\ ] [\ **-z | -**\ **-stanza**\ ] 
+\ **lsdef**\  [\ **-l | -**\ **-long**\ ] [\ **-a | -**\ **-all**\ ] [\ **-t**\  \ *object-types*\ ] [\ **-z | -**\ **-stanza**\ ]
 [\ **-i**\  \ *attr-list*\ ] [\ **-**\ **-template**\  [\ *template-object-name*\ ]]
 
 
@@ -45,113 +45,113 @@ OPTIONS
 
 
 
-\ **-a|-**\ **-all**\ 
- 
+\ **-a|-**\ **-all**\
+
  Display all definitions.
  For performance consideration, the auditlog and eventlog objects will not be listed.
  To list auditlog or eventlog objects, use lsdef -t auditlog or lsdef -t eventlog instead.
- 
 
 
-\ **-c|-**\ **-compress**\ 
- 
+
+\ **-c|-**\ **-compress**\
+
  Display information in compressed mode, each output line has format "<object name>: <data>".
- The output can be passed to command xcoll or xdshbak for formatted output. 
+ The output can be passed to command xcoll or xdshbak for formatted output.
  The -c flag must be used with -i flag.
- 
 
 
-\ **-h|-**\ **-help**\ 
- 
+
+\ **-h|-**\ **-help**\
+
  Display usage message.
- 
 
 
-\ **-i**\  \ *attr-list*\ 
- 
+
+\ **-i**\  \ *attr-list*\
+
  Comma separated list of attribute names to display.
- 
 
 
-\ **-l|-**\ **-long**\ 
- 
+
+\ **-l|-**\ **-long**\
+
  List the complete object definition.
- 
 
 
-\ **-s|-**\ **-short**\ 
- 
+
+\ **-s|-**\ **-short**\
+
  Only list the object names.
- 
 
 
-\ **-S**\ 
- 
+
+\ **-S**\
+
  List all the hidden nodes (FSP/BPA nodes) with other ones.
- 
 
 
-\ *noderange*\ 
- 
+
+\ *noderange*\
+
  A set of comma delimited node names and/or group names.
  See the "noderange" man page for details on supported formats.
- 
 
 
-\ **-o**\  \ *object-names*\ 
- 
+
+\ **-o**\  \ *object-names*\
+
  A set of comma delimited object names.
- 
+
 
 
 \ **-**\ **-template**\  [\ *template-object-name*\ ]
- 
+
  Show the object definition templates \ *template-object-name*\   shipped in xCAT. If no \ *template-object-name*\  is specified, all the object definition templates of the specified type \ **-t**\  \ *object-types*\  will be listed. Use \ **-a|-**\ **-all**\  option to list all the object definition templates.
- 
 
 
-\ **-**\ **-osimage**\ 
- 
+
+\ **-**\ **-osimage**\
+
  Show all the osimage information for the node.
- 
 
 
-\ **-**\ **-nics**\ 
- 
+
+\ **-**\ **-nics**\
+
  Show the nics configuration information for the node.
- 
 
 
-\ **-t**\  \ *object-types*\ 
- 
+
+\ **-t**\  \ *object-types*\
+
  A set of comma delimited object types. Use the help option to get a list of valid objects.
- 
 
 
-\ **-V|-**\ **-verbose**\ 
- 
+
+\ **-V|-**\ **-verbose**\
+
  Verbose mode.
- 
+
 
 
 \ **-w**\  \ *attr==val*\  \ **-w**\  \ *attr=~val*\  ...
- 
+
  Use one or multiple -w flags to specify the selection string that can be used to select objects. The operators ==, !=, =~ and !~ are available. Use the help option to get a list of valid attributes for each object type.
- 
+
  Operator descriptions:
          ==        Select nodes where the attribute value is exactly this value.
          !=        Select nodes where the attribute value is not this specific value.
          =~        Select nodes where the attribute value matches this regular expression.
          !~        Select nodes where the attribute value does not match this regular expression.
- 
+
  Note: if the "val" fields includes spaces or any other characters that will be parsed by shell, the "attr<operator>val" needs to be quoted. If the operator is "!~", the "attr<operator>val" needs to be quoted using single quote.
- 
 
 
-\ **-z|-**\ **-stanza**\ 
- 
+
+\ **-z|-**\ **-stanza**\
+
  Display output in stanza format. See the xcatstanzafile man page for details on using xCAT stanza files.
- 
+
 
 
 
@@ -172,253 +172,253 @@ EXAMPLES
 
 
 1.
- 
+
  To display a description of all the valid attributes that could be used
  when defining an xCAT node.
- 
- 
+
+
  .. code-block:: perl
- 
+
    lsdef -t node -h
- 
- 
+
+
 
 
 2.
- 
+
  To get a list of all the objects that have been defined.
- 
- 
+
+
  .. code-block:: perl
- 
+
    lsdef
      OR
    lsdef -a
- 
- 
+
+
 
 
 3.
- 
+
  To get all the attributes of the node1
- 
- 
+
+
  .. code-block:: perl
- 
+
    lsdef node1
      OR
    lsdef -t node node1
      OR
    lsdef -t node -o node1
- 
- 
+
+
 
 
 4.
- 
+
  To get the object name of node1 instead of all the attributes
- 
- 
+
+
  .. code-block:: perl
- 
+
    lsdef -s node1
- 
- 
+
+
 
 
 5.
- 
+
  To get a list of all the network definitions.
- 
- 
+
+
  .. code-block:: perl
- 
+
    lsdef -t network
- 
- 
+
+
 
 
 6.
- 
+
  To get a complete listing of all network definitions.
- 
- 
+
+
  .. code-block:: perl
- 
+
    lsdef -l -t network
- 
- 
+
+
 
 
 7.
- 
+
  To list the whole xCAT database and write it to a stanza file. (backup database)
- 
- 
+
+
  .. code-block:: perl
- 
+
    lsdef -a -l -z > mydbstanzafile
- 
- 
+
+
 
 
 8.
- 
+
  To list the MAC and install adapter name for each node.
- 
- 
+
+
  .. code-block:: perl
- 
+
    lsdef -t node -i mac,installnic
- 
- 
+
+
 
 
 9.
- 
+
  To list an osimage definition named "aix53J".
- 
- 
+
+
  .. code-block:: perl
- 
+
    lsdef -t osimage -l -o aix53J
- 
- 
+
+
 
 
 10.
- 
+
  To list all node definitions that have a status value of "booting".
- 
- 
+
+
  .. code-block:: perl
- 
+
    lsdef -t node -w status==booting
- 
- 
+
+
 
 
 11.
- 
+
  To list all the attributes of the group "service".
- 
- 
+
+
  .. code-block:: perl
- 
+
    lsdef -l -t group -o service
- 
- 
+
+
 
 
 12.
- 
+
  To list all the attributes of the nodes that are members of the group "service".
- 
- 
+
+
  .. code-block:: perl
- 
+
    lsdef -t node -l service
- 
- 
+
+
 
 
 13.
- 
+
  To get a listing of object definitions that includes information about
  what xCAT database tables are used to store the data.
- 
- 
+
+
  .. code-block:: perl
- 
+
    lsdef -V -l -t node -o node01
- 
- 
+
+
 
 
 14.
- 
+
  To list the hidden nodes that can't be seen with other flags.
  The hidden nodes are FSP/BPAs.
- 
- 
+
+
  .. code-block:: perl
- 
+
    lsdef -S
- 
- 
+
+
 
 
 15.
- 
+
  To list the nodes status and use xcoll to format the output.
- 
- 
+
+
  .. code-block:: perl
- 
+
    lsdef -t node -i status -c | xcoll
- 
- 
+
+
 
 
 16.
- 
+
  To display the description for some specific attributes that could be used
  when defining an xCAT node.
- 
- 
+
+
  .. code-block:: perl
- 
+
    lsdef -t node -h -i profile,pprofile
- 
- 
+
+
 
 
 17.
- 
+
  To display the nics configuration information for node cn1.
- 
- 
+
+
  .. code-block:: perl
- 
+
    lsdef cn1 --nics
- 
- 
+
+
 
 
 18.
- 
+
  To list all the object definition templates shipped in xCAT.
- 
- 
+
+
  .. code-block:: perl
- 
+
    lsdef --template -a
- 
- 
+
+
 
 
 19.
- 
+
  To display the details of "node" object definition template "ppc64le-template" shipped in xCAT.
- 
- 
+
+
  .. code-block:: perl
- 
+
    lsdef -t node --template ppc64le-template
- 
- 
+
+
 
 
 20.
- 
+
  To list all the "node" object definition templates shipped in xCAT.
- 
- 
+
+
  .. code-block:: perl
- 
+
    lsdef -t node --template
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/lsdocker.1.rst b/docs/source/guides/admin-guides/references/man1/lsdocker.1.rst
index 67b5fd0fa..239e7408d 100644
--- a/docs/source/guides/admin-guides/references/man1/lsdocker.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/lsdocker.1.rst
@@ -21,7 +21,7 @@ SYNOPSIS
 
 \ **lsdocker**\  \ *noderange*\  [\ **-l | -**\ **-logs**\ ]
 
-\ **lsdocker**\  \ *dockerhost*\ 
+\ **lsdocker**\  \ *dockerhost*\
 
 \ **lsdocker**\  [\ **-h | -**\ **-help**\ ]
 
@@ -42,7 +42,7 @@ OPTIONS
 
 
 
-\ **-l|-**\ **-logs**\ 
+\ **-l|-**\ **-logs**\
 
 
 
@@ -56,40 +56,40 @@ EXAMPLES
 
 
 1. To get info for docker instance "host01c01"
- 
- 
+
+
  .. code-block:: perl
- 
+
    lsdocker host01c01
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    host01c01: 50800dfd8b5f	ubuntu	/bin/bash	2016-01-13T06:32:59	running	/host01c01
- 
- 
+
+
 
 
 2. To get info for running docker instance on dockerhost "host01"
- 
- 
+
+
  .. code-block:: perl
- 
+
    lsdocker host01
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    host01: 50800dfd8b5f	ubuntu	/bin/bash	2016-1-13 - 1:32:59	Up 12 minutes	/host01c01
    host01: 875ce11d5987	ubuntu	/bin/bash	2016-1-21 - 1:12:37	Up 5 seconds	/host01c02
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/lsflexnode.1.rst b/docs/source/guides/admin-guides/references/man1/lsflexnode.1.rst
index e72fc0ce0..68c3d604a 100644
--- a/docs/source/guides/admin-guides/references/man1/lsflexnode.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/lsflexnode.1.rst
@@ -23,7 +23,7 @@ SYNOPSIS
 
 \ **lsflexnode**\  [\ **-v**\  | \ **-**\ **-version**\ ]
 
-\ **lsflexnode**\  \ *noderange*\ 
+\ **lsflexnode**\  \ *noderange*\
 
 
 ***********
@@ -55,16 +55,16 @@ OPTIONS
 
 
 
-\ **-h | -**\ **-help**\ 
- 
+\ **-h | -**\ **-help**\
+
  Display the usage message.
- 
 
 
-\ **-v | -**\ **-version**\ 
- 
+
+\ **-v | -**\ **-version**\
+
  Display the version information.
- 
+
 
 
 
@@ -76,102 +76,102 @@ ATTRIBUTES
 The meaning of attributes which displayed by the \ **lsflexnode**\ . The word 'node' in this section means \ **Blade slot node**\ .
 
 
-\ **Complex**\ 
- 
+\ **Complex**\
+
  The unique numeric identifier for a complex installed in the chassis.
- 
 
 
-\ **Partition number**\ 
- 
+
+\ **Partition number**\
+
  The number of partitions currently defined for this complex.
- 
 
 
-\ **Complex node number**\ 
- 
+
+\ **Complex node number**\
+
  The number of nodes existing in this complex, regardless of their assignment to any given partition.
- 
 
 
-\ **Partition**\ 
- 
+
+\ **Partition**\
+
  The unique numeric identifier for a partition defined within a complex installed in the chassis.
- 
 
 
-\ **Partition Mode**\ 
- 
+
+\ **Partition Mode**\
+
  The currently configured mode of this partition. It can be 'partition' or 'standalone'.
- 
 
 
-\ **Partition node number**\ 
- 
+
+\ **Partition node number**\
+
  The number of nodes currently defined for this partition.
- 
 
 
-\ **Partition status**\ 
- 
+
+\ **Partition status**\
+
  The current power status of this partition when the partition has a valid partition configuration. It can be 'poweredoff', 'poweredon', 'resetting' or 'invalid'.
- 
 
 
-\ **Node**\ 
- 
+
+\ **Node**\
+
  The unique numeric identifier for this node, unique within the partition. If this node does not belong to a partition, the slot number will be displayed.
- 
 
 
-\ **Node state**\ 
- 
+
+\ **Node state**\
+
  The physical power state of this node. It can be 'poweredoff', 'poweredon' or 'resetting'.
- 
 
 
-\ **Node slot**\ 
- 
+
+\ **Node slot**\
+
  The base slot number where the node exists in the chassis.
- 
 
 
-\ **Node resource**\ 
- 
+
+\ **Node resource**\
+
  A string providing a summary overview of the resources provided by this node. It includes the CPU number, CPU frequency and Memory size.
- 
 
 
-\ **Node type**\ 
- 
+
+\ **Node type**\
+
  The general categorization of the node. It can be 'processor', 'memory' or 'io'.
- 
 
 
-\ **Node role**\ 
- 
+
+\ **Node role**\
+
  Indicates if the node is assigned to a partition, and if so, provides an indication of whether the node is the primary node of the partition or not.
- 
 
 
-\ **Flexnode state**\ 
- 
+
+\ **Flexnode state**\
+
  The state of a flexible node. It is the state of the partition which this node belongs to. If this node does NOT belong to a partition, the value should be 'invalid'.
- 
+
  It can be 'poweredoff', 'poweredon', 'resetting' or 'invalid'.
- 
 
 
-\ **Complex id**\ 
- 
+
+\ **Complex id**\
+
  The identifier of the complex this node belongs to.
- 
 
 
-\ **Partition id**\ 
- 
+
+\ **Partition id**\
+
  The identifier of the partition this node belongs to.
- 
+
 
 
 
@@ -182,18 +182,18 @@ EXAMPLES
 
 
 1 Display all the \ **Complex**\ , \ **Partition**\  and \ **Blade slot node**\  which managed by a AMM.
- 
- 
+
+
  .. code-block:: perl
- 
+
    lsflexnode amm1
- 
- 
+
+
  The output:
- 
- 
+
+
  .. code-block:: perl
- 
+
       amm1: Complex - 24068
       amm1: ..Partition number - 1
       amm1: ..Complex node number - 2
@@ -214,23 +214,23 @@ EXAMPLES
       amm1: ......Node type - processor
       amm1: ......Node resource - 2 (1866 MHz) / 8 (2 GB)
       amm1: ......Node role - unassigned
- 
- 
+
+
 
 
 2 Display a flexible node.
- 
- 
+
+
  .. code-block:: perl
- 
+
    lsflexnode blade1
- 
- 
+
+
  The output:
- 
- 
+
+
  .. code-block:: perl
- 
+
       blade1: Flexnode state - poweredoff
       blade1: Complex id - 24068
       blade1: Partition id - 1
@@ -239,8 +239,8 @@ EXAMPLES
       blade1: Slot14: Node type - processor
       blade1: Slot14: Node resource - 2 (1866 MHz) / 8 (2 GB)
       blade1: Slot14: Node role - secondary
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/lshwconn.1.rst b/docs/source/guides/admin-guides/references/man1/lshwconn.1.rst
index 017ef1cc2..e3ae23a33 100644
--- a/docs/source/guides/admin-guides/references/man1/lshwconn.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/lshwconn.1.rst
@@ -27,14 +27,14 @@ PPC (with HMC) specific:
 ========================
 
 
-\ **lshwconn**\  [\ **-V**\ | \ **-**\ **-verbose**\ ] \ *noderange*\ 
+\ **lshwconn**\  [\ **-V**\ | \ **-**\ **-verbose**\ ] \ *noderange*\
 
 
 PPC (without HMC, using FSPAPI) specific:
 =========================================
 
 
-\ **lshwconn**\  \ *noderange*\  \ **-T**\  \ *tooltype*\ 
+\ **lshwconn**\  \ *noderange*\  \ **-T**\  \ *tooltype*\
 
 
 
@@ -52,22 +52,22 @@ OPTIONS
 
 
 
-\ **-h|-**\ **-help**\ 
- 
+\ **-h|-**\ **-help**\
+
  Display usage message.
- 
 
 
-\ **-V|-**\ **-verbose**\ 
- 
+
+\ **-V|-**\ **-verbose**\
+
  Verbose output.
- 
 
 
-\ **-T**\ 
- 
+
+\ **-T**\
+
  The tooltype is used to communicate to the CEC/Frame. The value could be lpar or fnm. The tooltype value lpar is for xCAT and fnm is for CNM.
- 
+
 
 
 
@@ -88,66 +88,66 @@ EXAMPLES
 
 
 1.
- 
+
  To display connection status for all CEC nodes in node group CEC:
- 
- 
+
+
  .. code-block:: perl
- 
+
    lshwconn cec
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    cec1: ipaddr=192.168.200.245,alt_ipaddr=unavailable,state=Connected
    cec2: Connection not found
- 
- 
+
+
 
 
 2.
- 
+
  To display connection status for Frame node frame1:
- 
- 
+
+
  .. code-block:: perl
- 
+
    lshwconn frame1
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    frame1: side=a,ipaddr=192.168.200.247,alt_ipaddr=unavailable,state=Connected
    frame1: side=b,ipaddr=192.168.200.248,alt_ipaddr=unavailable,state=Connected
- 
- 
+
+
 
 
 3.
- 
+
  To display connection status for all CEC nodes in node group CEC to hardware server, and using lpar tooltype:
- 
- 
+
+
  .. code-block:: perl
- 
+
    lshwconn cec -T lpar
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    cec1: sp=primary,ipadd=40.3.7.1,alt_ipadd=unavailable,state=LINE UP
    cec2: Connection not found
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/lskit.1.rst b/docs/source/guides/admin-guides/references/man1/lskit.1.rst
index e0e74377e..c845cadb3 100644
--- a/docs/source/guides/admin-guides/references/man1/lskit.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/lskit.1.rst
@@ -46,44 +46,44 @@ OPTIONS
 
 
 
-\ **-F|-**\ **-framework**\  \ *kit_path_name*\ 
- 
+\ **-F|-**\ **-framework**\  \ *kit_path_name*\
+
  Use this option to display the framework values of the specified Kit tarfile.  This information is retreived directly from the tarfile and can be done before the Kit has been defined in the xCAT database.  This option cannot be combined with other options.
- 
 
 
-\ **-K|-**\ **-kitattr**\  \ *kitattr_names*\ 
- 
+
+\ **-K|-**\ **-kitattr**\  \ *kitattr_names*\
+
  Where \ *kitattr_names*\  is a comma-delimited list of kit attribute names. The names correspond to attribute names in the \ **kit**\  table. The \ **lskit**\  command will only display the specified kit attributes.
- 
 
 
-\ **-R|-**\ **-repoattr**\  \ *repoattr_names*\ 
- 
+
+\ **-R|-**\ **-repoattr**\  \ *repoattr_names*\
+
  Where \ *repoattr_names*\  is a comma-delimited list of kit repository attribute names. The names correspond to attribute names in the \ **kitrepo**\  table. The \ **lskit**\  command will only display the specified kit repository attributes.
- 
 
 
-\ **-C|-**\ **-compattr**\  \ *compattr_names*\ 
- 
+
+\ **-C|-**\ **-compattr**\  \ *compattr_names*\
+
  where \ *compattr_names*\  is a comma-delimited list of kit component attribute names. The names correspond to attribute names in the \ **kitcomponent**\  table. The \ **lskit**\  command will only display the specified kit component attributes.
- 
 
 
-\ *kit_names*\ 
- 
+
+\ *kit_names*\
+
  is a comma-delimited list of kit names. The \ **lskit**\  command will only display the kits matching these names.
- 
 
 
-\ **-x|-**\ **-xml|-**\ **-XML**\ 
- 
+
+\ **-x|-**\ **-xml|-**\ **-XML**\
+
  Need XCATXMLTRACE=1 env when using -x|--xml|--XML, for example: XCATXMLTRACE=1  lskit -x testkit-1.0.0
  Return the output with XML tags.  The data is returned as:
- 
- 
+
+
  .. code-block:: perl
- 
+
     <data>
       <kitinfo>
          ...
@@ -95,58 +95,58 @@ OPTIONS
          ...
       </kitinfo>
     </data>
- 
- 
+
+
  Each <kitinfo> tag contains info for one kit.  The info inside <kitinfo> is structured as follows:
- 
- 
+
+
  .. code-block:: perl
- 
+
     The <kit> sub-tag contains the kit's basic info.
     The <kitrepo> sub-tags store info about the kit's repositories.
     The <kitcomponent> sub-tags store info about the kit's components.
- 
- 
+
+
  The data inside <kitinfo> is returned as:
- 
- 
+
+
  .. code-block:: perl
- 
+
     <kitinfo>
        <kit>
          ...
        </kit>
-  
+
        <kitrepo>
          ...
        </kitrepo>
        ...
-  
+
        <kitcomponent>
          ...
        </kitcomponent>
        ...
     </kitinfo>
- 
- 
 
 
-\ **-V|-**\ **-verbose**\ 
- 
+
+
+\ **-V|-**\ **-verbose**\
+
  Display additional progress and error messages.
- 
 
 
-\ **-v|-**\ **-version**\ 
- 
+
+\ **-v|-**\ **-version**\
+
  Command Version.
- 
 
 
-\ **-?|-h|-**\ **-help**\ 
- 
+
+\ **-?|-h|-**\ **-help**\
+
  Display usage message.
- 
+
 
 
 
@@ -172,64 +172,64 @@ EXAMPLES
 
 
 1. To list all kits, enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
     lskit
- 
- 
+
+
 
 
 2. To list the kit "kit-test1-1.0-Linux", enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
     lskit kit-test1-1.0-Linux
- 
- 
+
+
 
 
 3. To list the kit "kit-test1-1.0-Linux" for selected attributes, enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
     lskit -K basename,description -R kitreponame -C kitcompname kit-test1-1.0-Linux
- 
- 
+
+
 
 
 4. To list the framework value of a Kit tarfile.
- 
- 
+
+
  .. code-block:: perl
- 
+
     lskit -F /myhome/mykits/pperte-1.3.0.2-0-x86_64.tar.bz2
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
     Extracting the kit.conf file from /myhome/mykits/pperte-1.3.0.2-0-x86_64.tar.bz2. Please wait.
-    
+
           kitframework=2
           compatible_kitframeworks=0,1,2
- 
- 
+
+
 
 
 5. To list kit "testkit-1.0-1" with XML tags, enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
     XCATXMLTRACE=1 lskit -x testkit-1.0-1
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/lskitcomp.1.rst b/docs/source/guides/admin-guides/references/man1/lskitcomp.1.rst
index 895a065e1..615db005a 100644
--- a/docs/source/guides/admin-guides/references/man1/lskitcomp.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/lskitcomp.1.rst
@@ -44,38 +44,38 @@ OPTIONS
 
 
 
-\ **-C|-**\ **-compattr**\  \ *compattr_names*\ 
- 
+\ **-C|-**\ **-compattr**\  \ *compattr_names*\
+
  where \ *compattr_names*\  is a comma-delimited list of kit component attribute names. The names correspond to attribute names in the \ **kitcomponent**\  table.  The \ **lskitcomp**\  command will only display the specified kit component attributes.
- 
 
 
-\ **-O|-**\ **-osdistro**\  \ *os_distro*\ 
- 
+
+\ **-O|-**\ **-osdistro**\  \ *os_distro*\
+
  where \ *os_distro*\  is the name of an osdistro in \ **osdistro**\  table. The \ **lskitcomp**\  command will only display the kit components matching the specified osdistro.
- 
 
 
-\ **-S|-**\ **-serverrole**\  \ *server_role*\ 
- 
+
+\ **-S|-**\ **-serverrole**\  \ *server_role*\
+
  where \ *server_role*\  is the name of a server role. The typical server roles are: mgtnode, servicenode, computenode, loginnode, storagennode. The \ **lskitcomp**\  command will only display the kit components matching the specified server role.
- 
 
 
-\ *kitcomp_names*\ 
- 
+
+\ *kitcomp_names*\
+
  is a comma-delimited list of kit component names. The \ **lskitcomp**\  command will only display the kit components matching the specified names.
- 
 
 
-\ **-x|-**\ **-xml|-**\ **-XML**\ 
- 
+
+\ **-x|-**\ **-xml|-**\ **-XML**\
+
  Need XCATXMLTRACE=1 env when using -x|--xml|--XML.
  Return the output with XML tags.  The data is returned as:
- 
- 
+
+
  .. code-block:: perl
- 
+
     <data>
       <kitinfo>
          ...
@@ -87,52 +87,52 @@ OPTIONS
          ...
       </kitinfo>
     </data>
- 
- 
+
+
  Each <kitinfo> tag contains info for a group of kit components belonging to the same kit. The info inside <kitinfo> is structured as follows:
- 
- 
+
+
  .. code-block:: perl
- 
+
     The <kit> sub-tag contains the kit's name.
     The <kitcomponent> sub-tags store info about the kit's components.
- 
- 
+
+
  The data inside <kitinfo> is returned as:
- 
- 
+
+
  .. code-block:: perl
- 
+
     <kitinfo>
        <kit>
          ...
        </kit>
-  
+
        <kitcomponent>
          ...
        </kitcomponent>
        ...
     </kitinfo>
- 
- 
 
 
-\ **-V|-**\ **-verbose**\ 
- 
+
+
+\ **-V|-**\ **-verbose**\
+
  Display additional progress and error messages.
- 
 
 
-\ **-v|-**\ **-version**\ 
- 
+
+\ **-v|-**\ **-version**\
+
  Command Version.
- 
 
 
-\ **-?|-h|-**\ **-help**\ 
- 
+
+\ **-?|-h|-**\ **-help**\
+
  Display usage message.
- 
+
 
 
 
@@ -158,75 +158,75 @@ EXAMPLES
 
 
 1.
- 
+
  To list all kit components, enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
     lskitcomp
- 
- 
+
+
 
 
 2.
- 
+
  To list the kit component "comp-server-1.0-1-rhels-6-x86_64", enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
     lskitcomp comp-server-1.0-1-rhels-6-x86_64
- 
- 
+
+
 
 
 3.
- 
+
  To list the kit component "comp-server-1.0-1-rhels-6-x86_64" for selected kit component attributes, enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
     lskitcomp -C kitcompname,desc comp-server-1.0-1-rhels-6-x86_64
- 
- 
+
+
 
 
 4.
- 
+
  To list kit components compatible with "rhels-6.2-x86_64" osdistro, enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
     lskitcomp -O rhels-6.2-x86_64
- 
- 
+
+
 
 
 5.
- 
+
  To list kit components compatible with "rhels-6.2-x86_64" osdistro and "computenode" server role, enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
     lskitcomp -O rhels-6.2-x86_64 -S computenode
- 
- 
+
+
 
 
 6.
- 
+
  To list the kit component "testkit-compute-1.0-1-ubuntu-14.04-ppc64el" with XML tags, enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
     XCATXMLTRACE=1 lskitcomp -x testkit-compute-1.0-1-ubuntu-14.04-ppc64el
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/lskitdeployparam.1.rst b/docs/source/guides/admin-guides/references/man1/lskitdeployparam.1.rst
index 28cc34092..099688d2d 100644
--- a/docs/source/guides/admin-guides/references/man1/lskitdeployparam.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/lskitdeployparam.1.rst
@@ -44,25 +44,25 @@ OPTIONS
 
 
 
-\ **-k|-**\ **-kitname**\  \ *kit_names*\ 
- 
+\ **-k|-**\ **-kitname**\  \ *kit_names*\
+
  Where \ *kit_names*\  is a comma-delimited list of kit names. The \ **lskitdeployparam**\  command will only display the deployment parameters for the kits with the matching names.
- 
 
 
-\ **-c|-**\ **-compname**\  \ *comp_names*\ 
- 
+
+\ **-c|-**\ **-compname**\  \ *comp_names*\
+
  Where \ *comp_names*\  is a comma-delimited list of kit component names. The \ **lskitdeployparam**\  command will only display the deployment parameters for the kit components with the matching names.
- 
 
 
-\ **-x|-**\ **-xml|-**\ **-XML**\ 
- 
+
+\ **-x|-**\ **-xml|-**\ **-XML**\
+
  Return the output with XML tags.  The data is returned as:
- 
- 
+
+
  .. code-block:: perl
- 
+
     <data>
       <kitdeployparam>
         <name>KIT_KIT1_PARAM1</name>
@@ -76,26 +76,26 @@ OPTIONS
       </kitdeployparam>
     </data>
     ...
- 
- 
 
 
-\ **-V|-**\ **-verbose**\ 
- 
+
+
+\ **-V|-**\ **-verbose**\
+
  Display additional progress and error messages.
- 
 
 
-\ **-v|-**\ **-version**\ 
- 
+
+\ **-v|-**\ **-version**\
+
  Command Version.
- 
 
 
-\ **-?|-h|-**\ **-help**\ 
- 
+
+\ **-?|-h|-**\ **-help**\
+
  Display usage message.
- 
+
 
 
 
@@ -121,27 +121,27 @@ EXAMPLES
 
 
 1.
- 
+
  To list kit deployment parameters for kit "kit-test1-1.0-Linux", enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
     lskitdeployparam -k kit-test1-1.0-Linux
- 
- 
+
+
 
 
 2.
- 
+
  To list kit deployment parameters for kit component "comp-server-1.0-1-rhels-6-x86_64", enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
     lskitdeployparam -c comp-server-1.0-1-rhels-6-x86_64
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/lskmodules.1.rst b/docs/source/guides/admin-guides/references/man1/lskmodules.1.rst
index f2787f892..39042bd4e 100644
--- a/docs/source/guides/admin-guides/references/man1/lskmodules.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/lskmodules.1.rst
@@ -40,63 +40,63 @@ OPTIONS
 
 
 
-\ **-i|-**\ **-osimage**\  \ *osimage_names*\ 
- 
+\ **-i|-**\ **-osimage**\  \ *osimage_names*\
+
  where \ *osimage_names*\  is a comma-delimited list of xCAT database osimage object names.  For each \ *osimage_name*\ , lskmodules will use the entries in osimage.driverupdatesrc for the rpms and driver disk image files to search.
- 
 
 
-\ **-c|-**\ **-kitcomponent**\  \ *kitcomponent_names*\ 
- 
+
+\ **-c|-**\ **-kitcomponent**\  \ *kitcomponent_names*\
+
  where \ *kitcomponent_names*\  is a comma-delimited list of xCAT database kitcomponent object names.  For each \ *kitcomponent_name*\ , lskmodules will use the entries in kitcomponent.driverpacks for the rpm list and the repodir of the kitcomponent.kitreponame for the location of the rpm files to search.
- 
 
 
-\ **-o|-**\ **-osdistro**\  \ *osdistro_names*\ 
- 
+
+\ **-o|-**\ **-osdistro**\  \ *osdistro_names*\
+
  where \ *osdistro_names*\  is a comma-delimited list of xCAT database osdistro object names.  For each \ *osdistro_name*\ , lskmodules will search each <osdistro.dirpaths>/Packages/kernel-<kernelversion>.rpm file.
- 
 
 
-\ **-u|-**\ **-osdistroupdate**\  \ *osdistroupdate_names*\ 
- 
+
+\ **-u|-**\ **-osdistroupdate**\  \ *osdistroupdate_names*\
+
  where \ *osdistroupdate_names*\  is a comma-delimited list of xCAT database osdistroupdate table entries.  For each \ *osdistroupdate_name*\ , lskmodules will search the <osdistroupdate.dirpath>/kernel-<kernelversion>.rpm file.
- 
 
 
-\ **-x|-**\ **-xml|-**\ **-XML**\ 
- 
+
+\ **-x|-**\ **-xml|-**\ **-XML**\
+
  Return the output with XML tags.  The data is returned as:
- 
- 
+
+
  .. code-block:: perl
- 
+
     <module>
       <name> xxx.ko </name>
       <description> this is module xxx </description>
     </module>
- 
- 
+
+
  This option is intended for use by other programs.  The XML will not be displayed.  To view the returned XML, set the XCATSHOWXML=yes environment variable before running this command.
- 
 
 
-\ **-V|-**\ **-verbose**\ 
- 
+
+\ **-V|-**\ **-verbose**\
+
  Display additional progress and error messages.
- 
 
 
-\ **-v|-**\ **-version**\ 
- 
+
+\ **-v|-**\ **-version**\
+
  Command Version.
- 
 
 
-\ **-?|-h|-**\ **-help**\ 
- 
+
+\ **-?|-h|-**\ **-help**\
+
  Display usage message.
- 
+
 
 
 
@@ -122,15 +122,15 @@ EXAMPLES
 
 
 1.
- 
+
  To list the kernel modules included in the driverpacks shipped with kitcomponent kit1_comp1-x86_64, enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
     lskmodules -c kit1_comp1-x86_64
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/lslite.1.rst b/docs/source/guides/admin-guides/references/man1/lslite.1.rst
index fce8f56e9..ebff6f37b 100644
--- a/docs/source/guides/admin-guides/references/man1/lslite.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/lslite.1.rst
@@ -38,28 +38,28 @@ OPTIONS
 
 
 
-\ **-h|-**\ **-help**\ 
- 
+\ **-h|-**\ **-help**\
+
  Display usage message.
- 
 
 
-\ **-V|-**\ **-verbose**\ 
- 
+
+\ **-V|-**\ **-verbose**\
+
  Verbose mode.
- 
 
 
-\ **-i**\  \ *imagename*\ 
- 
+
+\ **-i**\  \ *imagename*\
+
  The name of an existing xCAT osimage definition.
- 
 
 
-\ *noderange*\ 
- 
+
+\ *noderange*\
+
  A set of comma delimited node names and/or group names. See the "noderange" man page for details on additional supported formats.
- 
+
 
 
 
@@ -80,61 +80,61 @@ EXAMPLES
 
 
 1.
- 
+
  To list the statelite information for an xCAT node named "node01".
- 
- 
+
+
  .. code-block:: perl
- 
+
    lslite node01
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    >>>Node: node01
-  
+
    Osimage: 61img
-  
+
    Persistent directory (statelite table):
           xcatmn1:/statelite
-  
+
    Litefiles (litefile table):
           tmpfs,rw      /etc/adjtime
           tmpfs,rw      /etc/lvm/.cache
           tmpfs,rw      /etc/mtab
           ........
-  
+
    Litetree path (litetree table):
           1,MN:/etc
           2,server1:/etc
- 
- 
+
+
 
 
 2.
- 
+
  To list the statelite information for an xCAT osimage named "osimage01".
- 
- 
+
+
  .. code-block:: perl
- 
+
    lslite -i osimage01
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
           tmpfs,rw      /etc/adjtime
           tmpfs,rw      /etc/lvm/.cache
           tmpfs,rw      /etc/mtab
           ........
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/lsslp.1.rst b/docs/source/guides/admin-guides/references/man1/lsslp.1.rst
index 3c83cb355..89add6b84 100644
--- a/docs/source/guides/admin-guides/references/man1/lsslp.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/lsslp.1.rst
@@ -19,9 +19,9 @@ SYNOPSIS
 ********
 
 
-\ **lsslp [-h| -**\ **-help]**\ 
+\ **lsslp [-h| -**\ **-help]**\
 
-\ **lsslp [-v| -**\ **-version]**\ 
+\ **lsslp [-v| -**\ **-version]**\
 
 \ **lsslp**\  [\ *noderange*\ ] [\ **-V**\ ] [\ **-i**\  \ *ip[,ip..]*\ ] \ **[-w] [-r|-x|-z] [-n] [-s CEC|FRAME|MM|IVM|RSA|HMC|CMM|IMM2|FSP]**\  [\ **-t**\  \ *tries*\ ] [\ **-I**\ ] [\ **-C**\  \ *counts*\ ] [\ **-T**\  \ *timeout*\ ] [\ **-**\ **-vpdtable**\ ]
 
@@ -176,7 +176,7 @@ Output is similar to:
          ip=192.168.200.125
          groups=hmc,all
          mgt=hmc
-         mac=00:1a:64:fb:7d:50        
+         mac=00:1a:64:fb:7d:50
          hidden=0
   192.168.200.244:
          objtype=node
@@ -251,7 +251,7 @@ Output is similar to:
      id=0
      mac=00:14:5E:F0:5C:FD
      otherinterfaces=50.0.0.5
- 
+
   bpa01:
      objtype=node
      nodetype=bpa
@@ -270,8 +270,8 @@ Output is similar to:
 
 .. code-block:: perl
 
-  lsslp -s CEC 
-  
+  lsslp -s CEC
+
   device  type-model  serial-number  side  ip-addresses  hostname
   FSP     9117-MMB    105EBEP        A-1   20.0.0.138    20.0.0.138
   FSP     9117-MMB    105EBEP        B-1   20.0.0.139    20.0.0.139
@@ -292,7 +292,7 @@ Output is similar to:
 .. code-block:: perl
 
   These nodes defined in database but can't be discovered: f17c00bpcb_b,f17c01bpcb_a,f17c01bpcb_b,f17c02bpcb_a,
- 
+
   device  type-model  serial-number  side  ip-addresses  hostname
   bpa     9458-100    BPCF017        A-0   40.17.0.1     f17c00bpca_a
   bpa     9458-100    BPCF017        B-0   40.17.0.2     f17c00bpcb_a
@@ -305,7 +305,7 @@ Output is similar to:
 
     lsslp CEC1-CEC3
  or lsslp CEC1,CEC2,CEC3
- 
+
    device  type-model  serial-number  side  ip-addresses     hostname
    FSP     9A01-100    0P1P336        A-0   192.168.200.34  192.168.200.34
    FSP     9A01-100    0P1P336        B-0   192.168.200.35  192.168.200.35
diff --git a/docs/source/guides/admin-guides/references/man1/lstree.1.rst b/docs/source/guides/admin-guides/references/man1/lstree.1.rst
index e6a4eeddf..677690c31 100644
--- a/docs/source/guides/admin-guides/references/man1/lstree.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/lstree.1.rst
@@ -38,34 +38,34 @@ OPTIONS
 
 
 
-\ **-h|-**\ **-help**\ 
- 
+\ **-h|-**\ **-help**\
+
  Display usage message.
- 
 
 
-\ **-s|-**\ **- servicenode**\ 
- 
+
+\ **-s|-**\ **- servicenode**\
+
  Show the tree of service node hierarchy.
- 
 
 
-\ **-H|-**\ **-hardwaremgmt**\ 
- 
+
+\ **-H|-**\ **-hardwaremgmt**\
+
  Show the tree of hardware hierarchy.
- 
 
 
-\ **-**\ **-v|-**\ **-virtualmachine**\ 
- 
+
+\ **-**\ **-v|-**\ **-virtualmachine**\
+
  Show the tree of VM hierarchy.
- 
 
 
-\ *noderange*\ 
- 
+
+\ *noderange*\
+
  A set of comma delimited node names and/or group names. See the "noderange" man page for details on additional supported formats.
- 
+
 
 
 
@@ -86,173 +86,173 @@ EXAMPLES
 
 
 1. To display the tree of service node hierarchy for all the nodes.
- 
- 
+
+
  .. code-block:: perl
- 
+
    lstree -s
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    Service Node: mysn01
    |__mycn01
    |__mycn02
    |__mycn03
-  
+
    Service Node: mysn02
    |__mycn11
    |__mycn12
    |__mycn13
    ......
- 
- 
+
+
 
 
 2.
- 
+
  To display the tree of service node hierarchy for service node "mysn01".
- 
- 
+
+
  .. code-block:: perl
- 
+
    lstree -s mysn01
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    Service Node: mysn01
    |__mycn01
    |__mycn02
    |__mycn03
- 
- 
+
+
 
 
 3.
- 
+
  To display the tree of hardware hierarchy for all the nodes.
- 
- 
+
+
  .. code-block:: perl
- 
+
    lstree -H
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    HMC: myhmc01
    |__Frame: myframe01
       |__CEC: mycec01
       |__CEC: mycec02
       ......
-  
+
    Service Focal Point: myhmc02
    |__Frame: myframe01
       |__CEC: mycec01
       |__CEC: mycec02
       |__CEC: mycec03
       ......
-  
+
    Management Module: mymm01
    |__Blade 1: js22n01
    |__Blade 2: js22n02
    |__Blade 3: js22n03
    ......
-  
+
    BMC: 192.168.0.1
    |__Server: x3650n01
- 
- 
+
+
 
 
 4. To display the tree of hardware hierarchy for HMC "myhmc01".
- 
- 
+
+
  .. code-block:: perl
- 
+
    lstree -H myhmc01
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    HMC: myhmc01
    |__Frame: myframe01
       |__CEC: mycec01
       |__CEC: mycec02
       ......
- 
- 
+
+
 
 
 5. To display the tree of VM hierarchy for all the nodes.
- 
- 
+
+
  .. code-block:: perl
- 
+
    lstree -v
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    Server: hs22n01
    |__ hs22vm1
-  
+
    Server: x3650n01
    |__ x3650n01kvm1
    |__ x3650n01kvm2
- 
- 
+
+
 
 
 6. To display the tree of VM hierarchy for the node "x3650n01".
- 
- 
+
+
  .. code-block:: perl
- 
+
    lstree -v x3650n01
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    Server: x3650n01
    |__ x3650n01kvm1
    |__ x3650n01kvm2
- 
- 
+
+
 
 
 7. To display both the hardware tree and VM tree for all nodes.
- 
- 
+
+
  .. code-block:: perl
- 
+
    lstree
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    HMC: myhmc01
    |__Frame: myframe01
       |__CEC: mycec01
@@ -265,7 +265,7 @@ EXAMPLES
          |__LPAR 2: node12
          |__LPAR 3: node13
          ......
-  
+
    Service Focal Point: myhmc02
    |__Frame: myframe01
       |__CEC: mycec01
@@ -279,7 +279,7 @@ EXAMPLES
          |__LPAR 2: node22
          |__LPAR 3: node23
          ......
-  
+
    Management Module: mymm01
    |__Blade 1: hs22n01
       |__hs22n01vm1
@@ -288,13 +288,13 @@ EXAMPLES
       |__hs22n02vm1
       |__hs22n02vm2
    ......
-  
+
    BMC: 192.168.0.1
    |__Server: x3650n01
       |__ x3650n01kvm1
       |__ x3650n01kvm2
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/lsve.1.rst b/docs/source/guides/admin-guides/references/man1/lsve.1.rst
index 59c351f2b..ab01f49fb 100644
--- a/docs/source/guides/admin-guides/references/man1/lsve.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/lsve.1.rst
@@ -27,16 +27,16 @@ DESCRIPTION
 ***********
 
 
-The \ **lsve**\  command can be used to list a virtual environment for 
+The \ **lsve**\  command can be used to list a virtual environment for
 'Data Center', 'Cluster', 'Storage Domain', 'Network' and 'Template' objects.
 
-The mandatory parameter \ **-m**\  \ *manager*\  is used to specify the address of the 
+The mandatory parameter \ **-m**\  \ *manager*\  is used to specify the address of the
 manager of virtual environment. xCAT needs it to access the RHEV manager.
 
-The mandatory parameter \ **-t**\  \ *type*\  is used to specify the type of the target 
+The mandatory parameter \ **-t**\  \ *type*\  is used to specify the type of the target
 object.
 
-Basically, \ **lsve**\  command supports three types of object: \ **dc**\ , \ **cl**\ , \ **sd**\ , \ **nw**\  
+Basically, \ **lsve**\  command supports three types of object: \ **dc**\ , \ **cl**\ , \ **sd**\ , \ **nw**\
 and \ **tpl**\ .
 
 The parameter \ **-o object**\  is used to specify which object to list. If no \ **-o**\  is specified,
@@ -54,9 +54,9 @@ OPTIONS
 
 
 \ **-m**\  Specify the manager of the virtual environment.
- 
+
  For RHEV, the FQDN (Fully Qualified Domain Name) of the rhev manager have to be specified.
- 
+
 
 
 \ **-o**\  The target object to display.
@@ -64,19 +64,19 @@ OPTIONS
 
 
 \ **-t**\  Specify the \ **type**\  of the target object.
- 
+
  Supported types:
- 
- 
+
+
  .. code-block:: perl
- 
+
    B<dc>  - Data Center (For type of 'dc', all the elements belongs to the data center will be listed.)
    B<cl>  - Cluster
    B<sd>  - Storage Domain (To get the status of Storage Doamin, show it from I<data center> it attached to.
    B<nw>  - Network
    B<tpl> - Template
- 
- 
+
+
 
 
 
@@ -97,18 +97,18 @@ EXAMPLES
 
 
 1. To list the data center 'Default', enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    lsve -t dc -m <FQDN of rhev manager> -o Default
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
     datacenters: [Default]
     description: The default Data Center
     state: up
@@ -148,44 +148,44 @@ EXAMPLES
         state: ok
         stateless: false
         type: desktop
- 
- 
+
+
 
 
 2. To list the cluster 'Default', enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    lsve -t cl -m <FQDN of rhev manager> -o Default
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
     cpu: Intel Westmere Family
     description: The default server cluster
     memory_hugepage: true
     memory_overcommit: 10
- 
- 
+
+
 
 
 3. To list the Storage Domain 'image', enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    lsve -t sd -m <FQDN of rhev manager> -o image
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
     storagedomains: [image]
       available: 55834574848
       committed: 13958643712
@@ -197,44 +197,44 @@ EXAMPLES
       storage_type: nfs
       type: data
       used: 9663676416
- 
- 
+
+
 
 
 4. To list the network 'rhevm', enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    lsve -t nw -m <FQDN of rhev manager> -o rhevm
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
     networks: [rhevm]
       description: Management Network
       state: operational
       stp: false
- 
- 
+
+
 
 
 5. To list the template 'tpl01', enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    lsve -t tpl -m <FQDN of rhev manager> -o tpl01
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
     templates: [tpl01]
       bootorder: network
       cpucore: 2
@@ -245,8 +245,8 @@ EXAMPLES
       state: ok
       stateless: false
       type: server
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/lsvlan.1.rst b/docs/source/guides/admin-guides/references/man1/lsvlan.1.rst
index 00a70be90..e9a797b8c 100644
--- a/docs/source/guides/admin-guides/references/man1/lsvlan.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/lsvlan.1.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **lsvlan**\ 
+\ **lsvlan**\
 
 \ **lsvlan**\  [\ *vlanid*\ ]
 
@@ -76,54 +76,54 @@ EXAMPLES
 
 
 1. To list all the vlans in the cluster
- 
- 
+
+
  .. code-block:: perl
- 
+
     lsvlan
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
     vlan 3:
         subnet 10.3.0.0
         netmask 255.255.0.0
-  
+
     vlan 4:
         subnet 10.4.0.0
         netmask 255.255.0.0
- 
- 
+
+
 
 
 2. To list the details for vlan3
- 
- 
+
+
  .. code-block:: perl
- 
+
     lsvlan 3
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
     vlan 3
         subnet 10.3.0.0
         netmask 255.255.0.0
-  
+
         hostname    ip address      node            vm host
         v3n1        10.3.0.1        c68m4hsp06
         v3n2        10.3.0.2        x3455n01
         v3n3        10.3.0.3        x3650n01
         v3n4        10.3.0.4        x3650n01kvm1    x3650n01
         v3n5        10.3.0.5        x3650n01kvm2    x3650n01
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/lsvm.1.rst b/docs/source/guides/admin-guides/references/man1/lsvm.1.rst
index ad48cc0af..4b7f5dd20 100644
--- a/docs/source/guides/admin-guides/references/man1/lsvm.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/lsvm.1.rst
@@ -19,35 +19,35 @@ SYNOPSIS
 ********
 
 
-\ **lsvm**\  [\ **-h**\ | \ **-**\ **-help]**\ 
+\ **lsvm**\  [\ **-h**\ | \ **-**\ **-help]**\
 
 \ **lsvm**\  [\ **-v**\ | \ **-**\ **-version**\ ]
 
-\ **lsvm**\  [\ **-V**\ | \ **-**\ **-verbose**\ ] \ *noderange*\ 
+\ **lsvm**\  [\ **-V**\ | \ **-**\ **-verbose**\ ] \ *noderange*\
 
-\ **lsvm**\  [\ **-a**\ | \ **-**\ **-all**\ ] \ *noderange*\ 
+\ **lsvm**\  [\ **-a**\ | \ **-**\ **-all**\ ] \ *noderange*\
 
 For PPC (using Direct FSP Management):
 ======================================
 
 
-\ **lsvm**\  [\ **-l**\ | \ **-**\ **-long**\ ] \ **-**\ **-p775**\  \ *noderange*\ 
+\ **lsvm**\  [\ **-l**\ | \ **-**\ **-long**\ ] \ **-**\ **-p775**\  \ *noderange*\
 
-\ **lsvm**\  \ *noderange*\ 
+\ **lsvm**\  \ *noderange*\
 
 
 For KVM and VMware
 ==================
 
 
-\ **lsvm**\  \ *noderange*\ 
+\ **lsvm**\  \ *noderange*\
 
 
 For zVM:
 ========
 
 
-\ **lsvm**\  \ *noderange*\ 
+\ **lsvm**\  \ *noderange*\
 
 
 
@@ -70,12 +70,12 @@ The pump mode value has the valid options:
   1 - Node Pump Mode
   2 - Chip Pump Mode
 
-The Memory Interleaving Mode has 3 valid options: 
+The Memory Interleaving Mode has 3 valid options:
   0 - not Applicable
   1 - interleaved
   2 - non-interleaved
 
-More information about this part, refer to the section Using the \*vm commands to define partitions in xCAT DFM  in the doc below. 
+More information about this part, refer to the section Using the \*vm commands to define partitions in xCAT DFM  in the doc below.
   XCAT_Power_775_Hardware_Management
 
 
@@ -101,27 +101,27 @@ OPTIONS
 *******
 
 
-\ **-h**\ 
+\ **-h**\
 
 Display usage message.
 
-\ **-v**\ 
+\ **-v**\
 
 Command version.
 
-\ **-V**\ 
+\ **-V**\
 
 Verbose output.
 
-\ **-a**\ 
+\ **-a**\
 
 List all the profiles for one partition
 
-\ **-**\ **-p775**\ 
+\ **-**\ **-p775**\
 
 Specify the operation is for Power 775 machines.
 
-\ **-l**\ 
+\ **-l**\
 
 Show lparnames for lpars. It shall work with option \ **-**\ **-p775**\ .
 
diff --git a/docs/source/guides/admin-guides/references/man1/lsxcatd.1.rst b/docs/source/guides/admin-guides/references/man1/lsxcatd.1.rst
index 86b95f19b..51a5ecb35 100644
--- a/docs/source/guides/admin-guides/references/man1/lsxcatd.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/lsxcatd.1.rst
@@ -36,34 +36,34 @@ OPTIONS
 
 
 
-\ **-v|-**\ **-version**\ 
- 
+\ **-v|-**\ **-version**\
+
  Command Version.
- 
 
 
-\ **-h|-**\ **-help**\ 
- 
+
+\ **-h|-**\ **-help**\
+
  Display usage message.
- 
 
 
-\ **-d|-**\ **-database**\ 
- 
+
+\ **-d|-**\ **-database**\
+
  Displays information about the current database being used by xCAT.
- 
 
 
-\ **-t|-**\ **-nodetype**\ 
- 
+
+\ **-t|-**\ **-nodetype**\
+
  Displays whether the node is a Management Node or a Service Node.
- 
 
 
-\ **-a|-**\ **-all**\ 
- 
+
+\ **-a|-**\ **-all**\
+
  Displays all information about the daemon supported by the command.
- 
+
 
 
 
@@ -84,44 +84,44 @@ EXAMPLES
 
 
 1.
- 
+
  To display information about the current database:
- 
- 
+
+
  .. code-block:: perl
- 
+
    lsxcatd -d
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
     cfgloc=Pg:dbname=xcatdb;host=7.777.47.250|xcatadm
     dbengine=Pg
     dbname=xcatdb
     dbhost=7.777.47.250
     dbadmin=xcatadm
- 
- 
+
+
 
 
 2.
- 
+
  To display all information:
- 
- 
+
+
  .. code-block:: perl
- 
+
    lsxcatd -a
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    Version 2.8.5 (git commit 0d4888af5a7a96ed521cb0e32e2c918a9d13d7cc, built Tue Jul 29 02:22:47 EDT 2014)
    This is a Management Node
    cfgloc=mysql:dbname=xcatdb;host=9.114.34.44|xcatadmin
@@ -129,8 +129,8 @@ EXAMPLES
    dbname=xcatdb
    dbhost=9.114.34.44
    dbadmin=xcatadmin
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/makentp.1.rst b/docs/source/guides/admin-guides/references/man1/makentp.1.rst
index 866d2e20f..3632e838a 100644
--- a/docs/source/guides/admin-guides/references/man1/makentp.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/makentp.1.rst
@@ -11,11 +11,11 @@ SYNOPSIS
 ********
 
 
-\ **makentp [-h|-**\ **-help]**\ 
+\ **makentp [-h|-**\ **-help]**\
 
-\ **makentp [-v|-**\ **-version]**\ 
+\ **makentp [-v|-**\ **-version]**\
 
-\ **makentp [-a|-**\ **-all] [-V|-**\ **-verbose]**\ 
+\ **makentp [-a|-**\ **-all] [-V|-**\ **-verbose]**\
 
 
 ***********
@@ -41,28 +41,28 @@ OPTIONS
 
 
 
-\ **-a|-**\ **-all**\ 
- 
+\ **-a|-**\ **-all**\
+
  Setup NTP servers for both management node and the service node. If management node has SLES installed and used as \ *ntpservers*\ , it is recommanded to use the \ **setupntp**\  postscript to set up NTP server for service nodes.
- 
 
 
-\ **-h|-**\ **-help**\ 
- 
+
+\ **-h|-**\ **-help**\
+
  Display usage message.
- 
 
 
-\ **-v|-**\ **-version**\ 
- 
+
+\ **-v|-**\ **-version**\
+
  Command Version.
- 
 
 
-\ **-V|-**\ **-verbose**\ 
- 
+
+\ **-V|-**\ **-verbose**\
+
  Verbose output.
- 
+
 
 
 
@@ -83,23 +83,23 @@ EXAMPLES
 
 
 1. To setup NTP server on the management node:
- 
- 
+
+
  .. code-block:: perl
- 
+
    makentp
- 
- 
+
+
 
 
 2. To setup NTP servers on both management node and the service node:
- 
- 
+
+
  .. code-block:: perl
- 
+
    makentp -a
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/mkdef.1.rst b/docs/source/guides/admin-guides/references/man1/mkdef.1.rst
index 066084735..ddc68d3e8 100644
--- a/docs/source/guides/admin-guides/references/man1/mkdef.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/mkdef.1.rst
@@ -38,89 +38,89 @@ OPTIONS
 
 
 
-\ *attr=val [attr=val ...]*\ 
- 
+\ *attr=val [attr=val ...]*\
+
  Specifies one or more "attribute equals value" pairs, separated by spaces. Attr=val pairs must be specified last on the command line. Use the help option to get a list of valid attributes for each object type.
- 
+
  Note: when creating node object definitions, the 'groups' attribute is required.
- 
 
 
-\ **-d|-**\ **-dynamic**\ 
- 
+
+\ **-d|-**\ **-dynamic**\
+
  Use the dynamic option to create dynamic node groups. This option must be used with -w option.
- 
 
 
-\ **-f|-**\ **-force**\ 
- 
+
+\ **-f|-**\ **-force**\
+
  Use the force option to re-create object definitions. This option removes the old definition before creating the new one.
- 
 
 
-\ **-h|-**\ **-help**\ 
- 
+
+\ **-h|-**\ **-help**\
+
  Display usage message.
- 
 
 
-\ *noderange*\ 
- 
+
+\ *noderange*\
+
  A set of comma delimited node names and/or group names. (must be the first parameter) See the "noderange" man page for details on supported formats.
- 
 
 
-\ **-o**\  \ *object-names*\ 
- 
+
+\ **-o**\  \ *object-names*\
+
  A set of comma delimited object names.
- 
 
 
-\ **-t**\  \ *object-types*\ 
- 
+
+\ **-t**\  \ *object-types*\
+
  A set of comma delimited object types.  Use the help option to get a list of valid object types.
- 
 
 
-\ **-**\ **-template**\  \ *template-object-name*\ 
- 
+
+\ **-**\ **-template**\  \ *template-object-name*\
+
  Name of the xCAT shipped object definition template or an existing object, from which the new object definition will be created. The newly created object will inherit the attributes of the template definition unless the attribute is specified in the arguments of \ **mkdef**\  command. If there are a template and an existing object with the same name \ *template-object-name*\ , the template object takes precedence over the existing object. For the details of xCAT shipped object definition templates, refer to the manpage of \ **-**\ **-template**\  option in lsdef(1)|lsdef.1.
- 
 
 
-\ **-V|-**\ **-verbose**\ 
- 
+
+\ **-V|-**\ **-verbose**\
+
  Verbose mode.
- 
+
 
 
 \ **-w**\  \ *attr==val*\  \ **-w**\  \ *attr=~val*\  ...
- 
+
  Use one or multiple -w flags to specify the selection string that can be used to select objects. The operators ==, !=, =~ and !~ are available. For mkdef command, the -w flag only makes sense for creating dynamic node group. Use the help option to get a list of valid attributes for each object type.
- 
+
  Operator descriptions:
          ==        Select nodes where the attribute value is exactly this value.
          !=        Select nodes where the attribute value is not this specific value.
          =~        Select nodes where the attribute value matches this regular expression.
          !~        Select nodes where the attribute value does not match this regular expression.
- 
+
  Note: if the "val" fields includes spaces or any other characters that will be parsed by shell, the "attr<operator>val" needs to be quoted. If the operator is "!~", the "attr<operator>val" needs to be quoted using single quote.
- 
 
 
-\ **-z|-**\ **-stanza**\ 
- 
+
+\ **-z|-**\ **-stanza**\
+
  Indicates that the file being piped to the command is in stanza format.  See the xcatstanzafile man page for details on using xCAT stanza files.
- 
 
 
-\ **-u**\ 
- 
+
+\ **-u**\
+
  Fill in the attributes such as template file, pkglist file and otherpkglist file of osimage object based on the specified parameters. It will search "/install/custom/" directory first, and then "/opt/xcat/share/".
  The \ *provmethod*\  and \ *profile*\  must be specified. If \ *osvers*\  or \ *osarch*\  is not specified, the corresponding value of the management node will be used.
- 
+
  Note: this option only works for objtype \ **osimage**\ .
- 
+
 
 
 
@@ -141,173 +141,173 @@ EXAMPLES
 
 
 1.
- 
+
  To create a site definition.
- 
- 
+
+
  .. code-block:: perl
- 
+
    mkdef -t site -o clustersite  installdir=/xcatinstall
- 
- 
+
+
 
 
 2.
- 
+
  To create a basic node definition.
- 
- 
+
+
  .. code-block:: perl
- 
+
    mkdef -t node -o node01 groups="all,aix"
- 
- 
+
+
 
 
 3.
- 
+
  To re-create the current definition of "node01".
- 
- 
+
+
  .. code-block:: perl
- 
+
    mkdef -f -t node -o node01  nodetype=osi groups="linux"
- 
- 
+
+
  (The group definitions are also created if they don't already exist.)
- 
+
 
 
 4.
- 
+
  To create a set of different types of definitions based on information contained in a stanza file.
- 
- 
+
+
  .. code-block:: perl
- 
+
    cat defstanzafile | mkdef -z
- 
- 
+
+
 
 
 5.
- 
+
  To create a group definition called LinuxNodes containing the nodes clstrn01 and clstrn02.
- 
- 
+
+
  .. code-block:: perl
- 
+
    mkdef -t group -o LinuxNodes members="clstrn01,clstrn02"
- 
- 
+
+
 
 
 6.
- 
+
  To create a node definition for an FSP node using the attributes provided by the group fspnodes.
- 
- 
+
+
  .. code-block:: perl
- 
+
    mkdef -t node fspn1 groups=fspnodes nodetype=fsp
- 
- 
+
+
 
 
 7.
- 
+
  To create node definitions for a set of node host names contained in the node range "node1,node2,node3"
- 
- 
+
+
  .. code-block:: perl
- 
+
    mkdef -t node node1,node2,node3 power=hmc groups="all,aix"
- 
- 
+
+
 
 
 8.
- 
+
  To create a dynamic node group definition called HMCMgtNodes containing all the HMC managed nodes"
- 
- 
+
+
  .. code-block:: perl
- 
+
    mkdef -t group -o HMCMgtNodes -d -w mgt==hmc -w cons==hmc
- 
- 
+
+
 
 
 9.
- 
+
  To create a dynamic node group definition called SLESNodes containing all the SLES nodes
- 
- 
+
+
  .. code-block:: perl
- 
+
    mkdef -t group -o SLESNodes -d -w "os=~^sles[0-9]+$"
- 
- 
+
+
 
 
 10.
- 
+
  To create a entry (7.0) in the policy table for user admin1
- 
- 
+
+
  .. code-block:: perl
- 
+
    mkdef -t policy -o 7.0 name=admin1 rule=allow
- 
- 
+
+
 
 
 11.
- 
+
  To create a node definition with nic attributes
- 
- 
+
+
  .. code-block:: perl
- 
+
    mkdef -t node cn1 groups=all nicips.eth0="1.1.1.1|1.2.1.1" nicnetworks.eth0="net1|net2" nictypes.eth0="Ethernet"
- 
- 
+
+
 
 
 12.
- 
+
  To create an osimage definition and fill in attributes automatically.
- 
- 
+
+
  .. code-block:: perl
- 
+
    mkdef redhat6img -u profile=compute provmethod=statelite
- 
- 
+
+
 
 
 13.
- 
+
  To create a PowerLE kvm node definition with the xCAT shipped template "ppc64lekvmguest-template".
- 
- 
+
+
  .. code-block:: perl
- 
+
    mkdef -t node cn1 --template ppc64lekvmguest-template ip=1.1.1.1 mac=42:3d:0a:05:27:0b vmhost=1.1.0.1 vmnics=br0
- 
- 
+
+
 
 
 14.
- 
+
  To create a node definition from an existing node definition "cn1"
- 
- 
+
+
  .. code-block:: perl
- 
+
    mkdef -t node cn2 --template cn1 ip=1.1.1.2 mac=42:3d:0a:05:27:0c
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/mkdocker.1.rst b/docs/source/guides/admin-guides/references/man1/mkdocker.1.rst
index f1e2d2e47..808b1eda9 100644
--- a/docs/source/guides/admin-guides/references/man1/mkdocker.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/mkdocker.1.rst
@@ -40,79 +40,79 @@ OPTIONS
 
 
 
-\ **image**\ 
- 
+\ **image**\
+
  The docker image name that the instance will use.
- 
 
 
-\ **command**\ 
- 
+
+\ **command**\
+
  The command that the instance will run based on the \ **image**\  specified. The \ **image**\  option must be specified in order to use this option.
- 
 
 
-\ **dockerflag**\ 
- 
+
+\ **dockerflag**\
+
  A JSON string which will be used as parameters to create a docker. Reference https://docs.docker.com/engine/reference/api/docker_remote_api_v1.22/ for more information about which parameters can be specified.
- 
+
  Some useful flags are:
- 
- 
- \ **AttachStdin**\ =\ **true | false**\ 
-  
+
+
+ \ **AttachStdin**\ =\ **true | false**\
+
   Whether attaches to stdin.
-  
- 
- 
- \ **AttachStdout**\ =\ **true | false**\ 
-  
+
+
+
+ \ **AttachStdout**\ =\ **true | false**\
+
   Whether attaches to stdout.
-  
- 
- 
- \ **AttachStderr**\ =\ **true | false**\ 
-  
+
+
+
+ \ **AttachStderr**\ =\ **true | false**\
+
   Whether attaches to stderr.
-  
- 
- 
- \ **OpenStdin**\ =\ **true | false**\ 
-  
+
+
+
+ \ **OpenStdin**\ =\ **true | false**\
+
   Whether opens stdin.
-  
- 
- 
- \ **Tty**\ =\ **true | false**\ 
-  
+
+
+
+ \ **Tty**\ =\ **true | false**\
+
   Attach standard streams to a tty, including stdin if it is not closed.
-  
- 
- 
- \ **ExposedPorts**\ 
-  
+
+
+
+ \ **ExposedPorts**\
+
   An object mapping ports to an empty object in the form of:
-  
-  
+
+
   .. code-block:: perl
-  
+
     "ExposedPorts": { "<port>/\<tcp|udp>: {}" }
-  
-  
- 
- 
- \ **HostConfig: {"Binds"}**\ 
-  
+
+
+
+
+ \ **HostConfig: {"Binds"}**\
+
   A list of volume bindings for this docker instance, the form will be:
-  
-  
+
+
   .. code-block:: perl
-  
+
     "HostConfig": {"Binds":["<dir_on_dockerhost>:<dir_in_instance>"]}
-  
-  
- 
- 
+
+
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/mkdsklsnode.1.rst b/docs/source/guides/admin-guides/references/man1/mkdsklsnode.1.rst
index 6968e6039..35eda685e 100644
--- a/docs/source/guides/admin-guides/references/man1/mkdsklsnode.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/mkdsklsnode.1.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **mkdsklsnode [-h|-**\ **-help ]**\ 
+\ **mkdsklsnode [-h|-**\ **-help ]**\
 
 \ **mkdsklsnode [-V|-**\ **-verbose] [-f|-**\ **-force] [-n|-**\ **-newname] [-i**\  \ *osimage_name*\ ] [\ **-l**\  \ *location*\ ] [\ **-u | -**\ **-updateSN**\ ] [\ **-k | -**\ **-skipsync**\ ] [\ **-p | -**\ **-primarySN**\ ] [\ **-b | -**\ **-backupSN**\ ] [\ **-S | -**\ **-setuphanfs**\ ] \ *noderange*\  [\ *attr=val [attr=val ...]*\ ]
 
@@ -37,7 +37,7 @@ This command will also create a NIM resolv_conf resource to be used when install
 
 The "domain" and "nameservers" attributes can be set in either the xCAT "network" definition used by the nodes or in the xCAT cluster "site" definition. The setting in the "network" definition will take priority.
 
-The "search" field of the resolv.conf file will contain a list all the domains 
+The "search" field of the resolv.conf file will contain a list all the domains
 listed in the xCAT network definitions and the xCAT site definition.
 
 The "nameservers" value can either be set to a specific IP address or the "<xcatmaster>" key word.  The "<xcatmaster>" key word means that the value of the "xcatmaster" attribute of the node definition will be used in the /etc/resolv.conf file.  (I.e.  The name of the install server as known by the node.)
@@ -70,46 +70,46 @@ OPTIONS
 
 
 
-\ *attr=val [attr=val ...]*\ 
- 
+\ *attr=val [attr=val ...]*\
+
  Specifies one or more "attribute equals value" pairs, separated by spaces. Attr=
  val pairs must be specified last on the command line. These are used to specify additional values that can be passed to the underlying NIM commands.
- 
+
  Valid values:
- 
- 
- \ **duplex**\ 
-  
+
+
+ \ **duplex**\
+
   Specifies the duplex setting (optional). Used when defining the NIM machine. Use this setting to configure the client's network interface. This value can be full or half. The default is full. (ex. "duplex=full")
-  
- 
- 
- \ **speed**\ 
-  
+
+
+
+ \ **speed**\
+
   Specifies the speed setting (optional). Used when defining the NIM machine. This is the communication speed to use when configuring the client's network interface. This value can be 10, 100, or 1000. The default is 100. (ex. "speed=100")
-  
- 
- 
- \ **psize**\ 
-  
+
+
+
+ \ **psize**\
+
   Specifies the size in Megabytes of the paging space for the diskless node.(optional) Used when initializing the NIM machine. The minimum and default size is 64 MB of paging space. (ex. "psize=256")
-  
- 
- 
- \ **sparse_paging**\ 
-  
+
+
+
+ \ **sparse_paging**\
+
   Specifies that the paging file should be created as an AIX sparse file, (ex. "sparse_paging=yes").  The default is "no".
-  
- 
- 
- \ **dump_iscsi_port**\ 
-  
+
+
+
+ \ **dump_iscsi_port**\
+
   The tcpip port number to use to communicate dump images from the client to the dump	resource server. Normally set by default. This port number is used by a dump resource server.
-  
- 
- 
- \ **configdump**\ 
-  
+
+
+
+ \ **configdump**\
+
   Specifies the type dump to be collected from the client.  The values are
   "selective", "full", and "none".  If the configdump attribute is set to "full"
   or "selective" the client will automatically be configured to dump to an iSCSI
@@ -118,81 +118,81 @@ OPTIONS
   and full memory dumps will be stored in subdirectory of the dump resource
   allocated to the client. This attribute is saved in the xCAT osimage
   definition.
-  
- 
- 
 
 
-\ **-b |-**\ **-backupSN**\ 
- 
+
+
+
+\ **-b |-**\ **-backupSN**\
+
  When using backup service nodes only update the backup.  The default is to update both the primary and backup service nodes.
- 
 
 
-\ **-f |-**\ **-force**\ 
- 
+
+\ **-f |-**\ **-force**\
+
  Use the force option to reinitialize the NIM machines.
- 
 
 
-\ **-h |-**\ **-help**\ 
- 
+
+\ **-h |-**\ **-help**\
+
  Display usage message.
- 
 
 
-\ **-i**\  \ *image_name*\ 
- 
+
+\ **-i**\  \ *image_name*\
+
  The name of an existing xCAT osimage definition. If this information is not provided on the command line the code checks the node definition for the value of the "provmethod" attribute. If the "-i" value is provided on the command line then that value will be used to set the "provmethod" attribute of the node definitions.
- 
 
 
-\ **-k|-**\ **-skipsync**\ 
- 
+
+\ **-k|-**\ **-skipsync**\
+
  Use this option to have the mkdsklsnode command skip the NIM sync_roots operation.  This option should only be used if you are certain that the shared_root resource does not have to be updated from the SPOT.  Normally, when the SPOT is updated, you should do a sync_roots on the shared_root resource.
- 
 
 
-\ **-l|-**\ **-location**\ 
- 
+
+\ **-l|-**\ **-location**\
+
  The directory location to use when creating new NIM resolv_conf resources. The default location is /install/nim.
- 
 
 
-\ **-n|-**\ **-newname**\ 
- 
+
+\ **-n|-**\ **-newname**\
+
  Create a new NIM machine object name for the xCAT node. Use the naming convention "<xcat_node_name>_<image_name>" for the new NIM machine definition.
- 
 
 
-\ **-p|-**\ **-primarySN**\ 
- 
+
+\ **-p|-**\ **-primarySN**\
+
  When using backup service nodes only update the primary.  The default is to update both the primary and backup service nodes.
- 
 
 
-\ **-S|-**\ **-setuphanfs**\ 
- 
+
+\ **-S|-**\ **-setuphanfs**\
+
  Setup NFSv4 replication between the primary service nodes and backup service nodes to provide high availability NFS for the compute nodes. This option only exports the /install directory with NFSv4 replication settings, the data synchronization between the primary service nodes and backup service nodes needs to be taken care of through some mechanism.
- 
 
 
-\ **-u|-**\ **-updateSN**\ 
- 
+
+\ **-u|-**\ **-updateSN**\
+
  Use this option if you wish to update the osimages but do not want to define or initialize the NIM client definitions. This option is only valid when the xCAT "site" definition attribute "sharedinstall" is set to either "sns" or "all".
- 
 
 
-\ *noderange*\ 
- 
+
+\ *noderange*\
+
  A set of comma delimited node names and/or group names. See the "noderange" man page for details on additional supported formats.
- 
 
 
-\ **-V |-**\ **-verbose**\ 
- 
+
+\ **-V |-**\ **-verbose**\
+
  Verbose mode.
- 
+
 
 
 
@@ -218,45 +218,45 @@ EXAMPLES
 
 
 1. Initialize an xCAT node named "node01" as an AIX diskless machine.  The xCAT osimage named "61spot" should be used to boot the node.
- 
- 
+
+
  .. code-block:: perl
- 
+
    mkdsklsnode -i 61spot node01
- 
- 
+
+
 
 
 2. Initialize all AIX diskless nodes contained in the xCAT node group called "aixnodes" using the image definitions pointed to by the "provmethod" attribute of the xCAT node definitions.
- 
- 
+
+
  .. code-block:: perl
- 
+
    mkdsklsnode aixnodes
- 
- 
+
+
 
 
 3. Initialize diskless node "clstrn29" using the xCAT osimage called "61dskls".  Also set the paging size to be 128M and specify the paging file be an AIX sparse file.
- 
- 
+
+
  .. code-block:: perl
- 
+
    mkdsklsnode -i 61dskls clstrn29 psize=128 sparse_paging=yes
- 
- 
+
+
 
 
 4.
- 
+
  Initialize an xCAT node called "node02" as an AIX diskless node.  Create a new NIM machine definition name with the osimage as an extension to the xCAT node name.
- 
- 
+
+
  .. code-block:: perl
- 
+
    mkdsklsnode -n -i 61spot node02
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/mkflexnode.1.rst b/docs/source/guides/admin-guides/references/man1/mkflexnode.1.rst
index 853e34221..159d42042 100644
--- a/docs/source/guides/admin-guides/references/man1/mkflexnode.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/mkflexnode.1.rst
@@ -23,7 +23,7 @@ SYNOPSIS
 
 \ **mkflexnode**\  [\ **-v**\  | \ **-**\ **-version**\ ]
 
-\ **mkflexnode**\  \ *noderange*\ 
+\ **mkflexnode**\  \ *noderange*\
 
 
 ***********
@@ -48,16 +48,16 @@ OPTIONS
 
 
 
-\ **-h | -**\ **-help**\ 
- 
+\ **-h | -**\ **-help**\
+
  Display the usage message.
- 
 
 
-\ **-v | -**\ **-version**\ 
- 
+
+\ **-v | -**\ **-version**\
+
  Display the version information.
- 
+
 
 
 
@@ -68,15 +68,15 @@ EXAMPLES
 
 
 1. Create a flexible node base on the xCAT node blade1.
- 
+
  The blade1 should belong to a complex, the \ *id*\  attribute should be set correctly and all the slots should be in \ **power off**\  state.
- 
- 
+
+
  .. code-block:: perl
- 
+
    mkflexnode blade1
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/mkhwconn.1.rst b/docs/source/guides/admin-guides/references/man1/mkhwconn.1.rst
index 87ece91f7..c8fe55adf 100644
--- a/docs/source/guides/admin-guides/references/man1/mkhwconn.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/mkhwconn.1.rst
@@ -77,53 +77,53 @@ OPTIONS
 
 
 
-\ **-h|-**\ **-help**\ 
- 
+\ **-h|-**\ **-help**\
+
  Display usage message.
- 
 
 
-\ **-t**\ 
- 
+
+\ **-t**\
+
  Read connection information from xCAT DB (ppc and ppcdirect tables).  Use this option if you need to connect multiple CECs/Frames
  to multiple HMCs in a single command.
- 
 
 
-\ **-p**\ 
- 
+
+\ **-p**\
+
  The HMC node name. Only one HMC nodes can be specified by this flag. To setup connection for multiple HMC nodes, use flag \ **-t**\ .
- 
 
 
-\ **-P**\ 
- 
+
+\ **-P**\
+
  The password of HMC based CEC/Frame login user(Default user name is 'HMC'). This flag is optional.
- 
 
 
-\ **-T**\ 
- 
+
+\ **-T**\
+
  The tooltype is used to communicate to the CEC/Frame. The value could be \ **lpar**\  or \ **fnm**\ . The tooltype value \ **lpar**\  is for xCAT and \ **fnm**\  is for CNM. The default value is "\ **lpar**\ ".
- 
 
 
-\ **-**\ **-port**\ 
- 
+
+\ **-**\ **-port**\
+
  The port value specifies which special side will be used to create the connection to the CEC/Frame. The value could only be specified as "\ **0**\ " or "\ **1**\ " and the default value is "\ **0,1**\ ". If the user wants to use all ports to create the connection, he should not specify this value. If the port value is specified as "\ **0**\ ", in the vpd table, the side column should be \ **A-0**\  and \ **B-0**\ ; If the port value is specified as "\ **1**\ ", the side column should be \ **A-1**\  and \ **B-1**\ . When making hardware connection between CEC/Frame and HMC, the value is used to specify the fsp/bpa port of the cec/frame and will be organized in order of "\ **A-0,A-1,B-0,B-1**\ ". If any side does not exist, the side would simply be ignored. Generally, only one port of a fsp/bap can be connected while another port be used as backup.
- 
 
 
-\ **-s**\ 
- 
+
+\ **-s**\
+
  The flag -s is used to make the connection between the frame and its Service Focal Point(HMC). -s flag is not supposed to work with other functional flags.
- 
 
 
-\ **-V|-**\ **-verbose**\ 
- 
+
+\ **-V|-**\ **-verbose**\
+
  Verbose output.
- 
+
 
 
 
@@ -144,63 +144,63 @@ EXAMPLES
 
 
 1.
- 
+
  To setup the connection for all CEC nodes in node group cec to HMC node, according to the definition in xCAT DB:
- 
- 
+
+
  .. code-block:: perl
- 
+
    mkhwconn cec -t
- 
- 
+
+
 
 
 2.
- 
+
  To setup the connection for Frame nodes in node group frame to HMC node hmc1, with password 'abc123':
- 
- 
+
+
  .. code-block:: perl
- 
+
    mkhwconn frame -p hmc1 -P abc123
- 
- 
+
+
 
 
 3.
- 
+
  To setup the connections for all CEC nodes in node group cec to hardware server, and the tooltype value is lpar:
- 
- 
+
+
  .. code-block:: perl
- 
+
    mkhwconn cec -t -T lpar
- 
- 
+
+
 
 
 4.
- 
+
  To setup the connections for all cecs nodes in node group cec to hardware server, and the tooltype value is lpar, and the port value is 1:
- 
- 
+
+
  .. code-block:: perl
- 
+
    mkhwconn cec -t -T lpar --port 1
- 
- 
+
+
 
 
 5.
- 
+
  To setup the connection between the frame and it's SFP node. This command will also set the connections between the CECs within this frame and their SFP node. User need to define HMC_name in the database in advance, but no need to set the sfp attribute for these node, xCAT will set the HMC_name as ppc.sfp for these nodes. The CECs within this frame should have the same sfp attribute as the frame.
- 
- 
+
+
  .. code-block:: perl
- 
+
    mkhwconn cec -s HMC_name -P HMC_passwd
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/mknimimage.1.rst b/docs/source/guides/admin-guides/references/man1/mknimimage.1.rst
index 1d2985946..5428ec80e 100644
--- a/docs/source/guides/admin-guides/references/man1/mknimimage.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/mknimimage.1.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **mknimimage [-h | -**\ **-help ]**\ 
+\ **mknimimage [-h | -**\ **-help ]**\
 
 \ **mknimimage [-V] -u**\  \ *osimage_name [attr=val [attr=val ...]*\ ]
 
@@ -39,13 +39,13 @@ The naming convention for the NIM SPOT resource definition is to use the same na
 
 When creating a mksysb image definition you must specify either the "-n" or the "-b" option. The "-n" option can be used to create a mksysb image from an existing NIM client machine.  The "-b" option can be used to specify an existing mksysb backup file.
 
-\ **Adding software and configuration files to the osimage.**\ 
+\ **Adding software and configuration files to the osimage.**\
 
 When creating a diskless osimage definition you also have the option of automatically updating the NIM SPOT resource.  You can have additional software installed or you can have configuration files added or updated.  To have software installed you must provide either the names of NIM installp_bundle resources or fileset names on the command line using the "attr=val" option. You may also supply the installp flags, RPM flags, emgr flags to use when installing the software.
 
 To have configuration files updated you must provide the full path name of a "synclists" file which contains the list of actual files to update.  The xCAT osimage definition that is created will contain the installp_bundle, otherpkgs, and synclists files that are provided on the command line.
 
-\ **Updating an existing xCAT osimage**\ 
+\ **Updating an existing xCAT osimage**\
 
 If you wish to update an existing diskless image after it has already been created you can use the "-u" (update) option.  In this case the xCAT osimage definition will not be updated.
 
@@ -57,7 +57,7 @@ Or, you could do a more ad hoc update by providing one or more of the "installp_
 
 WARNING: Installing random RPM packages in a SPOT may have unpredictable consequences.  The SPOT is a very restricted environment and some RPM packages may corrupt the SPOT or even hang your management system.  Try to be very careful about the packages you install. When installing RPMs, if the mknimimage command hangs or if there are file systems left mounted after the command completes you may need to reboot your management node to recover.  This is a limitation of the current AIX support for diskless systems
 
-\ **Copying an xCAT osimage.**\ 
+\ **Copying an xCAT osimage.**\
 
 You can use the "-i" and "-p" options to copy an existing diskless osimage.   To do this you must supply the name of an existing xCAT osimage definition and the name of the new osimage you wish to create. The \ **mknimimage**\  command will do the following:
 
@@ -71,7 +71,7 @@ You can use the "-i" and "-p" options to copy an existing diskless osimage.   To
 
 - if the "-p" option is specified then the original NIM lpp_source resource will be copied to a new location and redefined to NIM. (The default would be to use the original lpp_source - to save file system space.)
 
-\ **Additional information**\ 
+\ **Additional information**\
 
 IMPORTANT:  The NIM lpp_source and SPOT resources can get quite large. Always make sure that you have sufficient file system space available before running the \ **mknimimage**\  command.
 
@@ -94,265 +94,265 @@ OPTIONS
 
 
 
-\ *attr=val [attr=val ...]*\ 
- 
+\ *attr=val [attr=val ...]*\
+
  Specifies one or more "attribute equals value" pairs, separated by spaces. Attr=val pairs must be specified last on the command line.
- 
+
  Currently supported attributes:
- 
- 
- \ **bosinst_data**\ 
-  
+
+
+ \ **bosinst_data**\
+
   The name of a NIM bosinst_data resource.
-  
- 
- 
- \ **dump**\ 
-  
+
+
+
+ \ **dump**\
+
   The name of the NIM dump resource.
-  
- 
- 
- \ **fb_script**\ 
-  
+
+
+
+ \ **fb_script**\
+
   The name of a NIM fb_script resource.
-  
- 
- 
- \ **home**\ 
-  
+
+
+
+ \ **home**\
+
   The name of the NIM home resource.
-  
- 
- 
- \ **installp_bundle**\ 
-  
+
+
+
+ \ **installp_bundle**\
+
   One or more comma separated NIM installp_bundle resources.
-  
- 
- 
- \ **lpp_source**\ 
-  
+
+
+
+ \ **lpp_source**\
+
   The name of the NIM lpp_source resource.
-  
- 
- 
- \ **mksysb**\ 
-  
+
+
+
+ \ **mksysb**\
+
   The name of a NIM mksysb resource.
-  
- 
- 
- \ **otherpkgs**\ 
-  
+
+
+
+ \ **otherpkgs**\
+
   One or more comma separated installp, emgr, or rpm packages.  The packages must
   have prefixes of 'I:', 'E:', or 'R:', respectively. (ex. R:foo.rpm)
-  
- 
- 
- \ **paging**\ 
-  
+
+
+
+ \ **paging**\
+
   The name of the NIM paging resource.
-  
- 
- 
- \ **resolv_conf**\ 
-  
+
+
+
+ \ **resolv_conf**\
+
   The name of the NIM resolv_conf resource.
-  
- 
- 
- \ **root**\ 
-  
+
+
+
+ \ **root**\
+
   The name of the NIM root resource.
-  
- 
- 
- \ **script**\ 
-  
+
+
+
+ \ **script**\
+
   The name of a NIM script resource.
-  
- 
- 
- \ **shared_home**\ 
-  
+
+
+
+ \ **shared_home**\
+
   The name of the NIM shared_home resource.
-  
- 
- 
- \ **shared_root**\ 
-  
+
+
+
+ \ **shared_root**\
+
   A shared_root resource represents a directory that can be used as a / (root) directory by one or more diskless clients.
-  
- 
- 
- \ **spot**\ 
-  
+
+
+
+ \ **spot**\
+
   The name of the NIM SPOT resource.
-  
- 
- 
- \ **synclists**\ 
-  
+
+
+
+ \ **synclists**\
+
   The fully qualified name of a file containing a list of files to synchronize on the nodes.
-  
- 
- 
- \ **tmp**\ 
-  
+
+
+
+ \ **tmp**\
+
   The name of the NIM tmp resource.
-  
- 
- 
- \ **installp_flags**\ 
-  
+
+
+
+ \ **installp_flags**\
+
   The alternate flags to be passed along to the AIX installp command. (The default for installp_flags is "-abgQXY".)
-  
- 
- 
- \ **rpm_flags**\ 
-  
+
+
+
+ \ **rpm_flags**\
+
   The alternate flags to be passed along to the AIX rpm command. (The default for
-  rpm_flags is "-Uvh ".) The mknimimage command will check each rpm to see if 
+  rpm_flags is "-Uvh ".) The mknimimage command will check each rpm to see if
   it is installed.  It will not be reinstalled unless you specify the appropriate
   rpm option, such as '--replacepkgs'.
-  
- 
- 
- \ **emgr_flags**\ 
-  
+
+
+
+ \ **emgr_flags**\
+
   The alternate flags to be passed along to the AIX emgr command. (There is no default flags for the emgr command.)
-  
- 
- 
- \ **dumpsize**\ 
-  
+
+
+
+ \ **dumpsize**\
+
   The maximum size for a single dump image the dump resource will accept. Space is not allocated until a client starts to dump. The default size is 50GB. The dump resource should be large enough to hold the expected AIX dump and snap data.
-  
- 
- 
- \ **max_dumps**\ 
-  
+
+
+
+ \ **max_dumps**\
+
   The maximum number of archived dumps for an individual client. The default is one.
-  
- 
- 
- \ **snapcollect**\ 
-  
+
+
+
+ \ **snapcollect**\
+
   Indicates that after a dump is collected then snap data should be collected. The snap data will be collected in the clients dump resource directory.  Values are "yes" or "no". The default is "no".
-  
- 
- 
- \ **nfs_vers**\ 
-  
+
+
+
+ \ **nfs_vers**\
+
   Value Specifies the NFS protocol version required for NFS access.
-  
- 
- 
- \ **nfs_sec**\ 
-  
+
+
+
+ \ **nfs_sec**\
+
   Value Specifies the security method required for NFS access.
-  
- 
- 
+
+
+
  Note that you may specify multiple "script", "otherpkgs", and "installp_bundle" resources by using a comma separated list. (ex. "script=ascript,bscript"). RPM names may be included in the "otherpkgs" list by using a "R:" prefix(ex. "R:whatever.rpm"). epkg (AIX interim fix package) file names may be included in the "otherpkgs" using the 'E:' prefix. (ex. "otherpkgs=E:IZ38930TL0.120304.epkg.Z").
- 
 
 
-\ **-b**\  \ *mksysbfile*\ 
- 
+
+\ **-b**\  \ *mksysbfile*\
+
  Used to specify the path name of a mksysb file to use when defining a NIM mksysb resource.
- 
 
 
-\ **-c|-**\ **-completeosimage**\ 
- 
+
+\ **-c|-**\ **-completeosimage**\
+
  Complete the creation of the osimage definition passed in on the command line. This option will use any additional values passed in on the command line and/or it will attempt to create required resources in order to complete the definition of the xCAT osimage.  For example, if the osimage definition is missing a spot or shared_root resource the command will create those resources and add them to the osimage definition.
- 
 
 
-\ **-f|-**\ **-force**\ 
- 
+
+\ **-f|-**\ **-force**\
+
  Use the force option to re-create xCAT osimage definition. This option removes the old definition before creating the new one. It does not remove any of the NIM resource definitions named in the osimage definition.  Use the \ **rmnimimage**\  command to remove the NIM resources associated with an xCAT osimage definition.
- 
 
 
-\ **-h |-**\ **-help**\ 
- 
+
+\ **-h |-**\ **-help**\
+
  Display usage message.
- 
 
 
-\ *osimage_name*\ 
- 
+
+\ *osimage_name*\
+
  The name of the xCAT osimage definition.  This will be used as the name of the xCAT osimage definition as well as the name of the NIM SPOT resource.
- 
 
 
-\ **-D|-**\ **-mkdumpres**\ 
- 
+
+\ **-D|-**\ **-mkdumpres**\
+
  Create a diskless dump resource.
- 
 
 
-\ **-i**\  \ *current_image*\ 
- 
+
+\ **-i**\  \ *current_image*\
+
  The name of an existing xCAT osimage that should be copied to make a new xCAT osimage definition. Only valid when defining a "diskless" or "dataless" type image.
- 
 
 
-\ **-l**\  \ *location*\ 
- 
+
+\ **-l**\  \ *location*\
+
  The directory location to use when creating new NIM resources. The default location is /install/nim.
- 
 
 
-\ **-m**\  \ *nimmethod*\ 
- 
+
+\ **-m**\  \ *nimmethod*\
+
  Used to specify the NIM installation method to use. The possible values are "rte" and "mksysb". The default is "rte".
- 
 
 
-\ **-n**\  \ *mksysbnode*\ 
- 
+
+\ **-n**\  \ *mksysbnode*\
+
  The xCAT node to use to create a mksysb image.  The node must be a defined as a NIM client machine.
- 
 
 
-\ **-p|-**\ **-cplpp**\ 
- 
+
+\ **-p|-**\ **-cplpp**\
+
  Use this option when copying existing diskless osimages to indicate that you also wish to have the lpp_resource copied.  This option is only valid when using the "-i" option.
- 
 
 
-\ **-r|-**\ **-sharedroot**\ 
- 
+
+\ **-r|-**\ **-sharedroot**\
+
  Use this option to specify that a NIM "shared_root" resource be created for the AIX diskless nodes.  The default is to create a NIM "root" resource.  This feature is only available when using AIX version 6.1.4 or beyond. See the AIX/NIM documentation for a description of the "root" and "shared_root" resources.
- 
 
 
-\ **-s**\  \ *image_source*\ 
- 
+
+\ **-s**\  \ *image_source*\
+
  The source of software to use when creating the new NIM lpp_source resource. This could be a source directory or a previously defined NIM lpp_source resource name.
- 
 
 
-\ **-t nimtype**\ 
- 
+
+\ **-t nimtype**\
+
  Used to specify the NIM machine type. The possible values are "standalone", "diskless" or "dataless".  The default is "standalone".
- 
 
 
-\ **-u**\ 
- 
+
+\ **-u**\
+
  Used to update an AIX/NIM SPOT resource with additional software and configuration files.  This option is only valid for xCAT diskless osimage objects. The SPOT resource associated with the xCAT osimage definition will be updated. This option can also be used to update the nfs_vers attribute from NFSv3 to NFSv4 for the NIM resources associated with diskful or diskless image.
- 
 
 
-\ **-V |-**\ **-verbose**\ 
- 
+
+\ **-V |-**\ **-verbose**\
+
  Verbose mode.
- 
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/mkvlan.1.rst b/docs/source/guides/admin-guides/references/man1/mkvlan.1.rst
index e97321fbe..7bf761def 100644
--- a/docs/source/guides/admin-guides/references/man1/mkvlan.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/mkvlan.1.rst
@@ -147,65 +147,65 @@ The following is an example of the switches table
 
 
 1.
- 
+
  To make a private vlan for node1, node2 and node3
- 
- 
+
+
  .. code-block:: perl
- 
+
     mkvlan -n node1,node2,node3
- 
- 
+
+
  The vlan will be created on eth0 for the nodes.
- 
+
 
 
 2.
- 
+
  To make a private vlan for node1, node2 and node3 on eth1,
- 
- 
+
+
  .. code-block:: perl
- 
+
     mkvlan -n node1,node2,node3 -i eth1
- 
- 
+
+
 
 
 3.
- 
+
  To make a private vlan for node1, node2 with given subnet and netmask.
- 
- 
+
+
  .. code-block:: perl
- 
+
     mkvlan -n node1,node2,node3 -t 10.3.2.0 -m 255.255.255.0
- 
- 
+
+
 
 
 4.
- 
+
  To make a private vlan for KVM guests node1 and node2
- 
- 
+
+
  .. code-block:: perl
- 
+
     chtab key=usexhrm site.vlaue=1
-   
+
     mkdef node1 arch=x86_64 groups=kvm,all installnic=mac primarynic=mac mgt=kvm netboot=pxe nfsserver=10.1.0.204 os=rhels6 profile=compute provmethod=install serialport=0 serialspeed=115200 vmcpus=1 vmhost=x3650n01 vmmemory=512 vmnics=br0 vmstorage=nfs://10.1.0.203/vms
-  
+
     mkdef node2 arch=x86_64 groups=kvm,all installnic=mac primarynic=mac mgt=kvm netboot=pxe nfsserver=10.1.0.204 os=rhels6 profile=compute provmethod=install serialport=0 serialspeed=115200 vmcpus=1 vmhost=x3650n01 vmmemory=512 vmnics=br0 vmstorage=nfs://10.1.0.203/vms
-  
-    mkvlan -n node1,node2 
-  
+
+    mkvlan -n node1,node2
+
     mkvm node1,node2 -s 20G
-  
+
     rpower node1,node2 on
-  
+
     rinstall node1,node2
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/mkvm.1.rst b/docs/source/guides/admin-guides/references/man1/mkvm.1.rst
index effaaa109..862686779 100644
--- a/docs/source/guides/admin-guides/references/man1/mkvm.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/mkvm.1.rst
@@ -32,11 +32,11 @@ For PPC (with HMC) specific:
 ============================
 
 
-\ **mkvm**\  [\ **-V**\ | \ **-**\ **-verbose**\ ] \ *noderange*\  \ **-i**\  \ *id*\  \ **-l**\  \ *singlenode*\ 
+\ **mkvm**\  [\ **-V**\ | \ **-**\ **-verbose**\ ] \ *noderange*\  \ **-i**\  \ *id*\  \ **-l**\  \ *singlenode*\
 
-\ **mkvm**\  [\ **-V**\ | \ **-**\ **-verbose**\ ] \ *noderange*\  \ **-c**\  \ *destcec*\  \ **-p**\  \ *profile*\ 
+\ **mkvm**\  [\ **-V**\ | \ **-**\ **-verbose**\ ] \ *noderange*\  \ **-c**\  \ *destcec*\  \ **-p**\  \ *profile*\
 
-\ **mkvm**\  [\ **-V**\ | \ **-**\ **-verbose**\ ] \ *noderange*\  \ **-**\ **-full**\ 
+\ **mkvm**\  [\ **-V**\ | \ **-**\ **-verbose**\ ] \ *noderange*\  \ **-**\ **-full**\
 
 
 For PPC (using Direct FSP Management) specific:
@@ -122,84 +122,84 @@ OPTIONS
 
 
 
-\ **-h|-**\ **-help**\ 
- 
+\ **-h|-**\ **-help**\
+
  Display usage message.
- 
 
 
-\ **-c**\ 
- 
+
+\ **-c**\
+
  The cec (fsp) name for the destination.
- 
 
 
-\ **-**\ **-cpus**\ 
- 
+
+\ **-**\ **-cpus**\
+
  The cpu count which will be created for the kvm/vmware virtual machine.
- 
 
 
-\ **-**\ **-full**\ 
- 
+
+\ **-**\ **-full**\
+
  Request to create a new full system partition for each CEC.
- 
+
 
 
 \ **vmcpus=**\  \ *value*\  \ **vmmemory=**\  \ *value*\  \ **vmphyslots=**\  \ *value*\  \ **vmothersetting=**\  \ *value*\  \ **vmnics=**\  \ *value*\  \ **vmstorage=**\  \ *value*\  [\ **-**\ **-vios**\ ]
- 
+
  To specify the parameters which are used to create a partition. The \ *vmcpus*\ , \ *vmmemory*\  are necessary, and the value specified with this command have a more high priority. If the value of any of the three options is not specified, the corresponding value specified for the node object will be used. If any of the three attributes is neither specified with this command nor specified with the node object, error information will be returned. To reference to lsvm(1)|lsvm.1 for more information about 'drc_index' for \ *vmphyslots*\ .
- 
+
  The option \ *vios*\  is used to specify the partition that will be created is a VIOS partition. If specified, the value for \ *vmstorage*\  shall be number which indicate the number of vSCSI server adapter will be created, and if no value specified for \ *vmphyslots*\ , all the physical slot of the power machine will be asigned to VIOS partition. If not specified, it shall be in form of \ *vios_name:server_slotid*\  to specify the vios and the virtual slot id of the vSCSI server adapter that will be connected from the Logical partition.
- 
 
 
-\ **-f|-**\ **-force**\ 
- 
+
+\ **-f|-**\ **-force**\
+
  If the storage already exists, remove it before creating a new virtual machine.
- 
 
 
-\ **-i**\ 
- 
+
+\ **-i**\
+
  Starting numeric id of the newly created partitions.
- 
 
 
-\ **-l**\ 
- 
+
+\ **-l**\
+
  The partition name of the source.
- 
 
 
-\ **-**\ **-mem**\ 
- 
+
+\ **-**\ **-mem**\
+
  The memory size which will be used for the new created kvm/vmware virtual machine. Unit is Megabyte.
- 
 
 
-\ **-p**\ 
- 
+
+\ **-p**\
+
  The file that contains the profiles for the source partitions.
- 
 
 
-\ **-s|-**\ **-size**\ 
- 
+
+\ **-s|-**\ **-size**\
+
  The size of storage which will be created for the kvm/vmware virtual machine.
- 
 
 
-\ **-v|-**\ **-version**\ 
- 
+
+\ **-v|-**\ **-version**\
+
  Command Version.
- 
 
 
-\ **-V|-**\ **-verbose**\ 
- 
+
+\ **-V|-**\ **-verbose**\
+
  Verbose output.
- 
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/mkzone.1.rst b/docs/source/guides/admin-guides/references/man1/mkzone.1.rst
index 3e8b8f5f4..fa7ce76c9 100644
--- a/docs/source/guides/admin-guides/references/man1/mkzone.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/mkzone.1.rst
@@ -7,7 +7,7 @@ mkzone.1
 
 
 ************
-\ **NAME**\ 
+\ **NAME**\
 ************
 
 
@@ -15,7 +15,7 @@ mkzone.1
 
 
 ****************
-\ **SYNOPSIS**\ 
+\ **SYNOPSIS**\
 ****************
 
 
@@ -25,162 +25,162 @@ mkzone.1
 
 
 *******************
-\ **DESCRIPTION**\ 
+\ **DESCRIPTION**\
 *******************
 
 
 The \ **mkzone**\  command is designed to divide the xCAT cluster into multiple zones. The nodes in each zone will share common root ssh keys. This allows the nodes in a zone to be able to as root ssh to each other without password, but cannot do the same to any node in another zone. All zones share a common xCAT Management Node and database including the site table, which defines the attributes of the entire cluster.
 The mkzone command is only supported on Linux ( No AIX support).
-The nodes are not updated with the new root ssh keys by mkzone.  You must run updatenode -k  or xdsh -K to the nodes to update the root ssh keys to the new generated zone keys. This will also sync any service nodes with the zone keys, if you have a hierarchical cluster.   
+The nodes are not updated with the new root ssh keys by mkzone.  You must run updatenode -k  or xdsh -K to the nodes to update the root ssh keys to the new generated zone keys. This will also sync any service nodes with the zone keys, if you have a hierarchical cluster.
 Note: if any zones in the zone table, there must be one and only one defaultzone. Otherwise, errors will occur.
 
 
 ***************
-\ **OPTIONS**\ 
+\ **OPTIONS**\
 ***************
 
 
 
-\ **-h | -**\ **-help**\ 
- 
+\ **-h | -**\ **-help**\
+
  Displays usage information.
- 
 
 
-\ **-v | -**\ **-version**\ 
- 
+
+\ **-v | -**\ **-version**\
+
  Displays command version and build date.
- 
 
 
-\ **-k | -**\ **-sshkeypath**\  \ *full path to the ssh RSA private key*\ 
- 
+
+\ **-k | -**\ **-sshkeypath**\  \ *full path to the ssh RSA private key*\
+
  This is the path to the id_rsa key that will be used to build root's ssh keys for the zone. If -k is used, it will generate the ssh public key from the input ssh RSA private key and store both in /etc/xcat/sshkeys/<zonename>/.ssh directory.
  If -f is not used,  then it will generate a set of root ssh keys for the zone and store them in /etc/xcat/sshkeys/<zonename>/.ssh.
- 
 
 
-\ **-**\ **-default**\ 
- 
+
+\ **-**\ **-default**\
+
  if --defaultzone is input, then it will set the zone defaultzone attribute to yes; otherwise it will set to no.
  if --defaultzone is input and another zone is currently the default,
  then the -f flag must be used to force a change to the new defaultzone.
- If -f flag is not use an error will be returned and no change made. 
+ If -f flag is not use an error will be returned and no change made.
  Note: if any zones in the zone table, there must be one and only one defaultzone. Otherwise, errors will occur.
- 
 
 
-\ **-a | -**\ **-addnoderange**\  \ *noderange*\ 
- 
+
+\ **-a | -**\ **-addnoderange**\  \ *noderange*\
+
  For each node in the noderange, it will set the zonename attribute for that node to the input zonename.
  If the -g flag is also on the command, then
  it will add the group name "zonename" to each node in the noderange.
- 
 
 
-\ **-s| -**\ **-sshbetweennodes**\  \ **yes|no**\ 
- 
+
+\ **-s| -**\ **-sshbetweennodes**\  \ **yes|no**\
+
  If -s entered, the zone sshbetweennodes attribute will be set to yes or no. It defaults to yes. When this is set to yes, then ssh will be setup
  to allow passwordless root access between nodes.  If no, then root will be prompted for a password when running ssh between the nodes in the zone.
- 
 
 
-\ **-f | -**\ **-force**\ 
- 
+
+\ **-f | -**\ **-force**\
+
  Used with the (--defaultzone) flag to override the current default zone.
- 
 
 
-\ **-g | -**\ **-assigngroup**\ 
- 
+
+\ **-g | -**\ **-assigngroup**\
+
  Used with the (-a) flag to create the group zonename for all nodes in the input noderange.
- 
 
 
-\ **-V | -**\ **-Verbose**\ 
- 
+
+\ **-V | -**\ **-Verbose**\
+
  Verbose mode.
- 
+
 
 
 
 ****************
-\ **EXAMPLES**\ 
+\ **EXAMPLES**\
 ****************
 
 
 
 1. To make a new zone1 using defaults, enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    mkzone zone1
- 
- 
+
+
  Note: with the first \ **mkzone**\ , you will automatically get the xcatdefault zone created as the default zone.  This zone uses ssh keys from <roothome>/.ssh directory.
- 
+
 
 
 2. To make a new zone2 using defaults and make it the default zone enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    mkzone> zone2 --defaultzone -f
- 
- 
+
+
 
 
 3.
- 
+
  To make a new zone2A using the ssh id_rsa private key in /root/.ssh:
- 
- 
+
+
  .. code-block:: perl
- 
+
    mkzone zone2A -k /root/.ssh
- 
- 
+
+
 
 
 4.
- 
+
  To make a new zone3 and assign the noderange compute3 to the zone  enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    mkzone zone3 -a compute3
- 
- 
+
+
 
 
 5. To make a new zone4 and assign the noderange compute4 to the zone and add zone4 as a group to each node  enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    mkzone zone4 -a compute4 -g
- 
- 
+
+
 
 
 6.
- 
+
  To make a new zone5 and assign the noderange compute5 to the zone and add zone5 as a group to each node but not allow passwordless ssh between the nodes  enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    mkzone zone5 -a compute5 -g -s no
- 
- 
+
+
 
 
 
 *************
-\ **Files**\ 
+\ **Files**\
 *************
 
 
@@ -190,7 +190,7 @@ Location of the mkzone command.
 
 
 ****************
-\ **SEE ALSO**\ 
+\ **SEE ALSO**\
 ****************
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/monadd.1.rst b/docs/source/guides/admin-guides/references/man1/monadd.1.rst
index bb8f629e8..5e9f0f5cd 100644
--- a/docs/source/guides/admin-guides/references/man1/monadd.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/monadd.1.rst
@@ -19,11 +19,11 @@ SYNOPSIS
 ********
 
 
-\ **monadd  [-h| -**\ **-help]**\ 
+\ **monadd  [-h| -**\ **-help]**\
 
-\ **monadd  [-v| -**\ **-version]**\ 
+\ **monadd  [-v| -**\ **-version]**\
 
-\ **monadd  name [-n|-**\ **-nodestatmon] [-s|-**\ **-settings**\  \ *settings]*\ 
+\ **monadd  name [-n|-**\ **-nodestatmon] [-s|-**\ **-settings**\  \ *settings]*\
 
 
 ***********
@@ -50,28 +50,28 @@ OPTIONS
 
 
 
-\ **-h | -**\ **-help**\ 
- 
+\ **-h | -**\ **-help**\
+
  Display usage message.
- 
 
 
-\ **-n | -**\ **-nodestatmon**\ 
- 
+
+\ **-n | -**\ **-nodestatmon**\
+
  Indicate that this monitoring plug-in will be used for feeding the node liveness status to the xCAT \ *nodelist*\  table.
- 
 
 
-\ **-s | -**\ **-settings**\ 
- 
+
+\ **-s | -**\ **-settings**\
+
  Specifies the plug-in specific settings. These settings will be used by the plug-in to customize certain entities for the plug-in or the third party monitoring software. e.g. -s mon_interval=10 -s toggle=1.
- 
 
 
-\ **-v | -**\ **-version**\ 
- 
+
+\ **-v | -**\ **-version**\
+
  Command Version.
- 
+
 
 
 
@@ -92,52 +92,52 @@ EXAMPLES
 
 
 1.
- 
+
  To register gangliamon plug-in module (which interacts with Ganglia monitoring software) to monitor the xCAT cluster, enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
     monadd gangliamon
- 
- 
+
+
 
 
 2.
- 
+
  To register rmcmon plug-in module (which interacts with IBM's RSCT monitoring software) to monitor the xCAT cluster and have it feed the node liveness status to xCAT's \ *nodelist*\  table, enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
     monadd rmcmon -n
- 
- 
+
+
  This will also add the \ *configrmcnode*\  to the \ *postscripts*\  table. To view the content of the \ *postscripts*\  table, enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
     tabdump postscritps
     #node,postscripts,comments,disable
     "service","servicenode",,
     "xcatdefaults","syslog,remoteshell,configrmcnode",,
- 
- 
+
+
 
 
 3.
- 
+
  To register xcatmon plug-in module to feed the node liveness status to xCAT's \ *nodelist*\  table, enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
     monadd xcatmon -n -s ping-interval=2
- 
- 
+
+
  where 2 is the number of minutes between the pings.
- 
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/moncfg.1.rst b/docs/source/guides/admin-guides/references/man1/moncfg.1.rst
index a7ac99ccd..047d2aa6e 100644
--- a/docs/source/guides/admin-guides/references/man1/moncfg.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/moncfg.1.rst
@@ -19,11 +19,11 @@ SYNOPSIS
 ********
 
 
-\ **moncfg [-h| -**\ **-help]**\ 
+\ **moncfg [-h| -**\ **-help]**\
 
-\ **moncfg [-v| -**\ **-version]**\ 
+\ **moncfg [-v| -**\ **-version]**\
 
-\ **moncfg**\  \ *name*\  \ *[noderange]*\  \ **[-r|-**\ **-remote]**\ 
+\ **moncfg**\  \ *name*\  \ *[noderange]*\  \ **[-r|-**\ **-remote]**\
 
 
 ***********
diff --git a/docs/source/guides/admin-guides/references/man1/mondecfg.1.rst b/docs/source/guides/admin-guides/references/man1/mondecfg.1.rst
index eeb0dc747..c06c5b8a2 100644
--- a/docs/source/guides/admin-guides/references/man1/mondecfg.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/mondecfg.1.rst
@@ -19,11 +19,11 @@ SYNOPSIS
 ********
 
 
-\ **mondecfg [-h| -**\ **-help]**\ 
+\ **mondecfg [-h| -**\ **-help]**\
 
-\ **mondecfg [-v| -**\ **-version]**\ 
+\ **mondecfg [-v| -**\ **-version]**\
 
-\ **mondecfg**\  \ *name*\  \ *[noderange]*\  \ **[-r|-**\ **-remote]**\ 
+\ **mondecfg**\  \ *name*\  \ *[noderange]*\  \ **[-r|-**\ **-remote]**\
 
 
 ***********
diff --git a/docs/source/guides/admin-guides/references/man1/monls.1.rst b/docs/source/guides/admin-guides/references/man1/monls.1.rst
index f5241006d..15eda4174 100644
--- a/docs/source/guides/admin-guides/references/man1/monls.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/monls.1.rst
@@ -19,13 +19,13 @@ SYNOPSIS
 ********
 
 
-\ **monls [-h| -**\ **-help]**\ 
+\ **monls [-h| -**\ **-help]**\
 
-\ **monls  [-v| -**\ **-version]**\ 
+\ **monls  [-v| -**\ **-version]**\
 
-\ **monls**\  \ *name*\  \ **[-d|-**\ **-description]**\ 
+\ **monls**\  \ *name*\  \ **[-d|-**\ **-description]**\
 
-\ **monls [-a|-**\ **-all] [-d|-**\ **-description]**\ 
+\ **monls [-a|-**\ **-all] [-d|-**\ **-description]**\
 
 
 ***********
diff --git a/docs/source/guides/admin-guides/references/man1/monrm.1.rst b/docs/source/guides/admin-guides/references/man1/monrm.1.rst
index 27d4563b9..8d2edc16a 100644
--- a/docs/source/guides/admin-guides/references/man1/monrm.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/monrm.1.rst
@@ -19,11 +19,11 @@ SYNOPSIS
 ********
 
 
-\ **monrm [-h| -**\ **-help]**\ 
+\ **monrm [-h| -**\ **-help]**\
 
-\ **monrm [-v| -**\ **-version]**\ 
+\ **monrm [-v| -**\ **-version]**\
 
-\ **monrm**\  \ *name*\ 
+\ **monrm**\  \ *name*\
 
 
 ***********
diff --git a/docs/source/guides/admin-guides/references/man1/monshow.1.rst b/docs/source/guides/admin-guides/references/man1/monshow.1.rst
index 2c8ff130c..07b343994 100644
--- a/docs/source/guides/admin-guides/references/man1/monshow.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/monshow.1.rst
@@ -19,9 +19,9 @@ SYNOPSIS
 ********
 
 
-\ **monshow [-h| -**\ **-help]**\ 
+\ **monshow [-h| -**\ **-help]**\
 
-\ **monshow [-v| -**\ **-version]**\ 
+\ **monshow [-v| -**\ **-version]**\
 
 \ **monshow**\  \ *name*\  \ *[noderange]*\  [\ **-s**\ ] [\ **-t**\  \ *time*\ ] [\ **-a**\  \ *attributes*\ ] [\ **-w**\  \ *attr*\  < \ *operator*\  > \ *val*\  [\ **-w**\  \ *attr*\  < \ *operator*\  > \ *val*\ ] ... ][\ **-o {p|e}**\ ]
 
diff --git a/docs/source/guides/admin-guides/references/man1/monstart.1.rst b/docs/source/guides/admin-guides/references/man1/monstart.1.rst
index 1595b28b8..3c1c3a557 100644
--- a/docs/source/guides/admin-guides/references/man1/monstart.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/monstart.1.rst
@@ -19,9 +19,9 @@ SYNOPSIS
 ********
 
 
-\ **monstart [-h| -**\ **-help]**\ 
+\ **monstart [-h| -**\ **-help]**\
 
-\ **monstart [-v| -**\ **-version]**\ 
+\ **monstart [-v| -**\ **-version]**\
 
 \ **monstart**\  \ *name*\  \ *[noderange]*\  [\ **-r|-**\ **-remote**\ ]
 
diff --git a/docs/source/guides/admin-guides/references/man1/monstop.1.rst b/docs/source/guides/admin-guides/references/man1/monstop.1.rst
index 4a0502ba4..d776f408b 100644
--- a/docs/source/guides/admin-guides/references/man1/monstop.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/monstop.1.rst
@@ -19,9 +19,9 @@ SYNOPSIS
 ********
 
 
-\ **monstop [-h| -**\ **-help]**\ 
+\ **monstop [-h| -**\ **-help]**\
 
-\ **monstop [-v| -**\ **-version]**\ 
+\ **monstop [-v| -**\ **-version]**\
 
 \ **monstop**\  \ *name*\  [\ *noderange*\ ] [\ **-r|-**\ **-remote**\ ]
 
diff --git a/docs/source/guides/admin-guides/references/man1/mysqlsetup.1.rst b/docs/source/guides/admin-guides/references/man1/mysqlsetup.1.rst
index 8df8455b4..d604f9551 100644
--- a/docs/source/guides/admin-guides/references/man1/mysqlsetup.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/mysqlsetup.1.rst
@@ -39,7 +39,7 @@ DESCRIPTION
 
 \ **mysqlsetup**\  - Sets up the MySQL or MariaDB database (linux only for MariaDB) for xCAT to use. The mysqlsetup script is run on the Management Node as root after the MySQL code or MariaDB code has been installed. Before running the init option, the MySQL server should be stopped, if it is running.  The xCAT daemon, xcatd, must be running, do not stop it. No xCAT commands should be run during the init process, because we will be migrating the xCAT database to MySQL or MariaDB and restarting the xcatd daemon as well as the MySQL daemon. For full information on all the steps that will be done, read the "Configure MySQL and Migrate xCAT Data to MySQL" sections in
 
-\ **Setting_Up_MySQL_as_the_xCAT_DB**\ 
+\ **Setting_Up_MySQL_as_the_xCAT_DB**\
 
 Two passwords must be supplied for the setup,  a password for the xcatadmin id and a password for the root id in the MySQL database.  These will be prompted for interactively, unless the environment variables XCATMYSQLADMIN_PW and  XCATMYSQLROOT_PW are set to the passwords for the xcatadmin id and root id in the database,resp.
 
@@ -52,57 +52,57 @@ OPTIONS
 
 
 
-\ **-h|-**\ **-help**\ 
- 
+\ **-h|-**\ **-help**\
+
  Displays the usage message.
- 
 
 
-\ **-v|-**\ **-version**\ 
- 
+
+\ **-v|-**\ **-version**\
+
  Displays the release version of the code.
- 
 
 
-\ **-V|-**\ **-verbose**\ 
- 
+
+\ **-V|-**\ **-verbose**\
+
  Displays verbose messages.
- 
 
 
-\ **-i|-**\ **-init**\ 
- 
- The init option is used to setup a xCAT database on an installed MySQL or MariaDB server for xCAT to use. The mysqlsetup script will check for the installed MariaDB server rpm first and will use MariaDB if it is installed.   This involves creating the xcatdb database, the xcatadmin id, allowing access to the xcatdb database by the Management Node. It customizes the my.cnf configuration file for xcat and starts the MySQL server.  It also backs up the current xCAT database and restores it into the newly setup xcatdb MySQL database.  It creates the /etc/xcat/cfgloc file to point the xcatd daemon to the MySQL database and restarts the xcatd daemon using the database. 
+
+\ **-i|-**\ **-init**\
+
+ The init option is used to setup a xCAT database on an installed MySQL or MariaDB server for xCAT to use. The mysqlsetup script will check for the installed MariaDB server rpm first and will use MariaDB if it is installed.   This involves creating the xcatdb database, the xcatadmin id, allowing access to the xcatdb database by the Management Node. It customizes the my.cnf configuration file for xcat and starts the MySQL server.  It also backs up the current xCAT database and restores it into the newly setup xcatdb MySQL database.  It creates the /etc/xcat/cfgloc file to point the xcatd daemon to the MySQL database and restarts the xcatd daemon using the database.
  On AIX, it additionally setup the mysql id and group and corrects the permissions in the MySQL install directories. For AIX, you should be using the MySQL rpms available from the xCAT website. For Linux, you should use the MySQL or MariaDB rpms shipped with the OS. You can chose the -f and/or the -o option, to run after the init.
- 
 
 
-\ **-u|-**\ **-update**\ 
- 
+
+\ **-u|-**\ **-update**\
+
  To run the update option,  you must first have run the -i option and have xcat successfully running on the MySQL database. You can chose the -f and/or the -o option, to update.
- 
 
 
-\ **-f|-**\ **-hostfile**\ 
- 
+
+\ **-f|-**\ **-hostfile**\
+
  This option runs during update, it will take all the host from the input file (provide a full path) and give them database access to the xcatdb in  MySQL for the xcatadmin id. Wildcards and ipaddresses may be used. xCAT  must have been previously successfully setup to use MySQL. xcatadmin and MySQL root password are required.
- 
 
 
-\ **-o|-**\ **-odbc**\ 
- 
+
+\ **-o|-**\ **-odbc**\
+
  This option sets up the ODBC  /etc/../odbcinst.ini, /etc/../odbc.ini and the .odbc.ini file in roots home directory will be created and initialized to run off the xcatdb MySQL database.
  See "Add ODBC Support" in
  Setting_Up_MySQL_as_the_xCAT_DB
- 
 
 
-\ **-L|-**\ **-LL**\ 
- 
- Additional database configuration specifically for the LoadLeveler product. 
+
+\ **-L|-**\ **-LL**\
+
+ Additional database configuration specifically for the LoadLeveler product.
  See "Add ODBC Support" in
  Setting_Up_MySQL_as_the_xCAT_DB
- 
+
 
 
 
@@ -128,61 +128,61 @@ EXAMPLES
 
 
 1.
- 
+
  To setup MySQL for xCAT to run on the MySQL xcatdb database :
- 
- 
+
+
  .. code-block:: perl
- 
+
    mysqlsetup -i
- 
- 
+
+
 
 
 2.
- 
+
  Add hosts from /tmp/xcat/hostlist that can access the xcatdb database in MySQL:
- 
- 
+
+
  .. code-block:: perl
- 
+
    mysqlsetup -u -f /tmp/xcat/hostlist
- 
- 
+
+
  Where the file contains a host per line, for example:
- 
- 
+
+
  .. code-block:: perl
- 
+
            node1
            1.115.85.2
            10.%.%.%
            nodex.cluster.net
- 
- 
+
+
 
 
 3.
- 
+
  To setup the ODBC for MySQL xcatdb database access :
- 
- 
+
+
  .. code-block:: perl
- 
+
    mysqlsetup -o
- 
- 
+
+
 
 
 4.
- 
+
  To setup MySQL for xCAT and add hosts from /tmp/xcat/hostlist and setup the ODBC in Verbose mode:
- 
- 
+
+
  .. code-block:: perl
- 
+
    mysqlsetup -i -f /tmp/xcat/hostlist -o -V
- 
- 
+
+
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/nimnodecust.1.rst b/docs/source/guides/admin-guides/references/man1/nimnodecust.1.rst
index 1fd244764..0beb84a00 100644
--- a/docs/source/guides/admin-guides/references/man1/nimnodecust.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/nimnodecust.1.rst
@@ -19,9 +19,9 @@ SYNOPSIS
 ********
 
 
-\ **nimnodecust [-h|-**\ **-help ]**\ 
+\ **nimnodecust [-h|-**\ **-help ]**\
 
-\ **nimnodecust [-V] -s**\  \ *lpp_source_name*\  [\ **-p**\  \ *packages*\ ] [\ **-b**\  \ *installp_bundles*\ ] \ *noderange [attr=val [attr=val ...]]*\ 
+\ **nimnodecust [-V] -s**\  \ *lpp_source_name*\  [\ **-p**\  \ *packages*\ ] [\ **-b**\  \ *installp_bundles*\ ] \ *noderange [attr=val [attr=val ...]]*\
 
 
 ***********
@@ -43,7 +43,7 @@ A bundle file contains a list of package names.  The RPMs must have a prefix of
   # RPM
   R:expect-5.42.1-3.aix5.1.ppc.rpm
   R:ping-2.4b2_to-1.aix5.3.ppc.rpm
- 
+
   #installp
   I:openssh.base
   I:openssh.license
@@ -68,41 +68,41 @@ OPTIONS
 
 
 
-\ *attr=val [attr=val ...]*\ 
- 
+\ *attr=val [attr=val ...]*\
+
  Specifies one or more "attribute equals value" pairs, separated by spaces. Attr=val pairs must be specified last on the command line. These are used to specify
  additional values that can be passed to the underlying NIM commands, ("nim -o cust..."). See the NIM documentation for valid "nim" command line options.
- 
 
 
-\ **-b**\  \ *installp_bundle_names*\ 
- 
+
+\ **-b**\  \ *installp_bundle_names*\
+
  A comma separated list of NIM installp_bundle names.
- 
 
 
-\ **-h |-**\ **-help**\ 
- 
+
+\ **-h |-**\ **-help**\
+
  Display usage message.
- 
 
 
-\ **-p**\  \ *package_names*\ 
- 
+
+\ **-p**\  \ *package_names*\
+
  A comma-separated list of software packages to install.  Packages may be RPM or installp.
- 
 
 
-\ *noderange*\ 
- 
+
+\ *noderange*\
+
  A set of comma delimited node names and/or group names. See the "noderange" man page for details on additional supported formats.
- 
 
 
-\ **-V |-**\ **-verbose**\ 
- 
+
+\ **-V |-**\ **-verbose**\
+
  Verbose mode.
- 
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/nimnodeset.1.rst b/docs/source/guides/admin-guides/references/man1/nimnodeset.1.rst
index 5f3511342..2370ec466 100644
--- a/docs/source/guides/admin-guides/references/man1/nimnodeset.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/nimnodeset.1.rst
@@ -19,9 +19,9 @@ SYNOPSIS
 ********
 
 
-\ **nimnodeset [-h|-**\ **-help ]**\ 
+\ **nimnodeset [-h|-**\ **-help ]**\
 
-\ **nimnodeset [-V|-**\ **-verbose] [-f|-**\ **-force] [-i**\  \ *osimage_name*\ ] [\ **-l**\  \ *location*\ ] [\ **-p|-**\ **-primarySN**\ ] [\ **-b | -**\ **-backupSN**\ ] \ *noderange [attr=val [attr=val ...]]*\ 
+\ **nimnodeset [-V|-**\ **-verbose] [-f|-**\ **-force] [-i**\  \ *osimage_name*\ ] [\ **-l**\  \ *location*\ ] [\ **-p|-**\ **-primarySN**\ ] [\ **-b | -**\ **-backupSN**\ ] \ *noderange [attr=val [attr=val ...]]*\
 
 
 ***********
@@ -73,59 +73,59 @@ OPTIONS
 
 
 
-\ *attr=val [attr=val ...]*\ 
- 
+\ *attr=val [attr=val ...]*\
+
  Specifies one or more "attribute equals value" pairs, separated by spaces. Attr=
  val pairs must be specified last on the command line. These are used to specify additional values that can be passed to the underlying NIM commands, ("nim -o bos_inst ...").  See the NIM documentation for valid "nim" command line options. Note that you may specify multiple "script" and "installp_bundle" values by using a comma separated list. (ex. "script=ascript,bscript").
- 
 
 
-\ **-b|-**\ **-backupSN**\ 
- 
+
+\ **-b|-**\ **-backupSN**\
+
  When using backup service nodes only update the backup.  The default is to update both the primary and backup service nodes
- 
 
 
-\ **-f |-**\ **-force**\ 
- 
+
+\ **-f |-**\ **-force**\
+
  Use the force option to reinitialize the NIM machines.
- 
 
 
-\ **-h |-**\ **-help**\ 
- 
+
+\ **-h |-**\ **-help**\
+
  Display usage message.
- 
 
 
-\ **-i**\  \ *image_name*\ 
- 
+
+\ **-i**\  \ *image_name*\
+
  The name of an existing xCAT osimage definition.
- 
 
 
-\ **-l|-**\ **-location**\ 
- 
+
+\ **-l|-**\ **-location**\
+
  The directory location to use when creating new NIM resolv_conf resources. The default location is /install/nim.
- 
 
 
-\ **-p|-**\ **-primarySN**\ 
- 
+
+\ **-p|-**\ **-primarySN**\
+
  When using backup service nodes only update the primary.  The default is to update both the primary and backup service nodes.
- 
 
 
-\ *noderange*\ 
- 
+
+\ *noderange*\
+
  A set of comma delimited node names and/or group names. See the "noderange" man page for details on additional supported formats.
- 
 
 
-\ **-V |-**\ **-verbose**\ 
- 
+
+\ **-V |-**\ **-verbose**\
+
  Verbose mode.
- 
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/nodeaddunmged.1.rst b/docs/source/guides/admin-guides/references/man1/nodeaddunmged.1.rst
index 2ce52c742..0578103ef 100644
--- a/docs/source/guides/admin-guides/references/man1/nodeaddunmged.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/nodeaddunmged.1.rst
@@ -21,7 +21,7 @@ SYNOPSIS
 
 \ **nodeaddunmged**\  [\ **-h**\ | \ **-**\ **-help**\  | \ **-v**\  | \ **-**\ **-version**\ ]
 
-\ **nodeaddunmged hostname=**\ \ *node-name*\  \ **ip=**\ \ *ip-address*\ 
+\ **nodeaddunmged hostname=**\ \ *node-name*\  \ **ip=**\ \ *ip-address*\
 
 
 ***********
@@ -37,19 +37,19 @@ OPTIONS
 *******
 
 
-\ **-h|-**\ **-help**\ 
+\ **-h|-**\ **-help**\
 
 Display usage message.
 
-\ **-v|-**\ **-version**\ 
+\ **-v|-**\ **-version**\
 
 Command Version.
 
-\ **hostname=**\ \ *node-name*\ 
+\ **hostname=**\ \ *node-name*\
 
 Sets the name of the new unmanaged node, where <node-name> is the name of the node.
 
-\ **ip=**\ \ *ip-address*\ 
+\ **ip=**\ \ *ip-address*\
 
 Sets the IP address of the unmanaged node, where \ *ip-address*\  is the IP address of the new node in the form xxx.xxx.xxx.xxx
 
diff --git a/docs/source/guides/admin-guides/references/man1/nodech.1.rst b/docs/source/guides/admin-guides/references/man1/nodech.1.rst
index c336df750..5d4c89f86 100644
--- a/docs/source/guides/admin-guides/references/man1/nodech.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/nodech.1.rst
@@ -40,7 +40,7 @@ there.  If "^=" is used, the specified value will be removed from the attribute'
 if it is there.  You can also use "^=" and ",=" in the same command to essentially replace one item
 in the list with another.  (See the Examples section.)
 
-Additionally, as in nodels, boolean expressions can be used to further limit the scope of nodech from 
+Additionally, as in nodels, boolean expressions can be used to further limit the scope of nodech from
 the given noderange.  The operators supported are the same as nodels (=~, !~, ==, and !=).
 
 With these operators in mind, the unambiguous assignment operator is '=@'.  If you need, for example, to set
@@ -58,22 +58,22 @@ OPTIONS
 
 
 
-\ **-d|-**\ **-delete**\ 
- 
+\ **-d|-**\ **-delete**\
+
  Delete the nodes' row in the specified tables.
- 
 
 
-\ **-v|-**\ **-version**\ 
- 
+
+\ **-v|-**\ **-version**\
+
  Command Version.
- 
 
 
-\ **-?|-h|-**\ **-help**\ 
- 
+
+\ **-?|-h|-**\ **-help**\
+
  Display usage message.
- 
+
 
 
 
@@ -99,53 +99,53 @@ EXAMPLES
 
 
 1. To update nodes in noderange  node1-node4 to be in only group all:
- 
- 
+
+
  .. code-block:: perl
- 
+
    nodech node1-node4 groups=all
- 
- 
+
+
 
 
 2. To put all nodes with nodepos.rack value of 2 into a group called rack2:
- 
- 
+
+
  .. code-block:: perl
- 
+
    nodech all nodepos.rack==2 groups,=rack2
- 
- 
+
+
 
 
 3. To add nodes in noderange  node1-node4 to the nodetype table with os=rhel5:
- 
- 
+
+
  .. code-block:: perl
- 
+
    nodech node1-node4 groups=all,rhel5 nodetype.os=rhel5
- 
- 
+
+
 
 
 4. To add node1-node4 to group1 in addition to the groups they are already in:
- 
- 
+
+
  .. code-block:: perl
- 
+
    nodech node1-node4 groups,=group1
- 
- 
+
+
 
 
 5. To put node1-node4 in group2, instead of group1:
- 
- 
+
+
  .. code-block:: perl
- 
+
    nodech node1-node4 groups^=group1 groups,=group2
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/nodechmac.1.rst b/docs/source/guides/admin-guides/references/man1/nodechmac.1.rst
index 84a1dce0c..18a44c46e 100644
--- a/docs/source/guides/admin-guides/references/man1/nodechmac.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/nodechmac.1.rst
@@ -21,7 +21,7 @@ SYNOPSIS
 
 \ **nodechmac**\  [\ **-h**\  | \ **-**\ **-help**\  | \ **-v**\  | \ **-**\ **-version**\ ]
 
-\ **nodechmac**\  \ *node-name*\  \ **mac=**\ \ *mac-address*\ 
+\ **nodechmac**\  \ *node-name*\  \ **mac=**\ \ *mac-address*\
 
 
 ***********
@@ -39,19 +39,19 @@ OPTIONS
 *******
 
 
-\ **-h|-**\ **-help**\ 
+\ **-h|-**\ **-help**\
 
 Display usage message.
 
-\ **-v|-**\ **-version**\ 
+\ **-v|-**\ **-version**\
 
 Command Version.
 
-\ *node-name*\ 
+\ *node-name*\
 
 Specifies the name of the node you want to update, where <node-name> is the node that is updated.
 
-\ **mac=**\ \ *mac-address*\ 
+\ **mac=**\ \ *mac-address*\
 
 Sets the new MAC address for the NIC used by the provisioning node, where <mac-address> is the NICs new MAC address.
 
diff --git a/docs/source/guides/admin-guides/references/man1/nodechprofile.1.rst b/docs/source/guides/admin-guides/references/man1/nodechprofile.1.rst
index be6b5300e..77bff5084 100644
--- a/docs/source/guides/admin-guides/references/man1/nodechprofile.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/nodechprofile.1.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **nodechprofile**\  \ **[-h| -**\ **-help | -v | -**\ **-version]**\ 
+\ **nodechprofile**\  \ **[-h| -**\ **-help | -v | -**\ **-version]**\
 
 \ **nodechprofile**\  \ *noderange*\  [\ **imageprofile=**\  \ *image-profile*\ ] [\ **networkprofile=**\  \ *network-profile*\ ] [\ **hardwareprofile=**\  \ *hardware-profile*\ ]
 
@@ -47,27 +47,27 @@ OPTIONS
 *******
 
 
-\ **-h|-**\ **-help**\ 
+\ **-h|-**\ **-help**\
 
 Display usage message.
 
-\ **-v|-**\ **-version**\ 
+\ **-v|-**\ **-version**\
 
 Command Version.
 
-\ *noderange*\ 
+\ *noderange*\
 
 The nodes to be removed.
 
-\ **imageprofile=**\  \ *image-profile*\ 
+\ **imageprofile=**\  \ *image-profile*\
 
 Sets the new image profile name used by the node, where <image-profile> is the new image profile.  An image profile defines the provisioning method, OS information, kit information, and provisioning parameters for a node. If the "__ImageProfile_imgprofile" group already exists in the nodehm table, then "imgprofile" is used as the image profile name.
 
-\ **networkprofile=**\  \ *network-profile*\ 
+\ **networkprofile=**\  \ *network-profile*\
 
 Sets the new network profile name used by the node, where <network-profile> is the new network profile. A network profile defines the network, NIC, and routes for a node. If the "__NetworkProfile_netprofile" group already exists in the nodehm table, then "netprofile" is used as the network profile name.
 
-\ **hardwareprofile=**\  \ *hardware-profile*\ 
+\ **hardwareprofile=**\  \ *hardware-profile*\
 
 Sets the new hardware profile name used by the node, where <hardware-profile> is the new hardware management profile used by the node. If a "__HardwareProfile_hwprofile" group exists, then "hwprofile" is the hardware profile name. A hardware profile defines hardware management related information for imported nodes, including: IPMI, HMC, CEC, CMM.
 
@@ -89,23 +89,23 @@ EXAMPLES
 
 
 1. To change the image profile to rhels6.3_packaged for compute nodes compute-000 and compute-001, use the following command:
- 
- 
+
+
  .. code-block:: perl
- 
+
    nodechprofile compute-000,compute-001 imageprofile=rhels6.3_packaged
- 
- 
+
+
 
 
 2. To change all of the profiles for compute node compute-000, enter the following command:
- 
- 
+
+
  .. code-block:: perl
- 
+
    nodechprofile compute-000 imageprofile=rhels6.3_packaged networkprofile=default_cn hardwareprofile=default_ipmi
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/nodediscoverdef.1.rst b/docs/source/guides/admin-guides/references/man1/nodediscoverdef.1.rst
index e1d145eea..da7d60081 100644
--- a/docs/source/guides/admin-guides/references/man1/nodediscoverdef.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/nodediscoverdef.1.rst
@@ -11,8 +11,8 @@ NAME
 ****
 
 
-\ **nodediscoverdef**\  - Define the undefined discovery request to a predefined xCAT node, 
-or clean up the discovery entries from the discoverydata table 
+\ **nodediscoverdef**\  - Define the undefined discovery request to a predefined xCAT node,
+or clean up the discovery entries from the discoverydata table
 (which can be displayed by nodediscoverls command)
 
 
@@ -21,9 +21,9 @@ SYNOPSIS
 ********
 
 
-\ **nodediscoverdef**\  \ **-u**\  \ *uuid*\  \ **-n**\  \ *node*\ 
+\ **nodediscoverdef**\  \ **-u**\  \ *uuid*\  \ **-n**\  \ *node*\
 
-\ **nodediscoverdef**\  \ **-r**\  \ **-u**\  \ *uuid*\ 
+\ **nodediscoverdef**\  \ **-r**\  \ **-u**\  \ *uuid*\
 
 \ **nodediscoverdef**\  \ **-r**\  \ **-t**\  {\ **seq | profile | switch | blade | manual | undef | all**\ }
 
@@ -40,7 +40,7 @@ xCAT node. The discovery entry can be displayed by \ **nodediscoverls**\  comman
 
 The options \ **-u**\  and \ **-n**\  have to be used together to define a discovery request to a node.
 
-The \ **nodediscoverdef**\  command also can be used to clean up the discovery entries from the 
+The \ **nodediscoverdef**\  command also can be used to clean up the discovery entries from the
 discoverydata table.
 
 The option \ **-r**\  is used to remove discovery entries. If working with \ **-u**\ , the specific entry
@@ -56,69 +56,69 @@ OPTIONS
 
 
 
-\ **-t seq|profile|switch|blade|manual|undef|all**\ 
- 
+\ **-t seq|profile|switch|blade|manual|undef|all**\
+
  Specify the nodes that have been discovered by the specified discovery method:
- 
- 
+
+
  \* \ **seq**\  - Sequential discovery (started via nodediscoverstart noderange=<noderange> ...).
- 
- 
- 
+
+
+
  \* \ **profile**\  - Profile discovery (started via nodediscoverstart networkprofile=<network-profile> ...).
- 
- 
- 
+
+
+
  \* \ **switch**\  - Switch-based discovery (used when the switch and switches tables are filled in).
- 
- 
- 
+
+
+
  \* \ **blade**\  - Blade discovery (used for IBM Flex blades).
- 
- 
- 
+
+
+
  \* \ **manual**\  - Manually discovery (used when defining node by nodediscoverdef command).
- 
- 
- 
+
+
+
  \* \ **undef**\  - Display the nodes that were in the discovery pool, but for which xCAT has not yet received a discovery request.
- 
- 
- 
+
+
+
  \* \ **all**\  - All discovered nodes.
- 
- 
- 
 
 
-\ **-n**\  \ *node*\ 
- 
+
+
+
+\ **-n**\  \ *node*\
+
  The xCAT node that the discovery entry will be defined to.
- 
 
 
-\ **-r**\ 
- 
+
+\ **-r**\
+
  Remove the discovery entries from discoverydata table.
- 
 
 
-\ **-u**\  \ *uuid*\ 
- 
+
+\ **-u**\  \ *uuid*\
+
  The uuid of the discovered entry.
- 
 
 
-\ **-h|-**\ **-help**\ 
- 
+
+\ **-h|-**\ **-help**\
+
  Display usage message.
- 
 
 
-\ **-v|-**\ **-version**\ 
- 
+
+\ **-v|-**\ **-version**\
+
  Command version.
- 
+
 
 
 
@@ -139,57 +139,57 @@ EXAMPLES
 
 
 1. Define the discovery entry which uuid is 51E5F2D7-0D59-11E2-A7BC-3440B5BEDBB4 to node node1
- 
- 
+
+
  .. code-block:: perl
- 
+
    nodediscoverdef -u 51E5F2D7-0D59-11E2-A7BC-3440B5BEDBB4 -n node1
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    Defined [51E5F2D7-0D59-11E2-A7BC-3440B5BEDBB4] to node node1.
- 
- 
+
+
 
 
 2. Remove the discovery entry which uuid is 51E5F2D7-0D59-11E2-A7BC-3440B5BEDBB4 from the discoverydata table
- 
- 
+
+
  .. code-block:: perl
- 
+
    nodediscoverdef -r -u 51E5F2D7-0D59-11E2-A7BC-3440B5BEDBB4
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    Removing discovery entries finished.
- 
- 
+
+
 
 
 3. Remove the discovery entries which discover type is \ **seq**\  from the discoverydata table
- 
- 
+
+
  .. code-block:: perl
- 
+
    nodediscoverdef -r -t seq
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    Removing discovery entries finished.
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/nodediscoverls.1.rst b/docs/source/guides/admin-guides/references/man1/nodediscoverls.1.rst
index 8d1458b64..beda1bb93 100644
--- a/docs/source/guides/admin-guides/references/man1/nodediscoverls.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/nodediscoverls.1.rst
@@ -47,63 +47,63 @@ OPTIONS
 
 
 
-\ **-t seq|profile|switch|blade|manual|undef|all**\ 
- 
+\ **-t seq|profile|switch|blade|manual|undef|all**\
+
  Display the nodes that have been discovered by the specified discovery method:
- 
- 
+
+
  \* \ **seq**\  - Sequential discovery (started via nodediscoverstart noderange=<noderange> ...).
- 
- 
- 
+
+
+
  \* \ **profile**\  - Profile discovery (started via nodediscoverstart networkprofile=<network-profile> ...).
- 
- 
- 
+
+
+
  \* \ **switch**\  - Switch-based discovery (used when the switch and switches tables are filled in).
- 
- 
- 
+
+
+
  \* \ **blade**\  - Blade discovery (used for IBM Flex blades).
- 
- 
- 
+
+
+
  \* \ **manual**\  - Manually discovery (used when defining node by nodediscoverdef command).
- 
- 
- 
+
+
+
  \* \ **undef**\  - Display the nodes that were in the discovery pool, but for which xCAT has not yet received a discovery request.
- 
- 
- 
+
+
+
  \* \ **all**\  - All discovered nodes.
- 
- 
- 
 
 
-\ **-l**\ 
- 
+
+
+
+\ **-l**\
+
  Display more detailed information about the discovered nodes.
- 
 
 
-\ **-u**\  \ *uuid*\ 
- 
+
+\ **-u**\  \ *uuid*\
+
  Display the discovered node that has this uuid.
- 
 
 
-\ **-h|-**\ **-help**\ 
- 
+
+\ **-h|-**\ **-help**\
+
  Display usage message.
- 
 
 
-\ **-v|-**\ **-version**\ 
- 
+
+\ **-v|-**\ **-version**\
+
  Command version.
- 
+
 
 
 
@@ -124,80 +124,80 @@ EXAMPLES
 
 
 1. Display the discovered nodes when sequential discovery is running:
- 
- 
+
+
  .. code-block:: perl
- 
+
    nodediscoverls
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    UUID                                    NODE                METHOD         MTM       SERIAL
    51E5F2D7-0D59-11E2-A7BC-3440B5BEDBB2    distest1            sequential     786310X   1052EF2
    51E5F2D7-0D59-11E2-A7BC-3440B5BEDBB3    distest2            sequential     786310X   1052EF3
- 
- 
+
+
 
 
 2. Display the nodes that were in the discovery pool, but for which xCAT has not yet received a discovery request:
- 
- 
+
+
  .. code-block:: perl
- 
+
    nodediscoverls -t undef
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    UUID                                    NODE                METHOD         MTM       SERIAL
    51E5F2D7-0D59-11E2-A7BC-3440B5BEDBB0    undef               undef          786310X   1052EF0
    51E5F2D7-0D59-11E2-A7BC-3440B5BEDBB1    undef               undef          786310X   1052EF1
- 
- 
+
+
 
 
 3. Display all the discovered nodes:
- 
- 
+
+
  .. code-block:: perl
- 
+
    nodediscoverls -t all
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    UUID                                    NODE                METHOD         MTM       SERIAL
    51E5F2D7-0D59-11E2-A7BC-3440B5BEDBB0    undef               undef          786310X   1052EF0
    51E5F2D7-0D59-11E2-A7BC-3440B5BEDBB1    undef               undef          786310X   1052EF1
    51E5F2D7-0D59-11E2-A7BC-3440B5BEDBB2    distest1            sequential     786310X   1052EF2
    51E5F2D7-0D59-11E2-A7BC-3440B5BEDBB3    distest2            sequential     786310X   1052EF3
- 
- 
+
+
 
 
 4. Display the discovered node whose uuid is \ **51E5F2D7-0D59-11E2-A7BC-3440B5BEDBB2**\ , with detailed information:
- 
- 
+
+
  .. code-block:: perl
- 
+
    nodediscoverls -u 51E5F2D7-0D59-11E2-A7BC-3440B5BEDBB2 -l
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    Object uuid: 51E5F2D7-0D59-11E2-A7BC-3440B5BEDBB2
       node=distest1
       method=sequential
@@ -219,8 +219,8 @@ EXAMPLES
       switchaddr=eth0!192.168.70.120
       switchdesc=eth0!IBM Flex System Fabric EN4093 10Gb Scalable Switch, flash image: version 7.2.6, boot image: version 7.2.6
       switchport=eth0!INTA2
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/nodediscoverstart.1.rst b/docs/source/guides/admin-guides/references/man1/nodediscoverstart.1.rst
index 2171f8da9..87a280799 100644
--- a/docs/source/guides/admin-guides/references/man1/nodediscoverstart.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/nodediscoverstart.1.rst
@@ -21,12 +21,12 @@ SYNOPSIS
 
 \ **nodediscoverstart**\  [\ **-h | -**\ **-help | -v | -**\ **-version**\ ]
 
-\ **Sequential Discovery Specific:**\ 
+\ **Sequential Discovery Specific:**\
 
 
 \ **nodediscoverstart**\  \ **noderange=**\ \ *noderange*\  [\ **hostiprange=**\ \ *imageprofile*\ ] [\ **bmciprange=**\ \ *bmciprange*\ ] [\ **groups=**\ \ *groups*\ ] [\ **rack=**\ \ *rack*\ ] [\ **chassis=**\ \ *chassis*\ ] [\ **height=**\ \ *height*\ ] [\ **unit=**\ \ *unit*\ ] [\ **osimage=**\  \ *osimagename*\ >] [\ **-n | -**\ **-dns**\ ] [\ **-s | -**\ **-skipbmcsetup**\ ] [\ **-V|-**\ **-verbose**\ ]
 
-\ **Profile Discovery Specific:**\ 
+\ **Profile Discovery Specific:**\
 
 
 \ **nodediscoverstart**\  \ **networkprofile=**\ \ *network-profile*\  \ **imageprofile=**\ \ *image-profile*\  \ **hostnameformat=**\ \ *nost-name-format*\  [\ **hardwareprofile=**\ \ *hardware-profile*\ ] [\ **groups=**\ \ *node-groups*\ ] [\ **rack=**\ \ *rack-name*\ ] [\ **chassis=**\ \ *chassis-name*\ ] [\ **height=**\ \ *rack-server-height*\ ] [\ **unit=**\ \ *rack-server-unit-location*\ ] [\ **rank=**\ \ *rank-num*\ ]
@@ -40,7 +40,7 @@ DESCRIPTION
 The \ **nodediscoverstart**\  command starts either the \ **Sequential Discovery**\  or \ **Profile Discovery**\  process.  They can not both be
 running at the same time.
 
-\ **Sequential Discovery Specific:**\ 
+\ **Sequential Discovery Specific:**\
 
 
 This is the simplest discovery approach.  You only need to specify the \ **noderange**\ , \ **hostiprange**\  and \ **bmciprange**\  that should be
@@ -49,7 +49,7 @@ then you only need to specify the \ **noderange**\  to the \ **nodediscoverstart
 physically power on the nodes in the sequence that you want them to receive the node names and IPs, waiting a short time (e.g. 30 seconds)
 between each node.
 
-\ **Profile Discovery Specific:**\ 
+\ **Profile Discovery Specific:**\
 
 
 This is the PCM discovery approach.  \ *networkprofile*\ , \ *imageprofile*\ , \ *hostnameformat*\  arguments must be specified to start the \ **Profile Discovery**\ .
@@ -68,124 +68,124 @@ OPTIONS
 
 
 
-\ **noderange=**\ \ *noderange*\ 
- 
+\ **noderange=**\ \ *noderange*\
+
  The set of node names that should be given to nodes that are discovered via the \ **Sequential Discovery**\  method.
  This argument is required to \ **Sequential Discovery**\ . Any valid xCAT \ **noderange**\  is allowed, e.g. node[01-10].
- 
 
 
-\ **hostiprange=**\ \ *ip range*\ 
- 
+
+\ **hostiprange=**\ \ *ip range*\
+
  The ip range which will be assigned to the host of new discovered nodes in the \ **Sequential Discovery**\  method. The format can be: \ *start_ip*\ \ **-**\ \ *end_ip*\  or \ *noderange*\ , e.g. 192.168.0.1-192.168.0.10 or 192.168.0.[1-10].
- 
 
 
-\ **bmciprange=**\ \ *ip range*\ 
- 
+
+\ **bmciprange=**\ \ *ip range*\
+
  The ip range which will be assigned to the bmc of new discovered nodes in the \ **Sequential Discovery**\  method. The format can be: \ *start_ip*\ \ **-**\ \ *end_ip*\  or \ *noderange*\ , e.g. 192.168.1.1-192.168.1.10 or 192.168.1.[1-10].
- 
 
 
-\ **imageprofile=**\ \ *image-profile*\ 
- 
+
+\ **imageprofile=**\ \ *image-profile*\
+
  Sets the new image profile name used by the discovered nodes in the \ **Profile Discovery**\  method.  An image profile defines the provisioning method, OS information, kit information, and provisioning parameters for a node. If the "__ImageProfile_imgprofile" group already exists in the nodehm table, then "imgprofile" is used as the image profile name.
- 
 
 
-\ **networkprofile=**\ \ *network-profile*\ 
- 
+
+\ **networkprofile=**\ \ *network-profile*\
+
  Sets the new network profile name used by the discovered nodes in the \ **Profile Discovery**\  method. A network profile defines the network, NIC, and routes for a node. If the "__NetworkProfile_netprofile" group already exists in the nodehm table, then "netprofile" is used as the network profile name.
- 
 
 
-\ **hardwareprofile=**\ \ *hardware-profile*\ 
- 
+
+\ **hardwareprofile=**\ \ *hardware-profile*\
+
  Sets the new hardware profile name used by the discovered nodes in the \ **Profile Discovery**\  method. If a "__HardwareProfile_hwprofile" group exists, then "hwprofile" is the hardware profile name. A hardware profile defines hardware management related information for imported nodes, including: IPMI, HMC, CEC, CMM.
- 
 
 
-\ **hostnameformat=**\ \ *nost-name-format*\ 
- 
+
+\ **hostnameformat=**\ \ *nost-name-format*\
+
  Sets the node name format for all discovered nodes in the \ **Profile Discovery**\  method. The two types of formats supported are prefix#NNNappendix and prefix#RRand#NNappendix, where wildcard #NNN and #NN are replaced by a system generated number that is based on the provisioning order. Wildcard #RR represents the rack number and stays constant.
- 
+
  For example, if the node name format is compute-#NN, the node name is generated as: compute-00, compute-01, ..., compute-99. If the node name format is blade#NNN-x64, the node name is generated as: blade001-x64, blade002-x64, ..., blade999-x64
- 
+
  For example, if the node name format is compute-#RR-#NN and the rack number is 2, the node name is generated as: compute-02-00, compute-02-01, ..., compute-02-99. If node name format is node-#NN-in-#RR and rack number is 1, the node name is generated as: node-00-in-01, node-01-in-01, ..., node-99-in-01
- 
 
 
-\ **groups=**\ \ *node-groups*\ 
- 
+
+\ **groups=**\ \ *node-groups*\
+
  Sets the node groups that the discovered nodes should be put in for either the Sequential Discovery or Profile Discovery methods, where \ *node-group*\  is a comma-separated list of node groups.
- 
+
 
 
 \ **rack=**\ \ *rack-name*\ >
- 
+
  Sets the rack name where the node is located for either the Sequential Discovery or Profile Discovery methods.
- 
 
 
-\ **chassis=**\ \ *chassis-name*\ 
- 
+
+\ **chassis=**\ \ *chassis-name*\
+
  Sets the chassis name that the Blade server or PureFlex blade is located in, for either the Sequential Discovery or Profile Discovery methods. This option is used for the Blade server and PureFlex system only. You cannot specify this option with the rack option.
- 
 
 
-\ **height=**\ \ *rack-server-height*\ 
- 
+
+\ **height=**\ \ *rack-server-height*\
+
  Sets the height of a rack-mounted server in U units for either the Sequential Discovery or Profile Discovery methods. If the rack option is not specified, the default value is 1.
- 
 
 
-\ **unit=**\ \ *rack-server-unit-location*\ 
- 
+
+\ **unit=**\ \ *rack-server-unit-location*\
+
  Sets the start unit value for the node in the rack, for either the Sequential Discovery or Profile Discovery methods. This option is for a rack server only. If the unit option is not specified, the default value is 1
- 
 
 
-\ **rank=**\ \ *rank-num*\ 
- 
+
+\ **rank=**\ \ *rank-num*\
+
  Specifies the starting rank number that is used in the node name format, for the Profile Discovery method.  The rank number must be a valid integer between 0 and 254. This option must be specified with nodenameformat option. For example, if your node name format is compute-#RR-#NN. The rack's number is 2 and rank is specified as 5, the node name is generated as follows: compute-02-05, compute-02-06, ..., compute-02-99.
- 
 
 
-\ **osimage=**\ \ *osimagename*\ 
- 
+
+\ **osimage=**\ \ *osimagename*\
+
  Specifies the osimage name that will be associated with the new discovered node, the os provisioning will be started automatically at the end of the discovery process.
- 
 
 
-\ **-n|-**\ **-dns**\ 
- 
+
+\ **-n|-**\ **-dns**\
+
  Specifies to run makedns <nodename> for any new discovered node. This is useful mainly for non-predefined configuration, before running the "nodediscoverstart -n", the user needs to run makedns -n to initialize the named setup on the management node.
- 
 
 
-\ **-s|-**\ **-skipbmcsetup**\ 
- 
+
+\ **-s|-**\ **-skipbmcsetup**\
+
  Specifies to skip the bmcsetup during the sequential discovery process, if the bmciprange is specified with nodediscoverstart command, the BMC will be setup automatically during the discovery process, if the user does not want to run bmcsetup, could specify the "-s|--skipbmcsetup" with nodediscoverstart command to skip the bmcsetup.
- 
 
 
-\ **-V|-**\ **-verbose**\ 
- 
+
+\ **-V|-**\ **-verbose**\
+
  Enumerates the free node names and host/bmc ips that are being specified in the ranges given.  Use this option
  with Sequential Discovery to ensure that you are specifying the ranges you intend.
- 
 
 
-\ **-h|-**\ **-help**\ 
- 
+
+\ **-h|-**\ **-help**\
+
  Display usage message.
- 
 
 
-\ **-v|-**\ **-version**\ 
- 
+
+\ **-v|-**\ **-version**\
+
  Command Version.
- 
+
 
 
 
@@ -206,18 +206,18 @@ EXAMPLES
 
 
 1. \ **Sequential Discovery**\ : To discover nodes with noderange and host/bmc ip range:
- 
- 
+
+
  .. code-block:: perl
- 
+
    nodediscoverstart noderange=n[1-10] hostiprange='172.20.101.1-172.20.101.10' bmciprange='172.20.102.1-172.20.102.10' -V
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    Sequential Discovery: Started:
       Number of free node names: 10
       Number of free host ips: 10
@@ -227,18 +227,18 @@ EXAMPLES
    n01                 172.20.101.1        172.20.102.1
    n02                 172.20.101.2        172.20.102.2
    ...                 ...                 ...
- 
- 
+
+
 
 
 2. \ **Profile Discovery**\ : To discover nodes using the default_cn network profile and the rhels6.3_packaged image profile, use the following command:
- 
- 
+
+
  .. code-block:: perl
- 
+
    nodediscoverstart networkprofile=default_cn imageprofile=rhels6.3_packaged hostnameformat=compute#NNN
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/nodediscoverstatus.1.rst b/docs/source/guides/admin-guides/references/man1/nodediscoverstatus.1.rst
index 182800616..610e8bef0 100644
--- a/docs/source/guides/admin-guides/references/man1/nodediscoverstatus.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/nodediscoverstatus.1.rst
@@ -27,7 +27,7 @@ DESCRIPTION
 ***********
 
 
-The \ **nodediscoverstatus**\  command detects if the sequential or profile node discovery process is currently running, i.e. \ **nodediscoverstart**\ 
+The \ **nodediscoverstatus**\  command detects if the sequential or profile node discovery process is currently running, i.e. \ **nodediscoverstart**\
 has been run, but \ **nodediscoverstop**\  has not.
 
 
@@ -36,11 +36,11 @@ OPTIONS
 *******
 
 
-\ **-h|-**\ **-help**\ 
+\ **-h|-**\ **-help**\
 
 Display usage message.
 
-\ **-v|-**\ **-version**\ 
+\ **-v|-**\ **-version**\
 
 Command Version.
 
diff --git a/docs/source/guides/admin-guides/references/man1/nodediscoverstop.1.rst b/docs/source/guides/admin-guides/references/man1/nodediscoverstop.1.rst
index f95b1b43f..4f4046b0a 100644
--- a/docs/source/guides/admin-guides/references/man1/nodediscoverstop.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/nodediscoverstop.1.rst
@@ -37,11 +37,11 @@ OPTIONS
 *******
 
 
-\ **-h|-**\ **-help**\ 
+\ **-h|-**\ **-help**\
 
 Display usage message.
 
-\ **-v|-**\ **-version**\ 
+\ **-v|-**\ **-version**\
 
 Command Version.
 
diff --git a/docs/source/guides/admin-guides/references/man1/nodegrpch.1.rst b/docs/source/guides/admin-guides/references/man1/nodegrpch.1.rst
index 0b19fac79..522d4a769 100644
--- a/docs/source/guides/admin-guides/references/man1/nodegrpch.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/nodegrpch.1.rst
@@ -32,11 +32,11 @@ DESCRIPTION
 
 
 The nodegrpch command is similar to the nodech command, but ensures that the parameters are
-declared at the group level rather than the node specific level, and clears conflicting node 
-specific overrides of the specified groups.   Using table.column=value will do a 
-verbatim assignment.  If ",=" is used instead of "=", the specified value will be prepended to the 
-attribute's comma separated list, if it is not already there.  If "^=" is used, the specified 
-value will be removed from the attribute's comma separated list, if it is there.  You can also 
+declared at the group level rather than the node specific level, and clears conflicting node
+specific overrides of the specified groups.   Using table.column=value will do a
+verbatim assignment.  If ",=" is used instead of "=", the specified value will be prepended to the
+attribute's comma separated list, if it is not already there.  If "^=" is used, the specified
+value will be removed from the attribute's comma separated list, if it is there.  You can also
 use "^=" and ",=" in the same command to essentially replace one item
 in the list with another.  (See the Examples section.)
 
@@ -55,16 +55,16 @@ OPTIONS
 
 
 
-\ **-v|-**\ **-version**\ 
- 
+\ **-v|-**\ **-version**\
+
  Command Version.
- 
 
 
-\ **-?|-h|-**\ **-help**\ 
- 
+
+\ **-?|-h|-**\ **-help**\
+
  Display usage message.
- 
+
 
 
 
@@ -90,15 +90,15 @@ EXAMPLES
 
 
 1.
- 
+
  To declare all members of ipmi group to have nodehm.mgt be ipmi
- 
- 
+
+
  .. code-block:: perl
- 
+
    nodegrpch ipmi nodehm.mgt=ipmi
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/nodeimport.1.rst b/docs/source/guides/admin-guides/references/man1/nodeimport.1.rst
index ccd2a8ab9..bd3a82f54 100644
--- a/docs/source/guides/admin-guides/references/man1/nodeimport.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/nodeimport.1.rst
@@ -39,31 +39,31 @@ OPTIONS
 *******
 
 
-\ **-h|-**\ **-help**\ 
+\ **-h|-**\ **-help**\
 
 Display usage message.
 
-\ **-v|-**\ **-version**\ 
+\ **-v|-**\ **-version**\
 
 Command Version.
 
-\ **file=**\  \ *nodeinfo-filename*\ 
+\ **file=**\  \ *nodeinfo-filename*\
 
 Specifies the node information file, where <nodeinfo-filename> is the full path and file name of the node information file.
 
-\ **imageprofile=**\  \ *image-profile*\ 
+\ **imageprofile=**\  \ *image-profile*\
 
 Sets the new image profile name used by the node, where <image-profile> is the new image profile.  An image profile defines the provisioning method, OS information, kit information, and provisioning parameters for a node. If the "__ImageProfile_imgprofile" group already exists in the nodehm table, then "imgprofile" is used as the image profile name.
 
-\ **networkprofile=**\  \ *network-profile*\ 
+\ **networkprofile=**\  \ *network-profile*\
 
 Sets the new network profile name used by the node, where <network-profile> is the new network profile. A network profile defines the network, NIC, and routes for a node. If the "__NetworkProfile_netprofile" group already exists in the nodehm table, then "netprofile" is used as the network profile name.
 
-\ **hardwareprofile=**\  \ *hardware-profile*\ 
+\ **hardwareprofile=**\  \ *hardware-profile*\
 
 Sets the new hardware profile name used by the node, where <hardware-profile> is the new hardware management profile used by the node. If a "__HardwareProfile_hwprofile" group exists, then "hwprofile" is the hardware profile name. A hardware profile defines hardware management related information for imported nodes, including: IPMI, HMC, CEC, CMM.
 
-\ **hostnameformat=**\  \ *host-name-format*\ 
+\ **hostnameformat=**\  \ *host-name-format*\
 
 Sets the node name format for all nodes discovered, where <node-name-format> is a supported format. The two types of formats supported are prefix#NNNappendix and prefix#RRand#NNappendix, where wildcard #NNN and #NN are replaced by a system generated number that is based on the provisioning order. Wildcard #RR represents the rack number and stays constant.
 
@@ -71,7 +71,7 @@ For example, if the node name format is compute-#NN, the node name is generated
 
 For example, if the node name format is compute-#RR-#NN and the rack number is 2, the node name is generated as: compute-02-00, compute-02-01, ..., compute-02-99. If node name format is node-#NN-in-#RR and rack number is 1, the node name is generated as: node-00-in-01, node-01-in-01, ... , node-99-in-01
 
-\ **groups=**\  \ *node-groups*\ 
+\ **groups=**\  \ *node-groups*\
 
 Sets the node groups that the imported node belongs to, where <node-group> is a comma-separated list of node groups.
 
@@ -107,7 +107,7 @@ To import nodes using a profile, follow the following steps:
    "__NetworkProfile_default_mn","static","static",,,,
    "__NetworkProfile_default_cn","static",,,,,
    "__ImageProfile_rhels6.2-x86_64-install-compute","static","static",,,,
-    
+
    # lsdef -t group __NetworkProfile_default_cn
    Object name: __NetworkProfile_default_cn
        grouptype=static
@@ -125,14 +125,14 @@ To import nodes using a profile, follow the following steps:
 
 .. code-block:: perl
 
-   Example of a node information file, a blade and a rack server defined: 
+   Example of a node information file, a blade and a rack server defined:
    # hostinfo begin
    # This entry defines a blade.
    __hostname__:
       mac=b8:ac:6f:37:59:24
       ip=192.168.1.20
       chassis=chassis01
- 
+
    # This entry defines a rack server.
    __hostname__:
       mac=b8:ac:6f:37:59:25
@@ -140,9 +140,9 @@ To import nodes using a profile, follow the following steps:
       rack=rack01
       height=1
       unit=2
- 
+
    # hostinfo end.
- 
+
    Another example of a node information file, a PureFlex X/P node defined:
    # hostinfo begin
    # To define a PureFlex P/X node, chassis and slot id must be specified.
@@ -152,28 +152,28 @@ To import nodes using a profile, follow the following steps:
       chassis=cmm01
       slotid=1
    # hostinfo end.
- 
-   Example of a node information file, a switch auto discovery node defined: 
+
+   Example of a node information file, a switch auto discovery node defined:
    # hostinfo begin
    # This entry defines a blade.
    __hostname__:
       switches=eth0!switch1!1,eth0!switch2!1!eth1
- 
+
    Example of a node information file that specifies a CEC-based rack-mounted Power node that uses direct FSP management:
    # Node information file begins
    # This entry defines a Power rack-mount node.
    __hostname__:
       mac=b8:ac:6f:37:59:28
       cec=mycec
-   
+
    __hostname__:
       mac=b8:ac:6f:37:59:28
       cec=mycec
       lparid=2
    # Node information file ends.
-   
+
    Example of a node information file that specifies a PowerKVM Guest node that uses KVM management:
-   
+
    # Node information file begins
    # This entry defines a PowerKVM Guest node.
    # Make sure the node 'vm01' is already created on Hypervisor
diff --git a/docs/source/guides/admin-guides/references/man1/nodels.1.rst b/docs/source/guides/admin-guides/references/man1/nodels.1.rst
index 395c72848..2843e2bfa 100644
--- a/docs/source/guides/admin-guides/references/man1/nodels.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/nodels.1.rst
@@ -38,49 +38,49 @@ are specified after the noderange in the form:  \ *table.column*\  .  A few shor
 also be used as aliases to common attributes:
 
 
-\ **groups**\ 
- 
+\ **groups**\
+
  nodelist.groups
- 
 
 
-\ **tags**\ 
- 
+
+\ **tags**\
+
  nodelist.groups
- 
 
 
-\ **mgt**\ 
- 
+
+\ **mgt**\
+
  nodehm.mgt
- 
+
 
 
 nodels can also select based on table value criteria. The following operators are available:
 
 
-\ **==**\ 
- 
+\ **==**\
+
  Select nodes where the table.column value is exactly a certain value.
- 
 
 
-\ **!=**\ 
- 
+
+\ **!=**\
+
  Select nodes where the table.column value is not a given specific value.
- 
 
 
-\ **=~**\ 
- 
+
+\ **=~**\
+
  Select nodes where the table.column value matches a given regular expression.
- 
 
 
-\ **!~**\ 
- 
+
+\ **!~**\
+
  Select nodes where the table.column value does not match a given regular expression.
- 
+
 
 
 The \ **nodels**\  command with a specific node and one or more table.attribute parameters is a good substitute
@@ -95,34 +95,34 @@ OPTIONS
 
 
 
-\ **-v|-**\ **-version**\ 
- 
+\ **-v|-**\ **-version**\
+
  Command Version.
- 
 
 
-\ **-H|-**\ **-with-fieldname**\ 
- 
+
+\ **-H|-**\ **-with-fieldname**\
+
  Force display of table name and column name context for each result
- 
 
 
-\ **-b|-**\ **-blame**\ 
- 
+
+\ **-b|-**\ **-blame**\
+
  For values inherited from groups, display which groups provided the inheritance
- 
 
 
-\ **-S**\ 
- 
+
+\ **-S**\
+
  List all the hidden nodes (FSP/BPA nodes) with other ones.
- 
 
 
-\ **-?|-h|-**\ **-help**\ 
- 
+
+\ **-?|-h|-**\ **-help**\
+
  Display usage message.
- 
+
 
 
 
@@ -143,153 +143,153 @@ EXAMPLES
 
 
 1.
- 
+
  To list all defined nodes, enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    nodels
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
      node1
      node2
      node3
- 
- 
+
+
 
 
 2.
- 
+
  To list all defined attributes in a table for a node or noderange, enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    nodels rra001a noderes
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
      rra001a: noderes.primarynic: eth0
      rra001a: noderes.xcatmaster: rra000
      rra001a: noderes.installnic: eth0
      rra001a: noderes.netboot: pxe
      rra001a: noderes.servicenode: rra000
      rra001a: noderes.node: rra001a
- 
- 
+
+
 
 
 3.
- 
+
  To list nodes in node group ppc, enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    nodels ppc
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
      ppcnode1
      ppcnode2
      ppcnode3
- 
- 
+
+
 
 
 4.
- 
+
  To list the groups each node is part of:
- 
- 
+
+
  .. code-block:: perl
- 
+
    nodels all groups
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
      node1: groups: all
      node2: groups: all,storage
      node3: groups: all,blade
- 
- 
+
+
 
 
 5.
- 
+
  To list the groups each node is part of:
- 
- 
+
+
  .. code-block:: perl
- 
+
    nodels all nodehm.power
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
      node1: nodehm.power: blade
      node2: nodehm.power: ipmi
      node3: nodehm.power: ipmi
- 
- 
+
+
 
 
 6.
- 
+
  To list the out-of-band mgt method for blade1:
- 
- 
+
+
  .. code-block:: perl
- 
+
    nodels blade1 nodehm.mgt
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
      blade1: blade
- 
- 
+
+
 
 
 7.
- 
+
  Listing blades managed through an AMM named 'amm1'
- 
- 
+
+
  .. code-block:: perl
- 
+
    nodels all mp.mpa==amm1
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
      blade1
      blade10
      blade11
@@ -303,25 +303,25 @@ EXAMPLES
      blade7
      blade8
      blade9
- 
- 
+
+
 
 
 8.
- 
+
  Listing the switch.switch value for nodes in the second rack:
- 
- 
+
+
  .. code-block:: perl
- 
+
    nodels all nodepos.rack==2 switch.switch
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
      n41: switch.switch: switch2
      n42: switch.switch: switch2
      n43: switch.switch: switch2
@@ -335,25 +335,25 @@ EXAMPLES
      n58: switch.switch: switch2
      n59: switch.switch: switch2
      n60: switch.switch: switch2
- 
- 
+
+
 
 
 9.
- 
+
  Listing the blade slot number for anything managed through a device with a name beginning with amm:
- 
- 
+
+
  .. code-block:: perl
- 
+
    nodels all mp.mpa=~/^amm.*/ mp.id
- 
- 
+
+
  Output looks like:
- 
- 
+
+
  .. code-block:: perl
- 
+
      blade1: mp.id: 1
      blade10: mp.id: 10
      blade11: mp.id: 11
@@ -367,21 +367,21 @@ EXAMPLES
      blade7: mp.id: 7
      blade8: mp.id: 8
      blade9: mp.id: 9
- 
- 
+
+
 
 
 10.
- 
+
  To list the hidden nodes that can't be seen with other flags.
  The hidden nodes are FSP/BPAs.
- 
- 
+
+
  .. code-block:: perl
- 
+
    lsdef -S
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/nodepurge.1.rst b/docs/source/guides/admin-guides/references/man1/nodepurge.1.rst
index 847eb6c7b..50f18ad0d 100644
--- a/docs/source/guides/admin-guides/references/man1/nodepurge.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/nodepurge.1.rst
@@ -19,9 +19,9 @@ SYNOPSIS
 ********
 
 
-\ **nodepurge [-h| -**\ **-help | -v | -**\ **-version]**\ 
+\ **nodepurge [-h| -**\ **-help | -v | -**\ **-version]**\
 
-\ **nodepurge**\  \ *noderange*\ 
+\ **nodepurge**\  \ *noderange*\
 
 
 ***********
@@ -39,15 +39,15 @@ OPTIONS
 *******
 
 
-\ **-h|-**\ **-help**\ 
+\ **-h|-**\ **-help**\
 
 Display usage message.
 
-\ **-v|-**\ **-version**\ 
+\ **-v|-**\ **-version**\
 
 Command Version
 
-\ *noderange*\ 
+\ *noderange*\
 
 The nodes to be removed.
 
diff --git a/docs/source/guides/admin-guides/references/man1/noderefresh.1.rst b/docs/source/guides/admin-guides/references/man1/noderefresh.1.rst
index 7f110d908..d7919f311 100644
--- a/docs/source/guides/admin-guides/references/man1/noderefresh.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/noderefresh.1.rst
@@ -19,9 +19,9 @@ SYNOPSIS
 ********
 
 
-\ **noderefresh [-h| -**\ **-help | -v | -**\ **-version]**\ 
+\ **noderefresh [-h| -**\ **-help | -v | -**\ **-version]**\
 
-\ **noderefresh**\  \ *noderange*\ 
+\ **noderefresh**\  \ *noderange*\
 
 
 ***********
@@ -37,15 +37,15 @@ OPTIONS
 *******
 
 
-\ **-h|-**\ **-help**\ 
+\ **-h|-**\ **-help**\
 
 Display usage message.
 
-\ **-v|-**\ **-version**\ 
+\ **-v|-**\ **-version**\
 
 Command Version.
 
-\ *noderange*\ 
+\ *noderange*\
 
 The nodes to be updated.
 
diff --git a/docs/source/guides/admin-guides/references/man1/noderm.1.rst b/docs/source/guides/admin-guides/references/man1/noderm.1.rst
index 4f5eac74a..222e558b0 100644
--- a/docs/source/guides/admin-guides/references/man1/noderm.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/noderm.1.rst
@@ -19,9 +19,9 @@ SYNOPSIS
 ********
 
 
-\ **noderm [-h| -**\ **-help]**\ 
+\ **noderm [-h| -**\ **-help]**\
 
-\ **noderm noderange**\ 
+\ **noderm noderange**\
 
 
 ***********
diff --git a/docs/source/guides/admin-guides/references/man1/nodestat.1.rst b/docs/source/guides/admin-guides/references/man1/nodestat.1.rst
index 9264a0232..2c8944375 100644
--- a/docs/source/guides/admin-guides/references/man1/nodestat.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/nodestat.1.rst
@@ -15,7 +15,7 @@ Name
 
 
 ****************
-\ **Synopsis**\ 
+\ **Synopsis**\
 ****************
 
 
@@ -25,7 +25,7 @@ Name
 
 
 *******************
-\ **Description**\ 
+\ **Description**\
 *******************
 
 
@@ -60,10 +60,10 @@ Keywords to use:
 .. code-block:: perl
 
      apps -- a list of comma separated application names whose status will be queried. For how to get the status of each app, look for app name in the key field in a different row.
-     port -- the application daemon port number, if not specified, use internal list, then /etc/services. 
+     port -- the application daemon port number, if not specified, use internal list, then /etc/services.
      group -- the name of a node group that needs to get the application status from. If not specified, assume all the nodes in the nodelist table. To specify more than one groups, use group=a,group=b format.
      cmd -- the command that will be run locally on mn or sn.
-     lcmd -- the command that will be run the mn only. 
+     lcmd -- the command that will be run the mn only.
      dcmd -- the command that will be run distributed on the nodes using xdsh <nodes> ....
 
 
@@ -81,144 +81,144 @@ For the command specified by 'dcmd', no input is needed, the output can be a str
 
 
 ***************
-\ **Options**\ 
+\ **Options**\
 ***************
 
 
 
 \ **-f | -**\ **-usefping**\
- 
+
  Uses fping instead of nmap even if nmap is available.  If you seem to be having a problem with false negatives, fping can be more forgiving, but slower.
- 
 
 
-\ **-m | -**\ **-usemon**\ 
- 
+
+\ **-m | -**\ **-usemon**\
+
  Uses the settings from the \ **monsetting**\  table to determine a list of applications that need to get status for.
- 
 
 
-\ **-p | -**\ **-powerstat**\ 
- 
+
+\ **-p | -**\ **-powerstat**\
+
  Gets the power status for the nodes that are 'noping'.
- 
 
 
-\ **-u | -**\ **-updatedb**\ 
- 
+
+\ **-u | -**\ **-updatedb**\
+
  Updates the status and appstatus columns of the nodelist table with the returned running status from the given nodes.
- 
 
 
-\ **-v | -**\ **-version**\ 
- 
+
+\ **-v | -**\ **-version**\
+
  Print version.
- 
 
 
-\ **-h | -**\ **-help**\ 
- 
+
+\ **-h | -**\ **-help**\
+
  Print help.
- 
+
 
 
 
 ****************
-\ **Examples**\ 
+\ **Examples**\
 ****************
 
 
 
 1.
- 
- 
+
+
  .. code-block:: perl
- 
+
    nodestat compute
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    node1   sshd
    node2   sshd
    node3   ping
    node4   pbs
    node5   noping
- 
- 
+
+
 
 
 2.
- 
- 
+
+
  .. code-block:: perl
- 
+
    nodestat compute -p
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    node1   sshd
    node2   sshd
    node3   ping
    node4   pbs
    node5   noping(Shutting down)
- 
- 
+
+
 
 
 3.
- 
- 
+
+
  .. code-block:: perl
- 
+
    nodestat compute -u
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    node1   sshd
    node2   sshd
    node3   ping
    node4   netboot
    node5   noping
- 
- 
+
+
 
 
 4.
- 
- 
+
+
  .. code-block:: perl
- 
+
    nodestat compute -m
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    node1   ping,sshd,ll,gpfs=ok
    node2   ping,sshd,ll,gpfs=not ok,someapp=something is wrong
    node3   netboot
    node4   noping
- 
- 
+
+
 
 
 
 ************************
-\ **See**\  \ **Also**\ 
+\ **See**\  \ **Also**\
 ************************
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/packimage.1.rst b/docs/source/guides/admin-guides/references/man1/packimage.1.rst
index 7105513fd..d02606404 100644
--- a/docs/source/guides/admin-guides/references/man1/packimage.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/packimage.1.rst
@@ -19,9 +19,9 @@ SYNOPSIS
 ********
 
 
-\ **packimage [-h| -**\ **-help]**\ 
+\ **packimage [-h| -**\ **-help]**\
 
-\ **packimage  [-v| -**\ **-version]**\ 
+\ **packimage  [-v| -**\ **-version]**\
 
 \ **packimage**\  [\ **-m | -**\ **-method**\  \ *cpio|tar*\ ] [\ **-c | -**\ **-compress**\  \ *gzip|pigz|xz*\ ] [\ **--nosyncfiles**\ ] \ *imagename*\
 
diff --git a/docs/source/guides/admin-guides/references/man1/pasu.1.rst b/docs/source/guides/admin-guides/references/man1/pasu.1.rst
index e7af74980..519043875 100644
--- a/docs/source/guides/admin-guides/references/man1/pasu.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/pasu.1.rst
@@ -19,9 +19,9 @@ SYNOPSIS
 ********
 
 
-\ **pasu**\  [\ **-V**\ ] [\ **-d**\ ] [\ **-l**\  \ *user*\ ] [\ **-p**\  \ *passwd*\ ] [\ **-f**\  \ *fanout*\ ] [\ **-i**\  \ *hostname-suffix*\ ] \ *noderange*\  \ *command*\ 
+\ **pasu**\  [\ **-V**\ ] [\ **-d**\ ] [\ **-l**\  \ *user*\ ] [\ **-p**\  \ *passwd*\ ] [\ **-f**\  \ *fanout*\ ] [\ **-i**\  \ *hostname-suffix*\ ] \ *noderange*\  \ *command*\
 
-\ **pasu**\  [\ **-V**\ ] [\ **-d**\ ] [\ **-l**\  \ *user*\ ] [\ **-p**\  \ *passwd*\ ] [\ **-f**\  \ *fanout*\ ] [\ **-i**\  \ *hostname-suffix*\ ] \ **-b**\  \ *batchfile*\  \ *noderange*\ 
+\ **pasu**\  [\ **-V**\ ] [\ **-d**\ ] [\ **-l**\  \ *user*\ ] [\ **-p**\  \ *passwd*\ ] [\ **-f**\  \ *fanout*\ ] [\ **-i**\  \ *hostname-suffix*\ ] \ **-b**\  \ *batchfile*\  \ *noderange*\
 
 \ **pasu**\  [\ **-h**\  | \ **-**\ **-help**\ ]
 
@@ -47,66 +47,66 @@ OPTIONS
 
 
 
-\ **-l|-**\ **-loginname**\  \ *username*\ 
- 
+\ **-l|-**\ **-loginname**\  \ *username*\
+
  The username to use to connect to the IMMs.  If not specified, the row in the xCAT \ **passwd**\  table with key "ipmi"
  will be used to get the username.
- 
 
 
-\ **-p|-**\ **-passwd**\  \ *passwd*\ 
- 
+
+\ **-p|-**\ **-passwd**\  \ *passwd*\
+
  The password to use to connect to the IMMs.  If not specified, the row in the xCAT passwd table with key "ipmi"
  will be used to get the password.
- 
 
 
-\ **-f|-**\ **-fanout**\ 
- 
+
+\ **-f|-**\ **-fanout**\
+
  How many processes to run in parallel simultaneously.  The default is 64.  You can also set the XCATPSHFANOUT
  environment variable.
- 
 
 
-\ **-b|-**\ **-batch**\  -\ *batchfile*\ 
- 
+
+\ **-b|-**\ **-batch**\  -\ *batchfile*\
+
  A simple text file that contains multiple ASU commands, each on its own line.
- 
 
 
-\ **-d|-**\ **-donotfilter**\ 
- 
+
+\ **-d|-**\ **-donotfilter**\
+
  By default, pasu filters out (i.e. does not display) the standard initial output from ASU:
- 
- 
+
+
  .. code-block:: perl
- 
+
    IBM Advanced Settings Utility version 9.30.79N
    Licensed Materials - Property of IBM
    (C) Copyright IBM Corp. 2007-2012 All Rights Reserved
    Connected to IMM at IP address node2-imm
- 
- 
+
+
  If you want this output to be displayed, use this flag.
- 
 
 
-\ **-i|-**\ **-interface**\  \ *hostname-suffix*\ 
- 
+
+\ **-i|-**\ **-interface**\  \ *hostname-suffix*\
+
  The hostname suffix to be appended to the node names.
- 
 
 
-\ **-V|-**\ **-verbose**\ 
- 
+
+\ **-V|-**\ **-verbose**\
+
  Display verbose messages.
- 
 
 
-\ **-h|-**\ **-help**\ 
- 
+
+\ **-h|-**\ **-help**\
+
  Display usage message.
- 
+
 
 
 
@@ -127,147 +127,147 @@ EXAMPLES
 
 
 1.
- 
+
  To display the Com1ActiveAfterBoot setting on 2 nodes:
- 
- 
+
+
  .. code-block:: perl
- 
+
    pasu node1,node2 show DevicesandIOPorts.Com1ActiveAfterBoot
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
      node1: DevicesandIOPorts.Com1ActiveAfterBoot=Enable
      node2: DevicesandIOPorts.Com1ActiveAfterBoot=Enable
- 
- 
+
+
 
 
 2.
- 
+
  To display the Com1ActiveAfterBoot setting on all compute nodes:
- 
- 
+
+
  .. code-block:: perl
- 
+
    pasu compute show DevicesandIOPorts.Com1ActiveAfterBoot | xcoll
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
      ====================================
      compute
      ====================================
      DevicesandIOPorts.Com1ActiveAfterBoot=Enable
- 
- 
+
+
 
 
 3.
- 
+
  To set several settings on all compute nodes, create a batch file
  called (for example) asu-settings with contents:
- 
- 
+
+
  .. code-block:: perl
- 
+
    set DevicesandIOPorts.Com1ActiveAfterBoot Enable
    set DevicesandIOPorts.SerialPortSharing Enable
    set DevicesandIOPorts.SerialPortAccessMode Dedicated
    set DevicesandIOPorts.RemoteConsole Enable
- 
- 
+
+
  Then run:
- 
- 
+
+
  .. code-block:: perl
- 
+
    pasu -b asu-settings compute | xcoll
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
      ====================================
      compute
      ====================================
      Batch mode start.
      [set DevicesandIOPorts.Com1ActiveAfterBoot Enable]
      DevicesandIOPorts.Com1ActiveAfterBoot=Enable
-  
+
      [set DevicesandIOPorts.SerialPortSharing Enable]
      DevicesandIOPorts.SerialPortSharing=Enable
-  
+
      [set DevicesandIOPorts.SerialPortAccessMode Dedicated]
      DevicesandIOPorts.SerialPortAccessMode=Dedicated
-  
+
      [set DevicesandIOPorts.RemoteConsole Enable]
      DevicesandIOPorts.RemoteConsole=Enable
-  
+
      Beginning intermediate batch update.
      Waiting for command completion status.
      Command completed successfully.
      Completed intermediate batch update.
      Batch mode competed successfully.
- 
- 
+
+
 
 
 4.
- 
+
  To confirm that all the settings were made on all compute nodes, create a batch file
  called (for example) asu-show with contents:
- 
- 
+
+
  .. code-block:: perl
- 
+
    show DevicesandIOPorts.Com1ActiveAfterBoot
    show DevicesandIOPorts.SerialPortSharing
    show DevicesandIOPorts.SerialPortAccessMode
    show DevicesandIOPorts.RemoteConsole
- 
- 
+
+
  Then run:
- 
- 
+
+
  .. code-block:: perl
- 
+
    pasu -b asu-show compute | xcoll
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
      ====================================
      compute
      ====================================
      Batch mode start.
      [show DevicesandIOPorts.Com1ActiveAfterBoot]
      DevicesandIOPorts.Com1ActiveAfterBoot=Enable
-  
+
      [show DevicesandIOPorts.SerialPortSharing]
      DevicesandIOPorts.SerialPortSharing=Enable
-  
+
      [show DevicesandIOPorts.SerialPortAccessMode]
      DevicesandIOPorts.SerialPortAccessMode=Dedicated
-  
+
      [show DevicesandIOPorts.RemoteConsole]
      DevicesandIOPorts.RemoteConsole=Enable
-  
+
      Batch mode competed successfully.
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/pcons.1.rst b/docs/source/guides/admin-guides/references/man1/pcons.1.rst
index 25cd3dce7..27cf7e628 100644
--- a/docs/source/guides/admin-guides/references/man1/pcons.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/pcons.1.rst
@@ -11,12 +11,12 @@ SYNOPSIS
 ********
 
 
-\ **pcons**\  \ *noderange*\  \ *command*\ 
+\ **pcons**\  \ *noderange*\  \ *command*\
 
-\ **pcons**\ 
+\ **pcons**\
 [\ **-h | -**\ **-help**\ ]
 
-\ **pcons**\ 
+\ **pcons**\
 [\ **-v | -**\ **-version**\ ]
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/pgsqlsetup.1.rst b/docs/source/guides/admin-guides/references/man1/pgsqlsetup.1.rst
index 8e16004c7..e291a087b 100644
--- a/docs/source/guides/admin-guides/references/man1/pgsqlsetup.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/pgsqlsetup.1.rst
@@ -33,7 +33,7 @@ DESCRIPTION
 ***********
 
 
-\ **pgsqlsetup**\  - Sets up the PostgreSQL database for xCAT to use. The pgsqlsetup script is run on the Management Node as root after the PostgreSQL code has been installed. The xcatd daemon will be stopped during migration.  No xCAT commands should be run during the init process, because we will be migrating the xCAT database to PostgreSQL and restarting the xcatd daemon as well as the PostgreSQL daemon. For full information on all the steps that will be done reference 
+\ **pgsqlsetup**\  - Sets up the PostgreSQL database for xCAT to use. The pgsqlsetup script is run on the Management Node as root after the PostgreSQL code has been installed. The xcatd daemon will be stopped during migration.  No xCAT commands should be run during the init process, because we will be migrating the xCAT database to PostgreSQL and restarting the xcatd daemon as well as the PostgreSQL daemon. For full information on all the steps that will be done reference
 One password must be supplied for the setup,  a password for the xcatadm unix id and the same password for the xcatadm database id.  The password will be prompted for interactively or you can set the XCATPGPW environment variable to the password and then there will be no prompt.
 
 
@@ -43,62 +43,62 @@ OPTIONS
 
 
 
-\ **-h|-**\ **-help**\ 
- 
+\ **-h|-**\ **-help**\
+
  Displays the usage message.
- 
 
 
-\ **-v|-**\ **-version**\ 
- 
+
+\ **-v|-**\ **-version**\
+
  Displays the release version of the code.
- 
 
 
-\ **-V|-**\ **-verbose**\ 
- 
+
+\ **-V|-**\ **-verbose**\
+
  Displays verbose messages.
- 
 
 
-\ **-i|-**\ **-init**\ 
- 
- The init option is used to setup an installed PostgreSQL database so that xCAT can use the database.  This involves creating the xcat database, the xcat admin id, allowing access to the xcatdb database by the Management Node. It customizes the postgresql.conf configuration file, adds the management server to the pg_hba.conf and starts the PostgreSQL server.  It also backs up the current xCAT database and restores it into the newly setup xcatdb PostgreSQL database.  It creates the /etc/xcat/cfgloc file to point the xcatd daemon to the PostgreSQL database and restarts the xcatd daemon using the database. 
+
+\ **-i|-**\ **-init**\
+
+ The init option is used to setup an installed PostgreSQL database so that xCAT can use the database.  This involves creating the xcat database, the xcat admin id, allowing access to the xcatdb database by the Management Node. It customizes the postgresql.conf configuration file, adds the management server to the pg_hba.conf and starts the PostgreSQL server.  It also backs up the current xCAT database and restores it into the newly setup xcatdb PostgreSQL database.  It creates the /etc/xcat/cfgloc file to point the xcatd daemon to the PostgreSQL database and restarts the xcatd daemon using the database.
  On AIX, it additionally setup the xcatadm unix id and the postgres id and group. For AIX, you should be using the PostgreSQL rpms available from the xCAT website. For Linux, you should use the PostgreSQL rpms shipped with the OS. You can chose the -o option, to run after the init.
  To add additional nodes to access the PostgreSQL server, setup on the Management Node, use the -a option.
- 
+
  For more documentation see:Setting_Up_PostgreSQL_as_the_xCAT_DB
- 
 
 
-\ **-N|-**\ **-nostart**\ 
- 
+
+\ **-N|-**\ **-nostart**\
+
  This option with the -i flag will create the database, but will not backup and restore xCAT tables into the database. It will create the cfgloc file such that the next start of xcatd will try and contact the database.  This can be used to setup the xCAT PostgreSQL database during or before install.
- 
 
 
-\ **-l|-**\ **-listen**\  \ *address*\ 
- 
+
+\ **-l|-**\ **-listen**\  \ *address*\
+
  This option is used to specify additional IP addresses on which the PostgreSQL database will listen.  Without it, only localhost (on Linux) and the management node's main IP (on Linux and AIX) will be configured.  This option can be specified multiple times.
- 
 
 
-\ **-a|-**\ **-access**\  \ *address*\ 
- 
+
+\ **-a|-**\ **-access**\  \ *address*\
+
  This option is used to specify additional IP addresses from which the additional nodes will connect to the PostgreSQL database, for example, service nodes IP addresses or MN HA primary/standby nodes physical IP addresses.  Without it, only the management node will be configured for database access.  This option can be specified multiple times.
- 
 
 
-\ **-P|-**\ **-PCM**\ 
- 
+
+\ **-P|-**\ **-PCM**\
+
  This option sets up PostgreSQL database to be used with xCAT running with PCM.
- 
 
 
-\ **-o|-**\ **-odbc**\ 
- 
+
+\ **-o|-**\ **-odbc**\
+
  This option sets up the ODBC  /etc/../odbcinst.ini, /etc/../odbc.ini and the .odbc.ini file in roots home directory will be created and initialized to run off the xcatdb PostgreSQL database.
- 
+
 
 
 
@@ -108,10 +108,10 @@ ENVIRONMENT VARIABLES
 
 
 
-\ **XCATPGPW**\ 
- 
+\ **XCATPGPW**\
+
  The password to be used to setup the xCAT admin id for the database.
- 
+
 
 
 
@@ -122,22 +122,22 @@ EXAMPLES
 
 
 1. To setup PostgreSQL for xCAT to run on the PostgreSQL xcatdb database :
- 
- 
+
+
  .. code-block:: perl
- 
+
    pgsqlsetup -i
- 
- 
+
+
 
 
 2.  To setup the ODBC for PostgreSQL xcatdb database access :
- 
- 
+
+
  .. code-block:: perl
- 
+
    pgsqlsetup -o
- 
- 
+
+
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/pping.1.rst b/docs/source/guides/admin-guides/references/man1/pping.1.rst
index 92e680380..20bad2a90 100644
--- a/docs/source/guides/admin-guides/references/man1/pping.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/pping.1.rst
@@ -11,7 +11,7 @@ SYNOPSIS
 ********
 
 
-\ **pping**\  [\ **-i | -**\ **-interface**\  \ *interfaces*\ ] [\ **-f | -**\ **-use_fping**\ ] \ *noderange*\ 
+\ **pping**\  [\ **-i | -**\ **-interface**\  \ *interfaces*\ ] [\ **-f | -**\ **-use_fping**\ ] \ *noderange*\
 
 \ **pping**\  [\ **-h | -**\ **-help**\ ]
 
@@ -36,32 +36,32 @@ OPTIONS
 
 
 
-\ **-i | -**\ **-interface**\  \ *interfaces*\ 
- 
+\ **-i | -**\ **-interface**\  \ *interfaces*\
+
  A comma separated list of network interface names that should be pinged instead of the interface represented by the nodename/hostname.
  The following name resolution convention is assumed:  an interface is reachable by the hostname <nodename>-<interface>.  For example,
  the ib2 interface on node3 has a hostname of node3-ib2.
- 
+
  If more than one interface is specified, each interface will be combined with the nodenames as described above and will be pinged in turn.
- 
 
 
-\ **-f | -**\ **-use_fping**\ 
- 
- Use \ **fping**\  instead of \ **nmap**\ 
- 
+
+\ **-f | -**\ **-use_fping**\
+
+ Use \ **fping**\  instead of \ **nmap**\
 
 
-\ **-h | -**\ **-help**\ 
- 
+
+\ **-h | -**\ **-help**\
+
  Show usage information.
- 
 
 
-\ **-v | -**\ **-version**\ 
- 
+
+\ **-v | -**\ **-version**\
+
  Display the installed version of xCAT.
- 
+
 
 
 
@@ -72,46 +72,46 @@ EXAMPLES
 
 
 1.
- 
- 
+
+
  .. code-block:: perl
- 
+
    pping all
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    node1: ping
    node2: ping
    node3: noping
- 
- 
+
+
 
 
 2.
- 
- 
+
+
  .. code-block:: perl
- 
+
    pping all -i ib0,ib1
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    node1-ib0: ping
    node2-ib0: ping
    node3-ib0: noping
    node1-ib1: ping
    node2-ib1: ping
    node3-ib1: noping
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/ppping.1.rst b/docs/source/guides/admin-guides/references/man1/ppping.1.rst
index c957e330d..2dd33df35 100644
--- a/docs/source/guides/admin-guides/references/man1/ppping.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/ppping.1.rst
@@ -11,7 +11,7 @@ SYNOPSIS
 ********
 
 
-\ **ppping**\  [\ **-i | -**\ **-interface**\  \ *interfaces*\ ] [\ **-d | -**\ **-debug**\ ] [\ **-V | -**\ **-verbose**\ ] [\ **-q | -**\ **-quiet**\ ] [\ **-s | -**\ **-serial**\ ] \ *noderange*\ 
+\ **ppping**\  [\ **-i | -**\ **-interface**\  \ *interfaces*\ ] [\ **-d | -**\ **-debug**\ ] [\ **-V | -**\ **-verbose**\ ] [\ **-q | -**\ **-quiet**\ ] [\ **-s | -**\ **-serial**\ ] \ *noderange*\
 
 \ **ppping**\  [\ **-h | -**\ **-help**\ ]
 
@@ -35,52 +35,52 @@ OPTIONS
 
 
 
-\ **-s**\ 
- 
+\ **-s**\
+
  Ping serially instead of in parallel.
- 
 
 
-\ **-i | -**\ **-interface**\  \ *interfaces*\ 
- 
+
+\ **-i | -**\ **-interface**\  \ *interfaces*\
+
  A comma separated list of network interface names that should be pinged instead of the interface represented by the nodename/hostname.
  The following name resolution convention is assumed:  an interface is reachable by the hostname <nodename>-<interface>.  For example,
  the ib2 interface on node3 has a hostname of node3-ib2.
- 
+
  If more than one interface is specified, each interface will be combined with the nodenames as described above and will be pinged in turn.
- 
 
 
-\ **-V | -**\ **-verbose**\ 
- 
+
+\ **-V | -**\ **-verbose**\
+
  Display verbose output.  The result of every ping attempt from every node will be displayed.  Without this option, just a summary
  of the successful pings are displayed, along with all of the unsuccessful pings.
- 
 
 
-\ **-q | -**\ **-quiet**\ 
- 
+
+\ **-q | -**\ **-quiet**\
+
  Display minimum output:  just the unsuccessful pings.  This option has the effect that if all pings are successful, nothing is displayed.
  But it also has the performance benefit that each node does not have to send successful ping info back to the management node.
- 
 
 
-\ **-d | -**\ **-debug**\ 
- 
+
+\ **-d | -**\ **-debug**\
+
  Print debug information.
- 
 
 
-\ **-h | -**\ **-help**\ 
- 
+
+\ **-h | -**\ **-help**\
+
  Show usage information.
- 
 
 
-\ **-v | -**\ **-version**\ 
- 
+
+\ **-v | -**\ **-version**\
+
  Display the installed version of xCAT.
- 
+
 
 
 
@@ -91,40 +91,40 @@ EXAMPLES
 
 
 1.
- 
- 
+
+
  .. code-block:: perl
- 
+
    ppping all -q
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    blade7: node2: noping
    blade8: node2: noping
    blade9: node2: noping
    devmaster: node2: noping
    node2: noping
- 
- 
+
+
 
 
 2.
- 
- 
+
+
  .. code-block:: perl
- 
+
    ppping node1,node2 -i ib0,ib1,ib2,ib3
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    node1: pinged all nodes successfully on interface ib0
    node1: pinged all nodes successfully on interface ib1
    node1: pinged all nodes successfully on interface ib2
@@ -133,8 +133,8 @@ EXAMPLES
    node2: pinged all nodes successfully on interface ib1
    node2: pinged all nodes successfully on interface ib2
    node2: pinged all nodes successfully on interface ib3
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/prsync.1.rst b/docs/source/guides/admin-guides/references/man1/prsync.1.rst
index 7bee4871f..55e447be7 100644
--- a/docs/source/guides/admin-guides/references/man1/prsync.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/prsync.1.rst
@@ -15,20 +15,20 @@ prsync - parallel rsync
 
 
 ****************
-\ **Synopsis**\ 
+\ **Synopsis**\
 ****************
 
 
-\ **prsync**\  \ *filename*\  [\ *filename*\  \ *...*\ ] \ *noderange:destinationdirectory*\ 
+\ **prsync**\  \ *filename*\  [\ *filename*\  \ *...*\ ] \ *noderange:destinationdirectory*\
 
 \ **prsync**\   [\ **-o**\  \ *rsyncopts*\ ] [\ **-f**\  \ *fanout*\ ] [\ *filename*\  \ *filename*\  \ *...*\ ] [\ *directory*\  \ *directory*\  \ *...*\ ]
-\ *noderange:destinationdirectory*\ 
+\ *noderange:destinationdirectory*\
 
 \ **prsync**\  {\ **-h | -**\ **-help | -v | -**\ **-version**\ }
 
 
 *******************
-\ **Description**\ 
+\ **Description**\
 *******************
 
 
@@ -40,91 +40,91 @@ Note:  this command does not support the xcatd client/server communication and t
 
 
 ***************
-\ **Options**\ 
+\ **Options**\
 ***************
 
 
 
-\ **-o**\  \ *rsyncopts*\ 
- 
+\ **-o**\  \ *rsyncopts*\
+
  rsync options.  See \ **rsync(1)**\ .
- 
 
 
-\ **-f**\  \ *fanout*\ 
- 
+
+\ **-f**\  \ *fanout*\
+
  Specifies a fanout value for the maximum number of concurrently executing remote shell processes.
- 
 
 
-\ *filename*\ 
- 
+
+\ *filename*\
+
  A space delimited list of files to rsync.
- 
 
 
-\ *directory*\ 
- 
+
+\ *directory*\
+
  A space delimited list of directories to rsync.
- 
 
 
-\ *noderange:destination*\ 
- 
+
+\ *noderange:destination*\
+
  A noderange(3)|noderange.3 and destination directory.  The : is required.
- 
 
 
-\ **-h | -**\ **-help**\ 
- 
+
+\ **-h | -**\ **-help**\
+
  Print help.
- 
 
 
-\ **-v | -**\ **-version**\ 
- 
+
+\ **-v | -**\ **-version**\
+
  Print version.
- 
 
 
 
-\ **XCATPSHFANOUT**\ 
- 
+
+\ **XCATPSHFANOUT**\
+
  Specifies  the fanout value. This variable is overridden by
  the \ **-f**\  flag.  Default is 64.
- 
+
 
 
 
 ****************
-\ **Examples**\ 
+\ **Examples**\
 ****************
 
 
 
 1.
- 
- 
+
+
  .. code-block:: perl
- 
+
    cd /install; prsync -o "crz" post stage:/install
- 
- 
+
+
 
 
 2.
- 
- 
+
+
  .. code-block:: perl
- 
+
    prsync passwd group rack01:/etc
- 
- 
+
+
 
 
 
 ************************
-\ **See**\  \ **Also**\ 
+\ **See**\  \ **Also**\
 ************************
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/pscp.1.rst b/docs/source/guides/admin-guides/references/man1/pscp.1.rst
index 48d9a2af9..0a98b5f2d 100644
--- a/docs/source/guides/admin-guides/references/man1/pscp.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/pscp.1.rst
@@ -15,17 +15,17 @@ Name
 
 
 ****************
-\ **Synopsis**\ 
+\ **Synopsis**\
 ****************
 
 
-\ **pscp**\  [\ **-i**\  \ *suffix*\ ] [\ *scp options*\  \ *...*\ ] [\ **-f**\  \ *fanout*\ ] \ *filename*\  [\ *filename*\  \ *...*\ ] \ *noderange:destinationdirectory*\ 
+\ **pscp**\  [\ **-i**\  \ *suffix*\ ] [\ *scp options*\  \ *...*\ ] [\ **-f**\  \ *fanout*\ ] \ *filename*\  [\ *filename*\  \ *...*\ ] \ *noderange:destinationdirectory*\
 
 \ **pscp**\  {\ **-h | -**\ **-help | -v | -**\ **-version**\ }
 
 
 *******************
-\ **Description**\ 
+\ **Description**\
 *******************
 
 
@@ -41,92 +41,92 @@ management node to the compute node via a service node.
 
 
 ***************
-\ **Options**\ 
+\ **Options**\
 ***************
 
 
 
-\ **-f**\  \ *fanout*\ 
- 
+\ **-f**\  \ *fanout*\
+
  Specifies a fanout value for the maximum number of  concur-
  rently  executing  remote shell processes.
- 
 
 
-\ **-i**\  \ *suffix*\ 
- 
+
+\ **-i**\  \ *suffix*\
+
  Interfaces to be used.
- 
 
 
-\ *scp options*\ 
- 
- See \ **scp(1)**\ 
- 
+
+\ *scp options*\
+
+ See \ **scp(1)**\
 
 
-\ *filename*\ 
- 
+
+\ *filename*\
+
  A space delimited list of files to copy. If \ **-r**\  is passed as an scp option, directories may be specified as well.
- 
 
 
-\ *noderange:destination*\ 
- 
+
+\ *noderange:destination*\
+
  A noderange(3)|noderange.3 and destination directory.  The : is required.
- 
 
 
-\ **-h | -**\ **-help**\ 
- 
+
+\ **-h | -**\ **-help**\
+
  Print help.
- 
 
 
-\ **-v | -**\ **-version**\ 
- 
+
+\ **-v | -**\ **-version**\
+
  Print version.
- 
 
 
 
-\ **XCATPSHFANOUT**\ 
- 
+
+\ **XCATPSHFANOUT**\
+
  Specifies  the fanout value. This variable is overridden by
  the \ **-f**\  flag.  Default is 64.
- 
+
 
 
 
 ****************
-\ **Examples**\ 
+\ **Examples**\
 ****************
 
 
 
 1.
- 
- 
+
+
  .. code-block:: perl
- 
+
    pscp -r /usr/local node1,node3:/usr/local
- 
- 
+
+
 
 
 2.
- 
- 
+
+
  .. code-block:: perl
- 
+
    pscp passwd group rack01:/etc
- 
- 
+
+
 
 
 
 ************************
-\ **See**\  \ **Also**\ 
+\ **See**\  \ **Also**\
 ************************
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/psh.1.rst b/docs/source/guides/admin-guides/references/man1/psh.1.rst
index e264a9e75..dc847a489 100644
--- a/docs/source/guides/admin-guides/references/man1/psh.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/psh.1.rst
@@ -15,17 +15,17 @@ psh - parallel remote shell
 
 
 ****************
-\ **Synopsis**\ 
+\ **Synopsis**\
 ****************
 
 
-\ **psh**\  [\ **-i**\  \ *interface*\ ] [\ **-f**\  \ *fanout*\ ] [\ **-l**\  \ *user*\ ] \ *noderange*\  \ *command*\ 
+\ **psh**\  [\ **-i**\  \ *interface*\ ] [\ **-f**\  \ *fanout*\ ] [\ **-l**\  \ *user*\ ] \ *noderange*\  \ *command*\
 
 \ **psh**\  {\ **-h | -**\ **-help | -v | -**\ **-version**\ }
 
 
 *******************
-\ **Description**\ 
+\ **Description**\
 *******************
 
 
@@ -44,129 +44,129 @@ management node to the compute node via a service node.
 
 
 ***************
-\ **Options**\ 
+\ **Options**\
 ***************
 
 
 
-\ **-i**\  \ *interface*\ 
- 
+\ **-i**\  \ *interface*\
+
  The NIC on the node that psh should communicate with.  For example, if \ *interface*\  is \ **eth1**\ ,
  then psh will concatenate \ **-eth1**\  to the end of every node name before ssh'ing to it.  This
  assumes those host names have been set up to resolve to the IP address of each of the eth1 NICs.
- 
 
 
-\ **-f**\  \ *fanout*\ 
- 
+
+\ **-f**\  \ *fanout*\
+
  Specifies a fanout value for the maximum number of  concur-
  rently  executing  remote shell processes.
- 
 
 
-\ **-l**\  \ *user*\ 
- 
+
+\ **-l**\  \ *user*\
+
  Log into the nodes as the specified username.  The default is to use the same username as you
  are running the psh command as.
- 
 
 
-\ **-n|-**\ **-nonodecheck**\ 
- 
+
+\ **-n|-**\ **-nonodecheck**\
+
  Do not send the noderange to xcatd to expand it into a list of nodes.  Instead, use the noderange exactly as it is specified.
  In this case, the noderange must be a simple list of comma-separated hostnames of the nodes.
  This allows you to run \ **psh**\  even when xcatd is not running.
- 
 
 
-\ *noderange*\ 
- 
+
+\ *noderange*\
+
  See noderange(3)|noderange.3.
- 
 
 
-\ *command*\ 
- 
- Command  to  be run in parallel.  If no command is give then \ **psh**\ 
+
+\ *command*\
+
+ Command  to  be run in parallel.  If no command is give then \ **psh**\
  enters interactive mode.  In interactive mode a  ">"  prompt  is
  displayed.   Any  command entered is executed in parallel to the
  nodes in the noderange. Use "exit" or "Ctrl-D" to end the interactive session.
- 
 
 
-\ **-h | -**\ **-help**\ 
- 
+
+\ **-h | -**\ **-help**\
+
  Print help.
- 
+
 
 
 
 *************************************
-\ **Environment**\  \ **Variables**\ 
+\ **Environment**\  \ **Variables**\
 *************************************
 
 
 
-\ **XCATPSHFANOUT**\ 
- 
+\ **XCATPSHFANOUT**\
+
  Specifies  the fanout value. This variable is overridden by
  the \ **-f**\  flag.  Default is 64.
- 
+
 
 
 
 ****************
-\ **Examples**\ 
+\ **Examples**\
 ****************
 
 
 
 1. Run uptime on 3 nodes:
- 
- 
+
+
  .. code-block:: perl
- 
+
    psh node4-node6 uptime
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    node4: Sun Aug  5 17:42:06 MDT 2001
    node5: Sun Aug  5 17:42:06 MDT 2001
    node6: Sun Aug  5 17:42:06 MDT 2001
- 
- 
+
+
 
 
 2. Run a command on some BladeCenter management modules:
- 
- 
+
+
  .. code-block:: perl
- 
+
    psh amm1-amm5 'info -T mm[1]'
- 
- 
+
+
 
 
 3. Remove the tmp files on the nodes in the 1st frame:
- 
- 
+
+
  .. code-block:: perl
- 
+
    psh rack01 'rm -f /tmp/*'
- 
- 
+
+
  Notice the use of '' to forward shell expansion.  This is not necessary
  in interactive mode.
- 
+
 
 
 
 ************************
-\ **See**\  \ **Also**\ 
+\ **See**\  \ **Also**\
 ************************
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/pushinitrd.1.rst b/docs/source/guides/admin-guides/references/man1/pushinitrd.1.rst
index 7b1ea8919..42e359602 100644
--- a/docs/source/guides/admin-guides/references/man1/pushinitrd.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/pushinitrd.1.rst
@@ -49,24 +49,24 @@ OPTIONS
 
 
 
-\ **-w**\  \ *waittime*\ 
- 
+\ **-w**\  \ *waittime*\
+
  The number of seconds the initrd should wait before trying to communicate over the network.
  The default is 75.  This translates into the netwait kernel parameter and is usually needed
  in a SoftLayer environment because it can take a while for a NIC to be active after changing state.
- 
 
 
-\ **-?|-h|-**\ **-help**\ 
- 
+
+\ **-?|-h|-**\ **-help**\
+
  Display usage message.
- 
 
 
-\ **-v|-**\ **-version**\ 
- 
+
+\ **-v|-**\ **-version**\
+
  Command Version.
- 
+
 
 
 
@@ -87,15 +87,15 @@ EXAMPLES
 
 
 1.
- 
+
  Configure nodes for net installing in a SoftLayer environment:
- 
- 
+
+
  .. code-block:: perl
- 
+
    pushinitrd <noderange>
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/rbootseq.1.rst b/docs/source/guides/admin-guides/references/man1/rbootseq.1.rst
index fece3a79f..6075619ea 100644
--- a/docs/source/guides/admin-guides/references/man1/rbootseq.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/rbootseq.1.rst
@@ -17,21 +17,21 @@ Blade specific:
 ===============
 
 
-\ **rbootseq**\  \ *noderange*\  {\ **hd0 | hd1 | hd2 | hd3 | net | iscsi | iscsicrit | cdrom | usbflash | floppy | none | list | stat**\ }\ **,**\ \ *...*\ 
+\ **rbootseq**\  \ *noderange*\  {\ **hd0 | hd1 | hd2 | hd3 | net | iscsi | iscsicrit | cdrom | usbflash | floppy | none | list | stat**\ }\ **,**\ \ *...*\
 
 
 HP Blade specific:
 ==================
 
 
-\ **rbootseq**\  \ *noderange*\  {\ **hd | net1 | net2 | net3 | net4 | cdrom | usbflash | floppy | none**\ }\ **,**\ \ *...*\ 
+\ **rbootseq**\  \ *noderange*\  {\ **hd | net1 | net2 | net3 | net4 | cdrom | usbflash | floppy | none**\ }\ **,**\ \ *...*\
 
 
 PPC (using Direct FSP Management) specific:
 ===========================================
 
 
-\ **rbootseq**\  \ *noderange*\  \ **[hfi|net]**\ 
+\ **rbootseq**\  \ *noderange*\  \ **[hfi|net]**\
 
 
 
@@ -58,106 +58,106 @@ OPTIONS
 
 
 
-\ **hd0 | harddisk0 | hd | harddisk**\ 
- 
+\ **hd0 | harddisk0 | hd | harddisk**\
+
  The first hard disk.
- 
 
 
-\ **hd1 | harddisk1**\ 
- 
+
+\ **hd1 | harddisk1**\
+
  The second hard disk.
- 
 
 
-\ **hd2 | harddisk2**\ 
- 
+
+\ **hd2 | harddisk2**\
+
  The third hard disk.
- 
 
 
-\ **hd3 | harddisk3**\ 
- 
+
+\ **hd3 | harddisk3**\
+
  The fourth hard disk.
- 
 
 
-\ **n | net | network**\ 
- 
+
+\ **n | net | network**\
+
  Boot over the ethernet network, using a PXE or BOOTP broadcast.
- 
+
 
 
 \ **n | net | network | net1 | nic1**\  (HP Blade Only)
- 
+
  Boot over the first ethernet network, using a PXE or BOOTP broadcast.
- 
+
 
 
 \ **net2 | nic2**\  (HP Blade Only)
- 
+
  Boot over the second ethernet network, using a PXE or BOOTP broadcast.
- 
+
 
 
 \ **net3 | nic3**\  (HP Blade Only)
- 
+
  Boot over the third ethernet network, using a PXE or BOOTP broadcast.
- 
+
 
 
 \ **net3 | nic3**\  (HP Blade Only)
- 
+
  Boot over the fourth ethernet network, using a PXE or BOOTP broadcast.
- 
 
 
-\ **hfi**\ 
- 
+
+\ **hfi**\
+
  Boot p775 nodes over the HFI network, using BOOTP broadcast.
- 
 
 
-\ **iscsi**\ 
- 
+
+\ **iscsi**\
+
  Boot to an iSCSI disk over the network.
- 
 
 
-\ **iscsicrit**\ 
- 
+
+\ **iscsicrit**\
+
  ??
- 
 
 
-\ **cd | cdrom**\ 
- 
+
+\ **cd | cdrom**\
+
  The CD or DVD drive.
- 
 
 
-\ **usbflash | usb | flash**\ 
- 
+
+\ **usbflash | usb | flash**\
+
  A USB flash drive.
- 
 
 
-\ **floppy**\ 
- 
+
+\ **floppy**\
+
  The floppy drive.
- 
 
 
-\ **none**\ 
- 
+
+\ **none**\
+
  If it gets to this part of the sequence, do not boot.  Can not be specified 1st, or before any real boot devices.
- 
 
 
-\ **list | stat**\ 
- 
+
+\ **list | stat**\
+
  Display the current boot sequence.
- 
+
 
 
 
@@ -168,16 +168,16 @@ EXAMPLES
 
 
 1.
- 
+
  Set blades 14-56 and 70-203 to try to boot first from the CD drive, then the floppy drive, then
  the network, and finally from the 1st hard disk:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rbootseq blade[14-56],blade[70-203] c,f,n,hd0
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/rcons.1.rst b/docs/source/guides/admin-guides/references/man1/rcons.1.rst
index 394edb226..0a9ddc63a 100644
--- a/docs/source/guides/admin-guides/references/man1/rcons.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/rcons.1.rst
@@ -15,7 +15,7 @@ Name
 
 
 ****************
-\ **Synopsis**\ 
+\ **Synopsis**\
 ****************
 
 
@@ -25,7 +25,7 @@ Name
 
 
 *******************
-\ **Description**\ 
+\ **Description**\
 *******************
 
 
@@ -39,41 +39,41 @@ To exit the console session, enter: 'ctrl-e c .' (3 characters: ctrl-e, 'c' and
 
 
 ***************
-\ **Options**\ 
+\ **Options**\
 ***************
 
 
 
-\ **-f**\ 
- 
+\ **-f**\
+
  If another console for this node is already open in read-write mode, force that console into read-only (spy) mode, and
  open this console in read-write mode.  If -f is not specified, this console will be put in spy mode if another console
  is already open in read-write mode. The -f flag can not be used with the -s flag.
- 
 
 
-\ **-s**\ 
- 
- Open the console in read-only (spy) mode, in this mode all the escape sequences work, but all other keyboard input is 
+
+\ **-s**\
+
+ Open the console in read-only (spy) mode, in this mode all the escape sequences work, but all other keyboard input is
  discarded. The -s flag can not be used with the -f flag.
- 
 
 
-\ **-h | -**\ **-help**\ 
- 
+
+\ **-h | -**\ **-help**\
+
  Print help.
- 
 
 
-\ **-v | -**\ **-version**\ 
- 
+
+\ **-v | -**\ **-version**\
+
  Print version.
- 
+
 
 
 
 *************
-\ **Files**\ 
+\ **Files**\
 *************
 
 
@@ -84,7 +84,7 @@ method.
 
 
 ****************
-\ **Examples**\ 
+\ **Examples**\
 ****************
 
 
@@ -96,7 +96,7 @@ method.
 
 
 ************************
-\ **See**\  \ **Also**\ 
+\ **See**\  \ **Also**\
 ************************
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/regnotif.1.rst b/docs/source/guides/admin-guides/references/man1/regnotif.1.rst
index 2460784b2..17d38a4c5 100644
--- a/docs/source/guides/admin-guides/references/man1/regnotif.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/regnotif.1.rst
@@ -19,9 +19,9 @@ SYNOPSIS
 ********
 
 
-\ **regnotif [-h| -**\ **-help]**\ 
+\ **regnotif [-h| -**\ **-help]**\
 
-\ **regnotif  [-v| -**\ **-version]**\ 
+\ **regnotif  [-v| -**\ **-version]**\
 
 \ **regnotif**\  \ *filename tablename[,tablename]...*\  [\ **-o | -**\ **-operation**\  \ *actions*\ ]
 
diff --git a/docs/source/guides/admin-guides/references/man1/renergy.1.rst b/docs/source/guides/admin-guides/references/man1/renergy.1.rst
index 59a787916..d9e5a5be4 100644
--- a/docs/source/guides/admin-guides/references/man1/renergy.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/renergy.1.rst
@@ -7,7 +7,7 @@ renergy.1
 
 
 ************
-\ **NAME**\ 
+\ **NAME**\
 ************
 
 
@@ -15,7 +15,7 @@ renergy.1
 
 
 ****************
-\ **SYNOPSIS**\ 
+\ **SYNOPSIS**\
 ****************
 
 
@@ -23,102 +23,102 @@ renergy.1
 
 \ **renergy**\  [\ **-v**\  | \ **-**\ **-version**\ ]
 
-\ **Power 6 server specific :**\ 
+\ **Power 6 server specific :**\
 
 
 \ **renergy**\  \ *noderange*\  [\ **-V**\ ] {\ **all | [savingstatus] [cappingstatus] [cappingmaxmin] [cappingvalue] [cappingsoftmin] [averageAC] [averageDC] [ambienttemp] [exhausttemp] [CPUspeed] [syssbpower] [sysIPLtime]**\ }
 
 \ **renergy**\  \ *noderange*\  [\ **-V**\ ] {\ **savingstatus={on | off} | cappingstatus={on | off} | cappingwatt=watt | cappingperc=percentage**\ }
 
-\ **Power 7 server specific :**\ 
+\ **Power 7 server specific :**\
 
 
 \ **renergy**\  \ *noderange*\  [\ **-V**\ ] {\ **all | [savingstatus] [dsavingstatus] [cappingstatus] [cappingmaxmin] [cappingvalue] [cappingsoftmin] [averageAC] [averageDC] [ambienttemp] [exhausttemp] [CPUspeed] [syssbpower] [sysIPLtime] [fsavingstatus] [ffoMin] [ffoVmin] [ffoTurbo] [ffoNorm] [ffovalue]**\ }
 
 \ **renergy**\  \ *noderange*\  [\ **-V**\ ] {\ **savingstatus={on | off} | dsavingstatus={on-norm | on-maxp | off} | fsavingstatus={on | off} | ffovalue=MHZ | cappingstatus={on | off} | cappingwatt=watt | cappingperc=percentage**\ }
 
-\ **Power 8 server specific :**\ 
+\ **Power 8 server specific :**\
 
 
 \ **renergy**\  \ *noderange*\  [\ **-V**\ ] {\ **all | [savingstatus] [dsavingstatus] [averageAC] [averageAChistory] [averageDC] [averageDChistory] [ambienttemp] [ambienttemphistory] [exhausttemp] [exhausttemphistory] [fanspeed] [fanspeedhistory] [CPUspeed] [CPUspeedhistory] [syssbpower] [sysIPLtime] [fsavingstatus] [ffoMin] [ffoVmin] [ffoTurbo] [ffoNorm] [ffovalue]**\ }
 
-\ **renergy**\  \ *noderange*\  \ **[-V] {savingstatus={on | off} | dsavingstatus={on-norm | on-maxp | off} | fsavingstatus={on | off} | ffovalue=MHZ }**\ 
+\ **renergy**\  \ *noderange*\  \ **[-V] {savingstatus={on | off} | dsavingstatus={on-norm | on-maxp | off} | fsavingstatus={on | off} | ffovalue=MHZ }**\
 
-\ *NOTE:*\  The setting operation for \ **Power 8**\  server is only supported 
-for the server which is running in PowerVM mode. Do NOT run the setting 
+\ *NOTE:*\  The setting operation for \ **Power 8**\  server is only supported
+for the server which is running in PowerVM mode. Do NOT run the setting
 for the server which is running in OPAL mode.
 
-\ **BladeCenter specific :**\ 
+\ **BladeCenter specific :**\
 
 
-\ **For Management Modules:**\ 
+\ **For Management Modules:**\
 
 
 \ **renergy**\  \ *noderange*\  [\ **-V**\ ] {\ **all | pd1all | pd2all | [pd1status] [pd2status] [pd1policy] [pd2policy] [pd1powermodule1] [pd1powermodule2] [pd2powermodule1] [pd2powermodule2] [pd1avaiablepower] [pd2avaiablepower] [pd1reservedpower] [pd2reservedpower] [pd1remainpower] [pd2remainpower] [pd1inusedpower] [pd2inusedpower] [availableDC] [averageAC] [thermaloutput] [ambienttemp] [mmtemp]**\ }
 
-\ **For a blade server nodes:**\ 
+\ **For a blade server nodes:**\
 
 
 \ **renergy**\  \ *noderange*\  [\ **-V**\ ] {\ **all | [averageDC] [capability] [cappingvalue] [CPUspeed] [maxCPUspeed] [savingstatus] [dsavingstatus]**\ }
 
 \ **renergy**\  \ *noderange*\  [\ **-V**\ ] {\ **savingstatus={on | off} | dsavingstatus={on-norm | on-maxp | off}**\ }
 
-\ **Flex specific :**\ 
+\ **Flex specific :**\
 
 
-\ **For Flex Management Modules:**\ 
+\ **For Flex Management Modules:**\
 
 
 \ **renergy**\  \ *noderange*\  [\ **-V**\ ] {\ **all | [powerstatus] [powerpolicy] [powermodule] [avaiablepower] [reservedpower] [remainpower] [inusedpower] [availableDC] [averageAC] [thermaloutput] [ambienttemp] [mmtemp]**\ }
 
-\ **For Flex node (power and x86):**\ 
+\ **For Flex node (power and x86):**\
 
 
 \ **renergy**\  \ *noderange*\  [\ **-V**\ ] {\ **all | [averageDC] [capability] [cappingvalue] [cappingmaxmin] [cappingmax] [cappingmin] [cappingGmin] [CPUspeed] [maxCPUspeed] [savingstatus] [dsavingstatus]**\ }
 
 \ **renergy**\  \ *noderange*\  [\ **-V**\ ] {\ **cappingstatus={on | off} | cappingwatt=watt | cappingperc=percentage | savingstatus={on | off} | dsavingstatus={on-norm | on-maxp | off}**\ }
 
-\ **iDataPlex specific :**\ 
+\ **iDataPlex specific :**\
 
 
 \ **renergy**\  \ *noderange*\  [\ **-V**\ ] [{\ **cappingmaxmin | cappingmax | cappingmin}] [cappingstatus] [cappingvalue] [relhistogram]**\ }
 
 \ **renergy**\  \ *noderange*\  [\ **-V**\ ] {\ **cappingstatus={on | enable | off | disable} | {cappingwatt|cappingvalue}=watt**\ }
 
-\ **OpenPOWER server specific :**\ 
+\ **OpenPOWER server specific :**\
 
 
 \ **renergy**\  \ *noderange*\  {\ **powerusage | temperature**\ }
 
 
 *******************
-\ **DESCRIPTION**\ 
+\ **DESCRIPTION**\
 *******************
 
 
 This \ **renergy**\  command can be used to manage the energy consumption of
-IBM servers which support IBM EnergyScale technology. Through this command, 
-user can query and set the power saving and power capping status, and also can 
-query the average consumed energy, the ambient and exhaust temperature, 
+IBM servers which support IBM EnergyScale technology. Through this command,
+user can query and set the power saving and power capping status, and also can
+query the average consumed energy, the ambient and exhaust temperature,
 the processor frequency for a server.
 
 \ **renergy**\  command supports IBM POWER6, POWER7 and POWER8 rack-mounted servers,
-BladeCenter management modules, blade servers, and iDataPlex servers. 
+BladeCenter management modules, blade servers, and iDataPlex servers.
 For \ *Power6*\  and \ *Power7*\  rack-mounted servers, the following specific hardware types are supported:
 \ *8203-E4A*\ , \ *8204-E8A*\ , \ *9125-F2A*\ , \ *8233-E8B*\ , \ *8236-E8C*\ .
 For \ *Power8*\  server, there's no hardware type restriction.
 
-The parameter \ *noderange*\  needs to be specified for the \ **renergy**\  command to 
-get the target servers. The \ *noderange*\  should be a list of CEC node names, blade 
+The parameter \ *noderange*\  needs to be specified for the \ **renergy**\  command to
+get the target servers. The \ *noderange*\  should be a list of CEC node names, blade
 management module node names or blade server node names. Lpar name
 is not acceptable here.
 
-\ **renergy**\  command can accept multiple of energy attributes to query or one of energy 
-attribute to set. If only the attribute name is specified, without the '=', \ **renergy**\  
-gets and displays the current value. Otherwise, if specifying the attribute with '=' like 
+\ **renergy**\  command can accept multiple of energy attributes to query or one of energy
+attribute to set. If only the attribute name is specified, without the '=', \ **renergy**\
+gets and displays the current value. Otherwise, if specifying the attribute with '=' like
 'savingstatus=on', \ **renergy**\  will set the attribute savingstatus to value 'on'.
 
-The attributes listed in the \ **SYNOPSIS**\  section are which ones can be handled by 
+The attributes listed in the \ **SYNOPSIS**\  section are which ones can be handled by
 \ **renergy**\  command. But for each specific type of server, there are some attributes that
 are not supported. If user specifies an attribute which is not supported by a specific
 server, the return value of this attribute will be 'na'.
@@ -128,7 +128,7 @@ server, the return value of this attribute will be 'na'.
 The supported attributes for each specific system p hardware type is listed as follows:
 
 
-\ **8203-E4A**\ , \ **8204-E8A**\ 
+\ **8203-E4A**\ , \ **8204-E8A**\
 
 
 Supported attributes:
@@ -139,7 +139,7 @@ exhausttemp,CPUspeed,syssbpower,sysIPLtime
 
 \ **Set**\ :   savingstatus,cappingstatus,cappingwatt,cappingperc
 
-\ **9125-F2A**\ 
+\ **9125-F2A**\
 
 
 Supported attributes:
@@ -149,7 +149,7 @@ CPUspeed
 
 \ **Set**\ :   savingstatus
 
-\ **8233-E8B**\ , \ **8236-E8C**\ 
+\ **8233-E8B**\ , \ **8236-E8C**\
 
 
 Supported attributes:
@@ -161,7 +161,7 @@ ambienttemp,exhausttemp,CPUspeed,syssbpower,sysIPLtime
 \ **Set**\ :   savingstatus,dsavingstatus,cappingstatus,cappingwatt,
 cappingperc
 
-\ **9125-F2C**\ , \ **9119-FHB**\ 
+\ **9125-F2C**\ , \ **9119-FHB**\
 
 
 Supported attributes:
@@ -174,10 +174,10 @@ fsavingstatus,ffoMin,ffoVmin,ffoTurbo,ffoNorm,ffovalue
 \ **Set**\ :   savingstatus,dsavingstatus,cappingstatus,cappingwatt,
 cappingperc,fsavingstatus,ffovalue
 
-\ **Non of Above**\ 
+\ **Non of Above**\
 
 
-For the machine type which is not in the above list, the following 
+For the machine type which is not in the above list, the following
 attributes can be tried but not guaranteed:
 
 \ **Query**\ : savingstatus,dsavingstatus,cappingstatus,cappingmin,
@@ -188,25 +188,25 @@ ambienttemp,exhausttemp,CPUspeed,syssbpower,sysIPLtime
 cappingperc
 
 Note:
-For system P CEC nodes, each query operation for attribute CPUspeed, averageAC 
+For system P CEC nodes, each query operation for attribute CPUspeed, averageAC
 or averageDC needs about 30 seconds to complete. The query for others attributes
 will get response immediately.
 
 
 *********************
-\ **PREREQUISITES**\ 
+\ **PREREQUISITES**\
 *********************
 
 
-For the \ *Power6*\  and \ *Power7*\  nodes, the \ **renergy**\  command depends 
-on the Energy Management Plugin \ **xCAT-pEnergy**\  to 
-communicate with server.  \ **xCAT-pEnergy**\  can be downloaded from the IBM web site: 
+For the \ *Power6*\  and \ *Power7*\  nodes, the \ **renergy**\  command depends
+on the Energy Management Plugin \ **xCAT-pEnergy**\  to
+communicate with server.  \ **xCAT-pEnergy**\  can be downloaded from the IBM web site:
 http://www.ibm.com/support/fixcentral/. (Other Software -> EM)
 
 NOTE: \ *Power8*\  nodes don't need this specific energy management package.
 
-For iDataPlex nodes, the \ **renergy**\  command depends 
-on the Energy Management Plugin \ **xCAT-xEnergy**\  to 
+For iDataPlex nodes, the \ **renergy**\  command depends
+on the Energy Management Plugin \ **xCAT-xEnergy**\  to
 communicate with server.  This plugin must be requested from IBM.
 
 (The support for BladeCenter energy management is built into base xCAT,
@@ -214,519 +214,519 @@ so no additional plugins are needed for BladeCenter.)
 
 
 ***************
-\ **OPTIONS**\ 
+\ **OPTIONS**\
 ***************
 
 
 
-\ **-h | -**\ **-help**\ 
- 
+\ **-h | -**\ **-help**\
+
  Display the usage message.
- 
 
 
-\ **-v | -**\ **-version**\ 
- 
+
+\ **-v | -**\ **-version**\
+
  Display the version information.
- 
 
 
-\ **-V**\ 
- 
+
+\ **-V**\
+
  Verbose output.
- 
 
 
-\ **all**\ 
- 
- Query all energy attributes which supported by the specific 
+
+\ **all**\
+
+ Query all energy attributes which supported by the specific
  type of hardware.
- 
+
  For \ *Power8*\  machines, will not display the attributes
  for historical records.
- 
 
 
-\ **pd1all**\ 
- 
+
+\ **pd1all**\
+
  Query all energy attributes of the power domain 1 for blade
  management module node.
- 
 
 
-\ **pd2all**\ 
- 
+
+\ **pd2all**\
+
  Query all energy attributes of the power domain 2 for blade
  management module node.
- 
 
 
-\ **ambienttemp**\ 
- 
+
+\ **ambienttemp**\
+
  Query the current ambient temperature. (Unit is centigrade)
- 
 
 
-\ **ambienttemphistory**\ 
- 
+
+\ **ambienttemphistory**\
+
  Query the historical records which were generated in last one hour for \ **ambienttemp**\ .
- 
 
 
-\ **availableDC**\ 
- 
+
+\ **availableDC**\
+
  Query the total DC power available for the entire blade center chassis.
- 
 
 
-\ **averageAC**\ 
- 
+
+\ **averageAC**\
+
  Query the average power consumed (Input). (Unit is watt)
- 
- Note: For 9125-F2A,9125-F2C server, the value of attribute 
+
+ Note: For 9125-F2A,9125-F2C server, the value of attribute
  averageAC is the aggregate for all of the servers in a rack.
- 
- Note: For Blade Center, the value of attribute 
+
+ Note: For Blade Center, the value of attribute
  averageAC is the total AC power being consumed by all modules
- in the chassis. It also includes power consumed by the Chassis 
+ in the chassis. It also includes power consumed by the Chassis
  Cooling Devices for BCH chassis.
- 
 
 
-\ **averageAChistory**\ 
- 
+
+\ **averageAChistory**\
+
  Query the historical records which were generated in last one hour for \ **averageAC**\ .
- 
 
 
-\ **averageDC**\ 
- 
+
+\ **averageDC**\
+
  Query the average power consumed (Output). (Unit is watt)
- 
 
 
-\ **averageDChistory**\ 
- 
+
+\ **averageDChistory**\
+
  Query the historical records which were generated in last one hour for \ **averageDC**\ .
- 
 
 
-\ **capability**\ 
- 
+
+\ **capability**\
+
  Query the Power Capabilities of the blade server.
- 
+
  staticPowerManagement: the module with the static worst case power values.
- 
- fixedPowermanagement: the module with the static power values but ability 
+
+ fixedPowermanagement: the module with the static power values but ability
  to throttle.
- 
- dynamicPowerManagement: the module with power meter capability, measurement 
+
+ dynamicPowerManagement: the module with power meter capability, measurement
  enabled, but capping disabled.
- 
- dynamicPowerMeasurement1: the module with power meter capability, measurement 
+
+ dynamicPowerMeasurement1: the module with power meter capability, measurement
  enabled, phase 1 only
- 
- dynamicPowerMeasurement2: the module with power meter capability, measurement 
+
+ dynamicPowerMeasurement2: the module with power meter capability, measurement
  enabled, phase 2 or higher
- 
- dynamicPowerMeasurementWithPowerCapping: the module with power meter capability, 
+
+ dynamicPowerMeasurementWithPowerCapping: the module with power meter capability,
  both measurement and capping enabled, phase 2 or higher
- 
 
 
-\ **cappingGmin**\ 
- 
+
+\ **cappingGmin**\
+
  Query the Guaranteed Minimum power capping value in watts.
- 
 
 
-\ **cappingmax**\ 
- 
+
+\ **cappingmax**\
+
  Query the Maximum of power capping value in watts.
- 
 
 
-\ **cappingmaxmin**\ 
- 
+
+\ **cappingmaxmin**\
+
  Query the Maximum and Minimum of power capping value in watts.
- 
 
 
-\ **cappingmin**\ 
- 
+
+\ **cappingmin**\
+
  Query the Minimum of power capping value in watts.
- 
 
 
-\ **cappingperc**\ =\ **percentage**\ 
- 
- Set the power capping value base on the percentage of 
- the max-min of capping value which getting from 
- \ *cappingmaxmim*\  attribute. The valid value must be 
+
+\ **cappingperc**\ =\ **percentage**\
+
+ Set the power capping value base on the percentage of
+ the max-min of capping value which getting from
+ \ *cappingmaxmim*\  attribute. The valid value must be
  from 0 to 100.
- 
 
 
-\ **cappingsoftmin**\ 
- 
- Query the minimum value that can be assigned to power 
+
+\ **cappingsoftmin**\
+
+ Query the minimum value that can be assigned to power
  capping without guaranteed enforceability. (Unit is watt)
- 
 
 
-\ **cappingstatus**\ 
- 
- Query the power capping status. The result should be 'on' 
+
+\ **cappingstatus**\
+
+ Query the power capping status. The result should be 'on'
  or 'off'.
- 
+
 
 
 \ **cappingstatus**\ ={\ **on**\  | \ **off**\ }
- 
- Set the power capping status. The value must be 'on' 
- or 'off'. This is the switch to turn on or turn off the 
+
+ Set the power capping status. The value must be 'on'
+ or 'off'. This is the switch to turn on or turn off the
  power capping function.
- 
 
 
-\ **cappingvalue**\ 
- 
+
+\ **cappingvalue**\
+
  Query the current power capping value. (Unit is watt)
- 
 
 
-\ **cappingwatt**\ =\ **watt**\ 
- 
+
+\ **cappingwatt**\ =\ **watt**\
+
  Set the power capping value base on the watt unit.
- 
- If the 'watt' >  maximum of \ *cappingmaxmin*\  or 'watt' 
- < \ *cappingsoftmin*\ , the setting operation 
- will be failed. If the 'watt' > \ *cappingsoftmin*\  and 
- 'watt' < minimum of \ *cappingmaxmin*\ , the value can NOT be 
+
+ If the 'watt' >  maximum of \ *cappingmaxmin*\  or 'watt'
+ < \ *cappingsoftmin*\ , the setting operation
+ will be failed. If the 'watt' > \ *cappingsoftmin*\  and
+ 'watt' < minimum of \ *cappingmaxmin*\ , the value can NOT be
  guaranteed.
- 
 
 
-\ **CPUspeed**\ 
- 
+
+\ **CPUspeed**\
+
  Query the effective processor frequency. (Unit is MHz)
- 
 
 
-\ **CPUspeedhistory**\ 
- 
- Query the historical records which were generated in last one hour for \ **CPUspeed**\ 
- 
+
+\ **CPUspeedhistory**\
+
+ Query the historical records which were generated in last one hour for \ **CPUspeed**\
 
 
-\ **dsavingstatus**\ 
- 
- Query the dynamic power saving status. The result should 
+
+\ **dsavingstatus**\
+
+ Query the dynamic power saving status. The result should
  be 'on-norm', 'on-maxp'  or 'off'.
- 
- If turning on the dynamic power saving, the processor 
- frequency and voltage will be dropped dynamically based on 
+
+ If turning on the dynamic power saving, the processor
+ frequency and voltage will be dropped dynamically based on
  the core utilization. It supports two modes for turn on state:
- 
- \ *on-norm*\  - means normal, the processor frequency cannot 
+
+ \ *on-norm*\  - means normal, the processor frequency cannot
  exceed the nominal value;
- 
- \ *on-maxp*\  - means maximum performance, the processor 
+
+ \ *on-maxp*\  - means maximum performance, the processor
  frequency can exceed the nominal value.
- 
+
 
 
 \ **dsavingstatus**\ ={\ **on-norm**\  | \ **on-maxp**\  | \ **off**\ }
- 
- Set the dynamic power saving. The value must be 'on-norm', 
+
+ Set the dynamic power saving. The value must be 'on-norm',
  'on-maxp' or 'off'.
- 
- The dsavingstatus setting operation needs about 2 minutes 
+
+ The dsavingstatus setting operation needs about 2 minutes
  to take effect. (The used time depends on the hardware type)
- 
- The \ **dsavingstatus**\  only can be turned on when the 
+
+ The \ **dsavingstatus**\  only can be turned on when the
  \ **savingstatus**\  is in turn off status.
- 
 
 
-\ **exhausttemp**\ 
- 
+
+\ **exhausttemp**\
+
  Query the current exhaust temperature. (Unit is centigrade)
- 
 
 
-\ **exhausttemphistory**\ 
- 
- Query the historical records which were generated in last one hour for \ **exhausttemp**\ 
- 
+
+\ **exhausttemphistory**\
+
+ Query the historical records which were generated in last one hour for \ **exhausttemp**\
 
 
-\ **fanspeed**\ 
- 
+
+\ **fanspeed**\
+
  Query the fan speed for all the fans which installed in this node. (Unit is RPM - Rotations Per Minute))
- 
- If there are multiple fans for a node, multiple lines will be output. And a fan name in bracket will be 
+
+ If there are multiple fans for a node, multiple lines will be output. And a fan name in bracket will be
  appended after \ **fanspped**\  attribute name.
- 
 
 
-\ **fanspeedhistory**\ 
- 
+
+\ **fanspeedhistory**\
+
  Query the historical records which were generated in last one hour for \ **fanspeed**\ .
- 
 
 
-\ **ffoMin**\ 
- 
- Query the minimum cpu frequency which can be set for FFO. (Fixed 
+
+\ **ffoMin**\
+
+ Query the minimum cpu frequency which can be set for FFO. (Fixed
  Frequency Override)
- 
 
 
-\ **ffoNorm**\ 
- 
+
+\ **ffoNorm**\
+
  Query the maximum cpu frequency which can be set for FFO.
- 
 
 
-\ **ffoTurbo**\ 
- 
+
+\ **ffoTurbo**\
+
  Query the advertised maximum cpu frequency (selling point).
- 
 
 
-\ **ffoVmin**\ 
- 
- Query the minimum cpu frequency which can be set for dropping down 
- the voltage to save power. That means when you drop the cpu 
- frequency from the ffoVmin to ffoVmin, the voltage won't change, 
+
+\ **ffoVmin**\
+
+ Query the minimum cpu frequency which can be set for dropping down
+ the voltage to save power. That means when you drop the cpu
+ frequency from the ffoVmin to ffoVmin, the voltage won't change,
  then there's no obvious power to be saved.
- 
 
 
-\ **ffovalue**\ 
- 
+
+\ **ffovalue**\
+
  Query the current value of FFO.
- 
 
 
-\ **ffovalue**\ =\ **MHZ**\ 
- 
- Set the current value of FFO. The valid value of ffovalue should 
+
+\ **ffovalue**\ =\ **MHZ**\
+
+ Set the current value of FFO. The valid value of ffovalue should
  be between the ffoMin and ffoNorm.
- 
- Note1: Due to the limitation of firmware, the frequency in the range 
- 3501 MHz - 3807 MHz can NOT be set to ffovalue. This range may be 
+
+ Note1: Due to the limitation of firmware, the frequency in the range
+ 3501 MHz - 3807 MHz can NOT be set to ffovalue. This range may be
  changed in future.
- 
- Note2: The setting will take effect only when the fsavingstatus is in 
- 'on' status. But you need to set the ffovalue to a valid value before 
- enabling the fsavingstatus. (It's a limitation of the initial firmware 
+
+ Note2: The setting will take effect only when the fsavingstatus is in
+ 'on' status. But you need to set the ffovalue to a valid value before
+ enabling the fsavingstatus. (It's a limitation of the initial firmware
  and will be fixed in future.)
- 
+
  The ffovalue setting operation needs about 1 minute to take effect.
- 
 
 
-\ **fsavingstatus**\ 
- 
- Query the status of FFO. The result should be 'on' or 'off'. 
+
+\ **fsavingstatus**\
+
+ Query the status of FFO. The result should be 'on' or 'off'.
  'on' - enable; 'off' - disable.
- 
+
 
 
 \ **fsavingstatus**\ ={\ **on**\  | \ **off**\ }
- 
+
  Set the status of FFO. The value must be 'on' or 'off'.
- 
- 'on' - enable. It will take effect only when the \ **ffovalue**\  
+
+ 'on' - enable. It will take effect only when the \ **ffovalue**\
  has been set to a valid value.
- 
+
  'off' -disable. It will take effect immediately.
- 
+
  Note: See the Note2 of ffovalue=MHZ.
- 
 
 
-\ **maxCPUspeed**\ 
- 
+
+\ **maxCPUspeed**\
+
  Query the maximum processor frequency. (Unit is MHz)
- 
 
 
-\ **mmtemp**\ 
- 
- Query the current temperature of management module. 
+
+\ **mmtemp**\
+
+ Query the current temperature of management module.
  (Unit is centigrade)
- 
 
 
-\ **pd1status | powerstatus**\ 
- 
- Query the status of power domain 1 for blade management 
+
+\ **pd1status | powerstatus**\
+
+ Query the status of power domain 1 for blade management
  module node.
- 
- Note: for the attribute without the leading 'pd1' which 
+
+ Note: for the attribute without the leading 'pd1' which
  means there's only one power doamin in the chassis.
- 
 
 
-\ **pd1policy | powerpolicy**\ 
- 
+
+\ **pd1policy | powerpolicy**\
+
  Query the power management policy of power domain 1.
- 
 
 
-\ **pd1powermodule1 | powermodule**\ 
- 
+
+\ **pd1powermodule1 | powermodule**\
+
  Query the First Power Module capacity in power domain 1.
- 
 
 
-\ **pd1powermodule2 | powermodule**\ 
- 
+
+\ **pd1powermodule2 | powermodule**\
+
  Query the Second Power Module capacity in power domain 1.
- 
 
 
-\ **pd1avaiablepower | avaiablepower**\ 
- 
+
+\ **pd1avaiablepower | avaiablepower**\
+
  Query the total available power in power domain 1.
- 
 
 
-\ **pd1reservedpower | reservedpower**\ 
- 
+
+\ **pd1reservedpower | reservedpower**\
+
  Query the power that has been reserved for power domain 1.
- 
 
 
-\ **pd1remainpower | remainpower**\ 
- 
+
+\ **pd1remainpower | remainpower**\
+
  Query the remaining power available in power domain 1.
- 
 
 
-\ **pd1inusedpower | inusedpower**\ 
- 
+
+\ **pd1inusedpower | inusedpower**\
+
  Query the total power being used in power domain 1.
- 
 
 
-\ **pd2status**\ 
- 
- Query the status of power domain 2 for blade management 
+
+\ **pd2status**\
+
+ Query the status of power domain 2 for blade management
  module node.
- 
 
 
-\ **pd2policy**\ 
- 
+
+\ **pd2policy**\
+
  Query the power management policy of power domain 2.
- 
 
 
-\ **pd2powermodule1**\ 
- 
+
+\ **pd2powermodule1**\
+
  Query the First Power Module capacity in power domain 2.
- 
 
 
-\ **pd2powermodule2**\ 
- 
+
+\ **pd2powermodule2**\
+
  Query the Second Power Module capacity in power domain 2.
- 
 
 
-\ **pd2avaiablepower**\ 
- 
+
+\ **pd2avaiablepower**\
+
  Query the total available power in power domain 2.
- 
 
 
-\ **pd2reservedpower**\ 
- 
+
+\ **pd2reservedpower**\
+
  Query the power that has been reserved for power domain 2.
- 
 
 
-\ **pd2remainpower**\ 
- 
+
+\ **pd2remainpower**\
+
  Query the remaining power available in power domain 2.
- 
 
 
-\ **pd2inusedpower**\ 
- 
+
+\ **pd2inusedpower**\
+
  Query the total power being used in power domain 2.
- 
 
 
-\ **relhistogram**\ 
- 
+
+\ **relhistogram**\
+
  Query histogram data for wattage information
- 
 
 
-\ **savingstatus**\ 
- 
- Query the static power saving status. The result should be 
+
+\ **savingstatus**\
+
+ Query the static power saving status. The result should be
  'on' or 'off'. 'on' - enable; 'off' - disable.
- 
+
 
 
 \ **savingstatus**\ ={\ **on**\  | \ **off**\ }
- 
+
  Set the static power saving. The value must be 'on' or 'off'.
- 
- If turning on the static power saving, the processor frequency 
+
+ If turning on the static power saving, the processor frequency
  and voltage will be dropped to a fixed value to save energy.
- 
- The savingstatus setting operation needs about 2 minutes to 
+
+ The savingstatus setting operation needs about 2 minutes to
  take effect. (The used time depends on the hardware type)
- 
- The \ **savingstatus**\  only can be turned on when the 
+
+ The \ **savingstatus**\  only can be turned on when the
  \ **dsavingstatus**\  is in turn off status.
- 
 
 
-\ **sysIPLtime**\ 
- 
- Query the time used from FSP standby to OS standby. 
+
+\ **sysIPLtime**\
+
+ Query the time used from FSP standby to OS standby.
  (Unit is Second)
- 
 
 
-\ **syssbpower**\ 
- 
- Query the system power consumed prior to power on. 
+
+\ **syssbpower**\
+
+ Query the system power consumed prior to power on.
  (Unit is Watt)
- 
 
 
-\ **thermaloutput**\ 
- 
- Query the thermal output (load) in BTUs per hour for the blade 
+
+\ **thermaloutput**\
+
+ Query the thermal output (load) in BTUs per hour for the blade
  center chassis.
- 
 
 
-\ **powerusage**\ 
- 
+
+\ **powerusage**\
+
  Query System Power Statistics with DCMI (Data Center Manageability Interface).
- 
 
 
-\ **temperature**\ 
- 
- Query the temperature from DCMI (Data Center Manageability Interface) Temperature sensor. 
+
+\ **temperature**\
+
+ Query the temperature from DCMI (Data Center Manageability Interface) Temperature sensor.
  Currently, only CPU temperature and baseboard temperature sensor available for OpenPOWER servers.
- 
+
 
 
 
 ********************
-\ **RETURN VALUE**\ 
+\ **RETURN VALUE**\
 ********************
 
 
@@ -736,24 +736,24 @@ so no additional plugins are needed for BladeCenter.)
 
 
 ****************
-\ **EXAMPLES**\ 
+\ **EXAMPLES**\
 ****************
 
 
 
 1. Query all attributes which CEC1,CEC2 supported.
- 
- 
+
+
  .. code-block:: perl
- 
+
    renergy CEC1,CEC2 all
- 
- 
+
+
  The output of the query operation:
- 
- 
+
+
  .. code-block:: perl
- 
+
       CEC1: savingstatus: off
       CEC1: dsavingstatus: off
       CEC1: cappingstatus: off
@@ -779,23 +779,23 @@ so no additional plugins are needed for BladeCenter.)
       CEC2: ambienttemp: 25 C
       CEC2: exhausttemp: 40 C
       CEC2: CPUspeed: 4695 MHz
- 
- 
+
+
 
 
 2. Query the \ **fanspeed**\  attribute for Power8 CEC.
- 
- 
+
+
  .. code-block:: perl
- 
+
    renergy CEC1 fanspeed
- 
- 
+
+
  The output of the query operation:
- 
- 
+
+
  .. code-block:: perl
- 
+
       CEC1: fanspeed (Fan U78CB.001.WZS00MA-A1 00002101): 5947 RPM
       CEC1: fanspeed (Fan U78CB.001.WZS00MA-A2 00002103): 6081 RPM
       CEC1: fanspeed (Fan U78CB.001.WZS00MA-A3 00002105): 6108 RPM
@@ -804,19 +804,19 @@ so no additional plugins are needed for BladeCenter.)
       CEC1: fanspeed (Fan U78CB.001.WZS00MA-A6 0000210B): 6013 RPM
       CEC1: fanspeed (Fan U78CB.001.WZS00MA-E1 0000210C): 4992 RPM
       CEC1: fanspeed (Fan U78CB.001.WZS00MA-E2 0000210D): 5016 RPM
- 
- 
+
+
 
 
 3. Query the historical records for the \ **CPUspeed**\  attribute. (Power8 CEC)
- 
+
  \ **renergy**\  CEC1 CPUspeedhistory
- 
+
  The output of the query operation:
- 
- 
+
+
  .. code-block:: perl
- 
+
       CEC1: CPUspeedhistory: 2027 MHZ: 20141226042900
       CEC1: CPUspeedhistory: 2027 MHZ: 20141226042930
       CEC1: CPUspeedhistory: 2244 MHZ: 20141226043000
@@ -828,25 +828,25 @@ so no additional plugins are needed for BladeCenter.)
       CEC1: CPUspeedhistory: 2393 MHZ: 20141226043300
       CEC1: CPUspeedhistory: 2393 MHZ: 20141226043330
       ...
- 
- 
+
+
 
 
 4
- 
+
  Query all the attirbutes for management module node MM1. (For chassis)
- 
- 
+
+
  .. code-block:: perl
- 
+
    renergy MM1 all
- 
- 
+
+
  The output of the query operation:
- 
- 
+
+
  .. code-block:: perl
- 
+
       mm1: availableDC: 5880W
       mm1: frontpaneltmp: 18.00 Centigrade
       mm1: inusedAC: 2848W
@@ -868,23 +868,23 @@ so no additional plugins are needed for BladeCenter.)
       mm1: pd2reservedpower: 2889W
       mm1: pd2status: 2 - Warning: Power redundancy does not exist in this power domain.
       mm1: thermaloutput: 9717.376000 BTU/hour
- 
- 
+
+
 
 
 5. Query all the attirbutes for blade server node blade1.
- 
- 
+
+
  .. code-block:: perl
- 
+
    renergy blade1 all
- 
- 
+
+
  The output of the query operation:
- 
- 
+
+
  .. code-block:: perl
- 
+
       blade1: CPUspeed: 4204MHZ
       blade1: averageDC: 227W
       blade1: capability: dynamicPowerMeasurement2
@@ -892,87 +892,87 @@ so no additional plugins are needed for BladeCenter.)
       blade1: dsavingstatus: off
       blade1: maxCPUspeed: 4204MHZ
       blade1: savingstatus: off
- 
- 
 
 
-6. Query the attributes savingstatus, cappingstatus 
+
+
+6. Query the attributes savingstatus, cappingstatus
 and CPUspeed for server CEC1.
- 
- 
+
+
  .. code-block:: perl
- 
+
    renergy CEC1 savingstatus cappingstatus CPUspeed
- 
- 
+
+
  The output of the query operation:
- 
- 
+
+
  .. code-block:: perl
- 
+
       CEC1: savingstatus: off
       CEC1: cappingstatus: on
       CEC1: CPUspeed: 3621 MHz
- 
- 
+
+
 
 
 7. Turn on the power saving function of CEC1.
- 
- 
+
+
  .. code-block:: perl
- 
+
    renergy CEC1 savingstatus=on
- 
- 
+
+
  The output of the setting operation:
- 
- 
+
+
  .. code-block:: perl
- 
-      CEC1: Set savingstatus succeeded.         
+
+      CEC1: Set savingstatus succeeded.
       CEC1: This setting may need some minutes to take effect.
- 
- 
 
 
-8. Set the power capping value base on the percentage of the 
+
+
+8. Set the power capping value base on the percentage of the
 max-min capping value. Here, set it to 50%.
- 
- 
+
+
  .. code-block:: perl
- 
+
    renergy CEC1 cappingperc=50
- 
- 
- If the maximum capping value of the CEC1 is 850w, and the 
- minimum capping value of the CEC1 is 782w, the Power Capping 
+
+
+ If the maximum capping value of the CEC1 is 850w, and the
+ minimum capping value of the CEC1 is 782w, the Power Capping
  value will be set as ((850-782)\*50% + 782) = 816w.
- 
+
  The output of the setting operation:
- 
- 
+
+
  .. code-block:: perl
- 
+
       CEC1: Set cappingperc succeeded.
       CEC1: cappingvalue: 816
- 
- 
+
+
 
 
 9. Query powerusage and temperature for OpenPOWER servers.
- 
- 
+
+
  .. code-block:: perl
- 
+
    renergy ops01 powerusage temperature
- 
- 
+
+
  The output will be like this:
- 
- 
+
+
  .. code-block:: perl
- 
+
       ops01: Current Power                        : 591W
       ops01: Minimum Power over sampling duration : 558W
       ops01: Maximum Power over sampling duration : 607W
@@ -982,38 +982,38 @@ max-min capping value. Here, set it to 50%.
       ops01: Power Measurement                    : Active
       ops01: CPU Temperature Instance 0           : +39 Centigrade
       ops01: Baseboard temperature Instance 0     : +28 Centigrade
- 
- 
+
+
 
 
 
 ******************
-\ **REFERENCES**\ 
+\ **REFERENCES**\
 ******************
 
 
 
 1. For more information on 'Power System Energy Management':
- 
+
  http://www-03.ibm.com/systems/power/software/energy/index.html
- 
+
 
 
 2. EnergyScale white paper for Power6:
- 
+
  http://www-03.ibm.com/systems/power/hardware/whitepapers/energyscale.html
- 
+
 
 
 3. EnergyScale white paper for Power7:
- 
+
  http://www-03.ibm.com/systems/power/hardware/whitepapers/energyscale7.html
- 
+
 
 
 
 *************
-\ **FILES**\ 
+\ **FILES**\
 *************
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/replaycons.1.rst b/docs/source/guides/admin-guides/references/man1/replaycons.1.rst
index c4b1929b3..aee76d34d 100644
--- a/docs/source/guides/admin-guides/references/man1/replaycons.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/replaycons.1.rst
@@ -43,28 +43,28 @@ OPTIONS
 
 
 
-\ *bps*\ 
- 
+\ *bps*\
+
  The display rate to use to play back the console output.  Default is 19200.
- 
 
 
-\ *tail_amount*\ 
- 
+
+\ *tail_amount*\
+
  The place in the console log file to start play back, specified as the # of lines from the end.
- 
 
 
-\ **-v|-**\ **-version**\ 
- 
+
+\ **-v|-**\ **-version**\
+
  Command Version.
- 
 
 
-\ **-h|-**\ **-help**\ 
- 
+
+\ **-h|-**\ **-help**\
+
  Display usage message.
- 
+
 
 
 
@@ -90,15 +90,15 @@ EXAMPLES
 
 
 1.
- 
+
  To replay the console for node1 at the default rate, starting 2000 lines from the end:
- 
- 
+
+
  .. code-block:: perl
- 
+
    replaycons 19200 2000
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/restartxcatd.1.rst b/docs/source/guides/admin-guides/references/man1/restartxcatd.1.rst
index a4348f73f..57c6e4fb4 100644
--- a/docs/source/guides/admin-guides/references/man1/restartxcatd.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/restartxcatd.1.rst
@@ -29,7 +29,7 @@ DESCRIPTION
 
 The \ **restartxcatd**\  command restarts the xCAT daemon (xcatd).
 
-\ **Linux Specific**\ 
+\ **Linux Specific**\
 
 
 It will perform the xcatd \ *fast restart*\ . The xcatd \ *fast restart*\  is a specific restart which has two advantages compares to the \ *stop*\  and then \ *start*\ .
@@ -40,7 +40,7 @@ It does the same thing as 'service xcatd restart' on NON-systemd enabled Operati
 
 It's recommended to use \ **restartxcatd**\  command to restart xcatd on systemd enable system like rh7 and sles12 instead of 'service xcatd restart' or 'systemctl restart xcatd'.
 
-\ **AIX Specific**\ 
+\ **AIX Specific**\
 
 
 It runs 'stopsrc -s xcatd' to stop xcatd first if xcatd is active, then runs 'startsrc -s xcatd' to start xcatd.
diff --git a/docs/source/guides/admin-guides/references/man1/reventlog.1.rst b/docs/source/guides/admin-guides/references/man1/reventlog.1.rst
index 108ccbe9d..76a0d9a20 100644
--- a/docs/source/guides/admin-guides/references/man1/reventlog.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/reventlog.1.rst
@@ -15,7 +15,7 @@ Name
 
 
 ****************
-\ **Synopsis**\ 
+\ **Synopsis**\
 ****************
 
 
@@ -32,7 +32,7 @@ OpenPOWER OpenBMC specific :
 
 
 *******************
-\ **Description**\ 
+\ **Description**\
 *******************
 
 
@@ -42,73 +42,73 @@ logs are stored on each servers service processor.
 
 
 ***************
-\ **Options**\ 
+\ **Options**\
 ***************
 
 
 
-\ *number-of-entries*\ 
- 
+\ *number-of-entries*\
+
  Retrieve the specified number of entries from the nodes' service processors.
- 
 
 
-\ **all**\ 
- 
+
+\ **all**\
+
  Retrieve all entries.
- 
 
 
-\ **-s**\ 
- 
+
+\ **-s**\
+
  To sort the entries from latest (always the last entry in event DB) to oldest (always the first entry in event DB). If \ **number-of-entries**\  specified, the latest \ **number-of-entries**\  events will be output in the order of latest to oldest.
- 
 
 
-\ **clear**\ 
- 
+
+\ **clear**\
+
  Clear event logs.
- 
+
 
 
 \ **resolved=**\ {\ *id-list*\ |\ **LED**\ }
- 
+
  Mark event log entries as resolved. Use comma separated list of entry ids to specify individual entries. Use \ **LED**\  to mark as resolved all event log entries that contribute to LED fault.
- 
 
 
-\ **-h | -**\ **-help**\ 
- 
+
+\ **-h | -**\ **-help**\
+
  Print help.
- 
 
 
-\ **-v | -**\ **-version**\ 
- 
+
+\ **-v | -**\ **-version**\
+
  Print version.
- 
+
 
 
 
 ****************
-\ **Examples**\ 
+\ **Examples**\
 ****************
 
 
 
 1. List last 5 event log entries from node4 and node5
- 
- 
+
+
  .. code-block:: perl
- 
+
    reventlog node4,node5 5
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    node4: SERVPROC I 09/06/00 15:23:33 Remote Login Successful User ID = USERID[00]
    node4: SERVPROC I 09/06/00 15:23:32 System spn1 started a RS485 connection with us[00]
    node4: SERVPROC I 09/06/00 15:22:35 RS485 connection to system spn1 has ended[00]
@@ -119,48 +119,48 @@ logs are stored on each servers service processor.
    node5: SERVPROC I 09/06/00 15:21:34 RS485 connection to system spn1 has ended[00]
    node5: SERVPROC I 09/06/00 15:21:30 Remote Login Successful User ID = USERID[00]
    node5: SERVPROC I 09/06/00 15:21:29 System spn1 started a RS485 connection with us[00]
- 
- 
+
+
 
 
 2. Clear all event log entries from node4 and node5
- 
- 
+
+
  .. code-block:: perl
- 
+
    reventlog node4,node5 clear
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    node4: clear
    node5: clear
- 
- 
+
+
 
 
 3. Mark as resolved all event log entries from node4 that contribute to LED fault
- 
- 
+
+
  .. code-block:: perl
- 
+
    reventlog node4 resolved=LED
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    Attempting to resolve the following log entries: LED...
    node4: Resolved 51.
    node4: Resolved 52.
    node4: Resolved 58.
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/rflash.1.rst b/docs/source/guides/admin-guides/references/man1/rflash.1.rst
index 90c3ed721..4c494b23d 100644
--- a/docs/source/guides/admin-guides/references/man1/rflash.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/rflash.1.rst
@@ -15,7 +15,7 @@ Name
 
 
 ****************
-\ **Synopsis**\ 
+\ **Synopsis**\
 ****************
 
 
@@ -43,7 +43,7 @@ NeXtScale FPC specific:
 =======================
 
 
-\ **rflash**\  \ *noderange*\  \ *http_directory*\ 
+\ **rflash**\  \ *noderange*\  \ *http_directory*\
 
 
 OpenPOWER BMC specific (using IPMI):
@@ -52,7 +52,7 @@ OpenPOWER BMC specific (using IPMI):
 
 \ **rflash**\  \ *noderange*\  [\ *hpm_file_path*\  | \ **-d**\  \ *data_directory*\ ] [\ **-c | -**\ **-check**\ ] [\ **-**\ **-retry=**\ \ *count*\ ]
 
-\ **rflash**\  \ *noderange*\  \ **-**\ **-recover**\  \ *bmc_file_path*\ 
+\ **rflash**\  \ *noderange*\  \ **-**\ **-recover**\  \ *bmc_file_path*\
 
 
 OpenPOWER OpenBMC specific :
@@ -70,7 +70,7 @@ OpenPOWER OpenBMC specific :
 
 
 *******************
-\ **Description**\ 
+\ **Description**\
 *******************
 
 
@@ -181,110 +181,110 @@ This delete option will delete update image from BMC. It expects an ID as the in
 
 
 ***************
-\ **Options**\ 
+\ **Options**\
 ***************
 
 
 
-\ **-h|-**\ **-help**\ 
- 
+\ **-h|-**\ **-help**\
+
  Writes the command's usage statement to standard output.
- 
 
 
-\ **-c|-**\ **-check**\ 
- 
+
+\ **-c|-**\ **-check**\
+
  Check the firmware version of BMC and an update file.
- 
 
 
-\ **-p**\  \ *directory*\ 
- 
+
+\ **-p**\  \ *directory*\
+
  Specifies the directory where the packages are located.
- 
 
 
-\ **-d**\  \ *data_directory*\ 
- 
+
+\ **-d**\  \ *data_directory*\
+
  PPC (without HMC, using Direct FSP Management) specific:
- 
+
  Specifies the directory where the raw data from rpm packages for each CEC/Frame are located. The default directory is /tmp. The option is only used in Direct FSP/BPA Management.
- 
+
  OpenPOWER BMC specific (using IPMI):
- 
+
  Used for IBM Power S822LC for Big Data systems only. Specifies the directory where the \ **pUpdate**\  utility and at least one of BMC or Host update files are located. The utility and update files can be downloaded from FixCentral.
- 
+
 
 
 \ **-**\ **-activate**\  {\ **concurrent**\  | \ **disruptive**\ }
- 
+
  Must be specified to activate the new Licensed Internal Code.  The "disruptive" option will cause the target systems to be recycled.  Without this flag, LIC updates will be installed only, not activated.
- 
 
 
-\ **-**\ **-commit**\ 
- 
+
+\ **-**\ **-commit**\
+
  Used to commit the flash image in the temporary side of the chip to the permanent side for both managed systems and power subsystems.
- 
 
 
-\ **-**\ **-recover**\ 
- 
+
+\ **-**\ **-recover**\
+
  PPC (with HMC) and PPC (without HMC, using Direct FSP Management) specific:
- 
+
  Used to recover the flash image in the permanent side of the chip to the temporary side for both managed systems and power subsystems.
- 
+
  OpenPOWER BMC specific (using IPMI):
- 
+
  Used for IBM Power S822LC for Big Data systems only. Used to recover the BMC with a BMC image downloaded from FixCentral. This option will only work if BMC is in "Brick protection" state.
- 
 
 
-\ **-**\ **-retry=**\ \ *count*\ 
- 
+
+\ **-**\ **-retry=**\ \ *count*\
+
  Specify number of times to retry the update if failure is detected. Default value is 2. Value of 0 can be used to indicate no retries.
- 
 
 
-\ **-a|-**\ **-activate**\ 
- 
+
+\ **-a|-**\ **-activate**\
+
  Activate update image. Image id or update file must be specified.
- 
 
 
-\ **-l|-**\ **-list**\ 
- 
+
+\ **-l|-**\ **-list**\
+
  List currently uploaded update images. "(\*)" indicates currently active image.
- 
 
 
-\ **-u|-**\ **-upload**\ 
- 
+
+\ **-u|-**\ **-upload**\
+
  Upload update image. Specified file must be in .tar format.
- 
 
 
-\ **-**\ **-delete**\ 
- 
+
+\ **-**\ **-delete**\
+
  Delete update image from BMC
- 
 
 
-\ **-v|-**\ **-version**\ 
- 
+
+\ **-v|-**\ **-version**\
+
  Displays the command's version.
- 
 
 
-\ **-V|-**\ **-verbose**\ 
- 
+
+\ **-V|-**\ **-verbose**\
+
  Verbose output.
- 
+
 
 
 
 *******************
-\ **Exit Status**\ 
+\ **Exit Status**\
 *******************
 
 
@@ -294,96 +294,96 @@ This delete option will delete update image from BMC. It expects an ID as the in
 
 
 ****************
-\ **Examples**\ 
+\ **Examples**\
 ****************
 
 
 
 1. To update  only the  power subsystem attached to a single HMC-attached pSeries CEC(cec_name), and recycle the power  subsystem  and  all attached managed systems when the update is complete, and the Microcode update package and associated XML file are in /tmp/fw, enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rflash cec_name -p /tmp/fw --activate disruptive
- 
- 
+
+
 
 
 2. To update  only the  power subsystem attached to a single HMC-attached pSeries node, and recycle the power  subsystem  and  all attached managed systems when the update is complete, and the Microcode update package and associated XML file are in /tmp/fw, enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rflash bpa_name -p /tmp/fw --activate disruptive
- 
- 
+
+
 
 
 3. To commit a firmware update to permanent flash for both managed system and the related power subsystems, enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rflash cec_name --commit
- 
- 
+
+
 
 
 4. To update the firmware on a NeXtScale FPC specify the FPC node name and the HTTP location of the file including the xCAT MN IP address and the directory on the xCAT MN containing the firmware as follows:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rflash fpc01 http://10.1.147.169/install/firmware/fhet17a/ibm_fw_fpc_fhet17a-2.02_anyos_noarch.rom
- 
- 
+
+
 
 
 5. To update the firmware on OpenPOWER machine specify the node name and the file path of the HPM firmware file as follows:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rflash fs3 /firmware/8335_810.1543.20151021b_update.hpm
- 
- 
+
+
  Print verbose message to rflash log file (/var/log/xcat/rflash/fs3.log) when updading firmware:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rflash fs3 /firmware/8335_810.1543.20151021b_update.hpm -V
- 
- 
+
+
 
 
 6. To update the firmware on IBM Power S822LC for Big Data machine specify the node name and the file path of the data directory containing pUpdate utility, both BMC and Host update files:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rflash briggs01 -d /root/supermicro/OP825
- 
- 
+
+
 
 
 7. To update the firmware on the OpenBMC machine, specify the firmare update file to upload and activate:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rflash p9euh02 -a /tmp/witherspoon.pnor.squashfs.tar
- 
- 
+
+
 
 
 
 ****************
-\ **Location**\ 
+\ **Location**\
 ****************
 
 
-\ **/opt/xcat/bin/rflash**\ 
+\ **/opt/xcat/bin/rflash**\
 
 
 *****
diff --git a/docs/source/guides/admin-guides/references/man1/rinv.1.rst b/docs/source/guides/admin-guides/references/man1/rinv.1.rst
index 4f28900ab..128ee6fbe 100644
--- a/docs/source/guides/admin-guides/references/man1/rinv.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/rinv.1.rst
@@ -15,7 +15,7 @@ Name
 
 
 ****************
-\ **Synopsis**\ 
+\ **Synopsis**\
 ****************
 
 
@@ -76,7 +76,7 @@ pdu specific:
 =============
 
 
-\ **rinv**\  \ *noderange*\ 
+\ **rinv**\  \ *noderange*\
 
 
 zVM specific:
@@ -110,7 +110,7 @@ zVM specific:
 
 
 *******************
-\ **Description**\ 
+\ **Description**\
 *******************
 
 
@@ -121,220 +121,220 @@ Calling \ **rinv**\  for VMware will display the UUID/GUID, number of CPUs, amou
 
 
 ***************
-\ **Options**\ 
+\ **Options**\
 ***************
 
 
 
-\ **bus**\ 
- 
+\ **bus**\
+
  List all buses for each I/O slot.
- 
 
 
-\ **config**\ 
- 
+
+\ **config**\
+
  Retrieves number of processors, speed, total memory, and DIMM locations.
- 
 
 
-\ **model**\ 
- 
+
+\ **model**\
+
  Retrieves model number.
- 
 
 
-\ **serial**\ 
- 
+
+\ **serial**\
+
  Retrieves serial number.
- 
 
 
-\ **firm**\ 
- 
+
+\ **firm**\
+
  Retrieves firmware versions.
- 
 
 
-\ **deconfig**\ 
- 
+
+\ **deconfig**\
+
  Retrieves deconfigured resources. Deconfigured resources are hw components (cpus, memory, etc.) that have failed so the firmware has automatically turned those components off. This option is only capable of listing some of the deconfigured resources and should not be the only method used to check the hardware status.
- 
 
 
-\ **-x**\ 
- 
+
+\ **-x**\
+
  To output the raw information of deconfigured resources for CEC.
- 
 
 
-\ **asset**\ 
- 
+
+\ **asset**\
+
  Retrieves asset tag. Usually it's the MAC address of eth0.
- 
 
 
-\ **vpd**\ 
- 
+
+\ **vpd**\
+
  Same as specifying model, serial, deviceid, and mprom.
- 
 
 
-\ **diag**\ 
- 
+
+\ **diag**\
+
  Diagnostics information of firmware.
- 
 
 
-\ **mprom**\ 
- 
+
+\ **mprom**\
+
  Retrieves mprom firmware level.
- 
 
 
-\ **dimm**\ 
- 
+
+\ **dimm**\
+
  Retrieves dual in-line memory module information.
- 
 
 
-\ **deviceid**\ 
- 
+
+\ **deviceid**\
+
  Retrieves device identification. Usually device, manufacturing and product IDs.
- 
 
 
-\ **uuid**\ 
- 
+
+\ **uuid**\
+
  Retrieves the universally unique identifier.
- 
 
 
-\ **guid**\ 
- 
+
+\ **guid**\
+
  Retrieves the global unique identifier .
- 
 
 
-\ **all**\ 
- 
+
+\ **all**\
+
  All of the above.
- 
 
 
-\ **-h | -**\ **-help**\ 
- 
+
+\ **-h | -**\ **-help**\
+
  Print help.
- 
 
 
-\ **-v | -**\ **-version**\ 
- 
+
+\ **-v | -**\ **-version**\
+
  Print version.
- 
 
 
-\ **-V | -**\ **-verbose**\ 
- 
+
+\ **-V | -**\ **-verbose**\
+
  Prints verbose output, if available.
- 
 
 
-\ **-t**\ 
- 
+
+\ **-t**\
+
  Set the values in the vm table to what vCenter has for the indicated nodes.
- 
 
 
-\ **zVM specific :**\ 
+
+\ **zVM specific :**\
 
 
-\ **-**\ **-diskpoolspace**\ 
- 
+\ **-**\ **-diskpoolspace**\
+
  Calculates the total size of every known storage pool.
- 
 
 
-\ **-**\ **-diskpool**\  \ *pool*\  \ *space*\ 
- 
+
+\ **-**\ **-diskpool**\  \ *pool*\  \ *space*\
+
  Lists the storage devices (ECKD and FBA) contained in a disk pool. Space can be: all, free, or used.
- 
 
 
-\ **-**\ **-fcpdevices**\  \ *state*\  \ *details*\ 
- 
+
+\ **-**\ **-fcpdevices**\  \ *state*\  \ *details*\
+
  Lists the FCP device channels that are active, free, or offline. State can be: active, free, or offline.
- 
 
 
-\ **-**\ **-diskpoolnames**\ 
- 
+
+\ **-**\ **-diskpoolnames**\
+
  Lists the known disk pool names.
- 
 
 
-\ **-**\ **-networknames**\ 
- 
+
+\ **-**\ **-networknames**\
+
  Lists the known network names.
- 
 
 
-\ **-**\ **-network**\  \ *name*\ 
- 
+
+\ **-**\ **-network**\  \ *name*\
+
  Shows the configuration of a given network device.
- 
 
 
-\ **-**\ **-ssi**\ 
- 
+
+\ **-**\ **-ssi**\
+
  Obtain the SSI and system status.
- 
 
 
-\ **-**\ **-smapilevel**\ 
- 
+
+\ **-**\ **-smapilevel**\
+
  Obtain the SMAPI level installed on the z/VM system.
- 
 
 
-\ **-**\ **-wwpns**\  \ *fcp_channel*\ 
- 
+
+\ **-**\ **-wwpns**\  \ *fcp_channel*\
+
  Query a given FCP device channel on a z/VM system and return a list of WWPNs.
- 
 
 
-\ **-**\ **-zfcppool**\  \ *pool*\  \ *space*\ 
- 
+
+\ **-**\ **-zfcppool**\  \ *pool*\  \ *space*\
+
  List the SCSI/FCP devices contained in a zFCP pool. Space can be: free or used.
- 
 
 
-\ **-**\ **-zfcppoolnames**\ 
- 
+
+\ **-**\ **-zfcppoolnames**\
+
  List the known zFCP pool names.
- 
+
 
 
 
 ****************
-\ **Examples**\ 
+\ **Examples**\
 ****************
 
 
 
 1. To retrieve all information available from blade node4, enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rinv node5 all
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    node5: Machine Type/Model 865431Z
    node5: Serial Number 23C5030
    node5: Asset Tag 00:06:29:1F:01:1A
@@ -355,23 +355,23 @@ Calling \ **rinv**\  for VMware will display the UUID/GUID, number of CPUs, amou
    node5: Processor Speed: 866 MHz
    node5: Total Memory:	  512 MB
    node5: Memory DIMM locations:  Slot(s)  3  4
- 
- 
+
+
 
 
 2. To output the raw information of deconfigured resources for CEC cec01, enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rinv cec01 deconfig -x
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    cec01:
    <SYSTEM>
    <System_type>IH</System_type>
@@ -380,74 +380,74 @@ Calling \ **rinv**\  for VMware will display the UUID/GUID, number of CPUs, amou
    <RID>800</RID>
    </NODE>
    </SYSTEM>
- 
- 
+
+
 
 
 3.
- 
+
  To retrieve 'config' information from the HMC-managed LPAR node3, enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rinv node3 config
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    node5: Machine Configuration Info
    node5: Number of Processors: 1
    node5: Total Memory (MB): 1024
- 
- 
+
+
 
 
 4.
- 
+
  To retrieve information about a VMware node vm1, enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rinv vm1
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    vm1: UUID/GUID: 42198f65-d579-fb26-8de7-3ae49e1790a7
    vm1: CPUs: 1
    vm1: Memory: 1536 MB
    vm1: Network adapter 1: 36:1b:c2:6e:04:02
    vm1: Hard disk 1 (d0): 9000 MB @ [nfs_192.168.68.21_vol_rc1storage_vmware] vm1_3/vm1.vmdk
    vm1: Hard disk 2 (d4): 64000 MB @ [nfs_192.168.68.21_vol_rc1storage_vmware] vm1_3/vm1_5.vmdk
- 
- 
- \ **zVM specific :**\ 
- 
+
+
+ \ **zVM specific :**\
+
 
 
 5.
- 
+
  To list the defined network names available for a given node:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rinv pokdev61 --getnetworknames
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    pokdev61: LAN:QDIO SYSTEM GLAN1
    pokdev61: LAN:HIPERS SYSTEM GLAN2
    pokdev61: LAN:QDIO SYSTEM GLAN3
@@ -456,122 +456,122 @@ Calling \ **rinv**\  for VMware will display the UUID/GUID, number of CPUs, amou
    pokdev61: VSWITCH SYSTEM VSW1
    pokdev61: VSWITCH SYSTEM VSW2
    pokdev61: VSWITCH SYSTEM VSW3
- 
- 
+
+
 
 
 6.
- 
+
  To list the configuration for a given network:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rinv pokdev61 --getnetwork GLAN1
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    pokdev61: LAN SYSTEM GLAN1        Type: QDIO    Connected: 1    Maxconn: INFINITE
    pokdev61:   PERSISTENT  UNRESTRICTED  IP                        Accounting: OFF
    pokdev61:   IPTimeout: 5                 MAC Protection: Unspecified
    pokdev61:   Isolation Status: OFF
- 
- 
+
+
 
 
 7.
- 
+
  To list the disk pool names available:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rinv pokdev61 --diskpoolnames
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    pokdev61: POOL1
    pokdev61: POOL2
    pokdev61: POOL3
- 
- 
+
+
 
 
 8.
- 
+
  List the configuration for a given disk pool:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rinv pokdev61 --diskpool POOL1 free
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    pokdev61: #VolID DevType StartAddr Size
    pokdev61: EMC2C4 3390-09 0001 10016
    pokdev61: EMC2C5 3390-09 0001 10016
- 
- 
+
+
 
 
 9.
- 
+
  List the known zFCP pool names.
- 
- 
+
+
  .. code-block:: perl
- 
+
    rinv pokdev61 --zfcppoolnames
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    pokdev61: zfcp1
    pokdev61: zfcp2
    pokdev61: zfcp3
- 
- 
+
+
 
 
 10.
- 
+
  List the SCSI/FCP devices contained in a given zFCP pool:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rinv pokdev61 --zfcppool zfcp1
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    pokdev61: #status,wwpn,lun,size,range,owner,channel,tag
    pokdev61: used,500512345678c411,4014412100000000,2g,3B40-3B7F,ihost13,3b77,
    pokdev61: used,500512345678c411,4014412200000000,8192M,3B40-3B7F,ihost13,3b77,replace_root_device
    pokdev61: free,500512345678c411,4014412300000000,8g,3B40-3B7F,,,
    pokdev61: free,5005123456789411,4014412400000000,2g,3B40-3B7F,,,
    pokdev61: free,5005123456789411;5005123456789411,4014412600000000,2G,3B40-3B7F,,,
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/rmdef.1.rst b/docs/source/guides/admin-guides/references/man1/rmdef.1.rst
index c7913da80..2b3ea96cf 100644
--- a/docs/source/guides/admin-guides/references/man1/rmdef.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/rmdef.1.rst
@@ -39,65 +39,65 @@ OPTIONS
 
 
 
-\ **-a|-**\ **-all**\ 
- 
+\ **-a|-**\ **-all**\
+
  Clear the whole xCAT database. A backup of the xCAT definitions should be saved before using this option as the xCAT daemons will no longer work once cleared.
- 
+
  To restore:
- 
- 
+
+
  1. \ **export XCATBYPASS=1**\  and run the \ **restorexCATdb**\  command.
-  
+
   or
-  
- 
- 
+
+
+
  2. Run \ **xcatconfig -d**\  which initializes the database the same as when xCAT was installed.
- 
- 
- 
 
 
-\ **-f|-**\ **-force**\ 
- 
+
+
+
+\ **-f|-**\ **-force**\
+
  Use this with the \ **-**\ **-all**\  option as an extra indicator that ALL definitions are to be removed.
- 
 
 
-\ **-h|-**\ **-help**\ 
- 
+
+\ **-h|-**\ **-help**\
+
  Display a usage message.
- 
 
 
-\ *noderange*\ 
- 
+
+\ *noderange*\
+
  A set of comma delimited node names and/or group names. See the "noderange" man page for details on supported formats.
- 
 
 
-\ **-o**\  \ *object-names*\ 
- 
+
+\ **-o**\  \ *object-names*\
+
  A set of comma delimited object names.
- 
 
 
-\ **-t**\  \ *object-types*\ 
- 
+
+\ **-t**\  \ *object-types*\
+
  A set of comma delimited object types.
- 
 
 
-\ **-C|-**\ **-cleanup**\ 
- 
+
+\ **-C|-**\ **-cleanup**\
+
  Perform additional cleanup by running \ **nodeset offline**\ , \ **makeconservercf -d**\  and \ **makegocons -**\ **-cleanup**\  on the objects specified in the \ *noderange*\ .
- 
 
 
-\ **-V|-**\ **-verbose**\ 
- 
+
+\ **-V|-**\ **-verbose**\
+
  Verbose mode.
- 
+
 
 
 
@@ -118,35 +118,35 @@ EXAMPLES
 
 
 1. To remove a range of node definitions.
- 
- 
+
+
  .. code-block:: perl
- 
+
    rmdef -t node node1-node4
- 
- 
+
+
 
 
 2. To remove all node definitions for the nodes contained in the group bpcnodes.
- 
- 
+
+
  .. code-block:: perl
- 
+
    rmdef -t node -o bpcnodes
- 
- 
+
+
 
 
 3. To remove the group called bpcnodes.
- 
- 
+
+
  .. code-block:: perl
- 
+
    rmdef -t group -o bpcnodes
- 
- 
+
+
  (This will also update the values of the "groups" attribute of the member nodes.)
- 
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/rmdocker.1.rst b/docs/source/guides/admin-guides/references/man1/rmdocker.1.rst
index db021f2a9..b1d7849e3 100644
--- a/docs/source/guides/admin-guides/references/man1/rmdocker.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/rmdocker.1.rst
@@ -32,7 +32,7 @@ OPTIONS
 
 
 
-\ **-f|-**\ **-force**\ 
+\ **-f|-**\ **-force**\
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/rmdsklsnode.1.rst b/docs/source/guides/admin-guides/references/man1/rmdsklsnode.1.rst
index b9dd2625d..4fa5ccde5 100644
--- a/docs/source/guides/admin-guides/references/man1/rmdsklsnode.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/rmdsklsnode.1.rst
@@ -19,9 +19,9 @@ SYNOPSIS
 ********
 
 
-\ **rmdsklsnode [-h | -**\ **-help ]**\ 
+\ **rmdsklsnode [-h | -**\ **-help ]**\
 
-\ **rmdsklsnode [-V|-**\ **-verbose] [-f|-**\ **-force] [-r|-**\ **-remdef] [-i**\  \ *image_name*\ ] \ **[-p|-**\ **-primarySN] [-b|-**\ **-backupSN]**\  \ *noderange*\ 
+\ **rmdsklsnode [-V|-**\ **-verbose] [-f|-**\ **-force] [-r|-**\ **-remdef] [-i**\  \ *image_name*\ ] \ **[-p|-**\ **-primarySN] [-b|-**\ **-backupSN]**\  \ *noderange*\
 
 
 ***********
@@ -37,7 +37,7 @@ If you are using xCAT service nodes the \ **rmdsklsnode**\  command will automat
 
 If the node you are trying to remove is currently running the \ **rmdsklsnode**\  command will not remove the definitions.  You can use the "-f" option to shut down the node and remove the definition.
 
-\ **Removing alternate NIM client definitions**\ 
+\ **Removing alternate NIM client definitions**\
 
 If you used the "-n" option when you created the NIM client definitions with the \ **mkdsklsnode**\  command then the NIM client machine names would be a combination of the xCAT node name and the osimage name used to initialize the NIM machine. To remove these definitions, you must provide the name of the osimage that was used using the "-i" option.
 
@@ -52,52 +52,52 @@ OPTIONS
 
 
 
-\ **-f |-**\ **-force**\ 
- 
+\ **-f |-**\ **-force**\
+
  Use the force option to stop and remove running nodes. This handles the situation where a NIM machine definition indicates that a node is still running even though it is not.
- 
 
 
-\ **-b |-**\ **-backupSN**\ 
- 
+
+\ **-b |-**\ **-backupSN**\
+
  When using backup service nodes only update the backup.  The default is to update both the primary and backup service nodes.
- 
 
 
-\ **-h |-**\ **-help**\ 
- 
+
+\ **-h |-**\ **-help**\
+
  Display usage message.
- 
 
 
-\ **-i**\  \ *image_name*\ 
- 
+
+\ **-i**\  \ *image_name*\
+
  The name of an xCAT image definition.
- 
 
 
-\ *noderange*\ 
- 
+
+\ *noderange*\
+
  A set of comma delimited node names and/or group names. See the "noderange" man page for details on additional supported formats.
- 
 
 
-\ **-p|-**\ **-primarySN**\ 
- 
+
+\ **-p|-**\ **-primarySN**\
+
  When using backup service nodes only update the primary.  The default is to update both the primary and backup service nodes.
- 
 
 
-\ **-r|-**\ **-remdef**\ 
- 
+
+\ **-r|-**\ **-remdef**\
+
  Use this option to reset, deallocate, and remove NIM client definitions.  This option will not attempt to shut down running nodes. This option should be used when remove alternate NIM client definitions that were created using \ **mkdsklsnode -n**\ .
- 
 
 
-\ **-V |-**\ **-verbose**\ 
- 
+
+\ **-V |-**\ **-verbose**\
+
  Verbose mode.
- 
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/rmflexnode.1.rst b/docs/source/guides/admin-guides/references/man1/rmflexnode.1.rst
index 4aebb1f7a..5859588de 100644
--- a/docs/source/guides/admin-guides/references/man1/rmflexnode.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/rmflexnode.1.rst
@@ -23,7 +23,7 @@ SYNOPSIS
 
 \ **rmflexnode**\  [\ **-v**\  | \ **-**\ **-version**\ ]
 
-\ **rmflexnode**\  \ *noderange*\ 
+\ **rmflexnode**\  \ *noderange*\
 
 
 ***********
@@ -48,16 +48,16 @@ OPTIONS
 
 
 
-\ **-h | -**\ **-help**\ 
- 
+\ **-h | -**\ **-help**\
+
  Display the usage message.
- 
 
 
-\ **-v | -**\ **-version**\ 
- 
+
+\ **-v | -**\ **-version**\
+
  Display the version information.
- 
+
 
 
 
@@ -68,15 +68,15 @@ EXAMPLES
 
 
 1 Delete a flexible node base on the xCAT node blade1.
- 
+
  The blade1 should belong to a complex, the \ *id*\  attribute should be set correctly and all the slots should be in \ **power off**\  state.
- 
- 
+
+
  .. code-block:: perl
- 
+
    rmflexnode blade1
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/rmhwconn.1.rst b/docs/source/guides/admin-guides/references/man1/rmhwconn.1.rst
index 225bb4627..0229cf313 100644
--- a/docs/source/guides/admin-guides/references/man1/rmhwconn.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/rmhwconn.1.rst
@@ -27,21 +27,21 @@ PPC (with HMC) specific:
 ========================
 
 
-\ **rmhwconn**\  [\ **-V**\ | \ **-**\ **-verbose**\ ] \ *noderange*\ 
+\ **rmhwconn**\  [\ **-V**\ | \ **-**\ **-verbose**\ ] \ *noderange*\
 
 
 PPC (without HMC, using FSPAPI) specific:
 =========================================
 
 
-\ **rmhwconn**\  \ *noderange*\  \ **-T**\  \ *tooltype*\ 
+\ **rmhwconn**\  \ *noderange*\  \ **-T**\  \ *tooltype*\
 
 
 PPC (use HMC as SFP) specific:
 ==============================
 
 
-\ **rmhwconn**\  \ **-s**\ 
+\ **rmhwconn**\  \ **-s**\
 
 
 
@@ -71,22 +71,22 @@ OPTIONS
 
 
 
-\ **-h|-**\ **-help**\ 
- 
+\ **-h|-**\ **-help**\
+
  Display usage message.
- 
 
 
-\ **-V|-**\ **-verbose**\ 
- 
+
+\ **-V|-**\ **-verbose**\
+
  Verbose output.
- 
 
 
-\ **-T**\ 
- 
+
+\ **-T**\
+
  The tooltype is used to communicate to the CEC/Frame. The value could be \ **lpar**\  or \ **fnm**\ . The tooltype value \ **lpar**\  is for xCAT and \ **fnm**\  is for CNM.
- 
+
 
 
 
@@ -107,39 +107,39 @@ EXAMPLES
 
 
 1.
- 
+
  To disconnect all CEC nodes in node group cec from their HMC nodes:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rmhwconn cec
- 
- 
+
+
 
 
 2.
- 
+
  To remove the connection for Frame node frame1:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rmhwconn frame1
- 
- 
+
+
 
 
 3.
- 
+
  To disconnect all CEC nodes in node group cec from their related hardware serveri, using lpar tooltype:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rmhwconn cec -T lpar
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/rmhypervisor.1.rst b/docs/source/guides/admin-guides/references/man1/rmhypervisor.1.rst
index 5ada8fcbb..222ccef1d 100644
--- a/docs/source/guides/admin-guides/references/man1/rmhypervisor.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/rmhypervisor.1.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **RHEV specific :**\ 
+\ **RHEV specific :**\
 
 
 \ **rmhypervisor**\  \ *noderange*\  [\ **-f**\ ]
@@ -39,10 +39,10 @@ OPTIONS
 
 
 
-\ **-f**\ 
- 
+\ **-f**\
+
  If \ **-f**\  is specified, the host will be deactivated to maintenance before the removing.
- 
+
 
 
 
@@ -63,13 +63,13 @@ EXAMPLES
 
 
 1. To remove the host 'host1', enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rmhypervisor host1
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/rmigrate.1.rst b/docs/source/guides/admin-guides/references/man1/rmigrate.1.rst
index c76a6584e..dcb4a6a2e 100644
--- a/docs/source/guides/admin-guides/references/man1/rmigrate.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/rmigrate.1.rst
@@ -15,11 +15,11 @@ Name
 
 
 ****************
-\ **Synopsis**\ 
+\ **Synopsis**\
 ****************
 
 
-\ **rmigrate**\  \ *noderange*\  \ *target_host*\ 
+\ **rmigrate**\  \ *noderange*\  \ *target_host*\
 
 For zVM:
 ========
@@ -30,7 +30,7 @@ For zVM:
 
 
 *******************
-\ **Description**\ 
+\ **Description**\
 *******************
 
 
@@ -83,7 +83,7 @@ zVM specific:
 
 
 *************
-\ **Files**\ 
+\ **Files**\
 *************
 
 
@@ -93,7 +93,7 @@ This is used to determine the current host to migrate from.
 
 
 ****************
-\ **Examples**\ 
+\ **Examples**\
 ****************
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/rmimage.1.rst b/docs/source/guides/admin-guides/references/man1/rmimage.1.rst
index 4fa283448..637e0ade5 100644
--- a/docs/source/guides/admin-guides/references/man1/rmimage.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/rmimage.1.rst
@@ -19,9 +19,9 @@ SYNOPSIS
 ********
 
 
-\ **rmimage [-h | -**\ **-help]**\ 
+\ **rmimage [-h | -**\ **-help]**\
 
-\ **rmimage [-V | -**\ **-verbose]**\  \ *imagename*\  \ **[-**\ **-xcatdef]**\ 
+\ **rmimage [-V | -**\ **-verbose]**\  \ *imagename*\  \ **[-**\ **-xcatdef]**\
 
 
 ***********
@@ -32,7 +32,7 @@ DESCRIPTION
 Removes the Linux stateless or statelite image from the file system.
 The install dir is setup by using "installdir" attribute set in the site table.
 
-If \ *imagename*\  is specified, this command uses the information in the \ *imagename*\ 
+If \ *imagename*\  is specified, this command uses the information in the \ *imagename*\
 to calculate the image root directory; otherwise, this command uses the operating system name,
 architecture and profile name to calculate the image root directory.
 
@@ -41,7 +41,7 @@ specifying the flag \ **-**\ **-xcatdef**\  will remove the osimage definition,
 or you can use rmdef -t osimage to remove the osimage definition.
 
 The statelite image files on the diskful service nodes will not be removed,
-remove the image files on the service nodes manually if necessary, 
+remove the image files on the service nodes manually if necessary,
 for example, use command "rsync -az --delete /install <sn>:/" to remove the image files on the service nodes,
 where the <sn> is the hostname of the service node.
 
diff --git a/docs/source/guides/admin-guides/references/man1/rmkit.1.rst b/docs/source/guides/admin-guides/references/man1/rmkit.1.rst
index d83ca67ce..a4aec473b 100644
--- a/docs/source/guides/admin-guides/references/man1/rmkit.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/rmkit.1.rst
@@ -21,7 +21,7 @@ SYNOPSIS
 
 \ **rmkit**\  [\ **-? | -h | -**\ **-help**\ ] [\ **-v | -**\ **-version**\ ]
 
-\ **rmkit**\  [\ **-V | -**\ **-verbose**\ ] [\ **-f | -**\ **-force**\ ] [\ **-t | -**\ **-test**\ ] \ *kitlist*\ 
+\ **rmkit**\  [\ **-V | -**\ **-verbose**\ ] [\ **-f | -**\ **-force**\ ] [\ **-t | -**\ **-test**\ ] \ *kitlist*\
 
 
 ***********
@@ -40,40 +40,40 @@ OPTIONS
 
 
 
-\ **-h|-**\ **-help**\ 
- 
+\ **-h|-**\ **-help**\
+
  Display usage message.
- 
 
 
-\ **-V|-**\ **-verbose**\ 
- 
+
+\ **-V|-**\ **-verbose**\
+
  Verbose mode.
- 
 
 
-\ **-v|-**\ **-version**\ 
- 
+
+\ **-v|-**\ **-version**\
+
  Command version.
- 
 
 
-\ **-f|-**\ **-force**\ 
- 
+
+\ **-f|-**\ **-force**\
+
  Remove this kit even there is any component in this kit is listed by osimage.kitcomponents.  If this option is not specified, this kit will not be removed if any kit components listed in an osimage.kitcomponents
- 
 
 
-\ **-t|-**\ **-test**\ 
- 
+
+\ **-t|-**\ **-test**\
+
  Test if kitcomponents in this kit are used by osimage
- 
 
 
-\ *kitlist*\ 
- 
+
+\ *kitlist*\
+
  A comma delimited list of kits that are to be removed from the xCAT cluster.  Each entry can be a kitname or kit basename. For kit basename, rmkit command will remove all the kits that have that kit basename.
- 
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/rmkitcomp.1.rst b/docs/source/guides/admin-guides/references/man1/rmkitcomp.1.rst
index 183372691..3dbd0bf13 100644
--- a/docs/source/guides/admin-guides/references/man1/rmkitcomp.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/rmkitcomp.1.rst
@@ -21,7 +21,7 @@ SYNOPSIS
 
 \ **rmkitcomp**\  [\ **-? | -h | -**\ **-help**\ ] [\ **-v | -**\ **-version**\ ]
 
-\ **rmkitcomp**\  [\ **-V | -**\ **-verbose**\ ] [\ **-u | -**\ **-uninstall**\ ] [\ **-f | -**\ **-force**\ ] [\ **-**\ **-noscripts**\ ] \ **-i**\  \ *osimage*\   \ *kitcompname_list*\ 
+\ **rmkitcomp**\  [\ **-V | -**\ **-verbose**\ ] [\ **-u | -**\ **-uninstall**\ ] [\ **-f | -**\ **-force**\ ] [\ **-**\ **-noscripts**\ ] \ **-i**\  \ *osimage*\   \ *kitcompname_list*\
 
 
 ***********
@@ -40,52 +40,52 @@ OPTIONS
 
 
 
-\ **-u|-**\ **-uninstall**\ 
- 
+\ **-u|-**\ **-uninstall**\
+
  All the kit component meta rpms and package rpms in otherpkglist will be uninstalled during genimage for stateless image and updatenode for stateful nodes.
- 
 
 
-\ **-h|-**\ **-help**\ 
- 
+
+\ **-h|-**\ **-help**\
+
  Display usage message.
- 
 
 
-\ **-V|-**\ **-verbose**\ 
- 
+
+\ **-V|-**\ **-verbose**\
+
  Verbose mode.
- 
 
 
-\ **-v|-**\ **-version**\ 
- 
+
+\ **-v|-**\ **-version**\
+
  Command version.
- 
 
 
-\ **-f|-**\ **-force**\ 
- 
+
+\ **-f|-**\ **-force**\
+
  Remove this kit component from osimage no matter it is a dependency of other kit components.
- 
 
 
-\ **-**\ **-noscripts**\ 
- 
+
+\ **-**\ **-noscripts**\
+
  Do not remove kitcomponent's postbootscripts from osimage
- 
 
 
-\ **-i**\  \ *osimage*\ 
- 
+
+\ **-i**\  \ *osimage*\
+
  osimage name that include this kit component.
- 
 
 
-\ *kitcompname_list*\ 
- 
+
+\ *kitcompname_list*\
+
  A comma-delimited list of valid full kit component names or kit component basenames that are to be removed from the osimage. If a basename is specified, all kitcomponents matching that basename will be removed from the osimage.
- 
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/rmnimimage.1.rst b/docs/source/guides/admin-guides/references/man1/rmnimimage.1.rst
index f6b6ffe7a..134b409af 100644
--- a/docs/source/guides/admin-guides/references/man1/rmnimimage.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/rmnimimage.1.rst
@@ -19,9 +19,9 @@ SYNOPSIS
 ********
 
 
-\ **rmnimimage [-h|-**\ **-help]**\ 
+\ **rmnimimage [-h|-**\ **-help]**\
 
-\ **rmnimimage [-V|-**\ **-verbose] [-f|-**\ **-force] [-d|-**\ **-delete] [-x|-**\ **-xcatdef] [-M|-**\ **-managementnode] [-s**\  \ *servicenoderange*\ ] \ *osimage_name*\ 
+\ **rmnimimage [-V|-**\ **-verbose] [-f|-**\ **-force] [-d|-**\ **-delete] [-x|-**\ **-xcatdef] [-M|-**\ **-managementnode] [-s**\  \ *servicenoderange*\ ] \ *osimage_name*\
 
 
 ***********
@@ -31,7 +31,7 @@ DESCRIPTION
 
 Use this xCAT command to remove the AIX resources specified in an xCAT osimage definition.
 
-To list the contents of the xCAT osimage definition use the xCAT \ **lsdef**\  command ("lsdef -t osimage -l -o <osimage_name>"). \ **Before running the rmnimimage command you should be absolutely certain that you really want to remove the NIM resources specified in the xCAT osimage definition!**\ 
+To list the contents of the xCAT osimage definition use the xCAT \ **lsdef**\  command ("lsdef -t osimage -l -o <osimage_name>"). \ **Before running the rmnimimage command you should be absolutely certain that you really want to remove the NIM resources specified in the xCAT osimage definition!**\
 
 The default behavior of this command is to remove all the NIM resources, except the lpp_source, on the xCAT management node in addition to the resources that were replicated on any xCAT service nodes.
 
@@ -58,52 +58,52 @@ OPTIONS
 
 
 
-\ **-h |-**\ **-help**\ 
- 
+\ **-h |-**\ **-help**\
+
  Display usage message.
- 
 
 
-\ **-d|-**\ **-delete**\ 
- 
+
+\ **-d|-**\ **-delete**\
+
  Delete any files or directories that were left after the "nim -o remove" command was run. This option will also remove the lpp_source resouce and all files contained in the lpp_source directories. When this command completes all definitions and files will be completely erased so use with caution!
- 
 
 
-\ **-f|-**\ **-force**\ 
- 
+
+\ **-f|-**\ **-force**\
+
  Override the check for shared resources when removing an xCAT osimage.
- 
 
 
-\ **-M|-**\ **-managementnode**\ 
- 
+
+\ **-M|-**\ **-managementnode**\
+
  Remove NIM resources from the xCAT management node only.
- 
 
 
-\ **-s**\  \ *servicenoderange*\ 
- 
+
+\ **-s**\  \ *servicenoderange*\
+
  Remove the NIM resources on these xCAT service nodes only.  Do not remove the NIM resources from the xCAT management node.
- 
 
 
-\ *osimage_name*\ 
- 
+
+\ *osimage_name*\
+
  The name of the xCAT osimage definition.
- 
 
 
-\ **-V|-**\ **-verbose**\ 
- 
+
+\ **-V|-**\ **-verbose**\
+
  Verbose mode. This option will display the underlying NIM commands that are being called.
- 
 
 
-\ **-x|-**\ **-xcatdef**\ 
- 
+
+\ **-x|-**\ **-xcatdef**\
+
  Remove the xCAT osimage definition.
- 
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/rmvlan.1.rst b/docs/source/guides/admin-guides/references/man1/rmvlan.1.rst
index 67b48992a..f5a8674c0 100644
--- a/docs/source/guides/admin-guides/references/man1/rmvlan.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/rmvlan.1.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **rmvlan**\  \ *vlanid*\ 
+\ **rmvlan**\  \ *vlanid*\
 
 \ **rmvlan**\  [\ **-h | -**\ **-help**\ ]
 
@@ -76,19 +76,19 @@ EXAMPLES
 
 
 1.
- 
+
  To remove vlan 3
- 
- 
+
+
  .. code-block:: perl
- 
+
     rmvlan 3
- 
- 
+
+
  If the nodes are KVM guest then the do the following after the vlan is removed:
    rpower node1,node2 off
    rmvm node1,node2
- 
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/rmvm.1.rst b/docs/source/guides/admin-guides/references/man1/rmvm.1.rst
index 39a083ec7..d1d7a5e5a 100644
--- a/docs/source/guides/admin-guides/references/man1/rmvm.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/rmvm.1.rst
@@ -19,24 +19,24 @@ SYNOPSIS
 ********
 
 
-\ **rmvm [-h| -**\ **-help]**\ 
+\ **rmvm [-h| -**\ **-help]**\
 
-\ **rmvm [-v| -**\ **-version]**\ 
+\ **rmvm [-v| -**\ **-version]**\
 
-\ **rmvm [-V| -**\ **-verbose]**\  \ *noderange*\  \ **[-r] [-**\ **-service]**\ 
+\ **rmvm [-V| -**\ **-verbose]**\  \ *noderange*\  \ **[-r] [-**\ **-service]**\
 
 For KVM and VMware:
 ===================
 
 
-\ **rmvm [-p] [-f]**\  \ *noderange*\ 
+\ **rmvm [-p] [-f]**\  \ *noderange*\
 
 
 PPC (using Direct FSP Management) specific:
 ===========================================
 
 
-\ **rmvm [-p]**\  \ *noderange*\ 
+\ **rmvm [-p]**\  \ *noderange*\
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/rmzone.1.rst b/docs/source/guides/admin-guides/references/man1/rmzone.1.rst
index 5b51983b6..0ce98ee7d 100644
--- a/docs/source/guides/admin-guides/references/man1/rmzone.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/rmzone.1.rst
@@ -7,7 +7,7 @@ rmzone.1
 
 
 ************
-\ **NAME**\ 
+\ **NAME**\
 ************
 
 
@@ -15,7 +15,7 @@ rmzone.1
 
 
 ****************
-\ **SYNOPSIS**\ 
+\ **SYNOPSIS**\
 ****************
 
 
@@ -25,105 +25,105 @@ rmzone.1
 
 
 *******************
-\ **DESCRIPTION**\ 
+\ **DESCRIPTION**\
 *******************
 
 
 The \ **rmzone**\  command is designed to remove a previously defined zone from the cluster.
-It will remove the zone entry in the zone table.  It will remove the zone from the zonename attributes on the nodes that were assigned to the zone. Optionally, it will remove the zonename group from the nodes that were assigned to the zone. 
-It will also remove the root ssh keys that were created for that zone on the Management Node. 
+It will remove the zone entry in the zone table.  It will remove the zone from the zonename attributes on the nodes that were assigned to the zone. Optionally, it will remove the zonename group from the nodes that were assigned to the zone.
+It will also remove the root ssh keys that were created for that zone on the Management Node.
 The rmzone command is only supported on Linux ( No AIX support).
-The nodes are not automatically updated with new root ssh keys by rmzone.  You must run updatenode -k  or xdsh -K to the nodes to update the root ssh keys. The nodes new ssh key will be assigned from the defaultzone in the zone table, or if  no entries in the zone table,  the keys will come from /root/.ssh.   
+The nodes are not automatically updated with new root ssh keys by rmzone.  You must run updatenode -k  or xdsh -K to the nodes to update the root ssh keys. The nodes new ssh key will be assigned from the defaultzone in the zone table, or if  no entries in the zone table,  the keys will come from /root/.ssh.
 Note: if any zones in the zone table, there must be one and only one defaultzone. Otherwise, errors will occur.
 
 
 ***************
-\ **OPTIONS**\ 
+\ **OPTIONS**\
 ***************
 
 
 
-\ **-h | -**\ **-help**\ 
- 
+\ **-h | -**\ **-help**\
+
  Displays usage information.
- 
 
 
-\ **-v | -**\ **-version**\ 
- 
+
+\ **-v | -**\ **-version**\
+
  Displays command version and build date.
- 
 
 
-\ **-f | -**\ **-force**\ 
- 
+
+\ **-f | -**\ **-force**\
+
  Used to remove a zone that is defined as current default zone.  This should only be done if you are removing all zones, or you will
  adding a new zone or changing an existing zone to be the default zone.
- 
 
 
-\ **-g | -**\ **-assigngroup**\ 
- 
+
+\ **-g | -**\ **-assigngroup**\
+
  Remove the assigned group named \ **zonename**\  from all nodes assigned to the zone being removed.
- 
 
 
-\ **-V | -**\ **-Verbose**\ 
- 
+
+\ **-V | -**\ **-Verbose**\
+
  Verbose mode.
- 
+
 
 
 
 ****************
-\ **Examples**\ 
+\ **Examples**\
 ****************
 
 
 
 1. To remove zone1 from the zone table and the zonename attribute on all it's assigned nodes , enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rmzone zone1
- 
- 
+
+
 
 
 2.
- 
+
  To remove zone2 from the zone table, the zone2 zonename attribute, and the zone2 group assigned to all nodes that were in zone2, enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rmzone zone2 -g
- 
- 
+
+
 
 
 3.
- 
+
  To remove zone3 from the zone table, all the node zone attributes and  override the fact it is the defaultzone,  enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rmzone zone3 -g -f
- 
- 
 
 
-\ **Files**\ 
 
-\ **/opt/xcat/bin/rmzone/**\ 
+
+\ **Files**\
+
+\ **/opt/xcat/bin/rmzone/**\
 
 Location of the rmzone command.
 
 
 ****************
-\ **SEE ALSO**\ 
+\ **SEE ALSO**\
 ****************
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/rnetboot.1.rst b/docs/source/guides/admin-guides/references/man1/rnetboot.1.rst
index 866e10306..c86ad1317 100644
--- a/docs/source/guides/admin-guides/references/man1/rnetboot.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/rnetboot.1.rst
@@ -46,41 +46,41 @@ OPTIONS
 *******
 
 
-\ **-s**\ 
+\ **-s**\
 
 Set the boot device order.  Accepted boot devices are hd and net.
 
-\ **-F**\ 
+\ **-F**\
 
 Force reboot the system no matter what state the node is.  By default, rnetboot will not reboot the node if node is in 'boot' state.
 
-\ **-f**\ 
+\ **-f**\
 
 Force immediate shutdown of the partition.
 
-\ **-m**\ 
+\ **-m**\
 
 Use one or multiple -m flags to specify the node attributes and the expected status for the node installation monitoring and automatic retry mechanism. The operators ==, !=, =~ and !~ are valid. This flag must be used with -t flag.
 
 Note: if the "val" fields includes spaces or any other characters that will be parsed by shell, the "attr<oper-ator>val" needs to be quoted. If the operator is "!~", the "attr<operator>val" needs to be quoted using single quote.
 
-\ **-r**\ 
+\ **-r**\
 
 specify the number of retries that the monitoring process will perform before declaring the failure. The default value is 3. Setting the retrycount to 0 means only monitoring the os installation progress and will not re-initiate the installation if the node status has not been changed to the expected value after timeout. This flag must be used with -m flag.
 
-\ **-t**\ 
+\ **-t**\
 
 Specify the timeout, in minutes, to wait for the expectedstatus specified by -m flag. This is a required flag if the -m flag is specified.
 
-\ **-V|-**\ **-verbose**\ 
+\ **-V|-**\ **-verbose**\
 
 Verbose output.
 
-\ **-h|-**\ **-help**\ 
+\ **-h|-**\ **-help**\
 
 Display usage message.
 
-\ **-v|-**\ **-version**\ 
+\ **-v|-**\ **-version**\
 
 Command Version.
 
@@ -104,15 +104,15 @@ EXAMPLES
 .. code-block:: perl
 
   rnetboot 1,3
- 
+
   rnetboot 14-56,70-203
- 
+
   rnetboot 1,3,14-56,70-203
- 
+
   rnetboot all,-129-256
- 
+
   rnetboot all -s hd,net
- 
+
   rnetboot all ipl=00c
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/rollupdate.1.rst b/docs/source/guides/admin-guides/references/man1/rollupdate.1.rst
index 4d0210087..385666d8b 100644
--- a/docs/source/guides/admin-guides/references/man1/rollupdate.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/rollupdate.1.rst
@@ -31,10 +31,10 @@ DESCRIPTION
 
 The \ **rollupdate**\  command creates and submits scheduler reservation jobs that will notify xCAT to shutdown a group of nodes, run optional out-of-band commands from the xCAT management node, and reboot the nodes.  Currently, only LoadLeveler is supported as a job scheduler with \ **rollupdate**\ .
 
-Input to the \ **rollupdate**\  command is passed in as stanza data through STDIN.  Information such as the sets of nodes that will be updated, the name of the job scheduler, a template for generating job command files, and other control data are required.  See 
-/opt/xcat/share/xcat/rollupdate/rollupdate.input.sample 
+Input to the \ **rollupdate**\  command is passed in as stanza data through STDIN.  Information such as the sets of nodes that will be updated, the name of the job scheduler, a template for generating job command files, and other control data are required.  See
+/opt/xcat/share/xcat/rollupdate/rollupdate.input.sample
 and
-/opt/xcat/share/xcat/rollupdate/rollupdate_all.input.sample 
+/opt/xcat/share/xcat/rollupdate/rollupdate_all.input.sample
 for stanza keywords, usage, and examples.
 
 The \ **rollupdate**\  command will use the input data to determine each set of nodes that will be managed together as an update group.  For each update group, a job scheduler command file is created and a reservation request is submitted.  When the group of nodes becomes available and the scheduler activates the reservation, the xcatd daemon on the management node will be notified to begin the update process for all the nodes in the update group.  If specified, prescripts will be run, an operating system shutdown command will be sent to each node, out-of-band operations can be run on the management node, and the nodes are powered back on.
@@ -48,28 +48,28 @@ OPTIONS
 
 
 
-\ **-v|-**\ **-version**\ 
- 
+\ **-v|-**\ **-version**\
+
  Command Version.
- 
 
 
-\ **-V|-**\ **-verbose**\ 
- 
+
+\ **-V|-**\ **-verbose**\
+
  Display additional progress and error messages.  Output is also logged in /var/log/xcat/rollupdate.log.
- 
 
 
-\ **-t|-**\ **-test**\ 
- 
+
+\ **-t|-**\ **-test**\
+
  Run the rollupdate command in test mode only to verify the output files that are created.  No scheduler reservation requests will be submitted.
- 
 
 
-\ **-?|-h|-**\ **-help**\ 
- 
+
+\ **-?|-h|-**\ **-help**\
+
  Display usage message.
- 
+
 
 
 
@@ -95,17 +95,17 @@ EXAMPLES
 
 
 1.
- 
- To run a cluster rolling update based on the information you have created in the file 
+
+ To run a cluster rolling update based on the information you have created in the file
  /u/admin/rolling_updates/update_all.stanza
  enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
     cat /u/admin/rolling_updates/update_all.stanza | rollupdate
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/rpower.1.rst b/docs/source/guides/admin-guides/references/man1/rpower.1.rst
index 71bdc73a8..3756d063e 100644
--- a/docs/source/guides/admin-guides/references/man1/rpower.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/rpower.1.rst
@@ -149,94 +149,94 @@ OPTIONS
 
 
 
-\ **on**\ 
- 
+\ **on**\
+
  Turn power on.
- 
 
 
-\ **onstandby**\ 
- 
+
+\ **onstandby**\
+
  Turn power on to standby state
- 
 
 
-\ **-T**\ 
- 
+
+\ **-T**\
+
  The value could be \ **lpar**\  or \ **fnm**\ . The tooltype value \ **lpar**\  is for xCAT and \ **fnm**\  is for CNM. The default value is "\ **lpar**\ ". For cold start in the large cluster, it will save a lot of time if the admins use "\ **rpower**\  \ *noderange*\  \ **onstandby**\  \ **-T**\  \ **fnm**\ " to power on all the CECs from the management node through the \ **fnm**\  connections.
- 
 
 
-\ **rackstandby**\ 
- 
+
+\ **rackstandby**\
+
  Places the rack in the rack standby state. It requires that all CECs and DE be powered off before it will run.
- 
 
 
-\ **exit_rackstandby**\ 
- 
+
+\ **exit_rackstandby**\
+
  Exit Rack standby will be the default state that a rack goes into when power is initially applied to the rack. It simply moves the BPA from Rack standby to both bpa's in standby state.
- 
 
 
-\ **resetsp**\ 
- 
+
+\ **resetsp**\
+
  Reboot the service processor. If there are primary and secondary FSPs/BPAs of one cec/frame, it will reboot them almost at the same time.
- 
 
 
-\ **softoff**\ 
- 
+
+\ **softoff**\
+
  Attempt to request clean shutdown of OS (may not detect failures in completing command)
- 
 
 
-\ **off**\ 
- 
+
+\ **off**\
+
  Turn power off.
- 
 
 
-\ **suspend**\ 
- 
+
+\ **suspend**\
+
  Suspend the target nodes execution.
- 
+
  The \ **suspend**\  action could be run together with \ **-w**\  \ **-o**\  \ **-r**\ .
- 
+
  Refer to the following steps to enable the \ **suspend**\  function:
- 
+
  1. Add the 'acpid' and 'suspend'(the suspend package is not needed on RHEL) package to the .pkglist of your osimage so that the required package could be installed correctly to your target system.
- 
+
  2. Add two configuration files for the base function:
- 
- 
+
+
  .. code-block:: perl
- 
+
    /etc/pm/config.d/suspend
        S2RAM_OPTS="--force --vbe_save --vbe_post --vbe_mode"
-  
+
    /etc/acpi/events/suspend_event
        event=button/sleep.*
        action=/usr/sbin/pm-suspend
- 
- 
+
+
  3. Add the hook files for your specific applications which need specific action before or after the suspend action.
- 
+
  Refer to the 'pm-utils' package for how to create the specific hook files.
- 
 
 
-\ **wake**\ 
- 
+
+\ **wake**\
+
  Wake up the target nodes which is in \ **suspend**\  state.
- 
+
  Don't try to run \ **wake**\  against the 'on' state node, it would cause the node gets to 'off' state.
- 
+
  For some of xCAT hardware such as NeXtScale, it may need to enable S3 before using \ **wake**\ . The following steps can be used to enable S3. Reference pasu(1)|pasu.1 for "pasu" usage.
- 
- 
+
+
  .. code-block:: perl
- 
+
    [root@xcatmn home]# echo "set Power.S3Enable Enable" > power-setting
    [root@xcatmn home]# pasu -b power-setting node01
    node01: Batch mode start.
@@ -248,7 +248,7 @@ OPTIONS
    node01: Command completed successfully.
    node01: Completed intermediate batch update.
    node01: Batch mode completed successfully.
-  
+
    [root@xcatmn home]# pasu node01 show all|grep -i s3
    node01: IMM.Community_HostIPAddress3.1=
    node01: IMM.Community_HostIPAddress3.2=
@@ -256,158 +256,158 @@ OPTIONS
    node01: IMM.DNS_IP_Address3=0.0.0.0
    node01: IMM.IPv6DNS_IP_Address3=::
    node01: Power.S3Enable=Enable
- 
- 
 
 
-\ **stat | state**\ 
- 
+
+
+\ **stat | state**\
+
  Print the current power state/status.
- 
 
 
-\ **reset**\ 
- 
+
+\ **reset**\
+
  Send a hard reset.
- 
 
 
-\ **boot**\ 
- 
+
+\ **boot**\
+
  If off, then power on.
  If on, then hard reset.
  This option is recommended over \ **cycle**\ .
- 
 
 
-\ **cycle**\ 
- 
+
+\ **cycle**\
+
  Power off, then on.
- 
 
 
-\ **reseat**\ 
- 
+
+\ **reseat**\
+
  For Lenovo high-density servers, simulates unplugging and replugging the node into the chassis.
- 
 
 
-\ **of**\ 
- 
+
+\ **of**\
+
  Boot the node to open firmware console mode.
- 
 
 
-\ **sms**\ 
- 
+
+\ **sms**\
+
  Boot the node to open firmware SMS menu mode.
- 
 
 
-\ **-m**\  \ *table.column*\ ==\ *expectedstatus*\  \ **-m**\  \ *table.column*\ =~\ *expectedstatus*\ 
- 
+
+\ **-m**\  \ *table.column*\ ==\ *expectedstatus*\  \ **-m**\  \ *table.column*\ =~\ *expectedstatus*\
+
  Use one or multiple \ **-m**\  flags to specify the node attributes and the expected status for the node installation monitoring and automatic retry mechanism. The operators ==, !=, =~ and !~ are valid. This flag must be used with -t flag.
- 
+
  Note: if the "val" fields includes spaces or any other characters that will be parsed by shell, the "attr<oper-ator>val" needs to be quoted. If the operator is "!~", the "attr<operator>val" needs to be quoted using single quote.
- 
 
 
-\ **-**\ **-nodeps**\ 
- 
+
+\ **-**\ **-nodeps**\
+
  Do not use dependency table (default is to use dependency table). Valid only with \ **on|off|boot|reset|cycle**\  for blade power method and \ **on|off|reset|softoff**\  for hmc/fsp power method.
- 
 
 
-\ **-r**\  \ *retrycount*\ 
- 
+
+\ **-r**\  \ *retrycount*\
+
  specify the number of retries that the monitoring process will perform before declaring the failure. The default value is 3. Setting the retrycount to 0 means only monitoring the os installation progress and will not re-initiate the installation if the node status has not been changed to the expected value after timeout. This flag must be used with -m flag.
- 
 
 
-\ **-t**\  \ *timeout*\ 
- 
+
+\ **-t**\  \ *timeout*\
+
  Specify the timeout, in minutes, to wait for the expectedstatus specified by -m flag. This is a required flag if the -m flag is specified.
- 
+
  Power off, then on.
- 
 
 
-\ **-w**\  \ *timeout*\ 
- 
+
+\ **-w**\  \ *timeout*\
+
  To set the \ *timeout*\  for the \ **suspend**\  action to wait for the success.
- 
 
 
-\ **-o**\ 
- 
+
+\ **-o**\
+
  To specify that the target node will be power down if \ **suspend**\  action failed.
- 
 
 
-\ **-r**\ 
- 
+
+\ **-r**\
+
  To specify that the target node will be reset if \ **suspend**\  action failed.
- 
 
 
-\ **start**\ 
- 
+
+\ **start**\
+
  To start a created docker instance.
- 
 
 
-\ **stop**\ 
- 
+
+\ **stop**\
+
  To stop a created docker instance.
- 
 
 
-\ **restart**\ 
- 
+
+\ **restart**\
+
  To restart a created docker instance.
- 
 
 
-\ **pause**\ 
- 
+
+\ **pause**\
+
  To pause all processes in the instance.
- 
 
 
-\ **unpause**\ 
- 
+
+\ **unpause**\
+
  To unpause all processes in the instance.
- 
 
 
-\ **bmcreboot**\ 
- 
+
+\ **bmcreboot**\
+
  To reboot BMC.
- 
 
 
-\ **bmcstate**\ 
- 
+
+\ **bmcstate**\
+
  To get state of the BMC.
- 
 
 
-\ **state**\ 
- 
+
+\ **state**\
+
  To get state of the instance.
- 
 
 
-\ **-h | -**\ **-help**\ 
- 
+
+\ **-h | -**\ **-help**\
+
  Prints out a brief usage message.
- 
 
 
-\ **-v | -**\ **-version**\ 
- 
+
+\ **-v | -**\ **-version**\
+
  Display the version number.
- 
+
 
 
 
@@ -418,40 +418,40 @@ EXAMPLES
 
 
 1. To display power status of nodes4 and note5
- 
- 
+
+
  .. code-block:: perl
- 
+
    rpower node4,node5 stat
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    node4: on
    node5: off
- 
- 
+
+
 
 
 2. To power on node5
- 
- 
+
+
  .. code-block:: perl
- 
+
    rpower node5 on
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    node5: on
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/rscan.1.rst b/docs/source/guides/admin-guides/references/man1/rscan.1.rst
index 9d6ff5082..fa143d57a 100644
--- a/docs/source/guides/admin-guides/references/man1/rscan.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/rscan.1.rst
@@ -19,11 +19,11 @@ SYNOPSIS
 ********
 
 
-\ **rscan [-h|-**\ **-help]**\ 
+\ **rscan [-h|-**\ **-help]**\
 
-\ **rscan [-v|-**\ **-version]**\ 
+\ **rscan [-v|-**\ **-version]**\
 
-\ **rscan [-V|-**\ **-verbose]**\  \ *noderange*\   \ **[-u][-w][-x|-z]**\ 
+\ **rscan [-V|-**\ **-verbose]**\  \ *noderange*\   \ **[-u][-w][-x|-z]**\
 
 
 ***********
@@ -101,7 +101,7 @@ Output is similar to:
 .. code-block:: perl
 
    type    name                       id   type-model  serial-number  address
- 
+
    hmc     hmc01                           7310-C05    10F426A        hmc01
    fsp     Server-9117-MMA-SN10F6F3D       9117-MMA    10F6F3D        3.3.3.197
    lpar    lpar3                       4   9117-MMA    10F6F3D
@@ -136,7 +136,7 @@ Output is similar to:
     <groups>fsp,all</groups>
     <id>10</id>
   </Node>
- 
+
   <Node>
     <cons>ivm</cons>
     <profile>lpar01</profile>
@@ -150,7 +150,7 @@ Output is similar to:
     <groups>lpar,all</groups>
     <id>1</id>
   <Node>
- 
+
   </Node>
     <cons>ivm</cons>
     <profile>lpar02</profile>
@@ -191,7 +191,7 @@ Output is similar to:
      groups=bpa,all
      mgt=hmc
      cons=
- 
+
    Server-9119-590-SN02C5F9E:
      objtype=node
      type=fsp
@@ -204,7 +204,7 @@ Output is similar to:
      groups=fsp,all
      mgt=hmc
      cons=
- 
+
    lpar01:
      objtype=node
      nodetype=lpar,osi
@@ -217,7 +217,7 @@ Output is similar to:
      groups=lpar,all
      mgt=hmc
      cons=hmc
- 
+
    lpar02:
      objtype=node
      nodetype=lpar,osi
diff --git a/docs/source/guides/admin-guides/references/man1/rsetboot.1.rst b/docs/source/guides/admin-guides/references/man1/rsetboot.1.rst
index f25aa0bed..a38804cb1 100644
--- a/docs/source/guides/admin-guides/references/man1/rsetboot.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/rsetboot.1.rst
@@ -30,46 +30,46 @@ OPTIONS
 
 
 
-\ **hd**\ 
- 
+\ **hd**\
+
  Boot from the hard disk.
- 
 
 
-\ **net**\ 
- 
+
+\ **net**\
+
  Boot over the network, using a PXE or BOOTP broadcast.
- 
 
 
-\ **cd**\ 
- 
+
+\ **cd**\
+
  Boot from the CD or DVD drive.
- 
 
 
-\ **def | default**\ 
- 
+
+\ **def | default**\
+
  Boot using the default set in BIOS.
- 
 
 
-\ **stat**\ 
- 
+
+\ **stat**\
+
  Display the current boot setting.
- 
 
 
-\ **-u**\ 
- 
+
+\ **-u**\
+
  To specify the next boot mode to be "UEFI Mode". (Not supported for OpenBMC)
- 
 
 
-\ **-p**\ 
- 
+
+\ **-p**\
+
  To make the specified boot device and boot mode settings persistent.
- 
+
 
 
 
@@ -80,47 +80,47 @@ EXAMPLES
 
 
 1.
- 
+
  Set nodes 1 and 3 to boot from the network on the next boot:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rsetboot node1,node3 net
- 
- 
+
+
 
 
 2.
- 
+
  Display the next-boot value for nodes 14-56 and 70-203:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rsetboot node[14-56],node[70-203] stat
- 
- 
+
+
  Or:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rsetboot node[14-56],node[70-203]
- 
- 
+
+
 
 
 3.
- 
+
  Restore the next-boot value for these nodes back to their default set in the BIOS:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rsetboot node1,node3,node[14-56],node[70-203] default
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/rspconfig.1.rst b/docs/source/guides/admin-guides/references/man1/rspconfig.1.rst
index 3e61e08ba..957b8848d 100644
--- a/docs/source/guides/admin-guides/references/man1/rspconfig.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/rspconfig.1.rst
@@ -29,7 +29,7 @@ BMC/MPA specific:
 
 \ **rspconfig**\  \ *noderange*\  \ **alert**\ ={\ **on | enable | off | disable**\ }
 
-\ **rspconfig**\  \ *noderange*\  \ **snmpdest**\ =\ *snmpmanager-IP*\ 
+\ **rspconfig**\  \ *noderange*\  \ **snmpdest**\ =\ *snmpmanager-IP*\
 
 \ **rspconfig**\  \ *noderange*\  \ **community**\ ={\ **public**\  | \ *string*\ }
 
@@ -40,7 +40,7 @@ BMC specific:
 
 \ **rspconfig**\  \ *noderange*\  {\ **ip | netmask | gateway | backupgateway | garp | vlan**\ }
 
-\ **rspconfig**\  \ *noderange*\  \ **garp**\ =\ *time*\ 
+\ **rspconfig**\  \ *noderange*\  \ **garp**\ =\ *time*\
 
 
 OpenBMC specific:
@@ -51,41 +51,41 @@ OpenBMC specific:
 
 \ **rspconfig**\  \ *noderange*\  \ **admin_passwd**\ ={\ *currentpasswd,newpasswd*\ }
 
-\ **rspconfig**\  \ *noderange*\  \ **autoreboot**\ 
+\ **rspconfig**\  \ *noderange*\  \ **autoreboot**\
 
-\ **rspconfig**\  \ *noderange*\  \ **autoreboot={0|1}**\ 
+\ **rspconfig**\  \ *noderange*\  \ **autoreboot={0|1}**\
 
-\ **rspconfig**\  \ *noderange*\  \ **bootmode**\ 
+\ **rspconfig**\  \ *noderange*\  \ **bootmode**\
 
-\ **rspconfig**\  \ *noderange*\  \ **bootmode={safe|regular|setup}**\ 
+\ **rspconfig**\  \ *noderange*\  \ **bootmode={safe|regular|setup}**\
 
 \ **rspconfig**\  \ *noderange*\  \ **dump**\  [\ **-l | -**\ **-list**\ ] [\ **-g | -**\ **-generate**\ ] [\ **-c | -**\ **-clear**\  {\ *id*\  | \ **all**\ }] [\ **-d | -**\ **-download**\  {\ *id*\  | \ **all**\ }]
 
-\ **rspconfig**\  \ *noderange*\  \ **gard -c|-**\ **-clear**\ 
+\ **rspconfig**\  \ *noderange*\  \ **gard -c|-**\ **-clear**\
 
-\ **rspconfig**\  \ *noderange*\  \ **ip=dhcp**\ 
+\ **rspconfig**\  \ *noderange*\  \ **ip=dhcp**\
 
-\ **rspconfig**\  \ *noderange*\  \ **hostname**\ 
+\ **rspconfig**\  \ *noderange*\  \ **hostname**\
 
 \ **rspconfig**\  \ *noderange*\  \ **hostname**\ ={\* | \ *name*\ }
 
-\ **rspconfig**\  \ *noderange*\  \ **ntpservers**\ 
+\ **rspconfig**\  \ *noderange*\  \ **ntpservers**\
 
 \ **rspconfig**\  \ *noderange*\  \ **ntpservers**\ ={\ *ntpservers*\ }
 
-\ **rspconfig**\  \ *noderange*\  \ **powerrestorepolicy**\ 
+\ **rspconfig**\  \ *noderange*\  \ **powerrestorepolicy**\
 
-\ **rspconfig**\  \ *noderange*\  \ **powerrestorepolicy={always_on|restore|always_off}**\ 
+\ **rspconfig**\  \ *noderange*\  \ **powerrestorepolicy={always_on|restore|always_off}**\
 
-\ **rspconfig**\  \ *noderange*\  \ **powersupplyredundancy**\ 
+\ **rspconfig**\  \ *noderange*\  \ **powersupplyredundancy**\
 
-\ **rspconfig**\  \ *noderange*\  \ **powersupplyredundancy={disabled|enabled}**\ 
+\ **rspconfig**\  \ *noderange*\  \ **powersupplyredundancy={disabled|enabled}**\
 
-\ **rspconfig**\  \ *noderange*\  \ **sshcfg**\ 
+\ **rspconfig**\  \ *noderange*\  \ **sshcfg**\
 
-\ **rspconfig**\  \ *noderange*\  \ **timesyncmethod**\ 
+\ **rspconfig**\  \ *noderange*\  \ **timesyncmethod**\
 
-\ **rspconfig**\  \ *noderange*\  \ **timesyncmethod={manual|ntp}**\ 
+\ **rspconfig**\  \ *noderange*\  \ **timesyncmethod={manual|ntp}**\
 
 
 MPA specific:
@@ -131,9 +131,9 @@ FSP/CEC specific:
 
 \ **rspconfig**\  \ *noderange*\  \ **iocap**\ ={\ **enable | disable**\ }
 
-\ **rspconfig**\  \ *noderange*\  \ **time**\ =\ *hh:mm:ss*\ 
+\ **rspconfig**\  \ *noderange*\  \ **time**\ =\ *hh:mm:ss*\
 
-\ **rspconfig**\  \ *noderange*\  \ **date**\ =\ *mm:dd:yyyy*\ 
+\ **rspconfig**\  \ *noderange*\  \ **date**\ =\ *mm:dd:yyyy*\
 
 \ **rspconfig**\  \ *noderange*\  \ **decfg**\ ={\ **enable|disable**\ :\ *policyname,...*\ }
 
@@ -159,7 +159,7 @@ FSP/CEC specific:
 
 \ **rspconfig**\  \ *noderange*\  \ **hostname**\ ={\* | \ *name*\ }
 
-\ **rspconfig**\  \ *noderange*\  \ **-**\ **-resetnet**\ 
+\ **rspconfig**\  \ *noderange*\  \ **-**\ **-resetnet**\
 
 
 Flex system Specific:
@@ -203,7 +203,7 @@ BPA/Frame Specific:
 
 \ **rspconfig**\  \ *noderange*\  \ **hostname**\ ={\* | \ *name*\ }
 
-\ **rspconfig**\  \ *noderange*\  \ **-**\ **-resetnet**\ 
+\ **rspconfig**\  \ *noderange*\  \ **-**\ **-resetnet**\
 
 
 FSP/CEC (using Direct FSP Management) Specific:
@@ -242,7 +242,7 @@ FSP/CEC (using Direct FSP Management) Specific:
 
 \ **rspconfig**\  \ *noderange*\  {\ **force_failover**\ }
 
-\ **rspconfig**\  \ *noderange*\  \ **-**\ **-resetnet**\ 
+\ **rspconfig**\  \ *noderange*\  \ **-**\ **-resetnet**\
 
 
 BPA/Frame (using Direct FSP Management) Specific:
@@ -269,7 +269,7 @@ BPA/Frame (using Direct FSP Management) Specific:
 
 \ **rspconfig**\  \ *noderange*\  \ **pending_power_on_side**\ ={\ **temp | perm**\ }
 
-\ **rspconfig**\  \ *noderange*\  \ **-**\ **-resetnet**\ 
+\ **rspconfig**\  \ *noderange*\  \ **-**\ **-resetnet**\
 
 
 HMC Specific:
@@ -280,7 +280,7 @@ HMC Specific:
 
 \ **rspconfig**\  \ *noderange*\  \ **sshcfg**\ ={\ **enable | disable**\ }
 
-\ **rspconfig**\  \ *noderange*\  \ **-**\ **-resetnet**\ 
+\ **rspconfig**\  \ *noderange*\  \ **-**\ **-resetnet**\
 
 
 
@@ -300,418 +300,418 @@ OPTIONS
 
 
 
-\ **alert={on | enable | off | disable}**\ 
- 
+\ **alert={on | enable | off | disable}**\
+
  Turn on or off SNMP alerts.
- 
+
 
 
 \ **autopower**\ ={\ *enable*\  | \ *disable*\ }
- 
+
  Select the policy for auto power restart. If enabled, the system will boot automatically once power is restored after a power disturbance.
- 
 
 
-\ **backupgateway**\ 
- 
+
+\ **backupgateway**\
+
  Get the BMC backup gateway ip address.
- 
+
 
 
 \ **community**\ ={\ **public**\  | \ *string*\ }
- 
+
  Get or set the SNMP commmunity value. The default is \ **public**\ .
- 
 
 
-\ **date**\ =\ *mm:dd:yyy*\ 
- 
+
+\ **date**\ =\ *mm:dd:yyy*\
+
  Enter the current date.
- 
+
 
 
 \ **decfg**\ ={\ **enable | disable**\ :\ *policyname,...*\ }
- 
+
  Enables or disables deconfiguration policies.
- 
+
 
 
 \ **frame**\ ={\ *framenumber*\  | \*}
- 
+
  Set or get frame number.  If no framenumber and \* specified, framenumber for the nodes will be displayed and updated in xCAAT database.  If framenumber is specified, it only supports single node and the framenumber will be set for that frame.  If \* is specified, it supports noderange and all the frame numbers for the noderange will be read from xCAT database and set to frames. Setting the frame number is a disruptive command which requires all CECs to be powered off prior to issuing the command.
- 
+
 
 
 \ **cec_off_policy**\ ={\ **poweroff | stayon**\ }
- 
+
  Set or get cec off policy after lpars are powered off.  If no cec_off_policy value specified, the cec_off_policy for the nodes will be displayed. the cec_off_policy has two values: \ **poweroff**\  and \ **stayon**\ . \ **poweroff**\  means Power off when last partition powers off. \ **stayon**\  means Stay running after last partition powers off. If cec_off_policy value is specified, the cec off policy will be set for that cec.
- 
+
 
 
 \ **HMC_passwd**\ ={\ *currentpasswd,newpasswd*\ }
- 
+
  Change the password of the userid \ **HMC**\  for CEC/Frame. If the CEC/Frame is the factory default, the currentpasswd should NOT be specified; otherwise, the currentpasswd should be specified to the current password of the userid \ **HMC**\  for the CEC/Frame.
- 
+
 
 
 \ **admin_passwd**\ ={\ *currentpasswd,newpasswd*\ }
- 
+
  Change the password of the userid \ **admin**\  for CEC/Frame from currentpasswd to newpasswd. If the CEC/Frame is the factory default, the currentpasswd should NOT be specified; otherwise, the currentpasswd should be specified to the current password of the userid \ **admin**\  for the CEC/Frame.
- 
+
 
 
 \ **general_passwd**\ ={\ *currentpasswd,newpasswd*\ }
- 
+
  Change the password of the userid \ **general**\  for CEC/Frame from currentpasswd to newpasswd. If the CEC/Frame is the factory default, the currentpasswd should NOT be specified; otherwise, the currentpasswd should be specified to the current password of the userid \ **general**\  for the CEC/Frame.
- 
+
 
 
 \*\ **_passwd**\ ={\ *currentpasswd,newpasswd*\ }
- 
+
  Change the passwords of the userids \ **HMC**\ , \ **admin**\  and \ **general**\  for CEC/Frame from currentpasswd to newpasswd. If the CEC/Frame is the factory default, the currentpasswd should NOT be specified; otherwise, if the current passwords of the userids \ **HMC**\ , \ **admin**\  and \ **general**\  for CEC/Frame are the same one, the currentpasswd should be specified to the current password, and then the password will be changed to the newpasswd. If the CEC/Frame is NOT the factory default, and the current passwords of the userids \ **HMC**\ , \ **admin**\  and \ **general**\  for CEC/Frame are NOT the same one, this option could NOT be used, and we should change the password one by one.
- 
 
 
-\ **frequency**\ 
- 
+
+\ **frequency**\
+
  The NTP update frequency (in minutes).
- 
 
 
-\ **gard -c|-**\ **-clear**\ 
- 
+
+\ **gard -c|-**\ **-clear**\
+
  Clear gard file. [OpenBMC]
- 
 
 
-\ **garp**\ =\ *time*\ 
- 
+
+\ **garp**\ =\ *time*\
+
  Get or set Gratuitous ARP generation interval. The unit is number of 1/2 second.
- 
 
 
-\ **gateway**\ 
- 
+
+\ **gateway**\
+
  The gateway ip address.
- 
 
 
-\ **hostname**\ 
- 
+
+\ **hostname**\
+
  Display the CEC/BPA system names.
- 
 
 
-\ **BSR**\ 
- 
+
+\ **BSR**\
+
  Get Barrier Synchronization Register (BSR) allocation for a CEC.
- 
 
 
-\ **huge_page**\ 
- 
+
+\ **huge_page**\
+
  Query huge page information or request NUM of huge pages for CEC. If no value specified, it means query huge page information for the specified CECs, if a CEC is specified, the specified huge_page value NUM will be used as the requested number of huge pages for the CEC, if CECs are specified, it means to request the same NUM huge pages for all the specified CECs.
- 
+
 
 
 \ **setup_failover**\ ={\ **enable**\  | \ **disable**\ }
- 
+
  Enable or disable the service processor failover function of a CEC or display status of this function.
- 
 
 
-\ **force_failover**\ 
- 
+
+\ **force_failover**\
+
  Force a service processor failover from the primary service processor to the secondary service processor.
- 
+
 
 
 \ **hostname**\ ={\* | \ *name*\ }
- 
+
  Set CEC/BPA system names to the names in xCAT DB or the input name.
- 
+
 
 
 \ **iocap**\ ={\ **enable**\  | \ **disable**\ }
- 
+
  Select the policy for I/O Adapter Enlarged Capacity. This option controls the size of PCI memory space allocated to each PCI slot.
- 
 
 
-\ **hostname**\ 
- 
+
+\ **hostname**\
+
  Get or set hostname on the service processor.
- 
 
 
-\ **vlan**\ 
- 
+
+\ **vlan**\
+
  Get or set vlan ID. For get vlan ID, if vlan is not enabled, 'BMC VLAN disabled' will be outputed. For set vlan ID, the valid value are [1-4096].
- 
 
 
-\ **ipsrc**\ 
- 
+
+\ **ipsrc**\
+
  Get the IP source for OpenBMC.
- 
 
 
-\ **ip**\ 
- 
+
+\ **ip**\
+
  The IP address.
- 
+
 
 
 \ **memdecfg**\ ={\ **configure | deconfigure**\ :\ *processingunit*\ :\ *unit|bank*\ :\ *id,...*\ }
- 
+
  Select whether each memory bank should be enabled or disabled. State changes take effect on the next platform boot.
- 
 
 
-\ **netmask**\ 
- 
+
+\ **netmask**\
+
  The subnet mask.
- 
 
 
-\ **powerrestorepolicy**\ 
- 
+
+\ **powerrestorepolicy**\
+
  Display or control BMC Power Restore Policy attribute setting. [OpenBMC]
- 
 
 
-\ **powersupplyredundancy**\ 
- 
+
+\ **powersupplyredundancy**\
+
  Display or control BMC Power Supply Redundancy attribute setting. [OpenBMC]
- 
 
 
-\ **autoreboot**\ 
- 
+
+\ **autoreboot**\
+
  Display or control BMC Auto Reboot attribute setting. [OpenBMC]
- 
 
 
-\ **bootmode**\ 
- 
+
+\ **bootmode**\
+
  Display or control BMC Boot Mode attribute setting. [OpenBMC]
- 
 
 
-\ **dump**\ 
- 
+
+\ **dump**\
+
  Generate/Manage BMC system dumps. If no sub-option is provided, will generate, wait, and download the dump. [OpenBMC]
- 
- 
+
+
  \ **-c**\  will clear a single specified dump, or use 'all' to clear all dumps on the BMC.
- 
- 
- 
+
+
+
  \ **-l**\  will list all the generated dumps on the BMC.
- 
- 
- 
+
+
+
  \ **-g**\  will generate a new dump on the BMC. Dump generation can take a few minutes.
- 
- 
- 
+
+
+
  \ **-d**\  will download a single dump or all generated dumps from the BMC to /var/log/xcat/dump on management or service node.
- 
- 
- 
 
 
-\ **timesyncmethod**\ 
- 
+
+
+
+\ **timesyncmethod**\
+
  Set the method for time synchronization on the BMC. [OpenBMC]
- 
+
 
 
 \ **network**\ ={[\ *ip*\ ],[\ *host*\ ],[\ *gateway*\ ],[\ *netmask*\ ]|\*}
- 
+
  For MPA:  get or set the MPA network parameters. If '\*' is specified, all parameters are read from the xCAT database.
- 
+
  For FSP of Flex system P node: set the network parameters. If '\*' is specified, all parameters are read from the xCAT database.
- 
+
 
 
 \ **initnetwork**\ ={[\ *ip*\ ],[\ *host*\ ],[\ *gateway*\ ],[\ *netmask*\ ]|\*}
- 
+
  For MPA only. Connecting to the IP of MPA from the hosts.otherinterfaces to set the MPA network parameters. If '\*' is specified, all parameters are read from the xCAT database.
- 
+
 
 
 \ **network**\ ={\ *nic*\ ,{[\ *ip*\ ],[\ *host*\ ],[\ *gateway*\ ],[\ *netmask*\ ]}|\*}
- 
- Not only for FSP/BPA but also for IMM. Get or set the FSP/BPA/IMM network parameters. If '\*' is specified, all parameters are read from the xCAT database. 
+
+ Not only for FSP/BPA but also for IMM. Get or set the FSP/BPA/IMM network parameters. If '\*' is specified, all parameters are read from the xCAT database.
  If the value of \ *ip*\  is '0.0.0.0', this \ *nic*\  will be configured as a DHCP client. Otherwise this \ *nic*\  will be configured with a static IP.
- 
+
  Note that IPs of FSP/BPAs will be updated with this option, user needs to put the new IPs to /etc/hosts manually or with xCAT command makehosts. For more details, see the man page of makehosts.
- 
 
 
-\ **nonred**\ 
- 
+
+\ **nonred**\
+
  Allows loss of redundancy.
- 
+
 
 
 \ **ntp**\ ={[\ *ntpenable*\ ],[\ *ntpserver*\ ],[\ *frequency*\ ],[\ *v3*\ ]}
- 
+
  Get or set the MPA Network Time Protocol (NTP) parameters.
- 
 
 
-\ **ntpenable**\ 
- 
+
+\ **ntpenable**\
+
  Enable or disable NTP (enable|disable).
- 
 
 
-\ **ntpserver**\ 
- 
+
+\ **ntpserver**\
+
  Get or set NTP server IP address or name.
- 
 
 
-\ **ntpservers**\ 
- 
+
+\ **ntpservers**\
+
  Get or set NTP servers name. [OpenBMC]
- 
+
 
 
 \ **pd1**\ ={\ **nonred | redwoperf | redwperf**\ }
- 
+
  Power Domain 1 - determines how an MPA responds to a loss of redundant power.
- 
+
 
 
 \ **pd2**\ ={\ **nonred | redwoperf | redwperf**\ }
- 
+
  Power Domain 2 - determines how an MPA responds to a loss of redundant power.
- 
+
 
 
 \ **procdecfg**\ ={\ **configure|deconfigure**\ :\ *processingunit*\ :\ *id,...*\ }
- 
+
  Selects whether each processor should be enabled or disabled. State changes take effect on the next platform boot.
- 
 
 
-\ **redwoperf**\ 
- 
+
+\ **redwoperf**\
+
  Prevents components from turning on that will cause loss of power redundancy.
- 
 
 
-\ **redwperf**\ 
- 
+
+\ **redwperf**\
+
  Power throttles components to maintain power redundancy and prevents components from turning on that will cause loss of power redundancy.
- 
+
 
 
 \ **snmpcfg**\ ={\ **enable | disable**\ }
- 
+
  Enable or disable SNMP on MPA.
- 
 
 
-\ **snmpdest**\ =\ *snmpmanager-IP*\ 
- 
+
+\ **snmpdest**\ =\ *snmpmanager-IP*\
+
  Get or set where the SNMP alerts should be sent to.
- 
+
 
 
 \ **solcfg**\ ={\ **enable | disable**\ }
- 
+
  Enable or disable the sol on MPA (or CMM) and blade servers belongs to it.
- 
 
 
-\ **spdump**\ 
- 
+
+\ **spdump**\
+
  Performs a service processor dump.
- 
+
 
 
 \ **sshcfg**\ ={\ **enable | disable**\ }
- 
+
  Enable or disable SSH on MPA.
- 
 
 
-\ **sshcfg**\ 
- 
+
+\ **sshcfg**\
+
  Copy SSH keys.
- 
+
 
 
 \ **swnet**\ ={[\ *ip*\ ],[\ *gateway*\ ],[\ *netmask*\ ]}
- 
+
  Set the Switch network parameters.
- 
 
 
-\ **sysdump**\ 
- 
+
+\ **sysdump**\
+
  Performs a system dump.
- 
 
 
-\ **sysname**\ 
- 
+
+\ **sysname**\
+
  Query or set sysname for CEC or Frame. If no value specified, means to query sysname of the specified nodes. If '\*' specified, it means to set sysname for the specified nodes, and the sysname values would get from xCAT datebase. If a string is specified, it means to use the string as sysname value to set for the specified node.
- 
+
 
 
 \ **pending_power_on_side**\ ={\ **temp|perm**\ }
- 
+
  List or set pending power on side for CEC or Frame. If no pending_power_on_side value specified, the pending power on side for the CECs or frames will be displayed. If specified, the pending_power_on_side value will be set to CEC's FSPs or Frame's BPAs. The value 'temp' means T-side or temporary side. The value 'perm' means P-side or permanent side.
- 
 
 
-\ **time**\ =\ *hh:mm:ss*\ 
- 
+
+\ **time**\ =\ *hh:mm:ss*\
+
  Enter the current time in UTC (Coordinated Universal Time) format.
- 
+
 
 
 \ **textid**\ ={\ *\\*|textid*\ }
- 
+
  Set the blade or MPA textid. When using '\*', the textid used is the node name specified on the command-line. Note that when specifying an actual textid, only a single node can be specified in the noderange.
- 
+
 
 
 \ **USERID**\ ={\ *newpasswd*\ } \ **updateBMC**\ ={\ **y|n**\ }
- 
+
  Change the password of the userid \ **USERID**\  for CMM in Flex system cluster. The option \ *updateBMC*\  can be used to specify whether updating the password of BMCs that connected to the specified CMM. The value is 'y' by default which means whenever updating the password of CMM, the password of BMCs will be also updated. Note that there will be several seconds needed before this command complete.
- 
+
  If value "\*" is specified for USERID and the object node is \ *Flex System X node*\ , the password used to access the BMC of the System X node through IPMI will be updated as the same password of the userid \ **USERID**\  of the CMM in the same cluster.
- 
 
 
-\ **-**\ **-resetnet**\ 
- 
+
+\ **-**\ **-resetnet**\
+
  Reset the network interfaces of the specified nodes.
- 
 
 
-\ **v3**\ 
- 
+
+\ **v3**\
+
  Enable or disable v3 authentication (enable|disable).
- 
 
 
-\ **-h | -**\ **-help**\ 
- 
+
+\ **-h | -**\ **-help**\
+
  Prints out a brief usage message.
- 
 
 
-\ **-v**\  | \ **-**\ **-version**\ 
- 
+
+\ **-v**\  | \ **-**\ **-version**\
+
  Display the version number.
- 
+
 
 
 
@@ -722,181 +722,181 @@ EXAMPLES
 
 
 1. To setup new ssh keys on the Management Module mm:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rspconfig mm snmpcfg=enable sshcfg=enable
- 
- 
+
+
 
 
 2. To turn on SNMP alerts for node5:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rspconfig node5 alert=on
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    node5: Alerts: enabled
- 
- 
+
+
 
 
 3. To display the destination setting for SNMP alerts for node4:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rspconfig node4 snmpdest
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    node4: BMC SNMP Destination 1: 9.114.47.227
- 
- 
+
+
 
 
 4.
- 
+
  To display the frame number for frame 9A00-10000001
- 
- 
+
+
  .. code-block:: perl
- 
+
    rspconfig> 9A00-10000001 frame
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    9A00-10000001: 1
- 
- 
+
+
 
 
 5. To set the frame number for frame 9A00-10000001
- 
- 
+
+
  .. code-block:: perl
- 
+
    rspconfig 9A00-10000001 frame=2
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    9A00-10000001: SUCCESS
- 
- 
+
+
 
 
 6. To set the frame numbers for frame 9A00-10000001 and 9A00-10000002
- 
- 
+
+
  .. code-block:: perl
- 
+
    rspconfig 9A00-10000001,9A00-10000002 frame=*
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    9A00-10000001: SUCCESS
    9A00-10000002: SUCCESS
- 
- 
+
+
 
 
 7. To display the MPA network parameters for mm01:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rspconfig mm01 network
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    mm01: MM IP: 192.168.1.47
    mm01: MM Hostname: MM001125C31F28
    mm01: Gateway: 192.168.1.254
    mm01: Subnet Mask: 255.255.255.224
- 
- 
+
+
 
 
 8. To change the MPA network parameters with the values in the xCAT database for mm01:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rspconfig mm01 network=*
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    mm01: MM IP: 192.168.1.47
    mm01: MM Hostname: mm01
    mm01: Gateway: 192.168.1.254
    mm01: Subnet Mask: 255.255.255.224
- 
- 
+
+
 
 
 9. To change only the gateway parameter for the MPA network mm01:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rspconfig mm01 network=,,192.168.1.1,
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    mm01: Gateway: 192.168.1.1
- 
- 
+
+
 
 
 10. To display the FSP network parameters for fsp01:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rspconfig> fsp01 network
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    fsp01:
           eth0:
                   IP Type: Dynamic
@@ -904,237 +904,237 @@ EXAMPLES
                   Hostname:
                   Gateway:
                   Netmask: 255.255.255.0
-  
+
           eth1:
                   IP Type: Dynamic
                   IP Address: 192.168.200.51
                   Hostname: fsp01
                   Gateway:
                   Netmask: 255.255.255.0
- 
- 
+
+
 
 
 11. To change the FSP network parameters with the values in command line for eth0 on fsp01:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rspconfig fsp01 network=eth0,192.168.1.200,fsp01,,255.255.255.0
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    fsp01: Success to set IP address,hostname,netmask
- 
- 
+
+
 
 
 12. To change the FSP network parameters with the values in the xCAT database for eth0 on fsp01:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rspconfig fsp01 network=eth0,*
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    fsp01: Success to set IP address,hostname,gateway,netmask
- 
- 
+
+
 
 
 13. To configure eth0 on fsp01 to get dynamic IP address from DHCP server:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rspconfig fsp01 network=eth0,0.0.0.0
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    fsp01: Success to set IP type to dynamic.
- 
- 
+
+
 
 
 14. To get the current power redundancy mode for power domain 1 on mm01:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rspconfig mm01 pd1
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    mm01: Redundant without performance impact
- 
- 
+
+
 
 
 15. To change the current power redundancy mode for power domain 1 on mm01 to non-redundant:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rspconfig mm01 pd1=nonred
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    mm01: nonred
- 
- 
+
+
 
 
 16. To enable NTP with an NTP server address of 192.168.1.1, an update frequency of 90 minutes, and with v3 authentication enabled on mm01:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rspconfig mm01 ntp=enable,192.168.1.1,90,enable
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    mm01: NTP: disabled
    mm01: NTP Server: 192.168.1.1
    mm01: NTP: 90 (minutes)
    mm01: NTP: enabled
- 
- 
+
+
 
 
 17. To disable NTP v3 authentication only on mm01:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rspconfig mm01 ntp=,,,disable
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    mm01: NTP v3: disabled
- 
- 
+
+
 
 
 18. To disable Predictive Failure and L2 Failure deconfiguration policies on mm01:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rspconfig mm01 decfg=disable:predictive,L3
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    mm01: Success
- 
- 
+
+
 
 
 19. To deconfigure processors 4 and 5 of Processing Unit 0 on mm01:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rspconfig mm01 procedecfg=deconfigure:0:4,5
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    mm01: Success
- 
- 
+
+
 
 
 20. To check if CEC sysname set correct on mm01:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rspconfig mm01 sysname
-  
+
    mm01: mm01
-  
+
    rspconfig mm01 sysname=cec01
-  
+
    mm01: Success
-  
+
    rspconfig mm01 sysname
-  
+
    mm01: cec01
- 
- 
+
+
 
 
 21. To check and change the pending_power_on_side value of cec01's fsps:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rspconfig cec01 pending_power_on_side
-  
+
    cec01: Pending Power On Side Primary: temp
    cec01: Pending Power On Side Secondary: temp
-  
+
    rspconfig cec01 pending_power_on_side=perm
-  
+
    cec01: Success
-  
+
    rspconfig cec01 pending_power_on_side
-  
+
    cec01: Pending Power On Side Primary: perm
    cec01: Pending Power On Side Secondary: perm
- 
- 
+
+
 
 
 22. To show the BSR allocation for cec01:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rspconfig cec01 BSR
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    cec01: Barrier Synchronization Register (BSR)
    cec01: Number of BSR arrays: 256
    cec01: Bytes per BSR array : 4096
@@ -1148,23 +1148,23 @@ EXAMPLES
    cec01: lpar06        : 32
    cec01: lpar07        : 32
    cec01: lpar08        : 32
- 
- 
+
+
 
 
 23. To query the huge page information for CEC1, enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rspconfig CEC1 huge_page
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    CEC1: Huge Page Memory
    CEC1: Available huge page memory(in pages):    0
    CEC1: Configurable huge page memory(in pages): 12
@@ -1180,199 +1180,199 @@ EXAMPLES
    CEC1: lpar21        : 0
    CEC1: lpar25        : 0
    CEC1: lpar29        : 0
- 
- 
+
+
 
 
 24. To request 10 huge pages for CEC1, enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rspconfig CEC1 huge_page=10
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    CEC1: Success
- 
- 
+
+
 
 
 25. To disable service processor failover for cec01, in order to complete this command, the user should power off cec01 first:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rspconfig cec01 setup_failover
-  
+
    cec01: Failover status: Enabled
-  
+
    rpower cec01 off
-  
+
    rspconfig cec01 setup_failover=disable
-  
+
    cec01: Success
-  
+
    rspconfig cec01 setup_failover
-  
+
    cec01: Failover status: Disabled
- 
- 
+
+
 
 
 26. To force service processor failover for cec01:
- 
- 
+
+
  .. code-block:: perl
- 
+
    lshwconn cec01
-  
+
    cec01: 192.168.1.1: LINE DOWN
    cec01: 192.168.2.1: sp=primary,ipadd=192.168.2.1,alt_ipadd=unavailable,state=LINE UP
    cec01: 192.168.1.2: sp=secondary,ipadd=192.168.1.2,alt_ipadd=unavailable,state=LINE UP
    cec01: 192.168.2.2: LINE DOWN
-   
+
    rspconfig cec01 force_failover
-  
+
    cec01: Success.
-   
-   lshwconn> cec01                
-  
+
+   lshwconn> cec01
+
    cec01: 192.168.1.1: sp=secondary,ipadd=192.168.1.1,alt_ipadd=unavailable,state=LINE UP
    cec01: 192.168.2.1: LINE DOWN
    cec01: 192.168.1.2: LINE DOWN
    cec01: 192.168.2.2: sp=primary,ipadd=192.168.2.2,alt_ipadd=unavailable,state=LINE UP
- 
- 
+
+
 
 
 27.
- 
+
  To deconfigure memory bank 9 and 10 of Processing Unit 0 on mm01:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rspconfig mm01 memdecfg=deconfigure:bank:0:9,10
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    mm01: Success
- 
- 
+
+
 
 
 28.
- 
+
  To reset the network interface of the specified nodes:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rspconfig --resetnet
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    Start to reset network..
-  
+
    Reset network failed nodes:
-  
+
    Reset network succeed nodes:
    Server-8233-E8B-SN1000ECP-A,Server-9119-FHA-SN0275995-B,Server-9119-FHA-SN0275995-A,
-  
+
    Reset network finished.
- 
- 
+
+
 
 
 29. To update the existing admin password on fsp:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rspconfig fsp admin_passwd=admin,abc123
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    fsp: Success
- 
- 
+
+
 
 
 30. To set the initial password for user HMC on fsp:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rspconfig fsp HMC_passwd=,abc123
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    fsp: Success
- 
- 
+
+
 
 
 31. To list BMC dumps available for download:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rspconfig p9euh02 dump -l
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    p9euh02: [1] Generated: 09/06/2017 14:31:49, Size: 4528
    p9euh02: [2] Generated: 09/06/2017 14:31:55, Size: 4516
    p9euh02: [3] Generated: 09/06/2017 14:32:01, Size: 4236
    p9euh02: [4] Generated: 09/06/2017 14:32:07, Size: 4248
    p9euh02: [5] Generated: 09/06/2017 14:32:11, Size: 4268
- 
- 
+
+
 
 
 32. To generate and download BMC dump:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rspconfig p9euh02 dump
- 
- 
+
+
  Output is similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    Capturing BMC Diagnostic information, this will take some time...
    p9euh02: Dump requested. Target ID is 6, waiting for BMC to generate...
    p9euh02: Dump 6 generated. Downloading to /var/log/xcat/dump/20171211-0951_p9euh02_dump_6.tar.xz
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/rspreset.1.rst b/docs/source/guides/admin-guides/references/man1/rspreset.1.rst
index a73320790..6d6fe60c4 100644
--- a/docs/source/guides/admin-guides/references/man1/rspreset.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/rspreset.1.rst
@@ -15,17 +15,17 @@ Name
 
 
 ****************
-\ **Synopsis**\ 
+\ **Synopsis**\
 ****************
 
 
-\ **rspreset**\  \ *noderange*\ 
+\ **rspreset**\  \ *noderange*\
 
 \ **rspreset**\  [\ **-h | -**\ **-help | -v | -**\ **-version**\ ]
 
 
 *******************
-\ **Description**\ 
+\ **Description**\
 *******************
 
 
@@ -36,45 +36,45 @@ the blade's on board service processor will be reset.
 
 
 ***************
-\ **Options**\ 
+\ **Options**\
 ***************
 
 
 
-\ **-h | -**\ **-help**\ 
- 
+\ **-h | -**\ **-help**\
+
  Print help.
- 
 
 
-\ **-v | -**\ **-version**\ 
- 
+
+\ **-v | -**\ **-version**\
+
  Print version.
- 
+
 
 
 
 ****************
-\ **Examples**\ 
+\ **Examples**\
 ****************
 
 
 
 1.
- 
+
  Reset the service processor that controls node5:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rspreset node5
- 
- 
+
+
 
 
 
 ****************
-\ **SEE ALSO**\ 
+\ **SEE ALSO**\
 ****************
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/rvitals.1.rst b/docs/source/guides/admin-guides/references/man1/rvitals.1.rst
index 862f224ae..ee6ab3d18 100644
--- a/docs/source/guides/admin-guides/references/man1/rvitals.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/rvitals.1.rst
@@ -15,7 +15,7 @@ Name
 
 
 ****************
-\ **Synopsis**\ 
+\ **Synopsis**\
 ****************
 
 
@@ -72,7 +72,7 @@ OpenPOWER (OpenBMC) specific:
 
 
 *******************
-\ **Description**\ 
+\ **Description**\
 *******************
 
 
@@ -81,126 +81,126 @@ Processor for a single or range of nodes and groups.
 
 
 ***************
-\ **Options**\ 
+\ **Options**\
 ***************
 
 
 
-\ **cputemp**\ 
- 
+\ **cputemp**\
+
  Retrieves CPU temperatures.
- 
 
 
-\ **disktemp**\ 
- 
+
+\ **disktemp**\
+
  Retrieves HD back plane temperatures.
- 
 
 
-\ **ambtemp**\ 
- 
+
+\ **ambtemp**\
+
  Retrieves ambient temperatures.
- 
 
 
-\ **temp**\ 
- 
+
+\ **temp**\
+
  Retrieves all temperatures.
- 
 
 
-\ **voltage**\ 
- 
+
+\ **voltage**\
+
  Retrieves power supply and VRM voltage readings.
- 
 
 
-\ **fanspeed**\ 
- 
+
+\ **fanspeed**\
+
  Retrieves fan speeds.
- 
 
 
-\ **lcds**\ 
- 
+
+\ **lcds**\
+
  Retrieves LCDs status.
- 
 
 
-\ **rackenv**\ 
- 
+
+\ **rackenv**\
+
  Retrieves rack environmentals.
- 
 
 
-\ **leds**\ 
- 
+
+\ **leds**\
+
  Retrieves LEDs status.
- 
 
 
-\ **chassis**\ 
- 
+
+\ **chassis**\
+
  Retrieves chassis status.
- 
 
 
-\ **altitude**\ 
- 
+
+\ **altitude**\
+
  Retrieves altitude related attributes.
- 
 
 
-\ **power**\ 
- 
+
+\ **power**\
+
  Retrieves power status.
- 
 
 
-\ **powertime**\ 
- 
+
+\ **powertime**\
+
  Retrieves total power uptime.  This value only increases, unless
  the Service Processor flash gets updated.  This option is not valid
  for x86 architecture systems.
- 
 
 
-\ **reboot**\ 
- 
+
+\ **reboot**\
+
  Retrieves  total  number of reboots.  This value only increases,
  unless the Service Processor flash gets updated.  This option
  is not valid for x86 architecture systems.
- 
 
 
-\ **state**\ 
- 
+
+\ **state**\
+
  Retrieves the system state.
- 
 
 
-\ **all**\ 
- 
+
+\ **all**\
+
  All of the above.
- 
 
 
-\ **-h | -**\ **-help**\ 
- 
+
+\ **-h | -**\ **-help**\
+
  Print help.
- 
 
 
-\ **-v | -**\ **-version**\ 
- 
+
+\ **-v | -**\ **-version**\
+
  Print version.
- 
+
 
 
 
 ****************
-\ **Examples**\ 
+\ **Examples**\
 ****************
 
 
@@ -240,7 +240,7 @@ Output is similar to:
 
 
 ****************
-\ **SEE ALSO**\ 
+\ **SEE ALSO**\
 ****************
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/sinv.1.rst b/docs/source/guides/admin-guides/references/man1/sinv.1.rst
index 11a98a55b..a897a332f 100644
--- a/docs/source/guides/admin-guides/references/man1/sinv.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/sinv.1.rst
@@ -7,7 +7,7 @@ sinv.1
 
 
 ************
-\ **NAME**\ 
+\ **NAME**\
 ************
 
 
@@ -15,7 +15,7 @@ sinv.1
 
 
 ****************
-\ **SYNOPSIS**\ 
+\ **SYNOPSIS**\
 ****************
 
 
@@ -25,7 +25,7 @@ sinv.1
 
 
 *******************
-\ **DESCRIPTION**\ 
+\ **DESCRIPTION**\
 *******************
 
 
@@ -67,303 +67,303 @@ Command Protocol can be used. See man \ **xdsh**\  for more details.
 
 
 ***************
-\ **OPTIONS**\ 
+\ **OPTIONS**\
 ***************
 
 
 
-\ **-o | -**\ **-output**\  \ *report output file*\ 
- 
+\ **-o | -**\ **-output**\  \ *report output file*\
+
  Optional output file. This is the location of the file that will contain the report of the nodes that match, and do not match, the input templates. If the flag is not used, the output will go to stdout.
- 
 
 
-\ **-p | -**\ **-tp**\  \ *template path*\ 
- 
+
+\ **-p | -**\ **-tp**\  \ *template path*\
+
  This is the path to the template file. The template contains the output
- of \ **xdsh**\  or \ **rinv**\  command, that has been run against a "seed" node, a node 
+ of \ **xdsh**\  or \ **rinv**\  command, that has been run against a "seed" node, a node
  that contains the configuration that you would like all nodes in your noderange to match.
- 
+
  The admin can create the template by running the \ **xdsh**\  or \ **rinv**\  command on
  the seed node, pipe to \ **xdshcoll**\  (required) and store the output
  in the template path. See examples.
- 
+
  \ **Note:**\  The admin can also edit the template to remove any lines that they do not want checked.
- 
- An alternative method is to use the [\ **-s**\  \ *seed node*\ ] parameter, 
- which will automatically build the template for you from the 
+
+ An alternative method is to use the [\ **-s**\  \ *seed node*\ ] parameter,
+ which will automatically build the template for you from the
  seed node named.
- 
+
  If a a seed node is not provided, then command will automatically use the first node in the noderange as
  the seed node.
- 
 
 
-\ **-t | -**\ **-tc**\  \ *template count*\ 
- 
+
+\ **-t | -**\ **-tc**\  \ *template count*\
+
  This count is the number of templates that the command will use
  to check for nodes matches.  If the template in the template path does not
- match a node, the \ **sinv**\  will check additional templates up 
+ match a node, the \ **sinv**\  will check additional templates up
  to the template count.
- 
- For each node, it will compare the node against each template to see if 
- there is a match.  
+
+ For each node, it will compare the node against each template to see if
+ there is a match.
  If there is no match, and we are not over the template count,
- then a new template will be created from the node output. 
+ then a new template will be created from the node output.
  This will result in having all nodes that match a given template reported in
- their group at the end of the run in the output file. 
+ their group at the end of the run in the output file.
  If no template count is specified, 0 is the default, and all nodes will
  be compared against the first template.
- 
 
 
-\ **-s | -**\ **-seed**\  \ *seed node*\ 
- 
+
+\ **-s | -**\ **-seed**\  \ *seed node*\
+
  This is the node that will be used to build the first template
  that is stored in template path.  You can use this parameter instead of running
  the command yourself to build the template.
- 
+
  \ **Note:**\  If no seed node is supplied, the first node in the noderange is automatically
  selected as a seed node.
- 
 
 
-\ **-i | -**\ **-ignorefirst**\ 
- 
+
+\ **-i | -**\ **-ignorefirst**\
+
  This flag suppresses the reporting of the nodes matching the first
  template. In very large systems, you may not want to show the nodes that
  have the correct configuration, since the list could contain thousands of nodes.
- This allows you to only report the nodes that do not match the required 
+ This allows you to only report the nodes that do not match the required
  configuration.
- 
 
 
-\ **-e | -**\ **-exactmatch**\ 
- 
+
+\ **-e | -**\ **-exactmatch**\
+
  This requires the check of node output against template to be an exact match.
- If this flag is not set, \ **sinv**\  checks to see if the return from the 
- \ **xdsh**\  or \ **rinv**\  command to the nodes contain a match for each line in the input 
+ If this flag is not set, \ **sinv**\  checks to see if the return from the
+ \ **xdsh**\  or \ **rinv**\  command to the nodes contain a match for each line in the input
  template (except for xdshcoll header and comments). If not in exactmatch mode,
  there can be more lines in the \ **xdsh**\  or \ **rinv**\  return from the nodes.
- 
- For example, if running a "rpm -qa | grep xCAT" command, without exactmatch 
+
+ For example, if running a "rpm -qa | grep xCAT" command, without exactmatch
  set, if the node contains more xCAT rpms that listed in the template,
  it would be considered a match, as long as all rpms listed in the template
- were on the node. With exactmatch set, the output must be identical 
+ were on the node. With exactmatch set, the output must be identical
  to the template.
- 
 
 
-\ **-**\ **-devicetype**\  \ *type_of_device*\ 
- 
+
+\ **-**\ **-devicetype**\  \ *type_of_device*\
+
  Specify a user-defined device type that references the location
  of relevant device configuration file. The devicetype value must
  correspond to a valid device configuration file.
  xCAT ships some default configuration files
  for Ethernet switches and IB switches under
  \ */opt/xcat/share/xcat/devicetype*\  directory. If you want to overwrite
- any of the configuration files, copy them to \ */var/opt/xcat/*\ 
+ any of the configuration files, copy them to \ */var/opt/xcat/*\
  directory and cutomize.
  For example, \ *base/IBSwitch/Qlogic/config*\  is the configuration
  file location if devicetype is specified as IBSwitch::Qlogic.
  xCAT will first search config file using \ */var/opt/xcat/*\  as the base.
  If not found, it will search for it using
  \ */opt/xcat/share/xcat/devicetype/*\  as the base.
- 
 
 
-\ **-l | -**\ **-user**\  \ *user_ID*\ 
- 
+
+\ **-l | -**\ **-user**\  \ *user_ID*\
+
  Specifies a remote user name to use for remote command execution.
- 
 
 
-\ **-c | -**\ **-command**\ 
- 
- The \ **xdsh**\  or \ **rinv**\  command that will be run. The command should be enclosed in 
+
+\ **-c | -**\ **-command**\
+
+ The \ **xdsh**\  or \ **rinv**\  command that will be run. The command should be enclosed in
  double quotes to insure correct shell interpretation. This parameter must only contain, the node range or the image path (Linux) or spot name for AIX. It cannot be used to set additional input flags to \ **xdsh**\  or \ **rinv**\  (for example \ **-s**\ ,\ **-T**\ ,\ **-e**\ ).  See examples below.
- 
+
  \ **Note:**\  do not add the \ **| xdshcoll**\  to the command,
  it is automatically added by \ **sinv**\ .  \ **sinv**\  also automatically sets the \ **-v**\  flag for \ **xdsh**\ .
- 
 
 
-\ **-f | -**\ **-file**\ 
- 
- The file containing the \ **xdsh**\  or \ **rinv**\  command that will be run. 
+
+\ **-f | -**\ **-file**\
+
+ The file containing the \ **xdsh**\  or \ **rinv**\  command that will be run.
  This should be the fully qualified name of the file.
- 
+
  \ **Note:**\  do not add the \ **| xdshcoll**\  to the command in the file,
  it is automatically added by \ **sinv**\ .
- 
 
 
-\ **-r | -**\ **-remove**\ 
- 
+
+\ **-r | -**\ **-remove**\
+
  This flag indicates that generated templates should be removed at the
  at the end of the \ **sinv**\  command execution.
- 
- If the flag is specified, then all templates that are generated by the \ **sinv**\ 
+
+ If the flag is specified, then all templates that are generated by the \ **sinv**\
  command, will be removed. If the first template is created by the admin,
  it will not be removed.
- 
+
  If the flag is not specified, no
  templates will be removed. It is up to the admin to cleanup templates.
- 
 
 
-\ **-h | -**\ **-help**\ 
- 
+
+\ **-h | -**\ **-help**\
+
  Displays usage information.
- 
 
 
-\ **-v | -**\ **-version**\ 
- 
+
+\ **-v | -**\ **-version**\
+
  Displays xCAT release version.
- 
 
 
-\ **-V | -**\ **-Verbose**\ 
- 
+
+\ **-V | -**\ **-Verbose**\
+
  Verbose mode.
- 
+
 
 
 
 ****************
-\ **Examples**\ 
+\ **Examples**\
 ****************
 
 
 
 1. To setup sinv.template (name optional) for input to the \ **sinv**\  command, enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    xdsh node1,node2 "rpm -qa | grep ssh " | xdshcoll  > /tmp/sinv.template
- 
- 
+
+
  Note: when setting up the template the output of \ **xdsh**\  must be piped to \ **xdshcoll**\ , \ **sinv**\  processing depends on it.
- 
+
 
 
 2. To setup rinv.template for input to the \ **sinv**\  command , enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rinv node1-node2 serial | xdshcoll  > /tmp/rinv.template
- 
- 
+
+
  Note: when setting up the template the output of \ **rinv**\  must be piped to \ **xdshcoll**\ , \ **sinv**\  processing depends on it.
- 
+
 
 
 3. To execute \ **sinv**\  using the sinv.template generated above
 on the nodegroup, \ *testnodes*\  ,possibly generating up to two
 new templates, and removing all generated templates in the end, and writing
 output report to /tmp/sinv.output, enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    sinv -c "xdsh testnodes rpm -qa | grep ssh" -p /tmp/sinv.template -t 2 -r -o /tmp/sinv.output
- 
- 
+
+
  Note: do not add the pipe to \ **xdshcoll**\  on the \ **-c**\  flag, it is automatically added by the \ **sinv**\ .
- 
+
 
 
 4. To execute \ **sinv**\  on noderange, \ *node1-node4*\ , using the seed node, \ *node8*\ ,
 to generate the first template, using the \ **xdsh**\  command (\ **-c**\ ),
 possibly generating up to two additional
 templates and not removing any templates at the end, enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    sinv -c "xdsh node1-node4 lslpp -l | grep bos.adt" -s node8 -p /tmp/sinv.template -t 2 -o /tmp/sinv.output
- 
- 
+
+
 
 
 5. To execute \ **sinv**\  on noderange, \ *node1-node4*\ , using the seed node, \ *node8*\ ,
 to generate the first template, using the \ **rinv**\  command (\ **-c**\ ),
 possibly generating up to two additional
 templates and removing any generated templates at the end, enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    sinv -c "rinv node1-node4 serial" -s node8 -p /tmp/sinv.template -t 2 -r -o /tmp/rinv.output
- 
- 
+
+
 
 
 6. To execute \ **sinv**\  on noderange, \ *node1-node4*\ , using \ *node1*\  as
 the seed node, to generate the sinv.template from the \ **xdsh**\  command (\ **-c**\ ),
 using the exact match option, generating no additional templates, enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    sinv -c "xdsh node1-node4 lslpp -l | grep bos.adt" -s node1 -e -p /tmp/sinv.template  -o /tmp/sinv.output
- 
- 
+
+
  Note: the /tmp/sinv.template file must be empty, otherwise it will be used
  as an admin generated template.
- 
+
 
 
 7. To execute \ **sinv**\  on the Linux osimage defined for cn1.  First build a template from the /etc/hosts on the node. Then run \ **sinv**\  to compare.
- 
- 
+
+
  .. code-block:: perl
- 
+
    xdsh cn1 "cat /etc/hosts" | xdshcoll > /tmp/sinv2/template"
-  
+
    sinv -c "xdsh -i /install/netboot/rhels6/ppc64/test_ramdisk_statelite/rootimg cat /etc/hosts" -e -t 1 -p /tmp/sinv.template -o /tmp/sinv.output
- 
- 
+
+
 
 
 8.
- 
+
  To execute \ **sinv**\  on the AIX NIM 611dskls spot and compare /etc/hosts to compute1 node, run the following:
- 
- 
+
+
  .. code-block:: perl
- 
+
    xdsh compute1 "cat /etc/hosts" | xdshcoll > /tmp/sinv2/template"
-  
+
    sinv -c "xdsh -i 611dskls cat /etc/hosts" -e -t1 -p /tmp/sinv.template -o /tmp/sinv.output
- 
- 
+
+
 
 
 9.
- 
+
  To execute \ **sinv**\  on the device mswitch2 and compare to mswitch1
- 
- 
+
+
  .. code-block:: perl
- 
+
    sinv -c "xdsh mswitch  enable;show version" -s mswitch1 -p /tmp/sinv/template --devicetype IBSwitch::Mellanox -l admin -t 2
- 
- 
 
 
-\ **Files**\ 
 
-\ **/opt/xcat/bin/sinv/**\ 
+
+\ **Files**\
+
+\ **/opt/xcat/bin/sinv/**\
 
 Location of the sinv command.
 
 
 ****************
-\ **SEE ALSO**\ 
+\ **SEE ALSO**\
 ****************
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/snmove.1.rst b/docs/source/guides/admin-guides/references/man1/snmove.1.rst
index 453e64c94..53abb0129 100644
--- a/docs/source/guides/admin-guides/references/man1/snmove.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/snmove.1.rst
@@ -62,7 +62,7 @@ When the \ **snmove**\  command is run it modifies the xCAT database to
 switch the primary server to the backup server.
 
 It will also check the other services that are being used for the
-node (tftpserver, monserver, nfsserver, conserver), and if they were set 
+node (tftpserver, monserver, nfsserver, conserver), and if they were set
 to the original service node they will be changed to point to the backup
 service node.
 
@@ -88,65 +88,65 @@ OPTIONS
 
 
 
-\ **-d|-**\ **-dest**\ 
- 
+\ **-d|-**\ **-dest**\
+
  Specifies the hostname of the new destination service node as known by (facing) the management node.
- 
 
 
-\ **-D|-**\ **-destn**\ 
- 
+
+\ **-D|-**\ **-destn**\
+
  Specifies the hostname of the destination service node as known by (facing) the nodes.
- 
 
 
-\ **-h|-**\ **-help**\ 
- 
+
+\ **-h|-**\ **-help**\
+
  Display usage message.
- 
 
 
-\ **-i|-**\ **-ignorenodes**\ 
- 
+
+\ **-i|-**\ **-ignorenodes**\
+
  No modifications will be made on the nodes. If not specified, several xCAT postscripts will be run on the nodes to complete the switch to the new service node.
- 
 
 
-\ **-l|-**\ **-liteonly**\ 
- 
+
+\ **-l|-**\ **-liteonly**\
+
  Use this option to ONLY synchronize any AIX statelite files from the primary server to the backup server for the nodes. It will not do the actual moving of the nodes to the backup servers.
- 
 
 
-\ **-P|-**\ **-postscripts**\ 
- 
+
+\ **-P|-**\ **-postscripts**\
+
  Specifies a list of extra postscripts to be run on the nodes after the nodes are moved over to the new service node. If \ **all**\  is specified, all the postscripts defined in the postscripts table will be run for the nodes. The specified postscripts must be stored under /install/postscripts directory.
- 
 
 
-\ **-s|-**\ **-source**\ 
- 
+
+\ **-s|-**\ **-source**\
+
  Specifies the hostname of the current (source) service node sa known by (facing) the management node.
- 
 
 
-\ **-S|-**\ **-sourcen**\ 
- 
+
+\ **-S|-**\ **-sourcen**\
+
  Specifies the hostname of the current service node adapter as known by (facing)
  the nodes.
- 
 
 
-\ **-V|-**\ **-verbose**\ 
- 
+
+\ **-V|-**\ **-verbose**\
+
  Verbose mode.
- 
 
 
-\ **-v|-**\ **-version**\ 
- 
+
+\ **-v|-**\ **-version**\
+
  Command Version.
- 
+
 
 
 
@@ -157,99 +157,99 @@ EXAMPLES
 
 
 1.
- 
+
  Move the nodes contained in group "group1" to the service node named "xcatsn02".
- 
- 
+
+
  .. code-block:: perl
- 
+
    snmove group1 -d xcatsn02 -D xcatsn02-eth1
- 
- 
+
+
 
 
 2.
- 
+
  Move all the nodes that use service node xcatsn01 to service node xcatsn02.
- 
- 
+
+
  .. code-block:: perl
- 
+
    snmove -s xcatsn01 -S xcatsn01-eth1 -d xcatsn02 -D xcatsn02-eth1
- 
- 
+
+
 
 
 3.
- 
+
  Move any nodes that have sn1 as their primary server to the backup service node set in the xCAT node definition.
- 
- 
+
+
  .. code-block:: perl
- 
+
    snmove -s sn1
- 
- 
+
+
 
 
 4.
- 
+
  Move all the nodes in the xCAT group named "nodegroup1" to their backup SNs.
- 
- 
+
+
  .. code-block:: perl
- 
+
    snmove nodegroup1
- 
- 
+
+
 
 
 5.
- 
+
  Move all the nodes in xCAT group "sngroup1" to the service node named "xcatsn2".
- 
- 
+
+
  .. code-block:: perl
- 
+
    snmove sngroup1 -d xcatsn2
- 
- 
+
+
 
 
 6.
- 
+
  Move all the nodes in xCAT group "sngroup1" to the SN named "xcatsn2" and run extra postscripts.
- 
- 
+
+
  .. code-block:: perl
- 
+
    snmove sngroup1 -d xcatsn2 -P test1
- 
- 
+
+
 
 
 7.
- 
+
  Move all the nodes in xCAT group "sngroup1" to the SN named "xcatsn2" and do not run anything on the nodes.
- 
- 
+
+
  .. code-block:: perl
- 
+
    snmove sngroup1 -d xcatsn2 -i
- 
- 
+
+
 
 
 8.
- 
+
  Synchronize any AIX statelite files from the primary server for compute03 to the backup server.  This will not actually move the node to it's backup service node.
- 
- 
+
+
  .. code-block:: perl
- 
+
    snmove compute03 -l -V
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/swapnodes.1.rst b/docs/source/guides/admin-guides/references/man1/swapnodes.1.rst
index 158c5f4cf..62e76a07b 100644
--- a/docs/source/guides/admin-guides/references/man1/swapnodes.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/swapnodes.1.rst
@@ -53,28 +53,28 @@ OPTIONS
 
 
 
-\ **-h|-**\ **-help**\ 
- 
+\ **-h|-**\ **-help**\
+
  Display usage message.
- 
 
 
-\ **-c**\ 
- 
+
+\ **-c**\
+
  \ *current_node*\  -- the defective non-compute node.
- 
 
 
-\ **-f**\ 
- 
+
+\ **-f**\
+
  \ *fip_node*\  -- a compute node which will be swapped as the non-compute node.
- 
 
 
-\ **-o**\ 
- 
+
+\ **-o**\
+
  one way. Only move the \ *current_node*\  definition to the \ *fip_node*\ 's hardware resource, and not move the fip_node definition to the \ *current_node*\ . And then the \ *current_node*\  will use the \ *fip_node*\ 's hardware resource, and the \ *fip_node*\  definition is not changed. if the two nodes are in the same CEC, the I/O adapter from the original \ *current_node*\  will be assigned to the \ *fip_node*\ .
- 
+
 
 
 
@@ -95,33 +95,33 @@ EXAMPLES
 
 
 1. To swap the service node attributes and IO assignments between sn1 and compute2 which are in the same cec, all the attributes in the ppc table and nodepos table of the two node will be swapped, and the I/O adapters from the defective node (the original sn1) will be assigned to the available node (the original compute2). After the swapping, the sn1 will use the compute2's hardware resource and the I/O adapters from the original sn1.
- 
- 
+
+
  .. code-block:: perl
- 
+
    swapnodes -c sn1 -f compute2
- 
- 
+
+
 
 
 2. To swap the service node attributes and IO assignments between sn1 and compute2 which are NOT in the same cec, all the attributes in the ppc table and nodepos table of the two node will be swapped. After the swapping, the sn1 will use the compute2's hardware resource.
- 
- 
+
+
  .. code-block:: perl
- 
+
    swapnodes -c sn1 -f compute2
- 
- 
+
+
 
 
 3. Only to move the service node (sn1) definition to the compute node (compute2)'s hardware resource, and not move the compute2 definition to the sn1. After the swapping, the sn1 will use the compute2's hardware resource, and the compute2 definition is not changed.
- 
- 
+
+
  .. code-block:: perl
- 
+
    swapnodes -c sn1 -f compute2 -o
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/switchblade.1.rst b/docs/source/guides/admin-guides/references/man1/switchblade.1.rst
index 3d9ebad71..6421009aa 100644
--- a/docs/source/guides/admin-guides/references/man1/switchblade.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/switchblade.1.rst
@@ -35,35 +35,35 @@ OPTIONS
 
 
 
-\ **list | stat**\ 
- 
+\ **list | stat**\
+
  Display which blade the media tray and KVM are currently assigned to.
- 
 
 
-\ **media | mt**\ 
- 
+
+\ **media | mt**\
+
  Assign the media tray to the specified blade.
- 
 
 
-\ **kvm | video**\ 
- 
+
+\ **kvm | video**\
+
  Assign the KVM (video display) to the specified blade.
- 
 
 
-\ **both**\ 
- 
+
+\ **both**\
+
  Assign both the media tray and the KVM to the specified blade.
- 
 
 
-\ *slot_num*\ 
- 
+
+\ *slot_num*\
+
  The slot # of the blade that the resources should be assigned to.  If not specified, it will use the slot
  # of the node specified.
- 
+
 
 
 
@@ -74,23 +74,23 @@ EXAMPLES
 
 
 1.
- 
+
  Switch the media tray to be assigned to the blade in slot 4 (assume it is node4):
- 
- 
+
+
  .. code-block:: perl
- 
+
    switchblade node4 media
- 
- 
+
+
  Output will be like:
- 
- 
+
+
  .. code-block:: perl
- 
+
    Media Tray slot: 4
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/switchdiscover.1.rst b/docs/source/guides/admin-guides/references/man1/switchdiscover.1.rst
index e219a5ea8..2d67ecfae 100644
--- a/docs/source/guides/admin-guides/references/man1/switchdiscover.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/switchdiscover.1.rst
@@ -11,9 +11,9 @@ SYNOPSIS
 ********
 
 
-\ **switchdiscover [-h| -**\ **-help]**\ 
+\ **switchdiscover [-h| -**\ **-help]**\
 
-\ **switchdiscover [-v| -**\ **-version]**\ 
+\ **switchdiscover [-v| -**\ **-version]**\
 
 \ **switchdiscover**\  [\ *noderange*\  | \ **-**\ **-range**\  \ *ip_ranges*\ ] \ **[-V] [-w][-r|-x|-z][-s**\  \ *scan_methods*\ ] [\ **-**\ **-setup**\ ] [\ **-c**\  \ *community*\ ]
 
@@ -40,88 +40,88 @@ OPTIONS
 
 
 
-\ *noderange*\ 
- 
+\ *noderange*\
+
  The switches which the user want to discover.
  If the user specify the noderange, switchdiscover will just
- return the switches in the node range. Which means it will 
+ return the switches in the node range. Which means it will
  help to add the new switches to the xCAT database without
- modifying the existed definitions. But the switches' name 
- specified in noderange should be defined in database in advance. 
- The ips of the switches will be defined in /etc/hosts file. 
+ modifying the existed definitions. But the switches' name
+ specified in noderange should be defined in database in advance.
+ The ips of the switches will be defined in /etc/hosts file.
  This command will fill the switch attributes for the switches defined.
- 
 
 
-\ **-h|-**\ **-help**\ 
- 
+
+\ **-h|-**\ **-help**\
+
  Display usage message.
- 
 
 
-\ **-**\ **-range**\ 
- 
+
+\ **-**\ **-range**\
+
  Specify one or more IP ranges. Each can be an ip address (10.1.2.3) or an ip range (10.1.2.0/24). If the range is huge, for example, 192.168.1.1/8, the switch discover may take a very long time to scan. So the range should be exactly specified.
- 
+
  For nmap and snmp scan method, it accepts multiple formats. For example: 192.168.1.1/24, 40-41.1-2.3-4.1-100.
- 
+
  If the range is not specified, the command scans all the subnets that the active network interfaces (eth0, eth1) are on where this command is issued.
- 
 
 
-\ **-r**\ 
- 
+
+\ **-r**\
+
  Display Raw responses.
- 
 
 
-\ **-s**\ 
- 
- It is a comma separated list of methods for switch discovery. 
+
+\ **-s**\
+
+ It is a comma separated list of methods for switch discovery.
  The possible switch scan methods are: lldp, nmap or snmp. The default is nmap.
- 
 
 
-\ **-v|-**\ **-version**\ 
- 
+
+\ **-v|-**\ **-version**\
+
  Command Version.
- 
 
 
-\ **-V**\ 
- 
+
+\ **-V**\
+
  Verbose output.
- 
 
 
-\ **-w**\ 
- 
+
+\ **-w**\
+
  Writes output to xCAT database.
- 
 
 
-\ **-x**\ 
- 
+
+\ **-x**\
+
  XML formatted output.
- 
 
 
-\ **-z**\ 
- 
+
+\ **-z**\
+
  Stanza formatted output.
- 
 
 
-\ **-**\ **-setup**\ 
- 
+
+\ **-**\ **-setup**\
+
  Process switch-based switch discovery. Update discovered switch's ip address, hostname and enable snmpv3 configuration based on the predefined switch.
- 
 
 
-\ **-c**\ 
- 
+
+\ **-c**\
+
  User defined community string for snmp scan.
- 
+
 
 
 
@@ -142,45 +142,45 @@ EXAMPLES
 
 
 1. To discover the switches on some subnets:
- 
- 
+
+
  .. code-block:: perl
- 
+
    switchdiscover --range 10.2.3.0/24,192.168.3.0/24,11.5.6.7
- 
- 
+
+
 
 
 2. To do the switch discovery and save them to the xCAT database:
- 
- 
+
+
  .. code-block:: perl
- 
+
    switchdiscover --range 10.2.3.4/24 -w
- 
- 
+
+
  It is recommended to run \ **makehosts**\  after the switches are saved in the DB.
- 
+
 
 
 3. To use lldp method to discover the switches:
- 
- 
+
+
  .. code-block:: perl
- 
+
    switchdiscover -s lldp
- 
- 
+
+
 
 
 4. To process switch-based switch discovery, the core switch has to be configured and top-of-rack (edge) switch has to be predefine into xCAT databse with attribute \ **switch**\  and \ **switchport**\  to core switch:
- 
- 
+
+
  .. code-block:: perl
- 
+
    switchdiscover --range 192.168.5.150-170 -s snmp --setup
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/tabgrep.1.rst b/docs/source/guides/admin-guides/references/man1/tabgrep.1.rst
index 7670799be..7b4b1b427 100644
--- a/docs/source/guides/admin-guides/references/man1/tabgrep.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/tabgrep.1.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **tabgrep**\  \ *nodename*\ 
+\ **tabgrep**\  \ *nodename*\
 
 \ **tabgrep**\  [\ **-?**\  | \ **-h**\  | \ **-**\ **-help**\ ]
 
@@ -40,10 +40,10 @@ OPTIONS
 
 
 
-\ **-?|-h|-**\ **-help**\ 
- 
+\ **-?|-h|-**\ **-help**\
+
  Display usage message.
- 
+
 
 
 
@@ -69,20 +69,20 @@ EXAMPLES
 
 
 1.
- 
+
  To display the tables that contain blade1:
- 
- 
+
+
  .. code-block:: perl
- 
+
    tabgrep blade1
- 
- 
+
+
  The output would be similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
        nodelist
        nodehm
        mp
@@ -91,8 +91,8 @@ EXAMPLES
        mac
        noderes
        nodetype
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/unregnotif.1.rst b/docs/source/guides/admin-guides/references/man1/unregnotif.1.rst
index a61c02d17..52e735e61 100644
--- a/docs/source/guides/admin-guides/references/man1/unregnotif.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/unregnotif.1.rst
@@ -19,11 +19,11 @@ SYNOPSIS
 ********
 
 
-\ **unregnotif [-h| -**\ **-help]**\ 
+\ **unregnotif [-h| -**\ **-help]**\
 
-\ **unregnotif [-v| -**\ **-version]**\ 
+\ **unregnotif [-v| -**\ **-version]**\
 
-\ **unregnotif**\  \ *filename*\ 
+\ **unregnotif**\  \ *filename*\
 
 
 ***********
diff --git a/docs/source/guides/admin-guides/references/man1/updateSNimage.1.rst b/docs/source/guides/admin-guides/references/man1/updateSNimage.1.rst
index cb3d0e024..560c0b973 100644
--- a/docs/source/guides/admin-guides/references/man1/updateSNimage.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/updateSNimage.1.rst
@@ -19,9 +19,9 @@ SYNOPSIS
 ********
 
 
-\ **updateSNimage [-h | -**\ **-help ]**\ 
+\ **updateSNimage [-h | -**\ **-help ]**\
 
-\ **updateSNimage [-v | -**\ **-version]**\ 
+\ **updateSNimage [-v | -**\ **-version]**\
 
 \ **updateSNimage**\  [\ **-n**\  \ *node*\ ] [\ **-p**\  \ *path*\ ]
 
diff --git a/docs/source/guides/admin-guides/references/man1/updatenode.1.rst b/docs/source/guides/admin-guides/references/man1/updatenode.1.rst
index 20de04dd5..cffcf7c41 100644
--- a/docs/source/guides/admin-guides/references/man1/updatenode.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/updatenode.1.rst
@@ -58,24 +58,24 @@ Update the ca and credentials for the service nodes.
 
 
 
-The default behavior when no options are input to updatenode will be to run  
+The default behavior when no options are input to updatenode will be to run
 the following options \ **-S**\ , \ **-P**\  and \ **-F**\  options in this order.
-If you wish to limit updatenode to specific 
+If you wish to limit updatenode to specific
 actions you can use combinations of the \ **-S**\ , \ **-P**\ , and \ **-F**\  flags.
 
 For example, If you just want to synchronize configuration file you could
-specify the \ **-F**\  flag.   If you want to synchronize files and update 
-software you would specify the \ **-F**\  and \ **-S**\  flags. See the descriptions 
+specify the \ **-F**\  flag.   If you want to synchronize files and update
+software you would specify the \ **-F**\  and \ **-S**\  flags. See the descriptions
 of these flags and examples below.
 
 The flag \ **-k**\  (\ **-**\ **-security**\ ) can NOT be used together with \ **-S**\ , \ **-P**\ , and \ **-F**\  flags.
 
 The flag \ **-f**\  (\ **-**\ **-snsync**\ ) can NOT be used together with \ **-S**\ , \ **-P**\ , and \ **-F**\  flags.
 
-Note: In a large cluster environment the updating of nodes in an ad hoc 
-manner can quickly get out of hand, leaving the system administrator with 
-a very confusing environment to deal with. The updatenode command is 
-designed to encourage users to handle cluster updates in a manner that 
+Note: In a large cluster environment the updating of nodes in an ad hoc
+manner can quickly get out of hand, leaving the system administrator with
+a very confusing environment to deal with. The updatenode command is
+designed to encourage users to handle cluster updates in a manner that
 is recorded and easily repeatable.
 
 To distribute and synchronize files
@@ -97,7 +97,7 @@ The basic process for distributing and synchronizing nodes is:
 
 
 
-Files may be distributed and synchronized for both diskless and 
+Files may be distributed and synchronized for both diskless and
 diskful nodes.  Syncing files to NFS-based statelite nodes is not supported.
 
 More information on using the  synchronization file function is in the following doc: Using_Updatenode.
@@ -106,9 +106,9 @@ Create the synclist file
 ------------------------
 
 
-The synclist file contains the configuration entries that specify 
-where the files should be synced to. In the synclist file, each 
-line is an entry which describes the location of the source files 
+The synclist file contains the configuration entries that specify
+where the files should be synced to. In the synclist file, each
+line is an entry which describes the location of the source files
 and the destination location for the files on the target node.
 
 For more information on creating your synclist files and where to put them, read:
@@ -143,9 +143,9 @@ To install/update the packages, run:
    updatenode <noderange> -S
 
 
-\ **For Linux systems:**\ 
+\ **For Linux systems:**\
 
-It this is equivalent to running the 
+It this is equivalent to running the
 following command:
 
 
@@ -154,9 +154,9 @@ following command:
   updatenode noderange -P ospkgs,otherpkgs
 
 
-It will update all the rpms specified in the .pkglist file and .otherpkgs.pkglist 
-file. ospkgs postscript will normally remove all the existing rpm 
-repositories before adding server:/install/<os>/<arch/ as the new repository. 
+It will update all the rpms specified in the .pkglist file and .otherpkgs.pkglist
+file. ospkgs postscript will normally remove all the existing rpm
+repositories before adding server:/install/<os>/<arch/ as the new repository.
 To preserve the existing repositories, you can run the following command instead:
 
 
@@ -165,7 +165,7 @@ To preserve the existing repositories, you can run the following command instead
    updatenode noderange -P "ospkgs --keeprepo,otherpkgs"
 
 
-\ **For AIX systems:**\ 
+\ **For AIX systems:**\
 
 Note: The updatenode command is used to update AIX diskful nodes only. For updating diskless AIX nodes refer to the xCAT for AIX update documentation and use the xCAT mknimimage command.
 For information on updating software on AIX cluster:
@@ -187,24 +187,24 @@ To run postscripts
 ==================
 
 
-The scripts must be copied to the /install/postscripts 
-directory on the xCAT management node. (Make sure they are 
+The scripts must be copied to the /install/postscripts
+directory on the xCAT management node. (Make sure they are
 executable and world readable.)
 
-To run scripts on a node you must either specify them on the 
-command line or you must add them to the "postscripts" attribute 
+To run scripts on a node you must either specify them on the
+command line or you must add them to the "postscripts" attribute
 for the node.
 
-To set the postscripts attribute of the node (or group) 
-definition you can use the xCAT chdef command. Set the value to 
-be a comma separated list of the scripts that you want to be 
-executed on the nodes. The order of the scripts in the list 
-determines the order in which they will be run.  You can use the 
+To set the postscripts attribute of the node (or group)
+definition you can use the xCAT chdef command. Set the value to
+be a comma separated list of the scripts that you want to be
+executed on the nodes. The order of the scripts in the list
+determines the order in which they will be run.  You can use the
 lsdef command to check the postscript order.
 
 Scripts can  be run on both diskless and diskful nodes.
 
-To run all the customization scripts that have been designated 
+To run all the customization scripts that have been designated
 for the nodes, (in the "postscripts and postbootscripts" attributes), type:
 
 
@@ -234,9 +234,9 @@ where p1 p2 are the parameters for script1.
 The flag '-P' can be omitted when only scripts names  are
 specified.
 
-Note: script1,script2 may or may not be designated as scripts to 
-automatically run on the node. However, if you want script1 and 
-script2 to get invoked next time the nodes are deployed then make sure 
+Note: script1,script2 may or may not be designated as scripts to
+automatically run on the node. However, if you want script1 and
+script2 to get invoked next time the nodes are deployed then make sure
 to add them to the "postscripts/postbootscripts" attribute in the database for the nodes.
 
 
@@ -266,7 +266,7 @@ xcatd's of management node and service node.
 
 
 
-\ *Set up the SSH keys*\ 
+\ *Set up the SSH keys*\
 
 A password for the user who is running this command is needed to setup
 the ssh keys. This user must have the same uid and gid as
@@ -280,7 +280,7 @@ The non-root users public ssh keys and root's public ssh keys will be put in
 the authorized_keys\* files under the non-root users .ssh directory on the node(s
 ).
 
-\ *Handle the hierarchical scenario*\ 
+\ *Handle the hierarchical scenario*\
 
 When update security files for the node which is served by a service node,
 the service node will be updated automatically first, and then the target
@@ -291,7 +291,7 @@ the ssl connections between the xCAT client and xcatd on the service node,
 and the xcatd's between service node and management node. The files in the
 directories /etc/xcat/cert/ and ~/.xcat/ will be updated.
 
-Since the certificates have the validity time, the ntp service is recommended 
+Since the certificates have the validity time, the ntp service is recommended
 to be set up between management node and service node.
 
 Simply running following command to update the security keys:
@@ -310,40 +310,40 @@ PARAMETERS
 
 
 
-\ *noderange*\ 
- 
+\ *noderange*\
+
  A set of comma delimited xCAT node names
  and/or group names. See the xCAT "noderange"
- man page for details on additional supported 
+ man page for details on additional supported
  formats.
- 
 
 
-\ *script1,script2...*\ 
- 
- A comma-separated list of script names. 
- The scripts must be executable and copied 
+
+\ *script1,script2...*\
+
+ A comma-separated list of script names.
+ The scripts must be executable and copied
  to the /install/postscripts directory.
  Each script can take zero or more parameters.
- If parameters are specified, the whole list needs to be quoted by double quotes. 
+ If parameters are specified, the whole list needs to be quoted by double quotes.
  For example:
- 
- 
+
+
  .. code-block:: perl
- 
+
    "script1 p1 p2,script2"
- 
- 
+
+
 
 
 [\ *attr=val*\  [\ *attr=val...*\ ]]
- 
+
  Specifies one or more "attribute equals value" pairs, separated by spaces.
  Attr=val pairs must be specified last on the command line.  The currently
- supported attributes are: "installp_bundle", "otherpkgs", "installp_flags", 
+ supported attributes are: "installp_bundle", "otherpkgs", "installp_flags",
  "emgr_flags" and "rpm_flags".  These attributes are only valid for AIX software
  maintenance support.
- 
+
 
 
 
@@ -353,46 +353,46 @@ OPTIONS
 
 
 
-\ **-**\ **-fanout**\ =\ *fanout_value*\ 
- 
+\ **-**\ **-fanout**\ =\ *fanout_value*\
+
  Specifies a fanout value for the maximum number of concurrently executing remote shell processes. Serial execution can be specified by indicating a fanout value of \ **1**\ . If \ **-**\ **-fanout**\  is not specified, a default fanout value of \ **64**\  is used.
- 
 
 
-\ **-A|-**\ **-updateallsw**\ 
- 
+
+\ **-A|-**\ **-updateallsw**\
+
  Install or update all software contained in the source directory. (AIX only)
- 
 
 
-\ **-c|cmdlineonly**\ 
- 
+
+\ **-c|cmdlineonly**\
+
  Specifies that the updatenode command should only use software maintenance
  information provided on the command line.  This flag is only valid when
  using AIX software maintenance support.
- 
 
 
-\ **-d**\  \ *alt_source_dir*\ 
- 
+
+\ **-d**\  \ *alt_source_dir*\
+
  Used to specify a source directory other than the standard lpp_source directory specified in the xCAT osimage definition.  (AIX only)
- 
 
 
-\ **-F|-**\ **-sync**\ 
- 
+
+\ **-F|-**\ **-sync**\
+
  Specifies that file synchronization should be
  performed on the nodes.  rsync/scp and ssh must
- be installed and configured on the nodes. 
+ be installed and configured on the nodes.
  The function is not supported for NFS-based statelite installations.
  For NFS-based statelite installations to sync files, you should use the
  read-only option for files/directories listed in
  litefile table with source location specified in the litetree table.
- 
 
 
-\ **-f|-**\ **-snsync**\ 
- 
+
+\ **-f|-**\ **-snsync**\
+
  Specifies that file synchronization should be
  performed to the service nodes that service the
  nodes in the noderange. This updates the service
@@ -409,98 +409,98 @@ OPTIONS
  For statelite installations to sync files, you should use the
  read-only option for files/directories listed in
  litefile table with source location specified in the litetree table.
- 
+
 
 
 [\ **-r | -**\ **-node-rcp**\  [\ *full_path_to_remote_copy_command*\ ]]
- 
+
  Specifies  the  full  path of the remote copy command used for syncing files to node targets, such as "/usr/bin/rsync" or "/usr/bin/scp". If not specified, rsync will be used by default.
- 
+
  Notice: The synclist for "-r /usr/bin/scp" has some differences with "-r /usr/bin/rsync":
- 
+
  1) the ``EXECUTE`` clause is not supported in "-r /usr/bin/scp"
- 
+
  2) if the destination directory specified in synclist is an existing file on target node, "updatenode -r /usr/bin/scp" will fail with ``scp: <destination directory>: Not a directory``
- 
+
  3) if the destination file specified in synclist is an existing directory on target node, "updatenode -r /usr/bin/scp" will fail with ``scp: <destination file>: Is a directory``
- 
 
 
-\ **-g|-**\ **-genmypost**\ 
- 
+
+\ **-g|-**\ **-genmypost**\
+
  Will generate a new mypostscript file for the
  nodes in the noderange, if site precreatemypostscripts is 1 or YES.
- 
 
 
-\ **-h|-**\ **-help**\ 
- 
+
+\ **-h|-**\ **-help**\
+
  Display usage message.
- 
 
 
-\ **-k|-**\ **-security**\ 
- 
+
+\ **-k|-**\ **-security**\
+
  Update the ssh keys and host keys for the service nodes and compute nodes;
  Update the ca and credentials to the service nodes.  Never run this command to the Management Node, it will take down xcatd.
  You must be running updatenode as root to use the -k flag.
- 
 
 
-\ **-l | -**\ **-user**\  \ *user_ID*\ 
- 
- Specifies a non-root user name to use for remote command execution. This option is only available when running postscripts (-P) for 
- AIX and Linux and updating software (-S) for Linux only. 
- The non-root userid  must be previously defined as an xCAT user. 
+
+\ **-l | -**\ **-user**\  \ *user_ID*\
+
+ Specifies a non-root user name to use for remote command execution. This option is only available when running postscripts (-P) for
+ AIX and Linux and updating software (-S) for Linux only.
+ The non-root userid  must be previously defined as an xCAT user.
  The userid sudo setup will have to be done by the admin on the node.
- This is not supported in a hierarchical cluster, that is the node is serviced by a service node. 
+ This is not supported in a hierarchical cluster, that is the node is serviced by a service node.
  See the document Granting_Users_xCAT_privileges for required xcat/sudo setup.
- 
 
 
-\ **-P|-**\ **-scripts**\ 
- 
- Specifies that postscripts and postbootscripts should be run on the nodes. 
+
+\ **-P|-**\ **-scripts**\
+
+ Specifies that postscripts and postbootscripts should be run on the nodes.
  updatenode -P syncfiles is not supported.  The syncfiles postscript can only
  be run during install.  You should use updatenode <noderange> -F instead.
- 
 
 
-\ **-S|-**\ **-sw**\ 
- 
+
+\ **-S|-**\ **-sw**\
+
  Specifies that node software should be updated.  In Sysclone environment, specifies pushing the delta changes to target nodes.
- 
 
 
-\ **-n|-**\ **-noverify**\ 
- 
+
+\ **-n|-**\ **-noverify**\
+
  Specifies that node network availability verification will be skipped.
- 
 
 
-\ **-s|-**\ **-sn**\ 
- 
+
+\ **-s|-**\ **-sn**\
+
  Set the server information stored on the nodes in /opt/xcat/xcatinfo on Linux.
- 
 
 
-\ **-t**\  \ *timeout*\ 
- 
+
+\ **-t**\  \ *timeout*\
+
  Specifies a timeout in seconds the command will wait for the remote targets to complete. If timeout is not specified
  it will wait indefinitely. updatenode -k is the exception that has a timeout of 10 seconds, unless overridden by this flag.
- 
 
 
-\ **-v|-**\ **-version**\ 
- 
+
+\ **-v|-**\ **-version**\
+
  Command Version.
- 
 
 
-\ **-V|-**\ **-verbose**\ 
- 
+
+\ **-V|-**\ **-verbose**\
+
  Verbose mode.
- 
+
 
 
 
@@ -521,274 +521,274 @@ EXAMPLES
 
 
 1. To perform all updatenode features for the Linux nodes in the group "compute":
- 
- 
+
+
  .. code-block:: perl
- 
+
    updatenode compute
- 
- 
- The command will: run any scripts listed in the nodes "postscripts and postbootscripts" 
- attribute, install or update any software indicated in the 
- /install/custom/install/<ostype>/profile.otherpkgs.pkglist (refer to the 
- \ **To install or update software part**\ ), synchronize any files indicated by 
+
+
+ The command will: run any scripts listed in the nodes "postscripts and postbootscripts"
+ attribute, install or update any software indicated in the
+ /install/custom/install/<ostype>/profile.otherpkgs.pkglist (refer to the
+ \ **To install or update software part**\ ), synchronize any files indicated by
  the synclist files specified in the osimage "synclists" attribute.
- 
+
 
 
 2. To run postscripts,postbootscripts and file synchronization only on the node "clstrn01":
- 
- 
+
+
  .. code-block:: perl
- 
+
    updatenode clstrn01 -F -P
- 
- 
+
+
 
 
 3. Running updatenode -P with the syncfiles postscript is not supported. You should use updatenode -F instead.
- 
+
  Do not run:
- 
- 
+
+
  .. code-block:: perl
- 
+
    updatenode clstrno1 -P syncfiles
- 
- 
+
+
  Run:
- 
- 
+
+
  .. code-block:: perl
- 
+
    updatenode clstrn01 -F
- 
- 
+
+
 
 
 4. To run the postscripts and postbootscripts  indicated in the postscripts and postbootscripts attributes on the node "clstrn01":
- 
- 
+
+
  .. code-block:: perl
- 
+
    updatenode clstrn01 -P
- 
- 
+
+
 
 
 5. To run the postscripts script1 and script2 on the node "clstrn01":
- 
- 
+
+
  .. code-block:: perl
- 
+
    cp script1,script2 /install/postscripts
-  
+
    updatenode clstrn01 -P "script1 p1 p2,script2"
- 
- 
- Since flag '-P' can be omitted when only script names are specified, 
+
+
+ Since flag '-P' can be omitted when only script names are specified,
  the following command is equivalent:
- 
- 
+
+
  .. code-block:: perl
- 
+
    updatenode clstrn01 "script1 p1 p2,script2"
- 
- 
+
+
  p1 p2 are parameters for script1.
- 
 
 
-6. To synchronize the files on the node "clstrn01":  Prepare the synclist file. 
-For AIX, set the full path of synclist in the osimage table synclists 
-attribute. For Linux, put the synclist file into the location: 
+
+6. To synchronize the files on the node "clstrn01":  Prepare the synclist file.
+For AIX, set the full path of synclist in the osimage table synclists
+attribute. For Linux, put the synclist file into the location:
 /install/custom/<inst_type>/<distro>/<profile>.<os>.<arch>.synclist
 Then:
- 
- 
+
+
  .. code-block:: perl
- 
+
    updatenode clstrn01 -F
- 
- 
 
 
-7. To perform the software update on the Linux node "clstrn01":  Copy the extra 
-rpm into the /install/post/otherpkgs/<os>/<arch>/\* and add the rpm names into 
+
+
+7. To perform the software update on the Linux node "clstrn01":  Copy the extra
+rpm into the /install/post/otherpkgs/<os>/<arch>/\* and add the rpm names into
 the /install/custom/install/<ostype>/profile.otherpkgs.pkglist .  Then:
- 
- 
+
+
  .. code-block:: perl
- 
+
    updatenode clstrn01 -S
- 
- 
+
+
 
 
 8. To update the AIX node named "xcatn11" using the "installp_bundle" and/or
 "otherpkgs" attribute values stored in the xCAT database.  Use the default installp, rpm and emgr flags.
- 
- 
+
+
  .. code-block:: perl
- 
+
    updatenode xcatn11 -V -S
- 
- 
- Note: The xCAT "xcatn11" node definition points to an xCAT osimage definition 
+
+
+ Note: The xCAT "xcatn11" node definition points to an xCAT osimage definition
  which contains the "installp_bundle" and "otherpkgs" attributes as well as
  the name of the NIM lpp_source resource.
- 
 
 
-9. To update the AIX node "xcatn11" by installing the "bos.cpr" fileset using 
+
+9. To update the AIX node "xcatn11" by installing the "bos.cpr" fileset using
 the "-agQXY" installp flags.  Also display the output of the installp command.
- 
- 
+
+
  .. code-block:: perl
- 
+
    updatenode xcatn11 -V -S otherpkgs="I:bos.cpr" installp_flags="-agQXY"
- 
- 
+
+
  Note:  The 'I:' prefix is optional but recommended for installp packages.
- 
+
 
 
 10. To uninstall the "bos.cpr" fileset that was installed in the previous example.
- 
- 
+
+
  .. code-block:: perl
- 
+
    updatenode xcatn11 -V -S otherpkgs="I:bos.cpr" installp_flags="-u"
- 
- 
+
+
 
 
 11. To update the AIX nodes "xcatn11" and "xcatn12" with the "gpfs.base" fileset
 and the "rsync" rpm using the installp flags "-agQXY" and the rpm flags "-i --nodeps".
- 
- 
+
+
  .. code-block:: perl
- 
+
    updatenode xcatn11,xcatn12 -V -S otherpkgs="I:gpfs.base,R:rsync-2.6.2-1.aix5.1.ppc.rpm" installp_flags="-agQXY" rpm_flags="-i --nodeps"
- 
- 
+
+
  Note: Using the "-V" flag with multiple nodes may result in a large amount of output.
- 
+
 
 
 12. To uninstall the rsync rpm that was installed in the previous example.
- 
- 
+
+
  .. code-block:: perl
- 
+
    updatenode xcatn11 -V -S otherpkgs="R:rsync-2.6.2-1" rpm_flags="-e"
- 
- 
+
+
 
 
 13. Update the AIX node "node01" using the software specified in the NIM "sslbnd" and "sshbnd" installp_bundle resources and the "-agQXY" installp flags.
- 
- 
+
+
  .. code-block:: perl
- 
+
    updatenode node01 -V -S installp_bundle="sslbnd,sshbnd" installp_flags="-agQXY"
- 
- 
+
+
 
 
 14. To get a preview of what would happen if you tried to install the "rsct.base" fileset on AIX node "node42".  (You must use the "-V" option to get the full output from the installp command.)
- 
- 
+
+
  .. code-block:: perl
- 
+
    updatenode node42 -V -S otherpkgs="I:rsct.base" installp_flags="-apXY"
- 
- 
+
+
 
 
 15. To check what rpm packages are installed on the AIX node "node09". (You must use the "-c" flag so updatenode does not get a list of packages from the database.)
- 
- 
+
+
  .. code-block:: perl
- 
+
    updatenode node09 -V -c -S rpm_flags="-qa"
- 
- 
+
+
 
 
 16. To install all software updates contained in the /images directory.
- 
- 
+
+
  .. code-block:: perl
- 
+
    updatenode node27 -V -S -A -d /images
- 
- 
+
+
  Note:  Make sure the directory is exportable and that the permissions are set
  correctly for all the files.  (Including the .toc file in the case of
  installp filesets.)
- 
+
 
 
 17. Install the interim fix package located in the /efixes directory.
- 
- 
+
+
  .. code-block:: perl
- 
+
    updatenode node29 -V -S -d /efixes otherpkgs=E:IZ38930TL0.120304.epkg.Z
- 
- 
+
+
 
 
 18. To uninstall the interim fix that was installed in the previous example.
- 
- 
+
+
  .. code-block:: perl
- 
+
    updatenode xcatsn11 -V -S -c emgr_flags="-r -L IZ38930TL0"
- 
- 
+
+
 
 
 19. To update the security keys for the node "node01"
- 
- 
+
+
  .. code-block:: perl
- 
+
    updatenode node01 -k
- 
- 
+
+
 
 
 20. To update the service nodes with the files to be synchronized to node group compute:
- 
- 
+
+
  .. code-block:: perl
- 
+
    updatenode compute -f
- 
- 
+
+
 
 
 21. To run updatenode with the non-root userid "user1" that has been setup as an xCAT userid  with sudo on node1  to run as root, do the following:
 See  Granting_Users_xCAT_privileges for required sudo setup.
- 
- 
+
+
  .. code-block:: perl
- 
+
    updatenode node1 -l user1 -P syslog
- 
- 
+
+
 
 
 22. In Sysclone environment, after capturing the delta changes from golden client to management node, to run updatenode to push these delta changes to target nodes.
- 
- 
+
+
  .. code-block:: perl
- 
+
    updatenode target-node -S
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/wcons.1.rst b/docs/source/guides/admin-guides/references/man1/wcons.1.rst
index 4ff69d007..2ca612b93 100644
--- a/docs/source/guides/admin-guides/references/man1/wcons.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/wcons.1.rst
@@ -15,17 +15,17 @@ wcons - windowed remote console
 
 
 ****************
-\ **Synopsis**\ 
+\ **Synopsis**\
 ****************
 
 
-\ **wcons**\   [\ **-t | -**\ **-tile**\ =\ *n*\ ] [\ *xterm-options*\ ] \ *noderange*\ 
+\ **wcons**\   [\ **-t | -**\ **-tile**\ =\ *n*\ ] [\ *xterm-options*\ ] \ *noderange*\
 
 \ **wcons**\  [\ **-h | -**\ **-help | -v | -**\ **-version**\ ]
 
 
 *******************
-\ **Description**\ 
+\ **Description**\
 *******************
 
 
@@ -36,45 +36,45 @@ range or nodes or groups.
 
 
 ***************
-\ **Options**\ 
+\ **Options**\
 ***************
 
 
 
-\ **-t | -**\ **-tile**\ =\ *n*\ 
- 
+\ **-t | -**\ **-tile**\ =\ *n*\
+
  Tile \ **wcons**\  windows from top left to bottom right.  If \ *n*\  is spec-
  ified  then  tile  \ *n*\  across.  If \ *n*\  is not specified then tile to
  edge of screen.  If tiled \ **wcons**\  windows reach bottom right, then
  the windows start at top left overlaying existing \ **wcons**\  windows.
- 
 
 
-\ **-h | -**\ **-help**\ 
- 
+
+\ **-h | -**\ **-help**\
+
  Print help.
- 
 
 
-\ **-v | -**\ **-version**\ 
- 
+
+\ **-v | -**\ **-version**\
+
  Print version.
- 
 
 
-\ *xterm options*\ 
- 
+
+\ *xterm options*\
+
  See xterm(1). Any options other than those listed above are passed
  directly to xterm. \ **Note:**\  when given multiple nodes, wcons will
- override \ **-title**\  and tries to figure out optimal \ **-geometry**\ 
+ override \ **-title**\  and tries to figure out optimal \ **-geometry**\
  options for the xterms (however, \ **-geometry**\  can still be
  specified).
- 
+
 
 
 
 *************
-\ **Files**\ 
+\ **Files**\
 *************
 
 
@@ -84,21 +84,21 @@ method.
 
 
 ****************
-\ **Examples**\ 
+\ **Examples**\
 ****************
 
 
-\ **wcons**\  \ *node1-node5*\ 
+\ **wcons**\  \ *node1-node5*\
 
-\ **wcons**\  \ **-**\ **-tile**\  \ **-**\ **-font**\ =\ *nil2*\  \ *all*\ 
+\ **wcons**\  \ **-**\ **-tile**\  \ **-**\ **-font**\ =\ *nil2*\  \ *all*\
 
-\ **wcons**\  \ **-t**\  \ *4*\  \ *node1-node16*\ 
+\ **wcons**\  \ **-t**\  \ *4*\  \ *node1-node16*\
 
-\ **wcons**\  \ **-f**\  \ *vs*\  \ **-t**\  \ *4*\  \ *node1-node4*\ 
+\ **wcons**\  \ **-f**\  \ *vs*\  \ **-t**\  \ *4*\  \ *node1-node4*\
 
 
 ************
-\ **Bugs**\ 
+\ **Bugs**\
 ************
 
 
@@ -109,7 +109,7 @@ window manager let me know.
 
 
 ************************
-\ **See**\  \ **Also**\ 
+\ **See**\  \ **Also**\
 ************************
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/wkill.1.rst b/docs/source/guides/admin-guides/references/man1/wkill.1.rst
index 8d4cd02c7..b40658bcc 100644
--- a/docs/source/guides/admin-guides/references/man1/wkill.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/wkill.1.rst
@@ -15,7 +15,7 @@ Name
 
 
 ****************
-\ **Synopsis**\ 
+\ **Synopsis**\
 ****************
 
 
@@ -25,7 +25,7 @@ Name
 
 
 *******************
-\ **Description**\ 
+\ **Description**\
 *******************
 
 
@@ -40,26 +40,26 @@ wcons windows on your $DISPLAY will be killed.
 
 
 ***************
-\ **Options**\ 
+\ **Options**\
 ***************
 
 
 
-\ **-h | -**\ **-help**\ 
- 
+\ **-h | -**\ **-help**\
+
  Print help.
- 
 
 
-\ **-v | -**\ **-version**\ 
- 
+
+\ **-v | -**\ **-version**\
+
  Print version.
- 
+
 
 
 
 ****************
-\ **Examples**\ 
+\ **Examples**\
 ****************
 
 
@@ -71,7 +71,7 @@ wcons windows on your $DISPLAY will be killed.
 
 
 ************************
-\ **See**\  \ **Also**\ 
+\ **See**\  \ **Also**\
 ************************
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/wvid.1.rst b/docs/source/guides/admin-guides/references/man1/wvid.1.rst
index 5a1c178ad..10447f06d 100644
--- a/docs/source/guides/admin-guides/references/man1/wvid.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/wvid.1.rst
@@ -7,7 +7,7 @@ wvid.1
 
 
 ************
-\ **Name**\ 
+\ **Name**\
 ************
 
 
@@ -15,15 +15,15 @@ wvid - windowed remote video console for nodes
 
 
 ****************
-\ **Synopsis**\ 
+\ **Synopsis**\
 ****************
 
 
-\ **wvid**\  \ *noderange*\ 
+\ **wvid**\  \ *noderange*\
 
 
 *******************
-\ **Description**\ 
+\ **Description**\
 *******************
 
 
@@ -35,7 +35,7 @@ The \ **nodehm.cons**\  attribute of the node determines the method used to open
 
 
 ***************
-\ **Options**\ 
+\ **Options**\
 ***************
 
 
@@ -43,26 +43,26 @@ No options are supported at this time.
 
 
 ****************
-\ **Examples**\ 
+\ **Examples**\
 ****************
 
 
 
 1.
- 
+
  To open video consoles for the 1st 2 nodes:
- 
- 
+
+
  .. code-block:: perl
- 
+
    wvid node1,node2
- 
- 
+
+
 
 
 
 ****************
-\ **See Also**\ 
+\ **See Also**\
 ****************
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/xCATWorld.1.rst b/docs/source/guides/admin-guides/references/man1/xCATWorld.1.rst
index d473d603b..c29437dc1 100644
--- a/docs/source/guides/admin-guides/references/man1/xCATWorld.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/xCATWorld.1.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **xCATWorld**\  \ *noderange*\ 
+\ **xCATWorld**\  \ *noderange*\
 
 
 ***********
@@ -27,7 +27,7 @@ DESCRIPTION
 ***********
 
 
-The xCATWorld program gives you a sample client program that interfaces to the /opt/xcat/lib/perl/xCAT_plugin/xCATWorld.pm plugin.  
+The xCATWorld program gives you a sample client program that interfaces to the /opt/xcat/lib/perl/xCAT_plugin/xCATWorld.pm plugin.
 For debugging purposes we have an Environment Variable XCATBYPASS.  If export XCATBYPASS=yes, the client will call the plugin without going through the xcat daemon, xcatd.
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/xcat2nim.1.rst b/docs/source/guides/admin-guides/references/man1/xcat2nim.1.rst
index 9069b27de..f855ea2cc 100644
--- a/docs/source/guides/admin-guides/references/man1/xcat2nim.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/xcat2nim.1.rst
@@ -19,9 +19,9 @@ SYNOPSIS
 ********
 
 
-\ **xcat2nim [-h|-**\ **-help]**\ 
+\ **xcat2nim [-h|-**\ **-help]**\
 
-\ **xcat2nim [-V|-**\ **-verbose] [-u|-**\ **-update] [-l|-**\ **-list] [-r|-**\ **-remove] [-f|-**\ **-force] [-t object-types] [-o**\  \ *object-names*\ ] \ **[-a|-**\ **-allobjects] [-p|-**\ **-primarySN] [-b|-**\ **-backupSN]**\  \ *[noderange] [attr=val [attr=val...]]*\ 
+\ **xcat2nim [-V|-**\ **-verbose] [-u|-**\ **-update] [-l|-**\ **-list] [-r|-**\ **-remove] [-f|-**\ **-force] [-t object-types] [-o**\  \ *object-names*\ ] \ **[-a|-**\ **-allobjects] [-p|-**\ **-primarySN] [-b|-**\ **-backupSN]**\  \ *[noderange] [attr=val [attr=val...]]*\
 
 
 ***********
diff --git a/docs/source/guides/admin-guides/references/man1/xcatchroot.1.rst b/docs/source/guides/admin-guides/references/man1/xcatchroot.1.rst
index 1f1c4c9f0..8d7b03e0e 100644
--- a/docs/source/guides/admin-guides/references/man1/xcatchroot.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/xcatchroot.1.rst
@@ -19,9 +19,9 @@ SYNOPSIS
 ********
 
 
-\ **xcatchroot -h**\ 
+\ **xcatchroot -h**\
 
-\ **xcatchroot [-V] -i**\  \ *osimage_name cmd_string*\ 
+\ **xcatchroot [-V] -i**\  \ *osimage_name cmd_string*\
 
 
 ***********
@@ -29,11 +29,11 @@ DESCRIPTION
 ***********
 
 
-For AIX diskless images this command will modify the AIX SPOT resource using 
+For AIX diskless images this command will modify the AIX SPOT resource using
 the chroot command.  You must include the name of an xCAT osimage
 definition and the command that you wish to have run in the spot.
 
-\ **WARNING:**\ 
+\ **WARNING:**\
 
 
 Be very careful when using this command!!!  Make sure you are
@@ -53,21 +53,21 @@ check operation on the spot.
   nim -Fo check <spot_name>
 
 
-The xcatchroot command will take care of any of the required setup so that 
+The xcatchroot command will take care of any of the required setup so that
 the command you provide will be able to run in the spot chroot environment.
 It will also mount the lpp_source resource listed in the osimage definition
 so that you can access additional software that you may wish to install.
 
-For example, assume that the location of the spot named in the xCAT osimage 
+For example, assume that the location of the spot named in the xCAT osimage
 definition is /install/nim/spot/614spot/usr. The associated root directory in
 this spot would be /install/nim/spot/614spot/usr/lpp/bos/inst_root.  The chroot
-is automatically done to this new root directory.  The spot location is 
+is automatically done to this new root directory.  The spot location is
 mounted on /.../inst_root/usr so that when your command is run in the chroot
 environment it is actually running commands from the spot usr location.
 
-Also, the location of the lpp_source resource specified in the osimage 
+Also, the location of the lpp_source resource specified in the osimage
 definition will be mounted to a subdirectory of the spot /.../inst_root
-directory.  For example, if the lpp_source location is 
+directory.  For example, if the lpp_source location is
 /install/nim/lpp_source/614lpp_lpp_source then that would be mounted over
 /install/nim/spot/614spot/usr/lpp/bos/inst_root/lpp_source.
 
@@ -76,7 +76,7 @@ of all commands and files assuming the /.../inst_root directory is you root
 directory.
 
 If you wish to install software from the lpp_source location you would
-provide a directory location of /lpp_source (or /lpp_source/installp/ppc 
+provide a directory location of /lpp_source (or /lpp_source/installp/ppc
 or /lpp_source/RPMS/ppc etc.) See the example below.
 
 Always run the NIM check operation after you are done updating your spot.
@@ -89,29 +89,29 @@ OPTIONS
 
 
 
-\ *cmd_string*\ 
- 
- The command you wish to have run in the chroot environment.  (Use a quoted 
+\ *cmd_string*\
+
+ The command you wish to have run in the chroot environment.  (Use a quoted
  string.)
- 
 
 
-\ **-h |-**\ **-help**\ 
- 
+
+\ **-h |-**\ **-help**\
+
  Display usage message.
- 
 
 
-\ **-i**\  \ *osimage_name*\ 
- 
+
+\ **-i**\  \ *osimage_name*\
+
  The name of the xCAT osimage definition.
- 
 
 
-\ **-V |-**\ **-verbose**\ 
- 
+
+\ **-V |-**\ **-verbose**\
+
  Verbose mode.
- 
+
 
 
 
@@ -135,7 +135,7 @@ EXAMPLES
 ********
 
 
-1) Set the root password to "cluster" in the spot so that when the diskless 
+1) Set the root password to "cluster" in the spot so that when the diskless
 node boots it will have a root password set.
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/xcatperftest.1.rst b/docs/source/guides/admin-guides/references/man1/xcatperftest.1.rst
index 4911358cd..3c7bf5394 100644
--- a/docs/source/guides/admin-guides/references/man1/xcatperftest.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/xcatperftest.1.rst
@@ -29,10 +29,10 @@ DESCRIPTION
 ***********
 
 
-The xcatperftest command runs commandes defined in a command list file and get their execution response time baseline for performance purpose. 
+The xcatperftest command runs commandes defined in a command list file and get their execution response time baseline for performance purpose.
 The xcatperftest command is part of the xCAT package xCAT-test, and you can run it standalone or leverage it to build up your automation test cases.
 
-Any commands could be defined in the command list file, however, it is recommended that the one-time initial configuration are well prepared prior to run xcatperftest command. 
+Any commands could be defined in the command list file, however, it is recommended that the one-time initial configuration are well prepared prior to run xcatperftest command.
 For example, the network object, osdistor and osimage image objects.
 
 Follow the below steps to run xcatperftest command:
@@ -54,22 +54,22 @@ OPTIONS
 
 
 
-\ **-?|-h**\ 
- 
+\ **-?|-h**\
+
  Display usage message.
- 
+
 
 
 <command-list-file>
- 
+
  Specifies the command list file with full-path. xCAT supports an example command file: /opt/xcat/share/xcat/tools/autotest/perfcmds.lst
- 
+
 
 
 <total>
- 
+
  Total number of fake nodes will be defined during the testing.
- 
+
 
 
 
@@ -109,7 +109,7 @@ The command list file is in flat text format, the testing framework will parse t
    noderm #PERFGRP#
 
 
-\ **Note**\ : Each line defines one command, and the commands dependency should be handled by the line order. 
+\ **Note**\ : Each line defines one command, and the commands dependency should be handled by the line order.
 If you define a node range series line (started with #SERIES#) in this file, xcatperftest will run the command for each node range defined in series line.
 
 \ **#SERIES#**\        To define a node range series, and the series should be an comma split incremental number sequence.
@@ -128,33 +128,33 @@ ENVIRONMENT VARIABLE
 
 The xcatperftest command supports be customized by some environment variables.
 
-\ **FAKE_NODE_PREFIX**\ 
+\ **FAKE_NODE_PREFIX**\
 
 Optional, the prefix of the fake compute node name. By default, the value is 'fake'
 
-\ **FAKE_NODE_GROUP**\ 
+\ **FAKE_NODE_GROUP**\
 
 # Optional, the group name of all the fake compute nodes. By default, the value is 'perftest'
 
-\ **FAKE_NETWORK_PRO**\ 
+\ **FAKE_NETWORK_PRO**\
 
 Mandatory, the Provision network for all the fake compute nodes. By default, the value is '192.168'.
 It must be a string like 'A.B', and be matched with \`tabdump networks\`
 
-\ **FAKE_NETWORK_BMC**\ 
+\ **FAKE_NETWORK_BMC**\
 
 Mandatory, the BMC network for all the fake compute nodes. By default, the value is '192.168'. Note:  It could not be the same subnet as 'FAKE_NETWORK_PRO'
 It must be a string like 'A.B' and no need to be defined in 'networks' table.
 
-\ **PERF_NODETEMPL**\ 
+\ **PERF_NODETEMPL**\
 
 Optional, The node template name used for generating fake nodes. By default, it will be auto-detected according to the current arch.
 
-\ **PERF_DRYRUN**\ 
+\ **PERF_DRYRUN**\
 
 Optional, Indicate no real commands will be executed if the environment variable is set.
 
-\ **PERF_NOCREATE**\ 
+\ **PERF_NOCREATE**\
 
 Optional, Indicate no new fake nodes will be created if the environment variable is set.
 
@@ -166,39 +166,39 @@ EXAMPLES
 
 
 1.
- 
+
  To run the performance testing for the commands defined in /tmp/cmd.lst on 5000 fake nodes:
- 
- 
+
+
  .. code-block:: perl
- 
+
     xcatperftest 5000 /tmp/cmd.lst
- 
- 
+
+
 
 
 2.
- 
+
  To generate an xCAT node object stanz file for 10000 nodes in subnet 10.100.0.0:
- 
- 
+
+
  .. code-block:: perl
- 
+
     FAKE_NETWORK_PRO=10.100 FAKE_NETWORK_BMC=10.200 xcatperftest 10000
- 
- 
+
+
 
 
 3.
- 
+
  To run the performance testing for the commands defined in /opt/xcat/share/xcat/tools/autotest/perfcmds.lst on 5000 existing fake nodes:
- 
- 
+
+
  .. code-block:: perl
- 
+
     PERF_NOCREATE=y xcatperftest 5000 /opt/xcat/share/xcat/tools/autotest/perfcmds.lst
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/xcattest.1.rst b/docs/source/guides/admin-guides/references/man1/xcattest.1.rst
index 53a022bdf..fbc86963b 100644
--- a/docs/source/guides/admin-guides/references/man1/xcattest.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/xcattest.1.rst
@@ -54,46 +54,46 @@ OPTIONS
 
 
 
-\ **-?|-h**\ 
- 
+\ **-?|-h**\
+
  Display usage message.
- 
 
 
-\ **-f**\  \ *configure file*\ 
- 
+
+\ **-f**\  \ *configure file*\
+
  Specifies the configuration file with full-path. xCAT supports an example config file: /opt/xcat/share/xcat/tools/autotest/linux.conf.template
- 
 
 
-\ **-b**\  \ *case bundle list*\ 
- 
+
+\ **-b**\  \ *case bundle list*\
+
  Comma separated list of test cases bundle files, each test cases bundle can contain multiple lines and each line for one test case name. The bundle files should be listed in: /opt/xcat/share/xcat/tools/autotest/bundle.
- 
 
 
-\ **-t**\  \ *cases list*\ 
- 
+
+\ **-t**\  \ *cases list*\
+
  Comma separated list of test cases that will be run.
- 
 
 
-\ **-c**\  \ *cmd list*\ 
- 
+
+\ **-c**\  \ *cmd list*\
+
  Comma separated list of commands which will be tested, i.e., all the test cases under the command sub directory will be run.
- 
 
 
-\ **-l**\ 
- 
+
+\ **-l**\
+
  Display the test cases names specified by the flag -b, -t or -c.
- 
 
 
-\ **-s**\ 
- 
+
+\ **-s**\
+
  Display the bundle files and command with value: bundle or command.
- 
+
 
 
 
@@ -121,7 +121,7 @@ The xCAT-test test cases are in flat text format, the testing framework will par
    start:case name
    #optional, description of the test case
    description: what the test case is for?
-   #optional, environment requirements 
+   #optional, environment requirements
    os:AIX/Linux
    #optional, environment requirements
    arch:ppc/x86
@@ -146,50 +146,50 @@ EXAMPLES
 
 
 1.
- 
+
  To run all  test cases related command rpower:
- 
- 
+
+
  .. code-block:: perl
- 
+
     xcattest -f /tmp/config -c rpower
- 
- 
+
+
 
 
 2.
- 
+
  To run customized bundle with /tmp/config file:
- 
- 
+
+
  .. code-block:: perl
- 
+
     xcattest -c lsdef -l  > /opt/xcat/share/xcat/tools/autotest/bundle/custom.bundle
     Modify custom.bundle
     xcattest -f /tmp/config -b custom.bundle
- 
- 
+
+
 
 
 3.
- 
+
  To run specified test cases with /tmp/config file:
- 
- 
+
+
  .. code-block:: perl
- 
+
     xcattest -f /tmp/config -t lsdef_t_o_l_z
- 
- 
+
+
 
 
 4.
- 
+
  To add a new case to test chvm. In the example, we assume that the min_mem should not be equal to 16 in the lpar profile of computenode. The case name is chvm_custom. It create a test lpar named testnode firstly, that change the min_mem of the lpar to 16 using chvm, then check if min_mem have changed correctly. At last, the testnode be remove to ensure no garbage produced in the cases.
- 
- 
+
+
  .. code-block:: perl
- 
+
     add a new test case file in /opt/xcat/share/xcat/tools/autotest/chvm
     edit filename
     start:chvm_custom
@@ -207,8 +207,8 @@ EXAMPLES
     cmd:rmvm testnode
     cmd:rm -f /tmp/autotest.profile
     end
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/xcoll.1.rst b/docs/source/guides/admin-guides/references/man1/xcoll.1.rst
index 678d76ac2..ef49f4b13 100644
--- a/docs/source/guides/admin-guides/references/man1/xcoll.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/xcoll.1.rst
@@ -7,7 +7,7 @@ xcoll.1
 
 
 ************
-\ **NAME**\ 
+\ **NAME**\
 ************
 
 
@@ -15,7 +15,7 @@ xcoll.1
 
 
 ****************
-\ **SYNOPSIS**\ 
+\ **SYNOPSIS**\
 ****************
 
 
@@ -23,11 +23,11 @@ xcoll.1
 
 
 *******************
-\ **DESCRIPTION**\ 
+\ **DESCRIPTION**\
 *******************
 
 
-The  \ **xcoll**\  command formats and consolidates output from the \ **psh,rinv**\  command. The \ **xcoll**\ 
+The  \ **xcoll**\  command formats and consolidates output from the \ **psh,rinv**\  command. The \ **xcoll**\
 command takes, as input, lines in the following format:
 
 groupname: line of output from remote command, will use group name, if defined
@@ -47,7 +47,7 @@ is identical:
   lines from psh for node1 with hostnames stripped off
   .
   .
- 
+
   ====================================
   node2 or nodegroup name
   ====================================
@@ -56,7 +56,7 @@ is identical:
   lines from psh for node2 with hostnames stripped off
   .
   .
- 
+
   ====================================
   node3, node4 or nodegroup name
   ====================================
@@ -69,44 +69,44 @@ is identical:
 
 
 ***************
-\ **OPTIONS**\ 
+\ **OPTIONS**\
 ***************
 
 
 
-\ **-c**\ 
- 
+\ **-c**\
+
  Display a total nodecount for each set of output.
- 
 
 
-\ **-n**\ 
- 
+
+\ **-n**\
+
  Display output as nodenames instead of groupnames.
- 
+
 
 
 
 ****************
-\ **EXAMPLES**\ 
+\ **EXAMPLES**\
 ****************
 
 
 
 1. To  display the results of a command issued on several nodes, in
 the format used in the Description, enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    psh node1,node2,node3 cat /etc/passwd | xcoll
- 
- 
+
+
 
 
 
 ****************
-\ **SEE ALSO**\ 
+\ **SEE ALSO**\
 ****************
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/xdcp.1.rst b/docs/source/guides/admin-guides/references/man1/xdcp.1.rst
index 0eb60167e..4584d26c8 100644
--- a/docs/source/guides/admin-guides/references/man1/xdcp.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/xdcp.1.rst
@@ -7,7 +7,7 @@ xdcp.1
 
 
 ************
-\ **NAME**\ 
+\ **NAME**\
 ************
 
 
@@ -15,11 +15,11 @@ xdcp.1
 
 
 ****************
-\ **SYNOPSIS**\ 
+\ **SYNOPSIS**\
 ****************
 
 
-\ **xdcp**\  \ *noderange*\   [[\ **-B**\  | \ **-**\ **-bypass**\ ] [\ **-f**\  \ *fanout*\ ] [\ **-L**\ ]  [\ **-l**\   \ *userID*\ ] [\ **-o**\  \ *node_options*\ ] [\ **-p**\ ] [\ **-P**\ ] [\ **-r**\  \ *node_remote_shell*\ ] [\ **-R**\ ] [\ **-t**\  \ *timeout*\ ] [\ **-T**\ ] [\ **-v**\ ] [\ **-q**\ ] [\ **-X**\  \ *env_list*\ ] \ *sourcefile.... targetpath*\ 
+\ **xdcp**\  \ *noderange*\   [[\ **-B**\  | \ **-**\ **-bypass**\ ] [\ **-f**\  \ *fanout*\ ] [\ **-L**\ ]  [\ **-l**\   \ *userID*\ ] [\ **-o**\  \ *node_options*\ ] [\ **-p**\ ] [\ **-P**\ ] [\ **-r**\  \ *node_remote_shell*\ ] [\ **-R**\ ] [\ **-t**\  \ *timeout*\ ] [\ **-T**\ ] [\ **-v**\ ] [\ **-q**\ ] [\ **-X**\  \ *env_list*\ ] \ *sourcefile.... targetpath*\
 
 \ **xdcp**\  \ *noderange*\   [\ **-F**\  \ *rsync input file*\ ]
 
@@ -31,17 +31,17 @@ xdcp.1
 
 
 *******************
-\ **DESCRIPTION**\ 
+\ **DESCRIPTION**\
 *******************
 
 
 The \ **xdcp**\  command concurrently copies files  to  or  from  remote  target
 nodes. The command issues a remote copy command for each node or device specified. When files are  pulled  from a target,  they  are  placed  into  the  target_path with the name of the
 remote node or device appended to  the  copied  source_file  name.  The
-/usr/bin/rcp command is the model for syntax and security. 
+/usr/bin/rcp command is the model for syntax and security.
 If using hierarchy, then xdcp runs on the service node that is servicing the compute node. The file will first be copied to the path defined in the site table, SNsyncfiledir attribute, or the default path /var/xcat/syncfiles on the service node, if the attribute is not defined. The -P flag will not automatically copy
 the files from the compute node to the Management node, hierarchically.  There
-is a two step process, see \ **-P**\  flag.  
+is a two step process, see \ **-P**\  flag.
 If the Management Node is target node, it must be defined in the xCAT database with nodetype=mn. When the \ **xdcp**\  command runs the Management Node as the target, it does not use remote commands but uses the local OS copy (\ **cp**\ ) command.
 
 \ **REMOTE**\  \ **USER**\ :
@@ -85,114 +85,114 @@ standard output or standard error is displayed.
 
 
 ***************
-\ **OPTIONS**\ 
+\ **OPTIONS**\
 ***************
 
 
 
-\ *sourcefile...*\ 
- 
+\ *sourcefile...*\
+
  Specifies the complete path for the file to be  copied  to  or
  from  the  target.  Multiple files can be specified. When used
  with the -R flag, only a single directory  can  be  specified.
  When  used  with the -P flag, only a single file can be specified.
- 
 
 
-\ *targetpath*\ 
- 
+
+\ *targetpath*\
+
  If one source_file file, then it specifies the file to copy the source_file
  file to on the target. If multiple source_file files, it specifies
  the directory to copy the source_file files to on the target.
  If the -P flag is specified, the target_path is the local host location
  for the copied files.  The remote file directory structure is recreated
- under target_path and  the  remote  target  name  is  appended 
+ under target_path and  the  remote  target  name  is  appended
  to  the   copied source_file name in the target_path directory.
  Note: the targetpath directory must exist.
- 
 
 
-\ **-B | -**\ **-bypass**\ 
- 
+
+\ **-B | -**\ **-bypass**\
+
  Runs in bypass mode, use if the xcatd daemon is hung.
- 
 
 
-\ **-f | -**\ **-fanout**\  \ *fanout_value*\ 
- 
+
+\ **-f | -**\ **-fanout**\  \ *fanout_value*\
+
  Specifies a fanout value for the maximum number of  concur-
  rently  executing  remote shell processes. Serial execution
- can be specified by indicating a fanout value of \ **1**\ .  
+ can be specified by indicating a fanout value of \ **1**\ .
  If \ **-f**\  is not specified, a default fanout value of \ **64**\  is used.
- 
 
 
-\ **-F | -**\ **-File**\  \ *rsync input file*\ 
- 
- Specifies the path to the file that will be used to  
+
+\ **-F | -**\ **-File**\  \ *rsync input file*\
+
+ Specifies the path to the file that will be used to
  build the \ **rsync**\  command.
  The format of the input file is as follows, each line contains:
- 
- 
+
+
  .. code-block:: perl
- 
+
    <path to source file1> <path to source file2> ... ->  < path to destination file/directory>
- 
- 
+
+
  or
- 
- 
+
+
  .. code-block:: perl
- 
+
    <path to source file> -> <path to destination file>
- 
- 
+
+
  or
- 
- 
+
+
  .. code-block:: perl
- 
+
    <path to source file> -> <path to destination directory ( must end in /)>
- 
- 
+
+
  For example:
- 
- 
+
+
  .. code-block:: perl
- 
+
     /etc/password /etc/hosts -> /etc
-  
+
     /tmp/file2  ->  /tmp/file2
-  
+
     /tmp/file2  ->  /tmp/
-  
+
     /tmp/filex  ->  /tmp/source/filey
-  
+
     /etc/*  ->  /etc/
- 
- 
+
+
  \ **Running postscripts after files are sync'd to the nodes**\ :
- 
- After you define the files to rsync, you can add an \ **EXECUTE:**\  clause in the synclist file. The \ **EXECUTE:**\  clause will list all the postscripts that you would like to run after the files are sync'd to the node. 
+
+ After you define the files to rsync, you can add an \ **EXECUTE:**\  clause in the synclist file. The \ **EXECUTE:**\  clause will list all the postscripts that you would like to run after the files are sync'd to the node.
  The postscript file must be of the form \ **filename.post**\ , where the <filename>
  is the <filename> is the from <filename>, reside in the same
  directory as \ **filename**\ , and be executable.
- If the file \ **filename**\  is rsync'd to the node, then the \ **filename.post**\ 
+ If the file \ **filename**\  is rsync'd to the node, then the \ **filename.post**\
  will automatically be run on the node.
  If the file \ **filename**\  is not updated on the node,  the \ **filename.post**\  will not be run.
- 
+
  Putting the \ **filename.post**\  in the file list to rsync to the node is required
  for hierarchical clusters.  It is optional for non-hierarchical clusters.
- 
+
  Another option is the \ **EXECUTEALWAYS:**\  clause in the synclist file.  The \ **EXECUTEALWAYS:**\  will list all the postscripts that you would like to run after the files are sync'd to the nodes.   These scripts will run whether or not any files are sync'd to the nodes.  The scripts have no special format, but must contain the fully qualified path.
- 
+
  The scripts must be also added to the file list to rsync to the node for hierarchical clusters.  It is optional for non-hierarchical clusters.
- 
+
  For example, your rsynclist file may look like this:
- 
- 
+
+
  .. code-block:: perl
- 
+
    /tmp/share/file2  ->  /tmp/file2
    /tmp/share/file2.post -> /tmp/file2.post
    /tmp/share/file3  ->  /tmp/filex
@@ -204,18 +204,18 @@ standard output or standard error is displayed.
    /tmp/share/file3.post
    EXECUTEALWAYS:
    /tmp/myscript
- 
- 
- If /tmp/file2 and /tmp/file3  update /tmp/file2 and /tmp/filex on the node, then the postscripts /tmp/file2.post and /tmp/file3.post are automatically run on 
+
+
+ If /tmp/file2 and /tmp/file3  update /tmp/file2 and /tmp/filex on the node, then the postscripts /tmp/file2.post and /tmp/file3.post are automatically run on
  the node. /tmp/myscript will always be run on the node.
- 
+
  Another option is the \ **APPEND:**\  clause in the synclist file. The \ **APPEND:**\  clause is used to append the contents of the input file to an existing file on the node.  The file to append \ **must**\  already exist on the node and not be part of the synclist that contains the \ **APPEND:**\  clause.
- 
+
  For example, your rsynclist file may look like this:
- 
- 
+
+
  .. code-block:: perl
- 
+
    /tmp/share/file2  ->  /tmp/file2
    /tmp/share/file2.post -> /tmp/file2.post
    /tmp/share/file3  ->  /tmp/filex
@@ -230,12 +230,12 @@ standard output or standard error is displayed.
    APPEND:
    /etc/myappenddir/appendfile -> /etc/mysetup/setup
    /etc/myappenddir/appendfile2 -> /etc/mysetup/setup2
- 
- 
+
+
  When you use the append script,  the file  (left) of the arrow is appended to the file right of the arrow.  In this example, /etc/myappenddir/appendfile is appended to /etc/mysetup/setup file, which must already exist on the node. The /opt/xcat/share/xcat/scripts/xdcpappend.sh is used to accomplish this.
- 
+
  Another option is the \ **MERGE:**\  clause in the synclist file. The \ **MERGE:**\  clause is used to append the contents of the input file to /etc/passwd, /etc/group, or /etc/shadow on a Linux node.  It is only supported for those files and only on Linux. You must not use both the APPEND and MERGE funcion for these three files. The processing could end up not creating the file you desire. The MERGE function is the preferred method, becuase APPEND only adds to the file.  MERGE will add to the file but also insure there are no duplicate entries.
- 
+
  For example, your rsynclist file may look like this:
   /tmp/share/file2  ->  /tmp/file2
   /tmp/share/file2.post -> /tmp/file2.post
@@ -252,44 +252,44 @@ standard output or standard error is displayed.
   /custom/mypasswd -> /etc/passwd
   /custom/mygroups -> /etc/group
   /custom/myshadow -> /etc/shadow
- 
+
  Note: no order can be assumed by the order that the EXECUTE,EXECUTEALWAYS and APPEND clause fall in the synclist file.
- 
+
  For more information on syncing files to node, read Sync-ing_Config_Files_to_Nodes
- 
+
  On Linux rsync always uses ssh remoteshell. On AIX, ssh or rsh is used depending on the site.useSSHonAIX attribute.
- 
 
 
-\ **-h | -**\ **-help**\ 
- 
+
+\ **-h | -**\ **-help**\
+
  Displays usage information.
- 
 
 
-\ **-i | -**\ **-rootimg**\  \ *install image*\ 
- 
+
+\ **-i | -**\ **-rootimg**\  \ *install image*\
+
  Specifies  the path to the install image on the local Linux node.
- 
 
 
-\ **-o | -**\ **-node-options**\  \ *node_options*\ 
- 
+
+\ **-o | -**\ **-node-options**\  \ *node_options*\
+
  Specifies options to pass to the remote shell  command  for
  node  targets.  The options must be specified within double
  quotation marks ("") to distinguish them from \ **xdsh**\  options.
- 
 
 
-\ **-p | -**\ **-preserve**\ 
- 
+
+\ **-p | -**\ **-preserve**\
+
  Preserves  the  source  file characteristics as implemented by
  the configured remote copy command.
- 
 
 
-\ **-P | -**\ **-pull**\ 
- 
+
+\ **-P | -**\ **-pull**\
+
  Pulls (copies) the files from the targets and places  them  in
  the  target_path  directory on the local host. The target_path
  must be a directory. Files pulled from  remote  machines  have
@@ -298,164 +298,164 @@ standard output or standard error is displayed.
  appended to the directory. Only one file per invocation of the
  xdcp pull command can be pulled from the specified  targets.
  Hierarchy is not automatically support yet.   You must first pull
- the file to the Service Node and then pull the file to the Management 
+ the file to the Service Node and then pull the file to the Management
  node.
- 
 
 
-\ **-q | -**\ **-show-config**\ 
- 
+
+\ **-q | -**\ **-show-config**\
+
  Displays the current environment settings for all DSH
  Utilities commands. This includes the values of all environment
  variables  and  settings  for  all  currently installed and
  valid contexts. Each setting is prefixed with  \ *context*\ :  to
  identify the source context of the setting.
- 
 
 
-\ **-r | -**\ **-node-rcp**\  \ *node_remote_copy*\ 
- 
+
+\ **-r | -**\ **-node-rcp**\  \ *node_remote_copy*\
+
  Specifies  the  full  path of the remote copy command used
  for remote command execution on node targets.
- 
 
 
-\ **-R | -**\ **-recursive**\  \ *recursive*\ 
- 
+
+\ **-R | -**\ **-recursive**\  \ *recursive*\
+
  Recursively  copies files from a local directory to the remote
  targets, or when specified with the \ **-P**\  flag, recursively pulls
  (copies)  files  from  a remote directory to the local host. A
  single source directory can be specified using the source_file
  parameter.
- 
 
 
-\ **-s**\  \ *synch service nodes*\ 
- 
+
+\ **-s**\  \ *synch service nodes*\
+
  Will only sync the files listed in the synclist (\ **-F**\ ), to the service
  nodes for the input compute node list. The files will be placed in the
  directory defined by the site.SNsyncfiledir attribute, or the default
  /var/xcat/syncfiles directory.
- 
 
 
-\ **-t | -**\ **-timeout**\  \ *timeout*\ 
- 
+
+\ **-t | -**\ **-timeout**\  \ *timeout*\
+
  Specifies the time, in seconds, to wait for output from any
  currently executing remote targets. If no output is
- available  from  any  target in the specified \ *timeout*\ , 
+ available  from  any  target in the specified \ *timeout*\ ,
  \ **xdsh**\  displays an error and terminates execution for the remote
  targets  that  failed to respond. If \ *timeout*\  is not specified,
  \ **xdsh**\  waits indefinitely to continue processing output  from
  all  remote  targets.  When specified with the \ **-i**\  flag, the
  user is prompted for an additional timeout interval to wait
  for output.
- 
 
 
-\ **-T | -**\ **-trace**\ 
- 
+
+\ **-T | -**\ **-trace**\
+
  Enables trace mode. The \ **xdcp**\  command prints diagnostic
  messages to standard output during execution to each target.
- 
 
 
-\ **-v | -**\ **-verify**\ 
- 
+
+\ **-v | -**\ **-verify**\
+
  Verifies each target before executing any  remote  commands
  on  the target. If a target is not responding, execution of
  remote commands for the target is canceled.
- 
 
 
-\ **-V | -**\ **-version**\ 
- 
+
+\ **-V | -**\ **-version**\
+
  Displays the \ **xdcp**\  command version information.
- 
+
 
 
 
 *************************************
-\ **Environment**\  \ **Variables**\ 
+\ **Environment**\  \ **Variables**\
 *************************************
 
 
 
-\ **DSH_ENVIRONMENT**\ 
- 
+\ **DSH_ENVIRONMENT**\
+
  Specifies a file that contains environment variable
  definitions to export to the target before executing  the  remote
  command. This variable is overridden by the \ **-E**\  flag.
- 
 
 
-\ **DSH_FANOUT**\ 
- 
+
+\ **DSH_FANOUT**\
+
  Specifies  the fanout value. This variable is overridden by
  the \ **-f**\  flag.
- 
 
 
-\ **DSH_NODE_OPTS**\ 
- 
+
+\ **DSH_NODE_OPTS**\
+
  Specifies the options to use for the remote  shell  command
  with  node targets only. This variable is overridden by the
  \ **-o**\  flag.
- 
 
 
-\ **DSH_NODE_RCP**\ 
- 
+
+\ **DSH_NODE_RCP**\
+
  Specifies the full path of the remote copy command  to  use
  to  copy  local scripts and local environment configuration
  files to node targets.
- 
 
 
-\ **DSH_NODE_RSH**\ 
- 
+
+\ **DSH_NODE_RSH**\
+
  Specifies the full path of the  remote  shell  to  use  for
  remote  command execution on node targets. This variable is
  overridden by the \ **-r**\  flag.
- 
 
 
-\ **DSH_NODEGROUP_PATH**\ 
- 
+
+\ **DSH_NODEGROUP_PATH**\
+
  Specifies a colon-separated list of directories  that
  contain node group files for the \ **DSH**\  context. When the \ **-a**\  flag
  is specified in the \ **DSH**\  context,  a  list  of  unique  node
  names is collected from all node group files in the path.
- 
 
 
-\ **DSH_PATH**\ 
- 
+
+\ **DSH_PATH**\
+
  Sets the command path to use on the targets. If \ **DSH_PATH**\  is
  not set, the default path defined in  the  profile  of  the
  remote \ *user_ID*\  is used.
- 
 
 
-\ **DSH_SYNTAX**\ 
- 
+
+\ **DSH_SYNTAX**\
+
  Specifies the shell syntax to use on remote targets; \ **ksh**\  or
  \ **csh**\ . If not specified, the  \ **ksh**\   syntax  is  assumed.  This
  variable is overridden by the \ **-S**\  flag.
- 
 
 
-\ **DSH_TIMEOUT**\ 
- 
+
+\ **DSH_TIMEOUT**\
+
  Specifies  the  time,  in  seconds, to wait for output from
- each remote target. This variable is overridden by  the  \ **-t**\ 
+ each remote target. This variable is overridden by  the  \ **-t**\
  flag.
- 
+
 
 
 
 *******************
-\ **Exit Status**\ 
+\ **Exit Status**\
 *******************
 
 
@@ -473,7 +473,7 @@ successfully,  the xdcp  command exit value is greater than 0.
 
 
 ****************
-\ **Security**\ 
+\ **Security**\
 ****************
 
 
@@ -491,235 +491,235 @@ userdefined.
 
 
 ****************
-\ **Examples**\ 
+\ **Examples**\
 ****************
 
 
 
 1. To copy the /etc/hosts file from all  nodes in the cluster
 to the /tmp/hosts.dir directory on the local host, enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    xdcp all -P /etc/hosts /tmp/hosts.dir
- 
- 
+
+
  A suffix specifying the name of the target is  appended  to  each
  file name. The contents of the /tmp/hosts.dir directory are similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
    hosts._node1   hosts._node4   hosts._node7
    hosts._node2   hosts._node5   hosts._node8
    hosts._node3   hosts._node6
- 
- 
+
+
 
 
 2. To copy the directory /var/log/testlogdir  from  all  targets  in
 NodeGroup1 with a fanout of 12, and save each directory on  the  local
 host as /var/log._target, enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    xdcp NodeGroup1 -f 12 -RP /var/log/testlogdir /var/log
- 
- 
+
+
 
 
 3. To copy  /localnode/smallfile and /tmp/bigfile to /tmp on node1
 using rsync and input -t flag to rsync, enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    xdcp node1 -r /usr/bin/rsync -o "-t" /localnode/smallfile /tmp/bigfile /tmp
- 
- 
+
+
 
 
 4. To copy the /etc/hosts file from the local host to all the nodes
 in the cluster, enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    xdcp all /etc/hosts /etc/hosts
- 
- 
+
+
 
 
 5. To copy all the files in /tmp/testdir from the local host to all the nodes
 in the cluster, enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    xdcp all /tmp/testdir/* /tmp/testdir
- 
- 
 
 
-6. To copy all the files in /tmp/testdir and it's subdirectories 
+
+
+6. To copy all the files in /tmp/testdir and it's subdirectories
 from the local host to node1 in the cluster, enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    xdcp node1 -R /tmp/testdir /tmp/testdir
- 
- 
+
+
 
 
 7. To copy the /etc/hosts  file  from  node1  and  node2  to the
 /tmp/hosts.dir directory on the local host, enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    xdcp node1,node2 -P /etc/hosts /tmp/hosts.dir
- 
- 
+
+
 
 
 8. To rsync the /etc/hosts file to your compute nodes:
- 
+
  Create a rsync file /tmp/myrsync, with this line:
- 
+
  /etc/hosts -> /etc/hosts
- 
+
  or
- 
+
  /etc/hosts -> /etc/    (last / is required)
- 
+
  Run:
- 
- 
+
+
  .. code-block:: perl
- 
+
    xdcp compute -F /tmp/myrsync
- 
- 
+
+
 
 
 9.
- 
+
  To rsync all the files in /home/mikev to the  compute nodes:
- 
+
  Create a rsync file /tmp/myrsync, with this line:
- 
+
  /home/mikev/\* -> /home/mikev/      (last / is required)
- 
+
  Run:
- 
- 
+
+
  .. code-block:: perl
- 
+
    xdcp compute -F /tmp/myrsync
- 
- 
+
+
 
 
 10. To rsync to the compute nodes, using service nodes, the command will first
 rsync the files to the  /var/xcat/syncfiles directory on the service nodes and then rsync the files from that directory to the compute nodes. The /var/xcat/syncfiles default directory on the service nodes, can be changed by putting a directory value in the site table SNsyncfiledir attribute.
- 
+
  Create a rsync file /tmp/myrsync, with this line:
- 
+
  /etc/hosts /etc/passwd -> /etc
- 
+
  or
- 
+
  /etc/hosts /etc/passwd -> /etc/
- 
+
  Run:
- 
- 
+
+
  .. code-block:: perl
- 
+
    xdcp compute -F /tmp/myrsync
- 
- 
+
+
  to update the Compute Nodes
- 
+
 
 
 11. To rsync to the service nodes in preparation for rsyncing the compute nodes
 during an install from the service node.
- 
+
  Create a rsync file /tmp/myrsync, with this line:
- 
+
  /etc/hosts /etc/passwd -> /etc
- 
+
  Run:
- 
- 
+
+
  .. code-block:: perl
- 
+
    xdcp compute -s -F /tmp/myrsync
- 
- 
+
+
  to sync the service node for compute
- 
+
 
 
 12. To rsync the /etc/file1 and file2 to your compute nodes and rename to  filex and filey:
- 
+
  Create a rsync file /tmp/myrsync, with these line:
- 
+
  /etc/file1 -> /etc/filex
- 
+
  /etc/file2 -> /etc/filey
- 
+
  Run:
- 
- 
+
+
  .. code-block:: perl
- 
+
    xdcp compute -F /tmp/myrsync
- 
- 
+
+
  to update the Compute Nodes
- 
+
 
 
 13. To rsync files in the Linux image at /install/netboot/fedora9/x86_64/compute/rootimg on the MN:
- 
+
  Create a rsync file /tmp/myrsync, with this line:
- 
+
  /etc/hosts /etc/passwd -> /etc
- 
+
  Run:
- 
- 
+
+
  .. code-block:: perl
- 
+
    xdcp -i /install/netboot/fedora9/x86_64/compute/rootimg -F /tmp/myrsync
- 
- 
+
+
 
 
 14. To define the Management Node in the database so you can use xdcp, run
- 
- 
+
+
  .. code-block:: perl
- 
+
    xcatconfig -m
- 
- 
+
+
 
 
 
 *************
-\ **Files**\ 
+\ **Files**\
 *************
 
 
 
 ****************
-\ **SEE ALSO**\ 
+\ **SEE ALSO**\
 ****************
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/xdsh.1.rst b/docs/source/guides/admin-guides/references/man1/xdsh.1.rst
index 6132f8048..03f6db8f2 100644
--- a/docs/source/guides/admin-guides/references/man1/xdsh.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/xdsh.1.rst
@@ -7,7 +7,7 @@ xdsh.1
 
 
 ************
-\ **NAME**\ 
+\ **NAME**\
 ************
 
 
@@ -15,19 +15,19 @@ xdsh.1
 
 
 ****************
-\ **SYNOPSIS**\ 
+\ **SYNOPSIS**\
 ****************
 
 
 \ **xdsh**\  \ *noderange*\  [\ **-B**\  | \ **-**\ **-bypass**\ ]  [\ **-**\ **-devicetype**\  \ *type_of_device*\ ] [\ **-e**\ ] [\ **-E**\  \ *environment_file*\ ]  [\ **-f**\  \ *fanout*\ ]
 [\ **-L**\ ]  [\ **-l**\   \ *userID*\ ] [\ **-m**\ ] [\ **-o**\  \ *node_options*\ ] [\ **-Q**\ ] [\ **-r**\  \ *node_remote_shell*\ ] [\ **-s**\ ] [\ **-S**\  {\ **csh | ksh**\ }] [\ **-t**\  \ *timeout*\ ]
-[\ **-T**\ ] [\ **-v**\ ] [\ **-X**\  \ *env_list*\ ] [\ **-z**\ ] [\ **-**\ **-sudo**\ ] \ *command_list*\ 
+[\ **-T**\ ] [\ **-v**\ ] [\ **-X**\  \ *env_list*\ ] [\ **-z**\ ] [\ **-**\ **-sudo**\ ] \ *command_list*\
 
 \ **xdsh**\  \ *noderange*\   [\ **-K**\ ]
 
-\ **xdsh**\  \ *noderange*\   [\ **-K**\ ] [\ **-l**\   \ *userID*\ ] \ **-**\ **-devicetype**\  \ *type_of_device*\ 
+\ **xdsh**\  \ *noderange*\   [\ **-K**\ ] [\ **-l**\   \ *userID*\ ] \ **-**\ **-devicetype**\  \ *type_of_device*\
 
-\ **xdsh**\  [\ **-i**\  \ *image path | nim image name*\ ] \ *command_list*\ 
+\ **xdsh**\  [\ **-i**\  \ *image path | nim image name*\ ] \ *command_list*\
 
 \ **xdsh**\  \ *noderange*\   [\ **-c**\ ]
 
@@ -35,7 +35,7 @@ xdsh.1
 
 
 *******************
-\ **DESCRIPTION**\ 
+\ **DESCRIPTION**\
 *******************
 
 
@@ -43,7 +43,7 @@ The \ **xdsh**\  command runs commands in parallel on remote nodes and/or the Ma
 remote shell command for each target specified, and returns the output
 from all targets,
 formatted so that command results  from  all  nodes  can  be  managed.
-If the command is to be executed  on the Management Node, it does not use a remote shell command, but uses the local OS copy or shell command. The Management Node must be defined in the xCAT database. The best way to do this is to use the xcatconfig -m option. 
+If the command is to be executed  on the Management Node, it does not use a remote shell command, but uses the local OS copy or shell command. The Management Node must be defined in the xCAT database. The best way to do this is to use the xcatconfig -m option.
 The \ **xdsh**\  command is an xCAT Distributed Shell Utility.
 
 \ **COMMAND**\  \ **SPECIFICATION**\ :
@@ -116,7 +116,7 @@ The file should be executable and contain one environment variable per line.
 \ **COMMAND**\  \ **EXECUTION**\ :
 
 The  maximum  number  of concurrent remote shell command processes (the
-fanout) can be specified with the \ **-f**\  flag or with the \ **DSH_FANOUT**\ 
+fanout) can be specified with the \ **-f**\  flag or with the \ **DSH_FANOUT**\
 environment variable. The fanout is only restricted by the number of remote
 shell commands that can be run in parallel. You can experiment with the
 \ **DSH_FANOUT**\   value on your management server to see if higher values are
@@ -177,240 +177,240 @@ the commands executing on the remote targets.
 Signal  19  (CONT),  Signal  17 (STOP), and Signal 18 (TSTP) default to
 \ **xdsh**\ ; the \ **xdsh**\  command responds normally to these signals, but the
 signals  do  not have an effect on remotely executing commands. Other
-signals are caught by \ **xdsh**\  and have their default effects on the \ **xdsh**\ 
+signals are caught by \ **xdsh**\  and have their default effects on the \ **xdsh**\
 command; all current child processes, through propagation to remotely
 running commands, are terminated (SIGTERM).
 
 
 ***************
-\ **OPTIONS**\ 
+\ **OPTIONS**\
 ***************
 
 
 
-\ **-B | -**\ **-bypass**\ 
- 
+\ **-B | -**\ **-bypass**\
+
  Runs in bypass mode, use if the xcatd daemon is hung.
- 
 
 
-\ **-c | -**\ **-cleanup**\ 
- 
+
+\ **-c | -**\ **-cleanup**\
+
  This flag will have xdsh remove all files from the subdirectories of the
- the directory on the servicenodes, where xdcp stages the copy to the 
+ the directory on the servicenodes, where xdcp stages the copy to the
  compute nodes as defined in the site table SNsyncfiledir and nodesyncfiledir
  attribute, when the target is a service node.
- 
- It can also be used to remove the nodesyncfiledir directory on the compute 
+
+ It can also be used to remove the nodesyncfiledir directory on the compute
  nodes, which keeps the backup copies of files for the xdcp APPEND function
  support, if a compute node is the target.
- 
 
 
-\ **-e | -**\ **-execute**\ 
- 
+
+\ **-e | -**\ **-execute**\
+
  Indicates  that \ *command_list*\  specifies a local script
  filename and arguments to be executed on  the  remote  targets.
  The  script  file  is copied to the remote targets and then
  remotely   executed   with   the   given   arguments.   The
  \ **DSH_NODE_RCP**\   environment variables specify the remote copy
  command to use to copy the script file to node targets.
- 
 
 
-\ **-E | -**\ **-environment**\  \ *environment_file*\ 
- 
+
+\ **-E | -**\ **-environment**\  \ *environment_file*\
+
  Specifies that the  \ *environment_file*\   contains  environment
  variable definitions to export to the target before
  executing the  \ *command_list*\ .
- 
 
 
-\ **-**\ **-devicetype**\  \ *type_of_device*\ 
- 
+
+\ **-**\ **-devicetype**\  \ *type_of_device*\
+
  Specify a user-defined device type that references the location
  of relevant device configuration file. The devicetype value must
  correspond to a valid device configuration file.
  xCAT ships some default configuration files
- for Ethernet switches and and IB switches under 
+ for Ethernet switches and and IB switches under
  \ */opt/xcat/share/xcat/devicetype*\  directory. If you want to overwrite
- any of the configuration files, copy them to \ */var/opt/xcat/*\ 
- directory and cutomize. 
+ any of the configuration files, copy them to \ */var/opt/xcat/*\
+ directory and cutomize.
  For example, \ *base/IBSwitch/Qlogic/config*\  is the configuration
  file location if devicetype is specified as IBSwitch::Qlogic.
- xCAT will first search config file using \ */var/opt/xcat/*\  as the base. 
- If not found, it will search for it using  
+ xCAT will first search config file using \ */var/opt/xcat/*\  as the base.
+ If not found, it will search for it using
  \ */opt/xcat/share/xcat/devicetype/*\  as the base.
- 
 
 
-\ **-f | -**\ **-fanout**\  \ *fanout_value*\ 
- 
+
+\ **-f | -**\ **-fanout**\  \ *fanout_value*\
+
  Specifies a fanout value for the maximum number of  concurrently  executing  remote shell processes. Serial execution can be specified by indicating a fanout value of \ **1**\ . If  \ **-f**\  is not specified, a default fanout value of \ **64**\  is used.
- 
 
 
-\ **-h | -**\ **-help**\ 
- 
+
+\ **-h | -**\ **-help**\
+
  Displays usage information.
- 
 
 
-\ **-i | -**\ **-rootimg**\  \ *install image*\ 
- 
+
+\ **-i | -**\ **-rootimg**\  \ *install image*\
+
  For Linux, Specifies the path to the install image on the local node.
- For AIX, specifies the name of the osimage on the local node. Run lsnim 
+ For AIX, specifies the name of the osimage on the local node. Run lsnim
  for valid names.
  xdsh will chroot (xcatchroot for AIX) to this path and run the xdsh command against the
- install image.  No other xdsh flags, environment variables apply with 
- this input.  A noderange is not accepted. Only runs on the local host, 
+ install image.  No other xdsh flags, environment variables apply with
+ this input.  A noderange is not accepted. Only runs on the local host,
  normally the Management Node. The command you run must not prompt for input, the prompt will not be returned to you, and it will appear that \ **xdsh**\  hangs.
- 
-
-
-\ **-K | -**\ **-ssh-setup**\ 
 
 
 
-\ **-K | -**\ **-ssh-setup**\   \ **-l | -**\ **-user**\  \ *user_ID*\  \ **-**\ **-devicetype**\  \ *type_of_device*\ 
- 
+\ **-K | -**\ **-ssh-setup**\
+
+
+
+\ **-K | -**\ **-ssh-setup**\   \ **-l | -**\ **-user**\  \ *user_ID*\  \ **-**\ **-devicetype**\  \ *type_of_device*\
+
  Set up the SSH keys for the user running the command to the specified node list.
  The userid must have the same uid, gid and password as the userid on the node
  where the keys will be setup.
- 
+
  If the current user is root,  roots public ssh keys will be put in the
  authorized_keys\* files under roots .ssh directory on the node(s).
  If the current user is non-root, the user must be in the policy table and have credential to run the xdsh command.
  The non-root users public ssh keys and root's public ssh keys will be put in
  the authorized_keys\* files under the non-root users .ssh directory on the node(s).
  Other device types, such as IB switch, are also supported.  The
- device should be defined as a node and nodetype should be defined 
+ device should be defined as a node and nodetype should be defined
  as switch before connecting.
  The \ **xdsh -K**\  command must be run from the Management Node.
- 
 
 
-\ **-l | -**\ **-user**\  \ *user_ID*\ 
- 
+
+\ **-l | -**\ **-user**\  \ *user_ID*\
+
  Specifies a remote user name to use for remote command execution.
- 
 
 
-\ **-L | -**\ **-no-locale**\ 
- 
+
+\ **-L | -**\ **-no-locale**\
+
  Specifies to not export the locale definitions of the local
  host to the remote targets. Local host  locale  definitions
  are exported by default to each remote target.
- 
 
 
-\ **-m | -**\ **-monitor**\ 
- 
+
+\ **-m | -**\ **-monitor**\
+
  Monitors  remote  shell execution by displaying status
  messages during execution on each target.
- 
 
 
-\ **-o | -**\ **-node-options**\  \ *node_options*\ 
- 
+
+\ **-o | -**\ **-node-options**\  \ *node_options*\
+
  Specifies options to pass to the remote shell  command  for
  node  targets.  The options must be specified within double
  quotation marks ("") to distinguish them from \ **xdsh**\  options.
- 
 
 
-\ **-q | -**\ **-show-config**\ 
- 
+
+\ **-q | -**\ **-show-config**\
+
  Displays the current environment settings for all DSH
  Utilities commands. This includes the values of all environment
  variables  and  settings  for  all  currently installed and
  valid contexts. Each setting is prefixed with  \ *context*\ :  to
  identify the source context of the setting.
- 
 
 
-\ **-Q | -**\ **-silent**\ 
- 
+
+\ **-Q | -**\ **-silent**\
+
  Specifies silent mode. No target output is written to standard output or  standard  error.  Monitoring  messages are written to standard output.
- 
 
 
-\ **-r | -**\ **-node-rsh**\  \ *node_remote_shell*\ 
- 
+
+\ **-r | -**\ **-node-rsh**\  \ *node_remote_shell*\
+
  Specifies the path of the remote shell command used
  for remote command execution on node targets.
- 
 
 
-\ **-s | -**\ **-stream**\ 
- 
+
+\ **-s | -**\ **-stream**\
+
  Specifies that output is returned as it  becomes  available
- from  each  target, instead of waiting for the \ *command_list*\ 
+ from  each  target, instead of waiting for the \ *command_list*\
  to be completed on a target before returning output.
- 
+
 
 
 \ **-S | -**\ **-syntax**\  {\ **csh | ksh**\ }
- 
+
  Specifies the shell syntax to be used on the remote target.
  If not specified, the \ **ksh**\  syntax is used.
- 
 
 
-\ **-**\ **-sudo**\ 
- 
+
+\ **-**\ **-sudo**\
+
  Adding the \ **-**\ **-sudo**\  flag to the xdsh command will have xdsh run sudo before
  running the command.  This is particular useful when using the \ **-e**\  option.
  This is required when you input \ **-l**\  with a non-root user id and want that id
- to be able to run as root on the node.  The non-root userid will must be 
+ to be able to run as root on the node.  The non-root userid will must be
  previously defined as an xCAT user, see process for defining non-root ids in
- xCAT and setting up for using xdsh.  The userid sudo setup will have 
+ xCAT and setting up for using xdsh.  The userid sudo setup will have
  to be done by the admin on the node.  This includes, allowing all commands that
  you would like to run with xdsh by using visudo to edit the /etc/sudoers file.
- You must disabl ssh tty requirements by commenting out or removing this line in the /etc/sudoes file "#Defaults    requiretty". 
+ You must disabl ssh tty requirements by commenting out or removing this line in the /etc/sudoes file "#Defaults    requiretty".
  See the document Granting_Users_xCAT_privileges for sudo setup requirements.
  This is not supported in a hierarical cluster, that is the nodes are serviced by servicenodes.
- 
 
 
-\ **-t | -**\ **-timeout**\  \ *timeout*\ 
- 
+
+\ **-t | -**\ **-timeout**\  \ *timeout*\
+
  Specifies the time, in seconds, to wait for output from any
  currently executing remote targets. If no output is
- available  from  any  target in the specified \ *timeout*\ , \ **xdsh**\ 
+ available  from  any  target in the specified \ *timeout*\ , \ **xdsh**\
  displays an error and terminates execution for the remote
  targets  that  failed to respond. If \ *timeout*\  is not specified,
  \ **xdsh**\  waits indefinitely to continue processing output  from
- all  remote  targets. The exception is the \ **-K**\  flag which defaults 
+ all  remote  targets. The exception is the \ **-K**\  flag which defaults
  to 10 seconds.
- 
 
 
-\ **-T | -**\ **-trace**\ 
- 
+
+\ **-T | -**\ **-trace**\
+
  Enables trace mode. The \ **xdsh**\  command prints diagnostic
  messages to standard output during execution to each target.
- 
 
 
-\ **-v | -**\ **-verify**\ 
- 
+
+\ **-v | -**\ **-verify**\
+
  Verifies each target before executing any  remote  commands
  on  the target. If a target is not responding, execution of
  remote commands for the target is canceled. When  specified
  with the \ **-i**\  flag, the user is prompted to retry the
  verification request.
- 
 
 
-\ **-V | -**\ **-version**\ 
- 
+
+\ **-V | -**\ **-version**\
+
  Displays the \ **xdsh**\  command version information.
- 
 
 
-\ **-X**\  \ *env_list*\ 
- 
+
+\ **-X**\  \ *env_list*\
+
  Ignore \ **xdsh**\  environment variables. This option can take  an
  argument  which  is  a  comma separated list of environment
  variable names that should \ **NOT**\  be ignored. If there  is  no
@@ -419,16 +419,16 @@ running commands, are terminated (SIGTERM).
  This option is useful when running \ **xdsh**\  from within other
  scripts when you don't want the user's environment affecting
  the behavior of xdsh.
- 
 
 
-\ **-z | -**\ **-exit-status**\ 
- 
+
+\ **-z | -**\ **-exit-status**\
+
  Displays the exit status for  the  last  remotely  executed
  non-asynchronous  command  on  each  target. If the command
  issued on the remote node is run  in  the  background,  the
  exit status is not displayed.
- 
+
  Exit  values  for  each remote shell execution are displayed in
  messages from the \ **xdsh**\  command, if the remote  shell  exit  values  are
  non-zero.  A non-zero return code from a remote shell indicates that
@@ -436,7 +436,7 @@ running commands, are terminated (SIGTERM).
  unrelated  to  the  exit  code  of the remotely issued command. If a
  remote shell encounters an error, execution of the remote command on
  that target is bypassed.
- 
+
  The  \ **xdsh**\   command  exit  code  is \ **0**\  if the command executed without
  errors and all remote shell commands finished with exit codes of  \ **0**\ .
  If  internal  \ **xdsh**\   errors occur or the remote shell commands do not
@@ -445,101 +445,101 @@ running commands, are terminated (SIGTERM).
  an unsuccessful remote command execution.  If  the  remotely  issued
  command  is  run  in  the  background, the exit code of the remotely
  issued command is \ **0**\ .
- 
+
 
 
 
 *************************************
-\ **Environment**\  \ **Variables**\ 
+\ **Environment**\  \ **Variables**\
 *************************************
 
 
 
-\ **DEVICETYPE**\ 
- 
+\ **DEVICETYPE**\
+
  Specify a user-defined device type.  See \ **-**\ **-devicetype**\  flag.
- 
 
 
-\ **DSH_ENVIRONMENT**\ 
- 
+
+\ **DSH_ENVIRONMENT**\
+
  Specifies a file that contains environment variable
  definitions to export to the target before executing  the  remote
  command. This variable is overridden by the \ **-E**\  flag.
- 
 
 
-\ **DSH_FANOUT**\ 
- 
+
+\ **DSH_FANOUT**\
+
  Specifies  the fanout value. This variable is overridden by
  the \ **-f**\  flag.
- 
 
 
-\ **DSH_NODE_OPTS**\ 
- 
+
+\ **DSH_NODE_OPTS**\
+
  Specifies the options to use for the remote  shell  command
  with  node targets only. This variable is overridden by the
  \ **-o**\  flag.
- 
 
 
-\ **DSH_NODE_RCP**\ 
- 
+
+\ **DSH_NODE_RCP**\
+
  Specifies the full path of the remote copy command  to  use
  to  copy  local scripts and local environment configuration
  files to node targets.
- 
 
 
-\ **DSH_NODE_RSH**\ 
- 
+
+\ **DSH_NODE_RSH**\
+
  Specifies the full path of the  remote  shell  to  use  for
  remote  command execution on node targets. This variable is
  overridden by the \ **-r**\  flag.
- 
 
 
-\ **DSH_PATH**\ 
- 
+
+\ **DSH_PATH**\
+
  Sets the command path to use on the targets. If \ **DSH_PATH**\  is
  not set, the default path defined in  the  profile  of  the
  remote \ *user_ID*\  is used.
- 
 
 
-\ **DSH_REMOTE_PASSWORD**\ 
- 
+
+\ **DSH_REMOTE_PASSWORD**\
+
  If \ **DSH_REMOTE_PASSWORD**\  is set to the password of the
  userid (usually root) that will ssh to the node, then when
  you use the \ **-K**\  flag, you will not be prompted for a password.
- 
 
 
-\ **DSH_SYNTAX**\ 
- 
+
+\ **DSH_SYNTAX**\
+
  Specifies the shell syntax to use on remote targets; \ **ksh**\  or
  \ **csh**\ . If not specified, the  \ **ksh**\   syntax is assumed.  This
  variable is overridden by the \ **-S**\  flag.
- 
 
 
-\ **DSH_TIMEOUT**\ 
- 
+
+\ **DSH_TIMEOUT**\
+
  Specifies the time, in seconds, to wait for output from
  each remote target. This variable is overridden by the \ **-t**\  flag.
- 
 
 
-\ **DSH_VERIFY**\ 
- 
+
+\ **DSH_VERIFY**\
+
  Verifies each target before executing any remote commands on the target. If a target is not responding, execution of remote commands for the target is canceled. This variable is overridden by the \ **-v**\  flag.
- 
+
 
 
 
 **********************************
-\ **Compatibility with AIX dsh**\ 
+\ **Compatibility with AIX dsh**\
 **********************************
 
 
@@ -550,7 +550,7 @@ xCAT database that can be used by \ **dsh**\ . See \ **man groupfiles4dsh**\ .
 
 
 ****************
-\ **SECURITY**\ 
+\ **SECURITY**\
 ****************
 
 
@@ -568,7 +568,7 @@ userdefined.
 
 
 *******************
-\ **EXIT STATUS**\ 
+\ **EXIT STATUS**\
 *******************
 
 
@@ -576,178 +576,178 @@ The \ **xdsh**\  command exit code is 0 if the command executed without errors a
 
 
 ****************
-\ **EXAMPLES**\ 
+\ **EXAMPLES**\
 ****************
 
 
 
 1. To set up the SSH keys for root on node1, run as root:
- 
- 
+
+
  .. code-block:: perl
- 
+
    xdsh node1 -K
- 
- 
+
+
 
 
 2. To run the \ **ps -ef**\  command on node targets \ **node1**\  and \ **node2**\ , enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    xdsh node1,node2 "ps -ef"
- 
- 
+
+
 
 
 3. To run the \ **ps**\  command on node targets \ **node1**\  and run the remote command with the -v and -t flag, enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    xdsh node1,node2  -o "-v -t" ps
- 
- 
 
 
-4. To execute the commands contained in \ **myfile**\  in the \ **XCAT**\ 
+
+
+4. To execute the commands contained in \ **myfile**\  in the \ **XCAT**\
 context on several node targets, with a fanout of \ **1**\ , enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    xdsh node1,node2 -f 1 -e myfile
- 
- 
+
+
 
 
 5. To run the ps command on node1 and ignore all the dsh
 environment variable except the DSH_NODE_OPTS, enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    xdsh node1 -X `DSH_NODE_OPTS' ps
- 
- 
 
 
-6. To run on Linux, the xdsh command "rpm -qa | grep xCAT" 
+
+
+6. To run on Linux, the xdsh command "rpm -qa | grep xCAT"
 on the service node fedora9 diskless image, enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    xdsh -i /install/netboot/fedora9/x86_64/service/rootimg "rpm -qa | grep xCAT"
- 
- 
+
+
 
 
 7. To run on AIX, the xdsh command "lslpp -l | grep bos" on the NIM 611dskls spot, enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    xdsh -i 611dskls "/usr/bin/lslpp -l | grep bos"
- 
- 
+
+
 
 
 8. To cleanup the servicenode directory that stages the copy of files to the nodes, enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    xdsh servicenoderange -c
- 
- 
+
+
 
 
 9.
- 
- To define the QLogic IB switch as a node and to set up the SSH keys for IB switch 
+
+ To define the QLogic IB switch as a node and to set up the SSH keys for IB switch
  \ **qswitch**\  with device configuration file
  \ **/var/opt/xcat/IBSwitch/Qlogic/config**\  and user name \ **username**\ , enter
- 
- 
+
+
  .. code-block:: perl
- 
+
    chdef -t node -o qswitch groups=all nodetype=switch
-  
+
    xdsh qswitch -K -l username --devicetype IBSwitch::Qlogic
- 
- 
+
+
 
 
 10. To define the Management Node  in the database so you can use \ **xdsh**\ , enter
- 
- 
+
+
  .. code-block:: perl
- 
+
    xcatconfig -m
- 
- 
 
 
-11. To define the Mellanox switch as a node and run a command to show the ssh keys. 
+
+
+11. To define the Mellanox switch as a node and run a command to show the ssh keys.
 \ **mswitch**\  with and user name \ **username**\ , enter
- 
- 
+
+
  .. code-block:: perl
- 
+
    chdef -t node -o mswitch groups=all nodetype=switch
-  
+
    xdsh mswitch -l admin --devicetype IBSwitch::Mellanox  'enable;configure terminal;show ssh server host-keys'
- 
- 
+
+
 
 
 12.
- 
+
  To define a BNT Ethernet switch as a node and run a command to create a new vlan with vlan id 3 on the switch.
- 
- 
+
+
  .. code-block:: perl
- 
+
    chdef myswitch groups=all
-  
+
    tabch switch=myswitch switches.sshusername=admin switches.sshpassword=passw0rd switches.protocol=[ssh|telnet]
- 
- 
+
+
  where \ *admin*\  and \ *passw0rd*\  are the SSH user name and password for the switch.
- 
+
  If it is for Telnet, add \ *tn:*\  in front of the user name: \ *tn:admin*\ .
- 
- 
+
+
  .. code-block:: perl
- 
+
    dsh myswitch --devicetype EthSwitch::BNT 'enable;configure terminal;vlan 3;end;show vlan'
- 
- 
+
+
 
 
 13.
- 
+
  To run \ **xdsh**\  with the non-root userid "user1" that has been setup as an xCAT userid and with sudo on node1 and node2 to run as root, do the following, see xCAT doc on Granting_Users_xCAT_privileges:
- 
- 
+
+
  .. code-block:: perl
- 
+
    xdsh node1,node2 --sudo -l user1 "cat /etc/passwd"
- 
- 
+
+
 
 
 
 *************
-\ **Files**\ 
+\ **Files**\
 *************
 
 
 
 ****************
-\ **SEE ALSO**\ 
+\ **SEE ALSO**\
 ****************
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/xdshbak.1.rst b/docs/source/guides/admin-guides/references/man1/xdshbak.1.rst
index aa9e3a74e..3ebac0d2d 100644
--- a/docs/source/guides/admin-guides/references/man1/xdshbak.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/xdshbak.1.rst
@@ -15,7 +15,7 @@ NAME
 
 
 ****************
-\ **SYNOPSIS**\ 
+\ **SYNOPSIS**\
 ****************
 
 
@@ -27,7 +27,7 @@ DESCRIPTION
 ***********
 
 
-The  \ **xdshbak**\   command formats output from the \ **xdsh**\  command. The \ **xdshbak**\ 
+The  \ **xdshbak**\   command formats output from the \ **xdsh**\  command. The \ **xdshbak**\
 command takes, as input, lines in the following format:
 
 
@@ -73,7 +73,7 @@ When output is displayed from more than one node in collapsed form, the
 host  names are displayed alphabetically. When output is not collapsed,
 output is displayed sorted alphabetically by host name.
 
-If the \ **-q**\  quiet flag is not set then  \ **xdshbak**\ 
+If the \ **-q**\  quiet flag is not set then  \ **xdshbak**\
 command writes "." for each 1000 lines of output processed (to show progress),
 since it won't display the output until it has processed all of it.
 
@@ -112,87 +112,87 @@ OPTIONS
 
 
 
-\ **-b**\ 
- 
+\ **-b**\
+
  Strip the host prefix from the beginning of the lines. This only
  works with the \ **-x**\  option.
- 
 
 
-\ **-c**\ 
- 
+
+\ **-c**\
+
  If the output from multiple nodes is identical it will be collapsed
  and displayed only once.
- 
 
 
-\ **-x**\ 
- 
+
+\ **-x**\
+
  Omit the extra header lines that xdshbak normally displays for
  each node.  This provides
  more  compact  output,  but  xdshbak still sorts the output by
  node name for easier viewing.
  This option should not be used with \ **-c**\ .
- 
 
 
-\ **-h**\ 
- 
+
+\ **-h**\
+
  Displays usage information.
- 
 
 
-\ **-q**\ 
- 
+
+\ **-q**\
+
  Quiet mode, do not display "." for each 1000 lines of output.
- 
+
 
 
 
 ****************
-\ **EXAMPLES**\ 
+\ **EXAMPLES**\
 ****************
 
 
 
 1. To  display the results of a command issued on several nodes, in
 the format used in the Description, enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    xdsh node1,node2,node3 cat /etc/passwd | xdshbak
- 
- 
+
+
 
 
 2.
- 
+
  To display the results of a command issued on several nodes with
  identical output displayed only once, enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    xdsh host1,host2,host3 pwd | xdshbak -c
- 
- 
+
+
 
 
 3. To display the results of a command issued on several nodes with
 compact output and be sorted alphabetically by host name, enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    xdsh host1,host2,host3 date | xdshbak -x
- 
- 
+
+
 
 
 
 ****************
-\ **SEE ALSO**\ 
+\ **SEE ALSO**\
 ****************
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/xdshcoll.1.rst b/docs/source/guides/admin-guides/references/man1/xdshcoll.1.rst
index 0e1b13487..d70cfe2a8 100644
--- a/docs/source/guides/admin-guides/references/man1/xdshcoll.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/xdshcoll.1.rst
@@ -7,7 +7,7 @@ xdshcoll.1
 
 
 ************
-\ **NAME**\ 
+\ **NAME**\
 ************
 
 
@@ -15,19 +15,19 @@ xdshcoll.1
 
 
 ****************
-\ **SYNOPSIS**\ 
+\ **SYNOPSIS**\
 ****************
 
 
-\ **xdshcoll**\ 
+\ **xdshcoll**\
 
 
 *******************
-\ **DESCRIPTION**\ 
+\ **DESCRIPTION**\
 *******************
 
 
-The  \ **xdshcoll**\  command formats and consolidates output from the \ **xdsh,sinv**\  command. The \ **xdshcoll**\ 
+The  \ **xdshcoll**\  command formats and consolidates output from the \ **xdsh,sinv**\  command. The \ **xdshcoll**\
 command takes, as input, lines in the following format:
 
 host_name: line of output from remote command
@@ -47,7 +47,7 @@ is identical:
   lines from xdsh for node1 with hostnames stripped off
   .
   .
- 
+
   ====================================
   node2
   ====================================
@@ -56,7 +56,7 @@ is identical:
   lines from xdsh for node2 with hostnames stripped off
   .
   .
- 
+
   ====================================
   node3, node4
   ====================================
@@ -69,25 +69,25 @@ is identical:
 
 
 ****************
-\ **EXAMPLES**\ 
+\ **EXAMPLES**\
 ****************
 
 
 
 1. To  display the results of a command issued on several nodes, in
 the format used in the Description, enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    xdsh node1,node2,node3 cat /etc/passwd> | B<xdshcoll
- 
- 
+
+
 
 
 
 ****************
-\ **SEE ALSO**\ 
+\ **SEE ALSO**\
 ****************
 
 
diff --git a/docs/source/guides/admin-guides/references/man3/noderange.3.rst b/docs/source/guides/admin-guides/references/man3/noderange.3.rst
index e2a2180ce..4e2a1b268 100644
--- a/docs/source/guides/admin-guides/references/man3/noderange.3.rst
+++ b/docs/source/guides/admin-guides/references/man3/noderange.3.rst
@@ -15,43 +15,43 @@ Name
 
 
 ****************
-\ **Synopsis**\ 
+\ **Synopsis**\
 ****************
 
 
-\ *Examples:*\ 
+\ *Examples:*\
 
 
 .. code-block:: perl
 
   node1,node2,node8,node20,group1
- 
+
   node14-node56,node70-node203,group1-group10
- 
+
   node1,node2,node8,node20,node14-node56,node70-node203
- 
+
   node[14-56]
- 
+
   f[1-3]n[1-20]
- 
+
   all,-node129-node256,-frame01-frame03
- 
+
   /node.*
- 
+
   ^/tmp/nodes
- 
+
   node10+5
- 
+
   10-15,-13
- 
+
   group1@group2
- 
+
   table.attribute<operator>value
 
 
 
 *******************
-\ **Description**\ 
+\ **Description**\
 *******************
 
 
@@ -180,7 +180,7 @@ no group range match will be attempted.
 All node and group names are validated against the nodelist table.  Invalid names
 are ignored and return nothing.
 
-\ **xCAT Node Name Format**\ 
+\ **xCAT Node Name Format**\
 =============================
 
 
@@ -237,134 +237,134 @@ Example of \ **xCAT Node Name Format**\  node/group names:
 
 
 ****************
-\ **Examples**\ 
+\ **Examples**\
 ****************
 
 
 
 1.
- 
+
  Generates a list of all nodes (assuming all is a group) listed in the
  \ **nodelist**\  table less node5 through node10:
- 
- 
+
+
  .. code-block:: perl
- 
+
    all,-node5-node10
- 
- 
+
+
 
 
 2.
- 
+
  Generates  a  list  of  nodes 1 through 10 less nodes 3,4,5.  Note that
  node4 is listed twice, first in the range and then at the end.  Because
  exclusion has precedence node4 will be excluded.
- 
- 
+
+
  .. code-block:: perl
- 
+
    node1-node10,-node3-node5,node4
- 
- 
+
+
 
 
 3.
- 
+
  Generates a list of nodes 1 through 10 less nodes 3 and 5.
- 
- 
+
+
  .. code-block:: perl
- 
+
    node1-node10,-node3,-node5
- 
- 
+
+
 
 
 4.
- 
+
  Generates  a  list  of  all  (assuming  \`all'  is a group) nodes in the
  \ **nodelist**\  table less 17 through 32.
- 
- 
+
+
  .. code-block:: perl
- 
+
    -node17-node32,all
- 
- 
+
+
 
 
 5.
- 
+
  Generates a list of nodes 1 through 128, and user nodes 1 through 4.
- 
- 
+
+
  .. code-block:: perl
- 
+
    node1-node128,user1-user4
- 
- 
+
+
 
 
 6.
- 
+
  Generates a list of all nodes (assuming \`all' is a group),  less  nodes
  in  groups rack1 through rack3 (assuming groups rack1, rack2, and rack3
  are defined), less nodes 100 through 200, less  nodes  in  the  storage
  group.  Note that node150 is listed but is excluded.
- 
- 
+
+
  .. code-block:: perl
- 
+
    all,-rack1-rack3,-node100-node200,node150,-storage
- 
- 
+
+
 
 
 7.
- 
+
  Generates  a  list of nodes matching the regex \ *node[23].\\**\ .  That is all
  nodes that start with node2 or node3 and end in  anything  or  nothing.
  E.g. node2, node3, node20, node30, node21234 all match.
- 
- 
+
+
  .. code-block:: perl
- 
+
    /node[23].*
- 
- 
+
+
 
 
 8.
- 
- Generates  a  list of nodes which have the value hmc in the nodehm.cons 
+
+ Generates  a  list of nodes which have the value hmc in the nodehm.cons
  attribute.
- 
- 
+
+
  .. code-block:: perl
- 
+
    nodehm.cons==hmc
-  
+
    nodehm.cons=~hmc
- 
- 
+
+
 
 
 9.
- 
+
  Generate a list of nodes in the 1st two frames:
- 
- 
+
+
  .. code-block:: perl
- 
+
    f[1-2]n[1-42]
- 
- 
+
+
 
 
 
 ************
-\ **Bugs**\ 
+\ **Bugs**\
 ************
 
 
@@ -374,7 +374,7 @@ and \`~' may have to be escaped from the shell.
 
 
 ****************
-\ **SEE ALSO**\ 
+\ **SEE ALSO**\
 ****************
 
 
diff --git a/docs/source/guides/admin-guides/references/man5/auditlog.5.rst b/docs/source/guides/admin-guides/references/man5/auditlog.5.rst
index a89b681aa..b16ed7ad6 100644
--- a/docs/source/guides/admin-guides/references/man5/auditlog.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/auditlog.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **auditlog Attributes:**\   \ *recid*\ , \ *audittime*\ , \ *userid*\ , \ *clientname*\ , \ *clienttype*\ , \ *command*\ , \ *noderange*\ , \ *args*\ , \ *status*\ , \ *comments*\ , \ *disable*\ 
+\ **auditlog Attributes:**\   \ *recid*\ , \ *audittime*\ , \ *userid*\ , \ *clientname*\ , \ *clienttype*\ , \ *command*\ , \ *noderange*\ , \ *args*\ , \ *status*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,70 +36,70 @@ auditlog Attributes:
 
 
 
-\ **recid**\ 
- 
+\ **recid**\
+
  The record id.
- 
 
 
-\ **audittime**\ 
- 
+
+\ **audittime**\
+
  The timestamp for the audit entry.
- 
 
 
-\ **userid**\ 
- 
+
+\ **userid**\
+
  The user running the command.
- 
 
 
-\ **clientname**\ 
- 
+
+\ **clientname**\
+
  The client machine, where the command originated.
- 
 
 
-\ **clienttype**\ 
- 
+
+\ **clienttype**\
+
  Type of command: cli, java, webui, other.
- 
 
 
-\ **command**\ 
- 
+
+\ **command**\
+
  Command executed. See auditskipcmds site table attribute to control which commands get logged.
- 
 
 
-\ **noderange**\ 
- 
+
+\ **noderange**\
+
  The noderange on which the command was run.
- 
 
 
-\ **args**\ 
- 
+
+\ **args**\
+
  The command argument list.
- 
 
 
-\ **status**\ 
- 
+
+\ **status**\
+
  Allowed or Denied.
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-provided notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Do not use.  tabprune will not work if set to yes or 1
- 
+
 
 
 
@@ -108,5 +108,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/bootparams.5.rst b/docs/source/guides/admin-guides/references/man5/bootparams.5.rst
index 13f261616..f984191a8 100644
--- a/docs/source/guides/admin-guides/references/man5/bootparams.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/bootparams.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **bootparams Attributes:**\   \ *node*\ , \ *kernel*\ , \ *initrd*\ , \ *kcmdline*\ , \ *addkcmdline*\ , \ *dhcpstatements*\ , \ *adddhcpstatements*\ , \ *comments*\ , \ *disable*\ 
+\ **bootparams Attributes:**\   \ *node*\ , \ *kernel*\ , \ *initrd*\ , \ *kcmdline*\ , \ *addkcmdline*\ , \ *dhcpstatements*\ , \ *adddhcpstatements*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,58 +36,58 @@ bootparams Attributes:
 
 
 
-\ **node**\ 
- 
+\ **node**\
+
  The node or group name
- 
 
 
-\ **kernel**\ 
- 
+
+\ **kernel**\
+
  The kernel that network boot actions should currently acquire and use.  Note this could be a chained boot loader such as memdisk or a non-linux boot loader
- 
 
 
-\ **initrd**\ 
- 
+
+\ **initrd**\
+
  The initial ramdisk image that network boot actions should use (could be a DOS floppy or hard drive image if using memdisk as kernel)
- 
 
 
-\ **kcmdline**\ 
- 
+
+\ **kcmdline**\
+
  Arguments to be passed to the kernel
- 
 
 
-\ **addkcmdline**\ 
- 
+
+\ **addkcmdline**\
+
  User specified kernel options for os provision process(no prefix) or the provisioned os(with prefix "R::"). The options should be delimited with spaces(" ")
- 
 
 
-\ **dhcpstatements**\ 
- 
+
+\ **dhcpstatements**\
+
  xCAT manipulated custom dhcp statements (not intended for user manipulation)
- 
 
 
-\ **adddhcpstatements**\ 
- 
+
+\ **adddhcpstatements**\
+
  Custom dhcp statements for administrator use (not implemneted yet)
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-written notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -96,5 +96,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/boottarget.5.rst b/docs/source/guides/admin-guides/references/man5/boottarget.5.rst
index ff34f5b4a..b93468c43 100644
--- a/docs/source/guides/admin-guides/references/man5/boottarget.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/boottarget.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **boottarget Attributes:**\   \ *bprofile*\ , \ *kernel*\ , \ *initrd*\ , \ *kcmdline*\ , \ *comments*\ , \ *disable*\ 
+\ **boottarget Attributes:**\   \ *bprofile*\ , \ *kernel*\ , \ *initrd*\ , \ *kcmdline*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,40 +36,40 @@ boottarget Attributes:
 
 
 
-\ **bprofile**\ 
- 
+\ **bprofile**\
+
  All nodes with a nodetype.profile value equal to this value and nodetype.os set to "boottarget", will use the associated kernel, initrd, and kcmdline.
- 
 
 
-\ **kernel**\ 
- 
+
+\ **kernel**\
+
  The kernel that network boot actions should currently acquire and use.  Note this could be a chained boot loader such as memdisk or a non-linux boot loader
- 
 
 
-\ **initrd**\ 
- 
+
+\ **initrd**\
+
  The initial ramdisk image that network boot actions should use (could be a DOS floppy or hard drive image if using memdisk as kernel)
- 
 
 
-\ **kcmdline**\ 
- 
+
+\ **kcmdline**\
+
  Arguments to be passed to the kernel
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-written notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -78,5 +78,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/cfgmgt.5.rst b/docs/source/guides/admin-guides/references/man5/cfgmgt.5.rst
index 58d9c3f7a..b659a1ac4 100644
--- a/docs/source/guides/admin-guides/references/man5/cfgmgt.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/cfgmgt.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **cfgmgt Attributes:**\   \ *node*\ , \ *cfgmgr*\ , \ *cfgserver*\ , \ *roles*\ , \ *comments*\ , \ *disable*\ 
+\ **cfgmgt Attributes:**\   \ *node*\ , \ *cfgmgr*\ , \ *cfgserver*\ , \ *roles*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,40 +36,40 @@ cfgmgt Attributes:
 
 
 
-\ **node**\ 
- 
+\ **node**\
+
  The node being managed by the cfgmgr service
- 
 
 
-\ **cfgmgr**\ 
- 
+
+\ **cfgmgr**\
+
  The name of the configuration manager service.  Currently 'chef' and 'puppet' are supported services.
- 
 
 
-\ **cfgserver**\ 
- 
+
+\ **cfgserver**\
+
  The xCAT node name of the chef server or puppet master
- 
 
 
-\ **roles**\ 
- 
+
+\ **roles**\
+
  The roles associated with this node as recognized by the cfgmgr for the software that is to be installed and configured.  These role names map to chef recipes or puppet manifest classes that should be used for this node.  For example, chef OpenStack cookbooks have roles such as mysql-master,keystone, glance, nova-controller, nova-conductor, cinder-all.
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-written notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -78,5 +78,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/chain.5.rst b/docs/source/guides/admin-guides/references/man5/chain.5.rst
index 37ac50f22..dd2e5b869 100644
--- a/docs/source/guides/admin-guides/references/man5/chain.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/chain.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **chain Attributes:**\   \ *node*\ , \ *currstate*\ , \ *currchain*\ , \ *chain*\ , \ *ondiscover*\ , \ *comments*\ , \ *disable*\ 
+\ **chain Attributes:**\   \ *node*\ , \ *currstate*\ , \ *currchain*\ , \ *chain*\ , \ *ondiscover*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,46 +36,46 @@ chain Attributes:
 
 
 
-\ **node**\ 
- 
+\ **node**\
+
  The node name or group name.
- 
 
 
-\ **currstate**\ 
- 
+
+\ **currstate**\
+
  The current or next chain step to be executed on this node by xCAT-genesis.  Set by xCAT during node discovery or as a result of nodeset.
- 
 
 
-\ **currchain**\ 
- 
+
+\ **currchain**\
+
  The chain steps still left to do for this node.  This attribute will be automatically adjusted by xCAT while xCAT-genesis is running on the node (either during node discovery or a special operation like firmware update).  During node discovery, this attribute is initialized from the chain attribute and updated as the chain steps are executed.
- 
 
 
-\ **chain**\ 
- 
+
+\ **chain**\
+
  A comma-delimited chain of actions to be performed automatically when this node is discovered for the first time.  (xCAT and the DHCP server do not recognize the MAC address of the node when xCAT initializes the discovery process.)  The last step in this process is to run the operations listed in the chain attribute, one by one.  Valid values:  boot, runcmd=<cmd>, runimage=<URL>, shell, standby. For example, to have the genesis kernel pause to the shell, use chain=shell.
- 
 
 
-\ **ondiscover**\ 
- 
+
+\ **ondiscover**\
+
  This attribute is currently not used by xCAT.  The "nodediscover" operation is always done during node discovery.
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-written notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -84,5 +84,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/deps.5.rst b/docs/source/guides/admin-guides/references/man5/deps.5.rst
index 1da97c43c..7058824d6 100644
--- a/docs/source/guides/admin-guides/references/man5/deps.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/deps.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **deps Attributes:**\   \ *node*\ , \ *nodedep*\ , \ *msdelay*\ , \ *cmd*\ , \ *comments*\ , \ *disable*\ 
+\ **deps Attributes:**\   \ *node*\ , \ *nodedep*\ , \ *msdelay*\ , \ *cmd*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,40 +36,40 @@ deps Attributes:
 
 
 
-\ **node**\ 
- 
+\ **node**\
+
  The node name or group name.
- 
 
 
-\ **nodedep**\ 
- 
+
+\ **nodedep**\
+
  Comma-separated list of nodes or node groups it is dependent on.
- 
 
 
-\ **msdelay**\ 
- 
+
+\ **msdelay**\
+
  How long to wait between operating on the dependent nodes and the primary nodes.
- 
 
 
-\ **cmd**\ 
- 
+
+\ **cmd**\
+
  Comma-separated list of which operation this dependency applies to.
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-written notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -78,5 +78,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/discoverydata.5.rst b/docs/source/guides/admin-guides/references/man5/discoverydata.5.rst
index b187e5b5f..014c3c685 100644
--- a/docs/source/guides/admin-guides/references/man5/discoverydata.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/discoverydata.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **discoverydata Attributes:**\   \ *uuid*\ , \ *node*\ , \ *method*\ , \ *discoverytime*\ , \ *arch*\ , \ *cpucount*\ , \ *cputype*\ , \ *memory*\ , \ *mtm*\ , \ *serial*\ , \ *nicdriver*\ , \ *nicipv4*\ , \ *nichwaddr*\ , \ *nicpci*\ , \ *nicloc*\ , \ *niconboard*\ , \ *nicfirm*\ , \ *switchname*\ , \ *switchaddr*\ , \ *switchdesc*\ , \ *switchport*\ , \ *otherdata*\ , \ *comments*\ , \ *disable*\ 
+\ **discoverydata Attributes:**\   \ *uuid*\ , \ *node*\ , \ *method*\ , \ *discoverytime*\ , \ *arch*\ , \ *cpucount*\ , \ *cputype*\ , \ *memory*\ , \ *mtm*\ , \ *serial*\ , \ *nicdriver*\ , \ *nicipv4*\ , \ *nichwaddr*\ , \ *nicpci*\ , \ *nicloc*\ , \ *niconboard*\ , \ *nicfirm*\ , \ *switchname*\ , \ *switchaddr*\ , \ *switchdesc*\ , \ *switchport*\ , \ *otherdata*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,148 +36,148 @@ discoverydata Attributes:
 
 
 
-\ **uuid**\ 
- 
+\ **uuid**\
+
  The uuid of the node which send out the discovery request.
- 
 
 
-\ **node**\ 
- 
+
+\ **node**\
+
  The node name which assigned to the discovered node.
- 
 
 
-\ **method**\ 
- 
+
+\ **method**\
+
  The method which handled the discovery request. The method could be one of: switch, blade, profile, sequential.
- 
 
 
-\ **discoverytime**\ 
- 
+
+\ **discoverytime**\
+
  The last time that xCAT received the discovery message.
- 
 
 
-\ **arch**\ 
- 
+
+\ **arch**\
+
  The architecture of the discovered node. e.g. x86_64.
- 
 
 
-\ **cpucount**\ 
- 
+
+\ **cpucount**\
+
  The number of cores multiply by threads core supported for the discovered node. e.g. 192.
- 
 
 
-\ **cputype**\ 
- 
+
+\ **cputype**\
+
  The cpu type of the discovered node. e.g. Intel(R) Xeon(R) CPU E5-2690 0 @ 2.90GHz
- 
 
 
-\ **memory**\ 
- 
+
+\ **memory**\
+
  The memory size of the discovered node. e.g. 198460852
- 
 
 
-\ **mtm**\ 
- 
+
+\ **mtm**\
+
  The machine type model of the discovered node. e.g. 786310X
- 
 
 
-\ **serial**\ 
- 
+
+\ **serial**\
+
  The serial number of the discovered node. e.g. 1052EFB
- 
 
 
-\ **nicdriver**\ 
- 
+
+\ **nicdriver**\
+
  The driver of the nic. The value should be comma separated <nic name!driver name>. e.g. eth0!be2net,eth1!be2net
- 
 
 
-\ **nicipv4**\ 
- 
+
+\ **nicipv4**\
+
  The ipv4 address of the nic. The value should be comma separated <nic name!ipv4 address>. e.g. eth0!10.0.0.212/8
- 
 
 
-\ **nichwaddr**\ 
- 
+
+\ **nichwaddr**\
+
  The hardware address of the nic. The should will be comma separated <nic name!hardware address>. e.g. eth0!34:40:B5:BE:DB:B0,eth1!34:40:B5:BE:DB:B4
- 
 
 
-\ **nicpci**\ 
- 
+
+\ **nicpci**\
+
  The pic device of the nic. The value should be comma separated <nic name!pci device>. e.g. eth0!0000:0c:00.0,eth1!0000:0c:00.1
- 
 
 
-\ **nicloc**\ 
- 
+
+\ **nicloc**\
+
  The location of the nic. The value should be comma separated <nic name!nic location>. e.g. eth0!Onboard Ethernet 1,eth1!Onboard Ethernet 2
- 
 
 
-\ **niconboard**\ 
- 
+
+\ **niconboard**\
+
  The onboard info of the nic. The value should be comma separated <nic name!onboard info>. e.g. eth0!1,eth1!2
- 
 
 
-\ **nicfirm**\ 
- 
+
+\ **nicfirm**\
+
  The firmware description of the nic. The value should be comma separated <nic name!fimware description>. e.g. eth0!ServerEngines BE3 Controller,eth1!ServerEngines BE3 Controller
- 
 
 
-\ **switchname**\ 
- 
+
+\ **switchname**\
+
  The switch name which the nic connected to. The value should be comma separated <nic name!switch name>. e.g. eth0!c909f06sw01
- 
 
 
-\ **switchaddr**\ 
- 
+
+\ **switchaddr**\
+
  The address of the switch which the nic connected to. The value should be comma separated <nic name!switch address>. e.g. eth0!192.168.70.120
- 
 
 
-\ **switchdesc**\ 
- 
+
+\ **switchdesc**\
+
  The description of the switch which the nic connected to. The value should be comma separated <nic name!switch description>. e.g. eth0!IBM Flex System Fabric EN4093 10Gb Scalable Switch, flash image: version 7.2.6, boot image: version 7.2.6
- 
 
 
-\ **switchport**\ 
- 
+
+\ **switchport**\
+
  The port of the switch that the nic connected to. The value should be comma separated <nic name!switch port>. e.g. eth0!INTA2
- 
 
 
-\ **otherdata**\ 
- 
+
+\ **otherdata**\
+
  The left data which is not parsed to specific attributes (The complete message comes from genesis)
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-written notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -186,5 +186,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/domain.5.rst b/docs/source/guides/admin-guides/references/man5/domain.5.rst
index 73cc78ebb..724d6d4da 100644
--- a/docs/source/guides/admin-guides/references/man5/domain.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/domain.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **domain Attributes:**\   \ *node*\ , \ *ou*\ , \ *authdomain*\ , \ *adminuser*\ , \ *adminpassword*\ , \ *type*\ , \ *comments*\ , \ *disable*\ 
+\ **domain Attributes:**\   \ *node*\ , \ *ou*\ , \ *authdomain*\ , \ *adminuser*\ , \ *adminpassword*\ , \ *type*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,52 +36,52 @@ domain Attributes:
 
 
 
-\ **node**\ 
- 
+\ **node**\
+
  The node or group the entry applies to
- 
 
 
-\ **ou**\ 
- 
+
+\ **ou**\
+
  For an LDAP described machine account (i.e. Active Directory), the organizational unit to place the system.  If not set, defaults to cn=Computers,dc=your,dc=domain
- 
 
 
-\ **authdomain**\ 
- 
+
+\ **authdomain**\
+
  If a node should participate in an AD domain or Kerberos realm distinct from domain indicated in site, this field can be used to specify that
- 
 
 
-\ **adminuser**\ 
- 
+
+\ **adminuser**\
+
  Allow a node specific indication of Administrative user.  Most will want to just use passwd table to indicate this once rather than by node.
- 
 
 
-\ **adminpassword**\ 
- 
+
+\ **adminpassword**\
+
  Allow a node specific indication of Administrative user password for the domain.  Most will want to ignore this in favor of passwd table.
- 
 
 
-\ **type**\ 
- 
+
+\ **type**\
+
  Type, if any, of authentication domain to manipulate.  The only recognized value at the moment is activedirectory.
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-written notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -90,5 +90,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/eventlog.5.rst b/docs/source/guides/admin-guides/references/man5/eventlog.5.rst
index f75afb9de..bc82fc48e 100644
--- a/docs/source/guides/admin-guides/references/man5/eventlog.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/eventlog.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **eventlog Attributes:**\   \ *recid*\ , \ *eventtime*\ , \ *eventtype*\ , \ *monitor*\ , \ *monnode*\ , \ *node*\ , \ *application*\ , \ *component*\ , \ *id*\ , \ *severity*\ , \ *message*\ , \ *rawdata*\ , \ *comments*\ , \ *disable*\ 
+\ **eventlog Attributes:**\   \ *recid*\ , \ *eventtime*\ , \ *eventtype*\ , \ *monitor*\ , \ *monnode*\ , \ *node*\ , \ *application*\ , \ *component*\ , \ *id*\ , \ *severity*\ , \ *message*\ , \ *rawdata*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,88 +36,88 @@ eventlog Attributes:
 
 
 
-\ **recid**\ 
- 
+\ **recid**\
+
  The record id.
- 
 
 
-\ **eventtime**\ 
- 
+
+\ **eventtime**\
+
  The timestamp for the event.
- 
 
 
-\ **eventtype**\ 
- 
+
+\ **eventtype**\
+
  The type of the event.
- 
 
 
-\ **monitor**\ 
- 
+
+\ **monitor**\
+
  The name of the monitor that monitors this event.
- 
 
 
-\ **monnode**\ 
- 
+
+\ **monnode**\
+
  The node that monitors this event.
- 
 
 
-\ **node**\ 
- 
+
+\ **node**\
+
  The node where the event occurred.
- 
 
 
-\ **application**\ 
- 
+
+\ **application**\
+
  The application that reports the event.
- 
 
 
-\ **component**\ 
- 
+
+\ **component**\
+
  The component where the event occurred.
- 
 
 
-\ **id**\ 
- 
+
+\ **id**\
+
  The location or the resource name where the event occurred.
- 
 
 
-\ **severity**\ 
- 
+
+\ **severity**\
+
  The severity of the event. Valid values are: informational, warning, critical.
- 
 
 
-\ **message**\ 
- 
+
+\ **message**\
+
  The full description of the event.
- 
 
 
-\ **rawdata**\ 
- 
+
+\ **rawdata**\
+
  The data that associated with the event.
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-provided notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Do not use.  tabprune will not work if set to yes or 1
- 
+
 
 
 
@@ -126,5 +126,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/firmware.5.rst b/docs/source/guides/admin-guides/references/man5/firmware.5.rst
index 3b41f261f..358c49dc0 100644
--- a/docs/source/guides/admin-guides/references/man5/firmware.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/firmware.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **firmware Attributes:**\   \ *node*\ , \ *cfgfile*\ , \ *comments*\ , \ *disable*\ 
+\ **firmware Attributes:**\   \ *node*\ , \ *cfgfile*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,28 +36,28 @@ firmware Attributes:
 
 
 
-\ **node**\ 
- 
+\ **node**\
+
  The node id.
- 
 
 
-\ **cfgfile**\ 
- 
+
+\ **cfgfile**\
+
  The file to use.
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-written notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -66,5 +66,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/hosts.5.rst b/docs/source/guides/admin-guides/references/man5/hosts.5.rst
index 2771c52d9..d18fbd6da 100644
--- a/docs/source/guides/admin-guides/references/man5/hosts.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/hosts.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **hosts Attributes:**\   \ *node*\ , \ *ip*\ , \ *hostnames*\ , \ *otherinterfaces*\ , \ *comments*\ , \ *disable*\ 
+\ **hosts Attributes:**\   \ *node*\ , \ *ip*\ , \ *hostnames*\ , \ *otherinterfaces*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,40 +36,40 @@ hosts Attributes:
 
 
 
-\ **node**\ 
- 
+\ **node**\
+
  The node name or group name.
- 
 
 
-\ **ip**\ 
- 
+
+\ **ip**\
+
  The IP address of the node. This is only used in makehosts.  The rest of xCAT uses system name resolution to resolve node names to IP addresses.
- 
 
 
-\ **hostnames**\ 
- 
+
+\ **hostnames**\
+
  Hostname aliases added to /etc/hosts for this node. Comma or blank separated list.
- 
 
 
-\ **otherinterfaces**\ 
- 
+
+\ **otherinterfaces**\
+
  Other IP addresses to add for this node.  Format: -<ext>:<ip>,<intfhostname>:<ip>,...
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-written notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -78,5 +78,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/hwinv.5.rst b/docs/source/guides/admin-guides/references/man5/hwinv.5.rst
index 626fee9c2..b74b094d9 100644
--- a/docs/source/guides/admin-guides/references/man5/hwinv.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/hwinv.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **hwinv Attributes:**\   \ *node*\ , \ *cputype*\ , \ *cpucount*\ , \ *memory*\ , \ *disksize*\ , \ *comments*\ , \ *disable*\ 
+\ **hwinv Attributes:**\   \ *node*\ , \ *cputype*\ , \ *cpucount*\ , \ *memory*\ , \ *disksize*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,46 +36,46 @@ hwinv Attributes:
 
 
 
-\ **node**\ 
- 
+\ **node**\
+
  The node name or group name.
- 
 
 
-\ **cputype**\ 
- 
+
+\ **cputype**\
+
  The cpu model name for the node.
- 
 
 
-\ **cpucount**\ 
- 
+
+\ **cpucount**\
+
  The number of cpus for the node.
- 
 
 
-\ **memory**\ 
- 
+
+\ **memory**\
+
  The size of the memory for the node in MB.
- 
 
 
-\ **disksize**\ 
- 
+
+\ **disksize**\
+
  The size of the disks for the node in GB.
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-provided notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -84,5 +84,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/hypervisor.5.rst b/docs/source/guides/admin-guides/references/man5/hypervisor.5.rst
index c3f9e3a4c..2c9886af6 100644
--- a/docs/source/guides/admin-guides/references/man5/hypervisor.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/hypervisor.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **hypervisor Attributes:**\   \ *node*\ , \ *type*\ , \ *mgr*\ , \ *interface*\ , \ *netmap*\ , \ *defaultnet*\ , \ *cluster*\ , \ *datacenter*\ , \ *preferdirect*\ , \ *comments*\ , \ *disable*\ 
+\ **hypervisor Attributes:**\   \ *node*\ , \ *type*\ , \ *mgr*\ , \ *interface*\ , \ *netmap*\ , \ *defaultnet*\ , \ *cluster*\ , \ *datacenter*\ , \ *preferdirect*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,65 +36,65 @@ hypervisor Attributes:
 
 
 
-\ **node**\ 
- 
+\ **node**\
+
  The node or static group name
- 
 
 
-\ **type**\ 
- 
+
+\ **type**\
+
  The plugin associated with hypervisor specific commands such as revacuate
- 
 
 
-\ **mgr**\ 
- 
+
+\ **mgr**\
+
  The virtualization specific manager of this hypervisor when applicable
- 
 
 
-\ **interface**\ 
- 
+
+\ **interface**\
+
  The definition of interfaces for the hypervisor. The format is [networkname:interfacename:bootprotocol:IP:netmask:gateway] that split with | for each interface
- 
 
 
-\ **netmap**\ 
- 
+
+\ **netmap**\
+
  Optional mapping of useful names to relevant physical ports.  For example, 10ge=vmnic_16.0&vmnic_16.1,ge=vmnic1 would be requesting two virtual switches to be created, one called 10ge with vmnic_16.0 and vmnic_16.1 bonded, and another simply connected to vmnic1.  Use of this allows abstracting guests from network differences amongst hypervisors
- 
 
 
-\ **defaultnet**\ 
- 
+
+\ **defaultnet**\
+
  Optionally specify a default network entity for guests to join to if they do not specify.
- 
 
 
-\ **cluster**\ 
- 
+
+\ **cluster**\
+
  Specify to the underlying virtualization infrastructure a cluster membership for the hypervisor.
- 
 
 
-\ **datacenter**\ 
- 
+
+\ **datacenter**\
+
  Optionally specify a datacenter for the hypervisor to exist in (only applicable to VMWare)
- 
 
 
-\ **preferdirect**\ 
- 
+
+\ **preferdirect**\
+
  If a mgr is declared for a hypervisor, xCAT will default to using the mgr for all operations.  If this is field is set to yes or 1, xCAT will prefer to directly communicate with the hypervisor if possible
- 
-
-
-\ **comments**\ 
 
 
 
-\ **disable**\ 
+\ **comments**\
+
+
+
+\ **disable**\
 
 
 
@@ -104,5 +104,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/ipmi.5.rst b/docs/source/guides/admin-guides/references/man5/ipmi.5.rst
index 1912e186c..0d45e562d 100644
--- a/docs/source/guides/admin-guides/references/man5/ipmi.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/ipmi.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **ipmi Attributes:**\   \ *node*\ , \ *bmc*\ , \ *bmcport*\ , \ *taggedvlan*\ , \ *bmcid*\ , \ *username*\ , \ *password*\ , \ *comments*\ , \ *disable*\ 
+\ **ipmi Attributes:**\   \ *node*\ , \ *bmc*\ , \ *bmcport*\ , \ *taggedvlan*\ , \ *bmcid*\ , \ *username*\ , \ *password*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,98 +36,98 @@ ipmi Attributes:
 
 
 
-\ **node**\ 
- 
+\ **node**\
+
  The node name or group name.
- 
 
 
-\ **bmc**\ 
- 
+
+\ **bmc**\
+
  The hostname of the BMC adapter.
- 
 
 
-\ **bmcport**\ 
- 
+
+\ **bmcport**\
+
  In systems with selectable shared/dedicated ethernet ports, this parameter can be used to specify the preferred port. 0 means use the shared port, 1 means dedicated, blank is to not assign.
- 
- 
+
+
  .. code-block:: perl
- 
+
              The following special cases exist for IBM System x servers:
-  
+
              For x3755 M3 systems, 0 means use the dedicated port, 1 means
              shared, blank is to not assign.
-  
+
          For certain systems which have a mezzaine or ML2 adapter, there is a second
          value to include:
-  
-  
+
+
              For x3750 M4 (Model 8722):
-  
-  
+
+
              0 2   1st 1Gbps interface for LOM
-  
+
              0 0   1st 10Gbps interface for LOM
-  
+
              0 3   2nd 1Gbps interface for LOM
-  
+
              0 1   2nd 10Gbps interface for LOM
-  
-  
+
+
              For  x3750 M4 (Model 8752), x3850/3950 X6, dx360 M4, x3550 M4, and x3650 M4:
-  
-  
+
+
              0     Shared (1st onboard interface)
-  
+
              1     Dedicated
-  
+
              2 0   First interface on ML2 or mezzanine adapter
-  
+
              2 1   Second interface on ML2 or mezzanine adapter
-  
+
              2 2   Third interface on ML2 or mezzanine adapter
-  
+
              2 3   Fourth interface on ML2 or mezzanine adapter
- 
- 
 
 
-\ **taggedvlan**\ 
- 
+
+
+\ **taggedvlan**\
+
  bmcsetup script will configure the network interface of the BMC to be tagged to the VLAN specified.
- 
 
 
-\ **bmcid**\ 
- 
+
+\ **bmcid**\
+
  Unique identified data used by discovery processes to distinguish known BMCs from unrecognized BMCs
- 
 
 
-\ **username**\ 
- 
+
+\ **username**\
+
  The BMC userid.  If not specified, the key=ipmi row in the passwd table is used as the default.
- 
 
 
-\ **password**\ 
- 
+
+\ **password**\
+
  The BMC password.  If not specified, the key=ipmi row in the passwd table is used as the default.
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-written notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -136,5 +136,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/iscsi.5.rst b/docs/source/guides/admin-guides/references/man5/iscsi.5.rst
index 48a91d893..6371674ee 100644
--- a/docs/source/guides/admin-guides/references/man5/iscsi.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/iscsi.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **iscsi Attributes:**\   \ *node*\ , \ *server*\ , \ *target*\ , \ *lun*\ , \ *iname*\ , \ *file*\ , \ *userid*\ , \ *passwd*\ , \ *kernel*\ , \ *kcmdline*\ , \ *initrd*\ , \ *comments*\ , \ *disable*\ 
+\ **iscsi Attributes:**\   \ *node*\ , \ *server*\ , \ *target*\ , \ *lun*\ , \ *iname*\ , \ *file*\ , \ *userid*\ , \ *passwd*\ , \ *kernel*\ , \ *kcmdline*\ , \ *initrd*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,82 +36,82 @@ iscsi Attributes:
 
 
 
-\ **node**\ 
- 
+\ **node**\
+
  The node name or group name.
- 
 
 
-\ **server**\ 
- 
+
+\ **server**\
+
  The server containing the iscsi boot device for this node.
- 
 
 
-\ **target**\ 
- 
+
+\ **target**\
+
  The iscsi disk used for the boot device for this node.  Filled in by xCAT.
- 
 
 
-\ **lun**\ 
- 
+
+\ **lun**\
+
  LUN of boot device.  Per RFC-4173, this is presumed to be 0 if unset.  tgtd often requires this to be 1
- 
 
 
-\ **iname**\ 
- 
+
+\ **iname**\
+
  Initiator name.  Currently unused.
- 
 
 
-\ **file**\ 
- 
+
+\ **file**\
+
  The path on the server of the OS image the node should boot from.
- 
 
 
-\ **userid**\ 
- 
+
+\ **userid**\
+
  The userid of the iscsi server containing the boot device for this node.
- 
 
 
-\ **passwd**\ 
- 
+
+\ **passwd**\
+
  The password for the iscsi server containing the boot device for this node.
- 
 
 
-\ **kernel**\ 
- 
+
+\ **kernel**\
+
  The path of the linux kernel to boot from.
- 
 
 
-\ **kcmdline**\ 
- 
+
+\ **kcmdline**\
+
  The kernel command line to use with iSCSI for this node.
- 
 
 
-\ **initrd**\ 
- 
+
+\ **initrd**\
+
  The initial ramdisk to use when network booting this node.
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-written notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -120,5 +120,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/kit.5.rst b/docs/source/guides/admin-guides/references/man5/kit.5.rst
index af76b1134..3ffd4f226 100644
--- a/docs/source/guides/admin-guides/references/man5/kit.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/kit.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **kit Attributes:**\   \ *kitname*\ , \ *basename*\ , \ *description*\ , \ *version*\ , \ *release*\ , \ *ostype*\ , \ *isinternal*\ , \ *kitdeployparams*\ , \ *kitdir*\ , \ *comments*\ , \ *disable*\ 
+\ **kit Attributes:**\   \ *kitname*\ , \ *basename*\ , \ *description*\ , \ *version*\ , \ *release*\ , \ *ostype*\ , \ *isinternal*\ , \ *kitdeployparams*\ , \ *kitdir*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,70 +36,70 @@ kit Attributes:
 
 
 
-\ **kitname**\ 
- 
+\ **kitname**\
+
  The unique generated kit name, when kit is added to the cluster.
- 
 
 
-\ **basename**\ 
- 
+
+\ **basename**\
+
  The kit base name
- 
 
 
-\ **description**\ 
- 
+
+\ **description**\
+
  The Kit description.
- 
 
 
-\ **version**\ 
- 
+
+\ **version**\
+
  The kit version
- 
 
 
-\ **release**\ 
- 
+
+\ **release**\
+
  The kit release
- 
 
 
-\ **ostype**\ 
- 
+
+\ **ostype**\
+
  The kit OS type.  Linux or AIX.
- 
 
 
-\ **isinternal**\ 
- 
+
+\ **isinternal**\
+
  A flag to indicated if the Kit is internally used. When set to 1, the Kit is internal. If 0 or undefined, the kit is not internal.
- 
 
 
-\ **kitdeployparams**\ 
- 
+
+\ **kitdeployparams**\
+
  The file containing the default deployment parameters for this Kit.  These parameters are added to the OS Image definition.s list of deployment parameters when one or more Kit Components from this Kit are added to the OS Image.
- 
 
 
-\ **kitdir**\ 
- 
+
+\ **kitdir**\
+
  The path to Kit Installation directory on the Mgt Node.
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-written notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -108,5 +108,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/kitcomponent.5.rst b/docs/source/guides/admin-guides/references/man5/kitcomponent.5.rst
index ac48fa7a0..cd52254e8 100644
--- a/docs/source/guides/admin-guides/references/man5/kitcomponent.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/kitcomponent.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **kitcomponent Attributes:**\   \ *kitcompname*\ , \ *description*\ , \ *kitname*\ , \ *kitreponame*\ , \ *basename*\ , \ *version*\ , \ *release*\ , \ *serverroles*\ , \ *kitpkgdeps*\ , \ *prerequisite*\ , \ *driverpacks*\ , \ *kitcompdeps*\ , \ *postbootscripts*\ , \ *genimage_postinstall*\ , \ *exlist*\ , \ *comments*\ , \ *disable*\ 
+\ **kitcomponent Attributes:**\   \ *kitcompname*\ , \ *description*\ , \ *kitname*\ , \ *kitreponame*\ , \ *basename*\ , \ *version*\ , \ *release*\ , \ *serverroles*\ , \ *kitpkgdeps*\ , \ *prerequisite*\ , \ *driverpacks*\ , \ *kitcompdeps*\ , \ *postbootscripts*\ , \ *genimage_postinstall*\ , \ *exlist*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,106 +36,106 @@ kitcomponent Attributes:
 
 
 
-\ **kitcompname**\ 
- 
+\ **kitcompname**\
+
  The unique Kit Component name. It is auto-generated when the parent Kit is added to the cluster.
- 
 
 
-\ **description**\ 
- 
+
+\ **description**\
+
  The Kit component description.
- 
 
 
-\ **kitname**\ 
- 
+
+\ **kitname**\
+
  The Kit name which this Kit Component belongs to.
- 
 
 
-\ **kitreponame**\ 
- 
+
+\ **kitreponame**\
+
  The Kit Package Repository name which this Kit Component belongs to.
- 
 
 
-\ **basename**\ 
- 
+
+\ **basename**\
+
  Kit Component basename.
- 
 
 
-\ **version**\ 
- 
+
+\ **version**\
+
  Kit Component version.
- 
 
 
-\ **release**\ 
- 
+
+\ **release**\
+
  Kit Component release.
- 
 
 
-\ **serverroles**\ 
- 
+
+\ **serverroles**\
+
  The types of servers that this Kit Component can install on.  Valid types are: mgtnode, servicenode, compute
- 
 
 
-\ **kitpkgdeps**\ 
- 
+
+\ **kitpkgdeps**\
+
  Comma-separated list of packages that this kit component depends on.
- 
 
 
-\ **prerequisite**\ 
- 
+
+\ **prerequisite**\
+
  Prerequisite for this kit component, the prerequisite includes ospkgdeps,preinstall,preupgrade,preuninstall scripts
- 
 
 
-\ **driverpacks**\ 
- 
+
+\ **driverpacks**\
+
  Comma-separated List of driver package names. These must be full names like: pkg1-1.0-1.x86_64.rpm.
- 
 
 
-\ **kitcompdeps**\ 
- 
+
+\ **kitcompdeps**\
+
  Comma-separated list of kit components that this kit component depends on.
- 
 
 
-\ **postbootscripts**\ 
- 
+
+\ **postbootscripts**\
+
  Comma-separated list of postbootscripts that will run during the node boot.
- 
 
 
-\ **genimage_postinstall**\ 
- 
+
+\ **genimage_postinstall**\
+
  Comma-separated list of postinstall scripts that will run during the genimage.
- 
 
 
-\ **exlist**\ 
- 
+
+\ **exlist**\
+
  Exclude list file containing the files/directories to exclude when building a diskless image.
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-written notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -144,5 +144,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/kitrepo.5.rst b/docs/source/guides/admin-guides/references/man5/kitrepo.5.rst
index da260bccb..5a47317db 100644
--- a/docs/source/guides/admin-guides/references/man5/kitrepo.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/kitrepo.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **kitrepo Attributes:**\   \ *kitreponame*\ , \ *kitname*\ , \ *osbasename*\ , \ *osmajorversion*\ , \ *osminorversion*\ , \ *osarch*\ , \ *compat_osbasenames*\ , \ *kitrepodir*\ , \ *comments*\ , \ *disable*\ 
+\ **kitrepo Attributes:**\   \ *kitreponame*\ , \ *kitname*\ , \ *osbasename*\ , \ *osmajorversion*\ , \ *osminorversion*\ , \ *osarch*\ , \ *compat_osbasenames*\ , \ *kitrepodir*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,64 +36,64 @@ kitrepo Attributes:
 
 
 
-\ **kitreponame**\ 
- 
+\ **kitreponame**\
+
  The unique generated kit repo package name, when kit is added to the cluster.
- 
 
 
-\ **kitname**\ 
- 
+
+\ **kitname**\
+
  The Kit name which this Kit Package Repository belongs to.
- 
 
 
-\ **osbasename**\ 
- 
+
+\ **osbasename**\
+
  The OS distro name which this repository is based on.
- 
 
 
-\ **osmajorversion**\ 
- 
+
+\ **osmajorversion**\
+
  The OS distro major version which this repository is based on.
- 
 
 
-\ **osminorversion**\ 
- 
+
+\ **osminorversion**\
+
  The OS distro minor version which this repository is based on. If this attribute is not set, it means that this repo applies to all minor versions.
- 
 
 
-\ **osarch**\ 
- 
+
+\ **osarch**\
+
  The OS distro arch which this repository is based on.
- 
 
 
-\ **compat_osbasenames**\ 
- 
+
+\ **compat_osbasenames**\
+
  List of compatible OS base names.
- 
 
 
-\ **kitrepodir**\ 
- 
+
+\ **kitrepodir**\
+
  The path to Kit Repository directory on the Mgt Node.
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-written notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -102,5 +102,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/kvm_masterdata.5.rst b/docs/source/guides/admin-guides/references/man5/kvm_masterdata.5.rst
index 7ac2d011a..d9a70a8c3 100644
--- a/docs/source/guides/admin-guides/references/man5/kvm_masterdata.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/kvm_masterdata.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **kvm_masterdata Attributes:**\   \ *name*\ , \ *xml*\ , \ *comments*\ , \ *disable*\ 
+\ **kvm_masterdata Attributes:**\   \ *name*\ , \ *xml*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,26 +36,26 @@ kvm_masterdata Attributes:
 
 
 
-\ **name**\ 
- 
+\ **name**\
+
  The name of the relevant master
- 
 
 
-\ **xml**\ 
- 
+
+\ **xml**\
+
  The XML description to be customized for clones of this master
- 
-
-
-\ **comments**\ 
 
 
 
-\ **disable**\ 
- 
+\ **comments**\
+
+
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -64,5 +64,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/kvm_nodedata.5.rst b/docs/source/guides/admin-guides/references/man5/kvm_nodedata.5.rst
index c2286a413..b564c9979 100644
--- a/docs/source/guides/admin-guides/references/man5/kvm_nodedata.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/kvm_nodedata.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **kvm_nodedata Attributes:**\   \ *node*\ , \ *xml*\ , \ *comments*\ , \ *disable*\ 
+\ **kvm_nodedata Attributes:**\   \ *node*\ , \ *xml*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,28 +36,28 @@ kvm_nodedata Attributes:
 
 
 
-\ **node**\ 
- 
+\ **node**\
+
  The node corresponding to the virtual machine
- 
 
 
-\ **xml**\ 
- 
+
+\ **xml**\
+
  The XML description generated by xCAT, fleshed out by libvirt, and stored for reuse
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-written notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -66,5 +66,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/linuximage.5.rst b/docs/source/guides/admin-guides/references/man5/linuximage.5.rst
index 532eafc1b..f5c879187 100644
--- a/docs/source/guides/admin-guides/references/man5/linuximage.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/linuximage.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **linuximage Attributes:**\   \ *imagename*\ , \ *template*\ , \ *boottarget*\ , \ *addkcmdline*\ , \ *pkglist*\ , \ *pkgdir*\ , \ *otherpkglist*\ , \ *otherpkgdir*\ , \ *exlist*\ , \ *postinstall*\ , \ *rootimgdir*\ , \ *kerneldir*\ , \ *nodebootif*\ , \ *otherifce*\ , \ *netdrivers*\ , \ *kernelver*\ , \ *krpmver*\ , \ *permission*\ , \ *dump*\ , \ *crashkernelsize*\ , \ *partitionfile*\ , \ *driverupdatesrc*\ , \ *comments*\ , \ *disable*\ 
+\ **linuximage Attributes:**\   \ *imagename*\ , \ *template*\ , \ *boottarget*\ , \ *addkcmdline*\ , \ *pkglist*\ , \ *pkgdir*\ , \ *otherpkglist*\ , \ *otherpkgdir*\ , \ *exlist*\ , \ *postinstall*\ , \ *rootimgdir*\ , \ *kerneldir*\ , \ *nodebootif*\ , \ *otherifce*\ , \ *netdrivers*\ , \ *kernelver*\ , \ *krpmver*\ , \ *permission*\ , \ *dump*\ , \ *crashkernelsize*\ , \ *partitionfile*\ , \ *driverupdatesrc*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,67 +36,67 @@ linuximage Attributes:
 
 
 
-\ **imagename**\ 
- 
+\ **imagename**\
+
  The name of this xCAT OS image definition.
- 
 
 
-\ **template**\ 
- 
+
+\ **template**\
+
  The fully qualified name of the template file that will be used to create the OS installer configuration file for stateful installations (e.g.  kickstart for RedHat, autoyast for SLES).
- 
 
 
-\ **boottarget**\ 
- 
+
+\ **boottarget**\
+
  The name of the boottarget definition.  When this attribute is set, xCAT will use the kernel, initrd and kernel params defined in the boottarget definition instead of the default.
- 
 
 
-\ **addkcmdline**\ 
- 
+
+\ **addkcmdline**\
+
  User specified kernel options for os provision process(no prefix) or the provisioned os(with prefix "R::"). The options should be delimited with spaces(" "). This attribute is ignored if linuximage.boottarget is set.
- 
 
 
-\ **pkglist**\ 
- 
+
+\ **pkglist**\
+
  The fully qualified name of the file that stores the distro  packages list that will be included in the image. Make sure that if the pkgs in the pkglist have dependency pkgs, the dependency pkgs should be found in one of the pkgdir
- 
 
 
-\ **pkgdir**\ 
- 
+
+\ **pkgdir**\
+
  The name of the directory where the distro packages are stored. It could be set to multiple paths. The multiple paths must be separated by ",". The first path in the value of osimage.pkgdir must be the OS base pkg dir path, such as pkgdir=/install/rhels6.2/x86_64,/install/updates . In the os base pkg path, there are default repository data. And in the other pkg path(s), the users should make sure there are repository data. If not, use "createrepo" command to create them. For ubuntu, multiple mirrors can be specified in the pkgdir attribute, the mirrors must be prefixed by the protocol(http/ssh) and delimited with "," between each other.
- 
 
 
-\ **otherpkglist**\ 
- 
+
+\ **otherpkglist**\
+
  The fully qualified name of the file that stores non-distro package lists that will be included in the image. It could be set to multiple paths. The multiple paths must be separated by ",".
- 
 
 
-\ **otherpkgdir**\ 
- 
+
+\ **otherpkgdir**\
+
  The base directory and urls of internet repos from which the non-distro packages are retrived. Only 1 local directory is supported at present. The entries should be delimited with comma ",". Currently, the internet repos are only supported on Ubuntu and Redhat.
- 
 
 
-\ **exlist**\ 
- 
+
+\ **exlist**\
+
  The fully qualified name of the file that stores the file names and directory names that will be excluded from the image during packimage command.  It is used for diskless image only.
- 
 
 
-\ **postinstall**\ 
- 
- Supported in diskless image only. The fully qualified name of the scripts running in non-chroot mode after the package installation but before initrd generation during genimage. If multiple scripts are specified, they should be seperated with comma ",". A set of osimage attributes are exported as the environment variables to be used in the postinstall scripts:
- 
- 
+
+\ **postinstall**\
+
+ Supported in diskless image only. The fully qualified name of the scripts and the user-specified arguments running in non-chroot mode after the package installation but before initrd generation during genimage. If multiple scripts are specified, they should be seperated with comma ",". The arguments passed to each postinstall script include  4 implicit arguments(<rootimage path>,<os version>,<os arch>,<profile>) and the user-specified arguments. A set of osimage attributes are exported as the environment variables to be used in the postinstall scripts:
+
+
  .. code-block:: perl
- 
+
         IMG_ARCH(The architecture of the osimage, such as "ppc64le","x86_64"),
         IMG_NAME(The name of the osimage, such as "rhels7.3-ppc64le-netboot-compute"),
         IMG_OSVER(The os release of the osimage, such as "rhels7.3","sles11.4"),
@@ -107,72 +107,72 @@ linuximage Attributes:
         IMG_OTHERPKGLIST(the "otherpkglist" attribute of the osimage),
         IMG_OTHERPKGDIR(the "otherpkgdir" attribute of the osimage),
         IMG_ROOTIMGDIR(the "rootimgdir" attribute of the osimage)
- 
- 
 
 
-\ **rootimgdir**\ 
- 
+
+
+\ **rootimgdir**\
+
  The directory name where the image is stored.  It is generally used for diskless image. it also can be used in sysclone environment to specify where the image captured from golden client is stored. in sysclone environment, rootimgdir is generally assigned to some default value by xcat, but you can specify your own store directory. just one thing need to be noticed, wherever you save the image, the name of last level directory must be the name of image. for example, if your image name is testimage and you want to save this image under home directoy, rootimgdir should be assigned to value /home/testimage/
- 
 
 
-\ **kerneldir**\ 
- 
+
+\ **kerneldir**\
+
  The directory name where the 3rd-party kernel is stored. It is used for diskless image only.
- 
 
 
-\ **nodebootif**\ 
- 
+
+\ **nodebootif**\
+
  The network interface the stateless/statelite node will boot over (e.g. eth0)
- 
 
 
-\ **otherifce**\ 
- 
+
+\ **otherifce**\
+
  Other network interfaces (e.g. eth1) in the image that should be configured via DHCP
- 
 
 
-\ **netdrivers**\ 
- 
+
+\ **netdrivers**\
+
  The ethernet device drivers of the nodes which will use this linux image, at least the device driver for the nodes' installnic should be included
- 
 
 
-\ **kernelver**\ 
- 
+
+\ **kernelver**\
+
  The version of linux kernel used in the linux image. If the kernel version is not set, the default kernel in rootimgdir will be used
- 
 
 
-\ **krpmver**\ 
- 
+
+\ **krpmver**\
+
  The rpm version of kernel packages (for SLES only). If it is not set, the default rpm version of kernel packages will be used.
- 
 
 
-\ **permission**\ 
- 
+
+\ **permission**\
+
  The mount permission of /.statelite directory is used, its default value is 755
- 
 
 
-\ **dump**\ 
- 
+
+\ **dump**\
+
  The NFS directory to hold the Linux kernel dump file (vmcore) when the node with this image crashes, its format is "nfs://<nfs_server_ip>/<kdump_path>". If you want to use the node's "xcatmaster" (its SN or MN), <nfs_server_ip> can be left blank. For example, "nfs:///<kdump_path>" means the NFS directory to hold the kernel dump file is on the node's SN, or MN if there's no SN.
- 
 
 
-\ **crashkernelsize**\ 
- 
+
+\ **crashkernelsize**\
+
  the size that assigned to the kdump kernel. If the kernel size is not set, 256M will be the default value.
- 
 
 
-\ **partitionfile**\ 
- 
+
+\ **partitionfile**\
+
  Only available for diskful osimages and statelite osimages(localdisk enabled). The full path of the partition file or the script to generate the partition file. The valid value includes:
                  "<the absolute path of the parititon file>": For diskful osimages, the partition file contains the partition definition that will be inserted directly into the template file for os installation. The syntax and format of the partition file should confirm to the corresponding OS installer of the Linux distributions(e.g. kickstart for RedHat, autoyast for SLES, pressed for Ubuntu). For statelite osimages, when the localdisk is enabled, the partition file with specific syntax and format includes the partition scheme of the local disk, please refer to the statelite documentation for details.
                  "s:<the absolute path of the partition script>": a shell script to generate the partition file "/tmp/partitionfile" inside the installer before the installation start.
@@ -180,25 +180,25 @@ linuximage Attributes:
                  "s:d:<the absolute path of the disk script>": only available for ubuntu osimages, a script to generate the disk name file "/tmp/xcat.install_disk" inside the debian installer. This script is run in the "pressed/early_command" section.
                  "c:<the absolute path of the additional pressed config file>": only availbe for ubuntu osimages, contains the additional pressed entries in "d-i ..." form. This can be used to specify some additional preseed options to support RAID or LVM in Ubuntu.
                  "s:c:<the absolute path of the additional pressed config script>": only available for ubuntu osimages, runs in pressed/early_command and set the preseed values with "debconf-set". The multiple values should be delimited with comma ","
- 
 
 
-\ **driverupdatesrc**\ 
- 
+
+\ **driverupdatesrc**\
+
  The source of the drivers which need to be loaded during the boot. Two types of driver update source are supported: Driver update disk and Driver rpm package. The value for this attribute should be comma separated sources. Each source should be the format tab:full_path_of_source_file. The tab keyword can be: dud (for Driver update disk) and rpm (for driver rpm). If missing the tab, the rpm format is the default. e.g. dud:/install/dud/dd.img,rpm:/install/rpm/d.rpm
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-written notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -207,5 +207,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/litefile.5.rst b/docs/source/guides/admin-guides/references/man5/litefile.5.rst
index 220627f91..e3c131f0a 100644
--- a/docs/source/guides/admin-guides/references/man5/litefile.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/litefile.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **litefile Attributes:**\   \ *image*\ , \ *file*\ , \ *options*\ , \ *comments*\ , \ *disable*\ 
+\ **litefile Attributes:**\   \ *image*\ , \ *file*\ , \ *options*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,56 +36,56 @@ litefile Attributes:
 
 
 
-\ **image**\ 
- 
+\ **image**\
+
  The name of the image (as specified in the osimage table) that will use these options on this dir/file. You can also specify an image group name that is listed in the osimage.groups attribute of some osimages. 'ALL' means use this row for all images.
- 
 
 
-\ **file**\ 
- 
+
+\ **file**\
+
  The full pathname of the file. e.g: /etc/hosts.  If the path is a directory, then it should be terminated with a '/'.
- 
 
 
-\ **options**\ 
- 
+
+\ **options**\
+
  Options for the file:
- 
- 
+
+
  .. code-block:: perl
- 
+
    tmpfs - It is the default option if you leave the options column blank. It provides a file or directory for the node to use when booting, its permission will be the same as the original version on the server. In most cases, it is read-write; however, on the next statelite boot, the original version of the file or directory on the server will be used, it means it is non-persistent. This option can be performed on files and directories..
-  
-   rw - Same as above. Its name "rw" does NOT mean it always be read-write, even in most cases it is read-write. Do not confuse it with the "rw" permission in the file system. 
-  
-   persistent - It provides a mounted file or directory that is copied to the xCAT persistent location and then over-mounted on the local file or directory. Anything written to that file or directory is preserved. It means, if the file/directory does not exist at first, it will be copied to the persistent location. Next time the file/directory in the persistent location will be used. The file/directory will be persistent across reboots. Its permission will be the same as the original one in the statelite location. It requires the statelite table to be filled out with a spot for persistent statelite. This option can be performed on files and directories. 
-  
+
+   rw - Same as above. Its name "rw" does NOT mean it always be read-write, even in most cases it is read-write. Do not confuse it with the "rw" permission in the file system.
+
+   persistent - It provides a mounted file or directory that is copied to the xCAT persistent location and then over-mounted on the local file or directory. Anything written to that file or directory is preserved. It means, if the file/directory does not exist at first, it will be copied to the persistent location. Next time the file/directory in the persistent location will be used. The file/directory will be persistent across reboots. Its permission will be the same as the original one in the statelite location. It requires the statelite table to be filled out with a spot for persistent statelite. This option can be performed on files and directories.
+
    con - The contents of the pathname are concatenated to the contents of the existing file. For this directive the searching in the litetree hierarchy does not stop when the first match is found. All files found in the hierarchy will be concatenated to the file when found. The permission of the file will be "-rw-r--r--", which means it is read-write for the root user, but readonly for the others. It is non-persistent, when the node reboots, all changes to the file will be lost. It can only be performed on files. Do not use it for one directory.
-  
+
    ro - The file/directory will be overmounted read-only on the local file/directory. It will be located in the directory hierarchy specified in the litetree table. Changes made to this file or directory on the server will be immediately seen in this file/directory on the node. This option requires that the file/directory to be mounted must be available in one of the entries in the litetree table. This option can be performed on files and directories.
-  
-   link - It provides one file/directory for the node to use when booting, it is copied from the server, and will be placed in tmpfs on the booted node. In the local file system of the booted node, it is one symbolic link to one file/directory in tmpfs. And the permission of the symbolic link is "lrwxrwxrwx", which is not the real permission of the file/directory on the node. So for some application sensitive to file permissions, it will be one issue to use "link" as its option, for example, "/root/.ssh/", which is used for SSH, should NOT use "link" as its option. It is non-persistent, when the node is rebooted, all changes to the file/directory will be lost. This option can be performed on files and directories. 
-  
-   link,con -  It works similar to the "con" option. All the files found in the litetree hierarchy will be concatenated to the file when found. The final file will be put to the tmpfs on the booted node. In the local file system of the booted node, it is one symbolic link to the file/directory in tmpfs. It is non-persistent, when the node is rebooted, all changes to the file will be lost. The option can only be performed on files. 
-  
+
+   link - It provides one file/directory for the node to use when booting, it is copied from the server, and will be placed in tmpfs on the booted node. In the local file system of the booted node, it is one symbolic link to one file/directory in tmpfs. And the permission of the symbolic link is "lrwxrwxrwx", which is not the real permission of the file/directory on the node. So for some application sensitive to file permissions, it will be one issue to use "link" as its option, for example, "/root/.ssh/", which is used for SSH, should NOT use "link" as its option. It is non-persistent, when the node is rebooted, all changes to the file/directory will be lost. This option can be performed on files and directories.
+
+   link,con -  It works similar to the "con" option. All the files found in the litetree hierarchy will be concatenated to the file when found. The final file will be put to the tmpfs on the booted node. In the local file system of the booted node, it is one symbolic link to the file/directory in tmpfs. It is non-persistent, when the node is rebooted, all changes to the file will be lost. The option can only be performed on files.
+
     link,persistent - It provides a mounted file or directory that is copied to the xCAT persistent location and then over-mounted to the tmpfs on the booted node, and finally the symbolic link in the local file system will be linked to the over-mounted tmpfs file/directory on the booted node. The file/directory will be persistent across reboots. The permission of the file/directory where the symbolic link points to will be the same as the original one in the statelite location. It requires the statelite table to be filled out with a spot for persistent statelite. The option can be performed on files and directories.
-  
+
    link,ro - The file is readonly, and will be placed in tmpfs on the booted node. In the local file system of the booted node, it is one symbolic link to the tmpfs. It is non-persistent, when the node is rebooted, all changes to the file/directory will be lost. This option requires that the file/directory to be mounted must be available in one of the entries in the litetree table. The option can be performed on files and directories.
- 
- 
 
 
-\ **comments**\ 
- 
+
+
+\ **comments**\
+
  Any user-written notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -94,5 +94,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/litetree.5.rst b/docs/source/guides/admin-guides/references/man5/litetree.5.rst
index 50d1eaa6f..473af0218 100644
--- a/docs/source/guides/admin-guides/references/man5/litetree.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/litetree.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **litetree Attributes:**\   \ *priority*\ , \ *image*\ , \ *directory*\ , \ *mntopts*\ , \ *comments*\ , \ *disable*\ 
+\ **litetree Attributes:**\   \ *priority*\ , \ *image*\ , \ *directory*\ , \ *mntopts*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,40 +36,40 @@ litetree Attributes:
 
 
 
-\ **priority**\ 
- 
+\ **priority**\
+
  This number controls what order the directories are searched.  Directories are searched from smallest priority number to largest.
- 
 
 
-\ **image**\ 
- 
+
+\ **image**\
+
  The name of the image (as specified in the osimage table) that will use this directory. You can also specify an image group name that is listed in the osimage.groups attribute of some osimages. 'ALL' means use this row for all images.
- 
 
 
-\ **directory**\ 
- 
+
+\ **directory**\
+
  The location (hostname:path) of a directory that contains files specified in the litefile table.  Variables are allowed.  E.g: $noderes.nfsserver://xcatmasternode/install/$node/#CMD=uname-r#/
- 
 
 
-\ **mntopts**\ 
- 
+
+\ **mntopts**\
+
  A comma-separated list of options to use when mounting the litetree directory.  (Ex. 'soft') The default is to do a 'hard' mount.
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-written notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -78,5 +78,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/mac.5.rst b/docs/source/guides/admin-guides/references/man5/mac.5.rst
index 993fdd0cf..4221756cc 100644
--- a/docs/source/guides/admin-guides/references/man5/mac.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/mac.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **mac Attributes:**\   \ *node*\ , \ *interface*\ , \ *mac*\ , \ *comments*\ , \ *disable*\ 
+\ **mac Attributes:**\   \ *node*\ , \ *interface*\ , \ *mac*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,34 +36,34 @@ mac Attributes:
 
 
 
-\ **node**\ 
- 
+\ **node**\
+
  The node name or group name.
- 
 
 
-\ **interface**\ 
- 
+
+\ **interface**\
+
  The adapter interface name that will be used to install and manage the node. E.g. eth0 (for linux) or en0 (for AIX).)
- 
 
 
-\ **mac**\ 
- 
+
+\ **mac**\
+
  The mac address or addresses for which xCAT will manage static bindings for this node.  This may be simply a mac address, which would be bound to the node name (such as "01:02:03:04:05:0E").  This may also be a "|" delimited string of "mac address!hostname" format (such as "01:02:03:04:05:0E!node5|01:02:03:04:05:0F!node6-eth1"). If there are multiple nics connected to Management Network(usually for bond), in order to make sure the OS deployment finished successfully, the macs of those nics must be able to resolve to same IP address. First, users have to create alias of the node for each mac in the Management Network through either: 1. adding the alias into /etc/hosts for the node directly or: 2. setting the alias to the "hostnames" attribute and then run "makehost" against the node. Then, configure the "mac" attribute of the node like "mac1!node|mac2!node-alias". For the first mac address (mac1 in the example) set in "mac" attribute, do not need to set a "node name" string for it since the nodename of the node will be used for it by default.
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-written notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -72,5 +72,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/mic.5.rst b/docs/source/guides/admin-guides/references/man5/mic.5.rst
index 896113110..07e543a4d 100644
--- a/docs/source/guides/admin-guides/references/man5/mic.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/mic.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **mic Attributes:**\   \ *node*\ , \ *host*\ , \ *id*\ , \ *nodetype*\ , \ *bridge*\ , \ *onboot*\ , \ *vlog*\ , \ *powermgt*\ , \ *comments*\ , \ *disable*\ 
+\ **mic Attributes:**\   \ *node*\ , \ *host*\ , \ *id*\ , \ *nodetype*\ , \ *bridge*\ , \ *onboot*\ , \ *vlog*\ , \ *powermgt*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,64 +36,64 @@ mic Attributes:
 
 
 
-\ **node**\ 
- 
+\ **node**\
+
  The node name or group name.
- 
 
 
-\ **host**\ 
- 
+
+\ **host**\
+
  The host node which the mic card installed on.
- 
 
 
-\ **id**\ 
- 
+
+\ **id**\
+
  The device id of the mic node.
- 
 
 
-\ **nodetype**\ 
- 
+
+\ **nodetype**\
+
  The hardware type of the mic node. Generally, it is mic.
- 
 
 
-\ **bridge**\ 
- 
+
+\ **bridge**\
+
  The virtual bridge on the host node which the mic connected to.
- 
 
 
-\ **onboot**\ 
- 
+
+\ **onboot**\
+
  Set mic to autoboot when mpss start. Valid values: yes|no. Default is yes.
- 
 
 
-\ **vlog**\ 
- 
+
+\ **vlog**\
+
  Set the Verbose Log to console. Valid values: yes|no. Default is no.
- 
 
 
-\ **powermgt**\ 
- 
+
+\ **powermgt**\
+
  Set the Power Management for mic node. This attribute is used to set the power management state that mic may get into when it is idle. Four states can be set: cpufreq, corec6, pc3 and pc6. The valid value for powermgt attribute should be [cpufreq=<on|off>]![corec6=<on|off>]![pc3=<on|off>]![pc6=<on|off>]. e.g. cpufreq=on!corec6=off!pc3=on!pc6=off. Refer to the doc of mic to get more information for power management.
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-provided notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Do not use.  tabprune will not work if set to yes or 1
- 
+
 
 
 
@@ -102,5 +102,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/monitoring.5.rst b/docs/source/guides/admin-guides/references/man5/monitoring.5.rst
index 6ea1f73d3..52d3079aa 100644
--- a/docs/source/guides/admin-guides/references/man5/monitoring.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/monitoring.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **monitoring Attributes:**\   \ *name*\ , \ *nodestatmon*\ , \ *comments*\ , \ *disable*\ 
+\ **monitoring Attributes:**\   \ *name*\ , \ *nodestatmon*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,28 +36,28 @@ monitoring Attributes:
 
 
 
-\ **name**\ 
- 
+\ **name**\
+
  The name of the monitoring plug-in module.  The plug-in must be put in /lib/perl/xCAT_monitoring/.  See the man page for monstart for details.
- 
 
 
-\ **nodestatmon**\ 
- 
+
+\ **nodestatmon**\
+
  Specifies if the monitoring plug-in is used to feed the node status to the xCAT cluster.  Any one of the following values indicates "yes":  y, Y, yes, Yes, YES, 1.  Any other value or blank (default), indicates "no".
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-written notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -66,5 +66,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/monsetting.5.rst b/docs/source/guides/admin-guides/references/man5/monsetting.5.rst
index d14541ee0..ebe081dc3 100644
--- a/docs/source/guides/admin-guides/references/man5/monsetting.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/monsetting.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **monsetting Attributes:**\   \ *name*\ , \ *key*\ , \ *value*\ , \ *comments*\ , \ *disable*\ 
+\ **monsetting Attributes:**\   \ *name*\ , \ *key*\ , \ *value*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,34 +36,34 @@ monsetting Attributes:
 
 
 
-\ **name**\ 
- 
+\ **name**\
+
  The name of the monitoring plug-in module.  The plug-in must be put in /lib/perl/xCAT_monitoring/.  See the man page for monstart for details.
- 
 
 
-\ **key**\ 
- 
+
+\ **key**\
+
  Specifies the name of the attribute. The valid values are specified by each monitoring plug-in. Use "monls name -d" to get a list of valid keys.
- 
 
 
-\ **value**\ 
- 
+
+\ **value**\
+
  Specifies the value of the attribute.
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-written notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -72,5 +72,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/mp.5.rst b/docs/source/guides/admin-guides/references/man5/mp.5.rst
index ee046aee4..ff110772d 100644
--- a/docs/source/guides/admin-guides/references/man5/mp.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/mp.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **mp Attributes:**\   \ *node*\ , \ *mpa*\ , \ *id*\ , \ *nodetype*\ , \ *comments*\ , \ *disable*\ 
+\ **mp Attributes:**\   \ *node*\ , \ *mpa*\ , \ *id*\ , \ *nodetype*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,40 +36,40 @@ mp Attributes:
 
 
 
-\ **node**\ 
- 
+\ **node**\
+
  The blade node name or group name.
- 
 
 
-\ **mpa**\ 
- 
+
+\ **mpa**\
+
  The management module used to control this blade.
- 
 
 
-\ **id**\ 
- 
+
+\ **id**\
+
  The slot number of this blade in the BladeCenter chassis.
- 
 
 
-\ **nodetype**\ 
- 
+
+\ **nodetype**\
+
  The hardware type for mp node. Valid values: mm,cmm, blade.
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-written notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -78,5 +78,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/mpa.5.rst b/docs/source/guides/admin-guides/references/man5/mpa.5.rst
index 4b03e9d12..71d846ac6 100644
--- a/docs/source/guides/admin-guides/references/man5/mpa.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/mpa.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **mpa Attributes:**\   \ *mpa*\ , \ *username*\ , \ *password*\ , \ *displayname*\ , \ *slots*\ , \ *urlpath*\ , \ *comments*\ , \ *disable*\ 
+\ **mpa Attributes:**\   \ *mpa*\ , \ *username*\ , \ *password*\ , \ *displayname*\ , \ *slots*\ , \ *urlpath*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,60 +36,60 @@ mpa Attributes:
 
 
 
-\ **mpa**\ 
- 
+\ **mpa**\
+
  Hostname of the management module.
- 
 
 
-\ **username**\ 
- 
+
+\ **username**\
+
  Userid to use to access the management module.
- 
 
 
-\ **password**\ 
- 
+
+\ **password**\
+
  Password to use to access the management module.  If not specified, the key=blade row in the passwd table is used as the default.
- 
 
 
-\ **displayname**\ 
- 
+
+\ **displayname**\
+
  Alternative name for BladeCenter chassis. Only used by PCM.
- 
 
 
-\ **slots**\ 
- 
+
+\ **slots**\
+
  The number of available slots in the chassis. For PCM, this attribute is used to store the number of slots in the following format:  <slot rows>,<slot columns>,<slot orientation>  Where:
- 
- 
+
+
  .. code-block:: perl
- 
+
                    <slot rows>  = number of rows of slots in chassis
                    <slot columns> = number of columns of slots in chassis
                    <slot orientation> = set to 0 if slots are vertical, and set to 1 if slots of horizontal
- 
- 
 
 
-\ **urlpath**\ 
- 
+
+
+\ **urlpath**\
+
  URL path for the Chassis web interface. The full URL is built as follows: <hostname>/<urlpath>
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-written notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -98,5 +98,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/networks.5.rst b/docs/source/guides/admin-guides/references/man5/networks.5.rst
index 1c05e565f..171c8c7d3 100644
--- a/docs/source/guides/admin-guides/references/man5/networks.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/networks.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **networks Attributes:**\   \ *netname*\ , \ *net*\ , \ *mask*\ , \ *mgtifname*\ , \ *gateway*\ , \ *dhcpserver*\ , \ *tftpserver*\ , \ *nameservers*\ , \ *ntpservers*\ , \ *logservers*\ , \ *dynamicrange*\ , \ *staticrange*\ , \ *staticrangeincrement*\ , \ *nodehostname*\ , \ *ddnsdomain*\ , \ *vlanid*\ , \ *domain*\ , \ *mtu*\ , \ *comments*\ , \ *disable*\ 
+\ **networks Attributes:**\   \ *netname*\ , \ *net*\ , \ *mask*\ , \ *mgtifname*\ , \ *gateway*\ , \ *dhcpserver*\ , \ *tftpserver*\ , \ *nameservers*\ , \ *ntpservers*\ , \ *logservers*\ , \ *dynamicrange*\ , \ *staticrange*\ , \ *staticrangeincrement*\ , \ *nodehostname*\ , \ *ddnsdomain*\ , \ *vlanid*\ , \ *domain*\ , \ *mtu*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,34 +36,33 @@ networks Attributes:
 
 
 
-\ **netname**\ 
- 
+\ **netname**\
+
  Name used to identify this network definition.
- 
 
 
-\ **net**\ 
- 
+
+\ **net**\
+
  The network address.
- 
 
 
-\ **mask**\ 
- 
+
+\ **mask**\
+
  The network mask.
- 
 
 
-\ **mgtifname**\ 
- 
+
+\ **mgtifname**\
+
  The interface name of the management/service node facing this network.  !remote!<nicname> indicates a non-local network on a specific nic for relay DHCP.
- 
 
 
-\ **gateway**\ 
- 
+
+\ **gateway**\
+
  The network gateway. It can be set to an ip address or the keyword <xcatmaster>, the keyword <xcatmaster> indicates the cluster-facing ip address configured on this management node or service node. Leaving this field blank means that there is no gateway for this network.
- 
 
 
 \ **dhcpserver**\ 
@@ -72,86 +71,86 @@ networks Attributes:
  
 
 
-\ **tftpserver**\ 
- 
+\ **tftpserver**\
+
  The TFTP server that is servicing this network.  If not set, the DHCP server is assumed.
- 
 
 
-\ **nameservers**\ 
- 
+
+\ **nameservers**\
+
  A comma delimited list of DNS servers that each node in this network should use. This value will end up in the nameserver settings of the /etc/resolv.conf on each node in this network. If this attribute value is set to the IP address of an xCAT node, make sure DNS is running on it. In a hierarchical cluster, you can also set this attribute to "<xcatmaster>" to mean the DNS server for each node in this network should be the node that is managing it (either its service node or the management node).  Used in creating the DHCP network definition, and DNS configuration.
- 
 
 
-\ **ntpservers**\ 
- 
+
+\ **ntpservers**\
+
  The ntp servers for this network.  Used in creating the DHCP network definition.  Assumed to be the DHCP server if not set.
- 
 
 
-\ **logservers**\ 
- 
+
+\ **logservers**\
+
  The log servers for this network.  Used in creating the DHCP network definition.  Assumed to be the DHCP server if not set.
- 
 
 
-\ **dynamicrange**\ 
- 
+
+\ **dynamicrange**\
+
  The IP address range used by DHCP to assign dynamic IP addresses for requests on this network.  This should not overlap with entities expected to be configured with static host declarations, i.e. anything ever expected to be a node with an address registered in the mac table.
- 
 
 
-\ **staticrange**\ 
- 
+
+\ **staticrange**\
+
  The IP address range used to dynamically assign static IPs to newly discovered nodes.  This should not overlap with the dynamicrange nor overlap with entities that were manually assigned static IPs.  The format for the attribute value is:    <startip>-<endip>.
- 
-
-
-\ **staticrangeincrement**\ 
 
 
 
-\ **nodehostname**\ 
- 
+\ **staticrangeincrement**\
+
+
+
+\ **nodehostname**\
+
  A regular expression used to specify node name to network-specific hostname.  i.e. "/\z/-secondary/" would mean that the hostname of "n1" would be n1-secondary on this network.  By default, the nodename is assumed to equal the hostname, followed by nodename-interfacename.
- 
 
 
-\ **ddnsdomain**\ 
- 
+
+\ **ddnsdomain**\
+
  A domain to be combined with nodename to construct FQDN for DDNS updates induced by DHCP.  This is not passed down to the client as "domain"
- 
 
 
-\ **vlanid**\ 
- 
+
+\ **vlanid**\
+
  The vlan ID if this network is within a vlan.
- 
 
 
-\ **domain**\ 
- 
+
+\ **domain**\
+
  The DNS domain name (ex. cluster.com).
- 
 
 
-\ **mtu**\ 
- 
+
+\ **mtu**\
+
  The default MTU for the network, If multiple networks are applied to the same nic on the SN and/or CN, the MTU shall be the same for those networks.
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-written notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -160,5 +159,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/nics.5.rst b/docs/source/guides/admin-guides/references/man5/nics.5.rst
index 92a5621be..cf264ff18 100644
--- a/docs/source/guides/admin-guides/references/man5/nics.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/nics.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **nics Attributes:**\   \ *node*\ , \ *nicips*\ , \ *nichostnamesuffixes*\ , \ *nichostnameprefixes*\ , \ *nictypes*\ , \ *niccustomscripts*\ , \ *nicnetworks*\ , \ *nicaliases*\ , \ *nicextraparams*\ , \ *nicdevices*\ , \ *nicsadapter*\ , \ *comments*\ , \ *disable*\ 
+\ **nics Attributes:**\   \ *node*\ , \ *nicips*\ , \ *nichostnamesuffixes*\ , \ *nichostnameprefixes*\ , \ *nictypes*\ , \ *niccustomscripts*\ , \ *nicnetworks*\ , \ *nicaliases*\ , \ *nicextraparams*\ , \ *nicdevices*\ , \ *nicsadapter*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,117 +36,117 @@ nics Attributes:
 
 
 
-\ **node**\ 
- 
+\ **node**\
+
  The node or group name.
- 
 
 
-\ **nicips**\ 
- 
- Comma-separated list of IP addresses per NIC. 
+
+\ **nicips**\
+
+ Comma-separated list of IP addresses per NIC.
                  To specify one ip address per NIC:
                      <nic1>!<ip1>,<nic2>!<ip2>,..., for example, eth0!10.0.0.100,ib0!11.0.0.100
                  To specify multiple ip addresses per NIC:
                      <nic1>!<ip1>|<ip2>,<nic2>!<ip1>|<ip2>,..., for example, eth0!10.0.0.100|fd55::214:5eff:fe15:849b,ib0!11.0.0.100|2001::214:5eff:fe15:849a. The xCAT object definition commands support to use nicips.<nicname> as the sub attributes.
                  Note: The primary IP address must also be stored in the hosts.ip attribute. The nichostnamesuffixes should specify one hostname suffix for each ip address.
- 
 
 
-\ **nichostnamesuffixes**\ 
- 
- Comma-separated list of hostname suffixes per NIC. 
+
+\ **nichostnamesuffixes**\
+
+ Comma-separated list of hostname suffixes per NIC.
                          If only one ip address is associated with each NIC:
                              <nic1>!<ext1>,<nic2>!<ext2>,..., for example, eth0!-eth0,ib0!-ib0
                          If multiple ip addresses are associated with each NIC:
-                             <nic1>!<ext1>|<ext2>,<nic2>!<ext1>|<ext2>,..., for example,  eth0!-eth0|-eth0-ipv6,ib0!-ib0|-ib0-ipv6. 
+                             <nic1>!<ext1>|<ext2>,<nic2>!<ext1>|<ext2>,..., for example,  eth0!-eth0|-eth0-ipv6,ib0!-ib0|-ib0-ipv6.
                          The xCAT object definition commands support to use nichostnamesuffixes.<nicname> as the sub attributes.
- 
- 
+
+
  .. code-block:: perl
- 
+
                           Note:  According to DNS rules a hostname must be a text string up to 24 characters drawn from the alphabet (A-Z), digits (0-9) and minus sign (-). When you are specifying "nichostnamesuffixes" or "nicaliases" make sure the resulting hostnames will conform to this naming convention
- 
- 
 
 
-\ **nichostnameprefixes**\ 
- 
- Comma-separated list of hostname prefixes per NIC. 
+
+
+\ **nichostnameprefixes**\
+
+ Comma-separated list of hostname prefixes per NIC.
                          If only one ip address is associated with each NIC:
                              <nic1>!<ext1>,<nic2>!<ext2>,..., for example, eth0!eth0-,ib0!ib-
                          If multiple ip addresses are associated with each NIC:
-                             <nic1>!<ext1>|<ext2>,<nic2>!<ext1>|<ext2>,..., for example,  eth0!eth0-|eth0-ipv6i-,ib0!ib-|ib-ipv6-. 
-                         The xCAT object definition commands support to use nichostnameprefixes.<nicname> as the sub attributes. 
+                             <nic1>!<ext1>|<ext2>,<nic2>!<ext1>|<ext2>,..., for example,  eth0!eth0-|eth0-ipv6i-,ib0!ib-|ib-ipv6-.
+                         The xCAT object definition commands support to use nichostnameprefixes.<nicname> as the sub attributes.
                          Note:  According to DNS rules a hostname must be a text string up to 24 characters drawn from the alphabet (A-Z), digits (0-9) and minus sign (-). When you are specifying "nichostnameprefixes" or "nicaliases" make sure the resulting hostnames will conform to this naming convention
- 
 
 
-\ **nictypes**\ 
- 
+
+\ **nictypes**\
+
  Comma-separated list of NIC types per NIC. <nic1>!<type1>,<nic2>!<type2>, e.g. eth0!Ethernet,ib0!Infiniband. The xCAT object definition commands support to use nictypes.<nicname> as the sub attributes.
- 
 
 
-\ **niccustomscripts**\ 
- 
+
+\ **niccustomscripts**\
+
  Comma-separated list of custom scripts per NIC.  <nic1>!<script1>,<nic2>!<script2>, e.g. eth0!configeth eth0, ib0!configib ib0. The xCAT object definition commands support to use niccustomscripts.<nicname> as the sub attribute
  .
- 
 
 
-\ **nicnetworks**\ 
- 
+
+\ **nicnetworks**\
+
  Comma-separated list of networks connected to each NIC.
                  If only one ip address is associated with each NIC:
                      <nic1>!<network1>,<nic2>!<network2>, for example, eth0!10_0_0_0-255_255_0_0, ib0!11_0_0_0-255_255_0_0
                  If multiple ip addresses are associated with each NIC:
                      <nic1>!<network1>|<network2>,<nic2>!<network1>|<network2>, for example, eth0!10_0_0_0-255_255_0_0|fd55:faaf:e1ab:336::/64,ib0!11_0_0_0-255_255_0_0|2001:db8:1:0::/64. The xCAT object definition commands support to use nicnetworks.<nicname> as the sub attributes.
- 
 
 
-\ **nicaliases**\ 
- 
+
+\ **nicaliases**\
+
  Comma-separated list of hostname aliases for each NIC.
                  Format: eth0!<alias list>,eth1!<alias1 list>|<alias2 list>
-                     For multiple aliases per nic use a space-separated list. 
+                     For multiple aliases per nic use a space-separated list.
                  For example: eth0!moe larry curly,eth1!tom|jerry
- 
 
 
-\ **nicextraparams**\ 
- 
+
+\ **nicextraparams**\
+
  Comma-separated list of extra parameters that will be used for each NIC configuration.
                  If only one ip address is associated with each NIC:
                      <nic1>!<param1=value1 param2=value2>,<nic2>!<param3=value3>, for example, eth0!MTU=1500,ib0!MTU=65520 CONNECTED_MODE=yes.
                  If multiple ip addresses are associated with each NIC:
                      <nic1>!<param1=value1 param2=value2>|<param3=value3>,<nic2>!<param4=value4 param5=value5>|<param6=value6>, for example, eth0!MTU=1500|MTU=1460,ib0!MTU=65520 CONNECTED_MODE=yes.
              The xCAT object definition commands support to use nicextraparams.<nicname> as the sub attributes.
- 
 
 
-\ **nicdevices**\ 
- 
+
+\ **nicdevices**\
+
  Comma-separated list of NIC device per NIC, multiple ethernet devices can be bonded as bond device, these ethernet devices are separated by | . <nic1>!<dev1>|<dev3>,<nic2>!<dev2>, e.g. bond0!eth0|eth2,br0!bond0. The xCAT object definition commands support to use nicdevices.<nicname> as the sub attributes.
- 
 
 
-\ **nicsadapter**\ 
- 
+
+\ **nicsadapter**\
+
  Comma-separated list of NIC information collected by getadapter. <nic1>!<param1=value1 param2=value2>,<nic2>!<param4=value4 param5=value5>, for example, enP3p3s0f1!mac=98:be:94:59:fa:cd linkstate=DOWN,enP3p3s0f2!mac=98:be:94:59:fa:ce candidatename=enP3p3s0f2/enx98be9459face
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-written notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -155,5 +155,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/nimimage.5.rst b/docs/source/guides/admin-guides/references/man5/nimimage.5.rst
index 575f05328..0829eb5f2 100644
--- a/docs/source/guides/admin-guides/references/man5/nimimage.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/nimimage.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **nimimage Attributes:**\   \ *imagename*\ , \ *nimtype*\ , \ *lpp_source*\ , \ *spot*\ , \ *root*\ , \ *dump*\ , \ *paging*\ , \ *resolv_conf*\ , \ *tmp*\ , \ *home*\ , \ *shared_home*\ , \ *res_group*\ , \ *nimmethod*\ , \ *script*\ , \ *bosinst_data*\ , \ *installp_bundle*\ , \ *mksysb*\ , \ *fb_script*\ , \ *shared_root*\ , \ *otherpkgs*\ , \ *image_data*\ , \ *configdump*\ , \ *comments*\ , \ *disable*\ 
+\ **nimimage Attributes:**\   \ *imagename*\ , \ *nimtype*\ , \ *lpp_source*\ , \ *spot*\ , \ *root*\ , \ *dump*\ , \ *paging*\ , \ *resolv_conf*\ , \ *tmp*\ , \ *home*\ , \ *shared_home*\ , \ *res_group*\ , \ *nimmethod*\ , \ *script*\ , \ *bosinst_data*\ , \ *installp_bundle*\ , \ *mksysb*\ , \ *fb_script*\ , \ *shared_root*\ , \ *otherpkgs*\ , \ *image_data*\ , \ *configdump*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,148 +36,148 @@ nimimage Attributes:
 
 
 
-\ **imagename**\ 
- 
+\ **imagename**\
+
  User provided name of this xCAT OS image definition.
- 
 
 
-\ **nimtype**\ 
- 
+
+\ **nimtype**\
+
  The NIM client type- standalone, diskless, or dataless.
- 
 
 
-\ **lpp_source**\ 
- 
+
+\ **lpp_source**\
+
  The name of the NIM lpp_source resource.
- 
 
 
-\ **spot**\ 
- 
+
+\ **spot**\
+
  The name of the NIM SPOT resource.
- 
 
 
-\ **root**\ 
- 
+
+\ **root**\
+
  The name of the NIM root resource.
- 
 
 
-\ **dump**\ 
- 
+
+\ **dump**\
+
  The name of the NIM dump resource.
- 
 
 
-\ **paging**\ 
- 
+
+\ **paging**\
+
  The name of the NIM paging resource.
- 
 
 
-\ **resolv_conf**\ 
- 
+
+\ **resolv_conf**\
+
  The name of the NIM resolv_conf resource.
- 
 
 
-\ **tmp**\ 
- 
+
+\ **tmp**\
+
  The name of the NIM tmp resource.
- 
 
 
-\ **home**\ 
- 
+
+\ **home**\
+
  The name of the NIM home resource.
- 
 
 
-\ **shared_home**\ 
- 
+
+\ **shared_home**\
+
  The name of the NIM shared_home resource.
- 
 
 
-\ **res_group**\ 
- 
+
+\ **res_group**\
+
  The name of a NIM resource group.
- 
 
 
-\ **nimmethod**\ 
- 
+
+\ **nimmethod**\
+
  The NIM install method to use, (ex. rte, mksysb).
- 
 
 
-\ **script**\ 
- 
+
+\ **script**\
+
  The name of a NIM script resource.
- 
 
 
-\ **bosinst_data**\ 
- 
+
+\ **bosinst_data**\
+
  The name of a NIM bosinst_data resource.
- 
 
 
-\ **installp_bundle**\ 
- 
+
+\ **installp_bundle**\
+
  One or more comma separated NIM installp_bundle resources.
- 
 
 
-\ **mksysb**\ 
- 
+
+\ **mksysb**\
+
  The name of a NIM mksysb resource.
- 
 
 
-\ **fb_script**\ 
- 
+
+\ **fb_script**\
+
  The name of a NIM fb_script resource.
- 
 
 
-\ **shared_root**\ 
- 
+
+\ **shared_root**\
+
  A shared_root resource represents a directory that can be used as a / (root) directory by one or more diskless clients.
- 
 
 
-\ **otherpkgs**\ 
- 
+
+\ **otherpkgs**\
+
  One or more comma separated installp or rpm packages.  The rpm packages must have a prefix of 'R:', (ex. R:foo.rpm)
- 
 
 
-\ **image_data**\ 
- 
+
+\ **image_data**\
+
  The name of a NIM image_data resource.
- 
 
 
-\ **configdump**\ 
- 
+
+\ **configdump**\
+
  Specifies the type of system dump to be collected. The values are selective, full, and none.  The default is selective.
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-provided notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -186,5 +186,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/nodegroup.5.rst b/docs/source/guides/admin-guides/references/man5/nodegroup.5.rst
index 8d6d32ade..e255d03fd 100644
--- a/docs/source/guides/admin-guides/references/man5/nodegroup.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/nodegroup.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **nodegroup Attributes:**\   \ *groupname*\ , \ *grouptype*\ , \ *members*\ , \ *membergroups*\ , \ *wherevals*\ , \ *comments*\ , \ *disable*\ 
+\ **nodegroup Attributes:**\   \ *groupname*\ , \ *grouptype*\ , \ *members*\ , \ *membergroups*\ , \ *wherevals*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,46 +36,46 @@ nodegroup Attributes:
 
 
 
-\ **groupname**\ 
- 
+\ **groupname**\
+
  Name of the group.
- 
 
 
-\ **grouptype**\ 
- 
+
+\ **grouptype**\
+
  The only current valid value is dynamic.  We will be looking at having the object def commands working with static group definitions in the nodelist table.
- 
 
 
-\ **members**\ 
- 
+
+\ **members**\
+
  The value of the attribute is not used, but the attribute is necessary as a place holder for the object def commands.  (The membership for static groups is stored in the nodelist table.)
- 
 
 
-\ **membergroups**\ 
- 
+
+\ **membergroups**\
+
  This attribute stores a comma-separated list of nodegroups that this nodegroup refers to. This attribute is only used by PCM.
- 
 
 
-\ **wherevals**\ 
- 
+
+\ **wherevals**\
+
  A list of "attr\*val" pairs that can be used to determine the members of a dynamic group, the delimiter is "::" and the operator \* can be ==, =~, != or !~.
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-written notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -84,5 +84,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/nodehm.5.rst b/docs/source/guides/admin-guides/references/man5/nodehm.5.rst
index aa12ce4b2..879bf699e 100644
--- a/docs/source/guides/admin-guides/references/man5/nodehm.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/nodehm.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **nodehm Attributes:**\   \ *node*\ , \ *power*\ , \ *mgt*\ , \ *cons*\ , \ *termserver*\ , \ *termport*\ , \ *conserver*\ , \ *serialport*\ , \ *serialspeed*\ , \ *serialflow*\ , \ *getmac*\ , \ *cmdmapping*\ , \ *consoleondemand*\ , \ *consoleenabled*\ , \ *comments*\ , \ *disable*\ 
+\ **nodehm Attributes:**\   \ *node*\ , \ *power*\ , \ *mgt*\ , \ *cons*\ , \ *termserver*\ , \ *termport*\ , \ *conserver*\ , \ *serialport*\ , \ *serialspeed*\ , \ *serialflow*\ , \ *getmac*\ , \ *cmdmapping*\ , \ *consoleondemand*\ , \ *consoleenabled*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,100 +36,100 @@ nodehm Attributes:
 
 
 
-\ **node**\ 
- 
+\ **node**\
+
  The node name or group name.
- 
 
 
-\ **power**\ 
- 
+
+\ **power**\
+
  The method to use to control the power of the node. If not set, the mgt attribute will be used.  Valid values: ipmi, blade, hmc, ivm, fsp, kvm, esx, rhevm.  If "ipmi", xCAT will search for this node in the ipmi table for more info.  If "blade", xCAT will search for this node in the mp table.  If "hmc", "ivm", or "fsp", xCAT will search for this node in the ppc table.
- 
 
 
-\ **mgt**\ 
- 
+
+\ **mgt**\
+
  The method to use to do general hardware management of the node.  This attribute is used as the default if power or getmac is not set.  Valid values: openbmc, ipmi, blade, hmc, ivm, fsp, bpa, kvm, esx, rhevm.  See the power attribute for more details.
- 
 
 
-\ **cons**\ 
- 
+
+\ **cons**\
+
  The console method. If nodehm.serialport is set, this will default to the nodehm.mgt setting, otherwise it defaults to unused.  Valid values: cyclades, mrv, or the values valid for the mgt attribute.
- 
 
 
-\ **termserver**\ 
- 
+
+\ **termserver**\
+
  The hostname of the terminal server.
- 
 
 
-\ **termport**\ 
- 
+
+\ **termport**\
+
  The port number on the terminal server that this node is connected to.
- 
 
 
-\ **conserver**\ 
- 
+
+\ **conserver**\
+
  The hostname of the machine where the conserver daemon is running.  If not set, the default is the xCAT management node.
- 
 
 
-\ **serialport**\ 
- 
+
+\ **serialport**\
+
  The serial port for this node, in the linux numbering style (0=COM1/ttyS0, 1=COM2/ttyS1).  For SOL on IBM blades, this is typically 1.  For rackmount IBM servers, this is typically 0.
- 
 
 
-\ **serialspeed**\ 
- 
+
+\ **serialspeed**\
+
  The speed of the serial port for this node.  For SOL this is typically 19200.
- 
 
 
-\ **serialflow**\ 
- 
+
+\ **serialflow**\
+
  The flow control value of the serial port for this node.  For SOL this is typically 'hard'.
- 
 
 
-\ **getmac**\ 
- 
+
+\ **getmac**\
+
  The method to use to get MAC address of the node with the getmac command. If not set, the mgt attribute will be used.  Valid values: same as values for mgmt attribute.
- 
 
 
-\ **cmdmapping**\ 
- 
+
+\ **cmdmapping**\
+
  The fully qualified name of the file that stores the mapping between PCM hardware management commands and xCAT/third-party hardware management commands for a particular type of hardware device.  Only used by PCM.
- 
 
 
-\ **consoleondemand**\ 
- 
+
+\ **consoleondemand**\
+
  This overrides the value from site.consoleondemand. Set to 'yes', 'no', '1' (equivalent to 'yes'), or '0' (equivalent to 'no'). If not set, the default is the value from site.consoleondemand.
- 
 
 
-\ **consoleenabled**\ 
- 
+
+\ **consoleenabled**\
+
  A flag field to indicate whether the node is registered in the console server. If '1', console is enabled, if not set, console is not enabled.
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-written notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -138,5 +138,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/nodelist.5.rst b/docs/source/guides/admin-guides/references/man5/nodelist.5.rst
index 7dbe45086..bbefb44bd 100644
--- a/docs/source/guides/admin-guides/references/man5/nodelist.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/nodelist.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **nodelist Attributes:**\   \ *node*\ , \ *groups*\ , \ *status*\ , \ *statustime*\ , \ *appstatus*\ , \ *appstatustime*\ , \ *primarysn*\ , \ *hidden*\ , \ *updatestatus*\ , \ *updatestatustime*\ , \ *zonename*\ , \ *comments*\ , \ *disable*\ 
+\ **nodelist Attributes:**\   \ *node*\ , \ *groups*\ , \ *status*\ , \ *statustime*\ , \ *appstatus*\ , \ *appstatustime*\ , \ *primarysn*\ , \ *hidden*\ , \ *updatestatus*\ , \ *updatestatustime*\ , \ *zonename*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,82 +36,82 @@ nodelist Attributes:
 
 
 
-\ **node**\ 
- 
+\ **node**\
+
  The hostname of a node in the cluster.
- 
 
 
-\ **groups**\ 
- 
+
+\ **groups**\
+
  A comma-delimited list of groups this node is a member of.  Group names are arbitrary, except all nodes should be part of the 'all' group. Internal group names are designated by using __<groupname>.  For example, __Unmanaged, could be the internal name for a group of nodes that is not managed by xCAT. Admins should avoid using the __ characters when defining their groups.
- 
 
 
-\ **status**\ 
- 
+
+\ **status**\
+
  The current status of this node.  This attribute will be set by xCAT software.  Valid values: defined, booting, netbooting, booted, discovering, configuring, installing, alive, standingby, powering-off, unreachable. If blank, defined is assumed. The possible status change sequences are: For installation: defined->[discovering]->[configuring]->[standingby]->installing->booting->[postbooting]->booted->[alive],  For diskless deployment: defined->[discovering]->[configuring]->[standingby]->netbooting->[postbooting]->booted->[alive],  For booting: [alive/unreachable]->booting->[postbooting]->booted->[alive],  For powering off: [alive]->powering-off->[unreachable], For monitoring: alive->unreachable. Discovering and configuring are for x Series discovery process. Alive and unreachable are set only when there is a monitoring plug-in start monitor the node status for xCAT. Note that the status values will not reflect the real node status if you change the state of the node from outside of xCAT (i.e. power off the node using HMC GUI).
- 
 
 
-\ **statustime**\ 
- 
+
+\ **statustime**\
+
  The data and time when the status was updated.
- 
 
 
-\ **appstatus**\ 
- 
+
+\ **appstatus**\
+
  A comma-delimited list of application status. For example: 'sshd=up,ftp=down,ll=down'
- 
 
 
-\ **appstatustime**\ 
- 
+
+\ **appstatustime**\
+
  The date and time when appstatus was updated.
- 
 
 
-\ **primarysn**\ 
- 
+
+\ **primarysn**\
+
  Not used currently. The primary servicenode, used by this node.
- 
 
 
-\ **hidden**\ 
- 
+
+\ **hidden**\
+
  Used to hide fsp and bpa definitions, 1 means not show them when running lsdef and nodels
- 
 
 
-\ **updatestatus**\ 
- 
+
+\ **updatestatus**\
+
  The current node update status. Valid states are synced, out-of-sync,syncing,failed.
- 
 
 
-\ **updatestatustime**\ 
- 
+
+\ **updatestatustime**\
+
  The date and time when the updatestatus was updated.
- 
 
 
-\ **zonename**\ 
- 
+
+\ **zonename**\
+
  The name of the zone to which the node is currently assigned. If undefined, then it is not assigned to any zone.
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-written notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -120,5 +120,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/nodepos.5.rst b/docs/source/guides/admin-guides/references/man5/nodepos.5.rst
index 8a603d7ce..2c9969c81 100644
--- a/docs/source/guides/admin-guides/references/man5/nodepos.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/nodepos.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **nodepos Attributes:**\   \ *node*\ , \ *rack*\ , \ *u*\ , \ *chassis*\ , \ *slot*\ , \ *room*\ , \ *height*\ , \ *comments*\ , \ *disable*\ 
+\ **nodepos Attributes:**\   \ *node*\ , \ *rack*\ , \ *u*\ , \ *chassis*\ , \ *slot*\ , \ *room*\ , \ *height*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,58 +36,58 @@ nodepos Attributes:
 
 
 
-\ **node**\ 
- 
+\ **node**\
+
  The node name or group name.
- 
 
 
-\ **rack**\ 
- 
+
+\ **rack**\
+
  The frame the node is in.
- 
 
 
-\ **u**\ 
- 
+
+\ **u**\
+
  The vertical position of the node in the frame
- 
 
 
-\ **chassis**\ 
- 
+
+\ **chassis**\
+
  The BladeCenter chassis the blade is in.
- 
 
 
-\ **slot**\ 
- 
+
+\ **slot**\
+
  The slot number of the blade in the chassis. For PCM, a comma-separated list of slot numbers is stored
- 
 
 
-\ **room**\ 
- 
+
+\ **room**\
+
  The room where the node is located.
- 
 
 
-\ **height**\ 
- 
+
+\ **height**\
+
  The server height in U(s).
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-written notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -96,5 +96,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/noderes.5.rst b/docs/source/guides/admin-guides/references/man5/noderes.5.rst
index 98bc13b24..2381e4e81 100644
--- a/docs/source/guides/admin-guides/references/man5/noderes.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/noderes.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **noderes Attributes:**\   \ *node*\ , \ *servicenode*\ , \ *netboot*\ , \ *tftpserver*\ , \ *tftpdir*\ , \ *nfsserver*\ , \ *monserver*\ , \ *nfsdir*\ , \ *installnic*\ , \ *primarynic*\ , \ *discoverynics*\ , \ *cmdinterface*\ , \ *xcatmaster*\ , \ *current_osimage*\ , \ *next_osimage*\ , \ *nimserver*\ , \ *routenames*\ , \ *nameservers*\ , \ *proxydhcp*\ , \ *syslog*\ , \ *comments*\ , \ *disable*\ 
+\ **noderes Attributes:**\   \ *node*\ , \ *servicenode*\ , \ *netboot*\ , \ *tftpserver*\ , \ *tftpdir*\ , \ *nfsserver*\ , \ *monserver*\ , \ *nfsdir*\ , \ *installnic*\ , \ *primarynic*\ , \ *discoverynics*\ , \ *cmdinterface*\ , \ *xcatmaster*\ , \ *current_osimage*\ , \ *next_osimage*\ , \ *nimserver*\ , \ *routenames*\ , \ *nameservers*\ , \ *proxydhcp*\ , \ *syslog*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,147 +36,147 @@ noderes Attributes:
 
 
 
-\ **node**\ 
- 
+\ **node**\
+
  The node name or group name.
- 
 
 
-\ **servicenode**\ 
- 
+
+\ **servicenode**\
+
  A comma separated list of node names (as known by the management node) that provides most services for this node. The first service node on the list that is accessible will be used.  The 2nd node on the list is generally considered to be the backup service node for this node when running commands like snmove.
- 
 
 
-\ **netboot**\ 
- 
+
+\ **netboot**\
+
  The type of network booting to use for this node.  Valid values:
- 
- 
+
+
  .. code-block:: perl
- 
+
                          Arch                    OS                           valid netboot options
                          x86, x86_64             ALL                          pxe, xnba
                          ppc64                   <=rhel6, <=sles11.3          yaboot
                          ppc64                   >=rhels7, >=sles11.4         grub2,grub2-http,grub2-tftp
                          ppc64le NonVirtualize   ALL                          petitboot
                          ppc64le PowerKVM Guest  ALL                          grub2,grub2-http,grub2-tftp
- 
- 
 
 
-\ **tftpserver**\ 
- 
+
+
+\ **tftpserver**\
+
  The TFTP server for this node (as known by this node). If not set, it defaults to networks.tftpserver.
- 
 
 
-\ **tftpdir**\ 
- 
+
+\ **tftpdir**\
+
  The directory that roots this nodes contents from a tftp and related perspective.  Used for NAS offload by using different mountpoints.
- 
 
 
-\ **nfsserver**\ 
- 
+
+\ **nfsserver**\
+
  The NFS or HTTP server for this node (as known by this node).
- 
 
 
-\ **monserver**\ 
- 
+
+\ **monserver**\
+
  The monitoring aggregation point for this node. The format is "x,y" where x is the ip address as known by the management node and y is the ip address as known by the node.
- 
 
 
-\ **nfsdir**\ 
- 
+
+\ **nfsdir**\
+
  The path that should be mounted from the NFS server.
- 
 
 
-\ **installnic**\ 
- 
+
+\ **installnic**\
+
  The network adapter on the node that will be used for OS deployment, the installnic can be set to the network adapter name or the mac address or the keyword "mac" which means that the network interface specified by the mac address in the mac table will be used.  If not set, primarynic will be used. If primarynic is not set too, the keyword "mac" will be used as default.
- 
 
 
-\ **primarynic**\ 
- 
+
+\ **primarynic**\
+
  This attribute will be deprecated. All the used network interface will be determined by installnic. The network adapter on the node that will be used for xCAT management, the primarynic can be set to the network adapter name or the mac address or the keyword "mac" which means that the network interface specified by the mac address in the mac table  will be used.  Default is eth0.
- 
 
 
-\ **discoverynics**\ 
- 
+
+\ **discoverynics**\
+
  If specified, force discovery to occur on specific network adapters only, regardless of detected connectivity.  Syntax can be simply "eth2,eth3" to restrict discovery to whatever happens to come up as eth2 and eth3, or by driver name such as "bnx2:0,bnx2:1" to specify the first two adapters managed by the bnx2 driver
- 
 
 
-\ **cmdinterface**\ 
- 
+
+\ **cmdinterface**\
+
  Not currently used.
- 
 
 
-\ **xcatmaster**\ 
- 
+
+\ **xcatmaster**\
+
  The hostname of the xCAT service node (as known by this node).  This acts as the default value for nfsserver and tftpserver, if they are not set.  If xcatmaster is not set, the node will use whoever responds to its boot request as its master.  For the directed bootp case for POWER, it will use the management node if xcatmaster is not set.
- 
 
 
-\ **current_osimage**\ 
- 
+
+\ **current_osimage**\
+
  Not currently used.  The name of the osimage data object that represents the OS image currently deployed on this node.
- 
 
 
-\ **next_osimage**\ 
- 
+
+\ **next_osimage**\
+
  Not currently used.  The name of the osimage data object that represents the OS image that will be installed on the node the next time it is deployed.
- 
 
 
-\ **nimserver**\ 
- 
+
+\ **nimserver**\
+
  Not used for now. The NIM server for this node (as known by this node).
- 
 
 
-\ **routenames**\ 
- 
+
+\ **routenames**\
+
  A comma separated list of route names that refer to rows in the routes table. These are the routes that should be defined on this node when it is deployed.
- 
 
 
-\ **nameservers**\ 
- 
+
+\ **nameservers**\
+
  An optional node/group specific override for name server list.  Most people want to stick to site or network defined nameserver configuration.
- 
 
 
-\ **proxydhcp**\ 
- 
+
+\ **proxydhcp**\
+
  To specify whether the node supports proxydhcp protocol. Valid values: yes or 1, no or 0. Default value is yes.
- 
 
 
-\ **syslog**\ 
- 
+
+\ **syslog**\
+
  To configure how to configure syslog for compute node. Valid values:blank(not set), ignore. blank - run postscript syslog; ignore - do NOT run postscript syslog
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-written notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -185,5 +185,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/nodetype.5.rst b/docs/source/guides/admin-guides/references/man5/nodetype.5.rst
index 7d75e070c..820914581 100644
--- a/docs/source/guides/admin-guides/references/man5/nodetype.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/nodetype.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **nodetype Attributes:**\   \ *node*\ , \ *os*\ , \ *arch*\ , \ *profile*\ , \ *provmethod*\ , \ *supportedarchs*\ , \ *nodetype*\ , \ *comments*\ , \ *disable*\ 
+\ **nodetype Attributes:**\   \ *node*\ , \ *os*\ , \ *arch*\ , \ *profile*\ , \ *provmethod*\ , \ *supportedarchs*\ , \ *nodetype*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,58 +36,58 @@ nodetype Attributes:
 
 
 
-\ **node**\ 
- 
+\ **node**\
+
  The node name or group name.
- 
 
 
-\ **os**\ 
- 
+
+\ **os**\
+
  The operating system deployed on this node.  Valid values: AIX, rhels\*,rhelc\*, rhas\*,centos\*,SL\*, fedora\*, sles\* (where \* is the version #). As a special case, if this is set to "boottarget", then it will use the initrd/kernel/parameters specified in the row in the boottarget table in which boottarget.bprofile equals nodetype.profile.
- 
 
 
-\ **arch**\ 
- 
+
+\ **arch**\
+
  The hardware architecture of this node.  Valid values: x86_64, ppc64, x86, ia64.
- 
 
 
-\ **profile**\ 
- 
+
+\ **profile**\
+
  The string to use to locate a kickstart or autoyast template to use for OS deployment of this node.  If the provmethod attribute is set to an osimage name, that takes precedence, and profile need not be defined.  Otherwise, the os, profile, and arch are used to search for the files in /install/custom first, and then in /opt/xcat/share/xcat.
- 
 
 
-\ **provmethod**\ 
- 
+
+\ **provmethod**\
+
  The provisioning method for node deployment. The valid values are install, netboot, statelite or an os image name from the osimage table. If an image name is specified, the osimage definition stored in the osimage table and the linuximage table (for Linux) or nimimage table (for AIX) are used to locate the files for templates, pkglists, syncfiles, etc. On Linux, if install, netboot or statelite is specified, the os, profile, and arch are used to search for the files in /install/custom first, and then in /opt/xcat/share/xcat.
- 
 
 
-\ **supportedarchs**\ 
- 
+
+\ **supportedarchs**\
+
  Comma delimited list of architectures this node can execute.
- 
 
 
-\ **nodetype**\ 
- 
+
+\ **nodetype**\
+
  A comma-delimited list of characteristics of this node.  Valid values: ppc, blade, vm (virtual machine), osi (OS image), mm, mn, rsa, switch.
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-written notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -96,5 +96,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/notification.5.rst b/docs/source/guides/admin-guides/references/man5/notification.5.rst
index bd5027a74..795536bb9 100644
--- a/docs/source/guides/admin-guides/references/man5/notification.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/notification.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **notification Attributes:**\   \ *filename*\ , \ *tables*\ , \ *tableops*\ , \ *comments*\ , \ *disable*\ 
+\ **notification Attributes:**\   \ *filename*\ , \ *tables*\ , \ *tableops*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,34 +36,34 @@ notification Attributes:
 
 
 
-\ **filename**\ 
- 
+\ **filename**\
+
  The path name of a file that implements the callback routine when the monitored table changes.  Can be a perl module or a command.  See the regnotif man page for details.
- 
 
 
-\ **tables**\ 
- 
+
+\ **tables**\
+
  Comma-separated list of xCAT database tables to monitor.
- 
 
 
-\ **tableops**\ 
- 
+
+\ **tableops**\
+
  Specifies the table operation to monitor for. Valid values:  "d" (rows deleted), "a" (rows added), "u" (rows updated).
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-written notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -72,5 +72,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/openbmc.5.rst b/docs/source/guides/admin-guides/references/man5/openbmc.5.rst
index 11bbee003..88dae91e3 100644
--- a/docs/source/guides/admin-guides/references/man5/openbmc.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/openbmc.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **openbmc Attributes:**\   \ *node*\ , \ *bmc*\ , \ *consport*\ , \ *taggedvlan*\ , \ *username*\ , \ *password*\ , \ *comments*\ , \ *disable*\ 
+\ **openbmc Attributes:**\   \ *node*\ , \ *bmc*\ , \ *consport*\ , \ *taggedvlan*\ , \ *username*\ , \ *password*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,52 +36,52 @@ openbmc Attributes:
 
 
 
-\ **node**\ 
- 
+\ **node**\
+
  The node name or group name.
- 
 
 
-\ **bmc**\ 
- 
+
+\ **bmc**\
+
  The hostname of the BMC adapter.
- 
 
 
-\ **consport**\ 
- 
+
+\ **consport**\
+
  The console port for OpenBMC.
- 
 
 
-\ **taggedvlan**\ 
- 
+
+\ **taggedvlan**\
+
  bmcsetup script will configure the network interface of the BMC to be tagged to the VLAN specified.
- 
 
 
-\ **username**\ 
- 
+
+\ **username**\
+
  The BMC userid.
- 
 
 
-\ **password**\ 
- 
+
+\ **password**\
+
  The BMC password.
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-written notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -90,5 +90,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/osdistro.5.rst b/docs/source/guides/admin-guides/references/man5/osdistro.5.rst
index 8be247605..07045a5b2 100644
--- a/docs/source/guides/admin-guides/references/man5/osdistro.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/osdistro.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **osdistro Attributes:**\   \ *osdistroname*\ , \ *basename*\ , \ *majorversion*\ , \ *minorversion*\ , \ *arch*\ , \ *type*\ , \ *dirpaths*\ , \ *comments*\ , \ *disable*\ 
+\ **osdistro Attributes:**\   \ *osdistroname*\ , \ *basename*\ , \ *majorversion*\ , \ *minorversion*\ , \ *arch*\ , \ *type*\ , \ *dirpaths*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,58 +36,58 @@ osdistro Attributes:
 
 
 
-\ **osdistroname**\ 
- 
+\ **osdistroname**\
+
  Unique name (e.g. rhels6.2-x86_64)
- 
 
 
-\ **basename**\ 
- 
+
+\ **basename**\
+
  The OS base name (e.g. rhels)
- 
 
 
-\ **majorversion**\ 
- 
+
+\ **majorversion**\
+
  The OS distro major version.(e.g. 6)
- 
 
 
-\ **minorversion**\ 
- 
+
+\ **minorversion**\
+
  The OS distro minor version. (e.g. 2)
- 
 
 
-\ **arch**\ 
- 
+
+\ **arch**\
+
  The OS distro arch (e.g. x86_64)
- 
 
 
-\ **type**\ 
- 
+
+\ **type**\
+
  Linux or AIX
- 
 
 
-\ **dirpaths**\ 
- 
+
+\ **dirpaths**\
+
  Directory paths where OS distro is store. There could be multiple paths if OS distro has more than one ISO image. (e.g. /install/rhels6.2/x86_64,...)
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-written notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -96,5 +96,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/osdistroupdate.5.rst b/docs/source/guides/admin-guides/references/man5/osdistroupdate.5.rst
index 2d74cbd9c..99c05a153 100644
--- a/docs/source/guides/admin-guides/references/man5/osdistroupdate.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/osdistroupdate.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **osdistroupdate Attributes:**\   \ *osupdatename*\ , \ *osdistroname*\ , \ *dirpath*\ , \ *downloadtime*\ , \ *comments*\ , \ *disable*\ 
+\ **osdistroupdate Attributes:**\   \ *osupdatename*\ , \ *osdistroname*\ , \ *dirpath*\ , \ *downloadtime*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,40 +36,40 @@ osdistroupdate Attributes:
 
 
 
-\ **osupdatename**\ 
- 
+\ **osupdatename**\
+
  Name of OS update. (e.g. rhn-update1)
- 
 
 
-\ **osdistroname**\ 
- 
+
+\ **osdistroname**\
+
  The OS distro name to update. (e.g. rhels)
- 
 
 
-\ **dirpath**\ 
- 
+
+\ **dirpath**\
+
  Path to where OS distro update is stored. (e.g. /install/osdistroupdates/rhels6.2-x86_64-20120716-update)
- 
 
 
-\ **downloadtime**\ 
- 
+
+\ **downloadtime**\
+
  The timestamp when OS distro update was downloaded..
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-written notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -78,5 +78,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/osimage.5.rst b/docs/source/guides/admin-guides/references/man5/osimage.5.rst
index 968b2f443..4be9e16ee 100644
--- a/docs/source/guides/admin-guides/references/man5/osimage.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/osimage.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **osimage Attributes:**\   \ *imagename*\ , \ *groups*\ , \ *profile*\ , \ *imagetype*\ , \ *description*\ , \ *provmethod*\ , \ *rootfstype*\ , \ *osdistroname*\ , \ *osupdatename*\ , \ *cfmdir*\ , \ *osname*\ , \ *osvers*\ , \ *osarch*\ , \ *synclists*\ , \ *postscripts*\ , \ *postbootscripts*\ , \ *serverrole*\ , \ *isdeletable*\ , \ *kitcomponents*\ , \ *comments*\ , \ *disable*\ 
+\ **osimage Attributes:**\   \ *imagename*\ , \ *groups*\ , \ *profile*\ , \ *imagetype*\ , \ *description*\ , \ *provmethod*\ , \ *rootfstype*\ , \ *osdistroname*\ , \ *osupdatename*\ , \ *cfmdir*\ , \ *osname*\ , \ *osvers*\ , \ *osarch*\ , \ *synclists*\ , \ *postscripts*\ , \ *postbootscripts*\ , \ *serverrole*\ , \ *isdeletable*\ , \ *kitcomponents*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,130 +36,130 @@ osimage Attributes:
 
 
 
-\ **imagename**\ 
- 
+\ **imagename**\
+
  The name of this xCAT OS image definition.
- 
 
 
-\ **groups**\ 
- 
+
+\ **groups**\
+
  A comma-delimited list of image groups of which this image is a member.  Image groups can be used in the litefile and litetree table instead of a single image name. Group names are arbitrary.
- 
 
 
-\ **profile**\ 
- 
+
+\ **profile**\
+
  The node usage category. For example compute, service.
- 
 
 
-\ **imagetype**\ 
- 
+
+\ **imagetype**\
+
  The type of operating system image this definition represents (linux,AIX).
- 
 
 
-\ **description**\ 
- 
+
+\ **description**\
+
  OS Image Description
- 
 
 
-\ **provmethod**\ 
- 
+
+\ **provmethod**\
+
  The provisioning method for node deployment. The valid values are install, netboot,statelite,boottarget,dualboot,sysclone. If boottarget is set, you must set linuximage.boottarget to the name of the boottarget definition. It is not used by AIX.
- 
 
 
-\ **rootfstype**\ 
- 
+
+\ **rootfstype**\
+
  The filesystem type for the rootfs is used when the provmethod is statelite. The valid values are nfs or ramdisk. The default value is nfs
- 
 
 
-\ **osdistroname**\ 
- 
+
+\ **osdistroname**\
+
  The name of the OS distro definition.  This attribute can be used to specify which OS distro to use, instead of using the osname,osvers,and osarch attributes. For \*kit commands,  the attribute will be used to read the osdistro table for the osname, osvers, and osarch attributes. If defined, the osname, osvers, and osarch attributes defined in the osimage table will be ignored.
- 
 
 
-\ **osupdatename**\ 
- 
+
+\ **osupdatename**\
+
  A comma-separated list of OS distro updates to apply to this osimage.
- 
 
 
-\ **cfmdir**\ 
- 
+
+\ **cfmdir**\
+
  CFM directory name for PCM. Set to /install/osimages/<osimage name>/cfmdir by PCM.
- 
 
 
-\ **osname**\ 
- 
+
+\ **osname**\
+
  Operating system name- AIX or Linux.
- 
 
 
-\ **osvers**\ 
- 
+
+\ **osvers**\
+
  The Linux operating system deployed on this node.  Valid values:  rhels\*,rhelc\*, rhas\*,centos\*,SL\*, fedora\*, sles\* (where \* is the version #).
- 
 
 
-\ **osarch**\ 
- 
+
+\ **osarch**\
+
  The hardware architecture of this node.  Valid values: x86_64, ppc64, x86, ia64.
- 
 
 
-\ **synclists**\ 
- 
+
+\ **synclists**\
+
  The fully qualified name of a file containing a list of files to synchronize on the nodes. Can be a comma separated list of multiple synclist files. The synclist generated by PCM named /install/osimages/<imagename>/synclist.cfm is reserved for use only by PCM and should not be edited by the admin.
- 
 
 
-\ **postscripts**\ 
- 
+
+\ **postscripts**\
+
  Comma separated list of scripts that should be run on this image after diskful installation or diskless boot. For installation of RedHat, CentOS, Fedora, the scripts will be run before the reboot. For installation of SLES, the scripts will be run after the reboot but before the init.d process. For diskless deployment, the scripts will be run at the init.d time, and xCAT will automatically add the list of scripts from the postbootscripts attribute to run after postscripts list. For installation of AIX, the scripts will run after the reboot and acts the same as the postbootscripts attribute.  For AIX, use the postbootscripts attribute. See the site table runbootscripts attribute.
- 
 
 
-\ **postbootscripts**\ 
- 
+
+\ **postbootscripts**\
+
  Comma separated list of scripts that should be run on this after diskful installation or diskless boot. On AIX these scripts are run during the processing of /etc/inittab.  On Linux they are run at the init.d time. xCAT automatically adds the scripts in the xcatdefaults.postbootscripts attribute to run first in the list. See the site table runbootscripts attribute.
- 
 
 
-\ **serverrole**\ 
- 
+
+\ **serverrole**\
+
  The role of the server created by this osimage.  Default roles: mgtnode, servicenode, compute, login, storage, utility.
- 
 
 
-\ **isdeletable**\ 
- 
+
+\ **isdeletable**\
+
  A flag to indicate whether this image profile can be deleted.  This attribute is only used by PCM.
- 
 
 
-\ **kitcomponents**\ 
- 
+
+\ **kitcomponents**\
+
  List of Kit Component IDs assigned to this OS Image definition.
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-written notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -168,5 +168,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/passwd.5.rst b/docs/source/guides/admin-guides/references/man5/passwd.5.rst
index 4123a9258..f36b52c44 100644
--- a/docs/source/guides/admin-guides/references/man5/passwd.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/passwd.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **passwd Attributes:**\   \ *key*\ , \ *username*\ , \ *password*\ , \ *cryptmethod*\ , \ *authdomain*\ , \ *comments*\ , \ *disable*\ 
+\ **passwd Attributes:**\   \ *key*\ , \ *username*\ , \ *password*\ , \ *cryptmethod*\ , \ *authdomain*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,46 +36,46 @@ passwd Attributes:
 
 
 
-\ **key**\ 
- 
+\ **key**\
+
  The type of component this user/pw is for.  Valid values: blade (management module), ipmi (BMC), system (nodes), omapi (DHCP), hmc, ivm, cec, frame, switch.
- 
 
 
-\ **username**\ 
- 
+
+\ **username**\
+
  The default userid for this type of component
- 
 
 
-\ **password**\ 
- 
+
+\ **password**\
+
  The default password for this type of component. On Linux, a crypted form could be provided. Hashes starting with $1$, $5$ and $6$ (md5, sha256 and sha512 respectively) are supported.
- 
 
 
-\ **cryptmethod**\ 
- 
+
+\ **cryptmethod**\
+
  Indicates the method to use to encrypt the password attribute.  On AIX systems, if a value is provided for this attribute it indicates that the password attribute is encrypted.  If the cryptmethod value is not set it indicates the password is a simple string value. On Linux systems, the cryptmethod can be set to md5, sha256 or sha512. If not set, sha256 will be used as default to encrypt plain-text passwords.
- 
 
 
-\ **authdomain**\ 
- 
+
+\ **authdomain**\
+
  The domain in which this entry has meaning, e.g. specifying different domain administrators per active directory domain
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-written notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -84,5 +84,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/pdu.5.rst b/docs/source/guides/admin-guides/references/man5/pdu.5.rst
index c94edf9fe..e2293b772 100644
--- a/docs/source/guides/admin-guides/references/man5/pdu.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/pdu.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **pdu Attributes:**\   \ *node*\ , \ *nodetype*\ , \ *pdutype*\ , \ *outlet*\ , \ *username*\ , \ *password*\ , \ *snmpversion*\ , \ *community*\ , \ *snmpuser*\ , \ *authtype*\ , \ *authkey*\ , \ *privtype*\ , \ *privkey*\ , \ *seclevel*\ , \ *comments*\ , \ *disable*\ 
+\ **pdu Attributes:**\   \ *node*\ , \ *nodetype*\ , \ *pdutype*\ , \ *outlet*\ , \ *username*\ , \ *password*\ , \ *snmpversion*\ , \ *community*\ , \ *snmpuser*\ , \ *authtype*\ , \ *authkey*\ , \ *privtype*\ , \ *privkey*\ , \ *seclevel*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,100 +36,100 @@ pdu Attributes:
 
 
 
-\ **node**\ 
- 
+\ **node**\
+
  The hostname/address of the pdu to which the settings apply
- 
 
 
-\ **nodetype**\ 
- 
+
+\ **nodetype**\
+
  The node type should be pdu
- 
 
 
-\ **pdutype**\ 
- 
+
+\ **pdutype**\
+
  The type of pdu
- 
 
 
-\ **outlet**\ 
- 
+
+\ **outlet**\
+
  The pdu outlet count
- 
 
 
-\ **username**\ 
- 
+
+\ **username**\
+
  The remote login user name
- 
 
 
-\ **password**\ 
- 
+
+\ **password**\
+
  The remote login password
- 
 
 
-\ **snmpversion**\ 
- 
+
+\ **snmpversion**\
+
  The version to use to communicate with switch.  SNMPv1 is assumed by default.
- 
 
 
-\ **community**\ 
- 
+
+\ **community**\
+
  The community string to use for SNMPv1/v2
- 
 
 
-\ **snmpuser**\ 
- 
+
+\ **snmpuser**\
+
  The username to use for SNMPv3 communication, ignored for SNMPv1
- 
 
 
-\ **authtype**\ 
- 
+
+\ **authtype**\
+
  The authentication protocol(MD5|SHA) to use for SNMPv3.
- 
 
 
-\ **authkey**\ 
- 
+
+\ **authkey**\
+
  The authentication passphrase for SNMPv3
- 
 
 
-\ **privtype**\ 
- 
+
+\ **privtype**\
+
  The privacy protocol(AES|DES) to use for SNMPv3.
- 
 
 
-\ **privkey**\ 
- 
+
+\ **privkey**\
+
  The privacy passphrase to use for SNMPv3.
- 
 
 
-\ **seclevel**\ 
- 
+
+\ **seclevel**\
+
  The Security Level(noAuthNoPriv|authNoPriv|authPriv) to use for SNMPv3.
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-written notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -138,5 +138,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/pduoutlet.5.rst b/docs/source/guides/admin-guides/references/man5/pduoutlet.5.rst
index cbed931c1..5d2f72bd4 100644
--- a/docs/source/guides/admin-guides/references/man5/pduoutlet.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/pduoutlet.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **pduoutlet Attributes:**\   \ *node*\ , \ *pdu*\ , \ *comments*\ , \ *disable*\ 
+\ **pduoutlet Attributes:**\   \ *node*\ , \ *pdu*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,28 +36,28 @@ pduoutlet Attributes:
 
 
 
-\ **node**\ 
- 
+\ **node**\
+
  The node name or group name.
- 
 
 
-\ **pdu**\ 
- 
+
+\ **pdu**\
+
  a comma-separated list of outlet number for each PDU, ex: pdu1:outlet1,pdu2:outlet1
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-written notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -66,5 +66,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/performance.5.rst b/docs/source/guides/admin-guides/references/man5/performance.5.rst
index 1af503424..c1e8afe31 100644
--- a/docs/source/guides/admin-guides/references/man5/performance.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/performance.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **performance Attributes:**\   \ *timestamp*\ , \ *node*\ , \ *attrname*\ , \ *attrvalue*\ , \ *comments*\ , \ *disable*\ 
+\ **performance Attributes:**\   \ *timestamp*\ , \ *node*\ , \ *attrname*\ , \ *attrvalue*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,40 +36,40 @@ performance Attributes:
 
 
 
-\ **timestamp**\ 
- 
+\ **timestamp**\
+
  The time at which the metric was captured.
- 
 
 
-\ **node**\ 
- 
+
+\ **node**\
+
  The node name.
- 
 
 
-\ **attrname**\ 
- 
+
+\ **attrname**\
+
  The metric name.
- 
 
 
-\ **attrvalue**\ 
- 
+
+\ **attrvalue**\
+
  The metric value.
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-provided notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -78,5 +78,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/policy.5.rst b/docs/source/guides/admin-guides/references/man5/policy.5.rst
index 7b41a78db..f2a5357ad 100644
--- a/docs/source/guides/admin-guides/references/man5/policy.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/policy.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **policy Attributes:**\   \ *priority*\ , \ *name*\ , \ *host*\ , \ *commands*\ , \ *noderange*\ , \ *parameters*\ , \ *time*\ , \ *rule*\ , \ *comments*\ , \ *disable*\ 
+\ **policy Attributes:**\   \ *priority*\ , \ *name*\ , \ *host*\ , \ *commands*\ , \ *noderange*\ , \ *parameters*\ , \ *time*\ , \ *rule*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,64 +36,64 @@ policy Attributes:
 
 
 
-\ **priority**\ 
- 
+\ **priority**\
+
  The priority value for this rule.  This value is used to identify this policy data object (i.e. this rule) The table is sorted on this field with the lower the number the higher the priority. For example 1.0 is higher priority than 4.1 is higher than 4.9.
- 
 
 
-\ **name**\ 
- 
+
+\ **name**\
+
  The username that is allowed to perform the commands specified by this rule.  Default is "\*" (all users).
- 
 
 
-\ **host**\ 
- 
+
+\ **host**\
+
  The host from which users may issue the commands specified by this rule.  Default is "\*" (all hosts). Only all or one host is supported
- 
 
 
-\ **commands**\ 
- 
+
+\ **commands**\
+
  The list of commands that this rule applies to.  Default is "\*" (all commands).
- 
 
 
-\ **noderange**\ 
- 
+
+\ **noderange**\
+
  The Noderange that this rule applies to.  Default is "\*" (all nodes). Not supported with the \*def commands.
- 
 
 
-\ **parameters**\ 
- 
+
+\ **parameters**\
+
  A regular expression that matches the command parameters (everything except the noderange) that this rule applies to.  Default is "\*" (all parameters). Not supported with the \*def commands.
- 
 
 
-\ **time**\ 
- 
+
+\ **time**\
+
  Time ranges that this command may be executed in.  This is not supported.
- 
 
 
-\ **rule**\ 
- 
+
+\ **rule**\
+
  Specifies how this rule should be applied.  Valid values are: allow, trusted. Allow will allow the user to run the commands. Any other value will deny the user access to the commands. Trusted means that once this client has been authenticated via the certificate, all other information that is sent (e.g. the username) is believed without question.  This authorization should only be given to the xcatd on the management node at this time.
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-written notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -102,5 +102,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/postscripts.5.rst b/docs/source/guides/admin-guides/references/man5/postscripts.5.rst
index 6bac116b9..c91b3d21e 100644
--- a/docs/source/guides/admin-guides/references/man5/postscripts.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/postscripts.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **postscripts Attributes:**\   \ *node*\ , \ *postscripts*\ , \ *postbootscripts*\ , \ *comments*\ , \ *disable*\ 
+\ **postscripts Attributes:**\   \ *node*\ , \ *postscripts*\ , \ *postbootscripts*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,34 +36,34 @@ postscripts Attributes:
 
 
 
-\ **node**\ 
- 
+\ **node**\
+
  The node name or group name.
- 
 
 
-\ **postscripts**\ 
- 
+
+\ **postscripts**\
+
  Comma separated list of scripts that should be run on this node after diskful installation or diskless boot. Each script can take zero or more parameters. For example: "script1 p1 p2,script2,...". xCAT automatically adds the postscripts from  the xcatdefaults.postscripts attribute of the table to run first on the nodes after install or diskless boot. For installation of RedHat, CentOS, Fedora, the scripts will be run before the reboot. For installation of SLES, the scripts will be run after the reboot but before the init.d process. For diskless deployment, the scripts will be run at the init.d time, and xCAT will automatically add the list of scripts from the postbootscripts attribute to run after postscripts list. For installation of AIX, the scripts will run after the reboot and acts the same as the postbootscripts attribute.  For AIX, use the postbootscripts attribute. Please note that the postscripts specified for "xcatdefaults" will be assigned to node automatically, they can not be removed from "postscripts" attribute of a node with "chdef -m" command
- 
 
 
-\ **postbootscripts**\ 
- 
+
+\ **postbootscripts**\
+
  Comma separated list of scripts that should be run on this node after diskful installation or diskless boot. Each script can take zero or more parameters. For example: "script1 p1 p2,script2,...". On AIX these scripts are run during the processing of /etc/inittab.  On Linux they are run at the init.d time. xCAT automatically adds the scripts in the xcatdefaults.postbootscripts attribute to run first in the list. Please note that the postbootscripts specified for "xcatdefaults" will be assigned to node automatically, they can not be removed from "postbootscripts" attribute of a node with "chdef -m" command
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-written notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -72,5 +72,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/ppc.5.rst b/docs/source/guides/admin-guides/references/man5/ppc.5.rst
index 3e6fed8cd..2dbcf6872 100644
--- a/docs/source/guides/admin-guides/references/man5/ppc.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/ppc.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **ppc Attributes:**\   \ *node*\ , \ *hcp*\ , \ *id*\ , \ *pprofile*\ , \ *parent*\ , \ *nodetype*\ , \ *supernode*\ , \ *sfp*\ , \ *comments*\ , \ *disable*\ 
+\ **ppc Attributes:**\   \ *node*\ , \ *hcp*\ , \ *id*\ , \ *pprofile*\ , \ *parent*\ , \ *nodetype*\ , \ *supernode*\ , \ *sfp*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,64 +36,64 @@ ppc Attributes:
 
 
 
-\ **node**\ 
- 
+\ **node**\
+
  The node name or group name.
- 
 
 
-\ **hcp**\ 
- 
+
+\ **hcp**\
+
  The hardware control point for this node (HMC, IVM, Frame or CEC).  Do not need to set for BPAs and FSPs.
- 
 
 
-\ **id**\ 
- 
+
+\ **id**\
+
  For LPARs: the LPAR numeric id; for CECs: the cage number; for Frames: the frame number.
- 
 
 
-\ **pprofile**\ 
- 
+
+\ **pprofile**\
+
  The LPAR profile that will be used the next time the LPAR is powered on with rpower. For DFM, the pprofile attribute should be set to blank
- 
 
 
-\ **parent**\ 
- 
+
+\ **parent**\
+
  For LPARs: the CEC; for FSPs: the CEC; for CEC: the frame (if one exists); for BPA: the frame; for frame: the building block number (which consists 1 or more service nodes and compute/storage nodes that are serviced by them - optional).
- 
 
 
-\ **nodetype**\ 
- 
+
+\ **nodetype**\
+
  The hardware type of the node. Only can be one of fsp, bpa, cec, frame, ivm, hmc and lpar
- 
 
 
-\ **supernode**\ 
- 
+
+\ **supernode**\
+
  Indicates the connectivity of this CEC in the HFI network. A comma separated list of 2 ids. The first one is the supernode number the CEC is part of. The second one is the logical location number (0-3) of this CEC within the supernode.
- 
 
 
-\ **sfp**\ 
- 
+
+\ **sfp**\
+
  The Service Focal Point of this Frame. This is the name of the HMC that is responsible for collecting hardware service events for this frame and all of the CECs within this frame.
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-written notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -102,5 +102,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/ppcdirect.5.rst b/docs/source/guides/admin-guides/references/man5/ppcdirect.5.rst
index dd1002955..db01defb7 100644
--- a/docs/source/guides/admin-guides/references/man5/ppcdirect.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/ppcdirect.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **ppcdirect Attributes:**\   \ *hcp*\ , \ *username*\ , \ *password*\ , \ *comments*\ , \ *disable*\ 
+\ **ppcdirect Attributes:**\   \ *hcp*\ , \ *username*\ , \ *password*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,34 +36,34 @@ ppcdirect Attributes:
 
 
 
-\ **hcp**\ 
- 
+\ **hcp**\
+
  Hostname of the FSPs/BPAs(for ASMI) and CECs/Frames(for DFM).
- 
 
 
-\ **username**\ 
- 
+
+\ **username**\
+
  Userid of the FSP/BPA(for ASMI) and CEC/Frame(for DFM).  If not filled in, xCAT will look in the passwd table for key=fsp.  If not in the passwd table, the default used is admin.
- 
 
 
-\ **password**\ 
- 
+
+\ **password**\
+
  Password of the FSP/BPA(for ASMI) and CEC/Frame(for DFM).  If not filled in, xCAT will look in the passwd table for key=fsp.  If not in the passwd table, the default used is admin.
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-written notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -72,5 +72,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/ppchcp.5.rst b/docs/source/guides/admin-guides/references/man5/ppchcp.5.rst
index 80b3d3601..6b4ffa611 100644
--- a/docs/source/guides/admin-guides/references/man5/ppchcp.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/ppchcp.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **ppchcp Attributes:**\   \ *hcp*\ , \ *username*\ , \ *password*\ , \ *comments*\ , \ *disable*\ 
+\ **ppchcp Attributes:**\   \ *hcp*\ , \ *username*\ , \ *password*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,34 +36,34 @@ ppchcp Attributes:
 
 
 
-\ **hcp**\ 
- 
+\ **hcp**\
+
  Hostname of the HMC or IVM.
- 
 
 
-\ **username**\ 
- 
+
+\ **username**\
+
  Userid of the HMC or IVM.  If not filled in, xCAT will look in the passwd table for key=hmc or key=ivm.  If not in the passwd table, the default used is hscroot for HMCs and padmin for IVMs.
- 
 
 
-\ **password**\ 
- 
+
+\ **password**\
+
  Password of the HMC or IVM.  If not filled in, xCAT will look in the passwd table for key=hmc or key=ivm.  If not in the passwd table, the default used is abc123 for HMCs and padmin for IVMs.
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-written notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -72,5 +72,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/prescripts.5.rst b/docs/source/guides/admin-guides/references/man5/prescripts.5.rst
index 13f42e25c..4a865211f 100644
--- a/docs/source/guides/admin-guides/references/man5/prescripts.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/prescripts.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **prescripts Attributes:**\   \ *node*\ , \ *begin*\ , \ *end*\ , \ *comments*\ , \ *disable*\ 
+\ **prescripts Attributes:**\   \ *node*\ , \ *begin*\ , \ *end*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,21 +36,21 @@ prescripts Attributes:
 
 
 
-\ **node**\ 
- 
+\ **node**\
+
  The node name or group name.
- 
 
 
-\ **begin**\ 
- 
+
+\ **begin**\
+
  The scripts to be run at the beginning of the nodeset(Linux), nimnodeset(AIX) or mkdsklsnode(AIX) command.
   The format is:
     [action1:]s1,s2...[| action2:s3,s4,s5...]
   where:
-   - action1 and action2 for Linux are the nodeset actions specified in the command. 
+   - action1 and action2 for Linux are the nodeset actions specified in the command.
      For AIX, action1 and action1 can be 'diskless' for mkdsklsnode command'
-     and 'standalone for nimnodeset command. 
+     and 'standalone for nimnodeset command.
    - s1 and s2 are the scripts to run for action1 in order.
    - s3, s4, and s5 are the scripts to run for actions2.
   If actions are omitted, the scripts apply to all actions.
@@ -59,32 +59,32 @@ prescripts Attributes:
     diskless:myscript1,myscript2   (AIX)
     install:myscript1,myscript2|netboot:myscript3   (Linux)
   All the scripts should be copied to /install/prescripts directory.
-  The following two environment variables will be passed to each script: 
+  The following two environment variables will be passed to each script:
     NODES a coma separated list of node names that need to run the script for
     ACTION current nodeset action.
   If '#xCAT setting:MAX_INSTANCE=number' is specified in the script, the script
   will get invoked for each node in parallel, but no more than number of instances
   will be invoked at at a time. If it is not specified, the script will be invoked
   once for all the nodes.
- 
 
 
-\ **end**\ 
- 
+
+\ **end**\
+
  The scripts to be run at the end of the nodeset(Linux), nimnodeset(AIX),or mkdsklsnode(AIX) command. The format is the same as the 'begin' column.
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-written notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -93,5 +93,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/prodkey.5.rst b/docs/source/guides/admin-guides/references/man5/prodkey.5.rst
index 540cbfcce..e7e97f354 100644
--- a/docs/source/guides/admin-guides/references/man5/prodkey.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/prodkey.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **prodkey Attributes:**\   \ *node*\ , \ *product*\ , \ *key*\ , \ *comments*\ , \ *disable*\ 
+\ **prodkey Attributes:**\   \ *node*\ , \ *product*\ , \ *key*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,34 +36,34 @@ prodkey Attributes:
 
 
 
-\ **node**\ 
- 
+\ **node**\
+
  The node name or group name.
- 
 
 
-\ **product**\ 
- 
+
+\ **product**\
+
  A string to identify the product (for OSes, the osname would be used, i.e. wink28
- 
 
 
-\ **key**\ 
- 
+
+\ **key**\
+
  The product key relevant to the aforementioned node/group and product combination
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-written notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -72,5 +72,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/rack.5.rst b/docs/source/guides/admin-guides/references/man5/rack.5.rst
index 0784121a2..9d4767e9a 100644
--- a/docs/source/guides/admin-guides/references/man5/rack.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/rack.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **rack Attributes:**\   \ *rackname*\ , \ *displayname*\ , \ *num*\ , \ *height*\ , \ *room*\ , \ *comments*\ , \ *disable*\ 
+\ **rack Attributes:**\   \ *rackname*\ , \ *displayname*\ , \ *num*\ , \ *height*\ , \ *room*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,46 +36,46 @@ rack Attributes:
 
 
 
-\ **rackname**\ 
- 
+\ **rackname**\
+
  The rack name.
- 
 
 
-\ **displayname**\ 
- 
+
+\ **displayname**\
+
  Alternative name for rack. Only used by PCM.
- 
 
 
-\ **num**\ 
- 
+
+\ **num**\
+
  The rack number.
- 
 
 
-\ **height**\ 
- 
+
+\ **height**\
+
  Number of units which can be stored in the rack.
- 
 
 
-\ **room**\ 
- 
+
+\ **room**\
+
  The room in which the rack is located.
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-written notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -84,5 +84,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/routes.5.rst b/docs/source/guides/admin-guides/references/man5/routes.5.rst
index b84fa965a..8484ebc57 100644
--- a/docs/source/guides/admin-guides/references/man5/routes.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/routes.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **routes Attributes:**\   \ *routename*\ , \ *net*\ , \ *mask*\ , \ *gateway*\ , \ *ifname*\ , \ *comments*\ , \ *disable*\ 
+\ **routes Attributes:**\   \ *routename*\ , \ *net*\ , \ *mask*\ , \ *gateway*\ , \ *ifname*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,46 +36,46 @@ routes Attributes:
 
 
 
-\ **routename**\ 
- 
+\ **routename**\
+
  Name used to identify this route.
- 
 
 
-\ **net**\ 
- 
+
+\ **net**\
+
  The network address.
- 
 
 
-\ **mask**\ 
- 
+
+\ **mask**\
+
  The network mask.
- 
 
 
-\ **gateway**\ 
- 
+
+\ **gateway**\
+
  The gateway that routes the ip traffic from the mn to the nodes. It is usually a service node.
- 
 
 
-\ **ifname**\ 
- 
+
+\ **ifname**\
+
  The interface name that facing the gateway. It is optional for IPv4 routes, but it is required for IPv6 routes.
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-written notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -84,5 +84,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/servicenode.5.rst b/docs/source/guides/admin-guides/references/man5/servicenode.5.rst
index a13cb606c..a79bc2105 100644
--- a/docs/source/guides/admin-guides/references/man5/servicenode.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/servicenode.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **servicenode Attributes:**\   \ *node*\ , \ *nameserver*\ , \ *dhcpserver*\ , \ *tftpserver*\ , \ *nfsserver*\ , \ *conserver*\ , \ *monserver*\ , \ *ldapserver*\ , \ *ntpserver*\ , \ *ftpserver*\ , \ *nimserver*\ , \ *ipforward*\ , \ *dhcpinterfaces*\ , \ *proxydhcp*\ , \ *comments*\ , \ *disable*\ 
+\ **servicenode Attributes:**\   \ *node*\ , \ *nameserver*\ , \ *dhcpserver*\ , \ *tftpserver*\ , \ *nfsserver*\ , \ *conserver*\ , \ *monserver*\ , \ *ldapserver*\ , \ *ntpserver*\ , \ *ftpserver*\ , \ *nimserver*\ , \ *ipforward*\ , \ *dhcpinterfaces*\ , \ *proxydhcp*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,100 +36,100 @@ servicenode Attributes:
 
 
 
-\ **node**\ 
- 
+\ **node**\
+
  The hostname of the service node as known by the Management Node.
- 
 
 
-\ **nameserver**\ 
- 
+
+\ **nameserver**\
+
  Do we set up DNS on this service node? Valid values: 2, 1, or 0. If 2, creates named.conf as dns slave, using the management node as dns master, and starts named. If 1, creates named.conf file with forwarding to the management node and starts named. If 0, it does not change the current state of the service.
- 
 
 
-\ **dhcpserver**\ 
- 
+
+\ **dhcpserver**\
+
  Do we set up DHCP on this service node? Not supported on AIX. Valid values:1 or 0. If 1, runs makedhcp -n. If 0, it does not change the current state of the service.
- 
 
 
-\ **tftpserver**\ 
- 
+
+\ **tftpserver**\
+
  Do we set up TFTP on this service node? Not supported on AIX. Valid values:1 or 0. If 1, configures and starts atftp. If 0, it does not change the current state of the service.
- 
 
 
-\ **nfsserver**\ 
- 
+
+\ **nfsserver**\
+
  Do we set up file services (HTTP,FTP,or NFS) on this service node? For AIX will only setup NFS, not HTTP or FTP. Valid values:1 or 0.If 0, it does not change the current state of the service.
- 
 
 
-\ **conserver**\ 
- 
+
+\ **conserver**\
+
  Do we set up console service on this service node?  Valid values: 0, 1, or 2. If 0, it does not change the current state of the service. If 1, configures and starts conserver daemon. If 2, configures and starts goconserver daemon.
- 
 
 
-\ **monserver**\ 
- 
+
+\ **monserver**\
+
  Is this a monitoring event collection point? Valid values: 1 or 0. If 0, it does not change the current state of the service.
- 
 
 
-\ **ldapserver**\ 
- 
+
+\ **ldapserver**\
+
  Do we set up ldap caching proxy on this service node? Not supported on AIX.  Valid values:1 or 0. If 0, it does not change the current state of the service.
- 
 
 
-\ **ntpserver**\ 
- 
+
+\ **ntpserver**\
+
  Not used. Use setupntp postscript to setup a ntp server on this service node? Valid values:1 or 0. If 0, it does not change the current state of the service.
- 
 
 
-\ **ftpserver**\ 
- 
+
+\ **ftpserver**\
+
  Do we set up a ftp server on this service node? Not supported on AIX Valid values:1 or 0. If 1, configure and start vsftpd.  (You must manually install vsftpd on the service nodes before this.) If 0, it does not change the current state of the service. xCAT is not using ftp for compute nodes provisioning or any other xCAT features, so this attribute can be set to 0 if the ftp service will not be used for other purposes
- 
 
 
-\ **nimserver**\ 
- 
+
+\ **nimserver**\
+
  Not used. Do we set up a NIM server on this service node? Valid values:1 or 0. If 0, it does not change the current state of the service.
- 
 
 
-\ **ipforward**\ 
- 
+
+\ **ipforward**\
+
  Do we set up ip forwarding on this service node? Valid values:1 or 0. If 0, it does not change the current state of the service.
- 
 
 
-\ **dhcpinterfaces**\ 
- 
+
+\ **dhcpinterfaces**\
+
  The network interfaces DHCP server should listen on for the target node. This attribute can be used for management node and service nodes.  If defined, it will override the values defined in site.dhcpinterfaces. This is a comma separated list of device names. !remote! indicates a non-local network for relay DHCP. For example: !remote!,eth0,eth1
- 
 
 
-\ **proxydhcp**\ 
- 
+
+\ **proxydhcp**\
+
  Do we set up proxydhcp service on this node? valid values: 1 or 0. If 1, the proxydhcp daemon will be enabled on this node.
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-written notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -138,5 +138,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/site.5.rst b/docs/source/guides/admin-guides/references/man5/site.5.rst
index b77143fd2..47c00f259 100644
--- a/docs/source/guides/admin-guides/references/man5/site.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/site.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **site Attributes:**\   \ *key*\ , \ *value*\ , \ *comments*\ , \ *disable*\ 
+\ **site Attributes:**\   \ *key*\ , \ *value*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -27,9 +27,9 @@ DESCRIPTION
 ***********
 
 
-Global settings for the whole cluster.  This table is different from the 
-other tables in that each attribute is just named in the key column, rather 
-than having a separate column for each attribute. The following is a list of 
+Global settings for the whole cluster.  This table is different from the
+other tables in that each attribute is just named in the key column, rather
+than having a separate column for each attribute. The following is a list of
 attributes currently used by xCAT organized into categories.
 
 
@@ -39,23 +39,23 @@ site Attributes:
 
 
 
-\ **key**\ 
- 
+\ **key**\
+
  Attribute Name:  Description
- 
- 
+
+
  .. code-block:: perl
- 
+
    ------------
   AIX ATTRIBUTES
    ------------
    nimprime :   The name of NIM server, if not set default is the AIX MN.
                 If Linux MN, then must be set for support of mixed cluster (TBD).
-  
+
    useSSHonAIX:  (yes/1 or no/0). Default is yes.  The support for rsh/rcp is deprecated.
    useNFSv4onAIX:  (yes/1 or no/0). If yes, NFSv4 will be used with NIM. If no,
                  NFSv3 will be used with NIM. Default is no.
-  
+
    -----------------
   DATABASE ATTRIBUTES
    -----------------
@@ -67,78 +67,78 @@ site Attributes:
                   'ALL' means all cmds will be skipped. If attribute is null, all
                   commands will be written.
                   clienttype:web would skip all commands from the web client
-                  For example: tabdump,nodels,clienttype:web 
+                  For example: tabdump,nodels,clienttype:web
                   will not log tabdump, nodels or any web client commands.
    databaseloc:    Directory where we create the db instance directory.
                    Default is /var/lib. Only DB2 is currently supported.
                    Do not use the directory in the site.installloc or
                    installdir attribute. This attribute must not be changed
                    once db2sqlsetup script has been run and DB2 has been setup.
-  
+
    excludenodes:  A set of comma separated nodes and/or groups that would automatically
                   be subtracted from any noderange, it can be used for excluding some
                   failed nodes for any xCAT commands. See the 'noderange' manpage for
                   details on supported formats.
-  
+
    nodestatus:  If set to 'n', the nodelist.status column will not be updated during
                 the node deployment, node discovery and power operations. The default
                 is to update.
-  
+
    skiptables:  Comma separated list of tables to be skipped by dumpxCATdb
-  
-   skipvalidatelog:  If set to 1, then getcredentials and getpostscripts calls will not 
+
+   skipvalidatelog:  If set to 1, then getcredentials and getpostscripts calls will not
                      be logged in syslog.
-  
+
    -------------
   DHCP ATTRIBUTES
    -------------
    dhcpinterfaces:  The network interfaces DHCP should listen on.  If it is the same for all
                     nodes, use a comma-separated list of the NICs.  To specify different NICs
-                    for different nodes, use the format: "xcatmn|eth1,eth2;service|bond0", 
-                    where xcatmn is the name of the management node, DHCP should listen on 
-                    the eth1 and eth2 interfaces.  All the nodes in group 'service' should 
+                    for different nodes, use the format: "xcatmn|eth1,eth2;service|bond0",
+                    where xcatmn is the name of the management node, DHCP should listen on
+                    the eth1 and eth2 interfaces.  All the nodes in group 'service' should
                     listen on the 'bond0' interface.
-  
+
                     To disable the genesis kernel from being sent to specific interfaces, a
                     ':noboot' option can be appended to the interface name.  For example,
                     if the management node has two interfaces, eth1 and eth2, disable
                     genesis from being sent to eth1 using: "eth1:noboot,eth2".
-  
+
    dhcpsetup:  If set to 'n', it will skip the dhcp setup process in the nodeset cmd.
-  
+
    dhcplease:  The lease time for the dhcp client. The default value is 43200.
-  
+
    disjointdhcps:  If set to '1', the .leases file on a service node only contains
                    the nodes it manages. And when 'sharedtftp' is disabled, nodeset handles
                    boot loader configuration on a service node only for the nodes it manages.
                    The default value is '0'. It means include all the nodes in the subnet.
-  
+
    pruneservices:  Whether to enable service pruning when noderm is run (i.e.
                    removing DHCP entries when noderm is executed)
-  
+
    managedaddressmode: The mode of networking configuration during node provision.
-                       If set to 'static', the network configuration will be configured 
+                       If set to 'static', the network configuration will be configured
                        in static mode based on the node and network definition on MN.
                        If set to 'dhcp', the network will be configured with dhcp protocol.
                        The default is 'dhcp'.
-  
+
    ------------
   DNS ATTRIBUTES
    ------------
    dnshandler:  Name of plugin that handles DNS setup for makedns.
-  
+
    domain:  The DNS domain name used for the cluster.
-  
+
    forwarders:  The DNS servers at your site that can provide names outside of the cluster.
                 The makedns command will configure the DNS on the management node to forward
                 requests it does not know to these servers. Note that the DNS servers on the
-                service nodes will ignore this value and always be configured to forward 
+                service nodes will ignore this value and always be configured to forward
                 to the management node.
-  
-   emptyzonesenable: (yes or no). This is to set empty-zones-enable value in named.conf options section. 
-  
+
+   emptyzonesenable: (yes or no). This is to set empty-zones-enable value in named.conf options section.
+
    master:  The hostname of the xCAT management node, as known by the nodes.
-  
+
    nameservers:  A comma delimited list of DNS servers that each node in the cluster should
                  use. This value will end up in the nameserver settings of the
                  /etc/resolv.conf on each node. It is common (but not required) to set
@@ -148,172 +148,172 @@ site Attributes:
                  "<xcatmaster>" to mean the DNS server for each node should be the
                  node that is managing it (either its service node or the management
                  node).
-  
+
    externaldns:  To specify that external dns is used. If externaldns is set to any value
-                 then, makedns command will not start the local nameserver on xCAT MN. 
+                 then, makedns command will not start the local nameserver on xCAT MN.
                  Default is to start the local nameserver.
-  
+
    dnsupdaters:  The value are ',' separated string which will be added to the zone config
                  section. This is an interface for user to add configuration entries to
                  the zone sections in named.conf.
-  
+
    dnsinterfaces:  The network interfaces DNS should listen on.  If it is the same for all
-                   nodes, use a simple comma-separated list of NICs.  To specify different 
-                   NICs for different nodes, use the format: "xcatmn|eth1,eth2;service|bond0", 
+                   nodes, use a simple comma-separated list of NICs.  To specify different
+                   NICs for different nodes, use the format: "xcatmn|eth1,eth2;service|bond0",
                    where xcatmn is the name of the management node, and DNS should listen on
-                   the eth1 and eth2 interfaces.  All the nods in group 'service' should 
+                   the eth1 and eth2 interfaces.  All the nods in group 'service' should
                    listen on the 'bond0' interface.
-  
+
                    NOTE: If using this attribute to block certain interfaces, make sure
                    the IP maps to your hostname of xCAT MN is not blocked since xCAT needs
                    to use this IP to communicate with the local NDS server on MN.
-  
+
    -------------------------
   HARDWARE CONTROL ATTRIBUTES
    -------------------------
    blademaxp:  The maximum number of concurrent processes for blade hardware control.
-  
+
    ea_primary_hmc:  The hostname of the HMC that the Integrated Switch Network
                     Management Event Analysis should send hardware serviceable
                     events to for processing and potentially sending to IBM.
-  
+
    ea_backup_hmc:  The hostname of the HMC that the Integrated Switch Network
                     Management Event Analysis should send hardware serviceable
                     events to if the primary HMC is down.
-  
+
    enableASMI:  (yes/1 or no/0). If yes, ASMI method will be used after fsp-api. If no,
                  when fsp-api is used, ASMI method will not be used. Default is no.
-  
+
    fsptimeout:  The timeout, in milliseconds, to use when communicating with FSPs.
-  
+
    hwctrldispatch:  Whether or not to send hw control operations to the service
                     node of the target nodes. Default is 'y'.(At present, this attribute
                     is only used for IBM Flex System)
-  
+
    ipmidispatch:  Whether or not to send ipmi hw control operations to the service
                   node of the target compute nodes. Default is 'y'.
-  
+
    ipmimaxp:  The max # of processes for ipmi hw ctrl. The default is 64. Currently,
               this is only used for HP hw control.
-  
+
    ipmiretries:  The # of retries to use when communicating with BMCs. Default is 3.
-  
+
    ipmisdrcache:  If set to 'no', then the xCAT IPMI support will not cache locally
                   the target node's SDR cache to improve performance.
-  
+
    ipmitimeout:  The timeout to use when communicating with BMCs. Default is 2.
                  This attribute is currently not used.
-  
+
    maxssh:  The max # of SSH connections at any one time to the hw ctrl point for PPC
             This parameter doesn't take effect on the rpower command.
             It takes effects on other PPC hardware control command
             getmacs/rnetboot/rbootseq and so on. Default is 8.
-  
+
    syspowerinterval:  For SystemP CECs, this is the number of seconds the rpower command
                       will wait between performing the action for each CEC.  For SystemX
                       IPMI servers, this is the number of seconds the rpower command will
                       wait between powering on <syspowermaxnodes> nodes at a time.  This
-                      value is used to control the power on speed in large clusters. 
+                      value is used to control the power on speed in large clusters.
                       Default is 0.
-  
+
    syspowermaxnodes:  The number of servers to power on at one time before waiting
                       'syspowerinterval' seconds to continue on to the next set of
                       nodes.  If the noderange given to rpower includes nodes served
                       by different service nodes, it will try to spread each set of
                       nodes across the service nodes evenly. Currently only used for
                       IPMI servers and must be set if 'syspowerinterval' is set.
-  
+
    powerinterval:  The number of seconds the rpower command to LPARs will wait between
                    performing the action for each LPAR. LPARs of different HCPs
                    (HMCs or FSPs) are done in parallel. This is used to limit the
                    cluster boot up speed in large clusters. Default is 0.  This is
                    currently only used for system p hardware.
-  
+
    ppcmaxp:  The max # of processes for PPC hw ctrl. If there are more than ppcmaxp
              hcps, this parameter will take effect. It will control the max number of
              processes for PPC hardware control commands. Default is 64.
-  
+
    ppcretry:  The max # of PPC hw connection attempts to HMC before failing.
-             It only takes effect on the hardware control commands through HMC. 
+             It only takes effect on the hardware control commands through HMC.
              Default is 3.
-  
+
    ppctimeout:  The timeout, in milliseconds, to use when communicating with PPC hw
                 through HMC. It only takes effect on the hardware control commands
                 through HMC. Default is 0.
-  
+
    snmpc:  The snmp community string that xcat should use when communicating with the
            switches.
-  
+
    ---------------------------
   INSTALL/DEPLOYMENT ATTRIBUTES
    ---------------------------
    cleanupxcatpost:  (yes/1 or no/0). Set to 'yes' or '1' to clean up the /xcatpost
                      directory on the stateless and statelite nodes after the
                      postscripts are run. Default is no.
-  
+
    db2installloc:  The location which the service nodes should mount for
                    the db2 code to install. Format is hostname:/path.  If hostname is
                    omitted, it defaults to the management node. Default is /mntdb2.
-  
+
    defserialflow:  The default serial flow - currently only used by the mknb command.
-  
+
    defserialport:  The default serial port - currently only used by mknb.
-  
+
    defserialspeed:  The default serial speed - currently only used by mknb.
-  
+
    disablenodesetwarning:  Allow the legacy xCAT non-osimage style nodeset to execute.
-  
+
    genmacprefix:  When generating mac addresses automatically, use this manufacturing
                   prefix (e.g. 00:11:aa)
-  
+
    genpasswords:  Automatically generate random passwords for BMCs when configuring
                   them.
-  
+
    installdir:  The local directory name used to hold the node deployment packages.
-  
-   installloc:  The location from which the service nodes should mount the 
+
+   installloc:  The location from which the service nodes should mount the
                 deployment packages in the format hostname:/path.  If hostname is
                 omitted, it defaults to the management node. The path must
                 match the path in the installdir attribute.
-  
+
    iscsidir:  The path to put the iscsi disks in on the mgmt node.
-  
+
    mnroutenames:  The name of the routes to be setup on the management node.
                   It is a comma separated list of route names that are defined in the
                   routes table.
-  
+
    runbootscripts:  If set to 'yes' the scripts listed in the postbootscripts
                     attribute in the osimage and postscripts tables will be run during
                     each reboot of stateful (diskful) nodes. This attribute has no
                     effect on stateless and statelite nodes. Run the following
-                    command after you change the value of this attribute: 
+                    command after you change the value of this attribute:
                     'updatenode <nodes> -P setuppostbootscripts'
-  
-   precreatemypostscripts: (yes/1 or no/0). Default is no. If yes, it will  
+
+   precreatemypostscripts: (yes/1 or no/0). Default is no. If yes, it will
                 instruct xCAT at nodeset and updatenode time to query the db once for
                 all of the nodes passed into the cmd and create the mypostscript file
                 for each node, and put them in a directory of tftpdir(such as: /tftpboot)
                 If no, it will not generate the mypostscript file in the tftpdir.
-  
+
    secureroot:  If set to 1, xCAT will use secure mode to transfer root password hash
                 during the installation.  Default is 0.
 
    setinstallnic:  Set the network configuration for installnic to be static.
-  
+
    sharedtftp:  Set to 0 or no, xCAT should not assume the directory
                 in tftpdir is mounted on all on Service Nodes. Default is 1/yes.
                 If value is set to a hostname, the directory in tftpdir
                 will be mounted from that hostname on the SN
-  
+
    sharedinstall:  Indicates if a shared file system will be used for installation
-                   resources. Possible values are: 'no', 'sns', or 'all'.  'no' 
+                   resources. Possible values are: 'no', 'sns', or 'all'.  'no'
                    means a shared file system is not being used.  'sns' means a
                    shared filesystem is being used across all service nodes.
                    'all' means that the management as well as the service nodes
                    are all using a common shared filesystem. The default is 'no'.
-  
+
    xcatconfdir:  Where xCAT config data is (default /etc/xcat).
-  
+
    xcatdebugmode:  the xCAT debug level. xCAT provides a batch of techniques
                    to help user debug problems while using xCAT, especially on OS provision,
                    such as collecting logs of the whole installation process and accessing
@@ -325,109 +325,109 @@ site Attributes:
                      '2':  enable expert debug mode
                    For the details on 'basic debug mode' and 'expert debug mode',
                    refer to xCAT documentation.
-  
+
    --------------------
   REMOTESHELL ATTRIBUTES
    --------------------
    nodesyncfiledir:  The directory on the node, where xdcp will rsync the files
-  
+
    SNsyncfiledir:  The directory on the Service Node, where xdcp will rsync the files
                    from the MN that will eventually be rsync'd to the compute nodes.
-  
+
    sshbetweennodes:  Comma separated list of groups of compute nodes to enable passwordless
                      root ssh to the nodes during install or running 'xdsh -K'. The default
                      is ALLGROUPS.  Set to NOGROUPS to disable.
-  
+
                      Service Nodes are not affected by this attribute as they are always
                      configured with passwordless root access.
                      If using the zone table, this attribute in not used.
-  
+
    -----------------
   SERVICES ATTRIBUTES
    -----------------
    consoleondemand:  When set to 'yes', conserver connects and creates the console
                      output only when the user opens the console. Default is 'no' on
                      Linux, 'yes' on AIX.
-  
+
    httpport:    The port number that the booting/installing nodes should contact the
                 http server on the MN/SN on. It is your responsibility to configure
                 the http server to listen on that port - xCAT will not do that.
-  
-   nmapoptions: Additional options for the nmap command. nmap is used in pping, 
-                nodestat, xdsh -v and updatenode commands. Sometimes additional 
+
+   nmapoptions: Additional options for the nmap command. nmap is used in pping,
+                nodestat, xdsh -v and updatenode commands. Sometimes additional
                 performance tuning may be needed for nmap due to network traffic.
                 For example, if the network response time is too slow, nmap may not
-                give stable output. You can increase the timeout value by specifying 
-                '--min-rtt-timeout 1s'. xCAT will append the options defined here to 
+                give stable output. You can increase the timeout value by specifying
+                '--min-rtt-timeout 1s'. xCAT will append the options defined here to
                 the nmap command.
-  
+
    ntpservers:  A comma delimited list of NTP servers for the service node and
                 the compute node to sync with. The keyword <xcatmaster> means that
                 the node's NTP server is the node that is managing it
                 (either its service node or the management node).
-  
+
    extntpservers:  A comma delimited list of external NTP servers for the xCAT
                    management node to sync with. If it is empty, the NTP server
                    will use the management node's own hardware clock to calculate
                    the system date and time
-  
+
    svloglocal:  If set to 1, syslog on the service node will not get forwarded to the
                 management node.
-  
+
    timezone:  (e.g. America/New_York)
-  
+
    tftpdir:  The tftp directory path. Default is /tftpboot
-  
-   tftpflags:  The flags that used to start tftpd. Default is '-v -l -s /tftpboot 
+
+   tftpflags:  The flags that used to start tftpd. Default is '-v -l -s /tftpboot
                  -m /etc/tftpmapfile4xcat.conf' if tftplfags is not set
-  
+
    useNmapfromMN:  When set to yes, nodestat command should obtain the node status
                    using nmap (if available) from the management node instead of the
                    service node. This will improve the performance in a flat network.
-  
+
    vsftp:  Default is 'n'. If set to 'y', xcatd on the management node will automatically
            start vsftpd.  (vsftpd must be installed by the admin).  This setting does not
            apply to service nodes.  For service nodes, set servicenode.ftpserver=1.
-  
-   FQDNfirst:  Fully Qualified Domain Name first. If set to 1/yes/enable, the /etc/hosts 
-               entries generated by 'makehosts' will put the FQDN before the PQDN(Partially 
+
+   FQDNfirst:  Fully Qualified Domain Name first. If set to 1/yes/enable, the /etc/hosts
+               entries generated by 'makehosts' will put the FQDN before the PQDN(Partially
                Qualified Domain Name). Otherwise, the original behavior will be performed.
-  
+
    hierarchicalattrs:  Table attributes(e.g. postscripts, postbootscripts) that will be
                        included hierarchically. Attribute values for all the node's groups
                        will be applied to the node in the groups' order except the repeat one.
-   dbtracelevel:  The trace level for the database access log. To activate this setting, please. 
+   dbtracelevel:  The trace level for the database access log. To activate this setting, please.
                   restart xcatd or send HUP signal to the 'xcatd: DB Access' process, Like: .
-                  ps -ef | grep 'xcatd: DB Access' | grep -v grep | awk '{print $2}' | xargs kill -HUP  
-                  Currrent support values: 
-                  0: disable the trace log for db 
-                  1: trace the calls of database subroutines 
-                  2: Besides the log from level 1, trace the event to build the cache for the table 
-                  3: Besides the log from level 2, trace the event with cache hit 
-                  4: Besides the log from level 3, trace the SQL statement for the db access 
-                  With this configuration, xcat will send the log to syslog very frequently, some of the 
-                  log may be lost if imjournal is enabled by rsyslog. 
+                  ps -ef | grep 'xcatd: DB Access' | grep -v grep | awk '{print $2}' | xargs kill -HUP
+                  Currrent support values:
+                  0: disable the trace log for db
+                  1: trace the calls of database subroutines
+                  2: Besides the log from level 1, trace the event to build the cache for the table
+                  3: Besides the log from level 2, trace the event with cache hit
+                  4: Besides the log from level 3, trace the SQL statement for the db access
+                  With this configuration, xcat will send the log to syslog very frequently, some of the
+                  log may be lost if imjournal is enabled by rsyslog.
                   Please see https://github.com/xcat2/xcat-core/issues/3910 for the detail.
-  
+
    -----------------------
   VIRTUALIZATION ATTRIBUTES
    -----------------------
    usexhrm:  Have xCAT execute the xHRM script when booting up KVM guests to configure
              the virtual network bridge.
-  
+
    vcenterautojoin:  When set to no, the VMWare plugin will not attempt to auto remove
                      and add hypervisors while trying to perform operations.  If users
                      or tasks outside of xCAT perform the joining this assures xCAT
                      will not interfere.
-  
+
    vmwarereconfigonpower:  When set to no, the VMWare plugin will make no effort to
                            push vm.cpus/vm.memory updates from xCAT to VMWare.
-  
+
    persistkvmguests:  Keep the kvm definition on the kvm hypervisor when you power off
-                      the kvm guest node. This is useful for you to manually change the 
+                      the kvm guest node. This is useful for you to manually change the
                       kvm xml definition file in virsh for debugging. Set anything means
                       enable.
-  
+
    --------------------
   XCAT DAEMON ATTRIBUTES
    --------------------
@@ -443,43 +443,43 @@ site Attributes:
                  xcatd, and retry. The default is no.
                  See the following document for details:
                  Hints_and_Tips_for_Large_Scale_Clusters
-  
+
    xcatmaxconnections:  Number of concurrent xCAT protocol requests before requests
                         begin queueing. This applies to both client command requests
                         and node requests, e.g. to get postscripts. Default is 64.
-  
+
    xcatmaxbatchconnections:  Number of concurrent xCAT connections allowed from the nodes.
                         Value must be less than xcatmaxconnections. Default is 50.
-  
+
    xcatdport:  The port used by the xcatd daemon for client/server communication.
-  
+
    xcatiport:  The port used by xcatd to receive install status updates from nodes.
-  
+
    xcatlport:  The port used by xcatd command log writer process to collect command output.
-  
+
    xcatsslversion:  The ssl version by xcatd. Default is SSLv3.
-  
+
    xcatsslciphers:  The ssl cipher by xcatd. Default is 3DES.
- 
- 
 
 
-\ **value**\ 
- 
+
+
+\ **value**\
+
  The value of the attribute specified in the "key" column.
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-written notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -488,5 +488,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/statelite.5.rst b/docs/source/guides/admin-guides/references/man5/statelite.5.rst
index 3b9f6e1b0..ee7fc3860 100644
--- a/docs/source/guides/admin-guides/references/man5/statelite.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/statelite.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **statelite Attributes:**\   \ *node*\ , \ *image*\ , \ *statemnt*\ , \ *mntopts*\ , \ *comments*\ , \ *disable*\ 
+\ **statelite Attributes:**\   \ *node*\ , \ *image*\ , \ *statemnt*\ , \ *mntopts*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,40 +36,40 @@ statelite Attributes:
 
 
 
-\ **node**\ 
- 
+\ **node**\
+
  The name of the node or group that will use this location.
- 
 
 
-\ **image**\ 
- 
+
+\ **image**\
+
  Reserved for future development, not used.
- 
 
 
-\ **statemnt**\ 
- 
+
+\ **statemnt**\
+
  The persistent read/write area where a node's persistent files will be written to, e.g: 10.0.0.1/state/.  The node name will be automatically added to the pathname, so 10.0.0.1:/state, will become 10.0.0.1:/state/<nodename>.
- 
 
 
-\ **mntopts**\ 
- 
+
+\ **mntopts**\
+
  A comma-separated list of options to use when mounting the persistent directory.  (Ex. 'soft') The default is to do a 'hard' mount.
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-written notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -78,5 +78,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/storage.5.rst b/docs/source/guides/admin-guides/references/man5/storage.5.rst
index dd48879bb..b0f6d4b17 100644
--- a/docs/source/guides/admin-guides/references/man5/storage.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/storage.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **storage Attributes:**\   \ *node*\ , \ *osvolume*\ , \ *size*\ , \ *state*\ , \ *storagepool*\ , \ *hypervisor*\ , \ *fcprange*\ , \ *volumetag*\ , \ *type*\ , \ *controller*\ , \ *comments*\ , \ *disable*\ 
+\ **storage Attributes:**\   \ *node*\ , \ *osvolume*\ , \ *size*\ , \ *state*\ , \ *storagepool*\ , \ *hypervisor*\ , \ *fcprange*\ , \ *volumetag*\ , \ *type*\ , \ *controller*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -34,86 +34,86 @@ storage Attributes:
 
 
 
-\ **node**\ 
- 
+\ **node**\
+
  The node name
- 
 
 
-\ **osvolume**\ 
- 
+
+\ **osvolume**\
+
  Specification of what storage to place the node OS image onto.  Examples include:
- 
- 
+
+
  .. code-block:: perl
- 
+
                   localdisk (Install to first non-FC attached disk)
                   usbdisk (Install to first USB mass storage device seen)
                   wwn=0x50000393c813840c (Install to storage device with given WWN)
- 
- 
 
 
-\ **size**\ 
- 
+
+
+\ **size**\
+
  Size of the volume. Examples include: 10G, 1024M.
- 
 
 
-\ **state**\ 
- 
+
+\ **state**\
+
  State of the volume. The valid values are: free, used, and allocated
- 
 
 
-\ **storagepool**\ 
- 
+
+\ **storagepool**\
+
  Name of storage pool where the volume is assigned.
- 
 
 
-\ **hypervisor**\ 
- 
+
+\ **hypervisor**\
+
  Name of the hypervisor where the volume is configured.
- 
 
 
-\ **fcprange**\ 
- 
+
+\ **fcprange**\
+
  A range of acceptable fibre channels that the volume can use. Examples include: 3B00-3C00;4B00-4C00.
- 
 
 
-\ **volumetag**\ 
- 
+
+\ **volumetag**\
+
  A specific tag used to identify the volume in the autoyast or kickstart template.
- 
 
 
-\ **type**\ 
- 
+
+\ **type**\
+
  The plugin used to drive storage configuration (e.g. svc)
- 
 
 
-\ **controller**\ 
- 
+
+\ **controller**\
+
  The management address to attach/detach new volumes.
  In the scenario involving multiple controllers, this data must be
  passed as argument rather than by table value
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-written notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -122,5 +122,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/switch.5.rst b/docs/source/guides/admin-guides/references/man5/switch.5.rst
index 9e6d9c099..28ff4499a 100644
--- a/docs/source/guides/admin-guides/references/man5/switch.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/switch.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **switch Attributes:**\   \ *node*\ , \ *switch*\ , \ *port*\ , \ *vlan*\ , \ *interface*\ , \ *comments*\ , \ *disable*\ 
+\ **switch Attributes:**\   \ *node*\ , \ *switch*\ , \ *port*\ , \ *vlan*\ , \ *interface*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,46 +36,46 @@ switch Attributes:
 
 
 
-\ **node**\ 
- 
+\ **node**\
+
  The node name or group name.
- 
 
 
-\ **switch**\ 
- 
+
+\ **switch**\
+
  The switch hostname.
- 
 
 
-\ **port**\ 
- 
+
+\ **port**\
+
  The port number in the switch that this node is connected to. On a simple 1U switch, an administrator can generally enter the number as printed next to the ports, and xCAT will understand switch representation differences.  On stacked switches or switches with line cards, administrators should usually use the CLI representation (i.e. 2/0/1 or 5/8).  One notable exception is stacked SMC 8848M switches, in which you must add 56 for the proceeding switch, then the port number.  For example, port 3 on the second switch in an SMC8848M stack would be 59
- 
 
 
-\ **vlan**\ 
- 
+
+\ **vlan**\
+
  The ID for the tagged vlan that is created on this port using mkvlan and chvlan commands.
- 
 
 
-\ **interface**\ 
- 
+
+\ **interface**\
+
  The interface name from the node perspective. For example, eth0. For the primary nic, it can be empty, the word "primary" or "primary:ethx" where ethx is the interface name.
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-written notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -84,5 +84,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/switches.5.rst b/docs/source/guides/admin-guides/references/man5/switches.5.rst
index 86b4ec0f7..37f7b677f 100644
--- a/docs/source/guides/admin-guides/references/man5/switches.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/switches.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **switches Attributes:**\   \ *switch*\ , \ *snmpversion*\ , \ *username*\ , \ *password*\ , \ *privacy*\ , \ *auth*\ , \ *linkports*\ , \ *sshusername*\ , \ *sshpassword*\ , \ *protocol*\ , \ *switchtype*\ , \ *comments*\ , \ *disable*\ 
+\ **switches Attributes:**\   \ *switch*\ , \ *snmpversion*\ , \ *username*\ , \ *password*\ , \ *privacy*\ , \ *auth*\ , \ *linkports*\ , \ *sshusername*\ , \ *sshpassword*\ , \ *protocol*\ , \ *switchtype*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,77 +36,77 @@ switches Attributes:
 
 
 
-\ **switch**\ 
- 
+\ **switch**\
+
  The hostname/address of the switch to which the settings apply
- 
 
 
-\ **snmpversion**\ 
- 
+
+\ **snmpversion**\
+
  The version to use to communicate with switch.  SNMPv1 is assumed by default.
- 
 
 
-\ **username**\ 
- 
+
+\ **username**\
+
  The username to use for SNMPv3 communication, ignored for SNMPv1
- 
 
 
-\ **password**\ 
- 
+
+\ **password**\
+
  The password string for SNMPv3 or community string for SNMPv1/SNMPv2.  Falls back to passwd table, and site snmpc value if using SNMPv1/SNMPv2.
- 
 
 
-\ **privacy**\ 
- 
+
+\ **privacy**\
+
  The privacy protocol to use for v3. xCAT will use authNoPriv if this is unspecified. DES is recommended to use if v3 enabled, as it is the most readily available.
- 
 
 
-\ **auth**\ 
- 
+
+\ **auth**\
+
  The authentication protocol to use for SNMPv3.  SHA is assumed if v3 enabled and this is unspecified
- 
 
 
-\ **linkports**\ 
- 
+
+\ **linkports**\
+
  The ports that connect to other switches. Currently, this column is only used by vlan configuration. The format is: "port_number:switch,port_number:switch...". Refer to the switch table for details on how to specify the port numbers.
- 
 
 
-\ **sshusername**\ 
- 
+
+\ **sshusername**\
+
  The remote login user name. It can be for ssh or telnet. If it is for telnet, set protocol to "telnet". If the sshusername is blank, the username, password and protocol will be retrieved from the passwd table with "switch" as the key.
- 
 
 
-\ **sshpassword**\ 
- 
+
+\ **sshpassword**\
+
  The remote login password. It can be for ssh or telnet. If it is for telnet, set protocol to "telnet". If the sshusername is blank, the username, password and protocol will be retrieved from the passwd table with "switch" as the key.
- 
 
 
-\ **protocol**\ 
- 
+
+\ **protocol**\
+
  Protocol for running remote commands for the switch. The valid values are: ssh, telnet. ssh is the default. If the sshusername is blank, the username, password and protocol will be retrieved from the passwd table with "switch" as the key. The passwd.comments attribute is used for protocol.
- 
 
 
-\ **switchtype**\ 
- 
+
+\ **switchtype**\
+
  The type of switch. It is used to identify the file name that implements the functions for this switch. The valid values are: Mellanox, Cisco, BNT and Juniper.
- 
-
-
-\ **comments**\ 
 
 
 
-\ **disable**\ 
+\ **comments**\
+
+
+
+\ **disable**\
 
 
 
@@ -116,5 +116,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/taskstate.5.rst b/docs/source/guides/admin-guides/references/man5/taskstate.5.rst
index 1d7fc2e4f..2860e5573 100644
--- a/docs/source/guides/admin-guides/references/man5/taskstate.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/taskstate.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **taskstate Attributes:**\   \ *node*\ , \ *command*\ , \ *state*\ , \ *pid*\ , \ *reserve*\ , \ *disable*\ 
+\ **taskstate Attributes:**\   \ *node*\ , \ *command*\ , \ *state*\ , \ *pid*\ , \ *reserve*\ , \ *disable*\
 
 
 ***********
@@ -36,40 +36,40 @@ taskstate Attributes:
 
 
 
-\ **node**\ 
- 
+\ **node**\
+
  The node name.
- 
 
 
-\ **command**\ 
- 
+
+\ **command**\
+
  Current command is running
- 
 
 
-\ **state**\ 
- 
+
+\ **state**\
+
  The task state(callback, running) for the node.
- 
 
 
-\ **pid**\ 
- 
+
+\ **pid**\
+
  The process id of the request process.
- 
 
 
-\ **reserve**\ 
- 
+
+\ **reserve**\
+
  used to lock the node
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -78,5 +78,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/token.5.rst b/docs/source/guides/admin-guides/references/man5/token.5.rst
index 5089aa16b..0351e5c41 100644
--- a/docs/source/guides/admin-guides/references/man5/token.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/token.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **token Attributes:**\   \ *tokenid*\ , \ *username*\ , \ *expire*\ , \ *created*\ , \ *access*\ , \ *comments*\ , \ *disable*\ 
+\ **token Attributes:**\   \ *tokenid*\ , \ *username*\ , \ *expire*\ , \ *created*\ , \ *access*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,46 +36,46 @@ token Attributes:
 
 
 
-\ **tokenid**\ 
- 
+\ **tokenid**\
+
  It is a UUID as an unified identify for the user.
- 
 
 
-\ **username**\ 
- 
+
+\ **username**\
+
  The user name.
- 
 
 
-\ **expire**\ 
- 
+
+\ **expire**\
+
  The expire time for this token.
- 
 
 
-\ **created**\ 
- 
+
+\ **created**\
+
  Creation time for this token.
- 
 
 
-\ **access**\ 
- 
+
+\ **access**\
+
  Last access time for this token.
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-provided notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -84,5 +84,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/virtsd.5.rst b/docs/source/guides/admin-guides/references/man5/virtsd.5.rst
index 9ff5547de..410b81968 100644
--- a/docs/source/guides/admin-guides/references/man5/virtsd.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/virtsd.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **virtsd Attributes:**\   \ *node*\ , \ *sdtype*\ , \ *stype*\ , \ *location*\ , \ *host*\ , \ *cluster*\ , \ *datacenter*\ , \ *comments*\ , \ *disable*\ 
+\ **virtsd Attributes:**\   \ *node*\ , \ *sdtype*\ , \ *stype*\ , \ *location*\ , \ *host*\ , \ *cluster*\ , \ *datacenter*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,53 +36,53 @@ virtsd Attributes:
 
 
 
-\ **node**\ 
- 
+\ **node**\
+
  The name of the storage domain
- 
 
 
-\ **sdtype**\ 
- 
+
+\ **sdtype**\
+
  The type of storage domain. Valid values: data, iso, export
- 
 
 
-\ **stype**\ 
- 
+
+\ **stype**\
+
  The type of storge. Valid values: nfs, fcp, iscsi, localfs
- 
 
 
-\ **location**\ 
- 
+
+\ **location**\
+
  The path of the storage
- 
 
 
-\ **host**\ 
- 
+
+\ **host**\
+
  For rhev, a hypervisor host needs to be specified to manage the storage domain as SPM (Storage Pool Manager). But the SPM role will be failed over to another host when this host down.
- 
 
 
-\ **cluster**\ 
- 
+
+\ **cluster**\
+
  A cluster of hosts
- 
 
 
-\ **datacenter**\ 
- 
+
+\ **datacenter**\
+
  A collection for all host, vm that will shared the same storages, networks.
- 
-
-
-\ **comments**\ 
 
 
 
-\ **disable**\ 
+\ **comments**\
+
+
+
+\ **disable**\
 
 
 
@@ -92,5 +92,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/vm.5.rst b/docs/source/guides/admin-guides/references/man5/vm.5.rst
index 74cf3b400..167ade986 100644
--- a/docs/source/guides/admin-guides/references/man5/vm.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/vm.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **vm Attributes:**\   \ *node*\ , \ *mgr*\ , \ *host*\ , \ *migrationdest*\ , \ *storage*\ , \ *storagemodel*\ , \ *storagecache*\ , \ *storageformat*\ , \ *cfgstore*\ , \ *memory*\ , \ *cpus*\ , \ *nics*\ , \ *nicmodel*\ , \ *bootorder*\ , \ *clockoffset*\ , \ *virtflags*\ , \ *master*\ , \ *vncport*\ , \ *textconsole*\ , \ *powerstate*\ , \ *beacon*\ , \ *datacenter*\ , \ *cluster*\ , \ *guestostype*\ , \ *othersettings*\ , \ *physlots*\ , \ *vidmodel*\ , \ *vidproto*\ , \ *vidpassword*\ , \ *comments*\ , \ *disable*\ 
+\ **vm Attributes:**\   \ *node*\ , \ *mgr*\ , \ *host*\ , \ *migrationdest*\ , \ *storage*\ , \ *storagemodel*\ , \ *storagecache*\ , \ *storageformat*\ , \ *cfgstore*\ , \ *memory*\ , \ *cpus*\ , \ *nics*\ , \ *nicmodel*\ , \ *bootorder*\ , \ *clockoffset*\ , \ *virtflags*\ , \ *master*\ , \ *vncport*\ , \ *textconsole*\ , \ *powerstate*\ , \ *beacon*\ , \ *datacenter*\ , \ *cluster*\ , \ *guestostype*\ , \ *othersettings*\ , \ *physlots*\ , \ *vidmodel*\ , \ *vidproto*\ , \ *vidpassword*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,99 +36,99 @@ vm Attributes:
 
 
 
-\ **node**\ 
- 
+\ **node**\
+
  The node or static group name
- 
 
 
-\ **mgr**\ 
- 
+
+\ **mgr**\
+
  The function manager for the virtual machine
- 
 
 
-\ **host**\ 
- 
+
+\ **host**\
+
  The system that currently hosts the VM
- 
 
 
-\ **migrationdest**\ 
- 
+
+\ **migrationdest**\
+
  A noderange representing candidate destinations for migration (i.e. similar systems, same SAN, or other criteria that xCAT can use
- 
 
 
-\ **storage**\ 
- 
+
+\ **storage**\
+
  A list of storage files or devices to be used.  i.e. dir:///cluster/vm/<nodename> or nfs://<server>/path/to/folder/
- 
 
 
-\ **storagemodel**\ 
- 
+
+\ **storagemodel**\
+
  Model of storage devices to provide to guest
- 
 
 
-\ **storagecache**\ 
- 
+
+\ **storagecache**\
+
  Select caching scheme to employ.  E.g. KVM understands 'none', 'writethrough' and 'writeback'
- 
 
 
-\ **storageformat**\ 
- 
+
+\ **storageformat**\
+
  Select disk format to use by default (e.g. raw versus qcow2)
- 
 
 
-\ **cfgstore**\ 
- 
+
+\ **cfgstore**\
+
  Optional location for persistent storage separate of emulated hard drives for virtualization solutions that require persistent store to place configuration data
- 
 
 
-\ **memory**\ 
- 
+
+\ **memory**\
+
  Megabytes of memory the VM currently should be set to.
- 
 
 
-\ **cpus**\ 
- 
+
+\ **cpus**\
+
  Number of CPUs the node should see.
- 
 
 
-\ **nics**\ 
- 
+
+\ **nics**\
+
  Network configuration parameters.  Of the general form [physnet:]interface,.. Generally, interface describes the vlan entity (default for native, tagged for tagged, vl[number] for a specific vlan.  physnet is a virtual switch name or port description that is used for some virtualization technologies to construct virtual switches.  hypervisor.netmap can map names to hypervisor specific layouts, or the descriptions described there may be used directly here where possible.
- 
 
 
-\ **nicmodel**\ 
- 
+
+\ **nicmodel**\
+
  Model of NICs that will be provided to VMs (i.e. e1000, rtl8139, virtio, etc)
- 
 
 
-\ **bootorder**\ 
- 
+
+\ **bootorder**\
+
  Boot sequence (i.e. net,hd)
- 
 
 
-\ **clockoffset**\ 
- 
+
+\ **clockoffset**\
+
  Whether to have guest RTC synced to "localtime" or "utc"  If not populated, xCAT will guess based on the nodetype.os contents.
- 
 
 
-\ **virtflags**\ 
- 
- General flags used by the virtualization method.  
+
+\ **virtflags**\
+
+ General flags used by the virtualization method.
            For example, in Xen it could, among other things, specify paravirtualized setup, or direct kernel boot.  For a hypervisor/dom0 entry, it is the virtualization method (i.e. "xen").  For KVM, the following flag=value pairs are recognized:
              imageformat=[raw|fullraw|qcow2]
                  raw is a generic sparse file that allocates storage on demand
@@ -136,94 +136,94 @@ vm Attributes:
                  qcow2 is a sparse, copy-on-write capable format implemented at the virtualization layer rather than the filesystem level
              clonemethod=[qemu-img|reflink]
                  qemu-img allows use of qcow2 to generate virtualization layer copy-on-write
-                 reflink uses a generic filesystem facility to clone the files on your behalf, but requires filesystem support such as btrfs 
+                 reflink uses a generic filesystem facility to clone the files on your behalf, but requires filesystem support such as btrfs
              placement_affinity=[migratable|user_migratable|pinned]
- 
 
 
-\ **master**\ 
- 
+
+\ **master**\
+
  The name of a master image, if any, this virtual machine is linked to.  This is generally set by clonevm and indicates the deletion of a master that would invalidate the storage of this virtual machine
- 
 
 
-\ **vncport**\ 
- 
+
+\ **vncport**\
+
  Tracks the current VNC display port (currently not meant to be set
- 
 
 
-\ **textconsole**\ 
- 
+
+\ **textconsole**\
+
  Tracks the Psuedo-TTY that maps to the serial port or console of a VM
- 
 
 
-\ **powerstate**\ 
- 
+
+\ **powerstate**\
+
  This flag is used by xCAT to track the last known power state of the VM.
- 
 
 
-\ **beacon**\ 
- 
+
+\ **beacon**\
+
  This flag is used by xCAT to track the state of the identify LED with respect to the VM.
- 
 
 
-\ **datacenter**\ 
- 
+
+\ **datacenter**\
+
  Optionally specify a datacenter for the VM to exist in (only applicable to VMWare)
- 
 
 
-\ **cluster**\ 
- 
+
+\ **cluster**\
+
  Specify to the underlying virtualization infrastructure a cluster membership for the hypervisor.
- 
 
 
-\ **guestostype**\ 
- 
+
+\ **guestostype**\
+
  This allows administrator to specify an identifier for OS to pass through to virtualization stack.  Normally this should be ignored as xCAT will translate from nodetype.os rather than requiring this field be used
- 
 
 
-\ **othersettings**\ 
- 
+
+\ **othersettings**\
+
  This allows specifying a semicolon delimited list of key->value pairs to include in a vmx file of VMware or KVM. For partitioning on normal power machines, this option is used to specify the hugepage and/or bsr information, the value is like:'hugepage:1,bsr=2'. For KVM cpu pinning, this option is used to specify the physical cpu set on the host, the value is like:"vcpupin:'0-15,^8'",Its syntax is a comma separated list and a special markup using '-' and '^' (ex. '0-4', '0-3,^2') can also be allowed, the '-' denotes the range and the '^' denotes exclusive. For KVM memory binding, the value is like:'membind:0', restrict a guest to allocate memory from the specified set of NUMA nodes. For PCI passthrough, the value is like:'devpassthrough:pci_0001_01_00_0,pci_0000_03_00_0', the value for PCI device format also can be like:'devpassthrough:0001:01:00.1', the PCI devices are assigned to a virtual machine, and the virtual machine can use this I/O exclusively, the devices list are a list of PCI device names delimited with comma, the PCI device names can be obtained by running \ **virsh nodedev-list**\  on the host.
- 
 
 
-\ **physlots**\ 
- 
+
+\ **physlots**\
+
  Specify the physical slots drc index that will assigned to the partition, the delimiter is ',', and the drc index must started with '0x'. For more details, reference manpage for 'lsvm'.
- 
 
 
-\ **vidmodel**\ 
- 
+
+\ **vidmodel**\
+
  Model of video adapter to provide to guest.  For example, qxl in KVM
- 
 
 
-\ **vidproto**\ 
- 
+
+\ **vidproto**\
+
  Request a specific protocol for remote video access be set up.  For example, spice in KVM.
- 
 
 
-\ **vidpassword**\ 
- 
+
+\ **vidpassword**\
+
  Password to use instead of temporary random tokens for VNC and SPICE access
- 
-
-
-\ **comments**\ 
 
 
 
-\ **disable**\ 
+\ **comments**\
+
+
+
+\ **disable**\
 
 
 
@@ -233,5 +233,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/vmmaster.5.rst b/docs/source/guides/admin-guides/references/man5/vmmaster.5.rst
index cdceff5db..e974898a8 100644
--- a/docs/source/guides/admin-guides/references/man5/vmmaster.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/vmmaster.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **vmmaster Attributes:**\   \ *name*\ , \ *os*\ , \ *arch*\ , \ *profile*\ , \ *storage*\ , \ *storagemodel*\ , \ *nics*\ , \ *vintage*\ , \ *originator*\ , \ *virttype*\ , \ *specializeparameters*\ , \ *comments*\ , \ *disable*\ 
+\ **vmmaster Attributes:**\   \ *name*\ , \ *os*\ , \ *arch*\ , \ *profile*\ , \ *storage*\ , \ *storagemodel*\ , \ *nics*\ , \ *vintage*\ , \ *originator*\ , \ *virttype*\ , \ *specializeparameters*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,77 +36,77 @@ vmmaster Attributes:
 
 
 
-\ **name**\ 
- 
+\ **name**\
+
  The name of a master
- 
 
 
-\ **os**\ 
- 
+
+\ **os**\
+
  The value of nodetype.os at the time the master was captured
- 
 
 
-\ **arch**\ 
- 
+
+\ **arch**\
+
  The value of nodetype.arch at the time of capture
- 
 
 
-\ **profile**\ 
- 
+
+\ **profile**\
+
  The value of nodetype.profile at time of capture
- 
 
 
-\ **storage**\ 
- 
+
+\ **storage**\
+
  The storage location of bulk master information
- 
 
 
-\ **storagemodel**\ 
- 
+
+\ **storagemodel**\
+
  The default storage style to use when modifying a vm cloned from this master
- 
 
 
-\ **nics**\ 
- 
+
+\ **nics**\
+
  The nic configuration and relationship to vlans/bonds/etc
- 
 
 
-\ **vintage**\ 
- 
+
+\ **vintage**\
+
  When this image was created
- 
 
 
-\ **originator**\ 
- 
+
+\ **originator**\
+
  The user who created the image
- 
 
 
-\ **virttype**\ 
- 
+
+\ **virttype**\
+
  The type of virtualization this image pertains to (e.g. vmware, kvm, etc)
- 
 
 
-\ **specializeparameters**\ 
- 
+
+\ **specializeparameters**\
+
  Implementation specific arguments, currently only "autoLogonCount=<number" for ESXi clonevme
- 
-
-
-\ **comments**\ 
 
 
 
-\ **disable**\ 
+\ **comments**\
+
+
+
+\ **disable**\
 
 
 
@@ -116,5 +116,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/vpd.5.rst b/docs/source/guides/admin-guides/references/man5/vpd.5.rst
index eabf05441..4b14c4793 100644
--- a/docs/source/guides/admin-guides/references/man5/vpd.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/vpd.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **vpd Attributes:**\   \ *node*\ , \ *serial*\ , \ *mtm*\ , \ *side*\ , \ *asset*\ , \ *uuid*\ , \ *comments*\ , \ *disable*\ 
+\ **vpd Attributes:**\   \ *node*\ , \ *serial*\ , \ *mtm*\ , \ *side*\ , \ *asset*\ , \ *uuid*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,52 +36,52 @@ vpd Attributes:
 
 
 
-\ **node**\ 
- 
+\ **node**\
+
  The node name or group name.
- 
 
 
-\ **serial**\ 
- 
+
+\ **serial**\
+
  The serial number of the node.
- 
 
 
-\ **mtm**\ 
- 
+
+\ **mtm**\
+
  The machine type and model number of the node.  E.g. 7984-6BU
- 
 
 
-\ **side**\ 
- 
+
+\ **side**\
+
  <BPA>-<port> or <FSP>-<port>. The side information for the BPA/FSP. The side attribute refers to which BPA/FSP, A or B, which is determined by the slot value returned from lsslp command. It also lists the physical port within each BPA/FSP which is determined by the IP address order from the lsslp response. This information is used internally when communicating with the BPAs/FSPs
- 
 
 
-\ **asset**\ 
- 
+
+\ **asset**\
+
  A field for administrators to use to correlate inventory numbers they may have to accommodate
- 
 
 
-\ **uuid**\ 
- 
+
+\ **uuid**\
+
  The UUID applicable to the node
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-written notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -90,5 +90,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/websrv.5.rst b/docs/source/guides/admin-guides/references/man5/websrv.5.rst
index 437e45619..1146aaa7f 100644
--- a/docs/source/guides/admin-guides/references/man5/websrv.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/websrv.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **websrv Attributes:**\   \ *node*\ , \ *port*\ , \ *username*\ , \ *password*\ , \ *comments*\ , \ *disable*\ 
+\ **websrv Attributes:**\   \ *node*\ , \ *port*\ , \ *username*\ , \ *password*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,40 +36,40 @@ websrv Attributes:
 
 
 
-\ **node**\ 
- 
+\ **node**\
+
  The web service hostname.
- 
 
 
-\ **port**\ 
- 
+
+\ **port**\
+
  The port of the web service.
- 
 
 
-\ **username**\ 
- 
+
+\ **username**\
+
  Userid to use to access the web service.
- 
 
 
-\ **password**\ 
- 
+
+\ **password**\
+
  Password to use to access the web service.
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-written notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -78,5 +78,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/winimage.5.rst b/docs/source/guides/admin-guides/references/man5/winimage.5.rst
index 073521acf..cc0c1c8ae 100644
--- a/docs/source/guides/admin-guides/references/man5/winimage.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/winimage.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **winimage Attributes:**\   \ *imagename*\ , \ *template*\ , \ *installto*\ , \ *partitionfile*\ , \ *winpepath*\ , \ *comments*\ , \ *disable*\ 
+\ **winimage Attributes:**\   \ *imagename*\ , \ *template*\ , \ *installto*\ , \ *partitionfile*\ , \ *winpepath*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,46 +36,46 @@ winimage Attributes:
 
 
 
-\ **imagename**\ 
- 
+\ **imagename**\
+
  The name of this xCAT OS image definition.
- 
 
 
-\ **template**\ 
- 
+
+\ **template**\
+
  The fully qualified name of the template file that is used to create the windows unattend.xml file for diskful installation.
- 
 
 
-\ **installto**\ 
- 
+
+\ **installto**\
+
  The disk and partition that the Windows will be deployed to. The valid format is <disk>:<partition>. If not set, default value is 0:1 for bios boot mode(legacy) and 0:3 for uefi boot mode; If setting to 1, it means 1:1 for bios boot and 1:3 for uefi boot
- 
 
 
-\ **partitionfile**\ 
- 
+
+\ **partitionfile**\
+
  The path of partition configuration file. Since the partition configuration for bios boot mode and uefi boot mode are different, this configuration file can include both configurations if you need to support both bios and uefi mode. Either way, you must specify the boot mode in the configuration. Example of partition configuration file: [BIOS]xxxxxxx[UEFI]yyyyyyy. To simplify the setting, you also can set installto in partitionfile with section like [INSTALLTO]0:1
- 
 
 
-\ **winpepath**\ 
- 
+
+\ **winpepath**\
+
  The path of winpe which will be used to boot this image. If the real path is /tftpboot/winboot/winpe1/, the value for winpepath should be set to winboot/winpe1
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-written notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -84,5 +84,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/xcatdb.5.rst b/docs/source/guides/admin-guides/references/man5/xcatdb.5.rst
index 58a39fed8..414872f75 100644
--- a/docs/source/guides/admin-guides/references/man5/xcatdb.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/xcatdb.5.rst
@@ -33,7 +33,7 @@ xCAT allows the use of different database applications, depending on the needs o
 The default database is SQLite, which is a daemonless, zero-config database.  But you could instead
 choose to use something like postgresql for greater scalability and remote access in the
 hierarchical/service node case.  To use a different database or a different location, create
-the file /etc/xcat/cfgloc.  See the appropriate xCAT docuementation for the format of the file for the database you choose. 
+the file /etc/xcat/cfgloc.  See the appropriate xCAT docuementation for the format of the file for the database you choose.
 The following example /etc/xcat/cfgloc file is for PostgreSQL:
 
 
@@ -115,18 +115,18 @@ node names are cmm01, cmm02, etc., then you might have an mp table like:
 Before you panic, let me explain each column:
 
 
-\ **blade**\ 
- 
+\ **blade**\
+
  This is a group name.  In this example, we are assuming that all of your blades belong to this
  group.  Each time the xCAT software accesses the \ **mp**\  table to get the management module and slot number
  of a specific blade (e.g. \ **node20**\ ), this row will match (because \ **node20**\  is in the \ **blade**\  group).
  Once this row is matched for \ **node20**\ , then the processing described in the following items will take
  place.
- 
 
 
-\ **|\D+(\d+)|cmm(sprintf('%02d',($1-1)/14+1))|**\ 
- 
+
+\ **|\D+(\d+)|cmm(sprintf('%02d',($1-1)/14+1))|**\
+
  This is a perl substitution pattern that will produce the value for the second column of the table (the
  management module hostname).  The text \ **\D+(\d+)**\  between the 1st two vertical bars is
  a regular expression that matches the node
@@ -141,17 +141,17 @@ Before you panic, let me explain each column:
  zero, if necessary, to always make the number two digits.  Lastly the string \ **cmm**\  is added to the beginning,
  making the resulting string \ **cmm02**\ , which will be used as the hostname
  of the management module.
- 
 
 
-\ **|\D+(\d+)|(($1-1)%14+1)|**\ 
- 
+
+\ **|\D+(\d+)|(($1-1)%14+1)|**\
+
  This item is similar to the one above.  This substituion pattern will produce the value for
  the 3rd column (the chassis slot number for this blade).  Because this row was
  the match for \ **node20**\ , the parentheses
  within the 1st set of vertical bars will set $1 to 20.  Since % means modulo division, the
  expression \ **($1-1)%14+1**\  will evaluate to \ **6**\ .
- 
+
 
 
 See http://www.perl.com/doc/manual/html/pod/perlre.html for information on perl regular expressions.
@@ -173,34 +173,34 @@ Regular Expression Helper Functions
 xCAT provides several functions that can simplify regular expressions.
 
 
-\ **a2idx**\ 
- 
+\ **a2idx**\
+
  ASCII Character to Index
- 
 
 
-\ **a2zidx**\ 
- 
+
+\ **a2zidx**\
+
  ASCII Character to 0-Index
- 
 
 
-\ **dim2idx**\ 
- 
+
+\ **dim2idx**\
+
  Dimensions to Index
- 
 
 
-\ **skip**\ 
- 
+
+\ **skip**\
+
  Skip indices
- 
 
 
-\ **ipadd**\ 
- 
+
+\ **ipadd**\
+
  Add to an IP address
- 
+
 
 
 http://xcat-docs.readthedocs.org/en/latest/guides/admin-guides/basic_concepts/xcat_db/regexp_db.html#regular-expression-helper-functions
@@ -235,35 +235,35 @@ In plain English, an object name is in \ **xCAT Object Name Format**\  if starti
 
 
 \*
- 
+
  one or more alpha characters of any case and any number of "-" in any combination
- 
+
 
 
 \*
- 
+
  followed by one or more numbers
- 
+
 
 
 \*
- 
+
  then optionally followed by one alpha character of any case  or "-"
- 
+
 
 
 \*
- 
+
  followed by any combination of case mixed alphanumerics and "-"
- 
 
 
 
-\ **Object Types**\ 
+
+\ **Object Types**\
 ====================
 
 
-To run man for any of the object definitions below, use section 7.  For example:  \ **man 7 node**\ 
+To run man for any of the object definitions below, use section 7.  For example:  \ **man 7 node**\
 
 The object types are:
 
@@ -370,366 +370,366 @@ TABLES
 To manipulate the tables directly, use \ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ ,
 \ **nodeadd(8)**\ , \ **nodech(1)**\ .
 
-To run man for any of the table descriptions below, use section 5.  For example:  \ **man 5 nodehm**\ 
+To run man for any of the table descriptions below, use section 5.  For example:  \ **man 5 nodehm**\
 
 The tables are:
 
 
 auditlog(5)|auditlog.5
- 
+
  Audit Data log.
- 
+
 
 
 bootparams(5)|bootparams.5
- 
+
  Current boot settings to be sent to systems attempting network boot for deployment, stateless, or other reasons.  Mostly automatically manipulated by xCAT.
- 
+
 
 
 boottarget(5)|boottarget.5
- 
+
  Specify non-standard initrd, kernel, and parameters that should be used for a given profile.
- 
+
 
 
 cfgmgt(5)|cfgmgt.5
- 
+
  Configuration management data for nodes used by non-xCAT osimage management services to install and configure software on a node.
- 
+
 
 
 chain(5)|chain.5
- 
+
  Controls what operations are done (and it what order) when a node is discovered and deployed.
- 
+
 
 
 deps(5)|deps.5
- 
+
  Describes dependencies some nodes have on others.  This can be used, e.g., by rpower -d to power nodes on or off in the correct order.
- 
+
 
 
 discoverydata(5)|discoverydata.5
- 
+
  Discovery data which sent from genesis.
- 
+
 
 
 domain(5)|domain.5
- 
+
  Mapping of nodes to domain attributes
- 
+
 
 
 eventlog(5)|eventlog.5
- 
+
  Stores the events occurred.
- 
+
 
 
 firmware(5)|firmware.5
- 
+
  Maps node to firmware values to be used for setup at node discovery or later
- 
+
 
 
 hosts(5)|hosts.5
- 
+
  IP addresses and hostnames of nodes.  This info is optional and is only used to populate /etc/hosts and DNS via makehosts and makedns.  Using regular expressions in this table can be a quick way to populate /etc/hosts.
- 
+
 
 
 hwinv(5)|hwinv.5
- 
+
  The hareware inventory for the node.
- 
+
 
 
 hypervisor(5)|hypervisor.5
- 
+
  Hypervisor parameters
- 
+
 
 
 ipmi(5)|ipmi.5
- 
+
  Settings for nodes that are controlled by an on-board BMC via IPMI.
- 
+
 
 
 iscsi(5)|iscsi.5
- 
+
  Contains settings that control how to boot a node from an iSCSI target
- 
+
 
 
 kit(5)|kit.5
- 
+
  This table stores all kits added to the xCAT cluster.
- 
+
 
 
 kitcomponent(5)|kitcomponent.5
- 
+
  This table stores all kit components added to the xCAT cluster.
- 
+
 
 
 kitrepo(5)|kitrepo.5
- 
+
  This table stores all kits added to the xCAT cluster.
- 
+
 
 
 kvm_masterdata(5)|kvm_masterdata.5
- 
+
  Persistent store for KVM plugin for masters
- 
+
 
 
 kvm_nodedata(5)|kvm_nodedata.5
- 
+
  Persistent store for KVM plugin, not intended for manual modification.
- 
+
 
 
 linuximage(5)|linuximage.5
- 
+
  Information about a Linux operating system image that can be used to deploy cluster nodes.
- 
+
 
 
 litefile(5)|litefile.5
- 
+
  The litefile table specifies the directories and files on the statelite nodes that should be readwrite, persistent, or readonly overlay.  All other files in the statelite nodes come from the readonly statelite image.
- 
+
 
 
 litetree(5)|litetree.5
- 
+
  Directory hierarchy to traverse to get the initial contents of node files.  The files that are specified in the litefile table are searched for in the directories specified in this table.
- 
+
 
 
 mac(5)|mac.5
- 
+
  The MAC address of the node's install adapter.  Normally this table is populated by getmacs or node discovery, but you can also add entries to it manually.
- 
+
 
 
 mic(5)|mic.5
- 
+
  The host, slot id and configuration of the mic (Many Integrated Core).
- 
+
 
 
 monitoring(5)|monitoring.5
- 
+
  Controls what external monitoring tools xCAT sets up and uses.  Entries should be added and removed from this table using the provided xCAT commands monstart and monstop.
- 
+
 
 
 monsetting(5)|monsetting.5
- 
+
  Specifies the monitoring plug-in specific settings. These settings will be used by the monitoring plug-in to customize the behavior such as event filter, sample interval, responses etc. Entries should be added, removed or modified by chtab command. Entries can also be added or modified by the monstart command when a monitoring plug-in is brought up.
- 
+
 
 
 mp(5)|mp.5
- 
+
  Contains the hardware control info specific to blades.  This table also refers to the mpa table, which contains info about each Management Module.
- 
+
 
 
 mpa(5)|mpa.5
- 
+
  Contains info about each Management Module and how to access it.
- 
+
 
 
 networks(5)|networks.5
- 
+
  Describes the networks in the cluster and info necessary to set up nodes on that network.
- 
+
 
 
 nics(5)|nics.5
- 
+
  Stores NIC details.
- 
+
 
 
 nimimage(5)|nimimage.5
- 
+
  All the info that specifies a particular AIX operating system image that can be used to deploy AIX nodes.
- 
+
 
 
 nodegroup(5)|nodegroup.5
- 
+
  Contains group definitions, whose membership is dynamic depending on characteristics of the node.
- 
+
 
 
 nodehm(5)|nodehm.5
- 
+
  Settings that control how each node's hardware is managed.  Typically, an additional table that is specific to the hardware type of the node contains additional info.  E.g. the ipmi, mp, and ppc tables.
- 
+
 
 
 nodelist(5)|nodelist.5
- 
+
  The list of all the nodes in the cluster, including each node's current status and what groups it is in.
- 
+
 
 
 nodepos(5)|nodepos.5
- 
+
  Contains info about the physical location of each node.  Currently, this info is not used by xCAT, and therefore can be in whatevery format you want.  It will likely be used in xCAT in the future.
- 
+
 
 
 noderes(5)|noderes.5
- 
+
  Resources and settings to use when installing nodes.
- 
+
 
 
 nodetype(5)|nodetype.5
- 
+
  A few hardware and software characteristics of the nodes.
- 
+
 
 
 notification(5)|notification.5
- 
+
  Contains registrations to be notified when a table in the xCAT database changes.  Users can add entries to have additional software notified of changes.  Add and remove entries using the provided xCAT commands regnotif and unregnotif.
- 
+
 
 
 openbmc(5)|openbmc.5
- 
+
  Setting for nodes that are controlled by an on-board OpenBMC.
- 
+
 
 
 osdistro(5)|osdistro.5
- 
+
  Information about all the OS distros in the xCAT cluster
- 
+
 
 
 osdistroupdate(5)|osdistroupdate.5
- 
+
  Information about the OS distro updates in the xCAT cluster
- 
+
 
 
 osimage(5)|osimage.5
- 
+
  Basic information about an operating system image that can be used to deploy cluster nodes.
- 
+
 
 
 passwd(5)|passwd.5
- 
+
  Contains default userids and passwords for xCAT to access cluster components.  In most cases, xCAT will also actually set the userid/password in the relevant component when it is being configured or installed.  Userids/passwords for specific cluster components can be overidden in other tables, e.g. mpa, ipmi, ppchcp, etc.
- 
+
 
 
 pdu(5)|pdu.5
- 
+
  Parameters to use when interrogating pdus
- 
+
 
 
 pduoutlet(5)|pduoutlet.5
- 
+
  Contains list of outlet numbers on the pdu each node is connected to.
- 
+
 
 
 performance(5)|performance.5
- 
+
  Describes the system performance every interval unit of time.
- 
+
 
 
 policy(5)|policy.5
- 
+
  The policy table in the xCAT database controls who has authority to run specific xCAT operations. It is basically the Access Control List (ACL) for xCAT. It is sorted on the priority field before evaluating.
- 
+
 
 
 postscripts(5)|postscripts.5
- 
+
  The scripts that should be run on each node after installation or diskless boot.
- 
+
 
 
 ppc(5)|ppc.5
- 
+
  List of system p hardware: HMCs, IVMs, FSPs, BPCs, CECs, Frames.
- 
+
 
 
 ppcdirect(5)|ppcdirect.5
- 
+
  Info necessary to use FSPs/BPAs to control system p CECs/Frames.
- 
+
 
 
 ppchcp(5)|ppchcp.5
- 
+
  Info necessary to use HMCs and IVMs as hardware control points for LPARs.
- 
+
 
 
 prescripts(5)|prescripts.5
- 
+
  The scripts that will be run at the beginning and the end of the nodeset(Linux), nimnodeset(AIX) or mkdsklsnode(AIX) command.
- 
+
 
 
 prodkey(5)|prodkey.5
- 
+
  Specify product keys for products that require them
- 
+
 
 
 rack(5)|rack.5
- 
+
  Rack information.
- 
+
 
 
 routes(5)|routes.5
- 
+
  Describes the additional routes needed to be setup in the os routing table. These routes usually are used to connect the management node to the compute node using the service node as gateway.
- 
+
 
 
 servicenode(5)|servicenode.5
- 
+
  List of all Service Nodes and services that will be set up on the Service Node.
- 
+
 
 
 site(5)|site.5
- 
- Global settings for the whole cluster.  This table is different from the 
- other tables in that each attribute is just named in the key column, rather 
- than having a separate column for each attribute. The following is a list of 
+
+ Global settings for the whole cluster.  This table is different from the
+ other tables in that each attribute is just named in the key column, rather
+ than having a separate column for each attribute. The following is a list of
  attributes currently used by xCAT organized into categories.
- 
+
 
 
 statelite(5)|statelite.5
- 
+
  The location on an NFS server where a nodes persistent files are stored.  Any file marked persistent in the litefile table will be stored in the location specified in this table for that node.
- 
+
 
 
 storage(5)|storage.5
@@ -737,81 +737,81 @@ storage(5)|storage.5
 
 
 switch(5)|switch.5
- 
+
  Contains what switch port numbers each node is connected to.
- 
+
 
 
 switches(5)|switches.5
- 
+
  Parameters to use when interrogating switches
- 
+
 
 
 taskstate(5)|taskstate.5
- 
+
  The task state for the node.
- 
+
 
 
 token(5)|token.5
- 
+
  The token of users for authentication.
- 
+
 
 
 virtsd(5)|virtsd.5
- 
+
  The parameters which used to create the Storage Domain
- 
+
 
 
 vm(5)|vm.5
- 
+
  Virtualization parameters
- 
+
 
 
 vmmaster(5)|vmmaster.5
- 
+
  Inventory of virtualization images for use with clonevm.  Manual intervention in this table is not intended.
- 
+
 
 
 vpd(5)|vpd.5
- 
+
  The Machine type, Model, and Serial numbers of each node.
- 
+
 
 
 websrv(5)|websrv.5
- 
+
  Web service parameters
- 
+
 
 
 winimage(5)|winimage.5
- 
+
  Information about a Windows operating system image that can be used to deploy cluster nodes.
- 
+
 
 
 zone(5)|zone.5
- 
+
  Defines a cluster zone for nodes that share root ssh key access to each other.
- 
+
 
 
 zvm(5)|zvm.5
- 
+
  List of z/VM virtual servers.
- 
+
 
 
 zvmivp(5)|zvmivp.5
- 
+
  List of z/VM Installation Verification Procedures (IVPs) to be periodically run.
- 
+
 
 
 
@@ -820,5 +820,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ , \ **lsdef(1)**\ , \ **mkdef(1)**\ , \ **chdef(1)**\ , \ **rmdef(1)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ , \ **lsdef(1)**\ , \ **mkdef(1)**\ , \ **chdef(1)**\ , \ **rmdef(1)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/xcatstanzafile.5.rst b/docs/source/guides/admin-guides/references/man5/xcatstanzafile.5.rst
index b8cb9d33e..7618912c9 100644
--- a/docs/source/guides/admin-guides/references/man5/xcatstanzafile.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/xcatstanzafile.5.rst
@@ -23,75 +23,75 @@ A stanza file contains information that can be used to create xCAT data object d
 
 
 \*
- 
+
  An object stanza header consists of the object name followed by a colon, (":").
- 
+
 
 
 \*
- 
+
  Attribute lines must take the form of Attribute=Value.
- 
+
 
 
 \*
- 
+
  Attribute name might include the character dot ("."), like passwd.HMC and nicips.eth0.
- 
+
 
 
 \*
- 
+
  Only one stanza can exist for each object name.
- 
+
 
 
 \*
- 
+
  All stanzas except for default stanzas must have a value set for "objtype".
- 
+
 
 
 \*
- 
+
  Comments beginning with the "#" pound sign may be added to the file. A comment must be on a separate line.
- 
+
 
 
 \*
- 
+
  When parsing the file, tab characters and spaces are ignored.
- 
+
 
 
 \*
- 
+
  Each line of the file can have no more than one header or attribute definition.
- 
+
 
 
 \*
- 
+
  If the header name is "default-<object type>:" the attribute values in the stanza are considered default values for subsequent definitions in the file that are the same object type.
- 
+
 
 
 \*
- 
+
  Default stanzas can be specified multiple times and at any point in a stanza file. The values apply to all definitions following the default stanzas in a file. The default values are cumulative; a default attribute value will remain set until it is explicitly unset or changed.
- 
+
 
 
 \*
- 
+
  To turn off a default value, use another default stanza to set the attribute to have no value using a blank space.
- 
+
 
 
 \*
- 
+
  When a specific value for an attribute is provided in the stanza, it takes priority over any default value that had been set.
- 
+
 
 
 The format of a stanza file should look similar to the following.
@@ -103,13 +103,13 @@ The format of a stanza file should look similar to the following.
      attr=val
      attr=val
      . . .
- 
+
   <object name>:
      objtype=<object type>
      attr=val
      attr=val
      . . .
- 
+
   <object name>:
      objtype=<object type>
      attr=val
@@ -125,47 +125,47 @@ EXAMPLES
 
 
 1)
- 
+
  Sample stanza file:
- 
- 
+
+
  .. code-block:: perl
- 
+
    mysite:
       objtype=site
       rsh=/bin/rsh
       rcp=/bin/rcp
       installdir=/xcatinstall
       domain=ppd.pok.ibm.com
-  
+
    MSnet01:
       objtype=network
       gateway=1.2.3.4
       netmask=255.255.255.0
       nameserver=5.6.7.8
-  
+
    default-node:
       next_osimage=aix61
       network=MSnet01
       groups=all,compute
-  
+
    node01:
       objtype=node
       MAC=A2E26002C003
       xcatmaster=MS02.ppd.pok.com
       nfsserver=IS227.ppd.pok.com
-  
+
    node02:
       objtype=node
       MAC=A2E26002B004
       xcatmaster=MS01.ppd.pok.com
       nfsserver=IS127.ppd.pok.com
-  
+
    grp01:
       objtype=group
       members=node1,node2,node3
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man5/zone.5.rst b/docs/source/guides/admin-guides/references/man5/zone.5.rst
index b4183e642..878c949be 100644
--- a/docs/source/guides/admin-guides/references/man5/zone.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/zone.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **zone Attributes:**\   \ *zonename*\ , \ *sshkeydir*\ , \ *sshbetweennodes*\ , \ *defaultzone*\ , \ *comments*\ , \ *disable*\ 
+\ **zone Attributes:**\   \ *zonename*\ , \ *sshkeydir*\ , \ *sshbetweennodes*\ , \ *defaultzone*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,40 +36,40 @@ zone Attributes:
 
 
 
-\ **zonename**\ 
- 
+\ **zonename**\
+
  The name of the zone.
- 
 
 
-\ **sshkeydir**\ 
- 
+
+\ **sshkeydir**\
+
  Directory containing the shared root ssh RSA keys.
- 
 
 
-\ **sshbetweennodes**\ 
- 
+
+\ **sshbetweennodes**\
+
  Indicates whether passwordless ssh will be setup between the nodes of this zone. Values are yes/1 or no/0. Default is yes.
- 
 
 
-\ **defaultzone**\ 
- 
+
+\ **defaultzone**\
+
  If nodes are not assigned to any other zone, they will default to this zone. If value is set to yes or 1.
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user-provided notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -78,5 +78,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/zvm.5.rst b/docs/source/guides/admin-guides/references/man5/zvm.5.rst
index 249977d9b..9e7c8d2fb 100644
--- a/docs/source/guides/admin-guides/references/man5/zvm.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/zvm.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **zvm Attributes:**\   \ *node*\ , \ *hcp*\ , \ *userid*\ , \ *nodetype*\ , \ *parent*\ , \ *comments*\ , \ *disable*\ , \ *discovered*\ , \ *status*\ 
+\ **zvm Attributes:**\   \ *node*\ , \ *hcp*\ , \ *userid*\ , \ *nodetype*\ , \ *parent*\ , \ *comments*\ , \ *disable*\ , \ *discovered*\ , \ *status*\
 
 
 ***********
@@ -36,58 +36,58 @@ zvm Attributes:
 
 
 
-\ **node**\ 
- 
+\ **node**\
+
  The node name.
- 
 
 
-\ **hcp**\ 
- 
+
+\ **hcp**\
+
  The hardware control point for this node.
- 
 
 
-\ **userid**\ 
- 
+
+\ **userid**\
+
  The z/VM userID of this node.
- 
 
 
-\ **nodetype**\ 
- 
+
+\ **nodetype**\
+
  The node type. Valid values: cec (Central Electronic Complex), lpar (logical partition), zvm (z/VM host operating system), and vm (virtual machine).
- 
 
 
-\ **parent**\ 
- 
+
+\ **parent**\
+
  The parent node. For LPAR, this specifies the CEC. For z/VM, this specifies the LPAR. For VM, this specifies the z/VM host operating system.
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user provided notes.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to comment out this row.
- 
 
 
-\ **discovered**\ 
- 
+
+\ **discovered**\
+
  Set to '1' to indicate this node was discovered.
- 
 
 
-\ **status**\ 
- 
+
+\ **status**\
+
  The processing status.  Key value pairs (key=value) indicating status of the node.  Multiple pairs are separated by semi-colons.  Keys include: CLONING, CLONE_ONLY.
- 
+
 
 
 
@@ -96,5 +96,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man5/zvmivp.5.rst b/docs/source/guides/admin-guides/references/man5/zvmivp.5.rst
index 04e5714ba..b41bd902c 100644
--- a/docs/source/guides/admin-guides/references/man5/zvmivp.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/zvmivp.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **zvmivp Attributes:**\   \ *id*\ , \ *ip*\ , \ *schedule*\ , \ *last_run*\ , \ *type_of_run*\ , \ *access_user*\ , \ *orch_parms*\ , \ *prep_parms*\ , \ *main_ivp_parms*\ , \ *comments*\ , \ *disable*\ 
+\ **zvmivp Attributes:**\   \ *id*\ , \ *ip*\ , \ *schedule*\ , \ *last_run*\ , \ *type_of_run*\ , \ *access_user*\ , \ *orch_parms*\ , \ *prep_parms*\ , \ *main_ivp_parms*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -36,70 +36,70 @@ zvmivp Attributes:
 
 
 
-\ **id**\ 
- 
+\ **id**\
+
  Unique identifier associated with the IVP run, e.g. 1.
- 
 
 
-\ **ip**\ 
- 
+
+\ **ip**\
+
  IP address of the target system, either the IP of the OpenStack compute node or the xCAT management node.
- 
 
 
-\ **schedule**\ 
- 
+
+\ **schedule**\
+
  The hours (0-24) that the IVP should be run.  Multiple hours are separated by a blank.
- 
 
 
-\ **last_run**\ 
- 
+
+\ **last_run**\
+
  The last time the IVP was run specified as a set of 3 blank delimeted words: year, Julian date, and hour (in 24 hour format).
- 
 
 
-\ **type_of_run**\ 
- 
+
+\ **type_of_run**\
+
  The type of run requested, 'fullivp' or 'basicivp'.
- 
 
 
-\ **access_user**\ 
- 
+
+\ **access_user**\
+
  User on the OpenStack node that is used to: push the IVP preparation script to the OpenStack system, drive the preparation script to validate the OpenStack configuration files, and return the created driver script to the xCAT MN system for the next part of the IVP.  This user should be able to access the OpenStack configuration files that are scanned by the IVP.
- 
 
 
-\ **orch_parms**\ 
- 
+
+\ **orch_parms**\
+
  Parameters to pass to the IVP orchestrator script, verifynode.
- 
 
 
-\ **prep_parms**\ 
- 
+
+\ **prep_parms**\
+
  Parameters to pass to the phase 1 IVP preparation script.
- 
 
 
-\ **main_ivp_parms**\ 
- 
+
+\ **main_ivp_parms**\
+
  Parameters to pass to the main IVP script.
- 
 
 
-\ **comments**\ 
- 
+
+\ **comments**\
+
  Any user provided notes or description of the run.
- 
 
 
-\ **disable**\ 
- 
+
+\ **disable**\
+
  Set to 'yes' or '1' to disable this IVP run.
- 
+
 
 
 
@@ -108,5 +108,5 @@ SEE ALSO
 ********
 
 
-\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\ 
+\ **nodels(1)**\ , \ **chtab(8)**\ , \ **tabdump(8)**\ , \ **tabedit(8)**\
 
diff --git a/docs/source/guides/admin-guides/references/man7/auditlog.7.rst b/docs/source/guides/admin-guides/references/man7/auditlog.7.rst
index e6e270384..833d7a18f 100644
--- a/docs/source/guides/admin-guides/references/man7/auditlog.7.rst
+++ b/docs/source/guides/admin-guides/references/man7/auditlog.7.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **auditlog Attributes:**\   \ *args*\ , \ *audittime*\ , \ *clientname*\ , \ *clienttype*\ , \ *command*\ , \ *comments*\ , \ *disable*\ , \ *noderange*\ , \ *recid*\ , \ *status*\ , \ *userid*\ 
+\ **auditlog Attributes:**\   \ *args*\ , \ *audittime*\ , \ *clientname*\ , \ *clienttype*\ , \ *command*\ , \ *comments*\ , \ *disable*\ , \ *noderange*\ , \ *recid*\ , \ *status*\ , \ *userid*\
 
 
 ***********
@@ -40,69 +40,69 @@ auditlog Attributes:
 
 
 \ **args**\  (auditlog.args)
- 
+
  The command argument list.
- 
+
 
 
 \ **audittime**\  (auditlog.audittime)
- 
+
  The timestamp for the audit entry.
- 
+
 
 
 \ **clientname**\  (auditlog.clientname)
- 
+
  The client machine, where the command originated.
- 
+
 
 
 \ **clienttype**\  (auditlog.clienttype)
- 
+
  Type of command: cli, java, webui, other.
- 
+
 
 
 \ **command**\  (auditlog.command)
- 
+
  Command executed. See auditskipcmds site table attribute to control which commands get logged.
- 
+
 
 
 \ **comments**\  (auditlog.comments)
- 
+
  Any user-provided notes.
- 
+
 
 
 \ **disable**\  (auditlog.disable)
- 
+
  Do not use.  tabprune will not work if set to yes or 1
- 
+
 
 
 \ **noderange**\  (auditlog.noderange)
- 
+
  The noderange on which the command was run.
- 
+
 
 
 \ **recid**\  (auditlog.recid)
- 
+
  The record id.
- 
+
 
 
 \ **status**\  (auditlog.status)
- 
+
  Allowed or Denied.
- 
+
 
 
 \ **userid**\  (auditlog.userid)
- 
+
  The user running the command.
- 
+
 
 
 
@@ -111,5 +111,5 @@ SEE ALSO
 ********
 
 
-\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ 
+\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\
 
diff --git a/docs/source/guides/admin-guides/references/man7/boottarget.7.rst b/docs/source/guides/admin-guides/references/man7/boottarget.7.rst
index be767a2fc..3895b5ff4 100644
--- a/docs/source/guides/admin-guides/references/man7/boottarget.7.rst
+++ b/docs/source/guides/admin-guides/references/man7/boottarget.7.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **boottarget Attributes:**\   \ *bprofile*\ , \ *comments*\ , \ *initrd*\ , \ *kcmdline*\ , \ *kernel*\ 
+\ **boottarget Attributes:**\   \ *bprofile*\ , \ *comments*\ , \ *initrd*\ , \ *kcmdline*\ , \ *kernel*\
 
 
 ***********
@@ -40,33 +40,33 @@ boottarget Attributes:
 
 
 \ **bprofile**\  (boottarget.bprofile)
- 
+
  All nodes with a nodetype.profile value equal to this value and nodetype.os set to "boottarget", will use the associated kernel, initrd, and kcmdline.
- 
+
 
 
 \ **comments**\  (boottarget.comments)
- 
+
  Any user-written notes.
- 
+
 
 
 \ **initrd**\  (boottarget.initrd)
- 
+
  The initial ramdisk image that network boot actions should use (could be a DOS floppy or hard drive image if using memdisk as kernel)
- 
+
 
 
 \ **kcmdline**\  (boottarget.kcmdline)
- 
+
  Arguments to be passed to the kernel
- 
+
 
 
 \ **kernel**\  (boottarget.kernel)
- 
+
  The kernel that network boot actions should currently acquire and use.  Note this could be a chained boot loader such as memdisk or a non-linux boot loader
- 
+
 
 
 
@@ -75,5 +75,5 @@ SEE ALSO
 ********
 
 
-\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ 
+\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\
 
diff --git a/docs/source/guides/admin-guides/references/man7/eventlog.7.rst b/docs/source/guides/admin-guides/references/man7/eventlog.7.rst
index ff31cbe01..2a97b9988 100644
--- a/docs/source/guides/admin-guides/references/man7/eventlog.7.rst
+++ b/docs/source/guides/admin-guides/references/man7/eventlog.7.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **eventlog Attributes:**\   \ *application*\ , \ *comments*\ , \ *component*\ , \ *disable*\ , \ *eventtime*\ , \ *eventtype*\ , \ *id*\ , \ *message*\ , \ *monitor*\ , \ *monnode*\ , \ *node*\ , \ *rawdata*\ , \ *recid*\ , \ *severity*\ 
+\ **eventlog Attributes:**\   \ *application*\ , \ *comments*\ , \ *component*\ , \ *disable*\ , \ *eventtime*\ , \ *eventtype*\ , \ *id*\ , \ *message*\ , \ *monitor*\ , \ *monnode*\ , \ *node*\ , \ *rawdata*\ , \ *recid*\ , \ *severity*\
 
 
 ***********
@@ -40,87 +40,87 @@ eventlog Attributes:
 
 
 \ **application**\  (eventlog.application)
- 
+
  The application that reports the event.
- 
+
 
 
 \ **comments**\  (eventlog.comments)
- 
+
  Any user-provided notes.
- 
+
 
 
 \ **component**\  (eventlog.component)
- 
+
  The component where the event occurred.
- 
+
 
 
 \ **disable**\  (eventlog.disable)
- 
+
  Do not use.  tabprune will not work if set to yes or 1
- 
+
 
 
 \ **eventtime**\  (eventlog.eventtime)
- 
+
  The timestamp for the event.
- 
+
 
 
 \ **eventtype**\  (eventlog.eventtype)
- 
+
  The type of the event.
- 
+
 
 
 \ **id**\  (eventlog.id)
- 
+
  The location or the resource name where the event occurred.
- 
+
 
 
 \ **message**\  (eventlog.message)
- 
+
  The full description of the event.
- 
+
 
 
 \ **monitor**\  (eventlog.monitor)
- 
+
  The name of the monitor that monitors this event.
- 
+
 
 
 \ **monnode**\  (eventlog.monnode)
- 
+
  The node that monitors this event.
- 
+
 
 
 \ **node**\  (eventlog.node)
- 
+
  The node where the event occurred.
- 
+
 
 
 \ **rawdata**\  (eventlog.rawdata)
- 
+
  The data that associated with the event.
- 
+
 
 
 \ **recid**\  (eventlog.recid)
- 
+
  The record id.
- 
+
 
 
 \ **severity**\  (eventlog.severity)
- 
+
  The severity of the event. Valid values are: informational, warning, critical.
- 
+
 
 
 
@@ -129,5 +129,5 @@ SEE ALSO
 ********
 
 
-\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ 
+\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\
 
diff --git a/docs/source/guides/admin-guides/references/man7/firmware.7.rst b/docs/source/guides/admin-guides/references/man7/firmware.7.rst
index 43a6da7cc..2c8ee454d 100644
--- a/docs/source/guides/admin-guides/references/man7/firmware.7.rst
+++ b/docs/source/guides/admin-guides/references/man7/firmware.7.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **firmware Attributes:**\   \ *cfgfile*\ , \ *comments*\ , \ *disable*\ 
+\ **firmware Attributes:**\   \ *cfgfile*\ , \ *comments*\ , \ *disable*\
 
 
 ***********
@@ -40,21 +40,21 @@ firmware Attributes:
 
 
 \ **cfgfile**\  (firmware.cfgfile)
- 
+
  The file to use.
- 
+
 
 
 \ **comments**\  (firmware.comments)
- 
+
  Any user-written notes.
- 
+
 
 
 \ **disable**\  (firmware.disable)
- 
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 
@@ -63,5 +63,5 @@ SEE ALSO
 ********
 
 
-\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ 
+\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\
 
diff --git a/docs/source/guides/admin-guides/references/man7/group.7.rst b/docs/source/guides/admin-guides/references/man7/group.7.rst
index f4507f8e8..c4d1849d7 100644
--- a/docs/source/guides/admin-guides/references/man7/group.7.rst
+++ b/docs/source/guides/admin-guides/references/man7/group.7.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **group Attributes:**\   \ *addkcmdline*\ , \ *arch*\ , \ *authdomain*\ , \ *authkey*\ , \ *authtype*\ , \ *bmc*\ , \ *bmcpassword*\ , \ *bmcport*\ , \ *bmcusername*\ , \ *bmcvlantag*\ , \ *cfgmgr*\ , \ *cfgmgtroles*\ , \ *cfgserver*\ , \ *chain*\ , \ *chassis*\ , \ *cmdmapping*\ , \ *community*\ , \ *cons*\ , \ *conserver*\ , \ *consoleenabled*\ , \ *consoleondemand*\ , \ *consport*\ , \ *cpucount*\ , \ *cputype*\ , \ *currchain*\ , \ *currstate*\ , \ *dhcpinterfaces*\ , \ *disksize*\ , \ *displayname*\ , \ *dockercpus*\ , \ *dockerflag*\ , \ *dockerhost*\ , \ *dockermemory*\ , \ *dockernics*\ , \ *domainadminpassword*\ , \ *domainadminuser*\ , \ *domaintype*\ , \ *getmac*\ , \ *groupname*\ , \ *grouptype*\ , \ *hcp*\ , \ *height*\ , \ *hostcluster*\ , \ *hostinterface*\ , \ *hostmanager*\ , \ *hostnames*\ , \ *hosttype*\ , \ *hwtype*\ , \ *id*\ , \ *initrd*\ , \ *installnic*\ , \ *interface*\ , \ *ip*\ , \ *iscsipassword*\ , \ *iscsiserver*\ , \ *iscsitarget*\ , \ *iscsiuserid*\ , \ *kcmdline*\ , \ *kernel*\ , \ *linkports*\ , \ *mac*\ , \ *membergroups*\ , \ *members*\ , \ *memory*\ , \ *mgt*\ , \ *micbridge*\ , \ *michost*\ , \ *micid*\ , \ *miconboot*\ , \ *micpowermgt*\ , \ *micvlog*\ , \ *migrationdest*\ , \ *monserver*\ , \ *mpa*\ , \ *mtm*\ , \ *nameservers*\ , \ *netboot*\ , \ *nfsdir*\ , \ *nfsserver*\ , \ *nicaliases*\ , \ *niccustomscripts*\ , \ *nicdevices*\ , \ *nicextraparams*\ , \ *nichostnameprefixes*\ , \ *nichostnamesuffixes*\ , \ *nicips*\ , \ *nicnetworks*\ , \ *nicsadapter*\ , \ *nictypes*\ , \ *nimserver*\ , \ *nodetype*\ , \ *ondiscover*\ , \ *os*\ , \ *osvolume*\ , \ *otherinterfaces*\ , \ *ou*\ , \ *outlet*\ , \ *parent*\ , \ *passwd.HMC*\ , \ *passwd.admin*\ , \ *passwd.celogin*\ , \ *passwd.general*\ , \ *passwd.hscroot*\ , \ *password*\ , \ *pdu*\ , \ *pdutype*\ , \ *postbootscripts*\ , \ *postscripts*\ , \ *power*\ , \ *pprofile*\ , \ *prescripts-begin*\ , \ *prescripts-end*\ , \ *primarynic*\ , \ *privkey*\ , \ *privtype*\ , \ *productkey*\ , \ *profile*\ , \ *protocol*\ , \ *provmethod*\ , \ *rack*\ , \ *room*\ , \ *routenames*\ , \ *seclevel*\ , \ *serial*\ , \ *serialflow*\ , \ *serialport*\ , \ *serialspeed*\ , \ *servicenode*\ , \ *setupconserver*\ , \ *setupdhcp*\ , \ *setupftp*\ , \ *setupipforward*\ , \ *setupldap*\ , \ *setupnameserver*\ , \ *setupnfs*\ , \ *setupnim*\ , \ *setupntp*\ , \ *setupproxydhcp*\ , \ *setuptftp*\ , \ *sfp*\ , \ *side*\ , \ *slot*\ , \ *slotid*\ , \ *slots*\ , \ *snmpauth*\ , \ *snmppassword*\ , \ *snmpprivacy*\ , \ *snmpuser*\ , \ *snmpusername*\ , \ *snmpversion*\ , \ *storagcontroller*\ , \ *storagetype*\ , \ *supernode*\ , \ *supportedarchs*\ , \ *supportproxydhcp*\ , \ *switch*\ , \ *switchinterface*\ , \ *switchport*\ , \ *switchtype*\ , \ *switchvlan*\ , \ *syslog*\ , \ *termport*\ , \ *termserver*\ , \ *tftpdir*\ , \ *tftpserver*\ , \ *unit*\ , \ *urlpath*\ , \ *usercomment*\ , \ *userid*\ , \ *username*\ , \ *vmbeacon*\ , \ *vmbootorder*\ , \ *vmcfgstore*\ , \ *vmcluster*\ , \ *vmcpus*\ , \ *vmhost*\ , \ *vmmanager*\ , \ *vmmaster*\ , \ *vmmemory*\ , \ *vmnicnicmodel*\ , \ *vmnics*\ , \ *vmothersetting*\ , \ *vmphyslots*\ , \ *vmstorage*\ , \ *vmstoragecache*\ , \ *vmstorageformat*\ , \ *vmstoragemodel*\ , \ *vmtextconsole*\ , \ *vmvirtflags*\ , \ *vmvncport*\ , \ *webport*\ , \ *wherevals*\ , \ *xcatmaster*\ 
+\ **group Attributes:**\   \ *addkcmdline*\ , \ *arch*\ , \ *authdomain*\ , \ *authkey*\ , \ *authtype*\ , \ *bmc*\ , \ *bmcpassword*\ , \ *bmcport*\ , \ *bmcusername*\ , \ *bmcvlantag*\ , \ *cfgmgr*\ , \ *cfgmgtroles*\ , \ *cfgserver*\ , \ *chain*\ , \ *chassis*\ , \ *cmdmapping*\ , \ *community*\ , \ *cons*\ , \ *conserver*\ , \ *consoleenabled*\ , \ *consoleondemand*\ , \ *consport*\ , \ *cpucount*\ , \ *cputype*\ , \ *currchain*\ , \ *currstate*\ , \ *dhcpinterfaces*\ , \ *disksize*\ , \ *displayname*\ , \ *dockercpus*\ , \ *dockerflag*\ , \ *dockerhost*\ , \ *dockermemory*\ , \ *dockernics*\ , \ *domainadminpassword*\ , \ *domainadminuser*\ , \ *domaintype*\ , \ *getmac*\ , \ *groupname*\ , \ *grouptype*\ , \ *hcp*\ , \ *height*\ , \ *hostcluster*\ , \ *hostinterface*\ , \ *hostmanager*\ , \ *hostnames*\ , \ *hosttype*\ , \ *hwtype*\ , \ *id*\ , \ *initrd*\ , \ *installnic*\ , \ *interface*\ , \ *ip*\ , \ *iscsipassword*\ , \ *iscsiserver*\ , \ *iscsitarget*\ , \ *iscsiuserid*\ , \ *kcmdline*\ , \ *kernel*\ , \ *linkports*\ , \ *mac*\ , \ *membergroups*\ , \ *members*\ , \ *memory*\ , \ *mgt*\ , \ *micbridge*\ , \ *michost*\ , \ *micid*\ , \ *miconboot*\ , \ *micpowermgt*\ , \ *micvlog*\ , \ *migrationdest*\ , \ *monserver*\ , \ *mpa*\ , \ *mtm*\ , \ *nameservers*\ , \ *netboot*\ , \ *nfsdir*\ , \ *nfsserver*\ , \ *nicaliases*\ , \ *niccustomscripts*\ , \ *nicdevices*\ , \ *nicextraparams*\ , \ *nichostnameprefixes*\ , \ *nichostnamesuffixes*\ , \ *nicips*\ , \ *nicnetworks*\ , \ *nicsadapter*\ , \ *nictypes*\ , \ *nimserver*\ , \ *nodetype*\ , \ *ondiscover*\ , \ *os*\ , \ *osvolume*\ , \ *otherinterfaces*\ , \ *ou*\ , \ *outlet*\ , \ *parent*\ , \ *passwd.HMC*\ , \ *passwd.admin*\ , \ *passwd.celogin*\ , \ *passwd.general*\ , \ *passwd.hscroot*\ , \ *password*\ , \ *pdu*\ , \ *pdutype*\ , \ *postbootscripts*\ , \ *postscripts*\ , \ *power*\ , \ *pprofile*\ , \ *prescripts-begin*\ , \ *prescripts-end*\ , \ *primarynic*\ , \ *privkey*\ , \ *privtype*\ , \ *productkey*\ , \ *profile*\ , \ *protocol*\ , \ *provmethod*\ , \ *rack*\ , \ *room*\ , \ *routenames*\ , \ *seclevel*\ , \ *serial*\ , \ *serialflow*\ , \ *serialport*\ , \ *serialspeed*\ , \ *servicenode*\ , \ *setupconserver*\ , \ *setupdhcp*\ , \ *setupftp*\ , \ *setupipforward*\ , \ *setupldap*\ , \ *setupnameserver*\ , \ *setupnfs*\ , \ *setupnim*\ , \ *setupntp*\ , \ *setupproxydhcp*\ , \ *setuptftp*\ , \ *sfp*\ , \ *side*\ , \ *slot*\ , \ *slotid*\ , \ *slots*\ , \ *snmpauth*\ , \ *snmppassword*\ , \ *snmpprivacy*\ , \ *snmpuser*\ , \ *snmpusername*\ , \ *snmpversion*\ , \ *storagcontroller*\ , \ *storagetype*\ , \ *supernode*\ , \ *supportedarchs*\ , \ *supportproxydhcp*\ , \ *switch*\ , \ *switchinterface*\ , \ *switchport*\ , \ *switchtype*\ , \ *switchvlan*\ , \ *syslog*\ , \ *termport*\ , \ *termserver*\ , \ *tftpdir*\ , \ *tftpserver*\ , \ *unit*\ , \ *urlpath*\ , \ *usercomment*\ , \ *userid*\ , \ *username*\ , \ *vmbeacon*\ , \ *vmbootorder*\ , \ *vmcfgstore*\ , \ *vmcluster*\ , \ *vmcpus*\ , \ *vmhost*\ , \ *vmmanager*\ , \ *vmmaster*\ , \ *vmmemory*\ , \ *vmnicnicmodel*\ , \ *vmnics*\ , \ *vmothersetting*\ , \ *vmphyslots*\ , \ *vmstorage*\ , \ *vmstoragecache*\ , \ *vmstorageformat*\ , \ *vmstoragemodel*\ , \ *vmtextconsole*\ , \ *vmvirtflags*\ , \ *vmvncport*\ , \ *webport*\ , \ *wherevals*\ , \ *xcatmaster*\
 
 
 ***********
@@ -40,824 +40,824 @@ group Attributes:
 
 
 \ **addkcmdline**\  (bootparams.addkcmdline)
- 
+
  User specified kernel options for os provision process(no prefix) or the provisioned os(with prefix "R::"). The options should be delimited with spaces(" ")
- 
+
 
 
 \ **arch**\  (nodetype.arch)
- 
+
  The hardware architecture of this node.  Valid values: x86_64, ppc64, x86, ia64.
- 
+
 
 
 \ **authdomain**\  (domain.authdomain)
- 
+
  If a node should participate in an AD domain or Kerberos realm distinct from domain indicated in site, this field can be used to specify that
- 
+
 
 
 \ **authkey**\  (pdu.authkey)
- 
+
  The authentication passphrase for SNMPv3
- 
+
 
 
 \ **authtype**\  (pdu.authtype)
- 
+
  The authentication protocol(MD5|SHA) to use for SNMPv3.
- 
+
 
 
 \ **bmc**\  (ipmi.bmc, openbmc.bmc)
- 
+
  The hostname of the BMC adapter.
- 
+
  or
- 
+
  The hostname of the BMC adapter.
- 
+
 
 
 \ **bmcpassword**\  (ipmi.password, openbmc.password)
- 
+
  The BMC password.  If not specified, the key=ipmi row in the passwd table is used as the default.
- 
+
  or
- 
+
  The BMC password.
- 
+
 
 
 \ **bmcport**\  (ipmi.bmcport)
- 
+
  In systems with selectable shared/dedicated ethernet ports, this parameter can be used to specify the preferred port. 0 means use the shared port, 1 means dedicated, blank is to not assign.
- 
- 
+
+
  .. code-block:: perl
- 
+
              The following special cases exist for IBM System x servers:
-  
+
              For x3755 M3 systems, 0 means use the dedicated port, 1 means
              shared, blank is to not assign.
-  
+
          For certain systems which have a mezzaine or ML2 adapter, there is a second
          value to include:
-  
-  
+
+
              For x3750 M4 (Model 8722):
-  
-  
+
+
              0 2   1st 1Gbps interface for LOM
-  
+
              0 0   1st 10Gbps interface for LOM
-  
+
              0 3   2nd 1Gbps interface for LOM
-  
+
              0 1   2nd 10Gbps interface for LOM
-  
-  
+
+
              For  x3750 M4 (Model 8752), x3850/3950 X6, dx360 M4, x3550 M4, and x3650 M4:
-  
-  
+
+
              0     Shared (1st onboard interface)
-  
+
              1     Dedicated
-  
+
              2 0   First interface on ML2 or mezzanine adapter
-  
+
              2 1   Second interface on ML2 or mezzanine adapter
-  
+
              2 2   Third interface on ML2 or mezzanine adapter
-  
+
              2 3   Fourth interface on ML2 or mezzanine adapter
- 
- 
+
+
 
 
 \ **bmcusername**\  (ipmi.username, openbmc.username)
- 
+
  The BMC userid.  If not specified, the key=ipmi row in the passwd table is used as the default.
- 
+
  or
- 
+
  The BMC userid.
- 
+
 
 
 \ **bmcvlantag**\  (ipmi.taggedvlan, openbmc.taggedvlan)
- 
+
  bmcsetup script will configure the network interface of the BMC to be tagged to the VLAN specified.
- 
+
  or
- 
+
  bmcsetup script will configure the network interface of the BMC to be tagged to the VLAN specified.
- 
+
 
 
 \ **cfgmgr**\  (cfgmgt.cfgmgr)
- 
+
  The name of the configuration manager service.  Currently 'chef' and 'puppet' are supported services.
- 
+
 
 
 \ **cfgmgtroles**\  (cfgmgt.roles)
- 
+
  The roles associated with this node as recognized by the cfgmgr for the software that is to be installed and configured.  These role names map to chef recipes or puppet manifest classes that should be used for this node.  For example, chef OpenStack cookbooks have roles such as mysql-master,keystone, glance, nova-controller, nova-conductor, cinder-all.
- 
+
 
 
 \ **cfgserver**\  (cfgmgt.cfgserver)
- 
+
  The xCAT node name of the chef server or puppet master
- 
+
 
 
 \ **chain**\  (chain.chain)
- 
+
  A comma-delimited chain of actions to be performed automatically when this node is discovered for the first time.  (xCAT and the DHCP server do not recognize the MAC address of the node when xCAT initializes the discovery process.)  The last step in this process is to run the operations listed in the chain attribute, one by one.  Valid values:  boot, runcmd=<cmd>, runimage=<URL>, shell, standby. For example, to have the genesis kernel pause to the shell, use chain=shell.
- 
+
 
 
 \ **chassis**\  (nodepos.chassis)
- 
+
  The BladeCenter chassis the blade is in.
- 
+
 
 
 \ **cmdmapping**\  (nodehm.cmdmapping)
- 
+
  The fully qualified name of the file that stores the mapping between PCM hardware management commands and xCAT/third-party hardware management commands for a particular type of hardware device.  Only used by PCM.
- 
+
 
 
 \ **community**\  (pdu.community)
- 
+
  The community string to use for SNMPv1/v2
- 
+
 
 
 \ **cons**\  (nodehm.cons)
- 
+
  The console method. If nodehm.serialport is set, this will default to the nodehm.mgt setting, otherwise it defaults to unused.  Valid values: cyclades, mrv, or the values valid for the mgt attribute.
- 
+
 
 
 \ **conserver**\  (nodehm.conserver)
- 
+
  The hostname of the machine where the conserver daemon is running.  If not set, the default is the xCAT management node.
- 
+
 
 
 \ **consoleenabled**\  (nodehm.consoleenabled)
- 
+
  A flag field to indicate whether the node is registered in the console server. If '1', console is enabled, if not set, console is not enabled.
- 
+
 
 
 \ **consoleondemand**\  (nodehm.consoleondemand)
- 
+
  This overrides the value from site.consoleondemand. Set to 'yes', 'no', '1' (equivalent to 'yes'), or '0' (equivalent to 'no'). If not set, the default is the value from site.consoleondemand.
- 
+
 
 
 \ **consport**\  (openbmc.consport)
- 
+
  The console port for OpenBMC.
- 
+
 
 
 \ **cpucount**\  (hwinv.cpucount)
- 
+
  The number of cpus for the node.
- 
+
 
 
 \ **cputype**\  (hwinv.cputype)
- 
+
  The cpu model name for the node.
- 
+
 
 
 \ **currchain**\  (chain.currchain)
- 
+
  The chain steps still left to do for this node.  This attribute will be automatically adjusted by xCAT while xCAT-genesis is running on the node (either during node discovery or a special operation like firmware update).  During node discovery, this attribute is initialized from the chain attribute and updated as the chain steps are executed.
- 
+
 
 
 \ **currstate**\  (chain.currstate)
- 
+
  The current or next chain step to be executed on this node by xCAT-genesis.  Set by xCAT during node discovery or as a result of nodeset.
- 
+
 
 
 \ **dhcpinterfaces**\  (servicenode.dhcpinterfaces)
- 
+
  The network interfaces DHCP server should listen on for the target node. This attribute can be used for management node and service nodes.  If defined, it will override the values defined in site.dhcpinterfaces. This is a comma separated list of device names. !remote! indicates a non-local network for relay DHCP. For example: !remote!,eth0,eth1
- 
+
 
 
 \ **disksize**\  (hwinv.disksize)
- 
+
  The size of the disks for the node in GB.
- 
+
 
 
 \ **displayname**\  (mpa.displayname)
- 
+
  Alternative name for BladeCenter chassis. Only used by PCM.
- 
+
 
 
 \ **dockercpus**\  (vm.cpus)
- 
+
  Number of CPUs the node should see.
- 
+
 
 
 \ **dockerflag**\  (vm.othersettings)
- 
+
  This allows specifying a semicolon delimited list of key->value pairs to include in a vmx file of VMware or KVM. For partitioning on normal power machines, this option is used to specify the hugepage and/or bsr information, the value is like:'hugepage:1,bsr=2'. For KVM cpu pinning, this option is used to specify the physical cpu set on the host, the value is like:"vcpupin:'0-15,^8'",Its syntax is a comma separated list and a special markup using '-' and '^' (ex. '0-4', '0-3,^2') can also be allowed, the '-' denotes the range and the '^' denotes exclusive. For KVM memory binding, the value is like:'membind:0', restrict a guest to allocate memory from the specified set of NUMA nodes. For PCI passthrough, the value is like:'devpassthrough:pci_0001_01_00_0,pci_0000_03_00_0', the value for PCI device format also can be like:'devpassthrough:0001:01:00.1', the PCI devices are assigned to a virtual machine, and the virtual machine can use this I/O exclusively, the devices list are a list of PCI device names delimited with comma, the PCI device names can be obtained by running \ **virsh nodedev-list**\  on the host.
- 
+
 
 
 \ **dockerhost**\  (vm.host)
- 
+
  The system that currently hosts the VM
- 
+
 
 
 \ **dockermemory**\  (vm.memory)
- 
+
  Megabytes of memory the VM currently should be set to.
- 
+
 
 
 \ **dockernics**\  (vm.nics)
- 
+
  Network configuration parameters.  Of the general form [physnet:]interface,.. Generally, interface describes the vlan entity (default for native, tagged for tagged, vl[number] for a specific vlan.  physnet is a virtual switch name or port description that is used for some virtualization technologies to construct virtual switches.  hypervisor.netmap can map names to hypervisor specific layouts, or the descriptions described there may be used directly here where possible.
- 
+
 
 
 \ **domainadminpassword**\  (domain.adminpassword)
- 
+
  Allow a node specific indication of Administrative user password for the domain.  Most will want to ignore this in favor of passwd table.
- 
+
 
 
 \ **domainadminuser**\  (domain.adminuser)
- 
+
  Allow a node specific indication of Administrative user.  Most will want to just use passwd table to indicate this once rather than by node.
- 
+
 
 
 \ **domaintype**\  (domain.type)
- 
+
  Type, if any, of authentication domain to manipulate.  The only recognized value at the moment is activedirectory.
- 
+
 
 
 \ **getmac**\  (nodehm.getmac)
- 
+
  The method to use to get MAC address of the node with the getmac command. If not set, the mgt attribute will be used.  Valid values: same as values for mgmt attribute.
- 
+
 
 
 \ **groupname**\  (nodegroup.groupname)
- 
+
  Name of the group.
- 
+
 
 
 \ **grouptype**\  (nodegroup.grouptype)
- 
+
  The only current valid value is dynamic.  We will be looking at having the object def commands working with static group definitions in the nodelist table.
- 
+
 
 
 \ **hcp**\  (ppc.hcp, zvm.hcp)
- 
+
  The hardware control point for this node (HMC, IVM, Frame or CEC).  Do not need to set for BPAs and FSPs.
- 
+
  or
- 
+
  The hardware control point for this node.
- 
+
 
 
 \ **height**\  (nodepos.height)
- 
+
  The server height in U(s).
- 
+
 
 
 \ **hostcluster**\  (hypervisor.cluster)
- 
+
  Specify to the underlying virtualization infrastructure a cluster membership for the hypervisor.
- 
+
 
 
 \ **hostinterface**\  (hypervisor.interface)
- 
+
  The definition of interfaces for the hypervisor. The format is [networkname:interfacename:bootprotocol:IP:netmask:gateway] that split with | for each interface
- 
+
 
 
 \ **hostmanager**\  (hypervisor.mgr)
- 
+
  The virtualization specific manager of this hypervisor when applicable
- 
+
 
 
 \ **hostnames**\  (hosts.hostnames)
- 
+
  Hostname aliases added to /etc/hosts for this node. Comma or blank separated list.
- 
+
 
 
 \ **hosttype**\  (hypervisor.type)
- 
+
  The plugin associated with hypervisor specific commands such as revacuate
- 
+
 
 
 \ **hwtype**\  (ppc.nodetype, zvm.nodetype, mp.nodetype, mic.nodetype)
- 
+
  The hardware type of the node. Only can be one of fsp, bpa, cec, frame, ivm, hmc and lpar
- 
+
  or
- 
+
  The node type. Valid values: cec (Central Electronic Complex), lpar (logical partition), zvm (z/VM host operating system), and vm (virtual machine).
- 
+
  or
- 
+
  The hardware type for mp node. Valid values: mm,cmm, blade.
- 
+
  or
- 
+
  The hardware type of the mic node. Generally, it is mic.
- 
+
 
 
 \ **id**\  (ppc.id, mp.id)
- 
+
  For LPARs: the LPAR numeric id; for CECs: the cage number; for Frames: the frame number.
- 
+
  or
- 
+
  The slot number of this blade in the BladeCenter chassis.
- 
+
 
 
 \ **initrd**\  (bootparams.initrd)
- 
+
  The initial ramdisk image that network boot actions should use (could be a DOS floppy or hard drive image if using memdisk as kernel)
- 
+
 
 
 \ **installnic**\  (noderes.installnic)
- 
+
  The network adapter on the node that will be used for OS deployment, the installnic can be set to the network adapter name or the mac address or the keyword "mac" which means that the network interface specified by the mac address in the mac table will be used.  If not set, primarynic will be used. If primarynic is not set too, the keyword "mac" will be used as default.
- 
+
 
 
 \ **interface**\  (mac.interface)
- 
+
  The adapter interface name that will be used to install and manage the node. E.g. eth0 (for linux) or en0 (for AIX).)
- 
+
 
 
 \ **ip**\  (hosts.ip)
- 
+
  The IP address of the node. This is only used in makehosts.  The rest of xCAT uses system name resolution to resolve node names to IP addresses.
- 
+
 
 
 \ **iscsipassword**\  (iscsi.passwd)
- 
+
  The password for the iscsi server containing the boot device for this node.
- 
+
 
 
 \ **iscsiserver**\  (iscsi.server)
- 
+
  The server containing the iscsi boot device for this node.
- 
+
 
 
 \ **iscsitarget**\  (iscsi.target)
- 
+
  The iscsi disk used for the boot device for this node.  Filled in by xCAT.
- 
+
 
 
 \ **iscsiuserid**\  (iscsi.userid)
- 
+
  The userid of the iscsi server containing the boot device for this node.
- 
+
 
 
 \ **kcmdline**\  (bootparams.kcmdline)
- 
+
  Arguments to be passed to the kernel
- 
+
 
 
 \ **kernel**\  (bootparams.kernel)
- 
+
  The kernel that network boot actions should currently acquire and use.  Note this could be a chained boot loader such as memdisk or a non-linux boot loader
- 
+
 
 
 \ **linkports**\  (switches.linkports)
- 
+
  The ports that connect to other switches. Currently, this column is only used by vlan configuration. The format is: "port_number:switch,port_number:switch...". Refer to the switch table for details on how to specify the port numbers.
- 
+
 
 
 \ **mac**\  (mac.mac)
- 
+
  The mac address or addresses for which xCAT will manage static bindings for this node.  This may be simply a mac address, which would be bound to the node name (such as "01:02:03:04:05:0E").  This may also be a "|" delimited string of "mac address!hostname" format (such as "01:02:03:04:05:0E!node5|01:02:03:04:05:0F!node6-eth1"). If there are multiple nics connected to Management Network(usually for bond), in order to make sure the OS deployment finished successfully, the macs of those nics must be able to resolve to same IP address. First, users have to create alias of the node for each mac in the Management Network through either: 1. adding the alias into /etc/hosts for the node directly or: 2. setting the alias to the "hostnames" attribute and then run "makehost" against the node. Then, configure the "mac" attribute of the node like "mac1!node|mac2!node-alias". For the first mac address (mac1 in the example) set in "mac" attribute, do not need to set a "node name" string for it since the nodename of the node will be used for it by default.
- 
+
 
 
 \ **membergroups**\  (nodegroup.membergroups)
- 
+
  This attribute stores a comma-separated list of nodegroups that this nodegroup refers to. This attribute is only used by PCM.
- 
+
 
 
 \ **members**\  (nodegroup.members)
- 
+
  The value of the attribute is not used, but the attribute is necessary as a place holder for the object def commands.  (The membership for static groups is stored in the nodelist table.)
- 
+
 
 
 \ **memory**\  (hwinv.memory)
- 
+
  The size of the memory for the node in MB.
- 
+
 
 
 \ **mgt**\  (nodehm.mgt)
- 
+
  The method to use to do general hardware management of the node.  This attribute is used as the default if power or getmac is not set.  Valid values: openbmc, ipmi, blade, hmc, ivm, fsp, bpa, kvm, esx, rhevm.  See the power attribute for more details.
- 
+
 
 
 \ **micbridge**\  (mic.bridge)
- 
+
  The virtual bridge on the host node which the mic connected to.
- 
+
 
 
 \ **michost**\  (mic.host)
- 
+
  The host node which the mic card installed on.
- 
+
 
 
 \ **micid**\  (mic.id)
- 
+
  The device id of the mic node.
- 
+
 
 
 \ **miconboot**\  (mic.onboot)
- 
+
  Set mic to autoboot when mpss start. Valid values: yes|no. Default is yes.
- 
+
 
 
 \ **micpowermgt**\  (mic.powermgt)
- 
+
  Set the Power Management for mic node. This attribute is used to set the power management state that mic may get into when it is idle. Four states can be set: cpufreq, corec6, pc3 and pc6. The valid value for powermgt attribute should be [cpufreq=<on|off>]![corec6=<on|off>]![pc3=<on|off>]![pc6=<on|off>]. e.g. cpufreq=on!corec6=off!pc3=on!pc6=off. Refer to the doc of mic to get more information for power management.
- 
+
 
 
 \ **micvlog**\  (mic.vlog)
- 
+
  Set the Verbose Log to console. Valid values: yes|no. Default is no.
- 
+
 
 
 \ **migrationdest**\  (vm.migrationdest)
- 
+
  A noderange representing candidate destinations for migration (i.e. similar systems, same SAN, or other criteria that xCAT can use
- 
+
 
 
 \ **monserver**\  (noderes.monserver)
- 
+
  The monitoring aggregation point for this node. The format is "x,y" where x is the ip address as known by the management node and y is the ip address as known by the node.
- 
+
 
 
 \ **mpa**\  (mp.mpa)
- 
+
  The management module used to control this blade.
- 
+
 
 
 \ **mtm**\  (vpd.mtm)
- 
+
  The machine type and model number of the node.  E.g. 7984-6BU
- 
+
 
 
 \ **nameservers**\  (noderes.nameservers)
- 
+
  An optional node/group specific override for name server list.  Most people want to stick to site or network defined nameserver configuration.
- 
+
 
 
 \ **netboot**\  (noderes.netboot)
- 
+
  The type of network booting to use for this node.  Valid values:
- 
- 
+
+
  .. code-block:: perl
- 
+
                          Arch                    OS                           valid netboot options
                          x86, x86_64             ALL                          pxe, xnba
                          ppc64                   <=rhel6, <=sles11.3          yaboot
                          ppc64                   >=rhels7, >=sles11.4         grub2,grub2-http,grub2-tftp
                          ppc64le NonVirtualize   ALL                          petitboot
                          ppc64le PowerKVM Guest  ALL                          grub2,grub2-http,grub2-tftp
- 
- 
+
+
 
 
 \ **nfsdir**\  (noderes.nfsdir)
- 
+
  The path that should be mounted from the NFS server.
- 
+
 
 
 \ **nfsserver**\  (noderes.nfsserver)
- 
+
  The NFS or HTTP server for this node (as known by this node).
- 
+
 
 
 \ **nicaliases**\  (nics.nicaliases)
- 
+
  Comma-separated list of hostname aliases for each NIC.
                  Format: eth0!<alias list>,eth1!<alias1 list>|<alias2 list>
-                     For multiple aliases per nic use a space-separated list. 
+                     For multiple aliases per nic use a space-separated list.
                  For example: eth0!moe larry curly,eth1!tom|jerry
- 
+
 
 
 \ **niccustomscripts**\  (nics.niccustomscripts)
- 
+
  Comma-separated list of custom scripts per NIC.  <nic1>!<script1>,<nic2>!<script2>, e.g. eth0!configeth eth0, ib0!configib ib0. The xCAT object definition commands support to use niccustomscripts.<nicname> as the sub attribute
  .
- 
+
 
 
 \ **nicdevices**\  (nics.nicdevices)
- 
+
  Comma-separated list of NIC device per NIC, multiple ethernet devices can be bonded as bond device, these ethernet devices are separated by | . <nic1>!<dev1>|<dev3>,<nic2>!<dev2>, e.g. bond0!eth0|eth2,br0!bond0. The xCAT object definition commands support to use nicdevices.<nicname> as the sub attributes.
- 
+
 
 
 \ **nicextraparams**\  (nics.nicextraparams)
- 
+
  Comma-separated list of extra parameters that will be used for each NIC configuration.
                  If only one ip address is associated with each NIC:
                      <nic1>!<param1=value1 param2=value2>,<nic2>!<param3=value3>, for example, eth0!MTU=1500,ib0!MTU=65520 CONNECTED_MODE=yes.
                  If multiple ip addresses are associated with each NIC:
                      <nic1>!<param1=value1 param2=value2>|<param3=value3>,<nic2>!<param4=value4 param5=value5>|<param6=value6>, for example, eth0!MTU=1500|MTU=1460,ib0!MTU=65520 CONNECTED_MODE=yes.
              The xCAT object definition commands support to use nicextraparams.<nicname> as the sub attributes.
- 
+
 
 
 \ **nichostnameprefixes**\  (nics.nichostnameprefixes)
- 
- Comma-separated list of hostname prefixes per NIC. 
+
+ Comma-separated list of hostname prefixes per NIC.
                          If only one ip address is associated with each NIC:
                              <nic1>!<ext1>,<nic2>!<ext2>,..., for example, eth0!eth0-,ib0!ib-
                          If multiple ip addresses are associated with each NIC:
-                             <nic1>!<ext1>|<ext2>,<nic2>!<ext1>|<ext2>,..., for example,  eth0!eth0-|eth0-ipv6i-,ib0!ib-|ib-ipv6-. 
-                         The xCAT object definition commands support to use nichostnameprefixes.<nicname> as the sub attributes. 
+                             <nic1>!<ext1>|<ext2>,<nic2>!<ext1>|<ext2>,..., for example,  eth0!eth0-|eth0-ipv6i-,ib0!ib-|ib-ipv6-.
+                         The xCAT object definition commands support to use nichostnameprefixes.<nicname> as the sub attributes.
                          Note:  According to DNS rules a hostname must be a text string up to 24 characters drawn from the alphabet (A-Z), digits (0-9) and minus sign (-). When you are specifying "nichostnameprefixes" or "nicaliases" make sure the resulting hostnames will conform to this naming convention
- 
+
 
 
 \ **nichostnamesuffixes**\  (nics.nichostnamesuffixes)
- 
- Comma-separated list of hostname suffixes per NIC. 
+
+ Comma-separated list of hostname suffixes per NIC.
                          If only one ip address is associated with each NIC:
                              <nic1>!<ext1>,<nic2>!<ext2>,..., for example, eth0!-eth0,ib0!-ib0
                          If multiple ip addresses are associated with each NIC:
-                             <nic1>!<ext1>|<ext2>,<nic2>!<ext1>|<ext2>,..., for example,  eth0!-eth0|-eth0-ipv6,ib0!-ib0|-ib0-ipv6. 
+                             <nic1>!<ext1>|<ext2>,<nic2>!<ext1>|<ext2>,..., for example,  eth0!-eth0|-eth0-ipv6,ib0!-ib0|-ib0-ipv6.
                          The xCAT object definition commands support to use nichostnamesuffixes.<nicname> as the sub attributes.
- 
- 
+
+
  .. code-block:: perl
- 
+
                           Note:  According to DNS rules a hostname must be a text string up to 24 characters drawn from the alphabet (A-Z), digits (0-9) and minus sign (-). When you are specifying "nichostnamesuffixes" or "nicaliases" make sure the resulting hostnames will conform to this naming convention
- 
- 
+
+
 
 
 \ **nicips**\  (nics.nicips)
- 
- Comma-separated list of IP addresses per NIC. 
+
+ Comma-separated list of IP addresses per NIC.
                  To specify one ip address per NIC:
                      <nic1>!<ip1>,<nic2>!<ip2>,..., for example, eth0!10.0.0.100,ib0!11.0.0.100
                  To specify multiple ip addresses per NIC:
                      <nic1>!<ip1>|<ip2>,<nic2>!<ip1>|<ip2>,..., for example, eth0!10.0.0.100|fd55::214:5eff:fe15:849b,ib0!11.0.0.100|2001::214:5eff:fe15:849a. The xCAT object definition commands support to use nicips.<nicname> as the sub attributes.
                  Note: The primary IP address must also be stored in the hosts.ip attribute. The nichostnamesuffixes should specify one hostname suffix for each ip address.
- 
+
 
 
 \ **nicnetworks**\  (nics.nicnetworks)
- 
+
  Comma-separated list of networks connected to each NIC.
                  If only one ip address is associated with each NIC:
                      <nic1>!<network1>,<nic2>!<network2>, for example, eth0!10_0_0_0-255_255_0_0, ib0!11_0_0_0-255_255_0_0
                  If multiple ip addresses are associated with each NIC:
                      <nic1>!<network1>|<network2>,<nic2>!<network1>|<network2>, for example, eth0!10_0_0_0-255_255_0_0|fd55:faaf:e1ab:336::/64,ib0!11_0_0_0-255_255_0_0|2001:db8:1:0::/64. The xCAT object definition commands support to use nicnetworks.<nicname> as the sub attributes.
- 
+
 
 
 \ **nicsadapter**\  (nics.nicsadapter)
- 
+
  Comma-separated list of NIC information collected by getadapter. <nic1>!<param1=value1 param2=value2>,<nic2>!<param4=value4 param5=value5>, for example, enP3p3s0f1!mac=98:be:94:59:fa:cd linkstate=DOWN,enP3p3s0f2!mac=98:be:94:59:fa:ce candidatename=enP3p3s0f2/enx98be9459face
- 
+
 
 
 \ **nictypes**\  (nics.nictypes)
- 
+
  Comma-separated list of NIC types per NIC. <nic1>!<type1>,<nic2>!<type2>, e.g. eth0!Ethernet,ib0!Infiniband. The xCAT object definition commands support to use nictypes.<nicname> as the sub attributes.
- 
+
 
 
 \ **nimserver**\  (noderes.nimserver)
- 
+
  Not used for now. The NIM server for this node (as known by this node).
- 
+
 
 
 \ **nodetype**\  (nodetype.nodetype, pdu.nodetype)
- 
+
  A comma-delimited list of characteristics of this node.  Valid values: ppc, blade, vm (virtual machine), osi (OS image), mm, mn, rsa, switch.
- 
+
  or
- 
+
  The node type should be pdu
- 
+
 
 
 \ **ondiscover**\  (chain.ondiscover)
- 
+
  This attribute is currently not used by xCAT.  The "nodediscover" operation is always done during node discovery.
- 
+
 
 
 \ **os**\  (nodetype.os)
- 
+
  The operating system deployed on this node.  Valid values: AIX, rhels\*,rhelc\*, rhas\*,centos\*,SL\*, fedora\*, sles\* (where \* is the version #). As a special case, if this is set to "boottarget", then it will use the initrd/kernel/parameters specified in the row in the boottarget table in which boottarget.bprofile equals nodetype.profile.
- 
+
 
 
 \ **osvolume**\  (storage.osvolume)
- 
+
  Specification of what storage to place the node OS image onto.  Examples include:
- 
- 
+
+
  .. code-block:: perl
- 
+
                   localdisk (Install to first non-FC attached disk)
                   usbdisk (Install to first USB mass storage device seen)
                   wwn=0x50000393c813840c (Install to storage device with given WWN)
- 
- 
+
+
 
 
 \ **otherinterfaces**\  (hosts.otherinterfaces)
- 
+
  Other IP addresses to add for this node.  Format: -<ext>:<ip>,<intfhostname>:<ip>,...
- 
+
 
 
 \ **ou**\  (domain.ou)
- 
+
  For an LDAP described machine account (i.e. Active Directory), the organizational unit to place the system.  If not set, defaults to cn=Computers,dc=your,dc=domain
- 
+
 
 
 \ **outlet**\  (pdu.outlet)
- 
+
  The pdu outlet count
- 
+
 
 
 \ **parent**\  (ppc.parent)
- 
+
  For LPARs: the CEC; for FSPs: the CEC; for CEC: the frame (if one exists); for BPA: the frame; for frame: the building block number (which consists 1 or more service nodes and compute/storage nodes that are serviced by them - optional).
- 
+
 
 
 \ **passwd.HMC**\  (ppcdirect.password)
- 
+
  Password of the FSP/BPA(for ASMI) and CEC/Frame(for DFM).  If not filled in, xCAT will look in the passwd table for key=fsp.  If not in the passwd table, the default used is admin.
- 
+
 
 
 \ **passwd.admin**\  (ppcdirect.password)
- 
+
  Password of the FSP/BPA(for ASMI) and CEC/Frame(for DFM).  If not filled in, xCAT will look in the passwd table for key=fsp.  If not in the passwd table, the default used is admin.
- 
+
 
 
 \ **passwd.celogin**\  (ppcdirect.password)
- 
+
  Password of the FSP/BPA(for ASMI) and CEC/Frame(for DFM).  If not filled in, xCAT will look in the passwd table for key=fsp.  If not in the passwd table, the default used is admin.
- 
+
 
 
 \ **passwd.general**\  (ppcdirect.password)
- 
+
  Password of the FSP/BPA(for ASMI) and CEC/Frame(for DFM).  If not filled in, xCAT will look in the passwd table for key=fsp.  If not in the passwd table, the default used is admin.
- 
+
 
 
 \ **passwd.hscroot**\  (ppcdirect.password)
- 
+
  Password of the FSP/BPA(for ASMI) and CEC/Frame(for DFM).  If not filled in, xCAT will look in the passwd table for key=fsp.  If not in the passwd table, the default used is admin.
- 
+
 
 
 \ **password**\  (ppchcp.password, mpa.password, websrv.password, pdu.password, switches.sshpassword)
- 
+
  Password of the HMC or IVM.  If not filled in, xCAT will look in the passwd table for key=hmc or key=ivm.  If not in the passwd table, the default used is abc123 for HMCs and padmin for IVMs.
- 
+
  or
- 
+
  Password to use to access the management module.  If not specified, the key=blade row in the passwd table is used as the default.
- 
+
  or
- 
+
  Password to use to access the web service.
- 
+
  or
- 
+
  The remote login password
- 
+
  or
- 
+
  The remote login password. It can be for ssh or telnet. If it is for telnet, set protocol to "telnet". If the sshusername is blank, the username, password and protocol will be retrieved from the passwd table with "switch" as the key.
- 
+
 
 
 \ **pdu**\  (pduoutlet.pdu)
- 
+
  a comma-separated list of outlet number for each PDU, ex: pdu1:outlet1,pdu2:outlet1
- 
+
 
 
 \ **pdutype**\  (pdu.pdutype)
- 
+
  The type of pdu
- 
+
 
 
 \ **postbootscripts**\  (postscripts.postbootscripts)
- 
+
  Comma separated list of scripts that should be run on this node after diskful installation or diskless boot. Each script can take zero or more parameters. For example: "script1 p1 p2,script2,...". On AIX these scripts are run during the processing of /etc/inittab.  On Linux they are run at the init.d time. xCAT automatically adds the scripts in the xcatdefaults.postbootscripts attribute to run first in the list. Please note that the postbootscripts specified for "xcatdefaults" will be assigned to node automatically, they can not be removed from "postbootscripts" attribute of a node with "chdef -m" command
- 
+
 
 
 \ **postscripts**\  (postscripts.postscripts)
- 
+
  Comma separated list of scripts that should be run on this node after diskful installation or diskless boot. Each script can take zero or more parameters. For example: "script1 p1 p2,script2,...". xCAT automatically adds the postscripts from  the xcatdefaults.postscripts attribute of the table to run first on the nodes after install or diskless boot. For installation of RedHat, CentOS, Fedora, the scripts will be run before the reboot. For installation of SLES, the scripts will be run after the reboot but before the init.d process. For diskless deployment, the scripts will be run at the init.d time, and xCAT will automatically add the list of scripts from the postbootscripts attribute to run after postscripts list. For installation of AIX, the scripts will run after the reboot and acts the same as the postbootscripts attribute.  For AIX, use the postbootscripts attribute. Please note that the postscripts specified for "xcatdefaults" will be assigned to node automatically, they can not be removed from "postscripts" attribute of a node with "chdef -m" command
- 
+
 
 
 \ **power**\  (nodehm.power)
- 
+
  The method to use to control the power of the node. If not set, the mgt attribute will be used.  Valid values: ipmi, blade, hmc, ivm, fsp, kvm, esx, rhevm.  If "ipmi", xCAT will search for this node in the ipmi table for more info.  If "blade", xCAT will search for this node in the mp table.  If "hmc", "ivm", or "fsp", xCAT will search for this node in the ppc table.
- 
+
 
 
 \ **pprofile**\  (ppc.pprofile)
- 
+
  The LPAR profile that will be used the next time the LPAR is powered on with rpower. For DFM, the pprofile attribute should be set to blank
- 
+
 
 
 \ **prescripts-begin**\  (prescripts.begin)
- 
+
  The scripts to be run at the beginning of the nodeset(Linux), nimnodeset(AIX) or mkdsklsnode(AIX) command.
   The format is:
     [action1:]s1,s2...[| action2:s3,s4,s5...]
   where:
-   - action1 and action2 for Linux are the nodeset actions specified in the command. 
+   - action1 and action2 for Linux are the nodeset actions specified in the command.
      For AIX, action1 and action1 can be 'diskless' for mkdsklsnode command'
-     and 'standalone for nimnodeset command. 
+     and 'standalone for nimnodeset command.
    - s1 and s2 are the scripts to run for action1 in order.
    - s3, s4, and s5 are the scripts to run for actions2.
   If actions are omitted, the scripts apply to all actions.
@@ -866,511 +866,511 @@ group Attributes:
     diskless:myscript1,myscript2   (AIX)
     install:myscript1,myscript2|netboot:myscript3   (Linux)
   All the scripts should be copied to /install/prescripts directory.
-  The following two environment variables will be passed to each script: 
+  The following two environment variables will be passed to each script:
     NODES a coma separated list of node names that need to run the script for
     ACTION current nodeset action.
   If '#xCAT setting:MAX_INSTANCE=number' is specified in the script, the script
   will get invoked for each node in parallel, but no more than number of instances
   will be invoked at at a time. If it is not specified, the script will be invoked
   once for all the nodes.
- 
+
 
 
 \ **prescripts-end**\  (prescripts.end)
- 
+
  The scripts to be run at the end of the nodeset(Linux), nimnodeset(AIX),or mkdsklsnode(AIX) command. The format is the same as the 'begin' column.
- 
+
 
 
 \ **primarynic**\  (noderes.primarynic)
- 
+
  This attribute will be deprecated. All the used network interface will be determined by installnic. The network adapter on the node that will be used for xCAT management, the primarynic can be set to the network adapter name or the mac address or the keyword "mac" which means that the network interface specified by the mac address in the mac table  will be used.  Default is eth0.
- 
+
 
 
 \ **privkey**\  (pdu.privkey)
- 
+
  The privacy passphrase to use for SNMPv3.
- 
+
 
 
 \ **privtype**\  (pdu.privtype)
- 
+
  The privacy protocol(AES|DES) to use for SNMPv3.
- 
+
 
 
 \ **productkey**\  (prodkey.key)
- 
+
  The product key relevant to the aforementioned node/group and product combination
- 
+
 
 
 \ **profile**\  (nodetype.profile)
- 
+
  The string to use to locate a kickstart or autoyast template to use for OS deployment of this node.  If the provmethod attribute is set to an osimage name, that takes precedence, and profile need not be defined.  Otherwise, the os, profile, and arch are used to search for the files in /install/custom first, and then in /opt/xcat/share/xcat.
- 
+
 
 
 \ **protocol**\  (switches.protocol)
- 
+
  Protocol for running remote commands for the switch. The valid values are: ssh, telnet. ssh is the default. If the sshusername is blank, the username, password and protocol will be retrieved from the passwd table with "switch" as the key. The passwd.comments attribute is used for protocol.
- 
+
 
 
 \ **provmethod**\  (nodetype.provmethod)
- 
+
  The provisioning method for node deployment. The valid values are install, netboot, statelite or an os image name from the osimage table. If an image name is specified, the osimage definition stored in the osimage table and the linuximage table (for Linux) or nimimage table (for AIX) are used to locate the files for templates, pkglists, syncfiles, etc. On Linux, if install, netboot or statelite is specified, the os, profile, and arch are used to search for the files in /install/custom first, and then in /opt/xcat/share/xcat.
- 
+
 
 
 \ **rack**\  (nodepos.rack)
- 
+
  The frame the node is in.
- 
+
 
 
 \ **room**\  (nodepos.room)
- 
+
  The room where the node is located.
- 
+
 
 
 \ **routenames**\  (noderes.routenames)
- 
+
  A comma separated list of route names that refer to rows in the routes table. These are the routes that should be defined on this node when it is deployed.
- 
+
 
 
 \ **seclevel**\  (pdu.seclevel)
- 
+
  The Security Level(noAuthNoPriv|authNoPriv|authPriv) to use for SNMPv3.
- 
+
 
 
 \ **serial**\  (vpd.serial)
- 
+
  The serial number of the node.
- 
+
 
 
 \ **serialflow**\  (nodehm.serialflow)
- 
+
  The flow control value of the serial port for this node.  For SOL this is typically 'hard'.
- 
+
 
 
 \ **serialport**\  (nodehm.serialport)
- 
+
  The serial port for this node, in the linux numbering style (0=COM1/ttyS0, 1=COM2/ttyS1).  For SOL on IBM blades, this is typically 1.  For rackmount IBM servers, this is typically 0.
- 
+
 
 
 \ **serialspeed**\  (nodehm.serialspeed)
- 
+
  The speed of the serial port for this node.  For SOL this is typically 19200.
- 
+
 
 
 \ **servicenode**\  (noderes.servicenode)
- 
+
  A comma separated list of node names (as known by the management node) that provides most services for this node. The first service node on the list that is accessible will be used.  The 2nd node on the list is generally considered to be the backup service node for this node when running commands like snmove.
- 
+
 
 
 \ **setupconserver**\  (servicenode.conserver)
- 
+
  Do we set up console service on this service node?  Valid values: 0, 1, or 2. If 0, it does not change the current state of the service. If 1, configures and starts conserver daemon. If 2, configures and starts goconserver daemon.
- 
+
 
 
 \ **setupdhcp**\  (servicenode.dhcpserver)
- 
+
  Do we set up DHCP on this service node? Not supported on AIX. Valid values:1 or 0. If 1, runs makedhcp -n. If 0, it does not change the current state of the service.
- 
+
 
 
 \ **setupftp**\  (servicenode.ftpserver)
- 
+
  Do we set up a ftp server on this service node? Not supported on AIX Valid values:1 or 0. If 1, configure and start vsftpd.  (You must manually install vsftpd on the service nodes before this.) If 0, it does not change the current state of the service. xCAT is not using ftp for compute nodes provisioning or any other xCAT features, so this attribute can be set to 0 if the ftp service will not be used for other purposes
- 
+
 
 
 \ **setupipforward**\  (servicenode.ipforward)
- 
+
  Do we set up ip forwarding on this service node? Valid values:1 or 0. If 0, it does not change the current state of the service.
- 
+
 
 
 \ **setupldap**\  (servicenode.ldapserver)
- 
+
  Do we set up ldap caching proxy on this service node? Not supported on AIX.  Valid values:1 or 0. If 0, it does not change the current state of the service.
- 
+
 
 
 \ **setupnameserver**\  (servicenode.nameserver)
- 
+
  Do we set up DNS on this service node? Valid values: 2, 1, or 0. If 2, creates named.conf as dns slave, using the management node as dns master, and starts named. If 1, creates named.conf file with forwarding to the management node and starts named. If 0, it does not change the current state of the service.
- 
+
 
 
 \ **setupnfs**\  (servicenode.nfsserver)
- 
+
  Do we set up file services (HTTP,FTP,or NFS) on this service node? For AIX will only setup NFS, not HTTP or FTP. Valid values:1 or 0.If 0, it does not change the current state of the service.
- 
+
 
 
 \ **setupnim**\  (servicenode.nimserver)
- 
+
  Not used. Do we set up a NIM server on this service node? Valid values:1 or 0. If 0, it does not change the current state of the service.
- 
+
 
 
 \ **setupntp**\  (servicenode.ntpserver)
- 
+
  Not used. Use setupntp postscript to setup a ntp server on this service node? Valid values:1 or 0. If 0, it does not change the current state of the service.
- 
+
 
 
 \ **setupproxydhcp**\  (servicenode.proxydhcp)
- 
+
  Do we set up proxydhcp service on this node? valid values: 1 or 0. If 1, the proxydhcp daemon will be enabled on this node.
- 
+
 
 
 \ **setuptftp**\  (servicenode.tftpserver)
- 
+
  Do we set up TFTP on this service node? Not supported on AIX. Valid values:1 or 0. If 1, configures and starts atftp. If 0, it does not change the current state of the service.
- 
+
 
 
 \ **sfp**\  (ppc.sfp)
- 
+
  The Service Focal Point of this Frame. This is the name of the HMC that is responsible for collecting hardware service events for this frame and all of the CECs within this frame.
- 
+
 
 
 \ **side**\  (vpd.side)
- 
+
  <BPA>-<port> or <FSP>-<port>. The side information for the BPA/FSP. The side attribute refers to which BPA/FSP, A or B, which is determined by the slot value returned from lsslp command. It also lists the physical port within each BPA/FSP which is determined by the IP address order from the lsslp response. This information is used internally when communicating with the BPAs/FSPs
- 
+
 
 
 \ **slot**\  (nodepos.slot)
- 
+
  The slot number of the blade in the chassis. For PCM, a comma-separated list of slot numbers is stored
- 
+
 
 
 \ **slotid**\  (mp.id)
- 
+
  The slot number of this blade in the BladeCenter chassis.
- 
+
 
 
 \ **slots**\  (mpa.slots)
- 
+
  The number of available slots in the chassis. For PCM, this attribute is used to store the number of slots in the following format:  <slot rows>,<slot columns>,<slot orientation>  Where:
- 
- 
+
+
  .. code-block:: perl
- 
+
                    <slot rows>  = number of rows of slots in chassis
                    <slot columns> = number of columns of slots in chassis
                    <slot orientation> = set to 0 if slots are vertical, and set to 1 if slots of horizontal
- 
- 
+
+
 
 
 \ **snmpauth**\  (switches.auth)
- 
+
  The authentication protocol to use for SNMPv3.  SHA is assumed if v3 enabled and this is unspecified
- 
+
 
 
 \ **snmppassword**\  (switches.password)
- 
+
  The password string for SNMPv3 or community string for SNMPv1/SNMPv2.  Falls back to passwd table, and site snmpc value if using SNMPv1/SNMPv2.
- 
+
 
 
 \ **snmpprivacy**\  (switches.privacy)
- 
+
  The privacy protocol to use for v3. xCAT will use authNoPriv if this is unspecified. DES is recommended to use if v3 enabled, as it is the most readily available.
- 
+
 
 
 \ **snmpuser**\  (pdu.snmpuser)
- 
+
  The username to use for SNMPv3 communication, ignored for SNMPv1
- 
+
 
 
 \ **snmpusername**\  (switches.username)
- 
+
  The username to use for SNMPv3 communication, ignored for SNMPv1
- 
+
 
 
 \ **snmpversion**\  (pdu.snmpversion, switches.snmpversion)
- 
+
  The version to use to communicate with switch.  SNMPv1 is assumed by default.
- 
+
  or
- 
+
  The version to use to communicate with switch.  SNMPv1 is assumed by default.
- 
+
 
 
 \ **storagcontroller**\  (storage.controller)
- 
+
  The management address to attach/detach new volumes.
  In the scenario involving multiple controllers, this data must be
  passed as argument rather than by table value
- 
+
 
 
 \ **storagetype**\  (storage.type)
- 
+
  The plugin used to drive storage configuration (e.g. svc)
- 
+
 
 
 \ **supernode**\  (ppc.supernode)
- 
+
  Indicates the connectivity of this CEC in the HFI network. A comma separated list of 2 ids. The first one is the supernode number the CEC is part of. The second one is the logical location number (0-3) of this CEC within the supernode.
- 
+
 
 
 \ **supportedarchs**\  (nodetype.supportedarchs)
- 
+
  Comma delimited list of architectures this node can execute.
- 
+
 
 
 \ **supportproxydhcp**\  (noderes.proxydhcp)
- 
+
  To specify whether the node supports proxydhcp protocol. Valid values: yes or 1, no or 0. Default value is yes.
- 
+
 
 
 \ **switch**\  (switch.switch)
- 
+
  The switch hostname.
- 
+
 
 
 \ **switchinterface**\  (switch.interface)
- 
+
  The interface name from the node perspective. For example, eth0. For the primary nic, it can be empty, the word "primary" or "primary:ethx" where ethx is the interface name.
- 
+
 
 
 \ **switchport**\  (switch.port)
- 
+
  The port number in the switch that this node is connected to. On a simple 1U switch, an administrator can generally enter the number as printed next to the ports, and xCAT will understand switch representation differences.  On stacked switches or switches with line cards, administrators should usually use the CLI representation (i.e. 2/0/1 or 5/8).  One notable exception is stacked SMC 8848M switches, in which you must add 56 for the proceeding switch, then the port number.  For example, port 3 on the second switch in an SMC8848M stack would be 59
- 
+
 
 
 \ **switchtype**\  (switches.switchtype)
- 
+
  The type of switch. It is used to identify the file name that implements the functions for this switch. The valid values are: Mellanox, Cisco, BNT and Juniper.
- 
+
 
 
 \ **switchvlan**\  (switch.vlan)
- 
+
  The ID for the tagged vlan that is created on this port using mkvlan and chvlan commands.
- 
+
 
 
 \ **syslog**\  (noderes.syslog)
- 
+
  To configure how to configure syslog for compute node. Valid values:blank(not set), ignore. blank - run postscript syslog; ignore - do NOT run postscript syslog
- 
+
 
 
 \ **termport**\  (nodehm.termport)
- 
+
  The port number on the terminal server that this node is connected to.
- 
+
 
 
 \ **termserver**\  (nodehm.termserver)
- 
+
  The hostname of the terminal server.
- 
+
 
 
 \ **tftpdir**\  (noderes.tftpdir)
- 
+
  The directory that roots this nodes contents from a tftp and related perspective.  Used for NAS offload by using different mountpoints.
- 
+
 
 
 \ **tftpserver**\  (noderes.tftpserver)
- 
+
  The TFTP server for this node (as known by this node). If not set, it defaults to networks.tftpserver.
- 
+
 
 
 \ **unit**\  (nodepos.u)
- 
+
  The vertical position of the node in the frame
- 
+
 
 
 \ **urlpath**\  (mpa.urlpath)
- 
+
  URL path for the Chassis web interface. The full URL is built as follows: <hostname>/<urlpath>
- 
+
 
 
 \ **usercomment**\  (nodegroup.comments)
- 
+
  Any user-written notes.
- 
+
 
 
 \ **userid**\  (zvm.userid)
- 
+
  The z/VM userID of this node.
- 
+
 
 
 \ **username**\  (ppchcp.username, mpa.username, websrv.username, pdu.username, switches.sshusername)
- 
+
  Userid of the HMC or IVM.  If not filled in, xCAT will look in the passwd table for key=hmc or key=ivm.  If not in the passwd table, the default used is hscroot for HMCs and padmin for IVMs.
- 
+
  or
- 
+
  Userid to use to access the management module.
- 
+
  or
- 
+
  Userid to use to access the web service.
- 
+
  or
- 
+
  The remote login user name
- 
+
  or
- 
+
  The remote login user name. It can be for ssh or telnet. If it is for telnet, set protocol to "telnet". If the sshusername is blank, the username, password and protocol will be retrieved from the passwd table with "switch" as the key.
- 
+
 
 
 \ **vmbeacon**\  (vm.beacon)
- 
+
  This flag is used by xCAT to track the state of the identify LED with respect to the VM.
- 
+
 
 
 \ **vmbootorder**\  (vm.bootorder)
- 
+
  Boot sequence (i.e. net,hd)
- 
+
 
 
 \ **vmcfgstore**\  (vm.cfgstore)
- 
+
  Optional location for persistent storage separate of emulated hard drives for virtualization solutions that require persistent store to place configuration data
- 
+
 
 
 \ **vmcluster**\  (vm.cluster)
- 
+
  Specify to the underlying virtualization infrastructure a cluster membership for the hypervisor.
- 
+
 
 
 \ **vmcpus**\  (vm.cpus)
- 
+
  Number of CPUs the node should see.
- 
+
 
 
 \ **vmhost**\  (vm.host)
- 
+
  The system that currently hosts the VM
- 
+
 
 
 \ **vmmanager**\  (vm.mgr)
- 
+
  The function manager for the virtual machine
- 
+
 
 
 \ **vmmaster**\  (vm.master)
- 
+
  The name of a master image, if any, this virtual machine is linked to.  This is generally set by clonevm and indicates the deletion of a master that would invalidate the storage of this virtual machine
- 
+
 
 
 \ **vmmemory**\  (vm.memory)
- 
+
  Megabytes of memory the VM currently should be set to.
- 
+
 
 
 \ **vmnicnicmodel**\  (vm.nicmodel)
- 
+
  Model of NICs that will be provided to VMs (i.e. e1000, rtl8139, virtio, etc)
- 
+
 
 
 \ **vmnics**\  (vm.nics)
- 
+
  Network configuration parameters.  Of the general form [physnet:]interface,.. Generally, interface describes the vlan entity (default for native, tagged for tagged, vl[number] for a specific vlan.  physnet is a virtual switch name or port description that is used for some virtualization technologies to construct virtual switches.  hypervisor.netmap can map names to hypervisor specific layouts, or the descriptions described there may be used directly here where possible.
- 
+
 
 
 \ **vmothersetting**\  (vm.othersettings)
- 
+
  This allows specifying a semicolon delimited list of key->value pairs to include in a vmx file of VMware or KVM. For partitioning on normal power machines, this option is used to specify the hugepage and/or bsr information, the value is like:'hugepage:1,bsr=2'. For KVM cpu pinning, this option is used to specify the physical cpu set on the host, the value is like:"vcpupin:'0-15,^8'",Its syntax is a comma separated list and a special markup using '-' and '^' (ex. '0-4', '0-3,^2') can also be allowed, the '-' denotes the range and the '^' denotes exclusive. For KVM memory binding, the value is like:'membind:0', restrict a guest to allocate memory from the specified set of NUMA nodes. For PCI passthrough, the value is like:'devpassthrough:pci_0001_01_00_0,pci_0000_03_00_0', the value for PCI device format also can be like:'devpassthrough:0001:01:00.1', the PCI devices are assigned to a virtual machine, and the virtual machine can use this I/O exclusively, the devices list are a list of PCI device names delimited with comma, the PCI device names can be obtained by running \ **virsh nodedev-list**\  on the host.
- 
+
 
 
 \ **vmphyslots**\  (vm.physlots)
- 
+
  Specify the physical slots drc index that will assigned to the partition, the delimiter is ',', and the drc index must started with '0x'. For more details, reference manpage for 'lsvm'.
- 
+
 
 
 \ **vmstorage**\  (vm.storage)
- 
+
  A list of storage files or devices to be used.  i.e. dir:///cluster/vm/<nodename> or nfs://<server>/path/to/folder/
- 
+
 
 
 \ **vmstoragecache**\  (vm.storagecache)
- 
+
  Select caching scheme to employ.  E.g. KVM understands 'none', 'writethrough' and 'writeback'
- 
+
 
 
 \ **vmstorageformat**\  (vm.storageformat)
- 
+
  Select disk format to use by default (e.g. raw versus qcow2)
- 
+
 
 
 \ **vmstoragemodel**\  (vm.storagemodel)
- 
+
  Model of storage devices to provide to guest
- 
+
 
 
 \ **vmtextconsole**\  (vm.textconsole)
- 
+
  Tracks the Psuedo-TTY that maps to the serial port or console of a VM
- 
+
 
 
 \ **vmvirtflags**\  (vm.virtflags)
- 
- General flags used by the virtualization method.  
+
+ General flags used by the virtualization method.
            For example, in Xen it could, among other things, specify paravirtualized setup, or direct kernel boot.  For a hypervisor/dom0 entry, it is the virtualization method (i.e. "xen").  For KVM, the following flag=value pairs are recognized:
              imageformat=[raw|fullraw|qcow2]
                  raw is a generic sparse file that allocates storage on demand
@@ -1378,33 +1378,33 @@ group Attributes:
                  qcow2 is a sparse, copy-on-write capable format implemented at the virtualization layer rather than the filesystem level
              clonemethod=[qemu-img|reflink]
                  qemu-img allows use of qcow2 to generate virtualization layer copy-on-write
-                 reflink uses a generic filesystem facility to clone the files on your behalf, but requires filesystem support such as btrfs 
+                 reflink uses a generic filesystem facility to clone the files on your behalf, but requires filesystem support such as btrfs
              placement_affinity=[migratable|user_migratable|pinned]
- 
+
 
 
 \ **vmvncport**\  (vm.vncport)
- 
+
  Tracks the current VNC display port (currently not meant to be set
- 
+
 
 
 \ **webport**\  (websrv.port)
- 
+
  The port of the web service.
- 
+
 
 
 \ **wherevals**\  (nodegroup.wherevals)
- 
+
  A list of "attr\*val" pairs that can be used to determine the members of a dynamic group, the delimiter is "::" and the operator \* can be ==, =~, != or !~.
- 
+
 
 
 \ **xcatmaster**\  (noderes.xcatmaster)
- 
+
  The hostname of the xCAT service node (as known by this node).  This acts as the default value for nfsserver and tftpserver, if they are not set.  If xcatmaster is not set, the node will use whoever responds to its boot request as its master.  For the directed bootp case for POWER, it will use the management node if xcatmaster is not set.
- 
+
 
 
 
@@ -1413,5 +1413,5 @@ SEE ALSO
 ********
 
 
-\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ 
+\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\
 
diff --git a/docs/source/guides/admin-guides/references/man7/kit.7.rst b/docs/source/guides/admin-guides/references/man7/kit.7.rst
index e6062763f..d5626623d 100644
--- a/docs/source/guides/admin-guides/references/man7/kit.7.rst
+++ b/docs/source/guides/admin-guides/references/man7/kit.7.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **kit Attributes:**\   \ *basename*\ , \ *description*\ , \ *isinternal*\ , \ *kitdeployparams*\ , \ *kitdir*\ , \ *kitname*\ , \ *ostype*\ , \ *release*\ , \ *version*\ 
+\ **kit Attributes:**\   \ *basename*\ , \ *description*\ , \ *isinternal*\ , \ *kitdeployparams*\ , \ *kitdir*\ , \ *kitname*\ , \ *ostype*\ , \ *release*\ , \ *version*\
 
 
 ***********
@@ -40,57 +40,57 @@ kit Attributes:
 
 
 \ **basename**\  (kit.basename)
- 
+
  The kit base name
- 
+
 
 
 \ **description**\  (kit.description)
- 
+
  The Kit description.
- 
+
 
 
 \ **isinternal**\  (kit.isinternal)
- 
+
  A flag to indicated if the Kit is internally used. When set to 1, the Kit is internal. If 0 or undefined, the kit is not internal.
- 
+
 
 
 \ **kitdeployparams**\  (kit.kitdeployparams)
- 
+
  The file containing the default deployment parameters for this Kit.  These parameters are added to the OS Image definition.s list of deployment parameters when one or more Kit Components from this Kit are added to the OS Image.
- 
+
 
 
 \ **kitdir**\  (kit.kitdir)
- 
+
  The path to Kit Installation directory on the Mgt Node.
- 
+
 
 
 \ **kitname**\  (kit.kitname)
- 
+
  The unique generated kit name, when kit is added to the cluster.
- 
+
 
 
 \ **ostype**\  (kit.ostype)
- 
+
  The kit OS type.  Linux or AIX.
- 
+
 
 
 \ **release**\  (kit.release)
- 
+
  The kit release
- 
+
 
 
 \ **version**\  (kit.version)
- 
+
  The kit version
- 
+
 
 
 
@@ -99,5 +99,5 @@ SEE ALSO
 ********
 
 
-\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ 
+\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\
 
diff --git a/docs/source/guides/admin-guides/references/man7/kitcomponent.7.rst b/docs/source/guides/admin-guides/references/man7/kitcomponent.7.rst
index a5d222d13..6ab65f5aa 100644
--- a/docs/source/guides/admin-guides/references/man7/kitcomponent.7.rst
+++ b/docs/source/guides/admin-guides/references/man7/kitcomponent.7.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **kitcomponent Attributes:**\   \ *basename*\ , \ *description*\ , \ *driverpacks*\ , \ *exlist*\ , \ *genimage_postinstall*\ , \ *kitcompdeps*\ , \ *kitcompname*\ , \ *kitname*\ , \ *kitpkgdeps*\ , \ *kitreponame*\ , \ *postbootscripts*\ , \ *prerequisite*\ , \ *release*\ , \ *serverroles*\ , \ *version*\ 
+\ **kitcomponent Attributes:**\   \ *basename*\ , \ *description*\ , \ *driverpacks*\ , \ *exlist*\ , \ *genimage_postinstall*\ , \ *kitcompdeps*\ , \ *kitcompname*\ , \ *kitname*\ , \ *kitpkgdeps*\ , \ *kitreponame*\ , \ *postbootscripts*\ , \ *prerequisite*\ , \ *release*\ , \ *serverroles*\ , \ *version*\
 
 
 ***********
@@ -40,93 +40,93 @@ kitcomponent Attributes:
 
 
 \ **basename**\  (kitcomponent.basename)
- 
+
  Kit Component basename.
- 
+
 
 
 \ **description**\  (kitcomponent.description)
- 
+
  The Kit component description.
- 
+
 
 
 \ **driverpacks**\  (kitcomponent.driverpacks)
- 
+
  Comma-separated List of driver package names. These must be full names like: pkg1-1.0-1.x86_64.rpm.
- 
+
 
 
 \ **exlist**\  (kitcomponent.exlist)
- 
+
  Exclude list file containing the files/directories to exclude when building a diskless image.
- 
+
 
 
 \ **genimage_postinstall**\  (kitcomponent.genimage_postinstall)
- 
+
  Comma-separated list of postinstall scripts that will run during the genimage.
- 
+
 
 
 \ **kitcompdeps**\  (kitcomponent.kitcompdeps)
- 
+
  Comma-separated list of kit components that this kit component depends on.
- 
+
 
 
 \ **kitcompname**\  (kitcomponent.kitcompname)
- 
+
  The unique Kit Component name. It is auto-generated when the parent Kit is added to the cluster.
- 
+
 
 
 \ **kitname**\  (kitcomponent.kitname)
- 
+
  The Kit name which this Kit Component belongs to.
- 
+
 
 
 \ **kitpkgdeps**\  (kitcomponent.kitpkgdeps)
- 
+
  Comma-separated list of packages that this kit component depends on.
- 
+
 
 
 \ **kitreponame**\  (kitcomponent.kitreponame)
- 
+
  The Kit Package Repository name which this Kit Component belongs to.
- 
+
 
 
 \ **postbootscripts**\  (kitcomponent.postbootscripts)
- 
+
  Comma-separated list of postbootscripts that will run during the node boot.
- 
+
 
 
 \ **prerequisite**\  (kitcomponent.prerequisite)
- 
+
  Prerequisite for this kit component, the prerequisite includes ospkgdeps,preinstall,preupgrade,preuninstall scripts
- 
+
 
 
 \ **release**\  (kitcomponent.release)
- 
+
  Kit Component release.
- 
+
 
 
 \ **serverroles**\  (kitcomponent.serverroles)
- 
+
  The types of servers that this Kit Component can install on.  Valid types are: mgtnode, servicenode, compute
- 
+
 
 
 \ **version**\  (kitcomponent.version)
- 
+
  Kit Component version.
- 
+
 
 
 
@@ -135,5 +135,5 @@ SEE ALSO
 ********
 
 
-\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ 
+\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\
 
diff --git a/docs/source/guides/admin-guides/references/man7/kitrepo.7.rst b/docs/source/guides/admin-guides/references/man7/kitrepo.7.rst
index e5bf6c359..4abf1a4bf 100644
--- a/docs/source/guides/admin-guides/references/man7/kitrepo.7.rst
+++ b/docs/source/guides/admin-guides/references/man7/kitrepo.7.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **kitrepo Attributes:**\   \ *compat_osbasenames*\ , \ *kitname*\ , \ *kitrepodir*\ , \ *kitreponame*\ , \ *osarch*\ , \ *osbasename*\ , \ *osmajorversion*\ , \ *osminorversion*\ 
+\ **kitrepo Attributes:**\   \ *compat_osbasenames*\ , \ *kitname*\ , \ *kitrepodir*\ , \ *kitreponame*\ , \ *osarch*\ , \ *osbasename*\ , \ *osmajorversion*\ , \ *osminorversion*\
 
 
 ***********
@@ -40,51 +40,51 @@ kitrepo Attributes:
 
 
 \ **compat_osbasenames**\  (kitrepo.compat_osbasenames)
- 
+
  List of compatible OS base names.
- 
+
 
 
 \ **kitname**\  (kitrepo.kitname)
- 
+
  The Kit name which this Kit Package Repository belongs to.
- 
+
 
 
 \ **kitrepodir**\  (kitrepo.kitrepodir)
- 
+
  The path to Kit Repository directory on the Mgt Node.
- 
+
 
 
 \ **kitreponame**\  (kitrepo.kitreponame)
- 
+
  The unique generated kit repo package name, when kit is added to the cluster.
- 
+
 
 
 \ **osarch**\  (kitrepo.osarch)
- 
+
  The OS distro arch which this repository is based on.
- 
+
 
 
 \ **osbasename**\  (kitrepo.osbasename)
- 
+
  The OS distro name which this repository is based on.
- 
+
 
 
 \ **osmajorversion**\  (kitrepo.osmajorversion)
- 
+
  The OS distro major version which this repository is based on.
- 
+
 
 
 \ **osminorversion**\  (kitrepo.osminorversion)
- 
+
  The OS distro minor version which this repository is based on. If this attribute is not set, it means that this repo applies to all minor versions.
- 
+
 
 
 
@@ -93,5 +93,5 @@ SEE ALSO
 ********
 
 
-\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ 
+\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\
 
diff --git a/docs/source/guides/admin-guides/references/man7/monitoring.7.rst b/docs/source/guides/admin-guides/references/man7/monitoring.7.rst
index 8c7953e7f..478824ad7 100644
--- a/docs/source/guides/admin-guides/references/man7/monitoring.7.rst
+++ b/docs/source/guides/admin-guides/references/man7/monitoring.7.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **monitoring Attributes:**\   \ *comments*\ , \ *disable*\ , \ *name*\ , \ *nodestatmon*\ 
+\ **monitoring Attributes:**\   \ *comments*\ , \ *disable*\ , \ *name*\ , \ *nodestatmon*\
 
 
 ***********
@@ -40,27 +40,27 @@ monitoring Attributes:
 
 
 \ **comments**\  (monitoring.comments)
- 
+
  Any user-written notes.
- 
+
 
 
 \ **disable**\  (monitoring.disable)
- 
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 \ **name**\  (monitoring.name)
- 
+
  The name of the monitoring plug-in module.  The plug-in must be put in /lib/perl/xCAT_monitoring/.  See the man page for monstart for details.
- 
+
 
 
 \ **nodestatmon**\  (monitoring.nodestatmon)
- 
+
  Specifies if the monitoring plug-in is used to feed the node status to the xCAT cluster.  Any one of the following values indicates "yes":  y, Y, yes, Yes, YES, 1.  Any other value or blank (default), indicates "no".
- 
+
 
 
 
@@ -69,5 +69,5 @@ SEE ALSO
 ********
 
 
-\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ 
+\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\
 
diff --git a/docs/source/guides/admin-guides/references/man7/network.7.rst b/docs/source/guides/admin-guides/references/man7/network.7.rst
index 593a52fb0..9702cc574 100644
--- a/docs/source/guides/admin-guides/references/man7/network.7.rst
+++ b/docs/source/guides/admin-guides/references/man7/network.7.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **network Attributes:**\   \ *ddnsdomain*\ , \ *dhcpserver*\ , \ *domain*\ , \ *dynamicrange*\ , \ *gateway*\ , \ *logservers*\ , \ *mask*\ , \ *mgtifname*\ , \ *mtu*\ , \ *nameservers*\ , \ *net*\ , \ *netname*\ , \ *nodehostname*\ , \ *ntpservers*\ , \ *staticrange*\ , \ *staticrangeincrement*\ , \ *tftpserver*\ , \ *usercomment*\ , \ *vlanid*\ 
+\ **network Attributes:**\   \ *ddnsdomain*\ , \ *dhcpserver*\ , \ *domain*\ , \ *dynamicrange*\ , \ *gateway*\ , \ *logservers*\ , \ *mask*\ , \ *mgtifname*\ , \ *mtu*\ , \ *nameservers*\ , \ *net*\ , \ *netname*\ , \ *nodehostname*\ , \ *ntpservers*\ , \ *staticrange*\ , \ *staticrangeincrement*\ , \ *tftpserver*\ , \ *usercomment*\ , \ *vlanid*\
 
 
 ***********
@@ -40,93 +40,93 @@ network Attributes:
 
 
 \ **ddnsdomain**\  (networks.ddnsdomain)
- 
+
  A domain to be combined with nodename to construct FQDN for DDNS updates induced by DHCP.  This is not passed down to the client as "domain"
- 
+
 
 
 \ **dhcpserver**\  (networks.dhcpserver)
- 
+
  The DHCP server that is servicing this network.  Required to be explicitly set for pooled service node operation.
- 
+
 
 
 \ **domain**\  (networks.domain)
- 
+
  The DNS domain name (ex. cluster.com).
- 
+
 
 
 \ **dynamicrange**\  (networks.dynamicrange)
- 
+
  The IP address range used by DHCP to assign dynamic IP addresses for requests on this network.  This should not overlap with entities expected to be configured with static host declarations, i.e. anything ever expected to be a node with an address registered in the mac table.
- 
+
 
 
 \ **gateway**\  (networks.gateway)
- 
+
  The network gateway. It can be set to an ip address or the keyword <xcatmaster>, the keyword <xcatmaster> indicates the cluster-facing ip address configured on this management node or service node. Leaving this field blank means that there is no gateway for this network.
- 
+
 
 
 \ **logservers**\  (networks.logservers)
- 
+
  The log servers for this network.  Used in creating the DHCP network definition.  Assumed to be the DHCP server if not set.
- 
+
 
 
 \ **mask**\  (networks.mask)
- 
+
  The network mask.
- 
+
 
 
 \ **mgtifname**\  (networks.mgtifname)
- 
+
  The interface name of the management/service node facing this network.  !remote!<nicname> indicates a non-local network on a specific nic for relay DHCP.
- 
+
 
 
 \ **mtu**\  (networks.mtu)
- 
+
  The default MTU for the network, If multiple networks are applied to the same nic on the SN and/or CN, the MTU shall be the same for those networks.
- 
+
 
 
 \ **nameservers**\  (networks.nameservers)
- 
+
  A comma delimited list of DNS servers that each node in this network should use. This value will end up in the nameserver settings of the /etc/resolv.conf on each node in this network. If this attribute value is set to the IP address of an xCAT node, make sure DNS is running on it. In a hierarchical cluster, you can also set this attribute to "<xcatmaster>" to mean the DNS server for each node in this network should be the node that is managing it (either its service node or the management node).  Used in creating the DHCP network definition, and DNS configuration.
- 
+
 
 
 \ **net**\  (networks.net)
- 
+
  The network address.
- 
+
 
 
 \ **netname**\  (networks.netname)
- 
+
  Name used to identify this network definition.
- 
+
 
 
 \ **nodehostname**\  (networks.nodehostname)
- 
+
  A regular expression used to specify node name to network-specific hostname.  i.e. "/\z/-secondary/" would mean that the hostname of "n1" would be n1-secondary on this network.  By default, the nodename is assumed to equal the hostname, followed by nodename-interfacename.
- 
+
 
 
 \ **ntpservers**\  (networks.ntpservers)
- 
+
  The ntp servers for this network.  Used in creating the DHCP network definition.  Assumed to be the DHCP server if not set.
- 
+
 
 
 \ **staticrange**\  (networks.staticrange)
- 
+
  The IP address range used to dynamically assign static IPs to newly discovered nodes.  This should not overlap with the dynamicrange nor overlap with entities that were manually assigned static IPs.  The format for the attribute value is:    <startip>-<endip>.
- 
+
 
 
 \ **staticrangeincrement**\  (networks.staticrangeincrement)
@@ -134,21 +134,21 @@ network Attributes:
 
 
 \ **tftpserver**\  (networks.tftpserver)
- 
+
  The TFTP server that is servicing this network.  If not set, the DHCP server is assumed.
- 
+
 
 
 \ **usercomment**\  (networks.comments)
- 
+
  Any user-written notes.
- 
+
 
 
 \ **vlanid**\  (networks.vlanid)
- 
+
  The vlan ID if this network is within a vlan.
- 
+
 
 
 
@@ -157,5 +157,5 @@ SEE ALSO
 ********
 
 
-\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ 
+\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\
 
diff --git a/docs/source/guides/admin-guides/references/man7/node.7.rst b/docs/source/guides/admin-guides/references/man7/node.7.rst
index 985dadec3..0a57e2ceb 100644
--- a/docs/source/guides/admin-guides/references/man7/node.7.rst
+++ b/docs/source/guides/admin-guides/references/man7/node.7.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **node Attributes:**\   \ *addkcmdline*\ , \ *appstatus*\ , \ *appstatustime*\ , \ *arch*\ , \ *authdomain*\ , \ *authkey*\ , \ *authtype*\ , \ *bmc*\ , \ *bmcpassword*\ , \ *bmcport*\ , \ *bmcusername*\ , \ *bmcvlantag*\ , \ *cfgmgr*\ , \ *cfgmgtroles*\ , \ *cfgserver*\ , \ *chain*\ , \ *chassis*\ , \ *cmdmapping*\ , \ *community*\ , \ *cons*\ , \ *conserver*\ , \ *consoleenabled*\ , \ *consoleondemand*\ , \ *consport*\ , \ *cpucount*\ , \ *cputype*\ , \ *currchain*\ , \ *currstate*\ , \ *dhcpinterfaces*\ , \ *disksize*\ , \ *displayname*\ , \ *dockercpus*\ , \ *dockerflag*\ , \ *dockerhost*\ , \ *dockermemory*\ , \ *dockernics*\ , \ *domainadminpassword*\ , \ *domainadminuser*\ , \ *domaintype*\ , \ *getmac*\ , \ *groups*\ , \ *hcp*\ , \ *height*\ , \ *hidden*\ , \ *hostcluster*\ , \ *hostinterface*\ , \ *hostmanager*\ , \ *hostnames*\ , \ *hosttype*\ , \ *hwtype*\ , \ *id*\ , \ *initrd*\ , \ *installnic*\ , \ *interface*\ , \ *ip*\ , \ *iscsipassword*\ , \ *iscsiserver*\ , \ *iscsitarget*\ , \ *iscsiuserid*\ , \ *kcmdline*\ , \ *kernel*\ , \ *linkports*\ , \ *mac*\ , \ *memory*\ , \ *mgt*\ , \ *micbridge*\ , \ *michost*\ , \ *micid*\ , \ *miconboot*\ , \ *micpowermgt*\ , \ *micvlog*\ , \ *migrationdest*\ , \ *monserver*\ , \ *mpa*\ , \ *mtm*\ , \ *nameservers*\ , \ *netboot*\ , \ *nfsdir*\ , \ *nfsserver*\ , \ *nicaliases*\ , \ *niccustomscripts*\ , \ *nicdevices*\ , \ *nicextraparams*\ , \ *nichostnameprefixes*\ , \ *nichostnamesuffixes*\ , \ *nicips*\ , \ *nicnetworks*\ , \ *nicsadapter*\ , \ *nictypes*\ , \ *nimserver*\ , \ *node*\ , \ *nodetype*\ , \ *ondiscover*\ , \ *os*\ , \ *osvolume*\ , \ *otherinterfaces*\ , \ *ou*\ , \ *outlet*\ , \ *parent*\ , \ *passwd.HMC*\ , \ *passwd.admin*\ , \ *passwd.celogin*\ , \ *passwd.general*\ , \ *passwd.hscroot*\ , \ *password*\ , \ *pdu*\ , \ *pdutype*\ , \ *postbootscripts*\ , \ *postscripts*\ , \ *power*\ , \ *pprofile*\ , \ *prescripts-begin*\ , \ *prescripts-end*\ , \ *primarynic*\ , \ *primarysn*\ , \ *privkey*\ , \ *privtype*\ , \ *productkey*\ , \ *profile*\ , \ *protocol*\ , \ *provmethod*\ , \ *rack*\ , \ *room*\ , \ *routenames*\ , \ *seclevel*\ , \ *serial*\ , \ *serialflow*\ , \ *serialport*\ , \ *serialspeed*\ , \ *servicenode*\ , \ *setupconserver*\ , \ *setupdhcp*\ , \ *setupftp*\ , \ *setupipforward*\ , \ *setupldap*\ , \ *setupnameserver*\ , \ *setupnfs*\ , \ *setupnim*\ , \ *setupntp*\ , \ *setupproxydhcp*\ , \ *setuptftp*\ , \ *sfp*\ , \ *side*\ , \ *slot*\ , \ *slotid*\ , \ *slots*\ , \ *snmpauth*\ , \ *snmppassword*\ , \ *snmpprivacy*\ , \ *snmpuser*\ , \ *snmpusername*\ , \ *snmpversion*\ , \ *status*\ , \ *statustime*\ , \ *storagcontroller*\ , \ *storagetype*\ , \ *supernode*\ , \ *supportedarchs*\ , \ *supportproxydhcp*\ , \ *switch*\ , \ *switchinterface*\ , \ *switchport*\ , \ *switchtype*\ , \ *switchvlan*\ , \ *syslog*\ , \ *termport*\ , \ *termserver*\ , \ *tftpdir*\ , \ *tftpserver*\ , \ *unit*\ , \ *updatestatus*\ , \ *updatestatustime*\ , \ *urlpath*\ , \ *usercomment*\ , \ *userid*\ , \ *username*\ , \ *vmbeacon*\ , \ *vmbootorder*\ , \ *vmcfgstore*\ , \ *vmcluster*\ , \ *vmcpus*\ , \ *vmhost*\ , \ *vmmanager*\ , \ *vmmaster*\ , \ *vmmemory*\ , \ *vmnicnicmodel*\ , \ *vmnics*\ , \ *vmothersetting*\ , \ *vmphyslots*\ , \ *vmstorage*\ , \ *vmstoragecache*\ , \ *vmstorageformat*\ , \ *vmstoragemodel*\ , \ *vmtextconsole*\ , \ *vmvirtflags*\ , \ *vmvncport*\ , \ *webport*\ , \ *xcatmaster*\ , \ *zonename*\ 
+\ **node Attributes:**\   \ *addkcmdline*\ , \ *appstatus*\ , \ *appstatustime*\ , \ *arch*\ , \ *authdomain*\ , \ *authkey*\ , \ *authtype*\ , \ *bmc*\ , \ *bmcpassword*\ , \ *bmcport*\ , \ *bmcusername*\ , \ *bmcvlantag*\ , \ *cfgmgr*\ , \ *cfgmgtroles*\ , \ *cfgserver*\ , \ *chain*\ , \ *chassis*\ , \ *cmdmapping*\ , \ *community*\ , \ *cons*\ , \ *conserver*\ , \ *consoleenabled*\ , \ *consoleondemand*\ , \ *consport*\ , \ *cpucount*\ , \ *cputype*\ , \ *currchain*\ , \ *currstate*\ , \ *dhcpinterfaces*\ , \ *disksize*\ , \ *displayname*\ , \ *dockercpus*\ , \ *dockerflag*\ , \ *dockerhost*\ , \ *dockermemory*\ , \ *dockernics*\ , \ *domainadminpassword*\ , \ *domainadminuser*\ , \ *domaintype*\ , \ *getmac*\ , \ *groups*\ , \ *hcp*\ , \ *height*\ , \ *hidden*\ , \ *hostcluster*\ , \ *hostinterface*\ , \ *hostmanager*\ , \ *hostnames*\ , \ *hosttype*\ , \ *hwtype*\ , \ *id*\ , \ *initrd*\ , \ *installnic*\ , \ *interface*\ , \ *ip*\ , \ *iscsipassword*\ , \ *iscsiserver*\ , \ *iscsitarget*\ , \ *iscsiuserid*\ , \ *kcmdline*\ , \ *kernel*\ , \ *linkports*\ , \ *mac*\ , \ *memory*\ , \ *mgt*\ , \ *micbridge*\ , \ *michost*\ , \ *micid*\ , \ *miconboot*\ , \ *micpowermgt*\ , \ *micvlog*\ , \ *migrationdest*\ , \ *monserver*\ , \ *mpa*\ , \ *mtm*\ , \ *nameservers*\ , \ *netboot*\ , \ *nfsdir*\ , \ *nfsserver*\ , \ *nicaliases*\ , \ *niccustomscripts*\ , \ *nicdevices*\ , \ *nicextraparams*\ , \ *nichostnameprefixes*\ , \ *nichostnamesuffixes*\ , \ *nicips*\ , \ *nicnetworks*\ , \ *nicsadapter*\ , \ *nictypes*\ , \ *nimserver*\ , \ *node*\ , \ *nodetype*\ , \ *ondiscover*\ , \ *os*\ , \ *osvolume*\ , \ *otherinterfaces*\ , \ *ou*\ , \ *outlet*\ , \ *parent*\ , \ *passwd.HMC*\ , \ *passwd.admin*\ , \ *passwd.celogin*\ , \ *passwd.general*\ , \ *passwd.hscroot*\ , \ *password*\ , \ *pdu*\ , \ *pdutype*\ , \ *postbootscripts*\ , \ *postscripts*\ , \ *power*\ , \ *pprofile*\ , \ *prescripts-begin*\ , \ *prescripts-end*\ , \ *primarynic*\ , \ *primarysn*\ , \ *privkey*\ , \ *privtype*\ , \ *productkey*\ , \ *profile*\ , \ *protocol*\ , \ *provmethod*\ , \ *rack*\ , \ *room*\ , \ *routenames*\ , \ *seclevel*\ , \ *serial*\ , \ *serialflow*\ , \ *serialport*\ , \ *serialspeed*\ , \ *servicenode*\ , \ *setupconserver*\ , \ *setupdhcp*\ , \ *setupftp*\ , \ *setupipforward*\ , \ *setupldap*\ , \ *setupnameserver*\ , \ *setupnfs*\ , \ *setupnim*\ , \ *setupntp*\ , \ *setupproxydhcp*\ , \ *setuptftp*\ , \ *sfp*\ , \ *side*\ , \ *slot*\ , \ *slotid*\ , \ *slots*\ , \ *snmpauth*\ , \ *snmppassword*\ , \ *snmpprivacy*\ , \ *snmpuser*\ , \ *snmpusername*\ , \ *snmpversion*\ , \ *status*\ , \ *statustime*\ , \ *storagcontroller*\ , \ *storagetype*\ , \ *supernode*\ , \ *supportedarchs*\ , \ *supportproxydhcp*\ , \ *switch*\ , \ *switchinterface*\ , \ *switchport*\ , \ *switchtype*\ , \ *switchvlan*\ , \ *syslog*\ , \ *termport*\ , \ *termserver*\ , \ *tftpdir*\ , \ *tftpserver*\ , \ *unit*\ , \ *updatestatus*\ , \ *updatestatustime*\ , \ *urlpath*\ , \ *usercomment*\ , \ *userid*\ , \ *username*\ , \ *vmbeacon*\ , \ *vmbootorder*\ , \ *vmcfgstore*\ , \ *vmcluster*\ , \ *vmcpus*\ , \ *vmhost*\ , \ *vmmanager*\ , \ *vmmaster*\ , \ *vmmemory*\ , \ *vmnicnicmodel*\ , \ *vmnics*\ , \ *vmothersetting*\ , \ *vmphyslots*\ , \ *vmstorage*\ , \ *vmstoragecache*\ , \ *vmstorageformat*\ , \ *vmstoragemodel*\ , \ *vmtextconsole*\ , \ *vmvirtflags*\ , \ *vmvncport*\ , \ *webport*\ , \ *xcatmaster*\ , \ *zonename*\
 
 
 ***********
@@ -40,830 +40,830 @@ node Attributes:
 
 
 \ **addkcmdline**\  (bootparams.addkcmdline)
- 
+
  User specified kernel options for os provision process(no prefix) or the provisioned os(with prefix "R::"). The options should be delimited with spaces(" ")
- 
+
 
 
 \ **appstatus**\  (nodelist.appstatus)
- 
+
  A comma-delimited list of application status. For example: 'sshd=up,ftp=down,ll=down'
- 
+
 
 
 \ **appstatustime**\  (nodelist.appstatustime)
- 
+
  The date and time when appstatus was updated.
- 
+
 
 
 \ **arch**\  (nodetype.arch)
- 
+
  The hardware architecture of this node.  Valid values: x86_64, ppc64, x86, ia64.
- 
+
 
 
 \ **authdomain**\  (domain.authdomain)
- 
+
  If a node should participate in an AD domain or Kerberos realm distinct from domain indicated in site, this field can be used to specify that
- 
+
 
 
 \ **authkey**\  (pdu.authkey)
- 
+
  The authentication passphrase for SNMPv3
- 
+
 
 
 \ **authtype**\  (pdu.authtype)
- 
+
  The authentication protocol(MD5|SHA) to use for SNMPv3.
- 
+
 
 
 \ **bmc**\  (ipmi.bmc, openbmc.bmc)
- 
+
  The hostname of the BMC adapter.
- 
+
  or
- 
+
  The hostname of the BMC adapter.
- 
+
 
 
 \ **bmcpassword**\  (ipmi.password, openbmc.password)
- 
+
  The BMC password.  If not specified, the key=ipmi row in the passwd table is used as the default.
- 
+
  or
- 
+
  The BMC password.
- 
+
 
 
 \ **bmcport**\  (ipmi.bmcport)
- 
+
  In systems with selectable shared/dedicated ethernet ports, this parameter can be used to specify the preferred port. 0 means use the shared port, 1 means dedicated, blank is to not assign.
- 
- 
+
+
  .. code-block:: perl
- 
+
              The following special cases exist for IBM System x servers:
-  
+
              For x3755 M3 systems, 0 means use the dedicated port, 1 means
              shared, blank is to not assign.
-  
+
          For certain systems which have a mezzaine or ML2 adapter, there is a second
          value to include:
-  
-  
+
+
              For x3750 M4 (Model 8722):
-  
-  
+
+
              0 2   1st 1Gbps interface for LOM
-  
+
              0 0   1st 10Gbps interface for LOM
-  
+
              0 3   2nd 1Gbps interface for LOM
-  
+
              0 1   2nd 10Gbps interface for LOM
-  
-  
+
+
              For  x3750 M4 (Model 8752), x3850/3950 X6, dx360 M4, x3550 M4, and x3650 M4:
-  
-  
+
+
              0     Shared (1st onboard interface)
-  
+
              1     Dedicated
-  
+
              2 0   First interface on ML2 or mezzanine adapter
-  
+
              2 1   Second interface on ML2 or mezzanine adapter
-  
+
              2 2   Third interface on ML2 or mezzanine adapter
-  
+
              2 3   Fourth interface on ML2 or mezzanine adapter
- 
- 
+
+
 
 
 \ **bmcusername**\  (ipmi.username, openbmc.username)
- 
+
  The BMC userid.  If not specified, the key=ipmi row in the passwd table is used as the default.
- 
+
  or
- 
+
  The BMC userid.
- 
+
 
 
 \ **bmcvlantag**\  (ipmi.taggedvlan, openbmc.taggedvlan)
- 
+
  bmcsetup script will configure the network interface of the BMC to be tagged to the VLAN specified.
- 
+
  or
- 
+
  bmcsetup script will configure the network interface of the BMC to be tagged to the VLAN specified.
- 
+
 
 
 \ **cfgmgr**\  (cfgmgt.cfgmgr)
- 
+
  The name of the configuration manager service.  Currently 'chef' and 'puppet' are supported services.
- 
+
 
 
 \ **cfgmgtroles**\  (cfgmgt.roles)
- 
+
  The roles associated with this node as recognized by the cfgmgr for the software that is to be installed and configured.  These role names map to chef recipes or puppet manifest classes that should be used for this node.  For example, chef OpenStack cookbooks have roles such as mysql-master,keystone, glance, nova-controller, nova-conductor, cinder-all.
- 
+
 
 
 \ **cfgserver**\  (cfgmgt.cfgserver)
- 
+
  The xCAT node name of the chef server or puppet master
- 
+
 
 
 \ **chain**\  (chain.chain)
- 
+
  A comma-delimited chain of actions to be performed automatically when this node is discovered for the first time.  (xCAT and the DHCP server do not recognize the MAC address of the node when xCAT initializes the discovery process.)  The last step in this process is to run the operations listed in the chain attribute, one by one.  Valid values:  boot, runcmd=<cmd>, runimage=<URL>, shell, standby. For example, to have the genesis kernel pause to the shell, use chain=shell.
- 
+
 
 
 \ **chassis**\  (nodepos.chassis)
- 
+
  The BladeCenter chassis the blade is in.
- 
+
 
 
 \ **cmdmapping**\  (nodehm.cmdmapping)
- 
+
  The fully qualified name of the file that stores the mapping between PCM hardware management commands and xCAT/third-party hardware management commands for a particular type of hardware device.  Only used by PCM.
- 
+
 
 
 \ **community**\  (pdu.community)
- 
+
  The community string to use for SNMPv1/v2
- 
+
 
 
 \ **cons**\  (nodehm.cons)
- 
+
  The console method. If nodehm.serialport is set, this will default to the nodehm.mgt setting, otherwise it defaults to unused.  Valid values: cyclades, mrv, or the values valid for the mgt attribute.
- 
+
 
 
 \ **conserver**\  (nodehm.conserver)
- 
+
  The hostname of the machine where the conserver daemon is running.  If not set, the default is the xCAT management node.
- 
+
 
 
 \ **consoleenabled**\  (nodehm.consoleenabled)
- 
+
  A flag field to indicate whether the node is registered in the console server. If '1', console is enabled, if not set, console is not enabled.
- 
+
 
 
 \ **consoleondemand**\  (nodehm.consoleondemand)
- 
+
  This overrides the value from site.consoleondemand. Set to 'yes', 'no', '1' (equivalent to 'yes'), or '0' (equivalent to 'no'). If not set, the default is the value from site.consoleondemand.
- 
+
 
 
 \ **consport**\  (openbmc.consport)
- 
+
  The console port for OpenBMC.
- 
+
 
 
 \ **cpucount**\  (hwinv.cpucount)
- 
+
  The number of cpus for the node.
- 
+
 
 
 \ **cputype**\  (hwinv.cputype)
- 
+
  The cpu model name for the node.
- 
+
 
 
 \ **currchain**\  (chain.currchain)
- 
+
  The chain steps still left to do for this node.  This attribute will be automatically adjusted by xCAT while xCAT-genesis is running on the node (either during node discovery or a special operation like firmware update).  During node discovery, this attribute is initialized from the chain attribute and updated as the chain steps are executed.
- 
+
 
 
 \ **currstate**\  (chain.currstate)
- 
+
  The current or next chain step to be executed on this node by xCAT-genesis.  Set by xCAT during node discovery or as a result of nodeset.
- 
+
 
 
 \ **dhcpinterfaces**\  (servicenode.dhcpinterfaces)
- 
+
  The network interfaces DHCP server should listen on for the target node. This attribute can be used for management node and service nodes.  If defined, it will override the values defined in site.dhcpinterfaces. This is a comma separated list of device names. !remote! indicates a non-local network for relay DHCP. For example: !remote!,eth0,eth1
- 
+
 
 
 \ **disksize**\  (hwinv.disksize)
- 
+
  The size of the disks for the node in GB.
- 
+
 
 
 \ **displayname**\  (mpa.displayname)
- 
+
  Alternative name for BladeCenter chassis. Only used by PCM.
- 
+
 
 
 \ **dockercpus**\  (vm.cpus)
- 
+
  Number of CPUs the node should see.
- 
+
 
 
 \ **dockerflag**\  (vm.othersettings)
- 
+
  This allows specifying a semicolon delimited list of key->value pairs to include in a vmx file of VMware or KVM. For partitioning on normal power machines, this option is used to specify the hugepage and/or bsr information, the value is like:'hugepage:1,bsr=2'. For KVM cpu pinning, this option is used to specify the physical cpu set on the host, the value is like:"vcpupin:'0-15,^8'",Its syntax is a comma separated list and a special markup using '-' and '^' (ex. '0-4', '0-3,^2') can also be allowed, the '-' denotes the range and the '^' denotes exclusive. For KVM memory binding, the value is like:'membind:0', restrict a guest to allocate memory from the specified set of NUMA nodes. For PCI passthrough, the value is like:'devpassthrough:pci_0001_01_00_0,pci_0000_03_00_0', the value for PCI device format also can be like:'devpassthrough:0001:01:00.1', the PCI devices are assigned to a virtual machine, and the virtual machine can use this I/O exclusively, the devices list are a list of PCI device names delimited with comma, the PCI device names can be obtained by running \ **virsh nodedev-list**\  on the host.
- 
+
 
 
 \ **dockerhost**\  (vm.host)
- 
+
  The system that currently hosts the VM
- 
+
 
 
 \ **dockermemory**\  (vm.memory)
- 
+
  Megabytes of memory the VM currently should be set to.
- 
+
 
 
 \ **dockernics**\  (vm.nics)
- 
+
  Network configuration parameters.  Of the general form [physnet:]interface,.. Generally, interface describes the vlan entity (default for native, tagged for tagged, vl[number] for a specific vlan.  physnet is a virtual switch name or port description that is used for some virtualization technologies to construct virtual switches.  hypervisor.netmap can map names to hypervisor specific layouts, or the descriptions described there may be used directly here where possible.
- 
+
 
 
 \ **domainadminpassword**\  (domain.adminpassword)
- 
+
  Allow a node specific indication of Administrative user password for the domain.  Most will want to ignore this in favor of passwd table.
- 
+
 
 
 \ **domainadminuser**\  (domain.adminuser)
- 
+
  Allow a node specific indication of Administrative user.  Most will want to just use passwd table to indicate this once rather than by node.
- 
+
 
 
 \ **domaintype**\  (domain.type)
- 
+
  Type, if any, of authentication domain to manipulate.  The only recognized value at the moment is activedirectory.
- 
+
 
 
 \ **getmac**\  (nodehm.getmac)
- 
+
  The method to use to get MAC address of the node with the getmac command. If not set, the mgt attribute will be used.  Valid values: same as values for mgmt attribute.
- 
+
 
 
 \ **groups**\  (nodelist.groups)
- 
+
  A comma-delimited list of groups this node is a member of.  Group names are arbitrary, except all nodes should be part of the 'all' group. Internal group names are designated by using __<groupname>.  For example, __Unmanaged, could be the internal name for a group of nodes that is not managed by xCAT. Admins should avoid using the __ characters when defining their groups.
- 
+
 
 
 \ **hcp**\  (ppc.hcp, zvm.hcp)
- 
+
  The hardware control point for this node (HMC, IVM, Frame or CEC).  Do not need to set for BPAs and FSPs.
- 
+
  or
- 
+
  The hardware control point for this node.
- 
+
 
 
 \ **height**\  (nodepos.height)
- 
+
  The server height in U(s).
- 
+
 
 
 \ **hidden**\  (nodelist.hidden)
- 
+
  Used to hide fsp and bpa definitions, 1 means not show them when running lsdef and nodels
- 
+
 
 
 \ **hostcluster**\  (hypervisor.cluster)
- 
+
  Specify to the underlying virtualization infrastructure a cluster membership for the hypervisor.
- 
+
 
 
 \ **hostinterface**\  (hypervisor.interface)
- 
+
  The definition of interfaces for the hypervisor. The format is [networkname:interfacename:bootprotocol:IP:netmask:gateway] that split with | for each interface
- 
+
 
 
 \ **hostmanager**\  (hypervisor.mgr)
- 
+
  The virtualization specific manager of this hypervisor when applicable
- 
+
 
 
 \ **hostnames**\  (hosts.hostnames)
- 
+
  Hostname aliases added to /etc/hosts for this node. Comma or blank separated list.
- 
+
 
 
 \ **hosttype**\  (hypervisor.type)
- 
+
  The plugin associated with hypervisor specific commands such as revacuate
- 
+
 
 
 \ **hwtype**\  (ppc.nodetype, zvm.nodetype, mp.nodetype, mic.nodetype)
- 
+
  The hardware type of the node. Only can be one of fsp, bpa, cec, frame, ivm, hmc and lpar
- 
+
  or
- 
+
  The node type. Valid values: cec (Central Electronic Complex), lpar (logical partition), zvm (z/VM host operating system), and vm (virtual machine).
- 
+
  or
- 
+
  The hardware type for mp node. Valid values: mm,cmm, blade.
- 
+
  or
- 
+
  The hardware type of the mic node. Generally, it is mic.
- 
+
 
 
 \ **id**\  (ppc.id, mp.id)
- 
+
  For LPARs: the LPAR numeric id; for CECs: the cage number; for Frames: the frame number.
- 
+
  or
- 
+
  The slot number of this blade in the BladeCenter chassis.
- 
+
 
 
 \ **initrd**\  (bootparams.initrd)
- 
+
  The initial ramdisk image that network boot actions should use (could be a DOS floppy or hard drive image if using memdisk as kernel)
- 
+
 
 
 \ **installnic**\  (noderes.installnic)
- 
+
  The network adapter on the node that will be used for OS deployment, the installnic can be set to the network adapter name or the mac address or the keyword "mac" which means that the network interface specified by the mac address in the mac table will be used.  If not set, primarynic will be used. If primarynic is not set too, the keyword "mac" will be used as default.
- 
+
 
 
 \ **interface**\  (mac.interface)
- 
+
  The adapter interface name that will be used to install and manage the node. E.g. eth0 (for linux) or en0 (for AIX).)
- 
+
 
 
 \ **ip**\  (hosts.ip)
- 
+
  The IP address of the node. This is only used in makehosts.  The rest of xCAT uses system name resolution to resolve node names to IP addresses.
- 
+
 
 
 \ **iscsipassword**\  (iscsi.passwd)
- 
+
  The password for the iscsi server containing the boot device for this node.
- 
+
 
 
 \ **iscsiserver**\  (iscsi.server)
- 
+
  The server containing the iscsi boot device for this node.
- 
+
 
 
 \ **iscsitarget**\  (iscsi.target)
- 
+
  The iscsi disk used for the boot device for this node.  Filled in by xCAT.
- 
+
 
 
 \ **iscsiuserid**\  (iscsi.userid)
- 
+
  The userid of the iscsi server containing the boot device for this node.
- 
+
 
 
 \ **kcmdline**\  (bootparams.kcmdline)
- 
+
  Arguments to be passed to the kernel
- 
+
 
 
 \ **kernel**\  (bootparams.kernel)
- 
+
  The kernel that network boot actions should currently acquire and use.  Note this could be a chained boot loader such as memdisk or a non-linux boot loader
- 
+
 
 
 \ **linkports**\  (switches.linkports)
- 
+
  The ports that connect to other switches. Currently, this column is only used by vlan configuration. The format is: "port_number:switch,port_number:switch...". Refer to the switch table for details on how to specify the port numbers.
- 
+
 
 
 \ **mac**\  (mac.mac)
- 
+
  The mac address or addresses for which xCAT will manage static bindings for this node.  This may be simply a mac address, which would be bound to the node name (such as "01:02:03:04:05:0E").  This may also be a "|" delimited string of "mac address!hostname" format (such as "01:02:03:04:05:0E!node5|01:02:03:04:05:0F!node6-eth1"). If there are multiple nics connected to Management Network(usually for bond), in order to make sure the OS deployment finished successfully, the macs of those nics must be able to resolve to same IP address. First, users have to create alias of the node for each mac in the Management Network through either: 1. adding the alias into /etc/hosts for the node directly or: 2. setting the alias to the "hostnames" attribute and then run "makehost" against the node. Then, configure the "mac" attribute of the node like "mac1!node|mac2!node-alias". For the first mac address (mac1 in the example) set in "mac" attribute, do not need to set a "node name" string for it since the nodename of the node will be used for it by default.
- 
+
 
 
 \ **memory**\  (hwinv.memory)
- 
+
  The size of the memory for the node in MB.
- 
+
 
 
 \ **mgt**\  (nodehm.mgt)
- 
+
  The method to use to do general hardware management of the node.  This attribute is used as the default if power or getmac is not set.  Valid values: openbmc, ipmi, blade, hmc, ivm, fsp, bpa, kvm, esx, rhevm.  See the power attribute for more details.
- 
+
 
 
 \ **micbridge**\  (mic.bridge)
- 
+
  The virtual bridge on the host node which the mic connected to.
- 
+
 
 
 \ **michost**\  (mic.host)
- 
+
  The host node which the mic card installed on.
- 
+
 
 
 \ **micid**\  (mic.id)
- 
+
  The device id of the mic node.
- 
+
 
 
 \ **miconboot**\  (mic.onboot)
- 
+
  Set mic to autoboot when mpss start. Valid values: yes|no. Default is yes.
- 
+
 
 
 \ **micpowermgt**\  (mic.powermgt)
- 
+
  Set the Power Management for mic node. This attribute is used to set the power management state that mic may get into when it is idle. Four states can be set: cpufreq, corec6, pc3 and pc6. The valid value for powermgt attribute should be [cpufreq=<on|off>]![corec6=<on|off>]![pc3=<on|off>]![pc6=<on|off>]. e.g. cpufreq=on!corec6=off!pc3=on!pc6=off. Refer to the doc of mic to get more information for power management.
- 
+
 
 
 \ **micvlog**\  (mic.vlog)
- 
+
  Set the Verbose Log to console. Valid values: yes|no. Default is no.
- 
+
 
 
 \ **migrationdest**\  (vm.migrationdest)
- 
+
  A noderange representing candidate destinations for migration (i.e. similar systems, same SAN, or other criteria that xCAT can use
- 
+
 
 
 \ **monserver**\  (noderes.monserver)
- 
+
  The monitoring aggregation point for this node. The format is "x,y" where x is the ip address as known by the management node and y is the ip address as known by the node.
- 
+
 
 
 \ **mpa**\  (mp.mpa)
- 
+
  The management module used to control this blade.
- 
+
 
 
 \ **mtm**\  (vpd.mtm)
- 
+
  The machine type and model number of the node.  E.g. 7984-6BU
- 
+
 
 
 \ **nameservers**\  (noderes.nameservers)
- 
+
  An optional node/group specific override for name server list.  Most people want to stick to site or network defined nameserver configuration.
- 
+
 
 
 \ **netboot**\  (noderes.netboot)
- 
+
  The type of network booting to use for this node.  Valid values:
- 
- 
+
+
  .. code-block:: perl
- 
+
                          Arch                    OS                           valid netboot options
                          x86, x86_64             ALL                          pxe, xnba
                          ppc64                   <=rhel6, <=sles11.3          yaboot
                          ppc64                   >=rhels7, >=sles11.4         grub2,grub2-http,grub2-tftp
                          ppc64le NonVirtualize   ALL                          petitboot
                          ppc64le PowerKVM Guest  ALL                          grub2,grub2-http,grub2-tftp
- 
- 
+
+
 
 
 \ **nfsdir**\  (noderes.nfsdir)
- 
+
  The path that should be mounted from the NFS server.
- 
+
 
 
 \ **nfsserver**\  (noderes.nfsserver)
- 
+
  The NFS or HTTP server for this node (as known by this node).
- 
+
 
 
 \ **nicaliases**\  (nics.nicaliases)
- 
+
  Comma-separated list of hostname aliases for each NIC.
                  Format: eth0!<alias list>,eth1!<alias1 list>|<alias2 list>
-                     For multiple aliases per nic use a space-separated list. 
+                     For multiple aliases per nic use a space-separated list.
                  For example: eth0!moe larry curly,eth1!tom|jerry
- 
+
 
 
 \ **niccustomscripts**\  (nics.niccustomscripts)
- 
+
  Comma-separated list of custom scripts per NIC.  <nic1>!<script1>,<nic2>!<script2>, e.g. eth0!configeth eth0, ib0!configib ib0. The xCAT object definition commands support to use niccustomscripts.<nicname> as the sub attribute
  .
- 
+
 
 
 \ **nicdevices**\  (nics.nicdevices)
- 
+
  Comma-separated list of NIC device per NIC, multiple ethernet devices can be bonded as bond device, these ethernet devices are separated by | . <nic1>!<dev1>|<dev3>,<nic2>!<dev2>, e.g. bond0!eth0|eth2,br0!bond0. The xCAT object definition commands support to use nicdevices.<nicname> as the sub attributes.
- 
+
 
 
 \ **nicextraparams**\  (nics.nicextraparams)
- 
+
  Comma-separated list of extra parameters that will be used for each NIC configuration.
                  If only one ip address is associated with each NIC:
                      <nic1>!<param1=value1 param2=value2>,<nic2>!<param3=value3>, for example, eth0!MTU=1500,ib0!MTU=65520 CONNECTED_MODE=yes.
                  If multiple ip addresses are associated with each NIC:
                      <nic1>!<param1=value1 param2=value2>|<param3=value3>,<nic2>!<param4=value4 param5=value5>|<param6=value6>, for example, eth0!MTU=1500|MTU=1460,ib0!MTU=65520 CONNECTED_MODE=yes.
              The xCAT object definition commands support to use nicextraparams.<nicname> as the sub attributes.
- 
+
 
 
 \ **nichostnameprefixes**\  (nics.nichostnameprefixes)
- 
- Comma-separated list of hostname prefixes per NIC. 
+
+ Comma-separated list of hostname prefixes per NIC.
                          If only one ip address is associated with each NIC:
                              <nic1>!<ext1>,<nic2>!<ext2>,..., for example, eth0!eth0-,ib0!ib-
                          If multiple ip addresses are associated with each NIC:
-                             <nic1>!<ext1>|<ext2>,<nic2>!<ext1>|<ext2>,..., for example,  eth0!eth0-|eth0-ipv6i-,ib0!ib-|ib-ipv6-. 
-                         The xCAT object definition commands support to use nichostnameprefixes.<nicname> as the sub attributes. 
+                             <nic1>!<ext1>|<ext2>,<nic2>!<ext1>|<ext2>,..., for example,  eth0!eth0-|eth0-ipv6i-,ib0!ib-|ib-ipv6-.
+                         The xCAT object definition commands support to use nichostnameprefixes.<nicname> as the sub attributes.
                          Note:  According to DNS rules a hostname must be a text string up to 24 characters drawn from the alphabet (A-Z), digits (0-9) and minus sign (-). When you are specifying "nichostnameprefixes" or "nicaliases" make sure the resulting hostnames will conform to this naming convention
- 
+
 
 
 \ **nichostnamesuffixes**\  (nics.nichostnamesuffixes)
- 
- Comma-separated list of hostname suffixes per NIC. 
+
+ Comma-separated list of hostname suffixes per NIC.
                          If only one ip address is associated with each NIC:
                              <nic1>!<ext1>,<nic2>!<ext2>,..., for example, eth0!-eth0,ib0!-ib0
                          If multiple ip addresses are associated with each NIC:
-                             <nic1>!<ext1>|<ext2>,<nic2>!<ext1>|<ext2>,..., for example,  eth0!-eth0|-eth0-ipv6,ib0!-ib0|-ib0-ipv6. 
+                             <nic1>!<ext1>|<ext2>,<nic2>!<ext1>|<ext2>,..., for example,  eth0!-eth0|-eth0-ipv6,ib0!-ib0|-ib0-ipv6.
                          The xCAT object definition commands support to use nichostnamesuffixes.<nicname> as the sub attributes.
- 
- 
+
+
  .. code-block:: perl
- 
+
                           Note:  According to DNS rules a hostname must be a text string up to 24 characters drawn from the alphabet (A-Z), digits (0-9) and minus sign (-). When you are specifying "nichostnamesuffixes" or "nicaliases" make sure the resulting hostnames will conform to this naming convention
- 
- 
+
+
 
 
 \ **nicips**\  (nics.nicips)
- 
- Comma-separated list of IP addresses per NIC. 
+
+ Comma-separated list of IP addresses per NIC.
                  To specify one ip address per NIC:
                      <nic1>!<ip1>,<nic2>!<ip2>,..., for example, eth0!10.0.0.100,ib0!11.0.0.100
                  To specify multiple ip addresses per NIC:
                      <nic1>!<ip1>|<ip2>,<nic2>!<ip1>|<ip2>,..., for example, eth0!10.0.0.100|fd55::214:5eff:fe15:849b,ib0!11.0.0.100|2001::214:5eff:fe15:849a. The xCAT object definition commands support to use nicips.<nicname> as the sub attributes.
                  Note: The primary IP address must also be stored in the hosts.ip attribute. The nichostnamesuffixes should specify one hostname suffix for each ip address.
- 
+
 
 
 \ **nicnetworks**\  (nics.nicnetworks)
- 
+
  Comma-separated list of networks connected to each NIC.
                  If only one ip address is associated with each NIC:
                      <nic1>!<network1>,<nic2>!<network2>, for example, eth0!10_0_0_0-255_255_0_0, ib0!11_0_0_0-255_255_0_0
                  If multiple ip addresses are associated with each NIC:
                      <nic1>!<network1>|<network2>,<nic2>!<network1>|<network2>, for example, eth0!10_0_0_0-255_255_0_0|fd55:faaf:e1ab:336::/64,ib0!11_0_0_0-255_255_0_0|2001:db8:1:0::/64. The xCAT object definition commands support to use nicnetworks.<nicname> as the sub attributes.
- 
+
 
 
 \ **nicsadapter**\  (nics.nicsadapter)
- 
+
  Comma-separated list of NIC information collected by getadapter. <nic1>!<param1=value1 param2=value2>,<nic2>!<param4=value4 param5=value5>, for example, enP3p3s0f1!mac=98:be:94:59:fa:cd linkstate=DOWN,enP3p3s0f2!mac=98:be:94:59:fa:ce candidatename=enP3p3s0f2/enx98be9459face
- 
+
 
 
 \ **nictypes**\  (nics.nictypes)
- 
+
  Comma-separated list of NIC types per NIC. <nic1>!<type1>,<nic2>!<type2>, e.g. eth0!Ethernet,ib0!Infiniband. The xCAT object definition commands support to use nictypes.<nicname> as the sub attributes.
- 
+
 
 
 \ **nimserver**\  (noderes.nimserver)
- 
+
  Not used for now. The NIM server for this node (as known by this node).
- 
+
 
 
 \ **node**\  (nodelist.node)
- 
+
  The hostname of a node in the cluster.
- 
+
 
 
 \ **nodetype**\  (nodetype.nodetype, pdu.nodetype)
- 
+
  A comma-delimited list of characteristics of this node.  Valid values: ppc, blade, vm (virtual machine), osi (OS image), mm, mn, rsa, switch.
- 
+
  or
- 
+
  The node type should be pdu
- 
+
 
 
 \ **ondiscover**\  (chain.ondiscover)
- 
+
  This attribute is currently not used by xCAT.  The "nodediscover" operation is always done during node discovery.
- 
+
 
 
 \ **os**\  (nodetype.os)
- 
+
  The operating system deployed on this node.  Valid values: AIX, rhels\*,rhelc\*, rhas\*,centos\*,SL\*, fedora\*, sles\* (where \* is the version #). As a special case, if this is set to "boottarget", then it will use the initrd/kernel/parameters specified in the row in the boottarget table in which boottarget.bprofile equals nodetype.profile.
- 
+
 
 
 \ **osvolume**\  (storage.osvolume)
- 
+
  Specification of what storage to place the node OS image onto.  Examples include:
- 
- 
+
+
  .. code-block:: perl
- 
+
                   localdisk (Install to first non-FC attached disk)
                   usbdisk (Install to first USB mass storage device seen)
                   wwn=0x50000393c813840c (Install to storage device with given WWN)
- 
- 
+
+
 
 
 \ **otherinterfaces**\  (hosts.otherinterfaces)
- 
+
  Other IP addresses to add for this node.  Format: -<ext>:<ip>,<intfhostname>:<ip>,...
- 
+
 
 
 \ **ou**\  (domain.ou)
- 
+
  For an LDAP described machine account (i.e. Active Directory), the organizational unit to place the system.  If not set, defaults to cn=Computers,dc=your,dc=domain
- 
+
 
 
 \ **outlet**\  (pdu.outlet)
- 
+
  The pdu outlet count
- 
+
 
 
 \ **parent**\  (ppc.parent)
- 
+
  For LPARs: the CEC; for FSPs: the CEC; for CEC: the frame (if one exists); for BPA: the frame; for frame: the building block number (which consists 1 or more service nodes and compute/storage nodes that are serviced by them - optional).
- 
+
 
 
 \ **passwd.HMC**\  (ppcdirect.password)
- 
+
  Password of the FSP/BPA(for ASMI) and CEC/Frame(for DFM).  If not filled in, xCAT will look in the passwd table for key=fsp.  If not in the passwd table, the default used is admin.
- 
+
 
 
 \ **passwd.admin**\  (ppcdirect.password)
- 
+
  Password of the FSP/BPA(for ASMI) and CEC/Frame(for DFM).  If not filled in, xCAT will look in the passwd table for key=fsp.  If not in the passwd table, the default used is admin.
- 
+
 
 
 \ **passwd.celogin**\  (ppcdirect.password)
- 
+
  Password of the FSP/BPA(for ASMI) and CEC/Frame(for DFM).  If not filled in, xCAT will look in the passwd table for key=fsp.  If not in the passwd table, the default used is admin.
- 
+
 
 
 \ **passwd.general**\  (ppcdirect.password)
- 
+
  Password of the FSP/BPA(for ASMI) and CEC/Frame(for DFM).  If not filled in, xCAT will look in the passwd table for key=fsp.  If not in the passwd table, the default used is admin.
- 
+
 
 
 \ **passwd.hscroot**\  (ppcdirect.password)
- 
+
  Password of the FSP/BPA(for ASMI) and CEC/Frame(for DFM).  If not filled in, xCAT will look in the passwd table for key=fsp.  If not in the passwd table, the default used is admin.
- 
+
 
 
 \ **password**\  (ppchcp.password, mpa.password, websrv.password, pdu.password, switches.sshpassword)
- 
+
  Password of the HMC or IVM.  If not filled in, xCAT will look in the passwd table for key=hmc or key=ivm.  If not in the passwd table, the default used is abc123 for HMCs and padmin for IVMs.
- 
+
  or
- 
+
  Password to use to access the management module.  If not specified, the key=blade row in the passwd table is used as the default.
- 
+
  or
- 
+
  Password to use to access the web service.
- 
+
  or
- 
+
  The remote login password
- 
+
  or
- 
+
  The remote login password. It can be for ssh or telnet. If it is for telnet, set protocol to "telnet". If the sshusername is blank, the username, password and protocol will be retrieved from the passwd table with "switch" as the key.
- 
+
 
 
 \ **pdu**\  (pduoutlet.pdu)
- 
+
  a comma-separated list of outlet number for each PDU, ex: pdu1:outlet1,pdu2:outlet1
- 
+
 
 
 \ **pdutype**\  (pdu.pdutype)
- 
+
  The type of pdu
- 
+
 
 
 \ **postbootscripts**\  (postscripts.postbootscripts)
- 
+
  Comma separated list of scripts that should be run on this node after diskful installation or diskless boot. Each script can take zero or more parameters. For example: "script1 p1 p2,script2,...". On AIX these scripts are run during the processing of /etc/inittab.  On Linux they are run at the init.d time. xCAT automatically adds the scripts in the xcatdefaults.postbootscripts attribute to run first in the list. Please note that the postbootscripts specified for "xcatdefaults" will be assigned to node automatically, they can not be removed from "postbootscripts" attribute of a node with "chdef -m" command
- 
+
 
 
 \ **postscripts**\  (postscripts.postscripts)
- 
+
  Comma separated list of scripts that should be run on this node after diskful installation or diskless boot. Each script can take zero or more parameters. For example: "script1 p1 p2,script2,...". xCAT automatically adds the postscripts from  the xcatdefaults.postscripts attribute of the table to run first on the nodes after install or diskless boot. For installation of RedHat, CentOS, Fedora, the scripts will be run before the reboot. For installation of SLES, the scripts will be run after the reboot but before the init.d process. For diskless deployment, the scripts will be run at the init.d time, and xCAT will automatically add the list of scripts from the postbootscripts attribute to run after postscripts list. For installation of AIX, the scripts will run after the reboot and acts the same as the postbootscripts attribute.  For AIX, use the postbootscripts attribute. Please note that the postscripts specified for "xcatdefaults" will be assigned to node automatically, they can not be removed from "postscripts" attribute of a node with "chdef -m" command
- 
+
 
 
 \ **power**\  (nodehm.power)
- 
+
  The method to use to control the power of the node. If not set, the mgt attribute will be used.  Valid values: ipmi, blade, hmc, ivm, fsp, kvm, esx, rhevm.  If "ipmi", xCAT will search for this node in the ipmi table for more info.  If "blade", xCAT will search for this node in the mp table.  If "hmc", "ivm", or "fsp", xCAT will search for this node in the ppc table.
- 
+
 
 
 \ **pprofile**\  (ppc.pprofile)
- 
+
  The LPAR profile that will be used the next time the LPAR is powered on with rpower. For DFM, the pprofile attribute should be set to blank
- 
+
 
 
 \ **prescripts-begin**\  (prescripts.begin)
- 
+
  The scripts to be run at the beginning of the nodeset(Linux), nimnodeset(AIX) or mkdsklsnode(AIX) command.
   The format is:
     [action1:]s1,s2...[| action2:s3,s4,s5...]
   where:
-   - action1 and action2 for Linux are the nodeset actions specified in the command. 
+   - action1 and action2 for Linux are the nodeset actions specified in the command.
      For AIX, action1 and action1 can be 'diskless' for mkdsklsnode command'
-     and 'standalone for nimnodeset command. 
+     and 'standalone for nimnodeset command.
    - s1 and s2 are the scripts to run for action1 in order.
    - s3, s4, and s5 are the scripts to run for actions2.
   If actions are omitted, the scripts apply to all actions.
@@ -872,541 +872,541 @@ node Attributes:
     diskless:myscript1,myscript2   (AIX)
     install:myscript1,myscript2|netboot:myscript3   (Linux)
   All the scripts should be copied to /install/prescripts directory.
-  The following two environment variables will be passed to each script: 
+  The following two environment variables will be passed to each script:
     NODES a coma separated list of node names that need to run the script for
     ACTION current nodeset action.
   If '#xCAT setting:MAX_INSTANCE=number' is specified in the script, the script
   will get invoked for each node in parallel, but no more than number of instances
   will be invoked at at a time. If it is not specified, the script will be invoked
   once for all the nodes.
- 
+
 
 
 \ **prescripts-end**\  (prescripts.end)
- 
+
  The scripts to be run at the end of the nodeset(Linux), nimnodeset(AIX),or mkdsklsnode(AIX) command. The format is the same as the 'begin' column.
- 
+
 
 
 \ **primarynic**\  (noderes.primarynic)
- 
+
  This attribute will be deprecated. All the used network interface will be determined by installnic. The network adapter on the node that will be used for xCAT management, the primarynic can be set to the network adapter name or the mac address or the keyword "mac" which means that the network interface specified by the mac address in the mac table  will be used.  Default is eth0.
- 
+
 
 
 \ **primarysn**\  (nodelist.primarysn)
- 
+
  Not used currently. The primary servicenode, used by this node.
- 
+
 
 
 \ **privkey**\  (pdu.privkey)
- 
+
  The privacy passphrase to use for SNMPv3.
- 
+
 
 
 \ **privtype**\  (pdu.privtype)
- 
+
  The privacy protocol(AES|DES) to use for SNMPv3.
- 
+
 
 
 \ **productkey**\  (prodkey.key)
- 
+
  The product key relevant to the aforementioned node/group and product combination
- 
+
 
 
 \ **profile**\  (nodetype.profile)
- 
+
  The string to use to locate a kickstart or autoyast template to use for OS deployment of this node.  If the provmethod attribute is set to an osimage name, that takes precedence, and profile need not be defined.  Otherwise, the os, profile, and arch are used to search for the files in /install/custom first, and then in /opt/xcat/share/xcat.
- 
+
 
 
 \ **protocol**\  (switches.protocol)
- 
+
  Protocol for running remote commands for the switch. The valid values are: ssh, telnet. ssh is the default. If the sshusername is blank, the username, password and protocol will be retrieved from the passwd table with "switch" as the key. The passwd.comments attribute is used for protocol.
- 
+
 
 
 \ **provmethod**\  (nodetype.provmethod)
- 
+
  The provisioning method for node deployment. The valid values are install, netboot, statelite or an os image name from the osimage table. If an image name is specified, the osimage definition stored in the osimage table and the linuximage table (for Linux) or nimimage table (for AIX) are used to locate the files for templates, pkglists, syncfiles, etc. On Linux, if install, netboot or statelite is specified, the os, profile, and arch are used to search for the files in /install/custom first, and then in /opt/xcat/share/xcat.
- 
+
 
 
 \ **rack**\  (nodepos.rack)
- 
+
  The frame the node is in.
- 
+
 
 
 \ **room**\  (nodepos.room)
- 
+
  The room where the node is located.
- 
+
 
 
 \ **routenames**\  (noderes.routenames)
- 
+
  A comma separated list of route names that refer to rows in the routes table. These are the routes that should be defined on this node when it is deployed.
- 
+
 
 
 \ **seclevel**\  (pdu.seclevel)
- 
+
  The Security Level(noAuthNoPriv|authNoPriv|authPriv) to use for SNMPv3.
- 
+
 
 
 \ **serial**\  (vpd.serial)
- 
+
  The serial number of the node.
- 
+
 
 
 \ **serialflow**\  (nodehm.serialflow)
- 
+
  The flow control value of the serial port for this node.  For SOL this is typically 'hard'.
- 
+
 
 
 \ **serialport**\  (nodehm.serialport)
- 
+
  The serial port for this node, in the linux numbering style (0=COM1/ttyS0, 1=COM2/ttyS1).  For SOL on IBM blades, this is typically 1.  For rackmount IBM servers, this is typically 0.
- 
+
 
 
 \ **serialspeed**\  (nodehm.serialspeed)
- 
+
  The speed of the serial port for this node.  For SOL this is typically 19200.
- 
+
 
 
 \ **servicenode**\  (noderes.servicenode)
- 
+
  A comma separated list of node names (as known by the management node) that provides most services for this node. The first service node on the list that is accessible will be used.  The 2nd node on the list is generally considered to be the backup service node for this node when running commands like snmove.
- 
+
 
 
 \ **setupconserver**\  (servicenode.conserver)
- 
+
  Do we set up console service on this service node?  Valid values: 0, 1, or 2. If 0, it does not change the current state of the service. If 1, configures and starts conserver daemon. If 2, configures and starts goconserver daemon.
- 
+
 
 
 \ **setupdhcp**\  (servicenode.dhcpserver)
- 
+
  Do we set up DHCP on this service node? Not supported on AIX. Valid values:1 or 0. If 1, runs makedhcp -n. If 0, it does not change the current state of the service.
- 
+
 
 
 \ **setupftp**\  (servicenode.ftpserver)
- 
+
  Do we set up a ftp server on this service node? Not supported on AIX Valid values:1 or 0. If 1, configure and start vsftpd.  (You must manually install vsftpd on the service nodes before this.) If 0, it does not change the current state of the service. xCAT is not using ftp for compute nodes provisioning or any other xCAT features, so this attribute can be set to 0 if the ftp service will not be used for other purposes
- 
+
 
 
 \ **setupipforward**\  (servicenode.ipforward)
- 
+
  Do we set up ip forwarding on this service node? Valid values:1 or 0. If 0, it does not change the current state of the service.
- 
+
 
 
 \ **setupldap**\  (servicenode.ldapserver)
- 
+
  Do we set up ldap caching proxy on this service node? Not supported on AIX.  Valid values:1 or 0. If 0, it does not change the current state of the service.
- 
+
 
 
 \ **setupnameserver**\  (servicenode.nameserver)
- 
+
  Do we set up DNS on this service node? Valid values: 2, 1, or 0. If 2, creates named.conf as dns slave, using the management node as dns master, and starts named. If 1, creates named.conf file with forwarding to the management node and starts named. If 0, it does not change the current state of the service.
- 
+
 
 
 \ **setupnfs**\  (servicenode.nfsserver)
- 
+
  Do we set up file services (HTTP,FTP,or NFS) on this service node? For AIX will only setup NFS, not HTTP or FTP. Valid values:1 or 0.If 0, it does not change the current state of the service.
- 
+
 
 
 \ **setupnim**\  (servicenode.nimserver)
- 
+
  Not used. Do we set up a NIM server on this service node? Valid values:1 or 0. If 0, it does not change the current state of the service.
- 
+
 
 
 \ **setupntp**\  (servicenode.ntpserver)
- 
+
  Not used. Use setupntp postscript to setup a ntp server on this service node? Valid values:1 or 0. If 0, it does not change the current state of the service.
- 
+
 
 
 \ **setupproxydhcp**\  (servicenode.proxydhcp)
- 
+
  Do we set up proxydhcp service on this node? valid values: 1 or 0. If 1, the proxydhcp daemon will be enabled on this node.
- 
+
 
 
 \ **setuptftp**\  (servicenode.tftpserver)
- 
+
  Do we set up TFTP on this service node? Not supported on AIX. Valid values:1 or 0. If 1, configures and starts atftp. If 0, it does not change the current state of the service.
- 
+
 
 
 \ **sfp**\  (ppc.sfp)
- 
+
  The Service Focal Point of this Frame. This is the name of the HMC that is responsible for collecting hardware service events for this frame and all of the CECs within this frame.
- 
+
 
 
 \ **side**\  (vpd.side)
- 
+
  <BPA>-<port> or <FSP>-<port>. The side information for the BPA/FSP. The side attribute refers to which BPA/FSP, A or B, which is determined by the slot value returned from lsslp command. It also lists the physical port within each BPA/FSP which is determined by the IP address order from the lsslp response. This information is used internally when communicating with the BPAs/FSPs
- 
+
 
 
 \ **slot**\  (nodepos.slot)
- 
+
  The slot number of the blade in the chassis. For PCM, a comma-separated list of slot numbers is stored
- 
+
 
 
 \ **slotid**\  (mp.id)
- 
+
  The slot number of this blade in the BladeCenter chassis.
- 
+
 
 
 \ **slots**\  (mpa.slots)
- 
+
  The number of available slots in the chassis. For PCM, this attribute is used to store the number of slots in the following format:  <slot rows>,<slot columns>,<slot orientation>  Where:
- 
- 
+
+
  .. code-block:: perl
- 
+
                    <slot rows>  = number of rows of slots in chassis
                    <slot columns> = number of columns of slots in chassis
                    <slot orientation> = set to 0 if slots are vertical, and set to 1 if slots of horizontal
- 
- 
+
+
 
 
 \ **snmpauth**\  (switches.auth)
- 
+
  The authentication protocol to use for SNMPv3.  SHA is assumed if v3 enabled and this is unspecified
- 
+
 
 
 \ **snmppassword**\  (switches.password)
- 
+
  The password string for SNMPv3 or community string for SNMPv1/SNMPv2.  Falls back to passwd table, and site snmpc value if using SNMPv1/SNMPv2.
- 
+
 
 
 \ **snmpprivacy**\  (switches.privacy)
- 
+
  The privacy protocol to use for v3. xCAT will use authNoPriv if this is unspecified. DES is recommended to use if v3 enabled, as it is the most readily available.
- 
+
 
 
 \ **snmpuser**\  (pdu.snmpuser)
- 
+
  The username to use for SNMPv3 communication, ignored for SNMPv1
- 
+
 
 
 \ **snmpusername**\  (switches.username)
- 
+
  The username to use for SNMPv3 communication, ignored for SNMPv1
- 
+
 
 
 \ **snmpversion**\  (pdu.snmpversion, switches.snmpversion)
- 
+
  The version to use to communicate with switch.  SNMPv1 is assumed by default.
- 
+
  or
- 
+
  The version to use to communicate with switch.  SNMPv1 is assumed by default.
- 
+
 
 
 \ **status**\  (nodelist.status)
- 
+
  The current status of this node.  This attribute will be set by xCAT software.  Valid values: defined, booting, netbooting, booted, discovering, configuring, installing, alive, standingby, powering-off, unreachable. If blank, defined is assumed. The possible status change sequences are: For installation: defined->[discovering]->[configuring]->[standingby]->installing->booting->[postbooting]->booted->[alive],  For diskless deployment: defined->[discovering]->[configuring]->[standingby]->netbooting->[postbooting]->booted->[alive],  For booting: [alive/unreachable]->booting->[postbooting]->booted->[alive],  For powering off: [alive]->powering-off->[unreachable], For monitoring: alive->unreachable. Discovering and configuring are for x Series discovery process. Alive and unreachable are set only when there is a monitoring plug-in start monitor the node status for xCAT. Note that the status values will not reflect the real node status if you change the state of the node from outside of xCAT (i.e. power off the node using HMC GUI).
- 
+
 
 
 \ **statustime**\  (nodelist.statustime)
- 
+
  The data and time when the status was updated.
- 
+
 
 
 \ **storagcontroller**\  (storage.controller)
- 
+
  The management address to attach/detach new volumes.
  In the scenario involving multiple controllers, this data must be
  passed as argument rather than by table value
- 
+
 
 
 \ **storagetype**\  (storage.type)
- 
+
  The plugin used to drive storage configuration (e.g. svc)
- 
+
 
 
 \ **supernode**\  (ppc.supernode)
- 
+
  Indicates the connectivity of this CEC in the HFI network. A comma separated list of 2 ids. The first one is the supernode number the CEC is part of. The second one is the logical location number (0-3) of this CEC within the supernode.
- 
+
 
 
 \ **supportedarchs**\  (nodetype.supportedarchs)
- 
+
  Comma delimited list of architectures this node can execute.
- 
+
 
 
 \ **supportproxydhcp**\  (noderes.proxydhcp)
- 
+
  To specify whether the node supports proxydhcp protocol. Valid values: yes or 1, no or 0. Default value is yes.
- 
+
 
 
 \ **switch**\  (switch.switch)
- 
+
  The switch hostname.
- 
+
 
 
 \ **switchinterface**\  (switch.interface)
- 
+
  The interface name from the node perspective. For example, eth0. For the primary nic, it can be empty, the word "primary" or "primary:ethx" where ethx is the interface name.
- 
+
 
 
 \ **switchport**\  (switch.port)
- 
+
  The port number in the switch that this node is connected to. On a simple 1U switch, an administrator can generally enter the number as printed next to the ports, and xCAT will understand switch representation differences.  On stacked switches or switches with line cards, administrators should usually use the CLI representation (i.e. 2/0/1 or 5/8).  One notable exception is stacked SMC 8848M switches, in which you must add 56 for the proceeding switch, then the port number.  For example, port 3 on the second switch in an SMC8848M stack would be 59
- 
+
 
 
 \ **switchtype**\  (switches.switchtype)
- 
+
  The type of switch. It is used to identify the file name that implements the functions for this switch. The valid values are: Mellanox, Cisco, BNT and Juniper.
- 
+
 
 
 \ **switchvlan**\  (switch.vlan)
- 
+
  The ID for the tagged vlan that is created on this port using mkvlan and chvlan commands.
- 
+
 
 
 \ **syslog**\  (noderes.syslog)
- 
+
  To configure how to configure syslog for compute node. Valid values:blank(not set), ignore. blank - run postscript syslog; ignore - do NOT run postscript syslog
- 
+
 
 
 \ **termport**\  (nodehm.termport)
- 
+
  The port number on the terminal server that this node is connected to.
- 
+
 
 
 \ **termserver**\  (nodehm.termserver)
- 
+
  The hostname of the terminal server.
- 
+
 
 
 \ **tftpdir**\  (noderes.tftpdir)
- 
+
  The directory that roots this nodes contents from a tftp and related perspective.  Used for NAS offload by using different mountpoints.
- 
+
 
 
 \ **tftpserver**\  (noderes.tftpserver)
- 
+
  The TFTP server for this node (as known by this node). If not set, it defaults to networks.tftpserver.
- 
+
 
 
 \ **unit**\  (nodepos.u)
- 
+
  The vertical position of the node in the frame
- 
+
 
 
 \ **updatestatus**\  (nodelist.updatestatus)
- 
+
  The current node update status. Valid states are synced, out-of-sync,syncing,failed.
- 
+
 
 
 \ **updatestatustime**\  (nodelist.updatestatustime)
- 
+
  The date and time when the updatestatus was updated.
- 
+
 
 
 \ **urlpath**\  (mpa.urlpath)
- 
+
  URL path for the Chassis web interface. The full URL is built as follows: <hostname>/<urlpath>
- 
+
 
 
 \ **usercomment**\  (nodelist.comments)
- 
+
  Any user-written notes.
- 
+
 
 
 \ **userid**\  (zvm.userid)
- 
+
  The z/VM userID of this node.
- 
+
 
 
 \ **username**\  (ppchcp.username, mpa.username, websrv.username, pdu.username, switches.sshusername)
- 
+
  Userid of the HMC or IVM.  If not filled in, xCAT will look in the passwd table for key=hmc or key=ivm.  If not in the passwd table, the default used is hscroot for HMCs and padmin for IVMs.
- 
+
  or
- 
+
  Userid to use to access the management module.
- 
+
  or
- 
+
  Userid to use to access the web service.
- 
+
  or
- 
+
  The remote login user name
- 
+
  or
- 
+
  The remote login user name. It can be for ssh or telnet. If it is for telnet, set protocol to "telnet". If the sshusername is blank, the username, password and protocol will be retrieved from the passwd table with "switch" as the key.
- 
+
 
 
 \ **vmbeacon**\  (vm.beacon)
- 
+
  This flag is used by xCAT to track the state of the identify LED with respect to the VM.
- 
+
 
 
 \ **vmbootorder**\  (vm.bootorder)
- 
+
  Boot sequence (i.e. net,hd)
- 
+
 
 
 \ **vmcfgstore**\  (vm.cfgstore)
- 
+
  Optional location for persistent storage separate of emulated hard drives for virtualization solutions that require persistent store to place configuration data
- 
+
 
 
 \ **vmcluster**\  (vm.cluster)
- 
+
  Specify to the underlying virtualization infrastructure a cluster membership for the hypervisor.
- 
+
 
 
 \ **vmcpus**\  (vm.cpus)
- 
+
  Number of CPUs the node should see.
- 
+
 
 
 \ **vmhost**\  (vm.host)
- 
+
  The system that currently hosts the VM
- 
+
 
 
 \ **vmmanager**\  (vm.mgr)
- 
+
  The function manager for the virtual machine
- 
+
 
 
 \ **vmmaster**\  (vm.master)
- 
+
  The name of a master image, if any, this virtual machine is linked to.  This is generally set by clonevm and indicates the deletion of a master that would invalidate the storage of this virtual machine
- 
+
 
 
 \ **vmmemory**\  (vm.memory)
- 
+
  Megabytes of memory the VM currently should be set to.
- 
+
 
 
 \ **vmnicnicmodel**\  (vm.nicmodel)
- 
+
  Model of NICs that will be provided to VMs (i.e. e1000, rtl8139, virtio, etc)
- 
+
 
 
 \ **vmnics**\  (vm.nics)
- 
+
  Network configuration parameters.  Of the general form [physnet:]interface,.. Generally, interface describes the vlan entity (default for native, tagged for tagged, vl[number] for a specific vlan.  physnet is a virtual switch name or port description that is used for some virtualization technologies to construct virtual switches.  hypervisor.netmap can map names to hypervisor specific layouts, or the descriptions described there may be used directly here where possible.
- 
+
 
 
 \ **vmothersetting**\  (vm.othersettings)
- 
+
  This allows specifying a semicolon delimited list of key->value pairs to include in a vmx file of VMware or KVM. For partitioning on normal power machines, this option is used to specify the hugepage and/or bsr information, the value is like:'hugepage:1,bsr=2'. For KVM cpu pinning, this option is used to specify the physical cpu set on the host, the value is like:"vcpupin:'0-15,^8'",Its syntax is a comma separated list and a special markup using '-' and '^' (ex. '0-4', '0-3,^2') can also be allowed, the '-' denotes the range and the '^' denotes exclusive. For KVM memory binding, the value is like:'membind:0', restrict a guest to allocate memory from the specified set of NUMA nodes. For PCI passthrough, the value is like:'devpassthrough:pci_0001_01_00_0,pci_0000_03_00_0', the value for PCI device format also can be like:'devpassthrough:0001:01:00.1', the PCI devices are assigned to a virtual machine, and the virtual machine can use this I/O exclusively, the devices list are a list of PCI device names delimited with comma, the PCI device names can be obtained by running \ **virsh nodedev-list**\  on the host.
- 
+
 
 
 \ **vmphyslots**\  (vm.physlots)
- 
+
  Specify the physical slots drc index that will assigned to the partition, the delimiter is ',', and the drc index must started with '0x'. For more details, reference manpage for 'lsvm'.
- 
+
 
 
 \ **vmstorage**\  (vm.storage)
- 
+
  A list of storage files or devices to be used.  i.e. dir:///cluster/vm/<nodename> or nfs://<server>/path/to/folder/
- 
+
 
 
 \ **vmstoragecache**\  (vm.storagecache)
- 
+
  Select caching scheme to employ.  E.g. KVM understands 'none', 'writethrough' and 'writeback'
- 
+
 
 
 \ **vmstorageformat**\  (vm.storageformat)
- 
+
  Select disk format to use by default (e.g. raw versus qcow2)
- 
+
 
 
 \ **vmstoragemodel**\  (vm.storagemodel)
- 
+
  Model of storage devices to provide to guest
- 
+
 
 
 \ **vmtextconsole**\  (vm.textconsole)
- 
+
  Tracks the Psuedo-TTY that maps to the serial port or console of a VM
- 
+
 
 
 \ **vmvirtflags**\  (vm.virtflags)
- 
- General flags used by the virtualization method.  
+
+ General flags used by the virtualization method.
            For example, in Xen it could, among other things, specify paravirtualized setup, or direct kernel boot.  For a hypervisor/dom0 entry, it is the virtualization method (i.e. "xen").  For KVM, the following flag=value pairs are recognized:
              imageformat=[raw|fullraw|qcow2]
                  raw is a generic sparse file that allocates storage on demand
@@ -1414,33 +1414,33 @@ node Attributes:
                  qcow2 is a sparse, copy-on-write capable format implemented at the virtualization layer rather than the filesystem level
              clonemethod=[qemu-img|reflink]
                  qemu-img allows use of qcow2 to generate virtualization layer copy-on-write
-                 reflink uses a generic filesystem facility to clone the files on your behalf, but requires filesystem support such as btrfs 
+                 reflink uses a generic filesystem facility to clone the files on your behalf, but requires filesystem support such as btrfs
              placement_affinity=[migratable|user_migratable|pinned]
- 
+
 
 
 \ **vmvncport**\  (vm.vncport)
- 
+
  Tracks the current VNC display port (currently not meant to be set
- 
+
 
 
 \ **webport**\  (websrv.port)
- 
+
  The port of the web service.
- 
+
 
 
 \ **xcatmaster**\  (noderes.xcatmaster)
- 
+
  The hostname of the xCAT service node (as known by this node).  This acts as the default value for nfsserver and tftpserver, if they are not set.  If xcatmaster is not set, the node will use whoever responds to its boot request as its master.  For the directed bootp case for POWER, it will use the management node if xcatmaster is not set.
- 
+
 
 
 \ **zonename**\  (nodelist.zonename)
- 
+
  The name of the zone to which the node is currently assigned. If undefined, then it is not assigned to any zone.
- 
+
 
 
 
@@ -1449,5 +1449,5 @@ SEE ALSO
 ********
 
 
-\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ 
+\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\
 
diff --git a/docs/source/guides/admin-guides/references/man7/notification.7.rst b/docs/source/guides/admin-guides/references/man7/notification.7.rst
index c93c46647..e7dbb4f1d 100644
--- a/docs/source/guides/admin-guides/references/man7/notification.7.rst
+++ b/docs/source/guides/admin-guides/references/man7/notification.7.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **notification Attributes:**\   \ *comments*\ , \ *filename*\ , \ *tableops*\ , \ *tables*\ 
+\ **notification Attributes:**\   \ *comments*\ , \ *filename*\ , \ *tableops*\ , \ *tables*\
 
 
 ***********
@@ -40,27 +40,27 @@ notification Attributes:
 
 
 \ **comments**\  (notification.comments)
- 
+
  Any user-written notes.
- 
+
 
 
 \ **filename**\  (notification.filename)
- 
+
  The path name of a file that implements the callback routine when the monitored table changes.  Can be a perl module or a command.  See the regnotif man page for details.
- 
+
 
 
 \ **tableops**\  (notification.tableops)
- 
+
  Specifies the table operation to monitor for. Valid values:  "d" (rows deleted), "a" (rows added), "u" (rows updated).
- 
+
 
 
 \ **tables**\  (notification.tables)
- 
+
  Comma-separated list of xCAT database tables to monitor.
- 
+
 
 
 
@@ -69,5 +69,5 @@ SEE ALSO
 ********
 
 
-\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ 
+\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\
 
diff --git a/docs/source/guides/admin-guides/references/man7/osdistro.7.rst b/docs/source/guides/admin-guides/references/man7/osdistro.7.rst
index f1a87361c..2f1dad7dd 100644
--- a/docs/source/guides/admin-guides/references/man7/osdistro.7.rst
+++ b/docs/source/guides/admin-guides/references/man7/osdistro.7.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **osdistro Attributes:**\   \ *arch*\ , \ *basename*\ , \ *dirpaths*\ , \ *majorversion*\ , \ *minorversion*\ , \ *osdistroname*\ , \ *type*\ 
+\ **osdistro Attributes:**\   \ *arch*\ , \ *basename*\ , \ *dirpaths*\ , \ *majorversion*\ , \ *minorversion*\ , \ *osdistroname*\ , \ *type*\
 
 
 ***********
@@ -40,45 +40,45 @@ osdistro Attributes:
 
 
 \ **arch**\  (osdistro.arch)
- 
+
  The OS distro arch (e.g. x86_64)
- 
+
 
 
 \ **basename**\  (osdistro.basename)
- 
+
  The OS base name (e.g. rhels)
- 
+
 
 
 \ **dirpaths**\  (osdistro.dirpaths)
- 
+
  Directory paths where OS distro is store. There could be multiple paths if OS distro has more than one ISO image. (e.g. /install/rhels6.2/x86_64,...)
- 
+
 
 
 \ **majorversion**\  (osdistro.majorversion)
- 
+
  The OS distro major version.(e.g. 6)
- 
+
 
 
 \ **minorversion**\  (osdistro.minorversion)
- 
+
  The OS distro minor version. (e.g. 2)
- 
+
 
 
 \ **osdistroname**\  (osdistro.osdistroname)
- 
+
  Unique name (e.g. rhels6.2-x86_64)
- 
+
 
 
 \ **type**\  (osdistro.type)
- 
+
  Linux or AIX
- 
+
 
 
 
@@ -87,5 +87,5 @@ SEE ALSO
 ********
 
 
-\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ 
+\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\
 
diff --git a/docs/source/guides/admin-guides/references/man7/osdistroupdate.7.rst b/docs/source/guides/admin-guides/references/man7/osdistroupdate.7.rst
index 17850864c..11cf48b50 100644
--- a/docs/source/guides/admin-guides/references/man7/osdistroupdate.7.rst
+++ b/docs/source/guides/admin-guides/references/man7/osdistroupdate.7.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **osdistroupdate Attributes:**\   \ *dirpath*\ , \ *downloadtime*\ , \ *osdistroname*\ , \ *osupdatename*\ , \ *usercomment*\ 
+\ **osdistroupdate Attributes:**\   \ *dirpath*\ , \ *downloadtime*\ , \ *osdistroname*\ , \ *osupdatename*\ , \ *usercomment*\
 
 
 ***********
@@ -40,33 +40,33 @@ osdistroupdate Attributes:
 
 
 \ **dirpath**\  (osdistroupdate.dirpath)
- 
+
  Path to where OS distro update is stored. (e.g. /install/osdistroupdates/rhels6.2-x86_64-20120716-update)
- 
+
 
 
 \ **downloadtime**\  (osdistroupdate.downloadtime)
- 
+
  The timestamp when OS distro update was downloaded..
- 
+
 
 
 \ **osdistroname**\  (osdistroupdate.osdistroname)
- 
+
  The OS distro name to update. (e.g. rhels)
- 
+
 
 
 \ **osupdatename**\  (osdistroupdate.osupdatename)
- 
+
  Name of OS update. (e.g. rhn-update1)
- 
+
 
 
 \ **usercomment**\  (osdistroupdate.comments)
- 
+
  Any user-written notes.
- 
+
 
 
 
@@ -75,5 +75,5 @@ SEE ALSO
 ********
 
 
-\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ 
+\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\
 
diff --git a/docs/source/guides/admin-guides/references/man7/osimage.7.rst b/docs/source/guides/admin-guides/references/man7/osimage.7.rst
index 8e2faea1f..060118843 100644
--- a/docs/source/guides/admin-guides/references/man7/osimage.7.rst
+++ b/docs/source/guides/admin-guides/references/man7/osimage.7.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **osimage Attributes:**\   \ *addkcmdline*\ , \ *boottarget*\ , \ *bosinst_data*\ , \ *cfmdir*\ , \ *configdump*\ , \ *crashkernelsize*\ , \ *description*\ , \ *driverupdatesrc*\ , \ *dump*\ , \ *exlist*\ , \ *fb_script*\ , \ *groups*\ , \ *home*\ , \ *image_data*\ , \ *imagename*\ , \ *imagetype*\ , \ *installp_bundle*\ , \ *installto*\ , \ *isdeletable*\ , \ *kerneldir*\ , \ *kernelver*\ , \ *kitcomponents*\ , \ *krpmver*\ , \ *lpp_source*\ , \ *mksysb*\ , \ *netdrivers*\ , \ *nimmethod*\ , \ *nimtype*\ , \ *nodebootif*\ , \ *osarch*\ , \ *osdistroname*\ , \ *osname*\ , \ *osupdatename*\ , \ *osvers*\ , \ *otherifce*\ , \ *otherpkgdir*\ , \ *otherpkglist*\ , \ *otherpkgs*\ , \ *paging*\ , \ *partitionfile*\ , \ *permission*\ , \ *pkgdir*\ , \ *pkglist*\ , \ *postbootscripts*\ , \ *postinstall*\ , \ *postscripts*\ , \ *profile*\ , \ *provmethod*\ , \ *resolv_conf*\ , \ *root*\ , \ *rootfstype*\ , \ *rootimgdir*\ , \ *script*\ , \ *serverrole*\ , \ *shared_home*\ , \ *shared_root*\ , \ *spot*\ , \ *synclists*\ , \ *template*\ , \ *tmp*\ , \ *usercomment*\ , \ *winpepath*\ 
+\ **osimage Attributes:**\   \ *addkcmdline*\ , \ *boottarget*\ , \ *bosinst_data*\ , \ *cfmdir*\ , \ *configdump*\ , \ *crashkernelsize*\ , \ *description*\ , \ *driverupdatesrc*\ , \ *dump*\ , \ *exlist*\ , \ *fb_script*\ , \ *groups*\ , \ *home*\ , \ *image_data*\ , \ *imagename*\ , \ *imagetype*\ , \ *installp_bundle*\ , \ *installto*\ , \ *isdeletable*\ , \ *kerneldir*\ , \ *kernelver*\ , \ *kitcomponents*\ , \ *krpmver*\ , \ *lpp_source*\ , \ *mksysb*\ , \ *netdrivers*\ , \ *nimmethod*\ , \ *nimtype*\ , \ *nodebootif*\ , \ *osarch*\ , \ *osdistroname*\ , \ *osname*\ , \ *osupdatename*\ , \ *osvers*\ , \ *otherifce*\ , \ *otherpkgdir*\ , \ *otherpkglist*\ , \ *otherpkgs*\ , \ *paging*\ , \ *partitionfile*\ , \ *permission*\ , \ *pkgdir*\ , \ *pkglist*\ , \ *postbootscripts*\ , \ *postinstall*\ , \ *postscripts*\ , \ *profile*\ , \ *provmethod*\ , \ *resolv_conf*\ , \ *root*\ , \ *rootfstype*\ , \ *rootimgdir*\ , \ *script*\ , \ *serverrole*\ , \ *shared_home*\ , \ *shared_root*\ , \ *spot*\ , \ *synclists*\ , \ *template*\ , \ *tmp*\ , \ *usercomment*\ , \ *winpepath*\
 
 
 ***********
@@ -40,245 +40,245 @@ osimage Attributes:
 
 
 \ **addkcmdline**\  (linuximage.addkcmdline)
- 
+
  User specified kernel options for os provision process(no prefix) or the provisioned os(with prefix "R::"). The options should be delimited with spaces(" "). This attribute is ignored if linuximage.boottarget is set.
- 
+
 
 
 \ **boottarget**\  (linuximage.boottarget)
- 
+
  The name of the boottarget definition.  When this attribute is set, xCAT will use the kernel, initrd and kernel params defined in the boottarget definition instead of the default.
- 
+
 
 
 \ **bosinst_data**\  (nimimage.bosinst_data)
- 
+
  The name of a NIM bosinst_data resource.
- 
+
 
 
 \ **cfmdir**\  (osimage.cfmdir)
- 
+
  CFM directory name for PCM. Set to /install/osimages/<osimage name>/cfmdir by PCM.
- 
+
 
 
 \ **configdump**\  (nimimage.configdump)
- 
+
  Specifies the type of system dump to be collected. The values are selective, full, and none.  The default is selective.
- 
+
 
 
 \ **crashkernelsize**\  (linuximage.crashkernelsize)
- 
+
  the size that assigned to the kdump kernel. If the kernel size is not set, 256M will be the default value.
- 
+
 
 
 \ **description**\  (osimage.description)
- 
+
  OS Image Description
- 
+
 
 
 \ **driverupdatesrc**\  (linuximage.driverupdatesrc)
- 
+
  The source of the drivers which need to be loaded during the boot. Two types of driver update source are supported: Driver update disk and Driver rpm package. The value for this attribute should be comma separated sources. Each source should be the format tab:full_path_of_source_file. The tab keyword can be: dud (for Driver update disk) and rpm (for driver rpm). If missing the tab, the rpm format is the default. e.g. dud:/install/dud/dd.img,rpm:/install/rpm/d.rpm
- 
+
 
 
 \ **dump**\  (linuximage.dump, nimimage.dump)
- 
+
  The NFS directory to hold the Linux kernel dump file (vmcore) when the node with this image crashes, its format is "nfs://<nfs_server_ip>/<kdump_path>". If you want to use the node's "xcatmaster" (its SN or MN), <nfs_server_ip> can be left blank. For example, "nfs:///<kdump_path>" means the NFS directory to hold the kernel dump file is on the node's SN, or MN if there's no SN.
- 
+
  or
- 
+
  The name of the NIM dump resource.
- 
+
 
 
 \ **exlist**\  (linuximage.exlist)
- 
+
  The fully qualified name of the file that stores the file names and directory names that will be excluded from the image during packimage command.  It is used for diskless image only.
- 
+
 
 
 \ **fb_script**\  (nimimage.fb_script)
- 
+
  The name of a NIM fb_script resource.
- 
+
 
 
 \ **groups**\  (osimage.groups)
- 
+
  A comma-delimited list of image groups of which this image is a member.  Image groups can be used in the litefile and litetree table instead of a single image name. Group names are arbitrary.
- 
+
 
 
 \ **home**\  (nimimage.home)
- 
+
  The name of the NIM home resource.
- 
+
 
 
 \ **image_data**\  (nimimage.image_data)
- 
+
  The name of a NIM image_data resource.
- 
+
 
 
 \ **imagename**\  (osimage.imagename)
- 
+
  The name of this xCAT OS image definition.
- 
+
 
 
 \ **imagetype**\  (osimage.imagetype)
- 
+
  The type of operating system image this definition represents (linux,AIX).
- 
+
 
 
 \ **installp_bundle**\  (nimimage.installp_bundle)
- 
+
  One or more comma separated NIM installp_bundle resources.
- 
+
 
 
 \ **installto**\  (winimage.installto)
- 
+
  The disk and partition that the Windows will be deployed to. The valid format is <disk>:<partition>. If not set, default value is 0:1 for bios boot mode(legacy) and 0:3 for uefi boot mode; If setting to 1, it means 1:1 for bios boot and 1:3 for uefi boot
- 
+
 
 
 \ **isdeletable**\  (osimage.isdeletable)
- 
+
  A flag to indicate whether this image profile can be deleted.  This attribute is only used by PCM.
- 
+
 
 
 \ **kerneldir**\  (linuximage.kerneldir)
- 
+
  The directory name where the 3rd-party kernel is stored. It is used for diskless image only.
- 
+
 
 
 \ **kernelver**\  (linuximage.kernelver)
- 
+
  The version of linux kernel used in the linux image. If the kernel version is not set, the default kernel in rootimgdir will be used
- 
+
 
 
 \ **kitcomponents**\  (osimage.kitcomponents)
- 
+
  List of Kit Component IDs assigned to this OS Image definition.
- 
+
 
 
 \ **krpmver**\  (linuximage.krpmver)
- 
+
  The rpm version of kernel packages (for SLES only). If it is not set, the default rpm version of kernel packages will be used.
- 
+
 
 
 \ **lpp_source**\  (nimimage.lpp_source)
- 
+
  The name of the NIM lpp_source resource.
- 
+
 
 
 \ **mksysb**\  (nimimage.mksysb)
- 
+
  The name of a NIM mksysb resource.
- 
+
 
 
 \ **netdrivers**\  (linuximage.netdrivers)
- 
+
  The ethernet device drivers of the nodes which will use this linux image, at least the device driver for the nodes' installnic should be included
- 
+
 
 
 \ **nimmethod**\  (nimimage.nimmethod)
- 
+
  The NIM install method to use, (ex. rte, mksysb).
- 
+
 
 
 \ **nimtype**\  (nimimage.nimtype)
- 
+
  The NIM client type- standalone, diskless, or dataless.
- 
+
 
 
 \ **nodebootif**\  (linuximage.nodebootif)
- 
+
  The network interface the stateless/statelite node will boot over (e.g. eth0)
- 
+
 
 
 \ **osarch**\  (osimage.osarch)
- 
+
  The hardware architecture of this node.  Valid values: x86_64, ppc64, x86, ia64.
- 
+
 
 
 \ **osdistroname**\  (osimage.osdistroname)
- 
+
  The name of the OS distro definition.  This attribute can be used to specify which OS distro to use, instead of using the osname,osvers,and osarch attributes. For \*kit commands,  the attribute will be used to read the osdistro table for the osname, osvers, and osarch attributes. If defined, the osname, osvers, and osarch attributes defined in the osimage table will be ignored.
- 
+
 
 
 \ **osname**\  (osimage.osname)
- 
+
  Operating system name- AIX or Linux.
- 
+
 
 
 \ **osupdatename**\  (osimage.osupdatename)
- 
+
  A comma-separated list of OS distro updates to apply to this osimage.
- 
+
 
 
 \ **osvers**\  (osimage.osvers)
- 
+
  The Linux operating system deployed on this node.  Valid values:  rhels\*,rhelc\*, rhas\*,centos\*,SL\*, fedora\*, sles\* (where \* is the version #).
- 
+
 
 
 \ **otherifce**\  (linuximage.otherifce)
- 
+
  Other network interfaces (e.g. eth1) in the image that should be configured via DHCP
- 
+
 
 
 \ **otherpkgdir**\  (linuximage.otherpkgdir)
- 
+
  The base directory and urls of internet repos from which the non-distro packages are retrived. Only 1 local directory is supported at present. The entries should be delimited with comma ",". Currently, the internet repos are only supported on Ubuntu and Redhat.
- 
+
 
 
 \ **otherpkglist**\  (linuximage.otherpkglist)
- 
+
  The fully qualified name of the file that stores non-distro package lists that will be included in the image. It could be set to multiple paths. The multiple paths must be separated by ",".
- 
+
 
 
 \ **otherpkgs**\  (nimimage.otherpkgs)
- 
+
  One or more comma separated installp or rpm packages.  The rpm packages must have a prefix of 'R:', (ex. R:foo.rpm)
- 
+
 
 
 \ **paging**\  (nimimage.paging)
- 
+
  The name of the NIM paging resource.
- 
+
 
 
 \ **partitionfile**\  (linuximage.partitionfile, winimage.partitionfile)
- 
+
  Only available for diskful osimages and statelite osimages(localdisk enabled). The full path of the partition file or the script to generate the partition file. The valid value includes:
                  "<the absolute path of the parititon file>": For diskful osimages, the partition file contains the partition definition that will be inserted directly into the template file for os installation. The syntax and format of the partition file should confirm to the corresponding OS installer of the Linux distributions(e.g. kickstart for RedHat, autoyast for SLES, pressed for Ubuntu). For statelite osimages, when the localdisk is enabled, the partition file with specific syntax and format includes the partition scheme of the local disk, please refer to the statelite documentation for details.
                  "s:<the absolute path of the partition script>": a shell script to generate the partition file "/tmp/partitionfile" inside the installer before the installation start.
@@ -286,44 +286,44 @@ osimage Attributes:
                  "s:d:<the absolute path of the disk script>": only available for ubuntu osimages, a script to generate the disk name file "/tmp/xcat.install_disk" inside the debian installer. This script is run in the "pressed/early_command" section.
                  "c:<the absolute path of the additional pressed config file>": only availbe for ubuntu osimages, contains the additional pressed entries in "d-i ..." form. This can be used to specify some additional preseed options to support RAID or LVM in Ubuntu.
                  "s:c:<the absolute path of the additional pressed config script>": only available for ubuntu osimages, runs in pressed/early_command and set the preseed values with "debconf-set". The multiple values should be delimited with comma ","
- 
+
  or
- 
+
  The path of partition configuration file. Since the partition configuration for bios boot mode and uefi boot mode are different, this configuration file can include both configurations if you need to support both bios and uefi mode. Either way, you must specify the boot mode in the configuration. Example of partition configuration file: [BIOS]xxxxxxx[UEFI]yyyyyyy. To simplify the setting, you also can set installto in partitionfile with section like [INSTALLTO]0:1
- 
+
 
 
 \ **permission**\  (linuximage.permission)
- 
+
  The mount permission of /.statelite directory is used, its default value is 755
- 
+
 
 
 \ **pkgdir**\  (linuximage.pkgdir)
- 
+
  The name of the directory where the distro packages are stored. It could be set to multiple paths. The multiple paths must be separated by ",". The first path in the value of osimage.pkgdir must be the OS base pkg dir path, such as pkgdir=/install/rhels6.2/x86_64,/install/updates . In the os base pkg path, there are default repository data. And in the other pkg path(s), the users should make sure there are repository data. If not, use "createrepo" command to create them. For ubuntu, multiple mirrors can be specified in the pkgdir attribute, the mirrors must be prefixed by the protocol(http/ssh) and delimited with "," between each other.
- 
+
 
 
 \ **pkglist**\  (linuximage.pkglist)
- 
+
  The fully qualified name of the file that stores the distro  packages list that will be included in the image. Make sure that if the pkgs in the pkglist have dependency pkgs, the dependency pkgs should be found in one of the pkgdir
- 
+
 
 
 \ **postbootscripts**\  (osimage.postbootscripts)
- 
+
  Comma separated list of scripts that should be run on this after diskful installation or diskless boot. On AIX these scripts are run during the processing of /etc/inittab.  On Linux they are run at the init.d time. xCAT automatically adds the scripts in the xcatdefaults.postbootscripts attribute to run first in the list. See the site table runbootscripts attribute.
- 
+
 
 
 \ **postinstall**\  (linuximage.postinstall)
- 
+
  Supported in diskless image only. The fully qualified name of the scripts running in non-chroot mode after the package installation but before initrd generation during genimage. If multiple scripts are specified, they should be seperated with comma ",". A set of osimage attributes are exported as the environment variables to be used in the postinstall scripts:
- 
- 
+
+
  .. code-block:: perl
- 
+
         IMG_ARCH(The architecture of the osimage, such as "ppc64le","x86_64"),
         IMG_NAME(The name of the osimage, such as "rhels7.3-ppc64le-netboot-compute"),
         IMG_OSVER(The os release of the osimage, such as "rhels7.3","sles11.4"),
@@ -334,118 +334,118 @@ osimage Attributes:
         IMG_OTHERPKGLIST(the "otherpkglist" attribute of the osimage),
         IMG_OTHERPKGDIR(the "otherpkgdir" attribute of the osimage),
         IMG_ROOTIMGDIR(the "rootimgdir" attribute of the osimage)
- 
- 
+
+
 
 
 \ **postscripts**\  (osimage.postscripts)
- 
+
  Comma separated list of scripts that should be run on this image after diskful installation or diskless boot. For installation of RedHat, CentOS, Fedora, the scripts will be run before the reboot. For installation of SLES, the scripts will be run after the reboot but before the init.d process. For diskless deployment, the scripts will be run at the init.d time, and xCAT will automatically add the list of scripts from the postbootscripts attribute to run after postscripts list. For installation of AIX, the scripts will run after the reboot and acts the same as the postbootscripts attribute.  For AIX, use the postbootscripts attribute. See the site table runbootscripts attribute.
- 
+
 
 
 \ **profile**\  (osimage.profile)
- 
+
  The node usage category. For example compute, service.
- 
+
 
 
 \ **provmethod**\  (osimage.provmethod)
- 
+
  The provisioning method for node deployment. The valid values are install, netboot,statelite,boottarget,dualboot,sysclone. If boottarget is set, you must set linuximage.boottarget to the name of the boottarget definition. It is not used by AIX.
- 
+
 
 
 \ **resolv_conf**\  (nimimage.resolv_conf)
- 
+
  The name of the NIM resolv_conf resource.
- 
+
 
 
 \ **root**\  (nimimage.root)
- 
+
  The name of the NIM root resource.
- 
+
 
 
 \ **rootfstype**\  (osimage.rootfstype)
- 
+
  The filesystem type for the rootfs is used when the provmethod is statelite. The valid values are nfs or ramdisk. The default value is nfs
- 
+
 
 
 \ **rootimgdir**\  (linuximage.rootimgdir)
- 
+
  The directory name where the image is stored.  It is generally used for diskless image. it also can be used in sysclone environment to specify where the image captured from golden client is stored. in sysclone environment, rootimgdir is generally assigned to some default value by xcat, but you can specify your own store directory. just one thing need to be noticed, wherever you save the image, the name of last level directory must be the name of image. for example, if your image name is testimage and you want to save this image under home directoy, rootimgdir should be assigned to value /home/testimage/
- 
+
 
 
 \ **script**\  (nimimage.script)
- 
+
  The name of a NIM script resource.
- 
+
 
 
 \ **serverrole**\  (osimage.serverrole)
- 
+
  The role of the server created by this osimage.  Default roles: mgtnode, servicenode, compute, login, storage, utility.
- 
+
 
 
 \ **shared_home**\  (nimimage.shared_home)
- 
+
  The name of the NIM shared_home resource.
- 
+
 
 
 \ **shared_root**\  (nimimage.shared_root)
- 
+
  A shared_root resource represents a directory that can be used as a / (root) directory by one or more diskless clients.
- 
+
 
 
 \ **spot**\  (nimimage.spot)
- 
+
  The name of the NIM SPOT resource.
- 
+
 
 
 \ **synclists**\  (osimage.synclists)
- 
+
  The fully qualified name of a file containing a list of files to synchronize on the nodes. Can be a comma separated list of multiple synclist files. The synclist generated by PCM named /install/osimages/<imagename>/synclist.cfm is reserved for use only by PCM and should not be edited by the admin.
- 
+
 
 
 \ **template**\  (linuximage.template, winimage.template)
- 
+
  The fully qualified name of the template file that will be used to create the OS installer configuration file for stateful installations (e.g.  kickstart for RedHat, autoyast for SLES).
- 
+
  or
- 
+
  The fully qualified name of the template file that is used to create the windows unattend.xml file for diskful installation.
- 
+
 
 
 \ **tmp**\  (nimimage.tmp)
- 
+
  The name of the NIM tmp resource.
- 
+
 
 
 \ **usercomment**\  (linuximage.comments, nimimage.comments)
- 
+
  Any user-written notes.
- 
+
  or
- 
+
  Any user-provided notes.
- 
+
 
 
 \ **winpepath**\  (winimage.winpepath)
- 
+
  The path of winpe which will be used to boot this image. If the real path is /tftpboot/winboot/winpe1/, the value for winpepath should be set to winboot/winpe1
- 
+
 
 
 
@@ -454,5 +454,5 @@ SEE ALSO
 ********
 
 
-\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ 
+\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\
 
diff --git a/docs/source/guides/admin-guides/references/man7/pdu.7.rst b/docs/source/guides/admin-guides/references/man7/pdu.7.rst
index de02c50e9..72e27fd3d 100644
--- a/docs/source/guides/admin-guides/references/man7/pdu.7.rst
+++ b/docs/source/guides/admin-guides/references/man7/pdu.7.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **pdu Attributes:**\   \ *node*\ , \ *nodetype*\ , \ *outlet*\ 
+\ **pdu Attributes:**\   \ *node*\ , \ *nodetype*\ , \ *outlet*\
 
 
 ***********
@@ -40,21 +40,21 @@ pdu Attributes:
 
 
 \ **node**\  (pdu.node)
- 
+
  The hostname/address of the pdu to which the settings apply
- 
+
 
 
 \ **nodetype**\  (pdu.nodetype)
- 
+
  The node type should be pdu
- 
+
 
 
 \ **outlet**\  (pdu.outlet)
- 
+
  The pdu outlet count
- 
+
 
 
 
@@ -63,5 +63,5 @@ SEE ALSO
 ********
 
 
-\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ 
+\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\
 
diff --git a/docs/source/guides/admin-guides/references/man7/policy.7.rst b/docs/source/guides/admin-guides/references/man7/policy.7.rst
index b920c052f..8967d20e9 100644
--- a/docs/source/guides/admin-guides/references/man7/policy.7.rst
+++ b/docs/source/guides/admin-guides/references/man7/policy.7.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **policy Attributes:**\   \ *commands*\ , \ *host*\ , \ *name*\ , \ *noderange*\ , \ *parameters*\ , \ *priority*\ , \ *rule*\ , \ *time*\ , \ *usercomment*\ 
+\ **policy Attributes:**\   \ *commands*\ , \ *host*\ , \ *name*\ , \ *noderange*\ , \ *parameters*\ , \ *priority*\ , \ *rule*\ , \ *time*\ , \ *usercomment*\
 
 
 ***********
@@ -40,57 +40,57 @@ policy Attributes:
 
 
 \ **commands**\  (policy.commands)
- 
+
  The list of commands that this rule applies to.  Default is "\*" (all commands).
- 
+
 
 
 \ **host**\  (policy.host)
- 
+
  The host from which users may issue the commands specified by this rule.  Default is "\*" (all hosts). Only all or one host is supported
- 
+
 
 
 \ **name**\  (policy.name)
- 
+
  The username that is allowed to perform the commands specified by this rule.  Default is "\*" (all users).
- 
+
 
 
 \ **noderange**\  (policy.noderange)
- 
+
  The Noderange that this rule applies to.  Default is "\*" (all nodes). Not supported with the \*def commands.
- 
+
 
 
 \ **parameters**\  (policy.parameters)
- 
+
  A regular expression that matches the command parameters (everything except the noderange) that this rule applies to.  Default is "\*" (all parameters). Not supported with the \*def commands.
- 
+
 
 
 \ **priority**\  (policy.priority)
- 
+
  The priority value for this rule.  This value is used to identify this policy data object (i.e. this rule) The table is sorted on this field with the lower the number the higher the priority. For example 1.0 is higher priority than 4.1 is higher than 4.9.
- 
+
 
 
 \ **rule**\  (policy.rule)
- 
+
  Specifies how this rule should be applied.  Valid values are: allow, trusted. Allow will allow the user to run the commands. Any other value will deny the user access to the commands. Trusted means that once this client has been authenticated via the certificate, all other information that is sent (e.g. the username) is believed without question.  This authorization should only be given to the xcatd on the management node at this time.
- 
+
 
 
 \ **time**\  (policy.time)
- 
+
  Time ranges that this command may be executed in.  This is not supported.
- 
+
 
 
 \ **usercomment**\  (policy.comments)
- 
+
  Any user-written notes.
- 
+
 
 
 
@@ -99,5 +99,5 @@ SEE ALSO
 ********
 
 
-\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ 
+\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\
 
diff --git a/docs/source/guides/admin-guides/references/man7/rack.7.rst b/docs/source/guides/admin-guides/references/man7/rack.7.rst
index 1403a7da0..b2ddd3795 100644
--- a/docs/source/guides/admin-guides/references/man7/rack.7.rst
+++ b/docs/source/guides/admin-guides/references/man7/rack.7.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **rack Attributes:**\   \ *displayname*\ , \ *height*\ , \ *num*\ , \ *rackname*\ , \ *room*\ , \ *usercomment*\ 
+\ **rack Attributes:**\   \ *displayname*\ , \ *height*\ , \ *num*\ , \ *rackname*\ , \ *room*\ , \ *usercomment*\
 
 
 ***********
@@ -40,39 +40,39 @@ rack Attributes:
 
 
 \ **displayname**\  (rack.displayname)
- 
+
  Alternative name for rack. Only used by PCM.
- 
+
 
 
 \ **height**\  (rack.height)
- 
+
  Number of units which can be stored in the rack.
- 
+
 
 
 \ **num**\  (rack.num)
- 
+
  The rack number.
- 
+
 
 
 \ **rackname**\  (rack.rackname)
- 
+
  The rack name.
- 
+
 
 
 \ **room**\  (rack.room)
- 
+
  The room in which the rack is located.
- 
+
 
 
 \ **usercomment**\  (rack.comments)
- 
+
  Any user-written notes.
- 
+
 
 
 
@@ -81,5 +81,5 @@ SEE ALSO
 ********
 
 
-\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ 
+\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\
 
diff --git a/docs/source/guides/admin-guides/references/man7/route.7.rst b/docs/source/guides/admin-guides/references/man7/route.7.rst
index 1cbef8fc8..55b451253 100644
--- a/docs/source/guides/admin-guides/references/man7/route.7.rst
+++ b/docs/source/guides/admin-guides/references/man7/route.7.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **route Attributes:**\   \ *gateway*\ , \ *ifname*\ , \ *mask*\ , \ *net*\ , \ *routename*\ , \ *usercomment*\ 
+\ **route Attributes:**\   \ *gateway*\ , \ *ifname*\ , \ *mask*\ , \ *net*\ , \ *routename*\ , \ *usercomment*\
 
 
 ***********
@@ -40,39 +40,39 @@ route Attributes:
 
 
 \ **gateway**\  (routes.gateway)
- 
+
  The gateway that routes the ip traffic from the mn to the nodes. It is usually a service node.
- 
+
 
 
 \ **ifname**\  (routes.ifname)
- 
+
  The interface name that facing the gateway. It is optional for IPv4 routes, but it is required for IPv6 routes.
- 
+
 
 
 \ **mask**\  (routes.mask)
- 
+
  The network mask.
- 
+
 
 
 \ **net**\  (routes.net)
- 
+
  The network address.
- 
+
 
 
 \ **routename**\  (routes.routename)
- 
+
  Name used to identify this route.
- 
+
 
 
 \ **usercomment**\  (routes.comments)
- 
+
  Any user-written notes.
- 
+
 
 
 
@@ -81,5 +81,5 @@ SEE ALSO
 ********
 
 
-\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ 
+\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\
 
diff --git a/docs/source/guides/admin-guides/references/man7/site.7.rst b/docs/source/guides/admin-guides/references/man7/site.7.rst
index c617ecd0f..7c341e89b 100644
--- a/docs/source/guides/admin-guides/references/man7/site.7.rst
+++ b/docs/source/guides/admin-guides/references/man7/site.7.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **site Attributes:**\   \ *installdir*\ , \ *master*\ , \ *xcatdport*\ 
+\ **site Attributes:**\   \ *installdir*\ , \ *master*\ , \ *xcatdport*\
 
 
 ***********
@@ -40,21 +40,21 @@ site Attributes:
 
 
 \ **installdir**\  (site.value)
- 
+
  The installation directory
- 
+
 
 
 \ **master**\  (site.value)
- 
+
  The management node
- 
+
 
 
 \ **xcatdport**\  (site.value)
- 
+
  Port used by xcatd daemon on master
- 
+
 
 
 
@@ -63,5 +63,5 @@ SEE ALSO
 ********
 
 
-\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ 
+\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\
 
diff --git a/docs/source/guides/admin-guides/references/man7/taskstate.7.rst b/docs/source/guides/admin-guides/references/man7/taskstate.7.rst
index 464a2206d..09209820a 100644
--- a/docs/source/guides/admin-guides/references/man7/taskstate.7.rst
+++ b/docs/source/guides/admin-guides/references/man7/taskstate.7.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **taskstate Attributes:**\   \ *command*\ , \ *disable*\ , \ *node*\ , \ *pid*\ , \ *reserve*\ , \ *state*\ 
+\ **taskstate Attributes:**\   \ *command*\ , \ *disable*\ , \ *node*\ , \ *pid*\ , \ *reserve*\ , \ *state*\
 
 
 ***********
@@ -40,39 +40,39 @@ taskstate Attributes:
 
 
 \ **command**\  (taskstate.command)
- 
+
  Current command is running
- 
+
 
 
 \ **disable**\  (taskstate.disable)
- 
+
  Set to 'yes' or '1' to comment out this row.
- 
+
 
 
 \ **node**\  (taskstate.node)
- 
+
  The node name.
- 
+
 
 
 \ **pid**\  (taskstate.pid)
- 
+
  The process id of the request process.
- 
+
 
 
 \ **reserve**\  (taskstate.reserve)
- 
+
  used to lock the node
- 
+
 
 
 \ **state**\  (taskstate.state)
- 
+
  The task state(callback, running) for the node.
- 
+
 
 
 
@@ -81,5 +81,5 @@ SEE ALSO
 ********
 
 
-\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ 
+\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\
 
diff --git a/docs/source/guides/admin-guides/references/man7/zone.7.rst b/docs/source/guides/admin-guides/references/man7/zone.7.rst
index 7dca58ceb..e96c9c0c3 100644
--- a/docs/source/guides/admin-guides/references/man7/zone.7.rst
+++ b/docs/source/guides/admin-guides/references/man7/zone.7.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **zone Attributes:**\   \ *defaultzone*\ , \ *sshbetweennodes*\ , \ *sshkeydir*\ , \ *usercomment*\ , \ *zonename*\ 
+\ **zone Attributes:**\   \ *defaultzone*\ , \ *sshbetweennodes*\ , \ *sshkeydir*\ , \ *usercomment*\ , \ *zonename*\
 
 
 ***********
@@ -40,33 +40,33 @@ zone Attributes:
 
 
 \ **defaultzone**\  (zone.defaultzone)
- 
+
  If nodes are not assigned to any other zone, they will default to this zone. If value is set to yes or 1.
- 
+
 
 
 \ **sshbetweennodes**\  (zone.sshbetweennodes)
- 
+
  Indicates whether passwordless ssh will be setup between the nodes of this zone. Values are yes/1 or no/0. Default is yes.
- 
+
 
 
 \ **sshkeydir**\  (zone.sshkeydir)
- 
+
  Directory containing the shared root ssh RSA keys.
- 
+
 
 
 \ **usercomment**\  (zone.comments)
- 
+
  Any user-provided notes.
- 
+
 
 
 \ **zonename**\  (zone.zonename)
- 
+
  The name of the zone.
- 
+
 
 
 
@@ -75,5 +75,5 @@ SEE ALSO
 ********
 
 
-\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ 
+\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\
 
diff --git a/docs/source/guides/admin-guides/references/man7/zvmivp.7.rst b/docs/source/guides/admin-guides/references/man7/zvmivp.7.rst
index 5a8aeb8bf..8d7c12ac9 100644
--- a/docs/source/guides/admin-guides/references/man7/zvmivp.7.rst
+++ b/docs/source/guides/admin-guides/references/man7/zvmivp.7.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **zvmivp Attributes:**\   \ **\ 
+\ **zvmivp Attributes:**\   \ **\
 
 
 ***********
@@ -45,5 +45,5 @@ SEE ALSO
 ********
 
 
-\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\ 
+\ **mkdef(1)**\ , \ **chdef(1)**\ , \ **lsdef(1)**\ , \ **rmdef(1)**\
 
diff --git a/docs/source/guides/admin-guides/references/man8/chtab.8.rst b/docs/source/guides/admin-guides/references/man8/chtab.8.rst
index 8e38a5abe..65e69fbc2 100644
--- a/docs/source/guides/admin-guides/references/man8/chtab.8.rst
+++ b/docs/source/guides/admin-guides/references/man8/chtab.8.rst
@@ -74,63 +74,63 @@ EXAMPLES
 
 
 1.  To add a node=node1 to the nodelist table with groups=all:
- 
- 
+
+
  .. code-block:: perl
- 
+
    chtab  node=node1 nodelist.groups=all
- 
- 
+
+
 
 
 2. To add a keyword (tftpdir) and value (/tftpboot) to the site table:
- 
- 
+
+
  .. code-block:: perl
- 
+
    chtab  key=tftpdir site.value=/tftpboot
- 
- 
+
+
 
 
 3.  To add node1 to the  nodetype table with os=rhel5:
- 
- 
+
+
  .. code-block:: perl
- 
+
    chtab  node=node1 nodetype.os=rhel5
- 
- 
+
+
 
 
 4.  To change node1 in nodetype table setting os=sles:
- 
- 
+
+
  .. code-block:: perl
- 
+
    chtab  node=node1 nodetype.os=sles
- 
- 
+
+
 
 
 5. To change node1 by appending otherpkgs to the postbootscripts field in the postscripts table:
- 
- 
+
+
  .. code-block:: perl
- 
+
    chtab node=node1 postscripts.postbootscripts+=otherpkgs
- 
- 
+
+
 
 
 6. To delete node1 from nodetype table:
- 
- 
+
+
  .. code-block:: perl
- 
+
    chtab -d node=node1 nodetype
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man8/copycds-cdrom.8.rst b/docs/source/guides/admin-guides/references/man8/copycds-cdrom.8.rst
index ef33aff24..bc9f48015 100644
--- a/docs/source/guides/admin-guides/references/man8/copycds-cdrom.8.rst
+++ b/docs/source/guides/admin-guides/references/man8/copycds-cdrom.8.rst
@@ -11,7 +11,7 @@ SYNOPSIS
 ********
 
 
-\ **copycds-cdrom**\  \ *[copycds options]*\  \ *[drive]*\ 
+\ **copycds-cdrom**\  \ *[copycds options]*\  \ *[drive]*\
 
 
 ***********
diff --git a/docs/source/guides/admin-guides/references/man8/copycds.8.rst b/docs/source/guides/admin-guides/references/man8/copycds.8.rst
index 37c399113..6353a9dde 100644
--- a/docs/source/guides/admin-guides/references/man8/copycds.8.rst
+++ b/docs/source/guides/admin-guides/references/man8/copycds.8.rst
@@ -44,40 +44,40 @@ OPTIONS
 
 
 
-\ **-n|-**\ **-name|-**\ **-osver**\ =\ *distroname*\ 
- 
+\ **-n|-**\ **-name|-**\ **-osver**\ =\ *distroname*\
+
  The linux distro name and version that the ISO/DVD contains.  Examples:  rhels6.3, sles11.2, fedora9.  Note the 's' in rhels6.3 which denotes the Server version of RHEL, which is typically used.
- 
 
 
-\ **-a|-**\ **-arch**\ =\ *architecture*\ 
- 
+
+\ **-a|-**\ **-arch**\ =\ *architecture*\
+
  The architecture of the linux distro on the ISO/DVD.  Examples: x86, x86_64, ppc64, s390x.
- 
 
 
-\ **-p|-**\ **-path**\ =\ *ospkgpath*\ 
- 
+
+\ **-p|-**\ **-path**\ =\ *ospkgpath*\
+
  The destination directory to which the contents of ISO/DVD will be copied. When this option is not specified, the default destination directory will be formed from the \ **installdir**\  site table attribute and the distro name and architecture, for example: /install/rhel6.3/x86_64. This option is only supported for distributions of sles, redhat and windows.
- 
 
 
-\ **-i|-**\ **-inspection**\ 
- 
+
+\ **-i|-**\ **-inspection**\
+
  Check whether xCAT can recognize the DVDs/ISOs in the argument list, but do not copy the disc. Displays the os distribution name, architecture and disc no of each recognized DVD/ISO. This option is only supported for distributions of sles, redhat and windows.
- 
 
 
-\ **-o|-**\ **-noosimage**\ 
- 
+
+\ **-o|-**\ **-noosimage**\
+
  Do not create the default osimages based on the osdistro copied in. By default, \ **copycds**\  will create a set of osimages based on the osdistro.
- 
 
 
-\ **-w|-**\ **-nonoverwrite**\ 
- 
+
+\ **-w|-**\ **-nonoverwrite**\
+
  Complain and exit if the os disc has already been copied in. By default, \ **copycds**\  will overwrite the os disc already copied in.
- 
+
 
 
 
@@ -98,74 +98,74 @@ EXAMPLES
 
 
 1. To copy the RPMs from a set of ISOs that represent the DVDs of a distro:
- 
- 
+
+
  .. code-block:: perl
- 
+
    copycds dvd1.iso dvd2.iso
- 
- 
+
+
 
 
 2. To copy the RPMs from a physical DVD to /depot/kits/3 directory:
- 
- 
+
+
  .. code-block:: perl
- 
+
    copycds -p /depot/kits/3 /dev/dvd
- 
- 
+
+
 
 
 3. To copy the RPMs from a DVD ISO of a very recently released distro:
- 
- 
+
+
  .. code-block:: perl
- 
+
    copycds -n rhels6.4 -a x86_64 dvd.iso
- 
- 
+
+
 
 
 4. To check whether a DVD ISO can be recognized by xCAT and display the recognized disc info:
- 
- 
+
+
  .. code-block:: perl
- 
+
    copycds -i /media/RHEL/6.2/RHEL6.2-20111117.0-Server-ppc64-DVD1.iso
- 
- 
+
+
  Output will be similar to:
- 
- 
+
+
  .. code-block:: perl
- 
+
     OS Image:/media/RHEL/6.2/RHEL6.2-20111117.0-Server-ppc64-DVD1.iso
     DISTNAME:rhels6.2
     ARCH:ppc64
     DISCNO:1
- 
- 
+
+
  For the attributes that are not recognized, the value will be blank.
- 
+
 
 
 5. To copy the packages from a supplemental DVD ISO file:
- 
- 
+
+
  .. code-block:: perl
- 
+
    copycds /isodir/RHEL6.5/RHEL6.5-Supplementary-20131114.2-Server-ppc64-DVD1.iso -n rhels6.5-supp
- 
- 
+
+
  Also, remember to add the new directory to your osimage definition:
- 
- 
+
+
  .. code-block:: perl
- 
+
    chdef -t osimage myosimage -p pkgdir=/install/rhels6.5-supp/ppc64
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man8/makeconservercf.8.rst b/docs/source/guides/admin-guides/references/man8/makeconservercf.8.rst
index 249be78f4..c112313e2 100644
--- a/docs/source/guides/admin-guides/references/man8/makeconservercf.8.rst
+++ b/docs/source/guides/admin-guides/references/man8/makeconservercf.8.rst
@@ -116,11 +116,11 @@ RETURN VALUE
 
 
 
-0.  The command completed successfully.
+0. The command completed successfully.
 
 
 
-1.  An error has occurred.
+1. An error has occurred.
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man8/makedhcp.8.rst b/docs/source/guides/admin-guides/references/man8/makedhcp.8.rst
index 647f422de..ee3a581d5 100644
--- a/docs/source/guides/admin-guides/references/man8/makedhcp.8.rst
+++ b/docs/source/guides/admin-guides/references/man8/makedhcp.8.rst
@@ -29,9 +29,9 @@ SYNOPSIS
 
 \ **makedhcp**\  \ *noderange*\  [\ **-s**\  \ *statements*\ ] [\ **-l | -**\ **-localonly**\ ]
 
-\ **makedhcp**\  \ **-q**\  \ *noderange*\ 
+\ **makedhcp**\  \ **-q**\  \ *noderange*\
 
-\ **makedhcp**\  \ **[-h|-**\ **-help]**\ 
+\ **makedhcp**\  \ **[-h|-**\ **-help]**\
 
 
 ***********
@@ -39,35 +39,35 @@ DESCRIPTION
 ***********
 
 
-The \ **makedhcp**\  command creates and updates the DHCP configuration on the management node and service nodes. 
+The \ **makedhcp**\  command creates and updates the DHCP configuration on the management node and service nodes.
 The \ **makedhcp**\  command is supported for both Linux and AIX clusters.
 
 
 1.
- 
+
  Start by filling out the networks(5)|networks.5 table properly.
- 
+
 
 
 2.
- 
+
  Then use the \ **makedhcp -n**\  option to create a new dhcp configuration file.
  You can set the site table, dhcplease attribute to the lease time for the dhcp client. The default value is 43200.
- 
+
 
 
 3.
- 
+
  Next, get the node IP addresses and MACs defined in the xCAT database.
  Also, get the hostnames and IP addresses pushed to /etc/hosts (using makehosts(8)|makehosts.8) and to DNS (using makedns(8)|makedns.8).
- 
+
 
 
 4.
- 
+
  Then run \ **makedhcp**\  with a noderange or the \ **-a**\  option.  This will inject into dhcpd configuration data pertinent to the specified nodes.
  On linux, the configuration information immediately takes effect without a restart of DHCP.
- 
+
 
 
 If you need to delete node entries from the DHCP configuration, use the \ **-d**\  flag.
@@ -79,8 +79,8 @@ OPTIONS
 
 
 
-\ **-n**\ 
- 
+\ **-n**\
+
  Create a new dhcp configuration file with a network statement for each network the dhcp daemon should listen on.
  (Which networks dhcpd should listen on can be controlled by the dhcpinterfaces attribute in the site(5)|site.5 table.)
  The \ **makedhcp**\  command will automatically restart the dhcp daemon after this operation.
@@ -88,58 +88,58 @@ OPTIONS
  For Linux systems the file will include network entries as well as certain general parameters such as a dynamic range and omapi configuration.
  For AIX systems the file will include network entries.
  On AIX systems, if there are any non-xCAT entries in the existing configuration file they will be preserved and added to the end of the new configuration file.
- 
 
 
-\ **-a**\ 
- 
+
+\ **-a**\
+
  Define all nodes to the DHCP server.  (Will only add nodes that can be reached, network-wise, by this DHCP server.)
  The dhcp daemon does not have to be restarted after this.
  On AIX systems \ **makedhcp**\  will not add entries for cluster nodes that will be installed using NIM.  The entries for these nodes will be managed by NIM.
- 
 
 
-\ *noderange*\ 
- 
+
+\ *noderange*\
+
  Add the specified nodes to the DHCP server configuration.
- 
 
 
-\ **-s**\  \ *statements*\ 
- 
+
+\ **-s**\  \ *statements*\
+
  For the input noderange, the argument will be interpreted like dhcp configuration file text.
- 
 
 
-\ **-d**\  \ *noderange*\ 
- 
+
+\ **-d**\  \ *noderange*\
+
  Delete node entries from the DHCP server configuration. On AIX, any entries created by NIM will not be removed.
- 
 
 
-\ **-a -d**\ 
- 
+
+\ **-a -d**\
+
  Delete all node entries, that were added by xCAT, from the DHCP server configuration.
- 
 
 
-\ **-l | -**\ **-localonly**\ 
- 
+
+\ **-l | -**\ **-localonly**\
+
  Configure dhcpd on the local machine only.  Without this option, makedhcp will also send this
  operation to any service nodes that service the nodes in the noderange.
- 
 
 
-\ **-q**\  \ *noderange*\ 
- 
+
+\ **-q**\  \ *noderange*\
+
  Query the node entries from the DHCP server configuration. On AIX, any entries created by NIM will not be listed.
- 
 
 
-\ **-h|-**\ **-help**\ 
- 
+
+\ **-h|-**\ **-help**\
+
  Display usage message.
- 
+
 
 
 
@@ -165,46 +165,46 @@ EXAMPLES
 
 
 1. Create a new DHCP configuration file and add the network definitions:
- 
- 
+
+
  .. code-block:: perl
- 
+
    makedhcp -n
- 
- 
+
+
 
 
 2. Define all nodes to the dhcp server:
- 
- 
+
+
  .. code-block:: perl
- 
+
    makedhcp -a
- 
- 
+
+
  Note:  This does not add nodes that will be installed with AIX/NIM.
- 
+
 
 
 3. Will cause dhcp on the next request to set root-path appropriately for only node5.  Note some characters (e.g. ") must be doubly escaped (once for the shell, and once for the OMAPI layer).
- 
- 
+
+
  .. code-block:: perl
- 
+
    makedhcp node5 -s 'option root-path  \"172.16.0.1:/install/freebsd6.2/x86_64\";'
- 
- 
+
+
 
 
 4. Query a node from the DHCP server.
- 
- 
+
+
  .. code-block:: perl
- 
-   # makedhcp -q node01 
+
+   # makedhcp -q node01
    node01: ip-address = 91.214.34.156, hardware-address = 00:00:c9:c6:6c:42
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man8/makedns.8.rst b/docs/source/guides/admin-guides/references/man8/makedns.8.rst
index a97c1401a..961a13037 100644
--- a/docs/source/guides/admin-guides/references/man8/makedns.8.rst
+++ b/docs/source/guides/admin-guides/references/man8/makedns.8.rst
@@ -59,36 +59,36 @@ OPTIONS
 
 
 
-\ **-V | -**\ **-verbose**\ 
- 
+\ **-V | -**\ **-verbose**\
+
  Verbose mode.
- 
 
 
-\ **-n | -**\ **-new**\ 
- 
+
+\ **-n | -**\ **-new**\
+
  Use this flag to create new named configuration and db files.
- 
 
 
-\ **-d | -**\ **-delete**\ 
- 
+
+\ **-d | -**\ **-delete**\
+
  Remove the DNS records.
- 
 
 
-\ **-e | -**\ **-external**\ 
- 
+
+\ **-e | -**\ **-external**\
+
  Update DNS records to the external DNS server listed in /etc/resolv.conf.
- 
+
  Enabling the site attribute \ *externaldns*\  means use 'external' DNS by default. If setting \ *externaldns*\  to 1, you need NOT use \ **-e**\  flag in every makedns call.
- 
 
 
-\ **noderange**\ 
- 
+
+\ **noderange**\
+
  A set of comma delimited node names and/or group names. See the "noderange" man page for details on additional supported formats.
- 
+
 
 
 
@@ -99,43 +99,43 @@ Examples
 
 
 1. To set up DNS for all the hosts in /etc/hosts file.
- 
- 
+
+
  .. code-block:: perl
- 
+
    makedns
- 
- 
+
+
 
 
 2. To set up DNS for \ *node1*\ .
- 
- 
+
+
  .. code-block:: perl
- 
+
    makedns node1
- 
- 
+
+
 
 
 3. To create a new named configuration and db files for all hosts in /etc/hosts.
- 
- 
+
+
  .. code-block:: perl
- 
+
    makedns -n
- 
- 
+
+
 
 
 4. To delete the DNS records for \ *node1*\ .
- 
- 
+
+
  .. code-block:: perl
- 
+
    makedns -d node1
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man8/makegocons.8.rst b/docs/source/guides/admin-guides/references/man8/makegocons.8.rst
index 31daffabd..2ba2fe660 100644
--- a/docs/source/guides/admin-guides/references/man8/makegocons.8.rst
+++ b/docs/source/guides/admin-guides/references/man8/makegocons.8.rst
@@ -49,7 +49,7 @@ which nodes will have their consoles accessed from the management node and which
 To start goconserver on the specified service node, setup goconserver package on that service node, then set
 the \ **console**\  column of \ **servicenode**\  table to \ **2**\ .
 
-To support diskless service node, a new column \ **consoleenabled**\  has been added in \ **nodehm**\  table, it is used by \ **makegocons**\ 
+To support diskless service node, a new column \ **consoleenabled**\  has been added in \ **nodehm**\  table, it is used by \ **makegocons**\
 command to save the current console state for the node. After reinstalling the service node, the console storage file which maintain
 the console nodes by goconserver is lost, xCAT would register the console nodes into goconserver based on \ **consoleenabled**\  attribute
 when restarting xcatd service.
@@ -66,40 +66,40 @@ OPTIONS
 
 
 
-\ **-d|-**\ **-delete**\ 
- 
+\ **-d|-**\ **-delete**\
+
  Delete rather than add or refresh the nodes specified as a noderange.
- 
 
 
-\ **-C|-**\ **-cleanup**\ 
- 
+
+\ **-C|-**\ **-cleanup**\
+
  Remove the entries for the nodes whose definitions have been removed from xCAT db.
- 
 
 
-\ **-q|-**\ **-query**\ 
- 
+
+\ **-q|-**\ **-query**\
+
  List the console connection of the nodes. If noderange is not specified, all of the console nodes will be displayed.
- 
 
 
-\ **-v|-**\ **-version**\ 
- 
+
+\ **-v|-**\ **-version**\
+
  Display version.
- 
 
 
-\ **-V|-**\ **-verbose**\ 
- 
+
+\ **-V|-**\ **-verbose**\
+
  Verbose mode.
- 
 
 
-\ **-h|-**\ **-help**\ 
- 
+
+\ **-h|-**\ **-help**\
+
  Display usage message.
- 
+
 
 
 
@@ -125,43 +125,43 @@ EXAMPLES
 
 
 1. To create goconserver configuration for all the nodes.
- 
- 
+
+
  .. code-block:: perl
- 
+
    makegocons
- 
- 
+
+
 
 
 2. To create goconserver configuration for nodes node01-node10.
- 
- 
+
+
  .. code-block:: perl
- 
+
    makegocons node01-node10
- 
- 
+
+
 
 
 3. To remove goconserver configuration for node01.
- 
- 
+
+
  .. code-block:: perl
- 
+
    makegocons -d node01
- 
- 
+
+
 
 
 4. To list console connection for node01.
- 
- 
+
+
  .. code-block:: perl
- 
+
    makegocons -q node01
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man8/makehosts.8.rst b/docs/source/guides/admin-guides/references/man8/makehosts.8.rst
index c2e10b28a..377da28ff 100644
--- a/docs/source/guides/admin-guides/references/man8/makehosts.8.rst
+++ b/docs/source/guides/admin-guides/references/man8/makehosts.8.rst
@@ -29,7 +29,7 @@ DESCRIPTION
 ***********
 
 
-\ **makehosts**\  updates the /etc/hosts file based on information stored in the 
+\ **makehosts**\  updates the /etc/hosts file based on information stored in the
 xCAT database object definitions.
 
 The main three bits of information needed are: node hostname, node ip and network domain name.
@@ -49,32 +49,32 @@ OPTIONS
 
 
 
-\ **-n**\ 
- 
+\ **-n**\
+
  Completely replace the /etc/hosts file, losing any previous content.  If this option is not specified,
  it will only replace the lines in the file that correspond to the nodes in the specified noderange.
- 
 
 
-\ **-l | -**\ **-longnamefirst**\ 
- 
+
+\ **-l | -**\ **-longnamefirst**\
+
  The FQDN (Fully Qualified Domain Name) of the host will appear before the PQDN (Partially Qualified Domain Name) for each host in the /etc/hosts file.
  The default is PQDN first.
  After xCAT is installed, the attribute name "FQDNfirst" can be added into "site" table manually.  If the value is set as "1", "yes" or "enable", the /etc/hosts entries generated by "makehosts" will put the FQDN before the PQDN.  Otherwise, the original behavior will be performed.
- 
 
 
-\ **-m | -**\ **-mactolinklocal**\ 
- 
+
+\ **-m | -**\ **-mactolinklocal**\
+
  Updates /etc/hosts file with IPv6 link local addresses, the link local address is generated 
  from the mac address stored in mac table.
- 
 
 
-\ **-d**\ 
- 
+
+\ **-d**\
+
  Delete rather than create records. This will also delete any additional network interfaces (NICs) included in the node definitions.
- 
+
 
 
 
@@ -85,26 +85,26 @@ EXAMPLES
 
 
 1. Add entries to /etc/hosts for all nodes included in the xCAT node group called "compute".
- 
- 
+
+
  .. code-block:: perl
- 
+
     makehosts compute
- 
- 
+
+
 
 
 2.
 If the xCAT hosts table contains:
- 
- 
+
+
  .. code-block:: perl
- 
+
     "compute","|node(\d+)|1.2.3.($1+0)|","|(.*)|($1).cluster.net|",,
- 
- 
+
+
  Assuming the group "compute" contains node01, node02, etc., then in /etc/hosts they will be given
  IP addresses of 1.2.3.1, 1.2.3.2, etc.
- 
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man8/makeknownhosts.8.rst b/docs/source/guides/admin-guides/references/man8/makeknownhosts.8.rst
index fe31b65ad..b82da98f3 100644
--- a/docs/source/guides/admin-guides/references/man8/makeknownhosts.8.rst
+++ b/docs/source/guides/admin-guides/references/man8/makeknownhosts.8.rst
@@ -46,29 +46,29 @@ OPTIONS
 
 
 
-\ *noderange*\ 
- 
+\ *noderange*\
+
  A set of comma delimited node names and/or group names.
  See the \ *noderange*\  man page for details on supported formats.
- 
 
 
-\ **-d|-**\ **-delete**\ 
- 
+
+\ **-d|-**\ **-delete**\
+
  Only removes the entries for the nodes from the known_hosts file.
- 
 
 
-\ **-r|-**\ **-remove**\ 
- 
+
+\ **-r|-**\ **-remove**\
+
  Synonymous to \ **-d|-**\ **-delete**\ .
- 
 
 
-\ **-V|-**\ **-verbose**\ 
- 
+
+\ **-V|-**\ **-verbose**\
+
  Verbose mode.
- 
+
 
 
 
@@ -79,32 +79,32 @@ EXAMPLES
 
 
 1.
 To build the known_hosts entry for the nodes in the compute group
- 
- 
+
+
  .. code-block:: perl
- 
+
    makeknownhosts compute
- 
- 
+
+
 
 
 2.
 To build the known_hosts entry for the nodes in the lpars and service groups
- 
- 
+
+
  .. code-block:: perl
- 
+
    makeknownhosts lpars,service
- 
- 
+
+
 
 
 3.
 To remove the known_hosts entry for node02
- 
- 
+
+
  .. code-block:: perl
- 
+
    makeknownhosts node02 -d
- 
- 
+
+
 
 
diff --git a/docs/source/guides/admin-guides/references/man8/makenetworks.8.rst b/docs/source/guides/admin-guides/references/man8/makenetworks.8.rst
index aa78cdc5b..99f296e05 100644
--- a/docs/source/guides/admin-guides/references/man8/makenetworks.8.rst
+++ b/docs/source/guides/admin-guides/references/man8/makenetworks.8.rst
@@ -47,7 +47,7 @@ For example:
 .. code-block:: perl
 
  	makenetworks -d > mynetstanzas
- 
+
  	cat mynetstanzas | mkdef -z
 
 
@@ -104,31 +104,31 @@ EXAMPLES
 
 
 1. Gather cluster network information and create xCAT network definitions.
- 
- 
+
+
  .. code-block:: perl
- 
+
   	makenetworks
- 
- 
+
+
 
 
 2. Display cluster network information but do not write the network definitions to the xCAT database.
- 
- 
+
+
  .. code-block:: perl
- 
+
   	makenetworks -d
- 
- 
+
+
  The output would be one or more stanzas of information similar to the following. The line that ends with a colon is the value of the "netname" attribute and is the name of the network object to use with the lsdef, mkdef, chdef and rmdef commands.
- 
+
  9_114_37_0-255_255_255_0:
      objtype=network
      gateway=9.114.37.254
      mask=255.255.255.0
      net=9.114.37.0
- 
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man8/makeroutes.8.rst b/docs/source/guides/admin-guides/references/man8/makeroutes.8.rst
index 1bb33dd5c..c369fa26b 100644
--- a/docs/source/guides/admin-guides/references/man8/makeroutes.8.rst
+++ b/docs/source/guides/admin-guides/references/man8/makeroutes.8.rst
@@ -54,28 +54,28 @@ OPTIONS
 
 
 
-\ **-d|-**\ **-delete**\ 
- 
+\ **-d|-**\ **-delete**\
+
  Specifies to delete the given routes. If not specified, the action is to add routes.
- 
 
 
-\ **-r|-**\ **-routename**\ 
- 
+
+\ **-r|-**\ **-routename**\
+
  Specifies a list of comma separated route names defined in the \ **routes**\  table. If omitted, all routes defined in \ **noderes.routenames**\  for nodes or \ **site.mnroutenames**\  for the management node will be used.
- 
 
 
-\ **-h|-**\ **-help**\ 
- 
+
+\ **-h|-**\ **-help**\
+
  Display usage message.
- 
 
 
-\ **-v|-**\ **-version**\ 
- 
+
+\ **-v|-**\ **-version**\
+
  Command Version.
- 
+
 
 
 
@@ -86,43 +86,43 @@ EXAMPLES
 
 
 1. To add all routes from the \ **site.mnroutenames**\  to the os route table for the management node.
- 
- 
+
+
  .. code-block:: perl
- 
+
    makeroutes
- 
- 
+
+
 
 
 2. To add all the routes from \ **noderes.routenames**\  to the os route table for node1.
- 
- 
+
+
  .. code-block:: perl
- 
+
    makeroutes node1
- 
- 
+
+
 
 
 3. To add route rr1 and rr2 to the os route table for the management node.
- 
- 
+
+
  .. code-block:: perl
- 
+
    makeroutes -r rr1,rr2
- 
- 
+
+
 
 
 4. To delete route rr1 and rr2 from the os route table on node1 and node1.
- 
- 
+
+
  .. code-block:: perl
- 
+
    makeroutes node1,node2 -d -r rr1,rr2
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man8/mknb.8.rst b/docs/source/guides/admin-guides/references/man8/mknb.8.rst
index 119a369ef..174e140a8 100644
--- a/docs/source/guides/admin-guides/references/man8/mknb.8.rst
+++ b/docs/source/guides/admin-guides/references/man8/mknb.8.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **mknb**\  \ *arch*\ 
+\ **mknb**\  \ *arch*\
 
 
 ***********
@@ -29,7 +29,7 @@ DESCRIPTION
 
 The \ **mknb**\  command is run by xCAT automatically when xCAT is installed on the management node.
 It creates a network boot root image (used for node discovery, BMC programming, and flashing)
-for the same architecture that the management node is.  So you normally do not need to run the 
+for the same architecture that the management node is.  So you normally do not need to run the
 \ **mknb**\  command yourself.
 
 If you make custom changes to the network boot root image, you will need to run \ **mknb**\  again to regenerate the diskless image to include your changes.  If you have an xCAT Hierarchical Cluster with Service Nodes having local /tftpboot directories (site.sharedtftp=0), you will need to copy the generated root image to each Service Node.
@@ -43,10 +43,10 @@ OPTIONS
 
 
 
-\ *arch*\ 
- 
+\ *arch*\
+
  The hardware architecture for which to build the boot image.
- 
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man8/nodeadd.8.rst b/docs/source/guides/admin-guides/references/man8/nodeadd.8.rst
index aa956530e..9a92b2edc 100644
--- a/docs/source/guides/admin-guides/references/man8/nodeadd.8.rst
+++ b/docs/source/guides/admin-guides/references/man8/nodeadd.8.rst
@@ -47,16 +47,16 @@ OPTIONS
 
 
 
-\ **-v|-**\ **-version**\ 
- 
+\ **-v|-**\ **-version**\
+
  Command Version.
- 
 
 
-\ **-?|-h|-**\ **-help**\ 
- 
+
+\ **-?|-h|-**\ **-help**\
+
  Display usage message.
- 
+
 
 
 
@@ -82,23 +82,23 @@ EXAMPLES
 
 
 1. To add nodes in noderange  node1-node4 with group all:
- 
- 
+
+
  .. code-block:: perl
- 
+
    nodeadd node1-node4 groups=all
- 
- 
+
+
 
 
 2. To add nodes in noderange  node1-node4 to the nodetype table with os=rhel5:
- 
- 
+
+
  .. code-block:: perl
- 
+
    nodeadd node1-node4 groups=all,rhel5 nodetype.os=rhel5
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man8/nodeset.8.rst b/docs/source/guides/admin-guides/references/man8/nodeset.8.rst
index aeb8275c6..e09d07592 100644
--- a/docs/source/guides/admin-guides/references/man8/nodeset.8.rst
+++ b/docs/source/guides/admin-guides/references/man8/nodeset.8.rst
@@ -15,21 +15,21 @@ Name
 
 
 ****************
-\ **Synopsis**\ 
+\ **Synopsis**\
 ****************
 
 
-\ **nodeset**\  \ *noderange*\  [\ **boot**\  | \ **stat**\  [\ **-a**\ ]| \ **offline**\  | \ **runcmd=bmcsetup**\  | \ **osimage**\ [=\ *imagename*\ ] | \ **shell**\  | \ **shutdown**\ ] [\ **-V | -**\ **-verbose**\ ]
+\ **nodeset**\  \ *noderange*\  [\ **boot**\  | \ **stat**\  [\ **-a**\ ]| \ **offline**\  | \ **runcmd=**\ \ *command*\  | \ **osimage**\ [=\ *imagename*\ ] | \ **shell**\  | \ **shutdown**\ ] [\ **-V | -**\ **-verbose**\ ]
 
 \ **nodeset**\  \ *noderange*\  \ **osimage**\ [=\ *imagename*\ ] [\ **-**\ **-noupdateinitrd**\ ] [\ **-**\ **-ignorekernelchk**\ ]
 
-\ **nodeset**\  \ *noderange*\  \ **runimage=**\ \ *task*\ 
+\ **nodeset**\  \ *noderange*\  \ **runimage=**\ \ *task*\
 
 \ **nodeset**\  [\ **-h | -**\ **-help | -v | -**\ **-version**\ ]
 
 
 *******************
-\ **Description**\ 
+\ **Description**\
 *******************
 
 
@@ -65,95 +65,94 @@ A user can supply their own scripts to be run on the mn or on the service node (
 
 
 ***************
-\ **Options**\ 
+\ **Options**\
 ***************
 
 
 
-\ **boot**\ 
- 
+\ **boot**\
+
  Instruct network boot loader to be skipped, generally meaning boot to hard disk
- 
 
 
-\ **offline**\ 
- 
+
+\ **offline**\
+
  Cleanup the current pxe/tftp boot configuration files for the nodes requested
- 
 
 
-\ **osimage | osimage=**\ \ *imagename*\ 
- 
+
+\ **osimage | osimage=**\ \ *imagename*\
+
  Prepare server for installing a node using the specified os image. The os image is defined in the \ *osimage*\  table and \ *linuximage*\  table. If the <imagename> is omitted, the os image name will be obtained from \ *nodetype.provmethod*\  for the node.
- 
 
 
-\ **-**\ **-noupdateinitrd**\ 
- 
- Skip the rebuilding of initrd when the 'netdrivers', 'drvierupdatesrc' or 'osupdatename' were set for injecting new drivers to initrd. But, the \ **geninitrd**\  command
+
+\ **-**\ **-noupdateinitrd**\
+
+ Skip the rebuilding of initrd when the 'netdrivers', 'driverupdatesrc' or 'osupdatename' were set for injecting new drivers to initrd. But, the \ **geninitrd**\  command
  should be run to rebuild the initrd for new drivers injecting. This is used to improve the performance of \ **nodeset**\  command.
- 
 
 
-\ **-**\ **-ignorekernelchk**\ 
- 
+
+\ **-**\ **-ignorekernelchk**\
+
  Skip the kernel version checking when injecting drivers from osimage.driverupdatesrc. That means all drivers from osimage.driverupdatesrc will be injected to initrd for the specific target kernel.
- 
 
 
-\ **runimage**\ =\ *task*\ 
- 
+
+\ **runimage**\ =\ *task*\
+
  If you would like to run a task after deployment, you can define that task with this attribute.
- 
 
 
-\ **stat**\ 
- 
+
+\ **stat**\
+
  Display the current boot loader config file description for the nodes requested. When \ **disjointdhcps**\  is set, using \ **-a**\  to display them on all available service nodes.
- 
 
 
-\ **runcmd=bmcsetup**\ 
- 
- This instructs the node to boot to the xCAT nbfs environment and proceed to configure BMC
- for basic remote access.  This causes the IP, netmask, gateway, username, and password to be programmed according to the configuration table.
- 
+
+\ **runcmd=**\ \ *command*\
+
+ This instructs the node to boot to the xCAT genesis environment and specified command to be executed.
 
 
-\ **shell**\ 
- 
+
+\ **shell**\
+
  This instructs the node to boot to the xCAT genesis environment, and present a shell prompt on console.
  The node will also be able to be sshed into and have utilities such as wget, tftp, scp, nfs, and cifs.  It will have storage drivers available for many common systems.
- 
 
 
-\ **shutdown**\ 
- 
+
+\ **shutdown**\
+
  To make the node to get into power off status. This status only can be used after \ **runcmd**\  and \ **runimage**\  to power off the node after the performing of operations.
- 
 
 
-\ **-V | -**\ **-verbose**\ 
- 
+
+\ **-V | -**\ **-verbose**\
+
  Verbose mode.
- 
 
 
-\ **-h | -**\ **-help**\ 
- 
+
+\ **-h | -**\ **-help**\
+
  Print help.
- 
 
 
-\ **-v | -**\ **-version**\ 
- 
+
+\ **-v | -**\ **-version**\
+
  Print version.
- 
+
 
 
 
 *************
-\ **Files**\ 
+\ **Files**\
 *************
 
 
@@ -174,34 +173,44 @@ root directory and the TFTP xCAT  subdirectory.   /tftpboot  and
 
 
 ****************
-\ **Examples**\ 
+\ **Examples**\
 ****************
 
 
 
 1. To setup to install mycomputeimage on the compute node group.
- 
- 
+
+
  .. code-block:: perl
- 
+
    nodeset compute osimage=mycomputeimage
- 
- 
+
+
 
 
 2. To run http://$master/image.tgz  after deployment:
- 
- 
+
+
  .. code-block:: perl
- 
+
    nodeset $node runimage=http://$MASTER/image.tgz
- 
- 
+
+
+
+
+3. Boot node1 into xCAT genesis environment and execute bmcsetup script. This causes the IP, netmask, gateway, username, and password to be programmed according to the configuration in node object definition.
+
+
+ .. code-block:: perl
+
+   rinstall node1 runcmd=bmcsetup
+
+
 
 
 
 ************************
-\ **See**\  \ **Also**\ 
+\ **See**\  \ **Also**\
 ************************
 
 
diff --git a/docs/source/guides/admin-guides/references/man8/rescanplugins.8.rst b/docs/source/guides/admin-guides/references/man8/rescanplugins.8.rst
index 6de8cd178..91badc206 100644
--- a/docs/source/guides/admin-guides/references/man8/rescanplugins.8.rst
+++ b/docs/source/guides/admin-guides/references/man8/rescanplugins.8.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **rescanplugins**\ 
+\ **rescanplugins**\
 
 \ **rescanplugins**\  [\ **-h | -**\ **-help**\ ]
 
@@ -44,22 +44,22 @@ OPTIONS
 
 
 
-\ **-h|-**\ **-help**\ 
- 
+\ **-h|-**\ **-help**\
+
  Displays the usage message.
- 
 
 
-\ **-v|-**\ **-version**\ 
- 
+
+\ **-v|-**\ **-version**\
+
  Displays the release version of the code.
- 
 
 
-\ **-s|-**\ **-servicenodes**\ 
- 
+
+\ **-s|-**\ **-servicenodes**\
+
  Process the rescanplugins on the management node and on all service nodes.  The rescanplugins command will be sent to the xcatd daemon on all nodes defined in the servicenode table.  The default is to only run on the management node.
- 
+
 
 
 
@@ -70,22 +70,22 @@ EXAMPLES
 
 
 1.
 To rescan the plugins only on the xCAT Management Node:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rescanplugins
- 
- 
+
+
 
 
 2.
 To rescan the plugins on the xCAT Management Node and on all service nodes:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rescanplugins -s
- 
- 
+
+
 
 
diff --git a/docs/source/guides/admin-guides/references/man8/rinstall.8.rst b/docs/source/guides/admin-guides/references/man8/rinstall.8.rst
index f33d0144c..c0923a4f3 100644
--- a/docs/source/guides/admin-guides/references/man8/rinstall.8.rst
+++ b/docs/source/guides/admin-guides/references/man8/rinstall.8.rst
@@ -15,142 +15,158 @@ Name
 
 
 ****************
-\ **Synopsis**\ 
+\ **Synopsis**\
 ****************
 
 
-\ **rinstall**\  \ *noderange*\  [\ **boot**\  | \ **shell**\  | \ **runcmd=bmcsetup**\ ] [\ **runimage=**\ \ *task*\ ] [\ **-c | -**\ **-console**\ ] [\ **-V | -**\ **-verbose**\ ]
+\ **rinstall**\  \ *noderange*\  [\ **boot**\  | \ **shell**\  | \ **runcmd=**\ \ *command*\ ] [\ **-c | -**\ **-console**\ ] [\ **-V | -**\ **-verbose**\ ]
 
-\ **rinstall**\  \ *noderange*\  [\ **osimage**\ =\ *imagename*\  | \ *imagename*\ ] [\ **-**\ **-ignorekernelchk**\ ] [\ **-c | -**\ **-console**\ ] [\ **-u | -**\ **-uefimode**\ ] [\ **-V | -**\ **-verbose**\ ]
+\ **rinstall**\  \ *noderange*\  \ **osimage**\ [=\ *imagename*\ ] [\ **-**\ **-noupdateinitrd**\ ][\ **-**\ **-ignorekernelchk**\ ] [\ **-c | -**\ **-console**\ ] [\ **-u | -**\ **-uefimode**\ ] [\ **-V | -**\ **-verbose**\ ]
+
+\ **rinstall**\  \ *noderange*\  \ **runimage=**\ \ *task*\
 
 \ **rinstall**\  [\ **-h | -**\ **-help | -v | -**\ **-version**\ ]
 
 
 *******************
-\ **Description**\ 
+\ **Description**\
 *******************
 
 
 \ **rinstall**\  is a convenience command to begin OS provision on a noderange.
 
-If \ **osimage**\ =\ *imagename*\  | \ *imagename*\  is specified or nodetype.provmethod=\ **osimage**\  is set, provision the noderange with the osimage specified/configured.
+If \ **osimage**\ =\ *imagename*\  is specified or \ **osimage**\  is specified and nodetype.provmethod=\ **osimage**\  is set, provision the noderange with the osimage specified/configured.
 
-If \ **-c**\  is specified, it will then run rcons on the node. This is allowed only if one node in the noderange. If need consoles on multiple nodes, see winstall(8)|winstall.8.
+If \ **-c**\  is specified, it will then run \ **rcons**\  on the node. This is allowed only if one node is in the noderange. If consoles are needed on multiple nodes, see winstall(8)|winstall.8.
 
 
 ***************
-\ **Options**\ 
+\ **Options**\
 ***************
 
 
 
-\ **boot**\ 
- 
+\ **boot**\
+
  Instruct network boot loader to be skipped, generally meaning boot to hard disk
- 
 
 
-\ *imagename*\  | \ **osimage=**\ \ *imagename*\ 
- 
- Prepare server for installing a node using the specified os image. The os image is defined in the \ *osimage*\  table and \ *linuximage*\  table. If the \ *imagename*\  is omitted, the os image name will be obtained from \ *nodetype.provmethod*\  for the node.
- 
+
+\ **osimage**\ [=\ *imagename*\ ]
+
+ Prepare server for installing a node using the specified OS image. The OS image is defined in the \ *osimage*\  table and \ *linuximage*\  table. If the \ *imagename*\  is omitted, the OS image name will be obtained from \ *nodetype.provmethod*\  for the node.
 
 
-\ **-**\ **-ignorekernelchk**\ 
- 
+
+\ **-**\ **-noupdateinitrd**\  Skip the rebuilding of initrd when the 'netdrivers', 'driverupdatesrc' or 'osupdatename' were set for injecting new drivers to initrd. But, the \ **geninitrd**\  command should be run to rebuild the initrd for new drivers injecting. This is used to improve the performance of \ **rinstall**\  command.
+
+
+
+\ **-**\ **-ignorekernelchk**\
+
  Skip the kernel version checking when injecting drivers from osimage.driverupdatesrc. That means all drivers from osimage.driverupdatesrc will be injected to initrd for the specific target kernel.
- 
 
 
-\ **runimage=**\ \ *task*\ 
- 
+
+\ **runimage=**\ \ *task*\
+
  If you would like to run a task after deployment, you can define that task with this attribute.
- 
 
 
-\ **runcmd=bmcsetup**\ 
- 
- This instructs the node to boot to the xCAT nbfs environment and proceed to configure BMC for basic remote access.  This causes the IP, netmask, gateway, username, and password to be programmed according to the configuration table.
- 
+
+\ **runcmd=**\ \ *command*\
+
+ This instructs the node to boot to the xCAT genesis environment and specified command to be executed.
 
 
-\ **shell**\ 
- 
+
+\ **shell**\
+
  This instructs the node to boot to the xCAT genesis environment, and present a shell prompt on console.
  The node will also be able to be sshed into and have utilities such as wget, tftp, scp, nfs, and cifs.  It will have storage drivers available for many common systems.
- 
 
 
-\ **-h | -**\ **-help**\ 
- 
+
+\ **-h | -**\ **-help**\
+
  Display usage message.
- 
 
 
-\ **-v | -**\ **-version**\ 
- 
+
+\ **-v | -**\ **-version**\
+
  Display version.
- 
 
 
-\ **-u | -**\ **-uefimode**\ 
- 
+
+\ **-u | -**\ **-uefimode**\
+
  For BMC-based servers, to specify the next boot mode to be "UEFI Mode".
- 
 
 
-\ **-V | -**\ **-verbose**\ 
- 
+
+\ **-V | -**\ **-verbose**\
+
  Verbose output.
- 
 
 
-\ **-c | -**\ **-console**\ 
- 
- Requests that rinstall runs rcons once the provision starts.  This will only work if there is only one node in the noderange. See winstall(8)|winstall.8 for starting consoles on multiple nodes.
- 
+
+\ **-c | -**\ **-console**\
+
+ Requests that \ **rinstall**\  runs \ **rcons**\  once the provision starts.  This will only work if there is only one node in the noderange. See winstall(8)|winstall.8 for starting consoles on multiple nodes.
+
 
 
 
 ****************
-\ **Examples**\ 
+\ **Examples**\
 ****************
 
 
 
 1. Provision nodes 1 through 20, using their current configuration.
- 
- 
+
+
  .. code-block:: perl
- 
+
    rinstall node1-node20
- 
- 
+
+
 
 
 2. Provision nodes 1 through 20 with the osimage rhels6.4-ppc64-netboot-compute.
- 
- 
+
+
  .. code-block:: perl
- 
+
    rinstall node1-node20 osimage=rhels6.4-ppc64-netboot-compute
- 
- 
+
+
 
 
 3. Provision node1 and start a console to monitor the process.
- 
- 
+
+
  .. code-block:: perl
- 
+
    rinstall node1 -c
- 
- 
+
+
+
+
+4. Boot node1 into xCAT genesis environment and execute bmcsetup script. This causes the IP, netmask, gateway, username, and password to be programmed according to the configuration in node object definition.
+
+
+ .. code-block:: perl
+
+   rinstall node1 runcmd=bmcsetup
+
+
 
 
 
 ************************
-\ **See**\  \ **Also**\ 
+\ **See**\  \ **Also**\
 ************************
 
 
diff --git a/docs/source/guides/admin-guides/references/man8/rmosdistro.8.rst b/docs/source/guides/admin-guides/references/man8/rmosdistro.8.rst
index 261498552..51f8268b1 100644
--- a/docs/source/guides/admin-guides/references/man8/rmosdistro.8.rst
+++ b/docs/source/guides/admin-guides/references/man8/rmosdistro.8.rst
@@ -38,22 +38,22 @@ OPTIONS
 
 
 
-\ **-a | -**\ **-all**\ 
- 
+\ **-a | -**\ **-all**\
+
  If specified, try to delete all the OS Distros.
- 
 
 
-\ **-f | -**\ **-force**\ 
- 
+
+\ **-f | -**\ **-force**\
+
  Remove referenced OS Distros, never prompt.
- 
 
 
-\ **-h | -**\ **-help**\ 
- 
+
+\ **-h | -**\ **-help**\
+
  Show info of rmosdistro usage.
- 
+
 
 
 
@@ -62,7 +62,7 @@ RETURN VALUE
 ************
 
 
-Zero:                    
+Zero:
   The command completed successfully.
 
 Nonzero:
@@ -76,32 +76,32 @@ EXAMPLES
 
 
 1. To remove OS Distro "rhels6.2-ppc64" and "sles11.2-ppc64":
- 
- 
+
+
  .. code-block:: perl
- 
+
    rmosdistro rhels6.2-ppc64 sles11.2-ppc64
- 
- 
+
+
 
 
 2. To remove OS Distro "rhels6.2-ppc64", regardless of whether is referenced by any osimage:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rmosdistro -f rhels6.2-ppc64
- 
- 
+
+
 
 
 3. To remove all OS Distros:
- 
- 
+
+
  .. code-block:: perl
- 
+
    rmosdistro -a
- 
- 
+
+
 
 
diff --git a/docs/source/guides/admin-guides/references/man8/runsqlcmd.8.rst b/docs/source/guides/admin-guides/references/man8/runsqlcmd.8.rst
index 7f720347f..1f6790e4b 100644
--- a/docs/source/guides/admin-guides/references/man8/runsqlcmd.8.rst
+++ b/docs/source/guides/admin-guides/references/man8/runsqlcmd.8.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **runsqlcmd**\ 
+\ **runsqlcmd**\
 
 \ **runsqlcmd**\  [\ **-h | -**\ **-help**\ ]
 
@@ -37,7 +37,7 @@ DESCRIPTION
 ***********
 
 
-The runsqlcmd routine,  runs the sql statements contained in the \*.sql files as input to the command against the current running xCAT database. Only DB2,MySQL and PostgreSQL databases are supported.  SQLite is not supported.  
+The runsqlcmd routine,  runs the sql statements contained in the \*.sql files as input to the command against the current running xCAT database. Only DB2,MySQL and PostgreSQL databases are supported.  SQLite is not supported.
 If no directory or filelist is provided,  the default /opt/xcat/lib/perl/xCAT_schema directory is used.
 If the directory is input with the -d flag,  that directory will be used.
 If a comma separated list of files is input with the -f flag, those files will be used.
@@ -49,48 +49,48 @@ OPTIONS
 
 
 
-\ **-h|-**\ **-help**\ 
- 
+\ **-h|-**\ **-help**\
+
  Displays the usage message.
- 
 
 
-\ **-v|-**\ **-version**\ 
- 
+
+\ **-v|-**\ **-version**\
+
  Displays current code version.
- 
 
 
-\ **-V|-**\ **-verbose**\ 
- 
+
+\ **-V|-**\ **-verbose**\
+
  Displays extra debug information.
- 
 
 
-\ **-d|-**\ **-dir**\ 
- 
+
+\ **-d|-**\ **-dir**\
+
  To use a directory other than the default directory,  enter the directory path here.
- 
 
 
-\ **-f|-**\ **-files**\ 
- 
+
+\ **-f|-**\ **-files**\
+
  Comma separated list of files (full path), wildcard (\*) can be used.
- 
 
 
-\ **File format**\ 
- 
+
+\ **File format**\
+
  The files must be of the form <name>.sql or <name>_<database>.sql  where
- 
+
  <database>  is mysql,pgsql, or db2. Files must have permission 0755.
- 
 
 
-\ *sql statement*\ 
- 
+
+\ *sql statement*\
+
  Quoted sql statement syntax appropriate for the current database.
- 
+
 
 
 
@@ -101,52 +101,52 @@ EXAMPLES
 
 
 1. To run the database appropriate \*.sql files in /opt/xcat/lib/perl/xCAT_schema :
- 
- 
+
+
  .. code-block:: perl
- 
+
    runsqlcmd
- 
- 
+
+
 
 
 2. To run the database appropriate \*.sql files in /tmp/mysql:
- 
- 
+
+
  .. code-block:: perl
- 
+
    runsqlcmd -d /tmp/mysql
- 
- 
+
+
 
 
 3. To run the database appropriate \*.sql files in the input list:
- 
- 
+
+
  .. code-block:: perl
- 
+
    runsqlcmd -f "/tmp/mysql/test*,/tmp/mysql/test1*"
- 
- 
+
+
 
 
 4. To checkout one DB2 sql file:
- 
- 
+
+
  .. code-block:: perl
- 
+
    runsqlcmd -f /tmp/db2/test_db2.sql
- 
- 
+
+
 
 
 5. To run the following command to the database:
- 
- 
+
+
  .. code-block:: perl
- 
+
    runsqlcmd "Select * from site;"
- 
- 
+
+
 
 
diff --git a/docs/source/guides/admin-guides/references/man8/setupiscsidev.8.rst b/docs/source/guides/admin-guides/references/man8/setupiscsidev.8.rst
index 18b14391f..ab4b2beee 100644
--- a/docs/source/guides/admin-guides/references/man8/setupiscsidev.8.rst
+++ b/docs/source/guides/admin-guides/references/man8/setupiscsidev.8.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **setupiscsidev**\  [\ **-s|-**\ **-size**\ ] \ *noderange*\ 
+\ **setupiscsidev**\  [\ **-s|-**\ **-size**\ ] \ *noderange*\
 
 \ **setupiscsidev**\  [\ **-h|-**\ **-help|-v|-**\ **-version**\ ]
 
@@ -40,22 +40,22 @@ OPTIONS
 
 
 
-\ **-s|-**\ **-size**\ 
- 
+\ **-s|-**\ **-size**\
+
  The size of the LUN that should be created.  Default is 4096.
- 
 
 
-\ **-v|-**\ **-version**\ 
- 
+
+\ **-v|-**\ **-version**\
+
  Display version.
- 
 
 
-\ **-h|-**\ **-help**\ 
- 
+
+\ **-h|-**\ **-help**\
+
  Display usage message.
- 
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man8/tabch.8.rst b/docs/source/guides/admin-guides/references/man8/tabch.8.rst
index de11ce5ad..109b5705e 100644
--- a/docs/source/guides/admin-guides/references/man8/tabch.8.rst
+++ b/docs/source/guides/admin-guides/references/man8/tabch.8.rst
@@ -72,63 +72,63 @@ EXAMPLES
 
 
 1.  To add a node=node1 to the nodelist table with groups=all:
- 
- 
+
+
  .. code-block:: perl
- 
+
    tabch  node=node1 nodelist.groups=all
- 
- 
+
+
 
 
 2.  To add a keyword (tftpdir) and value (/tftpboot) to the site table:
- 
- 
+
+
  .. code-block:: perl
- 
+
    tabch  key=tftpdir site.value=/tftpboot
- 
- 
+
+
 
 
 3.  To add node1 to the  nodetype table with os=rhel5:
- 
- 
+
+
  .. code-block:: perl
- 
+
    tabch  node=node1 nodetype.os=rhel5
- 
- 
+
+
 
 
 4.  To change node1 in nodetype table setting os=sles:
- 
- 
+
+
  .. code-block:: perl
- 
+
    tabch  node=node1 nodetype.os=sles
- 
- 
+
+
 
 
 5.  To change node1 by appending otherpkgs to the postbootscripts field in the postscripts table:
- 
- 
+
+
  .. code-block:: perl
- 
+
    tabch node=node1 postscripts.postbootscripts+=otherpkgs
- 
- 
+
+
 
 
 6.  To delete node1 from nodetype table:
- 
- 
+
+
  .. code-block:: perl
- 
+
    tabch -d node=node1 nodetype
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man8/tabdump.8.rst b/docs/source/guides/admin-guides/references/man8/tabdump.8.rst
index 1f5efbc42..7b67d827f 100644
--- a/docs/source/guides/admin-guides/references/man8/tabdump.8.rst
+++ b/docs/source/guides/admin-guides/references/man8/tabdump.8.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **tabdump**\ 
+\ **tabdump**\
 
 \ **tabdump**\  [\ **-d**\ ] [\ *table*\ ]
 
@@ -54,40 +54,40 @@ OPTIONS
 
 
 
-\ **-?|-h|-**\ **-help**\ 
- 
+\ **-?|-h|-**\ **-help**\
+
  Display usage message.
- 
 
 
-\ **-d**\ 
- 
+
+\ **-d**\
+
  Show descriptions of the tables, instead of the contents of the tables.  If a table name is also specified, descriptions of the columns (attributes) of the table will be displayed.  Otherwise, a summary of each table will be displayed.
- 
 
 
-\ **-n**\ 
- 
+
+\ **-n**\
+
  Shows the most recent number of entries as supplied on the -n flag from the auditlog or eventlog table.
- 
 
 
-\ **-f**\ 
- 
+
+\ **-f**\
+
  File name or path to file in which to dump the table. Without this the table is dumped
  to stdout.  Using the -f flag allows the table to be dumped one record at a time. If tables are very large, dumping to stdout can cause problems such as running out of memory.
- 
+
 
 
 \ **-w**\  \ *'attr==val'*\  \ **-w**\  \ *'attr=~val'*\  ...
- 
+
  Use one or multiple -w flags to specify the selection string that can be used to select particular rows of the table. See examples.
- 
+
  Operator descriptions:
- 
- 
+
+
  .. code-block:: perl
- 
+
           ==        Select nodes where the attribute value is exactly this value.
           !=        Select nodes where the attribute value is not this specific value.
           >         Select nodes where the attribute value is greater than this  specific value.
@@ -96,8 +96,8 @@ OPTIONS
           <=        Select nodes where the attribute value is less than or equal to this  specific value.
           =~        Select nodes where the attribute value matches the SQL LIKE value.
           !~        Select nodes where the attribute value matches the SQL NOT LIKE value.
- 
- 
+
+
 
 
 
@@ -123,105 +123,105 @@ EXAMPLES
 
 
 1. To display the contents of the site table:
- 
- 
+
+
  .. code-block:: perl
- 
+
    tabdump site
- 
- 
+
+
 
 
 2. To display the contents of the nodelist table where the groups attribute is compute :
- 
- 
+
+
  .. code-block:: perl
- 
+
    tabdump -w 'groups==compute' nodelist
- 
- 
+
+
 
 
 3. To display the contents of the nodelist table where the groups attribute is comput% where % is a wildcard and can represent any string  and the status attribute is booted :
- 
- 
+
+
  .. code-block:: perl
- 
+
    tabdump -w 'groups=~comput%' -w 'status==booted' nodelist
- 
- 
+
+
 
 
 4. To display the records of the auditlog on date  2011-04-18 11:30:00 :
- 
- 
+
+
  .. code-block:: perl
- 
+
    tabdump -w 'audittime==2011-04-18 11:30:00' auditlog
- 
- 
+
+
 
 
 5. To display the records of the auditlog starting on 2011-04-18:
- 
- 
+
+
  .. code-block:: perl
- 
+
    tabdump -w 'audittime>2011-04-18 11:30:00' auditlog
- 
- 
+
+
 
 
 6. To display the 10 most recent entries in the auditlog:
- 
- 
+
+
  .. code-block:: perl
- 
+
    tabdump -n 10 auditlog
- 
- 
+
+
 
 
 7. To see what tables exist in the xCAT database:
- 
- 
+
+
  .. code-block:: perl
- 
+
    tabdump
- 
- 
+
+
 
 
 8. To back up all the xCAT database tables, instead of running \ **tabdump**\  multiple times, you can use the \ **dumpxCATdb**\  command as follows:
- 
- 
+
+
  .. code-block:: perl
- 
+
    dumpxCATdb -p /tmp/xcatbak
- 
- 
+
+
  See the \ **dumpxCATdb**\  man page for details.
- 
+
 
 
 9. To display a summary description of each table:
- 
- 
+
+
  .. code-block:: perl
- 
+
    tabdump -d
- 
- 
+
+
 
 
 10. To display a description of each column in the nodehm table:
- 
- 
+
+
  .. code-block:: perl
- 
+
    tabdump -d nodehm
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man8/tabedit.8.rst b/docs/source/guides/admin-guides/references/man8/tabedit.8.rst
index 7da620f7c..0cfdc0260 100644
--- a/docs/source/guides/admin-guides/references/man8/tabedit.8.rst
+++ b/docs/source/guides/admin-guides/references/man8/tabedit.8.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **tabedit**\  \ *table*\ 
+\ **tabedit**\  \ *table*\
 
 \ **tabedit**\  [\ **-?**\  | \ **-h**\  | \ **-**\ **-help**\ ]
 
@@ -43,10 +43,10 @@ OPTIONS
 
 
 
-\ **-?|-h|-**\ **-help**\ 
- 
+\ **-?|-h|-**\ **-help**\
+
  Display usage message.
- 
+
 
 
 
@@ -57,11 +57,11 @@ ENVIRONMENT VARIABLES
 
 
 TABEDITOR
- 
+
  The editor that should be used to edit the table, for example:  vi, vim, emacs, oocalc, pico, gnumeric, nano.
  If \ **TABEDITOR**\  is not set, the value from \ **EDITOR**\  will be used.  If \ **EDITOR**\  is not set, it will
  default to vi.
- 
+
 
 
 
@@ -87,13 +87,13 @@ EXAMPLES
 
 
 1. To edit the site table:
- 
- 
+
+
  .. code-block:: perl
- 
+
    tabedit site
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man8/tabprune.8.rst b/docs/source/guides/admin-guides/references/man8/tabprune.8.rst
index 58c489334..8eb9f39c5 100644
--- a/docs/source/guides/admin-guides/references/man8/tabprune.8.rst
+++ b/docs/source/guides/admin-guides/references/man8/tabprune.8.rst
@@ -21,7 +21,7 @@ SYNOPSIS
 
 \ **tabprune**\  [\ **eventlog | auditlog**\ ]  [\ **-V**\ ] [\ **-i**\  \ *recid*\  | \ **-n**\  \ *number of records*\  | \ **-p**\  \ *percentage*\  | \ **-d**\  \ *number of days*\  | \ **-a**\ ]
 
-\ **tabprune**\  \ *tablename*\  \ **-a**\ 
+\ **tabprune**\  \ *tablename*\  \ **-a**\
 
 \ **tabprune**\  [\ **-h | -**\ **-help**\ ] [\ **-v | -**\ **-version**\ ]
 
@@ -40,47 +40,47 @@ OPTIONS
 
 
 
-\ **-h|-**\ **-help**\ 
- 
+\ **-h|-**\ **-help**\
+
  Display usage message.
- 
 
 
-\ **-V**\ 
- 
+
+\ **-V**\
+
  Verbose mode.  This will cause tabprune to display the records that are being deleted from the table, in case
  you want to redirect them to a file to archive them.
- 
 
 
-\ **-a**\ 
- 
+
+\ **-a**\
+
  Remove all records from the input table name.  This option can be used on any xCAT table.
- 
 
 
-\ **-i**\   \ *recid number*\ 
- 
+
+\ **-i**\   \ *recid number*\
+
  Remove the records whose recid is less than the input recid number.
- 
 
 
-\ **-n**\  \ *number*\ 
- 
+
+\ **-n**\  \ *number*\
+
  Remove the number of records input.
- 
 
 
-\ **-p**\  \ *percent*\ 
- 
+
+\ **-p**\  \ *percent*\
+
  Remove the number of records input.
- 
 
 
-\ **-d**\  \ *number of days*\ 
- 
+
+\ **-d**\  \ *number of days*\
+
  Remove all records that occurred >= than number of days ago.
- 
+
 
 
 
@@ -106,63 +106,63 @@ EXAMPLES
 
 
 1. To remove all the records in the eventlog table:
- 
- 
+
+
  .. code-block:: perl
- 
+
    tabprune eventlog -a
- 
- 
+
+
 
 
 2. To remove all the records in the eventlog table saving the deleted records in eventlog.csv:
- 
- 
+
+
  .. code-block:: perl
- 
+
    tabprune eventlog -V -a > eventlog.csv
- 
- 
+
+
 
 
 3. To remove all the records before recid=200 in the auditlog table:
- 
- 
+
+
  .. code-block:: perl
- 
+
    tabprune auditlog -i 200
- 
- 
+
+
 
 
 4. To remove 400 records from the auditlog table and display the remove records:
- 
- 
+
+
  .. code-block:: perl
- 
+
    tabprune auditlog -V -n 400
- 
- 
+
+
 
 
 5. To remove 50% of the  eventlog table:
- 
- 
+
+
  .. code-block:: perl
- 
+
    tabprune eventlog -p 50
- 
- 
+
+
 
 
 6. To remove all records that occurred >= 5 days ago in the eventlog:
- 
- 
+
+
  .. code-block:: perl
- 
+
    tabprune eventlog -d 5
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man8/tabrestore.8.rst b/docs/source/guides/admin-guides/references/man8/tabrestore.8.rst
index 10b6c2331..25318187d 100644
--- a/docs/source/guides/admin-guides/references/man8/tabrestore.8.rst
+++ b/docs/source/guides/admin-guides/references/man8/tabrestore.8.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **tabrestore**\  [\ **-a**\ ] \ *table.csv*\ 
+\ **tabrestore**\  [\ **-a**\ ] \ *table.csv*\
 
 \ **tabrestore**\  [\ **-?**\  | \ **-h**\  | \ **-**\ **-help**\ ]
 
@@ -47,22 +47,22 @@ OPTIONS
 
 
 
-\ **-?|-h|-**\ **-help**\ 
- 
+\ **-?|-h|-**\ **-help**\
+
  Display usage message.
- 
 
 
-\ **-v|-**\ **-version**\ 
- 
+
+\ **-v|-**\ **-version**\
+
  Display version.
- 
 
 
-\ **-a|-**\ **-addrows**\ 
- 
+
+\ **-a|-**\ **-addrows**\
+
  Add rows from the CSV file to the table instead of replacing the table with the CSV file.
- 
+
 
 
 
@@ -88,42 +88,42 @@ EXAMPLES
 
 
 1. To replace the rows in the mp table with the rows in the mp.csv file:
- 
- 
+
+
  .. code-block:: perl
- 
+
    tabrestore mp.csv
- 
- 
+
+
  The file mp.csv could contain something like:
- 
- 
+
+
  .. code-block:: perl
- 
+
     #node,mpa,id,comments,disable
     "blade","|\D+(\d+)|amm(($1-1)/14+1)|","|\D+(\d+)|(($1-1)%14+1)|",,
- 
- 
+
+
 
 
 2. To add the rows in the mp.csv file to the rows in the mp table:
- 
- 
+
+
  .. code-block:: perl
- 
+
    tabrestore -a mp.csv
- 
- 
+
+
 
 
 3. To restore database tables from restore_directory that we dumped with dumpxCATdb:
- 
- 
+
+
  .. code-block:: perl
- 
+
    restorexCATdb -p restore_directory
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man8/winstall.8.rst b/docs/source/guides/admin-guides/references/man8/winstall.8.rst
index e939b5554..cbf27cf7f 100644
--- a/docs/source/guides/admin-guides/references/man8/winstall.8.rst
+++ b/docs/source/guides/admin-guides/references/man8/winstall.8.rst
@@ -15,7 +15,7 @@ Name
 
 
 ****************
-\ **Synopsis**\ 
+\ **Synopsis**\
 ****************
 
 
@@ -27,7 +27,7 @@ Name
 
 
 *******************
-\ **Description**\ 
+\ **Description**\
 *******************
 
 
@@ -39,102 +39,102 @@ It  will then run \ **wcons**\  on the noderange.
 
 
 ***************
-\ **Options**\ 
+\ **Options**\
 ***************
 
 
 
-\ **boot**\ 
- 
+\ **boot**\
+
  Instruct network boot loader to be skipped, generally meaning boot to hard disk
- 
 
 
-\ *imagename*\  | \ **osimage=**\ \ *imagename*\ 
- 
+
+\ *imagename*\  | \ **osimage=**\ \ *imagename*\
+
  Prepare server for installing a node using the specified os image. The os image is defined in the \ *osimage*\  table and \ *linuximage*\  table. If the \ *imagename*\  is omitted, the os image name will be obtained from \ *nodetype.provmethod*\  for the node.
- 
 
 
-\ **-**\ **-ignorekernelchk**\ 
- 
+
+\ **-**\ **-ignorekernelchk**\
+
  Skip the kernel version checking when injecting drivers from osimage.driverupdatesrc. That means all drivers from osimage.driverupdatesrc will be injected to initrd for the specific target kernel.
- 
 
 
-\ **runimage=**\ \ *task*\ 
- 
+
+\ **runimage=**\ \ *task*\
+
  If you would like to run a task after deployment, you can define that task with this attribute.
- 
 
 
-\ **runcmd=bmcsetup**\ 
- 
+
+\ **runcmd=bmcsetup**\
+
  This instructs the node to boot to the xCAT nbfs environment and proceed to configure BMC for basic remote access.  This causes the IP, netmask, gateway, username, and password to be programmed according to the configuration table.
- 
 
 
-\ **shell**\ 
- 
+
+\ **shell**\
+
  This instructs the node to boot to the xCAT genesis environment, and present a shell prompt on console.
  The node will also be able to be sshed into and have utilities such as wget, tftp, scp, nfs, and cifs.  It will have storage drivers available for many common systems.
- 
 
 
-\ **-h | -**\ **-help**\ 
- 
+
+\ **-h | -**\ **-help**\
+
  Display usage message.
- 
 
 
-\ **-v | -**\ **-version**\ 
- 
+
+\ **-v | -**\ **-version**\
+
  Display version.
- 
 
 
-\ **-u | -**\ **-uefimode**\ 
- 
+
+\ **-u | -**\ **-uefimode**\
+
  For BMC-based servers, to specify the next boot mode to be "UEFI Mode".
- 
 
 
-\ **-V | -**\ **-verbose**\ 
- 
+
+\ **-V | -**\ **-verbose**\
+
  Verbose output.
- 
+
 
 
 
 ****************
-\ **Examples**\ 
+\ **Examples**\
 ****************
 
 
 
 1. Provision nodes 1 through 20, using their current configuration.
- 
- 
+
+
  .. code-block:: perl
- 
+
    winstall node1-node20
- 
- 
+
+
 
 
 2. Provision nodes 1 through 20 with the osimage rhels6.4-ppc64-netboot-compute.
- 
- 
+
+
  .. code-block:: perl
- 
+
    winstall node1-node20 osimage=rhels6.4-ppc64-netboot-compute
- 
- 
+
+
 
 
 
 ************************
-\ **See**\  \ **Also**\ 
+\ **See**\  \ **Also**\
 ************************
 
 
diff --git a/docs/source/guides/admin-guides/references/man8/xcatconfig.8.rst b/docs/source/guides/admin-guides/references/man8/xcatconfig.8.rst
index 85a089555..4002f73e8 100644
--- a/docs/source/guides/admin-guides/references/man8/xcatconfig.8.rst
+++ b/docs/source/guides/admin-guides/references/man8/xcatconfig.8.rst
@@ -46,80 +46,80 @@ OPTIONS
 
 
 
-\ **-h|-**\ **-help**\ 
- 
+\ **-h|-**\ **-help**\
+
  Displays the usage message.
- 
 
 
-\ **-v|-**\ **-version**\ 
- 
+
+\ **-v|-**\ **-version**\
+
  Displays the release version of the code.
- 
 
 
-\ **-V|-**\ **-verbose**\ 
- 
+
+\ **-V|-**\ **-verbose**\
+
  Displays verbose messages.
- 
 
 
-\ **-i|-**\ **-initialinstall**\ 
- 
+
+\ **-i|-**\ **-initialinstall**\
+
  The install option is normally run as a post operation from the rpm xCAT.spec file during the initial install of xCAT on the Management Node. It will setup the root ssh keys, ssh node keys, xCAT credentials, initialize the database, export directories, start syslog and other daemons as needed after the initial install of xCAT.
- 
 
 
-\ **-u|-**\ **-updateinstall**\ 
- 
+
+\ **-u|-**\ **-updateinstall**\
+
  The update install option is normally run as a post operation from the rpm xCAT.spec file during an update install of xCAT on the Management Node. It will check the setup the root ssh keys, ssh node keys, xCAT credentials, database, exported directories, syslog and the state of daemons needed by xCAT, after the updateinstall of xCAT. If setup is required, it will perform the operation.  It will restart the necessary daemons.
- 
 
 
-\ **-k|-**\ **-sshkeys**\ 
- 
+
+\ **-k|-**\ **-sshkeys**\
+
  This option will remove and regenerate the root id_rsa keys. It should only be used, if the keys are deleted or corrupted. The keys must then be distributed to the nodes by installing, running updatenode -k, or using xdsh -K option, for root to be able to ssh to the nodes without being prompted for a password. 
  rspconfig will need to be run to distribute the key to the MM and HMCs. Any device, we need to ssh from the MN to the device will also have to be updated with the new ssh keys.
- 
 
 
-\ **-s|-**\ **-sshnodehostkeys**\ 
- 
+
+\ **-s|-**\ **-sshnodehostkeys**\
+
  This option will remove and regenerate the node host ssh keys.  It should only be used, if the keys are deleted or are corrupted. The keys must then be redistribute to the nodes by installing, running updatenode -k  or using xdcp or pcp to copy the keys from /etc/xcat/hostkeys directory to the /etc/ssh directory on the nodes.
- 
 
 
-\ **-c|-**\ **-credentials**\ 
- 
+
+\ **-c|-**\ **-credentials**\
+
  This option will remove all xcat credentials for root and any userids where credentials have been created. It will regenerate roots credentials, but the admin will have to add back all the userid credentials needed with the /opt/xcat/share/xcat/scripts/setup-local-client.sh <username> command. It should only be used, if they are deleted or become corrupted. The root credentials must be redistributed to the service nodes by installing the service node or using updatenode -k.  makeconservercf must be rerun to pick up the new credentials, and conserver must be stopped and started.
- 
 
 
-\ **-d|-**\ **-database**\ 
- 
+
+\ **-d|-**\ **-database**\
+
  This option will reinitialize the basic xCAT database table setup.  It will not remove any new database entries that have been added, but it is strongly suggested that you backup you database (dumpxCATdb) before using it.
- 
 
 
-\ **-f|-**\ **-force**\ 
- 
+
+\ **-f|-**\ **-force**\
+
  The force option may be used after the install to reinitialize the Management Node. This option will regenerate keys, credential and reinitialize the site table. This option should be used, if keys or credentials become corrupt or lost. 
  Additional action must be taken after using the force options.  ssh keys must be redistributed to the nodes, site table attributes might need to be restored, makeconservercf needs to be rerun to pick up the new credentials and conserver stopped and started, rspconfig needs to be rerun to distribute the new keys to the MM and the HMCs. 
  A new set of common ssh host keys will have been generated for the nodes. If you wish your nodes to be able to ssh to each other with out password intervention, then you should redistribute these new keys to the nodes. If the nodes hostkeys are updated then you will need to remove their entries from the known_hosts files on the management node before using ssh, xdsh, xdcp. 
  Redistribute credentials and ssh keys to the service nodes and ssh keys to the nodes by using the updatenode -k command.
- 
 
 
-\ **-m|-**\ **-mgtnode**\ 
- 
+
+\ **-m|-**\ **-mgtnode**\
+
  This option will add the Management Node to the database with the correct attributes set to be recognized by xCAT.  This should be run after the hostname of the Management Node is set to the name that  will resolve to the cluster-facing NIC.
- 
 
 
-\ **-t|-**\ **-tunables**\ 
- 
+
+\ **-t|-**\ **-tunables**\
+
  This option will set tunable parameters on the Management and Service nodes recommended for your Linux cluster.  It will only set them during initial install, if you run xcatconfig -f or xcatconfig -t.
- 
+
 
 
 
@@ -130,52 +130,52 @@ EXAMPLES
 
 
 1.
 To force regeneration of keys and credentials and reinitialize the site table:
- 
- 
+
+
  .. code-block:: perl
- 
+
    xcatconfig -f
- 
- 
+
+
 
 
 2.
 To regenerate root's ssh keys:
- 
- 
+
+
  .. code-block:: perl
- 
+
    xcatconfig -k
- 
- 
+
+
 
 
 3.
 To regenerate node host ssh keys:
- 
- 
+
+
  .. code-block:: perl
- 
+
    xcatconfig -s
- 
- 
+
+
 
 
 4.
 To regenerate node host ssh keys and credentials:
- 
- 
+
+
  .. code-block:: perl
- 
+
    xcatconfig -s -c
- 
- 
+
+
 
 
 5.
 To add the Management Node to the DB:
- 
- 
+
+
  .. code-block:: perl
- 
+
    xcatconfig -m
- 
- 
+
+
 
 
diff --git a/docs/source/guides/admin-guides/references/man8/xcatd.8.rst b/docs/source/guides/admin-guides/references/man8/xcatd.8.rst
index 80061339d..adb1479d4 100644
--- a/docs/source/guides/admin-guides/references/man8/xcatd.8.rst
+++ b/docs/source/guides/admin-guides/references/man8/xcatd.8.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **xcatd**\ 
+\ **xcatd**\
 
 
 ***********
@@ -41,33 +41,33 @@ EXAMPLES
 
 
 1. To start/stop/restart  xcatd on Linux, enter:
- 
- 
+
+
  .. code-block:: perl
- 
-   service xcatd start 
-  
-   service xcatd stop 
-  
+
+   service xcatd start
+
+   service xcatd stop
+
    service xcatd restart
- 
- 
+
+
 
 
 2. To start/stop/restart  xcatd on AIX, enter:
- 
- 
+
+
  .. code-block:: perl
- 
+
    restartxcatd
-  
+
      or
-  
+
    startsrc -s xcatd
-  
+
    stopsrc -s xcatd
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man8/xcatdebug.8.rst b/docs/source/guides/admin-guides/references/man8/xcatdebug.8.rst
index 6a32f61e7..ce0dc1705 100644
--- a/docs/source/guides/admin-guides/references/man8/xcatdebug.8.rst
+++ b/docs/source/guides/admin-guides/references/man8/xcatdebug.8.rst
@@ -30,15 +30,15 @@ DESCRIPTION
 xCAT offers two trace facilities to debug the xCAT:
 
 
-\ **Subroutine calling trace**\ 
+\ **Subroutine calling trace**\
 
 Display the calling trace for subroutine when it is called.
 
 The trace message includes: The name of the called subroutine; The arguments which passed to the called subroutine; The calling stack of the subroutine. By default, the trace will be enabled to all the subroutines in the xcatd and plugin modules. The target subroutine can be configured by configuration file or through xcatdebug command line.
 
 The flag \ **-c**\  is used to specify the subroutine list for \ **subroutine calling trace**\ , it can only work with \ **-f**\ . The value of \ **-c**\  can be a configuration file or a subroutine list.
-  \ **configuration file**\ : a file contains multiple lines of \ **SUBROUTINE_DEFINITION**\ 
-  \ **subroutine list**\ :    \ **SUBROUTINE_DEFINITION | SUBROUTINE_DEFINITION|...**\ 
+  \ **configuration file**\ : a file contains multiple lines of \ **SUBROUTINE_DEFINITION**\
+  \ **subroutine list**\ :    \ **SUBROUTINE_DEFINITION | SUBROUTINE_DEFINITION|...**\
 
 \ **SUBROUTINE_DEFINITION**\ : is the element for the \ **-c**\  to specify the subroutine list.
 
@@ -53,7 +53,7 @@ Otherwise, the package name of the plugin should be specified.
 
 The trace log will be written to /var/log/xcat/subcallingtrace. The log file subcallingtrace will be backed up for each running of the \ **xcatdebug -f enable**\ .
 
-\ **Commented trace log**\ 
+\ **Commented trace log**\
 
 The trace log code is presented as comments in the code of xCAT. In general mode, it will be kept as comments. But in debug mode, it will be commented back as common code to display the trace log.
 
@@ -88,39 +88,39 @@ OPTIONS
 
 
 
-\ **-f**\ 
- 
+\ **-f**\
+
  Enable or disable the \ **subroutine calling trace**\ .
- 
+
  For \ **enable**\ , if ignoring the \ **-c**\  flag, all the subroutines in the xcatd and plugin modules will be enabled.
- 
+
  For \ **disable**\ , all the subroutines which has been enabled by \ **-f enable**\  will be disabled. \ **-c**\  will be ignored.
- 
 
 
-\ **-c**\ 
- 
+
+\ **-c**\
+
  Specify the configuration file or subroutine list.
- 
- 
- \ **configuration file**\ : a file contains multiple lines of \ **SUBROUTINE_DEFINITION**\ 
+
+
+ \ **configuration file**\ : a file contains multiple lines of \ **SUBROUTINE_DEFINITION**\
    e.g.
      (plugin_command)
      xCAT_plugin::DBobjectdefs(defls,process_request)
      xCAT::DBobjUtils(getobjdefs)
- 
- \ **subroutine list**\ : a string like  \ **SUBROUTINE_DEFINITION | SUBROUTINE_DEFINITION|...**\ 
+
+ \ **subroutine list**\ : a string like  \ **SUBROUTINE_DEFINITION | SUBROUTINE_DEFINITION|...**\
    e.g.
      "(plugin_command)|xCAT_plugin::DBobjectdefs(defls,process_request)|xCAT::DBobjUtils(getobjdefs)"
- 
 
 
-\ **-d**\ 
- 
+
+\ **-d**\
+
  Enable or disable the \ **commented trace log**\ .
- 
- Note: The xcatd will be restarted for the performing of \ **-d**\ 
- 
+
+ Note: The xcatd will be restarted for the performing of \ **-d**\
+
 
 
 
@@ -131,62 +131,62 @@ EXAMPLES
 
 
 1. Enable the \ **subroutine calling trace**\  for all the subroutines in the xcatd and plugin modules.
- 
- 
+
+
  .. code-block:: perl
- 
+
    xcatdebug -f enable
- 
- 
+
+
 
 
 2. Enable the \ **subroutine calling trace**\  for the subroutines configured in the /opt/xcat/share/xcat/samples/tracelevel0
- 
- 
+
+
  .. code-block:: perl
- 
+
    xcatdebug -f enable -c /opt/xcat/share/xcat/samples/tracelevel0
- 
- 
+
+
 
 
 3. Enable the \ **subroutine calling trace**\  for the plugin_command in xcatd and defls,process_request in the xCAT_plugin::DBobjectdefs module.
- 
- 
+
+
  .. code-block:: perl
- 
+
    xcatdebug -f enable -c "xCAT_plugin::DBobjectdefs(defls,process_request)|(plugin_command)"
- 
- 
+
+
 
 
 4. Disable the \ **subroutine calling trace**\  for all the subroutines which have been enabled by \ **xcatdebug -f enable**\ .
- 
- 
+
+
  .. code-block:: perl
- 
+
    xcatdebug -f disable
- 
- 
 
 
-5. Enable the \ **commented trace log**\ 
- 
- 
+
+
+5. Enable the \ **commented trace log**\
+
+
  .. code-block:: perl
- 
+
    xcatdebug -d enable
- 
- 
 
 
-6. Enable both the \ **subroutine calling trace**\  and \ **commented trace log**\ 
- 
- 
+
+
+6. Enable both the \ **subroutine calling trace**\  and \ **commented trace log**\
+
+
  .. code-block:: perl
- 
+
     xcatdebug -f enable -c /opt/xcat/share/xcat/samples/tracelevel0 -d enable
- 
- 
+
+
 
 
diff --git a/docs/source/guides/admin-guides/references/man8/xcatsetup.8.rst b/docs/source/guides/admin-guides/references/man8/xcatsetup.8.rst
index 355cc6cb6..011d5506e 100644
--- a/docs/source/guides/admin-guides/references/man8/xcatsetup.8.rst
+++ b/docs/source/guides/admin-guides/references/man8/xcatsetup.8.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **xcatsetup**\  [\ **-s|-**\ **-stanzas**\  \ *stanza-list*\ ] [\ **-**\ **-yesreallydeletenodes**\ ] \ *cluster-config-file*\ 
+\ **xcatsetup**\  [\ **-s|-**\ **-stanzas**\  \ *stanza-list*\ ] [\ **-**\ **-yesreallydeletenodes**\ ] \ *cluster-config-file*\
 
 \ **xcatsetup**\  [\ **-?**\  | \ **-h**\  | \ **-**\ **-help**\  | \ **-v**\  | \ **-**\ **-version**\ ]
 
@@ -36,51 +36,51 @@ the hardware that is connected to the service and cluster networks.  The typical
 
 
 1.
- 
+
  Install the xCAT software on the management node
- 
+
 
 
 2.
- 
+
  Create the cluster config file and run xcatsetup
- 
+
 
 
 3.
- 
+
  Put hardware control passwords in the ppchcp or ppcdirect database table
- 
+
 
 
 4.
- 
+
  Run makenetworks and makedhcp
- 
+
 
 
 5.
- 
+
  Run the discovery commands (lsslp, mkhwconn, rspconfig) as described in the System P Hardware Management cookbook.
- 
+
 
 
 6.
- 
+
  Configure and start services using makehosts, makedns, mkconserver.cf, etc.
- 
+
 
 
 7.
- 
+
  Create the images that should be installed or booted on the nodes
- 
+
 
 
 8.
- 
+
  Run nodeset and rpower/rnetboot to boot up the nodes.
- 
+
 
 
 The \ **xcatsetup**\  command is intended as a quick way to fill out the database for a cluster that has very regular
@@ -140,16 +140,16 @@ This sample configuration file is for a 2 building block cluster.
     # ISR network topology.  For example, one of the following: 128D, 64D, 32D, 16D, 8D, 4D, 2D, 1D
     topology = 32D
     # The nameservers in site table will be set with the value of master automatically.
- 
+
    xcat-service-lan:
      # IP range used for DHCP. If you set the entry, the networks table will be filled
      # automatically with this range and the dhcp interface will be set in the site table.
      dhcp-dynamic-range = 50.0.0.0-50.0.0.200
- 
+
    xcat-hmcs:
     hostname-range = hmc1-hmc2
     starting-ip = 10.200.1.1
- 
+
    xcat-frames:
     # these are the connections to the frames
     hostname-range = frame[1-6]
@@ -166,12 +166,12 @@ This sample configuration file is for a 2 building block cluster.
     # bpa-b-1-starting-ip = 10.231.2.1
     # This assumes you have 2 service LANs:  a primary service LAN 40.x.y.z/255.0.0.0 that all of the port 0's
     # are connected to, and a backup service LAN 41.x.y.z/255.0.0.0 that all of the port 1's are connected to.
-    # "x" is the frame number and "z" is the bpa/fsp id (1 for the first BPA/FSP in the Frame/CEC, 2 for the 
+    # "x" is the frame number and "z" is the bpa/fsp id (1 for the first BPA/FSP in the Frame/CEC, 2 for the
     # second BPA/FSP in the Frame/CEC). For BPAs "y" is always be 0 and for FSPs "y" is the cec id.
     vlan-1 = 40
     vlan-2 = 41
- 
- 
+
+
    xcat-cecs:
     # These are the connections to the CECs.  Either form of hostname is supported.
     #hostname-range = cec01-cec64
@@ -189,12 +189,12 @@ This sample configuration file is for a 2 building block cluster.
     #fsp-b-0-starting-ip = 10.230.4.1
     #fsp-a-1-starting-ip = 10.231.3.1
     #fsp-b-1-starting-ip = 10.231.4.1
- 
- 
+
+
    xcat-building-blocks:
     num-frames-per-bb = 3
     num-cecs-per-bb = 32
- 
+
    xcat-lpars:
     num-lpars-per-cec = 8
     # If you set these, then do not set the corresponding attributes in the other node stanzas below.
@@ -205,7 +205,7 @@ This sample configuration file is for a 2 building block cluster.
     aliases = -hf0
     # ml0 is for aix.  For linux, use bond0 instead.
     otherinterfaces = -hf1:11.1.1.1,-hf2:12.1.1.1,-hf3:13.1.1.1,-ml0:14.1.1.1
- 
+
    xcat-service-nodes:
     num-service-nodes-per-bb = 2
     # which cecs within the bldg block that the SNs are located in
@@ -216,7 +216,7 @@ This sample configuration file is for a 2 building block cluster.
     # this value is the same format as the hosts.otherinterfaces attribute except
     # the IP addresses are starting IP addresses
     #otherinterfaces = -hf0:10.10.1.1,-hf1:10.11.1.1,-hf2:10.12.1.1,-hf3:10.13.1.1,-ml0:10.14.1.1
- 
+
    xcat-storage-nodes:
     num-storage-nodes-per-bb = 3
     # which cecs within the bldg block that the storage nodes are located in
@@ -225,7 +225,7 @@ This sample configuration file is for a 2 building block cluster.
     #starting-ip = 10.20.1.1
     #aliases = -hf0
     #otherinterfaces = -hf1:10.21.1.1,-hf2:10.22.1.1,-hf3:10.23.1.1,-ml0:10.24.1.1
- 
+
    xcat-compute-nodes:
     #hostname-range = n001-n502
     #starting-ip = 10.30.1.1
@@ -312,16 +312,16 @@ VPD data or supernode numbers at this time.
 
    xcat-site:
     use-direct-fsp-control = 1
- 
+
    xcat-frames:
     hostname-range = frame[1-2]
- 
+
    xcat-cecs:
     #hostname-range = cec[01-24]
     hostname-range = f[1-2]c[01-12]
     num-cecs-per-frame = 12
- 
- 
+
+
    xcat-lpars:
      hostname-range = f[1-2]c[01-12]p[01,05,09,13,17,21,25,29]
 
@@ -335,154 +335,154 @@ The following lists which database attributes are filled in as a result of each
 in the stanza, some attributes might not be filled in.
 
 
-\ **xcat-site**\ 
- 
+\ **xcat-site**\
+
  site table:  domain, nameservers, topology
- 
 
 
-\ **xcat-hmcs**\ 
- 
+
+\ **xcat-hmcs**\
+
  site table:  ea_primary_hmc, ea_backup_hmc
- 
+
  nodelist table:  node, groups (all HMCs (hmc) ), hidden
- 
+
  hosts table:  node, ip
- 
+
  ppc table:  node, comments
- 
+
  nodetype table:  node, nodetype
- 
 
 
-\ **xcat-frames**\ 
- 
+
+\ **xcat-frames**\
+
  nodelist table:  node, groups (all frames (frame) ), hidden
- 
+
  ppc table: node, id, hcp, nodetype, sfp
- 
+
  nodetype table: node, nodetype
- 
+
  nodehm table: node, mgt
- 
+
  vpd table: node, serial, mtm, side
- 
 
 
-\ **xcat-bpas**\ 
- 
+
+\ **xcat-bpas**\
+
  nodelist table: node, groups (bpa,all) , hidden
- 
+
  ppc table: node, id, hcp, nodetype, parent
- 
+
  nodetype table:  node, nodetype
- 
+
  nodehm table:  node, mgt
- 
+
  vpd table:  node, serial, mtm, side
- 
 
 
-\ **xcat-cecs**\ 
- 
+
+\ **xcat-cecs**\
+
  nodelist table:  node, groups (all CECs (cec), all CECs in a frame (<frame>cec) ), hidden
- 
+
  ppc table:  node, supernode, hcp, id, parent
- 
+
  nodetype table:  node, nodetype
- 
+
  nodehm table:  node, mgt
- 
+
  nodegroup table:  groupname, grouptype, members, wherevals (all nodes in a CEC (<cec>nodes) )
- 
+
  nodepos:  rack, u
- 
 
 
-\ **xcat-fsps**\ 
- 
+
+\ **xcat-fsps**\
+
  nodelist table: node, groups (fsp,all), hidden
- 
+
  ppc table: node, id, hcp, nodetype, parent
- 
+
  nodetype table: node, nodetype
- 
+
  nodehm table: node, mgt
- 
+
  vpd table: node, serial, mtm, side
- 
 
 
-\ **xcat-building-blocks**\ 
- 
+
+\ **xcat-building-blocks**\
+
  site table: sharedtftp, sshbetweennodes(service)
- 
+
  ppc table:  node, parent (for frame)
- 
 
 
-\ **xcat-service-nodes**\ 
- 
+
+\ **xcat-service-nodes**\
+
  nodelist table:  node, groups (all service nodes (service), all service nodes in a BB (bb<num>service) )
- 
+
  hosts table:  node, ip, hostnames, otherinterfaces
- 
+
  ppc table:  node, id, hcp, parent
- 
+
  nodetype table:  node, nodetype, arch
- 
+
  nodehm table:  node, mgt, cons
- 
+
  noderes table:  netboot
- 
+
  servicenode table:  node, nameserver, dhcpserver, tftpserver, nfsserver, conserver, monserver, ftpserver, nimserver, ipforward
- 
+
  nodegroup table:  groupname, grouptype, members, wherevals (all nodes under a service node (<servicenode>nodes) )
- 
+
  nodepos:  rack, u
- 
 
 
-\ **xcat-storage-nodes**\ 
- 
+
+\ **xcat-storage-nodes**\
+
  nodelist table:  node, groups (all storage nodes (storage), all storage nodes in a BB (bb<num>storage) )
- 
+
  hosts table:  node, ip, hostnames, otherinterfaces
- 
+
  ppc table:  node, id, hcp, parent
- 
+
  nodetype table:  node, nodetype, arch
- 
+
  nodehm table:  node, mgt, cons
- 
+
  noderes table:  netboot, xcatmaster, servicenode
- 
+
  nodepos:  rack, u
- 
 
 
-\ **xcat-compute-nodes**\ 
- 
+
+\ **xcat-compute-nodes**\
+
  nodelist table:  node, groups (all compute nodes (compute) )
- 
+
  hosts table:  node, ip, hostnames, otherinterfaces
- 
+
  ppc table:  node, id, hcp, parent
- 
+
  nodetype table:  node, nodetype, arch
- 
+
  nodehm table:  node, mgt, cons
- 
+
  noderes table:  netboot, xcatmaster, servicenode
- 
+
  nodepos:  rack, u
- 
 
 
-\ **ll-config**\ 
- 
+
+\ **ll-config**\
+
  postscripts: postscripts
- 
+
 
 
 
@@ -493,36 +493,36 @@ OPTIONS
 
 
 
-\ **-s|-**\ **-stanzas**\  \ *stanza-list*\ 
- 
+\ **-s|-**\ **-stanzas**\  \ *stanza-list*\
+
  A comma-separated list of stanza names that \ **xcatsetup**\  should process in the configuration file.  If not specified, it will process
  all the stanzas that start with 'xcat' and some other stanzas that give xCAT hints about how to set up the HPC products.
- 
+
  This option should only be specified if you have already run \ **xcatsetup**\  earlier with the stanzas that occur before this in the
  configuration file.  Otherwise, objects will be created that refer back to other objects that do not exist in the database.
- 
 
 
-\ **-v|-**\ **-version**\ 
- 
+
+\ **-v|-**\ **-version**\
+
  Command Version.
- 
 
 
-\ **-?|-h|-**\ **-help**\ 
- 
+
+\ **-?|-h|-**\ **-help**\
+
  Display usage message.
- 
 
 
-\ **-**\ **-yesreallydeletenodes**\ 
- 
+
+\ **-**\ **-yesreallydeletenodes**\
+
  Delete the nodes represented in the cluster config file, instead of creating them.  This is useful if your first attempt with the cluster
  config file wasn't quite right and you want to start over.  But use this option with extreme caution, because it will potentially delete
  a lot of nodes.  If the only thing you have done so far in your database is add nodes by running \ **xcatsetup**\ , then it is safe to use this
  option to start over.  If you have made other changes to your database, you should first back it up using dumpxCATdb(1)|dumpxCATdb.1 before
  using this option.
- 
+
 
 
 
@@ -549,45 +549,45 @@ EXAMPLES
 
 1. Use the sample config.txt file at the beginning of this man page to create all the objects/nodes for a
 2 building block cluster.
- 
- 
+
+
  .. code-block:: perl
- 
+
    xcatsetup config.txt
- 
- 
+
+
  The output:
- 
- 
+
+
  .. code-block:: perl
- 
+
    Defining site attributes...
    Defining HMCs...
    Defining frames...
    Defining CECs...
    Defining building blocks...
    Defining LPAR nodes...
- 
- 
+
+
 
 
 2. Use the simpler config file shown earlier in this man page to create just the frame and cec objects:
- 
- 
+
+
  .. code-block:: perl
- 
+
    xcatsetup config-simple.txt
- 
- 
+
+
  The output:
- 
- 
+
+
  .. code-block:: perl
- 
+
    Defining frames...
    Defining CECs...
- 
- 
+
+
 
 
 
diff --git a/docs/source/guides/admin-guides/references/man8/xcatsnap.8.rst b/docs/source/guides/admin-guides/references/man8/xcatsnap.8.rst
index 330cad684..6474da807 100644
--- a/docs/source/guides/admin-guides/references/man8/xcatsnap.8.rst
+++ b/docs/source/guides/admin-guides/references/man8/xcatsnap.8.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **xcatsnap**\ 
+\ **xcatsnap**\
 
 \ **xcatsnap**\  [\ **-h | -**\ **-help**\ ]
 
@@ -46,28 +46,28 @@ OPTIONS
 
 
 
-\ **-h|-**\ **-help**\ 
- 
+\ **-h|-**\ **-help**\
+
  Displays the usage message.
- 
 
 
-\ **-v|-**\ **-version**\ 
- 
+
+\ **-v|-**\ **-version**\
+
  Displays the release version of the code.
- 
 
 
-\ **-B|-**\ **-bypass**\ 
- 
+
+\ **-B|-**\ **-bypass**\
+
  Runs in bypass mode, use if the xcatd daemon is hung.
- 
 
 
-\ **-d|-**\ **-dir**\ 
- 
+
+\ **-d|-**\ **-dir**\
+
  The directory to put the snap information.  Default is /tmp/xcatsnap.
- 
+
 
 
 
@@ -84,22 +84,22 @@ EXAMPLES
 
 
 1. Run the xcatsnap routine in bypass mode and put info in /tmp/mydir :
- 
- 
+
+
  .. code-block:: perl
- 
+
    xcatsnap -B -d /tmp/mydir
- 
- 
+
+
 
 
 2.  To run the xcatsnap routine and use default directory /tmp/xcatsnap :
- 
- 
+
+
  .. code-block:: perl
- 
+
    xcatsnap
- 
- 
+
+
 
 
diff --git a/docs/source/guides/admin-guides/references/tools/detect_dhcpd.rst b/docs/source/guides/admin-guides/references/tools/detect_dhcpd.rst
index fa33e4a73..dbfa8fb43 100644
--- a/docs/source/guides/admin-guides/references/tools/detect_dhcpd.rst
+++ b/docs/source/guides/admin-guides/references/tools/detect_dhcpd.rst
@@ -6,12 +6,12 @@ detect_dhcpd
     Usage: detect_dhcpd -i interface [-m macaddress] [-t timeout] [-V]
 
     This command can be used to detect the dhcp server in a network for a specific mac address.
-    
+
     Options:
         -i interface:  The interface which facing the target network.
         -m macaddress: The mac that will be used to detect dhcp server. Recommend to use the real mac
-                       of the node that will be netboot. If no specified, the mac of interface which 
+                       of the node that will be netboot. If no specified, the mac of interface which
                        specified by -i will be used.
         -t timeout:    The time to wait to detect the dhcp messages. The default value is 10s.
-    
+
 Author:  Wang, Xiao Peng
diff --git a/docs/source/guides/admin-guides/references/tools/mac2linklocal.rst b/docs/source/guides/admin-guides/references/tools/mac2linklocal.rst
index 3bcf2ec6e..94d008419 100644
--- a/docs/source/guides/admin-guides/references/tools/mac2linklocal.rst
+++ b/docs/source/guides/admin-guides/references/tools/mac2linklocal.rst
@@ -1,9 +1,9 @@
 mac2linklocal
 =============
 
-:: 
+::
 
-    Usage:  mac2linklocal -m 
+    Usage:  mac2linklocal -m
 
     Determines the IPv6 link local address that is appropriate for a NIC, based on its MAC.
 
diff --git a/docs/source/guides/admin-guides/references/tools/mktoolscenter.rst b/docs/source/guides/admin-guides/references/tools/mktoolscenter.rst
index 23b42d978..fa5877c04 100644
--- a/docs/source/guides/admin-guides/references/tools/mktoolscenter.rst
+++ b/docs/source/guides/admin-guides/references/tools/mktoolscenter.rst
@@ -4,17 +4,17 @@ mktoolscenter
 ::
 
     Usage: mktoolscenter
-      --ph 
-      --pp 
-      --puser 
-      --ppw 
-      -l 
+      --ph
+      --pp
+      --puser
+      --ppw
+      -l
       -s
-      --nfsserver 
-      --nfspath 
-      --profilename 
+      --nfsserver
+      --nfspath
+      --profilename
       --help
-    
+
     Updates IBM system x server hardware using IBM Bootable Media Creator.
-    
+
 Author:  Jim Turner
diff --git a/docs/source/guides/admin-guides/references/tools/nodesw.rst b/docs/source/guides/admin-guides/references/tools/nodesw.rst
index 3d5bc4dbf..93a88567e 100644
--- a/docs/source/guides/admin-guides/references/tools/nodesw.rst
+++ b/docs/source/guides/admin-guides/references/tools/nodesw.rst
@@ -6,7 +6,7 @@ nodesw
     nodesw changes the vlan of a node to a specified vlan
     requires xCAT 2.0, Switch configured with SNMP sets, and only tested on SMC8648T
     nodesw -h|--help
-    nodesw [-v]  vlan 
+    nodesw [-v]  vlan
     nodesw [-v]  show
 
 Author:  Vallard Benincosa
diff --git a/docs/source/guides/admin-guides/references/tools/reorgtbls.rst b/docs/source/guides/admin-guides/references/tools/reorgtbls.rst
index a544a13e9..5f1863ebd 100644
--- a/docs/source/guides/admin-guides/references/tools/reorgtbls.rst
+++ b/docs/source/guides/admin-guides/references/tools/reorgtbls.rst
@@ -4,11 +4,11 @@ reorgtbls
 ::
 
     DB2 Table Reorganization utility.
-    This script can be set as a cron job or run on the command line to reorg the xcatdb DB2 database tables. It automatically added as a cron job, if you use the db2sqlsetup command to create your DB2 database setup for xCAT. 
+    This script can be set as a cron job or run on the command line to reorg the xcatdb DB2 database tables. It automatically added as a cron job, if you use the db2sqlsetup command to create your DB2 database setup for xCAT.
     Usage:
             --V - Verbose mode
             --h - usage
             --t -comma delimited list of tables.
                  Without this flag it reorgs all tables in the xcatdb database .
-    
+
 Author:  Lissa Valletta
diff --git a/docs/source/guides/admin-guides/references/tools/rmblade.rst b/docs/source/guides/admin-guides/references/tools/rmblade.rst
index 150883fb2..776a15a99 100644
--- a/docs/source/guides/admin-guides/references/tools/rmblade.rst
+++ b/docs/source/guides/admin-guides/references/tools/rmblade.rst
@@ -8,11 +8,11 @@ rmblade
     Response to SNMP for monsetting to remove blade from xCAT when trap is recieved.
     Pipe the MM IP address and blade slot number into this cmd.
 
-    Example: 
+    Example:
      1.  user removes a blade from the chassis
      2.  snmp trap setup to point here
      3.  this script removes the blade configuration from xCAT
-     4.  so if blade is placed in new slot or back in then xCAT goes 
+     4.  so if blade is placed in new slot or back in then xCAT goes
          through rediscover process again.
-    
+
 Author:  Jarrod Johnson
diff --git a/docs/source/guides/admin-guides/references/tools/rmnodecfg.rst b/docs/source/guides/admin-guides/references/tools/rmnodecfg.rst
index c571f185f..545e2b0b4 100644
--- a/docs/source/guides/admin-guides/references/tools/rmnodecfg.rst
+++ b/docs/source/guides/admin-guides/references/tools/rmnodecfg.rst
@@ -3,9 +3,9 @@ rmnodecfg
 
 ::
 
-    Usage: rmnodecfg [-h|--help] 
+    Usage: rmnodecfg [-h|--help]
 
-    Removes the configuration of a node so that the next time you reboot 
+    Removes the configuration of a node so that the next time you reboot
     it, it forces it to go through the discovery process.
     This does not remove it completely from xCAT.  You may want to do this
     command before running noderm to completely purge the system of the node
diff --git a/docs/source/guides/admin-guides/references/tools/test_hca_state.rst b/docs/source/guides/admin-guides/references/tools/test_hca_state.rst
index abe5e6781..89a14c08d 100644
--- a/docs/source/guides/admin-guides/references/tools/test_hca_state.rst
+++ b/docs/source/guides/admin-guides/references/tools/test_hca_state.rst
@@ -17,12 +17,12 @@ test_hca_state
             is passed to "egrep" and can be a simple string or a regular
             expression.
 
-    Purpose:  
-    
+    Purpose:
+
         This tool provides a quick and easily repeatable method of
         validating key InfiniBand adapter (HCA) and node based InfiniBand
-        settings across an entire cluster.  
-        
+        settings across an entire cluster.
+
         Having consistent OFED settings, and even HCA firmware, can be very
         important for a properly functioning InfiniBand fabric.  This tool
         can help you confirm that your nodes are using the settings you
@@ -55,7 +55,7 @@ test_hca_state
             rate: 10 Gb/sec (4X)
             symbol_error: 0
             port_rcv_errors: 0
-        
+
           IPoIB
             recv_queue_size: 8192
             send_queue_size: 8192
@@ -67,14 +67,14 @@ test_hca_state
               Mode: datagram
               MTU:  4092
               Mode: up
-    
-    
+
+
         #
         # This example uses a FILTER on the word 'firmware'.  In this case, we've
-        # upgraded the firmware across rack11 and rack12.  
+        # upgraded the firmware across rack11 and rack12.
         #
         #   - On rack11, we've also restarted the IB stack (/etc/init.d/openibd
-        #     restart) to activate the new firmware.  
+        #     restart) to activate the new firmware.
         #
         #   - Rack 12 has also been updated, as we can see from the 'Firmware
         #     installed' line, but it's nodes are still running with their prior
@@ -86,12 +86,12 @@ test_hca_state
         ====================================
           Firmware installed: 2.30.3200
           Firmware active:    2.30.3200
-        
+
         ====================================
         rack12
         ====================================
           Firmware installed: 2.30.3200
           Firmware active:    2.11.1260
-    
-    
+
+
 Author:  Brian Finley
diff --git a/docs/source/guides/install-guides/apt/automatic_install.rst b/docs/source/guides/install-guides/apt/automatic_install.rst
index 84dd06fd8..dc926cb7f 100644
--- a/docs/source/guides/install-guides/apt/automatic_install.rst
+++ b/docs/source/guides/install-guides/apt/automatic_install.rst
@@ -3,4 +3,4 @@ Automatic Install Using ``go-xcat``
 
 .. include:: ../common_sections.rst
    :start-after: BEGIN_automatic_install
-   :end-before: END_automatic_install 
+   :end-before: END_automatic_install
diff --git a/docs/source/guides/install-guides/apt/configure_xcat.rst b/docs/source/guides/install-guides/apt/configure_xcat.rst
index 887ef327f..45eff55ec 100644
--- a/docs/source/guides/install-guides/apt/configure_xcat.rst
+++ b/docs/source/guides/install-guides/apt/configure_xcat.rst
@@ -8,14 +8,14 @@ Internet Repository
 
 **[xcat-core]**
 
-From the xCAT download page, find the build you want to install and add to ``/etc/apt/sources.list``. 
+From the xCAT download page, find the build you want to install and add to ``/etc/apt/sources.list``.
 
 To configure the xCAT development build, add the following line to ``/etc/apt/sources.list``: ::
 
   [For x86_64 servers]
-  deb [arch=amd64] http://xcat.org/files/xcat/repos/apt/devel/core-snap trusty main
+  deb [arch=amd64] http://xcat.org/files/xcat/repos/apt/devel/core-snap bionic main
   [For ppc64el servers]
-  deb [arch=ppc64el] http://xcat.org/files/xcat/repos/apt/devel/core-snap trusty main
+  deb [arch=ppc64el] http://xcat.org/files/xcat/repos/apt/devel/core-snap bionic main
 
 
 **[xcat-dep]**
@@ -23,9 +23,9 @@ To configure the xCAT development build, add the following line to ``/etc/apt/so
 To configure the xCAT deps online repository, add the following line to ``/etc/apt/sources.list``: ::
 
   [For x86_64 servers]
-  deb [arch=amd64] http://xcat.org/files/xcat/repos/apt/xcat-dep trusty main
+  deb [arch=amd64] http://xcat.org/files/xcat/repos/apt/latest/xcat-dep bionic main
   [For ppc64el servers]
-  deb [arch=ppc64el] http://xcat.org/files/xcat/repos/apt/xcat-dep trusty main
+  deb [arch=ppc64el] http://xcat.org/files/xcat/repos/apt/latest/xcat-dep bionic main
 
 
 If using internet repositories, continue to the next step to install xCAT.
diff --git a/docs/source/guides/install-guides/apt/manual_install.rst b/docs/source/guides/install-guides/apt/manual_install.rst
index 0f048e5f0..956f5650c 100644
--- a/docs/source/guides/install-guides/apt/manual_install.rst
+++ b/docs/source/guides/install-guides/apt/manual_install.rst
@@ -3,7 +3,7 @@ Manual Install Using Software Repositories
 
 .. include:: ../common_sections.rst
    :start-after: BEGIN_install_xcat_introduction
-   :end-before: END_install_xcat_introduction 
+   :end-before: END_install_xcat_introduction
 
 xCAT is installed by configuring software repositories for ``xcat-core`` and ``xcat-dep`` and using yum package manager.  The repositories can be publicly hosted or locally hosted.
 
diff --git a/docs/source/guides/install-guides/apt/prepare_mgmt_node.rst b/docs/source/guides/install-guides/apt/prepare_mgmt_node.rst
index 20d3f0672..97ccac2ec 100644
--- a/docs/source/guides/install-guides/apt/prepare_mgmt_node.rst
+++ b/docs/source/guides/install-guides/apt/prepare_mgmt_node.rst
@@ -19,18 +19,19 @@ xCAT uses the apt package manager on Ubuntu Linux distributions to install and r
 
 #. Copy the DVD iso file to ``/tmp`` on the Management Node: ::
 
-     # This example will use ubuntu-14.04.3-server-ppc64el.iso
+     # This example will use ubuntu-18.04-server-ppc64el.iso
+     cp /path/to/ubuntu-18.04-server-ppc64el.iso /tmp
 
-#. Mount the iso to ``/mnt/iso/ubuntu14`` on the Management Node.  ::
+#. Mount the iso to ``/mnt/iso/ubuntu`` on the Management Node. ::
 
-     mkdir -p /mnt/iso/ubuntu14
-     mount -o loop /tmp/ubuntu-14.04.3-server-ppc64el.iso /mnt/iso/ubuntu14
+     mkdir -p /mnt/iso/ubuntu
+     mount -o loop /tmp/ubuntu-18.04-server-ppc64el.iso /mnt/iso/ubuntu
 
-#. Create an apt repository file ``/etc/apt.repos.d/ubuntu14-dvd.repo`` that points to the locally mounted iso image from the above step.  The file contents should appear as the following: ::
+#. Create an apt repository file ``/etc/apt.repos.d/ubuntu18-dvd.repo`` that points to the locally mounted iso image from the above step.  The file contents should appear as the following: ::
 
-     [ubuntu-14-dvd-server]
-     name=UBUNTU 14 SERVER packages
-     baseurl=file:///mnt/iso/ubuntu14/Server
+     [ubuntu-dvd-server]
+     name=Ubuntu 18.04 Server packages
+     baseurl=file:///mnt/iso/ubuntu/Server
      enabled=1
      gpgcheck=1
 
@@ -44,10 +45,10 @@ By setting properties on the Management Node before installing the xCAT software
 
    #. To set the hostname of *xcatmn.cluster.com*: ::
 
-       hostname xcatmn.cluster.com 
+       hostname xcatmn.cluster.com
+
+   #. Add the hostname to the ``/etc/hostname`` and ``/etc/hosts`` to persist the hostname on reboot.
 
-   #. Add the hostname to the ``/etc/hostname`` and ``/etc/hosts`` to persist the hostname on reboot. 
-   
    #. Reboot or run ``service hostname restart`` to allow the hostname to take effect and verify the hostname command returns correctly:
 
         * ``hostname``
@@ -55,4 +56,4 @@ By setting properties on the Management Node before installing the xCAT software
 
 #. Reduce the risk of the Management Node IP address being lost by setting the interface IP to **STATIC** in the ``/etc/network/interfaces`` configuration file.
 
-#. Configure any domain search strings and nameservers using the ``resolvconf`` command. 
+#. Configure any domain search strings and nameservers using the ``resolvconf`` command.
diff --git a/docs/source/guides/install-guides/apt/verify_xcat.rst b/docs/source/guides/install-guides/apt/verify_xcat.rst
index d2d09c535..fcecd973d 100644
--- a/docs/source/guides/install-guides/apt/verify_xcat.rst
+++ b/docs/source/guides/install-guides/apt/verify_xcat.rst
@@ -3,4 +3,4 @@ Verify xCAT Installation
 
 .. include:: ../common_sections.rst
    :start-after: BEGIN_verifying_xcat
-   :end-before: END_verifying_xcat 
+   :end-before: END_verifying_xcat
diff --git a/docs/source/guides/install-guides/common_sections.rst b/docs/source/guides/install-guides/common_sections.rst
index 203b6cea9..f803deea1 100644
--- a/docs/source/guides/install-guides/common_sections.rst
+++ b/docs/source/guides/install-guides/common_sections.rst
@@ -1,7 +1,7 @@
 
 .. BEGIN_see_release_notes
 
-For the current list of operating systems supported and verified by the development team for the different releases of xCAT, see the :doc:`xCAT2 Release Notes </overview/xcat2_release>`. 
+For the current list of operating systems supported and verified by the development team for the different releases of xCAT, see the :doc:`xCAT2 Release Notes </overview/xcat2_release>`.
 
 **Disclaimer** These instructions are intended to only be guidelines and specific details may differ slightly based on the operating system version.  Always refer to the operating system documentation for the latest recommended procedures.
 
@@ -33,7 +33,7 @@ The system requirements for your xCAT management node largely depend on the size
 
 xCAT consists of two software packages: ``xcat-core`` and ``xcat-dep``
 
-#. **xcat-core**  xCAT's main software package and is provided in one of the following options: 
+#. **xcat-core**  xCAT's main software package and is provided in one of the following options:
 
      * **Latest Release (Stable) Builds**
 
@@ -50,7 +50,7 @@ xCAT consists of two software packages: ``xcat-core`` and ``xcat-dep``
 #. **xcat-dep**  xCAT's dependency package.  This package is provided as a convenience for the user and contains dependency packages required by xCAT that are not provided by the operating system.
 
 
-.. END_install_xcat_introduction 
+.. END_install_xcat_introduction
 
 .. BEGIN_installation_methods
 
@@ -68,7 +68,7 @@ The following sections describe the different methods for installing xCAT.
         chmod +x /tmp/go-xcat
 
 #. Run the ``go-xcat`` tool: ::
-        
+
         /tmp/go-xcat install            # installs the latest stable version of xCAT
         /tmp/go-xcat -x devel install   # installs the latest development version of xCAT
 
@@ -126,7 +126,7 @@ The following sections describe the different methods for installing xCAT.
 
 **[xcat-dep]**
 
-Unless you are downloading ``xcat-dep`` to match a specific package tested with a GA release, it's recommended to download the latest version of xcat-dep. 
+Unless you are downloading ``xcat-dep`` to match a specific package tested with a GA release, it's recommended to download the latest version of xcat-dep.
 
 
 #. Download xcat-dep: ::
@@ -153,7 +153,7 @@ Unless you are downloading ``xcat-dep`` to match a specific package tested with
 
 **[xcat-dep]**
 
-Unless you are downloading ``xcat-dep`` to match a specific package tested with a GA release, it's recommended to download the latest version of xcat-dep. 
+Unless you are downloading ``xcat-dep`` to match a specific package tested with a GA release, it's recommended to download the latest version of xcat-dep.
 
 
 #. Download xcat-dep: ::
@@ -205,7 +205,7 @@ Quick verification of the xCAT Install can be done running the following steps:
 Starting and Stopping
 ---------------------
 
-xCAT is started automatically after the installation, but the following commands can be used to start, stop, restart, and check xCAT status. 
+xCAT is started automatically after the installation, but the following commands can be used to start, stop, restart, and check xCAT status.
 
 * start xCAT: ::
 
@@ -228,5 +228,5 @@ xCAT is started automatically after the installation, but the following commands
     [systemd] systemctl status xcatd.service
 
 
-.. END_verifying_xcat 
+.. END_verifying_xcat
 
diff --git a/docs/source/guides/install-guides/index.rst b/docs/source/guides/install-guides/index.rst
index 09a92b510..af31e607d 100644
--- a/docs/source/guides/install-guides/index.rst
+++ b/docs/source/guides/install-guides/index.rst
@@ -9,4 +9,4 @@ Install Guides
    yum/index.rst
    zypper/index.rst
    apt/index.rst
-   maintenance/index.rst 
+   maintenance/index.rst
diff --git a/docs/source/guides/install-guides/maintenance/backup_restore_xcat.rst b/docs/source/guides/install-guides/maintenance/backup_restore_xcat.rst
index 47af4ffe9..43831f11a 100644
--- a/docs/source/guides/install-guides/maintenance/backup_restore_xcat.rst
+++ b/docs/source/guides/install-guides/maintenance/backup_restore_xcat.rst
@@ -12,7 +12,7 @@ If need to backup xcat database, you can use :doc:`dumpxCATdb </guides/admin-gui
 
 **[Note]** Maybe you need to dump some environment data for problem report when you hit defect, you can use :doc:`xcatsnap </guides/admin-guides/references/man8/xcatsnap.8>` command like below. ::
 
-    xcatsnap -B -d <path_to_save_the_data> 
+    xcatsnap -B -d <path_to_save_the_data>
 
 
 Restore User Data
diff --git a/docs/source/guides/install-guides/maintenance/uninstall_xcat.rst b/docs/source/guides/install-guides/maintenance/uninstall_xcat.rst
index be28e918a..c3e84774b 100644
--- a/docs/source/guides/install-guides/maintenance/uninstall_xcat.rst
+++ b/docs/source/guides/install-guides/maintenance/uninstall_xcat.rst
@@ -18,7 +18,7 @@ Clean Up xCAT Related Configuration
 
   Keeping xCAT nodes information in ``/etc/hosts`` is harmless,  but if you really want to remove them from ``/etc/hosts`` run:  ::
 
-    makehosts -d all  
+    makehosts -d all
 
 4. To clean up the node information from DNS (optional)
 
@@ -49,14 +49,14 @@ Remove xCAT Files
 1. Remove the xCAT RPMs
 
   There is no easy way to identify all xCAT packages. For packages shipped by xCAT, you can remove them by using the commands below.
-  
+
   [RHEL and SLES] ::
 
       yum remove '*xcat*'
       yum remove '*xCAT*'
 
-  [Ubuntu] ::	  
-  
+  [Ubuntu] ::	
+
       dpkg -l | awk '/xcat/ { print $2 }'
 
   To do an even more thorough cleanup, use links below to get a list of RPMs installed by xCAT. Some RPMs may not to be installed in a specific environment.
@@ -64,32 +64,32 @@ Remove xCAT Files
   * XCAT Core Packages List (xcat-core)	
 
     [RHEL and SLES] ::
-  
+
         http://xcat.org/files/xcat/repos/yum/<version>/xcat-core/
 
     [Ubuntu] ::	
-  
+
         http://xcat.org/files/xcat/repos/apt/<version>/xcat-core/pool/main
-	  
-  * XCAT Dependency Packages (xcat-dep) 
+	
+  * XCAT Dependency Packages (xcat-dep)
 
     [RHEL and SLES] ::
-  
+
         http://xcat.org/files/xcat/repos/yum/xcat-dep/<os>/<arch>
 
     [Ubuntu] ::	
-  
+
         http://xcat.org/files/xcat/repos/apt/xcat-dep/pool/main
 
 
-  When ``yum install xCAT`` is used to install xCAT, dependency RPMs provided by the Operating System will be installed. Keeping those rpms installed on the system is harmless. 
+  When ``yum install xCAT`` is used to install xCAT, dependency RPMs provided by the Operating System will be installed. Keeping those rpms installed on the system is harmless.
 
 
 2. Remove xCAT certificate file ::
 
     rm -rf /root/.xcat
 
-3. Remove xCAT data files 
+3. Remove xCAT data files
 
   By default, xCAT uses SQLite, remove SQLite data files under ``/etc/xcat/``. ::
 
@@ -108,7 +108,7 @@ Remove xCAT Files
     /etc/rsyslogd.d/xCAT-*
     /var/log/xcat	
     /opt/xcat/
-    /mnt/xcat  
+    /mnt/xcat
 
 Remove Databases
 ----------------
diff --git a/docs/source/guides/install-guides/yum/automatic_install.rst b/docs/source/guides/install-guides/yum/automatic_install.rst
index 84dd06fd8..dc926cb7f 100644
--- a/docs/source/guides/install-guides/yum/automatic_install.rst
+++ b/docs/source/guides/install-guides/yum/automatic_install.rst
@@ -3,4 +3,4 @@ Automatic Install Using ``go-xcat``
 
 .. include:: ../common_sections.rst
    :start-after: BEGIN_automatic_install
-   :end-before: END_automatic_install 
+   :end-before: END_automatic_install
diff --git a/docs/source/guides/install-guides/yum/manual_install.rst b/docs/source/guides/install-guides/yum/manual_install.rst
index 0f048e5f0..956f5650c 100644
--- a/docs/source/guides/install-guides/yum/manual_install.rst
+++ b/docs/source/guides/install-guides/yum/manual_install.rst
@@ -3,7 +3,7 @@ Manual Install Using Software Repositories
 
 .. include:: ../common_sections.rst
    :start-after: BEGIN_install_xcat_introduction
-   :end-before: END_install_xcat_introduction 
+   :end-before: END_install_xcat_introduction
 
 xCAT is installed by configuring software repositories for ``xcat-core`` and ``xcat-dep`` and using yum package manager.  The repositories can be publicly hosted or locally hosted.
 
diff --git a/docs/source/guides/install-guides/yum/prepare_mgmt_node.rst b/docs/source/guides/install-guides/yum/prepare_mgmt_node.rst
index 7dbc7d0d7..7e266eb46 100644
--- a/docs/source/guides/install-guides/yum/prepare_mgmt_node.rst
+++ b/docs/source/guides/install-guides/yum/prepare_mgmt_node.rst
@@ -15,9 +15,9 @@ Configure the Base OS Repository
 
 xCAT uses the yum package manager on RHEL Linux distributions to install and resolve dependency packages provided by the base operating system.  Follow this section to create the repository for the base operating system on the Management Node
 
-#. Copy the DVD iso file to ``/tmp`` on the Management Node.  
+#. Copy the DVD iso file to ``/tmp`` on the Management Node.
    This example will use file ``RHEL-LE-7.1-20150219.1-Server-ppc64le-dvd1.iso``
-   
+
 #. Mount the iso to ``/mnt/iso/rhels7.1`` on the Management Node.  ::
 
      mkdir -p /mnt/iso/rhels7.1
@@ -41,12 +41,12 @@ By setting properties on the Management Node before installing the xCAT software
 
    #. To set the hostname of *xcatmn.cluster.com*: ::
 
-       hostname xcatmn.cluster.com 
+       hostname xcatmn.cluster.com
 
    #. Add the hostname to the ``/etc/sysconfig/network`` in order to persist the hostname on reboot.
 
-   
-   #. Reboot the server and verify the hostname by running the following commands: 
+
+   #. Reboot the server and verify the hostname by running the following commands:
 
         * ``hostname``
         * ``hostname -d`` - should display the domain
diff --git a/docs/source/guides/install-guides/yum/verify_xcat.rst b/docs/source/guides/install-guides/yum/verify_xcat.rst
index d2d09c535..fcecd973d 100644
--- a/docs/source/guides/install-guides/yum/verify_xcat.rst
+++ b/docs/source/guides/install-guides/yum/verify_xcat.rst
@@ -3,4 +3,4 @@ Verify xCAT Installation
 
 .. include:: ../common_sections.rst
    :start-after: BEGIN_verifying_xcat
-   :end-before: END_verifying_xcat 
+   :end-before: END_verifying_xcat
diff --git a/docs/source/guides/install-guides/zypper/automatic_install.rst b/docs/source/guides/install-guides/zypper/automatic_install.rst
index 84dd06fd8..dc926cb7f 100644
--- a/docs/source/guides/install-guides/zypper/automatic_install.rst
+++ b/docs/source/guides/install-guides/zypper/automatic_install.rst
@@ -3,4 +3,4 @@ Automatic Install Using ``go-xcat``
 
 .. include:: ../common_sections.rst
    :start-after: BEGIN_automatic_install
-   :end-before: END_automatic_install 
+   :end-before: END_automatic_install
diff --git a/docs/source/guides/install-guides/zypper/index.rst b/docs/source/guides/install-guides/zypper/index.rst
index 253711f78..d19a52a73 100644
--- a/docs/source/guides/install-guides/zypper/index.rst
+++ b/docs/source/guides/install-guides/zypper/index.rst
@@ -11,4 +11,4 @@ Installation Guide for SUSE Linux Enterprise Server
    :maxdepth: 2
 
    prepare_mgmt_node.rst
-   install.rst 
+   install.rst
diff --git a/docs/source/guides/install-guides/zypper/manual_install.rst b/docs/source/guides/install-guides/zypper/manual_install.rst
index 0f048e5f0..956f5650c 100644
--- a/docs/source/guides/install-guides/zypper/manual_install.rst
+++ b/docs/source/guides/install-guides/zypper/manual_install.rst
@@ -3,7 +3,7 @@ Manual Install Using Software Repositories
 
 .. include:: ../common_sections.rst
    :start-after: BEGIN_install_xcat_introduction
-   :end-before: END_install_xcat_introduction 
+   :end-before: END_install_xcat_introduction
 
 xCAT is installed by configuring software repositories for ``xcat-core`` and ``xcat-dep`` and using yum package manager.  The repositories can be publicly hosted or locally hosted.
 
diff --git a/docs/source/guides/install-guides/zypper/prepare_mgmt_node.rst b/docs/source/guides/install-guides/zypper/prepare_mgmt_node.rst
index fd52e4387..1c2323748 100644
--- a/docs/source/guides/install-guides/zypper/prepare_mgmt_node.rst
+++ b/docs/source/guides/install-guides/zypper/prepare_mgmt_node.rst
@@ -20,7 +20,7 @@ xCAT uses the zypper package manager on SLES Linux distributions to install and
 #. Copy the DVD iso file to ``/tmp`` on the Management Node: ::
 
      # This example will use SLE-12-Server-DVD-ppc64le-GM-DVD1.iso
-   
+
 #. Mount the iso to ``/mnt/iso/sles12`` on the Management Node.  ::
 
      mkdir -p /mnt/iso/sles12
@@ -44,12 +44,12 @@ By setting properties on the Management Node before installing the xCAT software
 
    #. To set the hostname of *xcatmn.cluster.com*: ::
 
-       hostname xcatmn.cluster.com 
+       hostname xcatmn.cluster.com
 
    #. Add the hostname to the ``/etc/hostname`` in order to persist the hostname on reboot.
 
-   
-   #. Reboot the server and verify the hostname by running the following commands: 
+
+   #. Reboot the server and verify the hostname by running the following commands:
 
         * ``hostname``
         * ``hostname -d`` - should display the domain
diff --git a/docs/source/guides/install-guides/zypper/verify_xcat.rst b/docs/source/guides/install-guides/zypper/verify_xcat.rst
index d2d09c535..fcecd973d 100644
--- a/docs/source/guides/install-guides/zypper/verify_xcat.rst
+++ b/docs/source/guides/install-guides/zypper/verify_xcat.rst
@@ -3,4 +3,4 @@ Verify xCAT Installation
 
 .. include:: ../common_sections.rst
    :start-after: BEGIN_verifying_xcat
-   :end-before: END_verifying_xcat 
+   :end-before: END_verifying_xcat
diff --git a/docs/source/help.rst b/docs/source/help.rst
index 15e0dde1e..e9f65642f 100644
--- a/docs/source/help.rst
+++ b/docs/source/help.rst
@@ -3,10 +3,10 @@ Need Help
 
 xCAT is now on `GitHub! <https://github.com/xcat2>`_
 
-For support, we encourage the use of the GitHub issues system. 
+For support, we encourage the use of the GitHub issues system.
         * `xcat-core <https://github.com/xcat2/xcat-core/issues>`_
         * `confluent <https://github.com/xcat2/confluent/issues>`_
-        * `documentation <https://github.com/xcat2/xcat-core/issues>`_ issues can be opened against xcat-core project  
+        * `documentation <https://github.com/xcat2/xcat-core/issues>`_ issues can be opened against xcat-core project
 
 
 The older email list is still available: xcat-user@list.sourceforge.net
diff --git a/docs/source/index.rst b/docs/source/index.rst
index 32ec86a95..f971139ad 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -17,8 +17,8 @@ renderfarms, online gaming infrastructure, and whatever tomorrows next buzzword
 
 You've reached xCAT documentation site, The main page product page is http://xcat.org
 
-**xCAT** is an open source project hosted on `GitHub <https://github.com/xcat2/xcat-core/>`_. 
-Go to GitHub to view the source, open issues, ask questions, and participate in the project. 
+**xCAT** is an open source project hosted on `GitHub <https://github.com/xcat2/xcat-core/>`_.
+Go to GitHub to view the source, open issues, ask questions, and participate in the project.
 
 Enjoy!
 
diff --git a/docs/source/overview/architecture.rst b/docs/source/overview/architecture.rst
index 07004e672..c794023ee 100644
--- a/docs/source/overview/architecture.rst
+++ b/docs/source/overview/architecture.rst
@@ -18,10 +18,10 @@ Network Services (dhcp, tftp, http,etc):
   The various network services necessary to perform Operating System deployment over the network.  xCAT will bring up and configure the network services automatically without any intervention from the System Administrator.
 
 Service Processor (SP):
-  A module embedded in the hardware server used to perform the out-of-band hardware control. (e.g. Integrated Management Module (IMM), Flexible Service Processor (FSP), Baseboard Management Controller (BMC), etc) 
+  A module embedded in the hardware server used to perform the out-of-band hardware control. (e.g. Integrated Management Module (IMM), Flexible Service Processor (FSP), Baseboard Management Controller (BMC), etc)
 
 Management network:
-  The network used by the Management Node (or Service Node) to install operating systems and manage the nodes.  The Management Node and in-band Network Interface Card (NIC) of the nodes are connected to this network.   If you have a large cluster utilizing Service Nodes, sometimes this network is segregated into separate VLANs for each Service Node.  
+  The network used by the Management Node (or Service Node) to install operating systems and manage the nodes.  The Management Node and in-band Network Interface Card (NIC) of the nodes are connected to this network.   If you have a large cluster utilizing Service Nodes, sometimes this network is segregated into separate VLANs for each Service Node.
 Service network:
   The network used by the Management Node (or Service Node) to control the nodes using out-of-band management using the Service Processor.  If the Service Processor is configured in shared mode (meaning the NIC of the Service process is used for the SP and the host), then this network can be combined with the management network.
 
diff --git a/docs/source/overview/differentiators.rst b/docs/source/overview/differentiators.rst
index eb015c76b..10b27dcc9 100644
--- a/docs/source/overview/differentiators.rst
+++ b/docs/source/overview/differentiators.rst
@@ -28,7 +28,7 @@ Differentiators
 
 * Built in Automatic discovery
 
-  No need to power on one machine at a time for discovery.  Nodes that fail can be replaced and back in action simply by powering the new one on. 
+  No need to power on one machine at a time for discovery.  Nodes that fail can be replaced and back in action simply by powering the new one on.
 
 * RestFUL API
 
diff --git a/docs/source/overview/features.rst b/docs/source/overview/features.rst
index 176d6b82a..d29c0d3d0 100644
--- a/docs/source/overview/features.rst
+++ b/docs/source/overview/features.rst
@@ -3,7 +3,7 @@ Features
 
 #. Discover the hardware servers
 
-   * Manually define 
+   * Manually define
    * MTMS-based discovery
    * Switch-based discovery
    * Sequential-based discovery
diff --git a/docs/source/overview/xcat2_release.rst b/docs/source/overview/xcat2_release.rst
index 517a5433e..486faf10e 100644
--- a/docs/source/overview/xcat2_release.rst
+++ b/docs/source/overview/xcat2_release.rst
@@ -1,7 +1,7 @@
 xCAT2 Release Information
 =========================
 
-The following table is a summary of the new operating system (OS), hardware, and features that are added to each xCAT release.   The OS and hardware listed in the table have been fully tested with xCAT.   For a more detailed list of new function, bug fixes, restrictions and known problems, refer to the individual release notes for a specific release. 
+The following table is a summary of the new operating system (OS), hardware, and features that are added to each xCAT release.   The OS and hardware listed in the table have been fully tested with xCAT.   For a more detailed list of new function, bug fixes, restrictions and known problems, refer to the individual release notes for a specific release.
 
 * **RHEL** - Red Hat Enterprise Linux
 * **SLES** - Suse Linux Enterprise Server
@@ -14,23 +14,29 @@ xCAT 2.14.x
 |xCAT                             |New OS         |New          |New Feature                       |
 |Version                          |               |Hardware     |                                  |
 +=================================+===============+=============+==================================+
-|| xCAT 2.14.2 2018/7/13          |- ubuntu18.04  |             |                                  |
+|| xCAT 2.14.3 2018/8/24          |- SLES12.3     |             |- OpenBMC rflash enhancement      |
 ||                                |               |             |                                  |
+| `2.14.3 Release Notes <https:// |               |             |- xcat-inventory 0.1.5            |
+| github.com/xcat2/xcat-core/wiki |               |             |                                  |
+| /XCAT_2.14.3_Release_Notes>`_   |               |             |- goconserver v0.3.1              |
++---------------------------------+---------------+-------------+----------------------------------+
+|| xCAT 2.14.2 2018/7/13          |- Ubuntu 18.04 |             |                                  |
+||                                |- RHEL6.10     |             |                                  |
 | `2.14.2 Release Notes <https:// |               |             |                                  |
 | github.com/xcat2/xcat-core/wiki |               |             |                                  |
 | /XCAT_2.14.2_Release_Notes>`_   |               |             |                                  |
 +---------------------------------+---------------+-------------+----------------------------------+
-|| xCAT 2.14.1                    |- RHV4.2 +     |             |- OpenBMC in python enhance:      |
+|| xCAT 2.14.1                    |- RHV 4.2 +    |             |- OpenBMC in python enhancement:  |
 || 2018/6/1                       |  RHEL7.5 + p8 |             |                                  |
-||                                |               |             |  rinv enhance,issue #5176        |
+||                                |               |             |  rinv enhance, issue #5176       |
 | `2.14.1 Release Notes <https:// |               |             |                                  |
 | github.com/xcat2/xcat-core/wiki |               |             |- Cumulus Switch OS - syncfile    |
 | /XCAT_2.14.1_Release_Notes>`_   |               |             |                                  |
-|                                 |               |             |- Discover process enhance        |
+|                                 |               |             |- Discover process enhancement    |
 |                                 |               |             |                                  |
-|                                 |               |             |- xcatprobe `xcatmn` enhance      |
+|                                 |               |             |- xcatprobe `xcatmn` enhancement  |
 |                                 |               |             |                                  |
-|                                 |               |             |- xcat-inventory enhance(beta)    |
+|                                 |               |             |- xcat-inventory enhancement(beta)|
 |                                 |               |             |                                  |
 |                                 |               |             |- goconserver v0.2.2              |
 +---------------------------------+---------------+-------------+----------------------------------+
@@ -74,7 +80,7 @@ xCAT 2.13.x
 +---------------------------------+---------------+-------------+----------------------------------+
 || xCAT 2.13.9                    |               |             |- OpenBMC support:                |
 || 2017/12/18                     |               |             |                                  |
-||                                |               |             |  rflash -a/-u enhance, add -d    |
+||                                |               |             |  rflash -a/-u enhancement, add -d|
 | `2.13.9 Release Notes <https:// |               |             |                                  |
 | github.com/xcat2/xcat-core/wiki |               |             |  reventlog implementation        |
 | /XCAT_2.13.9_Release_Notes>`_   |               |             |                                  |
@@ -91,7 +97,8 @@ xCAT 2.13.x
 | /XCAT_2.13.8_Release_Notes>`_   |               |             |                                  |
 |                                 |               |             |- The document of MN HA           |
 |                                 |               |             |                                  |
-|                                 |               |             |- nodeset enhance for multi-nodes |
+|                                 |               |             |- nodeset enhancement for         |
+|                                 |               |             |  multi-nodes                     |
 +---------------------------------+---------------+-------------+----------------------------------+
 || xCAT 2.13.7                    |               |             |- OpenBMC support:                |
 || 2017/9/22                      |               |             |                                  |
@@ -99,7 +106,8 @@ xCAT 2.13.x
 | `2.13.7 Release Notes <https:// |               |             |                                  |
 | github.com/xcat2/xcat-core/wiki |               |             |  reventlog to get/clear event log|
 | /XCAT_2.13.7_Release_Notes>`_   |               |             |                                  |
-|                                 |               |             |- xcatprobe clusterstatus enhance |
+|                                 |               |             |- xcatprobe clusterstatus         |
+|                                 |               |             |  enhancement                     |
 |                                 |               |             |                                  |
 |                                 |               |             |- PDU support: discover, config   |
 |                                 |               |             |                                  |
@@ -113,14 +121,14 @@ xCAT 2.13.x
 | /XCAT_2.13.6_Release_Notes>`_   |               |             |  /delete/check                   |
 |                                 |               |             |                                  |
 |                                 |               |             |  rspconfig retrieve OpenBMC ip/  |
-|                                 |               |             |  netmask/gateway information     | 
+|                                 |               |             |  netmask/gateway information     |
 |                                 |               |             |- nodeset performance enhancement |
 |                                 |               |             |  (Phase 3)                       |
 |                                 |               |             |                                  |
 |                                 |               |             |  Dispatch request to the         |
-|                                 |               |             |  specified service nodes with    | 
+|                                 |               |             |  specified service nodes with    |
 |                                 |               |             |  'disjointdhcps'                 |
-|                                 |               |             |                                  |  
+|                                 |               |             |                                  |
 |                                 |               |             |  Enhance the output of nodeset   |
 |                                 |               |             |  in hierarchical cluster         |
 |                                 |               |             |                                  |
@@ -153,7 +161,7 @@ xCAT 2.13.x
 |                                 |               |             |  tool xcat-test                  |
 |                                 |               |             |- Service node pool support for   |
 |                                 |               |             |  rhels7 ppc64le diskless         |
-|                                 |               |             |- Mellanox cumulus switch ZTP     | 
+|                                 |               |             |- Mellanox cumulus switch ZTP     |
 |                                 |               |             |  based discovery and             |
 |                                 |               |             |  auto-configuration              |
 |                                 |               |             |- Performance enhancements        |
@@ -360,9 +368,9 @@ xCAT 2.9.x
 |                                 |               |             |                                  |
 +---------------------------------+---------------+-------------+----------------------------------+
 
-.. [#] xCAT 2.9.1 onwards provides support for Kernel-based Virtual Machines (KVM) and requires an operating system that ships the ``perl-Sys-Virt`` package.  
+.. [#] xCAT 2.9.1 onwards provides support for Kernel-based Virtual Machines (KVM) and requires an operating system that ships the ``perl-Sys-Virt`` package.
 
-xCAT 2.8.x 
+xCAT 2.8.x
 ----------
 
 +---------------------------------+---------------+-------------+----------------------------------+
diff --git a/docs/source/references/coral/cluster_mgmt/firmware/ipmi.rst b/docs/source/references/coral/cluster_mgmt/firmware/ipmi.rst
index 354326e82..f40e5a58d 100644
--- a/docs/source/references/coral/cluster_mgmt/firmware/ipmi.rst
+++ b/docs/source/references/coral/cluster_mgmt/firmware/ipmi.rst
@@ -7,11 +7,11 @@ The process for updating firmware on the IBM Power9 Server (Boston) is documente
 Collect the required files
 --------------------------
 
-Collect the following files and put them into a directory on the Management Node. 
+Collect the following files and put them into a directory on the Management Node.
 
    * pUpdate utility
    * .pnor for host
-   * .bin for bmc 
+   * .bin for bmc
 
 If running ``rflash`` in Hierarchy, the firmware files/directory must be accessible on the Service Nodes.
 
@@ -20,14 +20,14 @@ Flash Firmware
 
 Using xCAT ``rflash`` command, specify the directory containing the files with the ``-d`` option. ::
 
-   rflash <noderange> -d /path-to-directory/ 
+   rflash <noderange> -d /path-to-directory/
 
-The ``pUpdate`` utility is leveraged in doing the firmware update against the target node and will do the following: 
+The ``pUpdate`` utility is leveraged in doing the firmware update against the target node and will do the following:
 
    * power off the host
    * flash bmc and reboot
    * flash host
-   * power on the host 
+   * power on the host
 
 Monitor the progress for the nodes by looking at the files under ``/var/log/xcat/rflash/``.
 
diff --git a/docs/source/references/coral/cluster_mgmt/firmware/openbmc/index.rst b/docs/source/references/coral/cluster_mgmt/firmware/openbmc/index.rst
index 4f841ef1a..e28dd0cef 100644
--- a/docs/source/references/coral/cluster_mgmt/firmware/openbmc/index.rst
+++ b/docs/source/references/coral/cluster_mgmt/firmware/openbmc/index.rst
@@ -1,7 +1,7 @@
 OpenBMC Firmware Update
 =======================
 
-.. toctree:: 
+.. toctree::
    :maxdepth: 2
 
    unattended.rst
diff --git a/docs/source/references/coral/cluster_mgmt/firmware/openbmc/manually.rst b/docs/source/references/coral/cluster_mgmt/firmware/openbmc/manually.rst
index 1f3c88160..56bd50a76 100644
--- a/docs/source/references/coral/cluster_mgmt/firmware/openbmc/manually.rst
+++ b/docs/source/references/coral/cluster_mgmt/firmware/openbmc/manually.rst
@@ -1,10 +1,10 @@
 Manual Firmware Flash
 =====================
 
-.. include:: ../../../../../guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/openbmc_common.rst 
+.. include:: ../../../../../guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/openbmc_common.rst
      :start-after: BEGIN_flashing_OpenBMC_Servers
      :end-before: END_flashing_OpenBMC_Servers
 
-.. include:: ../../../../../guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/openbmc_common.rst 
+.. include:: ../../../../../guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/openbmc_common.rst
      :start-after: BEGIN_Validation_OpenBMC_firmware
      :end-before: END_Validation_OpenBMC_firmware
diff --git a/docs/source/references/coral/cluster_mgmt/firmware/openbmc/unattended.rst b/docs/source/references/coral/cluster_mgmt/firmware/openbmc/unattended.rst
index 21e8d9915..c391ae4ca 100644
--- a/docs/source/references/coral/cluster_mgmt/firmware/openbmc/unattended.rst
+++ b/docs/source/references/coral/cluster_mgmt/firmware/openbmc/unattended.rst
@@ -1,10 +1,10 @@
 Unattended Firmware Flash
 =========================
 
-.. include:: ../../../../../guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/openbmc_common.rst 
+.. include:: ../../../../../guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/openbmc_common.rst
      :start-after: BEGIN_unattended_OpenBMC_flashing
      :end-before: END_unattended_OpenBMC_flashing
 
-.. include:: ../../../../../guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/openbmc_common.rst 
+.. include:: ../../../../../guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/openbmc_common.rst
      :start-after: BEGIN_Validation_OpenBMC_firmware
      :end-before: END_Validation_OpenBMC_firmware
diff --git a/docs/source/references/coral/cluster_mgmt/scalability/python/index.rst b/docs/source/references/coral/cluster_mgmt/scalability/python/index.rst
index 97c275cc5..c1a05e403 100644
--- a/docs/source/references/coral/cluster_mgmt/scalability/python/index.rst
+++ b/docs/source/references/coral/cluster_mgmt/scalability/python/index.rst
@@ -1,7 +1,7 @@
 Python framework
 ================
 
-When testing the scale up of xCAT commands against OpenBMC REST API, it was evident that the Perl framework of xCAT did not scale well and was not sending commands to the BMCs in a true parallel fashion.  
+When testing the scale up of xCAT commands against OpenBMC REST API, it was evident that the Perl framework of xCAT did not scale well and was not sending commands to the BMCs in a true parallel fashion.
 
 The team investigated the possibility of using Python framework.  This support is implemented using Python 2.x framework.
 
diff --git a/docs/source/references/coral/cluster_mgmt/scalability/python/install/disable.rst b/docs/source/references/coral/cluster_mgmt/scalability/python/install/disable.rst
index 40c54c64b..e55a63f5a 100644
--- a/docs/source/references/coral/cluster_mgmt/scalability/python/install/disable.rst
+++ b/docs/source/references/coral/cluster_mgmt/scalability/python/install/disable.rst
@@ -1,7 +1,7 @@
 Disable Python Framework
 ========================
 
-By default, if ``xCAT-openbmc-py`` is installed and Python files are there, xCAT will default to running the Python framework. 
+By default, if ``xCAT-openbmc-py`` is installed and Python files are there, xCAT will default to running the Python framework.
 
 A site table attribute is created to allow the ability to control between Python and Perl.
 
diff --git a/docs/source/references/coral/cluster_mgmt/scalability/python/install/index.rst b/docs/source/references/coral/cluster_mgmt/scalability/python/install/index.rst
index 70c74418e..8e8490f6e 100644
--- a/docs/source/references/coral/cluster_mgmt/scalability/python/install/index.rst
+++ b/docs/source/references/coral/cluster_mgmt/scalability/python/install/index.rst
@@ -1,7 +1,7 @@
 Installation
 ============
 
-A new RPM is created that contains the Python code: ``xCAT-openbmc-py``.  The Python code requires additonal Python libraries that may not be available as an operating system provided package.  The following will help resolve the dependencies. 
+A new RPM is created that contains the Python code: ``xCAT-openbmc-py``.  The Python code requires additonal Python libraries that may not be available as an operating system provided package.  The following will help resolve the dependencies.
 
 
 .. toctree::
diff --git a/docs/source/references/coral/cluster_mgmt/scalability/python/install/rpm.rst b/docs/source/references/coral/cluster_mgmt/scalability/python/install/rpm.rst
index 32efaaa19..52d1a59e9 100644
--- a/docs/source/references/coral/cluster_mgmt/scalability/python/install/rpm.rst
+++ b/docs/source/references/coral/cluster_mgmt/scalability/python/install/rpm.rst
@@ -1,9 +1,9 @@
-Using RPM (recommended) 
+Using RPM (recommended)
 =======================
 
 **Support is only for RHEL 7.5 for Power LE (Power 9)**
 
-The following repositories should be configured on your Management Node (and Service Nodes). 
+The following repositories should be configured on your Management Node (and Service Nodes).
 
    * RHEL 7.5 OS Repository
    * RHEL 7.5 Extras Repository
@@ -12,13 +12,13 @@ The following repositories should be configured on your Management Node (and Ser
 
 #. Configure the MN/SN to the RHEL 7.5 OS Repo
 
-#. Configure the MN/SN to the RHEL 7.5 Extras Repo 
+#. Configure the MN/SN to the RHEL 7.5 Extras Repo
 
 #. Configure the MN/SN to the EPEL Repo  (https://fedoraproject.org/wiki/EPEL)
 
-#. Create a local Fedora28 Repo and Configure the MN/SN to the FC28 Repo 
+#. Create a local Fedora28 Repo and Configure the MN/SN to the FC28 Repo
 
-   Here's  an example to configure the Fedora 28 repo at ``/install/repos/fc28`` 
+   Here's  an example to configure the Fedora 28 repo at ``/install/repos/fc28``
 
    #. Make the target repo directory on the MN: ::
 
@@ -27,13 +27,13 @@ The following repositories should be configured on your Management Node (and Ser
    #. Download the rpms from the Internet: ::
 
         cd /install/repos/fc28/ppc64le/Packages
-        wget https://www.rpmfind.net/linux/fedora-secondary/development/rawhide/Everything/ppc64le/os/Packages/p/python2-gevent-1.2.2-2.fc28.ppc64le.rpm 
+        wget https://www.rpmfind.net/linux/fedora-secondary/development/rawhide/Everything/ppc64le/os/Packages/p/python2-gevent-1.2.2-2.fc28.ppc64le.rpm
         wget https://www.rpmfind.net/linux/fedora-secondary/development/rawhide/Everything/ppc64le/os/Packages/p/python2-greenlet-0.4.13-2.fc28.ppc64le.rpm
 
     #. Create a yum repo in that directory: ::
 
         cd /install/repos/fc28/ppc64le/
-        createrepo . 
+        createrepo .
 
 #. Install ``xCAT-openbmc-py`` using ``yum``: ::
 
diff --git a/docs/source/references/coral/cluster_mgmt/scalability/python/performance.rst b/docs/source/references/coral/cluster_mgmt/scalability/python/performance.rst
index 35a01be28..af082e80f 100644
--- a/docs/source/references/coral/cluster_mgmt/scalability/python/performance.rst
+++ b/docs/source/references/coral/cluster_mgmt/scalability/python/performance.rst
@@ -30,9 +30,9 @@ The following commands are currently supported:
 Data
 ----
 
-The following graph shows performance gains in the Python code implementation of ``mgt=openbmc`` when compared to the Perl implementation.  
+The following graph shows performance gains in the Python code implementation of ``mgt=openbmc`` when compared to the Perl implementation.
 
-rpower <noderange> state 
+rpower <noderange> state
 ````````````````````````
 
 This chart gathers data points on a single 18-node frame, up to 4 frames (72-nodes).
diff --git a/docs/source/references/coral/discovery/compute/index.rst b/docs/source/references/coral/discovery/compute/index.rst
index f685c63b8..0a5bd12ca 100644
--- a/docs/source/references/coral/discovery/compute/index.rst
+++ b/docs/source/references/coral/discovery/compute/index.rst
@@ -5,5 +5,5 @@ Compute Nodes
    :maxdepth: 2
 
    discover.rst
-   validation.rst 
+   validation.rst
 
diff --git a/docs/source/references/coral/discovery/index.rst b/docs/source/references/coral/discovery/index.rst
index 3d7984876..1d52a6aff 100644
--- a/docs/source/references/coral/discovery/index.rst
+++ b/docs/source/references/coral/discovery/index.rst
@@ -9,5 +9,5 @@ Discovery
    mid_sw/index.rst
    servicenode/index.rst
    edge_sw/index.rst
-   compute/index.rst 
-   
+   compute/index.rst
+
diff --git a/docs/source/references/coral/discovery/servicenode/index.rst b/docs/source/references/coral/discovery/servicenode/index.rst
index 23ff6169e..018fca8cf 100644
--- a/docs/source/references/coral/discovery/servicenode/index.rst
+++ b/docs/source/references/coral/discovery/servicenode/index.rst
@@ -5,5 +5,5 @@ Service Nodes
    :maxdepth: 2
 
    discover.rst
-   validation.rst 
+   validation.rst
 
diff --git a/docs/source/references/coral/ha/ha_mgmt_node_with_shared_data.rst b/docs/source/references/coral/ha/ha_mgmt_node_with_shared_data.rst
index 0d62646ee..0537cccd8 100644
--- a/docs/source/references/coral/ha/ha_mgmt_node_with_shared_data.rst
+++ b/docs/source/references/coral/ha/ha_mgmt_node_with_shared_data.rst
@@ -44,14 +44,14 @@ Use ``xcatha.py -d`` to disable and stop all related services: ::
 Configure Virtual IP
 ````````````````````
 
-Existing xCAT management node IP should be configured as Virtual IP address, the Virtual IP address should be non-persistent, it needs to be re-configured right after the management node is rebooted. This non-persistent Virtual IP address is designed to avoid ip address conflict when the original primary management node is recovered with this Virtual IP address configured. Since the Virtual IP is non-persistent, the network interface should have a persistent IP address. 
+Existing xCAT management node IP should be configured as Virtual IP address, the Virtual IP address should be non-persistent, it needs to be re-configured right after the management node is rebooted. This non-persistent Virtual IP address is designed to avoid ip address conflict when the original primary management node is recovered with this Virtual IP address configured. Since the Virtual IP is non-persistent, the network interface should have a persistent IP address.
 
 #. Configure another IP on primary management node for network interface as static IP, for example, ``10.5.106.70``:
 
     #. Configure ``10.5.106.70`` as static IP::
 
         ip addr add 10.5.106.70/8 dev eth0
-  
+
     #. Edit ``ifcfg-eth0`` file as::
 
         DEVICE="eth0"
@@ -70,16 +70,16 @@ Existing xCAT management node IP should be configured as Virtual IP address, the
 
     #. Add ``10.5.106.70`` into ``/var/lib/pgsql/data/pg_hba.conf``::
 
-        host    all          all        10.5.106.7/32      md5 
+        host    all          all        10.5.106.7/32      md5
 
-    #. Add ``10.5.106.70`` into ``listen_addresses`` variable in ``/var/lib/pgsql/data/postgresql.conf``:: 
+    #. Add ``10.5.106.70`` into ``listen_addresses`` variable in ``/var/lib/pgsql/data/postgresql.conf``::
 
         listen_addresses = 'localhost,10.5.106.7,10.5.106.70'
 
 #. Modify provision network entry ``mgtifname`` as ``eth0:0`` on primary management node::
-    
+
     tabedit networks
-    "10_0_0_0-255_0_0_0","10.0.0.0","255.0.0.0","eth0:0","10.0.0.103",,"<xcatmaster>",,,,,,,,,,,"1500",, 
+    "10_0_0_0-255_0_0_0","10.0.0.0","255.0.0.0","eth0:0","10.0.0.103",,"<xcatmaster>",,,,,,,,,,,"1500",,
 
 Configure Shared Data
 `````````````````````
@@ -164,10 +164,10 @@ Activate Backup xCAT Management Node to be Primary Management Node
 
 #. Switch to ``PostgreSQL`` database
 
-#. Disable and deactivate services using ``xcatha.py -d`` on both ``xcatmn2`` and ``xcatmn1`` 
+#. Disable and deactivate services using ``xcatha.py -d`` on both ``xcatmn2`` and ``xcatmn1``
 
 #. Remove Virtual IP from primary xCAT Management Node ``xcatmn1``::
-  
+
     ip addr del 10.5.106.7/8 dev eth0:0
 
 #. Configure Virtual IP on ``xcatmn2``
diff --git a/docs/source/references/coral/ha/index.rst b/docs/source/references/coral/ha/index.rst
index 93e8d663c..15a0ca208 100644
--- a/docs/source/references/coral/ha/index.rst
+++ b/docs/source/references/coral/ha/index.rst
@@ -4,4 +4,4 @@ HA
 .. toctree::
    :maxdepth: 2
 
-   ha_mgmt_node_with_shared_data.rst 
+   ha_mgmt_node_with_shared_data.rst
diff --git a/docs/source/references/coral/index.rst b/docs/source/references/coral/index.rst
index c89735c71..5e28d2137 100644
--- a/docs/source/references/coral/index.rst
+++ b/docs/source/references/coral/index.rst
@@ -1,7 +1,7 @@
 CORAL
 =====
 
-CORAL stands for Collaboration of Oak Ridge, Argonne, and Livermore and is solution that IBM is building for the Department of Energy to superseed its current cluster of Supercomputers. 
+CORAL stands for Collaboration of Oak Ridge, Argonne, and Livermore and is solution that IBM is building for the Department of Energy to superseed its current cluster of Supercomputers.
 
 
 .. toctree::
@@ -9,6 +9,6 @@ CORAL stands for Collaboration of Oak Ridge, Argonne, and Livermore and is solut
 
    cluster_mgmt/index.rst
    known_issues/index.rst
-   ha/index.rst 
+   ha/index.rst
 ..   mn/index.rst
 ..   discovery/index.rst
diff --git a/docs/source/references/coral/known_issues/genesis_base.rst b/docs/source/references/coral/known_issues/genesis_base.rst
index c01b4848a..3df864a89 100644
--- a/docs/source/references/coral/known_issues/genesis_base.rst
+++ b/docs/source/references/coral/known_issues/genesis_base.rst
@@ -13,8 +13,8 @@ Work-around
 xCAT cannot ship a kernel based on RHEL distribution, so the customer needs to build a version of the ``xCAT-genesis-base`` on-site using a server running Red Hat Enterprise Linux.
 
 1. Download the latest timestamp version of the ``xCAT-genesis-builder`` RPM provided here: http://xcat.org/files/xcat/xcat-dep/2.x_Linux/beta/
-   
-2. Install the ``xCAT-genesis-builder`` RPM on a node that is installed with the RHEL version being deployed. 
+
+2. Install the ``xCAT-genesis-builder`` RPM on a node that is installed with the RHEL version being deployed.
 
 3. Build the ``xCAT-genesis-base`` RPM: ::
 
diff --git a/docs/source/references/coral/known_issues/openbmc/2_13_8.rst b/docs/source/references/coral/known_issues/openbmc/2_13_8.rst
index d5502f9be..957c40a03 100644
--- a/docs/source/references/coral/known_issues/openbmc/2_13_8.rst
+++ b/docs/source/references/coral/known_issues/openbmc/2_13_8.rst
@@ -3,5 +3,5 @@
 
 Issue `#4264 <https://github.com/xcat2/xcat-core/issues/4264>`_
 
-In attempt to improve the performance of the REST calls to OpenBMC and reduce the time spent in a timeout, we fail too soon here before the BMC has a chance to respond. 
+In attempt to improve the performance of the REST calls to OpenBMC and reduce the time spent in a timeout, we fail too soon here before the BMC has a chance to respond.
 
diff --git a/docs/source/references/coral/known_issues/openbmc/SW402273.rst b/docs/source/references/coral/known_issues/openbmc/SW402273.rst
index b1a07e688..7c3105f3d 100644
--- a/docs/source/references/coral/known_issues/openbmc/SW402273.rst
+++ b/docs/source/references/coral/known_issues/openbmc/SW402273.rst
@@ -5,9 +5,9 @@ SW402273 - Unable to tell the firmware level that is actually running on the nod
 * **Reported:** 1738B (ibm-v1.99.10-0-r7)
 * **Fixed:** 1740B (ibm-v1.99.10-0-r13)
 
-**Issue:** 
+**Issue:**
 
-Until 1740B firmware (> ibm-v1.99.10-0-r13), there's no method provided by OpenBMC to indicate the active running firmware on the node.  Until the BMC is rebooted or the HOST is rebooted, the Active firmware may or may not really be running. 
+Until 1740B firmware (> ibm-v1.99.10-0-r13), there's no method provided by OpenBMC to indicate the active running firmware on the node.  Until the BMC is rebooted or the HOST is rebooted, the Active firmware may or may not really be running.
 
 If you are running a version that prints the following message from ``rflash``:  ::
 
diff --git a/docs/source/references/coral/known_issues/openbmc/SW404161.rst b/docs/source/references/coral/known_issues/openbmc/SW404161.rst
index e955fdeab..a3d3405db 100644
--- a/docs/source/references/coral/known_issues/openbmc/SW404161.rst
+++ b/docs/source/references/coral/known_issues/openbmc/SW404161.rst
@@ -5,7 +5,7 @@ SW404161 - Firmware do not self extract tar, causing rflash cannot find ID to ac
 * **Reported:** 1738A (ibm-v1.99.10-0-r7)
 * **Fixed:** 1742D (ibm-v1.99.10-0-113-r10)
 
-**Issue:** 
+**Issue:**
 
 Firmware is not extracted and could not be found by rflash to activate ::
 
@@ -20,7 +20,7 @@ Firmware is not extracted and could not be found by rflash to activate ::
     c650f07p27: Could not find ID for firmware ibm-v1.99.10-113-g65edf7d-r8-0-g713d86d to activate, waiting 10 seconds and retry...
     c650f07p27: Error: Could not find firmware ibm-v1.99.10-113-g65edf7d-r8-0-g713d86d after waiting 60 seconds.
 
-**Work-around:** Use one of the following methods: 
+**Work-around:** Use one of the following methods:
 
 * Reboot the BMC before flashing firmware: ``rpower <> bmcreboot``
 * ssh into bmc and run:  ``systemctl restart xyz.openbmc_project.Software.Version.service``
diff --git a/docs/source/references/coral/known_issues/openbmc/SW406771.rst b/docs/source/references/coral/known_issues/openbmc/SW406771.rst
index 145844d86..d02460327 100644
--- a/docs/source/references/coral/known_issues/openbmc/SW406771.rst
+++ b/docs/source/references/coral/known_issues/openbmc/SW406771.rst
@@ -5,7 +5,7 @@ SW406771 - Duplicate FW ID or 2 BMC firmware active at the same time
 * **Reported:** 1740A (ibm-v1.99.10-0-r11-0-g9c65260)
 * **Fixed:** 1742 or higher
 
-**Issue:** 
+**Issue:**
 
 At some point after 1740A firmware, ``ibm-v1.99.10-0-r11-0-g9c65260``, the hashing algorithm to create the ID on the BMC was chagned by the Firmware team. This allows for the same firmware to potentially have two different IDs resulting in two active running BMC firmware.
 
@@ -15,7 +15,7 @@ At some point after 1740A firmware, ``ibm-v1.99.10-0-r11-0-g9c65260``, the hashi
 Upgrade from 1740A
 ------------------
 
-If you are running 1740A, you will need to get two BMC firmware levels from your IBM representative. 
+If you are running 1740A, you will need to get two BMC firmware levels from your IBM representative.
 
 This example will cover flashing from 1740A to 1742D, using 1742C as the recovery flash level.
 
@@ -47,7 +47,7 @@ This example will cover flashing from 1740A to 1742D, using 1742C as the recover
     mid05tor12cn13: 9e55358e BMC     Active     ibm-v1.99.10-0-r11-0-g9c65260
     mid05tor12cn13: 221d9020 Host    Active(*)  IBM-witherspoon-redbud-ibm-OP9_v1.19_1.33
     mid05tor12cn13: 6e71e1af BMC     Active(*)  ibm-v1.99.10-113-g65edf7d-r10-0-gcdf7635
-    mid05tor12cn13: f6590ce0 BMC     Active(+)  ibm-v1.99.10-113-g65edf7d-r8-0-g713d86d    <--- 1742C 
+    mid05tor12cn13: f6590ce0 BMC     Active(+)  ibm-v1.99.10-113-g65edf7d-r8-0-g713d86d    <--- 1742C
     mid05tor12cn13:
 
 #. Delete the bad hash firmware: ``rflash <node> -d 6e71e1af``
@@ -59,7 +59,7 @@ This example will cover flashing from 1740A to 1742D, using 1742C as the recover
     mid05tor12cn13: ID       Purpose State      Version
     mid05tor12cn13: -------------------------------------------------------
     mid05tor12cn13: 221d9020 Host    Active(*)  IBM-witherspoon-redbud-ibm-OP9_v1.19_1.33
-    mid05tor12cn13: efc8a851 BMC     Active(*)  ibm-v1.99.10-113-g65edf7d-r10-0-gcdf7635   <--- good hash 
+    mid05tor12cn13: efc8a851 BMC     Active(*)  ibm-v1.99.10-113-g65edf7d-r10-0-gcdf7635   <--- good hash
     mid05tor12cn13: f6590ce0 BMC     Active     ibm-v1.99.10-113-g65edf7d-r8-0-g713d86d
     mid05tor12cn13:
 
@@ -77,8 +77,8 @@ If you have two active BMCs::
     f7n02: f6590ce0 BMC     Active(*)  ibm-v1.99.10-113-g65edf7d-r8-0-g713d86d
     f7n02:
 
-There's no way to de-activate one manually, recover by doing the following: 
+There's no way to de-activate one manually, recover by doing the following:
 
 #. Flash the BMC to the previous level of the firmware and reboot BMC
 #. Delete the duplicate firmware using ``rflash <node> -d <ID>``
-#. Re-flash the BMC to the target level and reboot the BMC. 
+#. Re-flash the BMC to the target level and reboot the BMC.
diff --git a/docs/source/references/coral/known_issues/openbmc/SW407037.rst b/docs/source/references/coral/known_issues/openbmc/SW407037.rst
index 5f939ede3..d3947a6c1 100644
--- a/docs/source/references/coral/known_issues/openbmc/SW407037.rst
+++ b/docs/source/references/coral/known_issues/openbmc/SW407037.rst
@@ -3,27 +3,27 @@ SW407037 - bmcsetup does not successfully configure the IP (Sev1)
 
 * **Issue:** `SW407037 <https://w3.rchland.ibm.com/projects/bestquest/?defect=SW407037>`_
 * **Reported:** 1742C (ibm-v1.99.10-113-g65edf7d-r8-0-g713d86d)
-* **Fixed:** Fixed in xCAT after 11/07/17 `#4242 <https://github.com/xcat2/xcat-core/issues/4242>`_ 
+* **Fixed:** Fixed in xCAT after 11/07/17 `#4242 <https://github.com/xcat2/xcat-core/issues/4242>`_
 
-**Issue:** 
+**Issue:**
 
-OpenBMC firmware has problems with ipmi inband support of the ``access on`` comamnd and the work around is to use the ``raw 0x06 0x40`` instead.  In early Sept, we switched to using ``access on`` because the implementation looked like it was working, since then we have found some issues with it and recommendation is to revert back to the raw command. 
+OpenBMC firmware has problems with ipmi inband support of the ``access on`` comamnd and the work around is to use the ``raw 0x06 0x40`` instead.  In early Sept, we switched to using ``access on`` because the implementation looked like it was working, since then we have found some issues with it and recommendation is to revert back to the raw command.
 
 See related issues describing potential problems:
 * https://github.com/openbmc/openbmc/issues/2493
 * https://github.com/openbmc/openbmc/issues/2492
 
-This problem is very severe because if the network is not configured correctly, the access to the BMC is lost. 
+This problem is very severe because if the network is not configured correctly, the access to the BMC is lost.
 
 **Work-around**
 
-Use one of the following work arounds: 
+Use one of the following work arounds:
 
 #.  Install a version of xCAT built after November, 07, 2017 which includes the fix. (**Recommended**)
 
 #.  Manually patch bmcsetup using changes in PR: https://github.com/xcat2/xcat-core/pull/4247, then run ``mknb ppc64``
 
-#.  Patch the system with provided patch: 
+#.  Patch the system with provided patch:
 
     #. Download patch file: https://github.com/xcat2/xcat-core/files/1451181/bmcsetup.4242.patch.txt
 
@@ -32,7 +32,7 @@ Use one of the following work arounds:
     #. ``cd /opt/xcat/share/xcat/netboot/genesis/ppc64/fs/usr/bin``
 
     #. ``patch -p0 < /tmp/bmcsetup.4242.patch.txt``
- 
+
     #. ``mknb ppc64``
 
 
diff --git a/docs/source/references/coral/known_issues/openbmc/index.rst b/docs/source/references/coral/known_issues/openbmc/index.rst
index 0f01bb3f9..03ae246fc 100644
--- a/docs/source/references/coral/known_issues/openbmc/index.rst
+++ b/docs/source/references/coral/known_issues/openbmc/index.rst
@@ -1,4 +1,4 @@
-OpenBMC Management Issues 
+OpenBMC Management Issues
 =========================
 
 xCAT
@@ -17,7 +17,7 @@ Please see the `2.13.8 Release Notes <https://github.com/xcat2/xcat-core/wiki/XC
 Firmware
 --------
 
-The following versions indicate the level of firmware the issue was reported. 
+The following versions indicate the level of firmware the issue was reported.
 
 
 1742C - ibm-v1.99.10-113-g65edf7d-r8-0-g713d86d
diff --git a/docs/source/references/coral/mn/index.rst b/docs/source/references/coral/mn/index.rst
index 55f5cb559..0df5b471e 100644
--- a/docs/source/references/coral/mn/index.rst
+++ b/docs/source/references/coral/mn/index.rst
@@ -1,12 +1,12 @@
 Management Node
 ===============
 
-The Management Node should be installed with a RHEL Operating System.  The following guides describe the process of installation, configuration and validation of xCAT on the Management Node. 
+The Management Node should be installed with a RHEL Operating System.  The following guides describe the process of installation, configuration and validation of xCAT on the Management Node.
 
 .. toctree::
    :maxdepth: 2
 
    install.rst
-   configure/index.rst 
+   configure/index.rst
    validate/index.rst
 
diff --git a/docs/source/references/coral/mn/install.rst b/docs/source/references/coral/mn/install.rst
index 92baff000..d0547d859 100644
--- a/docs/source/references/coral/mn/install.rst
+++ b/docs/source/references/coral/mn/install.rst
@@ -1,4 +1,4 @@
-Install 
+Install
 =======
 
 
@@ -13,4 +13,4 @@ Install the following RPMs Management Node.  They are used by various tools xCAT
 Install xCAT
 ------------
 
-See :ref:`rhel_install_guide` for detailed xCAT installation instructions. 
+See :ref:`rhel_install_guide` for detailed xCAT installation instructions.
diff --git a/docs/source/references/index.rst b/docs/source/references/index.rst
index 7a3d6402a..63cb8dd23 100644
--- a/docs/source/references/index.rst
+++ b/docs/source/references/index.rst
@@ -1,11 +1,11 @@
 Reference Implementation
 ========================
 
-Reference documentation created for management of large clusters using xCAT. 
+Reference documentation created for management of large clusters using xCAT.
 
 .. toctree::
    :maxdepth: 2
 
    coral/index.rst
    percs/index.rst
-   
+
diff --git a/docs/source/security/2015/20150312_openssl.rst b/docs/source/security/2015/20150312_openssl.rst
index aa9a9e096..a40bc494c 100644
--- a/docs/source/security/2015/20150312_openssl.rst
+++ b/docs/source/security/2015/20150312_openssl.rst
@@ -1,19 +1,19 @@
 2015-03-12 - OpenSSL Vulnerabilities  (FREAK)
 =============================================
 
-OpenSSL announced security fixes on 01/08/15 in the following bulletin: https://www-origin.openssl.org/news/secadv/20150108.txt  
+OpenSSL announced security fixes on 01/08/15 in the following bulletin: https://www-origin.openssl.org/news/secadv/20150108.txt
 
 Advisory CVEs
 -------------
 
 * CVE-2015-0204 **RSA silently downgrades to EXPORT_RSA [Client]** (Severity: Low)
 
-FREAK vulnerability CVE-2015-0204 is involved when 'RSA_EXPORT' ssl cipher suit is used in ssl server/client. 
+FREAK vulnerability CVE-2015-0204 is involved when 'RSA_EXPORT' ssl cipher suit is used in ssl server/client.
 
 Action
 ------
 
-xCAT does not use RSA_EXPORT ciphers for ssl communication by default. However, xCAT does allow user to choose the ciphers from the site.xcatsslciphers attribute. 
+xCAT does not use RSA_EXPORT ciphers for ssl communication by default. However, xCAT does allow user to choose the ciphers from the site.xcatsslciphers attribute.
 
 Make sure you do not put RSA_EXPORT related ciphers in this attribute.
 
diff --git a/docs/source/security/2015/20150324_openssl.rst b/docs/source/security/2015/20150324_openssl.rst
index d7080600b..1ba5aa5b3 100644
--- a/docs/source/security/2015/20150324_openssl.rst
+++ b/docs/source/security/2015/20150324_openssl.rst
@@ -1,7 +1,7 @@
-2015-03-24 - OpenSSL Vulnerabilities 
+2015-03-24 - OpenSSL Vulnerabilities
 ====================================
 
-OpenSSL 1.0.2 introduced the "multiblock" performance improvement. This feature only applies on 64 bit x86 architecture platforms that support AES NI instructions. A defect in the implementation of "multiblock" can cause a segmentation fault within OpenSSL, thus enabling a potential DoS attack. 
+OpenSSL 1.0.2 introduced the "multiblock" performance improvement. This feature only applies on 64 bit x86 architecture platforms that support AES NI instructions. A defect in the implementation of "multiblock" can cause a segmentation fault within OpenSSL, thus enabling a potential DoS attack.
 
 This issue affects OpenSSL version: 1.0.2
 
@@ -9,4 +9,4 @@ This issue affects OpenSSL version: 1.0.2
 Action
 ------
 
-xCAT uses OpenSSL for client-server communication but **does not** ship it. Upgrade OpenSSL to 1.0.2a or higher. 
+xCAT uses OpenSSL for client-server communication but **does not** ship it. Upgrade OpenSSL to 1.0.2a or higher.
diff --git a/docs/source/security/2015/20150403_openssl.rst b/docs/source/security/2015/20150403_openssl.rst
index 12262015c..762822f90 100644
--- a/docs/source/security/2015/20150403_openssl.rst
+++ b/docs/source/security/2015/20150403_openssl.rst
@@ -1,14 +1,14 @@
 2015-04-03 - OpenSSL Vulnerabilities (BAR MITZVAH)
 ==================================================
 
-The RC4 Bar mitzvah attack is an attack on the SSL/TLS protocols when both the client and server have RC4 enabled. 
+The RC4 Bar mitzvah attack is an attack on the SSL/TLS protocols when both the client and server have RC4 enabled.
 
-* http://www.darkreading.com/attacks-breaches/ssl-tls-suffers-bar-mitzvah-attack-/d/d-id/1319633 
+* http://www.darkreading.com/attacks-breaches/ssl-tls-suffers-bar-mitzvah-attack-/d/d-id/1319633
 * http://www.imperva.com/docs/HII_Attacking_SSL_when_using_RC4.pdf.
 
 Action
 ------
 
-xCAT uses OpenSSL shipped with OS distribution for client-server communication. It does not use RC4 ciphers explicitly. However, it allows user to specify xcatsslciphers on the site table for ssl communication. It is recommended that the user not specify RC4 ciphers to avoid the Bar mitzvah attack. 
+xCAT uses OpenSSL shipped with OS distribution for client-server communication. It does not use RC4 ciphers explicitly. However, it allows user to specify xcatsslciphers on the site table for ssl communication. It is recommended that the user not specify RC4 ciphers to avoid the Bar mitzvah attack.
 
-It is also recommended that the user go to the OS distribution to get latest OpenSSL package for the fix of this problem. 
+It is also recommended that the user go to the OS distribution to get latest OpenSSL package for the fix of this problem.
diff --git a/docs/source/security/2015/20150519_openssl.rst b/docs/source/security/2015/20150519_openssl.rst
index 35220c4d0..0affd1f4a 100644
--- a/docs/source/security/2015/20150519_openssl.rst
+++ b/docs/source/security/2015/20150519_openssl.rst
@@ -4,7 +4,7 @@
 Advisory CVEs
 -------------
 
-* CVE-2015-3456 - **(aka VENOM) is a security flaw in the QEMU's Floppy Disk Controller (FDC) emulation.** 
+* CVE-2015-3456 - **(aka VENOM) is a security flaw in the QEMU's Floppy Disk Controller (FDC) emulation.**
 
 VENOM vulnerability could expose virtual machines on unpatched host systems
 
@@ -22,6 +22,6 @@ The VENOM bug (CVE-2015-3456) exists in the virtual Floppy Disk Controller for t
 Action
 ------
 
-xCAT does not ship any rpms that have QEMU component directly. However xCAT does make system calls to QEMU when doing KVM/Xen visualization. If you are using xCAT to manage KVM or Xen hosts and quests, get the latest rpms that have QEMU component from the os distro and do a upgrade on both xCAT management node and the KVM/Xen hosts. 
+xCAT does not ship any rpms that have QEMU component directly. However xCAT does make system calls to QEMU when doing KVM/Xen visualization. If you are using xCAT to manage KVM or Xen hosts and quests, get the latest rpms that have QEMU component from the os distro and do a upgrade on both xCAT management node and the KVM/Xen hosts.
 
 
diff --git a/docs/source/security/2015/20150520_openssl.rst b/docs/source/security/2015/20150520_openssl.rst
index 9bb2ae6bd..4a0be5f77 100644
--- a/docs/source/security/2015/20150520_openssl.rst
+++ b/docs/source/security/2015/20150520_openssl.rst
@@ -15,6 +15,6 @@ Refer to the following openssl link for more details regarding the fix: https://
 Action
 ------
 
-xCAT uses OpenSSL for client-server communication but **does not** ship it.  It uses the default ciphers from openssl. It also allows the user to customize it through site.xcatsslversion and site.xcatsslciphers. Make sure you do not enable DH or DHE ciphers. 
+xCAT uses OpenSSL for client-server communication but **does not** ship it.  It uses the default ciphers from openssl. It also allows the user to customize it through site.xcatsslversion and site.xcatsslciphers. Make sure you do not enable DH or DHE ciphers.
 
 Get the latest openssl package from the os distros and upgrade it on all the xCAT management nodes, the service nodes and xCAT client nodes.
diff --git a/docs/source/security/2015/20151203_openssl.rst b/docs/source/security/2015/20151203_openssl.rst
index da5e9e772..bc4f9f9c0 100644
--- a/docs/source/security/2015/20151203_openssl.rst
+++ b/docs/source/security/2015/20151203_openssl.rst
@@ -36,7 +36,7 @@ Advisory CVEs
 Action
 ------
 
-xCAT uses OpenSSL for client-server communication but **does not** ship it.  
+xCAT uses OpenSSL for client-server communication but **does not** ship it.
 
-It is recommended to keep your OpenSSL levels up-to-date with the indicated versions in the security bulletins to prevent any potential security threats. 
+It is recommended to keep your OpenSSL levels up-to-date with the indicated versions in the security bulletins to prevent any potential security threats.
 
diff --git a/docs/source/security/2015/index.rst b/docs/source/security/2015/index.rst
index 4da7c1928..4e4c29845 100644
--- a/docs/source/security/2015/index.rst
+++ b/docs/source/security/2015/index.rst
@@ -1,4 +1,4 @@
-2015 Notices 
+2015 Notices
 ============
 
 .. toctree::
diff --git a/docs/source/security/2016/20160115_openssl.rst b/docs/source/security/2016/20160115_openssl.rst
index 32dcee2a3..5d0a3ebe2 100644
--- a/docs/source/security/2016/20160115_openssl.rst
+++ b/docs/source/security/2016/20160115_openssl.rst
@@ -11,9 +11,9 @@ Advisory CVEs
 Action
 ------
 
-xCAT uses OpenSSL for client-server communication but **does not** ship it.  
+xCAT uses OpenSSL for client-server communication but **does not** ship it.
 
-It is highly recommended to keep your OpenSSL levels up-to-date with the indicated versions in the security bulletins to prevent any potential security threats. Obtain the updated software packages from your Operating system distribution channels. 
+It is highly recommended to keep your OpenSSL levels up-to-date with the indicated versions in the security bulletins to prevent any potential security threats. Obtain the updated software packages from your Operating system distribution channels.
 
 
 
diff --git a/docs/source/security/2016/20160128_openssl.rst b/docs/source/security/2016/20160128_openssl.rst
index a4b5f567a..ed1f2f536 100644
--- a/docs/source/security/2016/20160128_openssl.rst
+++ b/docs/source/security/2016/20160128_openssl.rst
@@ -8,14 +8,14 @@ Advisory CVEs
 
 * CVE-2016-0701 - **DH small subgroups**  (Severity:High)
 
-  This issue affects OpenSSL version 1.0.2.  
+  This issue affects OpenSSL version 1.0.2.
   OpenSSL 1.0.2 users should upgrade to 1.0.2f
 
 * CVE-2015-3197 - **SSLv2 doesn't block disabled ciphers**   (Severity:Low)
 
-  This issue affects OpenSSL versions 1.0.2 and 1.0.1.  
+  This issue affects OpenSSL versions 1.0.2 and 1.0.1.
 
-  OpenSSL 1.0.2 users should upgrade to 1.0.2f  
+  OpenSSL 1.0.2 users should upgrade to 1.0.2f
   OpenSSL 1.0.1 users should upgrade to 1.0.1r
 
 
@@ -24,5 +24,5 @@ Action
 
 xCAT uses OpenSSL for client-server communication but **does not** ship it.
 
-It is recommended to keep your OpenSSL levels up-to-date with the indicated versions in the security bulletins to prevent any potential security threats. 
+It is recommended to keep your OpenSSL levels up-to-date with the indicated versions in the security bulletins to prevent any potential security threats.
 
diff --git a/docs/source/security/2016/20160301_openssl.rst b/docs/source/security/2016/20160301_openssl.rst
index aa466cfb3..4d69040ba 100644
--- a/docs/source/security/2016/20160301_openssl.rst
+++ b/docs/source/security/2016/20160301_openssl.rst
@@ -8,61 +8,61 @@ Advisory CVEs
 
 * CVE-2016-0800 - **Cross-protocol attack on TLS using SSLv2 (DROWN)**  (Severity:High)
 
-  This issue affects OpenSSL versions 1.0.1 and 1.0.2.  
-  
-  OpenSSL 1.0.2 users should upgrade to 1.0.2g  
+  This issue affects OpenSSL versions 1.0.1 and 1.0.2.
+
+  OpenSSL 1.0.2 users should upgrade to 1.0.2g
   OpenSSL 1.0.1 users should upgrade to 1.0.1s
 
 * CVE-2016-0705 - **Double-free in DSA code** (Severity:Low)
 
   This issue affects OpenSSL versions 1.0.2 and 1.0.1.
 
-  OpenSSL 1.0.2 users should upgrade to 1.0.2g  
+  OpenSSL 1.0.2 users should upgrade to 1.0.2g
   OpenSSL 1.0.1 users should upgrade to 1.0.1s
 
 * CVE-2016-0798  - **Memory leak in SRP database lookups** (Severity:Low)
- 
+
   This issue affects OpenSSL versions 1.0.2 and 1.0.1.
 
-  OpenSSL 1.0.2 users should upgrade to 1.0.2g  
+  OpenSSL 1.0.2 users should upgrade to 1.0.2g
   OpenSSL 1.0.1 users should upgrade to 1.0.1s
 
 * CVE-2016-0797  - **BN_hex2bn/BN_dec2bn NULL pointer deref/heap corruption** (Severity:Low)
- 
+
   This issue affects OpenSSL versions 1.0.2 and 1.0.1.
 
-  OpenSSL 1.0.2 users should upgrade to 1.0.2g  
+  OpenSSL 1.0.2 users should upgrade to 1.0.2g
   OpenSSL 1.0.1 users should upgrade to 1.0.1s
 
 
 * CVE-2016-0797  - **Fix memory issues in BIO_*printf functions** (Severity:Low)
- 
+
   This issue affects OpenSSL versions 1.0.2 and 1.0.1.
 
-  OpenSSL 1.0.2 users should upgrade to 1.0.2g  
+  OpenSSL 1.0.2 users should upgrade to 1.0.2g
   OpenSSL 1.0.1 users should upgrade to 1.0.1s
 
 
 * CVE-2016-0702  - **Side channel attack on modular exponentiation** (Severity:Low)
- 
+
   This issue affects OpenSSL versions 1.0.2 and 1.0.1.
 
-  OpenSSL 1.0.2 users should upgrade to 1.0.2g  
+  OpenSSL 1.0.2 users should upgrade to 1.0.2g
   OpenSSL 1.0.1 users should upgrade to 1.0.1s
 
 * CVE-2016-0703  - **Divide-and-conquer session key recovery in SSLv2** (Severity:High)
- 
+
   This issue affected OpenSSL versions 1.0.2, 1.0.1l, 1.0.0q, 0.9.8ze and all earlier versions.  It was fixed in OpenSSL 1.0.2a, 1.0.1m, 1.0.0r and 0.9.8zf
 
 * CVE-2016-0704  - **Bleichenbacher oracle in SSLv2** (Severity:Moderate)
- 
+
   This issue affected OpenSSL versions 1.0.2, 1.0.1l, 1.0.0q, 0.9.8ze and all earlier versions.  It was fixed in OpenSSL 1.0.2a, 1.0.1m, 1.0.0r and 0.9.8zf
 
 
 Action
 ------
 
-xCAT uses OpenSSL for client-server communication but **does not** ship it.  Regarding CVE-2016-0800, xCAT also does not use SSLv2 layer but uses the newer TLS transport layer security.  
+xCAT uses OpenSSL for client-server communication but **does not** ship it.  Regarding CVE-2016-0800, xCAT also does not use SSLv2 layer but uses the newer TLS transport layer security.
 
-It is recommended to keep your OpenSSL levels up-to-date with the indicated versions in the security bulletins to prevent any potential security threats. 
+It is recommended to keep your OpenSSL levels up-to-date with the indicated versions in the security bulletins to prevent any potential security threats.
 
diff --git a/docs/source/security/2016/20160503_openssl.rst b/docs/source/security/2016/20160503_openssl.rst
index 33b94836b..5b58f1060 100644
--- a/docs/source/security/2016/20160503_openssl.rst
+++ b/docs/source/security/2016/20160503_openssl.rst
@@ -9,7 +9,7 @@ Advisory CVEs
 * CVE-2016-2108 - **Memory corruption in the ASN.1 encoder** (Severity:High)
 
   This issue affects all OpenSSL version prior to April 2015
-  
+
   OpenSSL 1.0.2 users should upgrade to 1.0.2c
   OpenSSL 1.0.1 users should upgrade to 1.0.1o
 
@@ -21,12 +21,12 @@ Advisory CVEs
   OpenSSL 1.0.1 users should upgrade to 1.0.1t
 
 * CVE-2016-2105 - **EVP_EncodeUpdate overflow** (Severity:Low)
- 
+
   OpenSSL 1.0.2 users should upgrade to 1.0.2h
   OpenSSL 1.0.1 users should upgrade to 1.0.1t
 
 * CVE-2016-2106 - **EVP_EncryptUpdate overflow** (Severity:Low)
- 
+
   OpenSSL 1.0.2 users should upgrade to 1.0.2h
   OpenSSL 1.0.1 users should upgrade to 1.0.1t
 
@@ -38,7 +38,7 @@ Advisory CVEs
 
 
 * CVE-2016-2176 - **EBCDIC overread** (Severity:Low)
- 
+
   OpenSSL 1.0.2 users should upgrade to 1.0.2h
   OpenSSL 1.0.1 users should upgrade to 1.0.1t
 
@@ -46,7 +46,7 @@ Advisory CVEs
 Action
 ------
 
-xCAT uses OpenSSL for client-server communication but **does not** ship it.  
+xCAT uses OpenSSL for client-server communication but **does not** ship it.
 
-It is recommended to keep your OpenSSL levels up-to-date with the indicated versions in the security bulletins to prevent any potential security threats. 
+It is recommended to keep your OpenSSL levels up-to-date with the indicated versions in the security bulletins to prevent any potential security threats.
 
diff --git a/docs/source/security/2016/20160815_openssl.rst b/docs/source/security/2016/20160815_openssl.rst
index 1a99c972d..62bd9b386 100644
--- a/docs/source/security/2016/20160815_openssl.rst
+++ b/docs/source/security/2016/20160815_openssl.rst
@@ -10,9 +10,9 @@ Patch: https://github.com/openssl/openssl/commit/0ed26acce328ec16a3aa635f1ca3736
 Advisory CVEs
 -------------
 
-`CVE-2016-2180 <https://exchange.xforce.ibmcloud.com/vulnerabilities/115829>`_ - OpenSSL is vulnerable to a denial of service, caused by an out-of-bounds read in the TS_OBJ_print_bio function. 
+`CVE-2016-2180 <https://exchange.xforce.ibmcloud.com/vulnerabilities/115829>`_ - OpenSSL is vulnerable to a denial of service, caused by an out-of-bounds read in the TS_OBJ_print_bio function.
 
 Action
 ------
 
-xCAT uses OpenSSL for client-server communication but **does not** ship it.  It is highly recommended to keep your OpenSSL levels up-to-date to prevent any potential security threats.  
+xCAT uses OpenSSL for client-server communication but **does not** ship it.  It is highly recommended to keep your OpenSSL levels up-to-date to prevent any potential security threats.
diff --git a/docs/source/security/2016/20160824_openssl.rst b/docs/source/security/2016/20160824_openssl.rst
index fdf724cc9..436616d49 100644
--- a/docs/source/security/2016/20160824_openssl.rst
+++ b/docs/source/security/2016/20160824_openssl.rst
@@ -24,8 +24,8 @@ Advisory CVEs
 Action
 ------
 
-xCAT uses OpenSSL for client-server communication but **does not** ship it.  
+xCAT uses OpenSSL for client-server communication but **does not** ship it.
 
-It is highly recommended to keep your OpenSSL levels up-to-date with the indicated versions in the security bulletins to prevent any potential security threats. Obtain the updated software packages from your Operating system distribution channels. 
+It is highly recommended to keep your OpenSSL levels up-to-date with the indicated versions in the security bulletins to prevent any potential security threats. Obtain the updated software packages from your Operating system distribution channels.
 
 
diff --git a/docs/source/security/2016/20161130_hard_code_password.rst b/docs/source/security/2016/20161130_hard_code_password.rst
index 80d81a695..307035bde 100644
--- a/docs/source/security/2016/20161130_hard_code_password.rst
+++ b/docs/source/security/2016/20161130_hard_code_password.rst
@@ -20,7 +20,7 @@ No action is required for xCAT 2.12.3, and higher.
 
 If running older versions of xCAT, update xCAT to a higher level code base that has the hard-coded default passwords removed.
 
-The following table describes the recommended update path: 
+The following table describes the recommended update path:
 
 +-------------------------+-----------------------------------------------+---------------------------------------+
 | xCAT Version            | Action                                        | Release Notes                         |
diff --git a/docs/source/security/2016/index.rst b/docs/source/security/2016/index.rst
index e0db9a230..1550b39e4 100644
--- a/docs/source/security/2016/index.rst
+++ b/docs/source/security/2016/index.rst
@@ -1,4 +1,4 @@
-2016 Notices 
+2016 Notices
 ============
 
 .. toctree::
diff --git a/docs/source/security/2017/20170126_openssl.rst b/docs/source/security/2017/20170126_openssl.rst
index 037ad97cb..2e6a2607b 100644
--- a/docs/source/security/2017/20170126_openssl.rst
+++ b/docs/source/security/2017/20170126_openssl.rst
@@ -20,8 +20,8 @@ Please see the security bulletin above for patch, upgrade, or suggested work aro
 Action
 ------
 
-xCAT uses OpenSSL for client-server communication but **does not** ship it.  
+xCAT uses OpenSSL for client-server communication but **does not** ship it.
 
-It is highly recommended to keep your OpenSSL levels up-to-date with the indicated versions in the security bulletins to prevent any potential security threats. Obtain the updated software packages from your Operating system distribution channels. 
+It is highly recommended to keep your OpenSSL levels up-to-date with the indicated versions in the security bulletins to prevent any potential security threats. Obtain the updated software packages from your Operating system distribution channels.
 
 
diff --git a/docs/source/security/2017/20170216_openssl.rst b/docs/source/security/2017/20170216_openssl.rst
index 9f430f713..9af3743d5 100644
--- a/docs/source/security/2017/20170216_openssl.rst
+++ b/docs/source/security/2017/20170216_openssl.rst
@@ -1,13 +1,13 @@
 2017-02-16 - OpenSSL Vulnerabilities
 ====================================
 
-*Feb 16, 2017*, OpenSSL announced the following security advisories: https://www.openssl.org/news/secadv/20170216.txt 
+*Feb 16, 2017*, OpenSSL announced the following security advisories: https://www.openssl.org/news/secadv/20170216.txt
 
 
 Advisory CVEs
 -------------
 
-* CVE-2017-3733 - **Encrypt-Then-Mac renegotiation crash** (Severity:High) 
+* CVE-2017-3733 - **Encrypt-Then-Mac renegotiation crash** (Severity:High)
 
   OpenSSL 1.1.0 users should upgrade to 1.1.0e
 
@@ -18,8 +18,8 @@ Please see the security bulletin above for patch, upgrade, or suggested work aro
 Action
 ------
 
-xCAT uses OpenSSL for client-server communication but **does not** ship it.  
+xCAT uses OpenSSL for client-server communication but **does not** ship it.
 
-It is highly recommended to keep your OpenSSL levels up-to-date with the indicated versions in the security bulletins to prevent any potential security threats. Obtain the updated software packages from your Operating system distribution channels. 
+It is highly recommended to keep your OpenSSL levels up-to-date with the indicated versions in the security bulletins to prevent any potential security threats. Obtain the updated software packages from your Operating system distribution channels.
 
 
diff --git a/docs/source/security/2017/20170828_openssl.rst b/docs/source/security/2017/20170828_openssl.rst
index 9592f1f6d..b985ed780 100644
--- a/docs/source/security/2017/20170828_openssl.rst
+++ b/docs/source/security/2017/20170828_openssl.rst
@@ -1,7 +1,7 @@
 2017-08-28 - OpenSSL Vulnerabilities
 ====================================
 
-*Aug 28, 2017*, OpenSSL announced the following security advisories: https://www.openssl.org/news/secadv/20170828.txt 
+*Aug 28, 2017*, OpenSSL announced the following security advisories: https://www.openssl.org/news/secadv/20170828.txt
 
 
 Advisory CVEs
@@ -24,8 +24,8 @@ Please see the security bulletin above for patch, upgrade, or suggested work aro
 Action
 ------
 
-xCAT uses OpenSSL for client-server communication but **does not** ship it.  
+xCAT uses OpenSSL for client-server communication but **does not** ship it.
 
-It is highly recommended to keep your OpenSSL levels up-to-date with the indicated versions in the security bulletins to prevent any potential security threats. Obtain the updated software packages from your Operating system distribution channels. 
+It is highly recommended to keep your OpenSSL levels up-to-date with the indicated versions in the security bulletins to prevent any potential security threats. Obtain the updated software packages from your Operating system distribution channels.
 
 
diff --git a/docs/source/security/2017/20171207_openssl.rst b/docs/source/security/2017/20171207_openssl.rst
index 2b1dfb7a3..59cda479c 100644
--- a/docs/source/security/2017/20171207_openssl.rst
+++ b/docs/source/security/2017/20171207_openssl.rst
@@ -25,8 +25,8 @@ Please see the security bulletin above for patch, upgrade, or suggested work aro
 Action
 ------
 
-xCAT uses OpenSSL for client-server communication but **does not** ship it.  
+xCAT uses OpenSSL for client-server communication but **does not** ship it.
 
-It is highly recommended to keep your OpenSSL levels up-to-date with the indicated versions in the security bulletins to prevent any potential security threats. Obtain the updated software packages from your Operating system distribution channels. 
+It is highly recommended to keep your OpenSSL levels up-to-date with the indicated versions in the security bulletins to prevent any potential security threats. Obtain the updated software packages from your Operating system distribution channels.
 
 
diff --git a/docs/source/security/2017/20171212_tls.rst b/docs/source/security/2017/20171212_tls.rst
index 87eeffd86..63cf60467 100644
--- a/docs/source/security/2017/20171212_tls.rst
+++ b/docs/source/security/2017/20171212_tls.rst
@@ -11,19 +11,19 @@ Advisory CVEs
 Summary
 -------
 
-Transport Layer Security (TLS) is a mechanism for a security transport over network connections, and is defined in RFC 5246. TLS may utilize RSA cryptography to secure the connection, and section 7.4.7 describes how client and server may exchange keys. Implementations that don't closely follow the descriptions in RFC 5246 may leak information to an attacker when they handle PKCS #1 v1.5 padding errors in ways that lets the attacker distinguish between valid and invalid messages. An attacker may utilize discrepancies in TLS error messages to obtain the pre-master secret key private RSA key used by TLS to decrypt sensitive data. This type of attack has become known as a Bleichenbacher attack. CERT/CC previously published CERT Advisory CA-1998-07 for this type of attack. 
+Transport Layer Security (TLS) is a mechanism for a security transport over network connections, and is defined in RFC 5246. TLS may utilize RSA cryptography to secure the connection, and section 7.4.7 describes how client and server may exchange keys. Implementations that don't closely follow the descriptions in RFC 5246 may leak information to an attacker when they handle PKCS #1 v1.5 padding errors in ways that lets the attacker distinguish between valid and invalid messages. An attacker may utilize discrepancies in TLS error messages to obtain the pre-master secret key private RSA key used by TLS to decrypt sensitive data. This type of attack has become known as a Bleichenbacher attack. CERT/CC previously published CERT Advisory CA-1998-07 for this type of attack.
 
 Action
 ------
 
-Consider the following recommended actions: 
+Consider the following recommended actions:
 
 1. Disable TLS RSA
-2. Apply an update (if available) 
+2. Apply an update (if available)
 
 
-xCAT uses OpenSSL for client-server communication but **does not** ship it.  
+xCAT uses OpenSSL for client-server communication but **does not** ship it.
 
-It is highly recommended to keep your OpenSSL levels up-to-date. Obtain the updated software packages from your Operating system distribution channels. 
+It is highly recommended to keep your OpenSSL levels up-to-date. Obtain the updated software packages from your Operating system distribution channels.
 
 
diff --git a/docs/source/security/2017/index.rst b/docs/source/security/2017/index.rst
index 0d2b5039e..dd6842dd6 100644
--- a/docs/source/security/2017/index.rst
+++ b/docs/source/security/2017/index.rst
@@ -1,4 +1,4 @@
-2017 Notices 
+2017 Notices
 ============
 
 .. toctree::
diff --git a/docs/source/security/2018/20180612_openssl.rst b/docs/source/security/2018/20180612_openssl.rst
index e11dc06b0..319573509 100644
--- a/docs/source/security/2018/20180612_openssl.rst
+++ b/docs/source/security/2018/20180612_openssl.rst
@@ -14,8 +14,8 @@ Please see the security bulletin above for patch, upgrade, or suggested work aro
 Action
 ------
 
-xCAT uses OpenSSL for client-server communication but **does not** ship it.  
+xCAT uses OpenSSL for client-server communication but **does not** ship it.
 
-It is highly recommended to keep your OpenSSL levels up-to-date with the indicated versions in the security bulletins to prevent any potential security threats. Obtain the updated software packages from your Operating system distribution channels. 
+It is highly recommended to keep your OpenSSL levels up-to-date with the indicated versions in the security bulletins to prevent any potential security threats. Obtain the updated software packages from your Operating system distribution channels.
 
 
diff --git a/docs/source/security/2018/index.rst b/docs/source/security/2018/index.rst
index eb736ccb8..cf289fb37 100644
--- a/docs/source/security/2018/index.rst
+++ b/docs/source/security/2018/index.rst
@@ -1,7 +1,7 @@
-2018 Notices 
+2018 Notices
 ============
 
 .. toctree::
    :maxdepth: 1
 
-   20180612_openssl.rst 
+   20180612_openssl.rst
diff --git a/docs/source/troubleshooting/os_installation/debug_port.rst b/docs/source/troubleshooting/os_installation/debug_port.rst
index ac2e8741a..a6e55891a 100644
--- a/docs/source/troubleshooting/os_installation/debug_port.rst
+++ b/docs/source/troubleshooting/os_installation/debug_port.rst
@@ -12,4 +12,4 @@ Usage: ``runcmdinstaller <node> "<command>"``
 Note: Make sure all the commands are quoted by ``""``
 
 To list all the items under the /etc directory in the installer: ``runcmdinstaller c910f03c01p03 "ls /etc"``
- 
+
diff --git a/docs/source/troubleshooting/os_installation/log_to_mn_cn.rst b/docs/source/troubleshooting/os_installation/log_to_mn_cn.rst
index 007142084..1bb1c5a74 100644
--- a/docs/source/troubleshooting/os_installation/log_to_mn_cn.rst
+++ b/docs/source/troubleshooting/os_installation/log_to_mn_cn.rst
@@ -45,25 +45,25 @@ The diskless provision logs:
 
 * **Pre-Install** logs: the logs of pre-installation scripts, including:
 
-  * ``%pre`` section in anaconda, 
-  * ``<pre-scripts/>`` section for SUSE and ``partman/early_command`` and ``preseed/early_command`` sections for ubuntu. 
-  * STDOUT and STDERR of the scripts 
+  * ``%pre`` section in anaconda,
+  * ``<pre-scripts/>`` section for SUSE and ``partman/early_command`` and ``preseed/early_command`` sections for ubuntu.
+  * STDOUT and STDERR of the scripts
   * debug trace output of bash scripts with ``set -x``
 
 * **Installer** logs: the logs from the os installer itself, i.e, the logs of installation program (anaconda, autoyast and preseed,etc.)
 
-* **Post-Install** logs: the logs of post-installation scripts, including 
+* **Post-Install** logs: the logs of post-installation scripts, including
 
-  * ``%post`` section in anaconda, 
-  * ``<chroot-scripts/>`` and ``<post-scripts/>`` sections for SUSE and ``preseed/late_command`` section for ubuntu. 
-  * STDOUT and STDERR of the scripts 
+  * ``%post`` section in anaconda,
+  * ``<chroot-scripts/>`` and ``<post-scripts/>`` sections for SUSE and ``preseed/late_command`` section for ubuntu.
+  * STDOUT and STDERR of the scripts
   * debug trace output of bash scripts with ``set -x``
 
 * **Provision** logs: the logs during the diskless provision.
 
 * **PostBootScript** logs: the logs during the post boot scripts execution, which are specified in ``postbootscripts`` attribute of node and osimage definition and run during the 1st reboot after installation.
 
-MN: the logs forwarded to management node: 
+MN: the logs forwarded to management node:
 
 * M1: the installer logs will be forwarded to the MN in ``/var/log/xcat/computes.log`` file.
 
diff --git a/docs/source/troubleshooting/os_installation/ssh_enable.rst b/docs/source/troubleshooting/os_installation/ssh_enable.rst
index 8f2e94b80..2a60dd98b 100644
--- a/docs/source/troubleshooting/os_installation/ssh_enable.rst
+++ b/docs/source/troubleshooting/os_installation/ssh_enable.rst
@@ -15,7 +15,7 @@ When ssh access to the installer is enabled, the admin can login into the instal
     ***  login using 'ssh -X root@<node>'  ***
     ***  run 'yast' to start the installation  ***
 
-   Just as the message above suggests, the admin can open 2 sessions and run ``ssh -X root@<node>`` with the configured system password in the ``passwd`` table to login into the installer, then run ``yast`` to continue installation in one session and inspect the installation process in the installer in the other session. 
+   Just as the message above suggests, the admin can open 2 sessions and run ``ssh -X root@<node>`` with the configured system password in the ``passwd`` table to login into the installer, then run ``yast`` to continue installation in one session and inspect the installation process in the installer in the other session.
 
    After the installation is finished, the system requires a reboot. The installation will halt again before the system configuration, the console output looks like: ::
 
diff --git a/makerpm b/makerpm
index aeb5d8108..28771d9e2 100755
--- a/makerpm
+++ b/makerpm
@@ -24,7 +24,7 @@ function xcat_probe_copy {
    fi
 }
 
-function xcat_probe_cleanup { 
+function xcat_probe_cleanup {
    RPMNAME=${1}
    if [ $RPMNAME = "xCAT-probe" ]; then
        rm -rf ${RPMNAME}/lib/perl/xCAT/
@@ -45,22 +45,22 @@ function makenoarch {
 	else	# linux
 		echo "Building $RPMROOT/RPMS/noarch/$RPMNAME-$VER-snap*.noarch.rpm $EMBEDTXT..."
 		# TODO: should fix this up, this is a hack for the new build machine
-		if [ $RPMNAME = "xCAT-UI" ]; then 
+		if [ $RPMNAME = "xCAT-UI" ]; then
 			# Only if the old compiler.jar file does not exist.....
-			if [ ! -e /xcat2/build/tools/compiler.jar ]; then 
+			if [ ! -e /xcat2/build/tools/compiler.jar ]; then
 				# look for the dynamic location of the compiler.jar file
 				DIRNAME=`dirname $(readlink -f $0)`
 				COMPILER_JAR=`echo "${DIRNAME%%linux_rpm/*}tools/compiler.jar"`
-				if [ -f $COMPILER_JAR ]; then 
+				if [ -f $COMPILER_JAR ]; then
 					sed -i "s#/xcat2/build/tools/compiler.jar#${COMPILER_JAR}#g" xCAT-UI/xCAT-UI.spec
-				else 
+				else
 					# In c910, if using the old buildxcat scripts...
 					COMPILER_JAR=`echo "${DIRNAME%%old/*}xcat2/tools/compiler.jar"`
-					if [ -f $COMPILER_JAR ]; then 
+					if [ -f $COMPILER_JAR ]; then
 						sed -i "s#/xcat2/build/tools/compiler.jar#${COMPILER_JAR}#g" xCAT-UI/xCAT-UI.spec
 					fi
 				fi
-			fi 
+			fi
 		fi
 
                 xcat_probe_copy ${RPMNAME}
@@ -150,7 +150,7 @@ function makexcat {
 			cp xcat.conf.apach24 $RPMROOT/SOURCES
 			cp xCATSN $RPMROOT/SOURCES
                         cp -a ../xCAT/etc/rsyslog.d $RPMROOT/
-                        cp -a ../xCAT/etc/logrotate.d $RPMROOT/ 
+                        cp -a ../xCAT/etc/logrotate.d $RPMROOT/
 			cd - >/dev/null
 		elif [ "$RPMNAME" = "xCAT-buildkit" ]; then
 			ARCH="noarch"
@@ -180,7 +180,7 @@ function makexcat {
 function makeironic {
 	RPMNAME="$1"
 	ARCH="$2"
-	cd `dirname $0`/$RPMNAME    
+	cd `dirname $0`/$RPMNAME
 	cp -rf ironic_baremetal /tmp/
 	cd /tmp/ironic_baremetal
 	git init
@@ -295,7 +295,7 @@ elif [ "$1" = "xCAT-genesis-scripts" ]; then
 	exportEmbed $3
 	makegenesisscripts $1 $2
 elif [ "$1" = "xCAT-OpenStack-ironic" ]; then
-	makeironic $1 $2    
+	makeironic $1 $2
 else	# must be one of the noarch rpms
 	exportEmbed $2
 	makenoarch $1
diff --git a/perl-xCAT/db2man b/perl-xCAT/db2man
index ee73edc5e..7542ae3f4 100755
--- a/perl-xCAT/db2man
+++ b/perl-xCAT/db2man
@@ -167,7 +167,7 @@ xCAT allows the use of different database applications, depending on the needs o
 The default database is SQLite, which is a daemonless, zero-config database.  But you could instead
 choose to use something like postgresql for greater scalability and remote access in the
 hierarchical/service node case.  To use a different database or a different location, create
-the file /etc/xcat/cfgloc.  See the appropriate xCAT docuementation for the format of the file for the database you choose. 
+the file /etc/xcat/cfgloc.  See the appropriate xCAT docuementation for the format of the file for the database you choose.
 The following example /etc/xcat/cfgloc file is for PostgreSQL:
 
  Pg:dbname=xcat;host=<mgmtnode>|<pgadminuserid>|<pgadminpasswd>
@@ -265,9 +265,9 @@ expression B<($1-1)%14+1> will evaluate to B<6>.
 
 See http://www.perl.com/doc/manual/html/pod/perlre.html for information on perl regular expressions.
 
-=head2 Easy Regular Expressions 
+=head2 Easy Regular Expressions
 
-As of xCAT 2.8.1, you can use a modified version of the regular expression support described in the previous section. You do not need to enter the node information (1st part of the expression), it will be derived from the input nodename. You only need to supply the 2nd part of the expression to determine the value to give the attribute. For examples, see 
+As of xCAT 2.8.1, you can use a modified version of the regular expression support described in the previous section. You do not need to enter the node information (1st part of the expression), it will be derived from the input nodename. You only need to supply the 2nd part of the expression to determine the value to give the attribute. For examples, see
 
 http://xcat-docs.readthedocs.org/en/latest/guides/admin-guides/basic_concepts/xcat_db/regexp_db.html#easy-regular-expressions
 
diff --git a/perl-xCAT/debian/copyright b/perl-xCAT/debian/copyright
index f61d34dfe..87e60f492 100644
--- a/perl-xCAT/debian/copyright
+++ b/perl-xCAT/debian/copyright
@@ -85,4 +85,4 @@ Everyone is permitted to copy and distribute copies of this Agreement, but in or
 
 This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
 
- 
+
diff --git a/perl-xCAT/xCAT/CFMUtils.pm b/perl-xCAT/xCAT/CFMUtils.pm
index d6a36c659..e0d306503 100644
--- a/perl-xCAT/xCAT/CFMUtils.pm
+++ b/perl-xCAT/xCAT/CFMUtils.pm
@@ -25,7 +25,7 @@ use xCAT::MsgUtils;
 
 =head3 initCFMdir
     Initialize CFM directories and files. The default layout under cfmdir is:
-    . 
+    .
     |-- etc
     | |-- group.merge -> /etc/group.merge
     | |-- hosts -> /etc/hosts
@@ -42,7 +42,7 @@ use xCAT::MsgUtils;
       0 - initialize successfully
       1 - initialize failed
     Globals:
-      none 
+      none
     Error:
       none
     Example:
@@ -116,7 +116,7 @@ sub initCFMdir
     Update the /etc/passwd, shadow, group merge files under specified CFM directory
 
     Arguments:
-      $cfmdir - CFM directory for osimage      
+      $cfmdir - CFM directory for osimage
     Returns:
       0 - update successfully
       1 - update failed
@@ -287,7 +287,7 @@ sub setCFMSynclistFile {
 #-----------------------------------------------------------------------------
 
 =head3 updateCFMSynclistFile
-    Update the synclist file(/install/osimages/<imagename>/synclist.cfm) for CFM function. 
+    Update the synclist file(/install/osimages/<imagename>/synclist.cfm) for CFM function.
     It will recursively scan the files under cfmdir directory and then add them to CFM synclist file.
     Note:
     The files with suffix ".append" will be appended to the dest file(records in "APPEND:" section).
@@ -778,8 +778,8 @@ sub getPkgsDiff {
 
 #-----------------------------------------------------------------------------
 
-=head3 getIncludefiles 
-    Get the #INCLUDE files from the given file 
+=head3 getIncludefiles
+    Get the #INCLUDE files from the given file
 
     Arguments:
       $file - the given file
@@ -825,7 +825,7 @@ sub getIncludefiles {
 #-----------------------------------------------------------------------------
 
 =head3 trim
-    Strip left and right whitspaces for a string 
+    Strip left and right whitspaces for a string
 
     Arguments:
       $string
diff --git a/perl-xCAT/xCAT/CIMUtils.pm b/perl-xCAT/xCAT/CIMUtils.pm
index d13a2e93a..749d81ec0 100644
--- a/perl-xCAT/xCAT/CIMUtils.pm
+++ b/perl-xCAT/xCAT/CIMUtils.pm
@@ -19,13 +19,13 @@ use Data::Dumper;
 
     A hash which includes all the parameters for accessing HTTP server. The valid parameter:
         ip:        The IP address of the HTTP server
-        user:      The user to access HTTP server. 
-        password:  The password for the user. 
+        user:      The user to access HTTP server.
+        password:  The password for the user.
         method:    The http method. (GET, PUT, POST, DELETE). Default is GET
         protocol:  The protocol which will be used to access HTTP server.  (http/https). Default is https
         format:    The format of payload. Default is xml
         payload:   The payload of http
-        
+
     Example:
         my %http_params = ( ip       => '192.168.1.1',
                             port     => '5989',
@@ -33,7 +33,7 @@ use Data::Dumper;
                             password => 'admin',
                             method   => 'POST',
                             protocol => 'https');
-        
+
 =cut
 
 =head1 enum_instance ()
@@ -50,7 +50,7 @@ use Data::Dumper;
             rc     - The return code. 0 - success. > 0 - fail.
             cim_rc - The return code from CIM server.
             msg    - Output message.
-            
+
         2 - Array of instances, each instance is a hash contains lots of properties.
 
         3 - The name path of instance
@@ -337,14 +337,14 @@ sub set_property
     Description:
         Generate a http request.
 
-    Arguments: 
+    Arguments:
         http_params: A reference to HTTP_PARAMS
         payload:     The payload for the http request. It can be null if the payload has been set in http_params.
 
     Return:
         A hash reference. The valid key includes:
             rc      - The return code. 0 - success. > 0 - fail.
-            msg     - Output message 
+            msg     - Output message
             request - The generated HTTP::Request object
 =cut
 
diff --git a/perl-xCAT/xCAT/Client.pm b/perl-xCAT/xCAT/Client.pm
index e742289c5..2aaaaa069 100644
--- a/perl-xCAT/xCAT/Client.pm
+++ b/perl-xCAT/xCAT/Client.pm
@@ -174,6 +174,7 @@ sub submit_request {
 
         # Load plugins from either specified or default dir
         require xCAT::Table;
+        populate_site_hash();
         my %cmd_handlers;
         my @plugins_dirs = split('\:', $ENV{XCATBYPASS});
         if (-d $plugins_dirs[0]) {
@@ -192,8 +193,6 @@ sub submit_request {
             scan_plugins();
         }
 
-        populate_site_hash();
-
         #  don't do XML transformation -- assume request is well-formed
         #  my $xmlreq=XMLout($request,RootName=>xcatrequest,NoAttr=>1,KeyAttr=>[]);
         #  $request = XMLin($xmlreq,SuppressEmpty=>undef,ForceArray=>1) ;
@@ -268,7 +267,7 @@ sub submit_request {
     } else {
         print "warning: the client certificates under $homedir/.xcat/ are not setup correctly, please run '/opt/xcat/share/xcat/scripts/setup-local-client.sh"." $ENV{'USER'}' as 'root' to generate the client certificates; otherwise, the SSL connection between xcat client and xcatd will be setup without certificate verification and open to Man-In-The-Middle attacks.\n";
         #Using the default of SSL_verify_mode of SSL_VERIFY_NONE for client is deprecated!
-        #need to specify SSL_verify_mode => SSL_VERIFY_NONE explicitly 
+        #need to specify SSL_verify_mode => SSL_VERIFY_NONE explicitly
         $client = IO::Socket::SSL->start_SSL($pclient,
             SSL_verify_mode => SSL_VERIFY_NONE,
 	    SSL_cipher_list => undef,
@@ -1340,7 +1339,7 @@ sub handle_response {
             }
             if ($desc) {
                 $desc = "[$msgsource]: $desc" if ($showsource && $msgsource);
-                print "$desc\n"; 
+                print "$desc\n";
             }
         }
     }
diff --git a/perl-xCAT/xCAT/DBobjUtils.pm b/perl-xCAT/xCAT/DBobjUtils.pm
index d462416e2..f3efe6c34 100755
--- a/perl-xCAT/xCAT/DBobjUtils.pm
+++ b/perl-xCAT/xCAT/DBobjUtils.pm
@@ -1175,10 +1175,10 @@ sub setobjdefs
             my $pickvalidattr=0;
             if ($invalidattr->{$att}->{valid} != 1) {
                 my $tt = $invalidattr->{$att}->{valid};
-                #if attribute is set invalid, check if its pre-check attribute exists in group objects, pick the attribute into valid. 
+                #if attribute is set invalid, check if its pre-check attribute exists in group objects, pick the attribute into valid.
                 # ex. like if I want to set hdwctrlpoint I will have
-                # to match the right value for mgtmethod 
-                # if mgtmethod exists in group objects and its value match the one of only_if value, set hdwctrlpoint valid 
+                # to match the right value for mgtmethod
+                # if mgtmethod exists in group objects and its value match the one of only_if value, set hdwctrlpoint valid
                 my $conditionkey=$invalidattr->{$att}->{condition};
                 foreach my $tmpgrp (@tmplgrplist) {
                     if (($DBgroupsattr{$tmpgrp}{$conditionkey}) && ($conditionlist->{$conditionkey} =~ $DBgroupsattr{$tmpgrp}{$conditionkey})) {
diff --git a/perl-xCAT/xCAT/DSHCLI.pm b/perl-xCAT/xCAT/DSHCLI.pm
index 631b412c2..6e4676cfd 100644
--- a/perl-xCAT/xCAT/DSHCLI.pm
+++ b/perl-xCAT/xCAT/DSHCLI.pm
@@ -14,6 +14,7 @@ use File::Basename;
 use locale;
 use strict;
 use File::Path;
+use File::Temp;
 use POSIX;
 use Socket;
 use Getopt::Long;
@@ -413,7 +414,7 @@ sub execute_dsh
 =head3
         _execute_dsh
 
-        Wrapper routine for execute_dsh 
+        Wrapper routine for execute_dsh
         to execute actual dsh call
 
         Arguments:
@@ -804,7 +805,7 @@ sub fork_fanout_dcp
         my @dcp_command;
         my $rsyncfile;
 
-        
+
         my %envardict;
         foreach my $varstr (split(',',$$target_properties{'envar'})){
             if($varstr =~ m/(.*)=(.*)/){
@@ -843,7 +844,7 @@ sub fork_fanout_dcp
             }
         }
 
-        
+
         if (!$$target_properties{'localhost'})    # this is to a remote host
         {
             my $target_type = $$target_properties{'type'};
@@ -1024,8 +1025,8 @@ sub fork_fanout_dsh
       )
       = @_;
 
-    #get username and passeword for switches 
-    if (($$options{'devicetype'} =~ /EthSwitch/) || 
+    #get username and passeword for switches
+    if (($$options{'devicetype'} =~ /EthSwitch/) ||
         (($$options{'devicetype'} =~ /IBSwitch/) && !($$options{'user'})) ){
         if (@$targets_waiting > 0) {
             if ($ENV{'DSH_REMOTE_PASSWORD'}) {
@@ -1229,7 +1230,7 @@ sub fork_fanout_dsh
                 $rsp->{data}->[0] = "TRACE: Environment option specified";
                 $dsh_trace && (xCAT::MsgUtils->message("I", $rsp, $::CALLBACK));
                 my %env_rcp_config = ();
-                $tmp_env_file = POSIX::tmpnam . '.dsh';
+                $tmp_env_file = File::Temp::tmpnam . '.dsh';
                 $rsh_config{'command'} .= ". $tmp_env_file ; ";
 
                 $env_rcp_config{'src-file'}  = $$options{'environment'};
@@ -1280,7 +1281,7 @@ sub fork_fanout_dsh
                 $dsh_trace && (xCAT::MsgUtils->message("I", $rsp, $::CALLBACK));
 
                 my %exe_rcp_config = ();
-                $tmp_cmd_file = POSIX::tmpnam . ".dsh";
+                $tmp_cmd_file = File::Temp::tmpnam . ".dsh";
 
                 my ($exe_cmd, @args) = @{ $$options{'execute'} };
                 my $chmod_cmd = "";
@@ -1372,7 +1373,7 @@ sub fork_fanout_dsh
         #print "Command=@dsh_command\n";
 
         #@process_info = xCAT::DSHCore->fork_output($user_target, @dsh_command);
-        push(@commands, \@dsh_command);    
+        push(@commands, \@dsh_command);
         @process_info = xCAT::DSHCore->fork_output_for_commands($user_target, @commands);
         if ($process_info[0] == -2)
         {
@@ -3291,7 +3292,7 @@ sub _resolve_nodes
         xdsh and just let ssh do it.  Stayed to preserve the logic of the old
         code.
         Does check if the Management Node is part of the node range and sets
-        localhost if it is.  The MN must be defined in nodelist and with 
+        localhost if it is.  The MN must be defined in nodelist and with
         nodetype.nodetype=mn.
 
         Arguments:
@@ -3301,13 +3302,13 @@ sub _resolve_nodes
 
         Returns:
         	None
-                
+
         Globals:
         	None
-    
+
         Error:
         	None
-    
+
         Example:
 
         Comments:
@@ -3334,7 +3335,7 @@ sub bld_resolve_nodes_hash
         xCAT::MsgUtils->message("I", $rsp, $::CALLBACK);
     }
 
-    
+
     my $ostab = xCAT::Table->new('nodetype');
     my %oents = %{ $ostab->getNodesAttribs(\@target_list, [qw(provmethod)]) };
 
@@ -3359,10 +3360,10 @@ sub bld_resolve_nodes_hash
         if ($ent and $ent->{provmethod} and \
                ($ent->{provmethod} ne 'install') and ($ent->{provmethod} ne 'netboot') and ($ent->{provmethod} ne 'statelite')) {
 
-            my $imagename = $ent->{provmethod};  
+            my $imagename = $ent->{provmethod};
             my $osimagetab = xCAT::Table->new('osimage', -create => 1);
             (my $ref) = $osimagetab->getAttribs({ imagename => $imagename }, 'environvar');
-            if($ref){ 
+            if($ref){
                 $envar=$ref->{'environvar'};
             }
         }
@@ -4639,7 +4640,7 @@ sub parse_and_run_dcp
              xCAT::MsgUtils->message("E", $rsp, $::CALLBACK, 1);
              return;
         }
-    
+
         if ($remotecopycommand !~ /\/(rcp|scp|rsync)$/){
              my $rsp = {};
              $rsp->{error}->[0] =
@@ -4739,7 +4740,7 @@ sub parse_and_run_dcp
         {
             $::SYNCSN = 1;
         }
-        
+
 
         # the parsing of the file will fill in an array of postscripts
         # need to be run if the associated file is updated
@@ -4946,13 +4947,13 @@ sub parse_and_run_dcp
           /.../file1 /..../filex  -> /...../dir1
 
        rsync command format
-	   /usr/bin/rsync -Lprgotz  /etc/services  $pathtoimage/etc/services 
+	   /usr/bin/rsync -Lprgotz  /etc/services  $pathtoimage/etc/services
 	   /usr/bin/rsync -Lprgotz  /tmp/lissa/file1 /tmp/lissa/file $pathtoimage/tmp/lissa
 
         Arguments:
 		  Input:
 		  sync file
-		  path to image 
+		  path to image
 
         Returns:
            Errors if invalid options or the executed dcp command
@@ -4977,13 +4978,13 @@ sub rsync_to_image
 
     my ($input_file, $image) = @_;
     my $rc = 0;
- 
+
     my %osimgenv;
     if($ENV{'XCAT_OSIMAGE_ENV'}){
         foreach my $myenv(split(',',$ENV{'XCAT_OSIMAGE_ENV'})){
             if($myenv =~ /\s*(\S+)\s*=\s*(\S+)\s*/) {
                 $osimgenv{$1}=$2;
-            } 
+            }
         }
     }
     open(INPUTFILE, "< $input_file") || die "File $input_file does not exist\n";
@@ -4995,7 +4996,7 @@ sub rsync_to_image
             next;
         }
 
-        $line=xCAT::Utils->varsubinline($line,\%osimgenv); 
+        $line=xCAT::Utils->varsubinline($line,\%osimgenv);
 
         # process no more lines, do not exec
         # do not execute postscripts when syncing images
@@ -5087,7 +5088,7 @@ sub rsync_to_image
 
 =head3
        parse_rsync_input_file_on_MN
-	  
+	
 
         This parses the -F rsync input file on the Management node.
 
@@ -5098,7 +5099,7 @@ sub rsync_to_image
           /.../file1 /..../filex  -> /...../dir1
           /tmp/file2  ->  /tmp/file2
           /tmp/file2.post -> /tmp/file2.post
-          EXECUTE: 
+          EXECUTE:
           /tmp/file2.post
           EXECUTEALWAYS:
           /tmp/myscript1
@@ -5107,11 +5108,11 @@ sub rsync_to_image
           .
 
         Arguments:
-		  Input nodelist,options, pointer to the sync file,flag is 
+		  Input nodelist,options, pointer to the sync file,flag is
 		  syncing the service node and
 		  the directory to syn the files to on the service node
 		  based on defaults or the site.SNsyncfiledir attribute,
-		  if syncing a service node for hierarchical support. 
+		  if syncing a service node for hierarchical support.
 
         Returns:
            Errors if invalid options or the executed dcp command
@@ -5369,7 +5370,7 @@ sub parse_rsync_input_file_on_MN
     if($remotecopycommand !~ /\/rsync$/ and @::postscripts){
         my $rsp = {};
         $rsp->{error}->[0] ="key word 'EXECUTE' is unavailable when the remote copy command specified by '-r|--node-rcp' is $remotecopycommand. Does 'EXECUTEALWAYS' work for you?";
-        xCAT::MsgUtils->message("E", $rsp, $::CALLBACK, 1);         
+        xCAT::MsgUtils->message("E", $rsp, $::CALLBACK, 1);
         return 1;
     }
 
@@ -5379,27 +5380,27 @@ sub parse_rsync_input_file_on_MN
 #-------------------------------------------------------------------------------
 
 =head3
-      build_append_rsync 
+      build_append_rsync
 
-        Handles the 
+        Handles the
            APPEND: clause in the synclist
            /tmp/appendfile -> /tmp/receivefile
 
            Syncs the append file from the left side of the arrow
            to the nodes into the site.nodesyncfiledir directory
-           After we find out which append file are actually changed, we 
+           After we find out which append file are actually changed, we
            will sync and run and the append script
            /opt/xcat/share/xcat/script/xdcpappend.sh
            See build_append_script.
 
         Returns:
-          Files do not exist, rsync errors. 
+          Files do not exist, rsync errors.
 
         Globals:
 
 
         Error:
-          Files do not exist, rsync errors. 
+          Files do not exist, rsync errors.
 
         Example:
 
@@ -5494,9 +5495,9 @@ sub build_append_rsync
 #-------------------------------------------------------------------------------
 
 =head3
-      build_merge_rsync 
+      build_merge_rsync
 
-        Handles the 
+        Handles the
            MERGE: clause in the synclist
            /tmp/mypasswd -> /etc/passwd
            /tmp/mygroup -> /etc/group
@@ -5506,13 +5507,13 @@ sub build_append_rsync
           myshadow into /etc/passwd, /etc/group , /etc/shadow on the nodes.
           These are the only files supported from MERGE and only on Linux
         Returns:
-          Files do not exist, rsync errors. 
+          Files do not exist, rsync errors.
 
         Globals:
 
 
         Error:
-          Files do not exist, rsync errors. 
+          Files do not exist, rsync errors.
 
         Example:
 
@@ -5623,7 +5624,7 @@ sub build_merge_rsync
 
         Arguments:
 		  Input nodelist,options, pointer to the sync file and
-		  the directory to syn the files from 
+		  the directory to syn the files from
 		  based on defaults or the site.SNsyncfiledir attribute,
 
         Returns:
@@ -5653,7 +5654,7 @@ sub build_merge_rsync
 
         Arguments:
 		  Input nodelist,options, pointer to the sync file and
-		  the directory to syn the files from 
+		  the directory to syn the files from
 		  based on defaults or the site.SNsyncfiledir attribute,
 
         Returns:
@@ -5757,7 +5758,7 @@ sub parse_rsync_input_file_on_SN
             # xCAT supports the syncfile format:
             #   file -> file
             #   file -> (noderange for permitted nodes) file
-            if ($line =~ /(.+) -> (.+)/ || $line =~ /(.+) -> +\((.+)\) +(.+)/) 
+            if ($line =~ /(.+) -> (.+)/ || $line =~ /(.+) -> +\((.+)\) +(.+)/)
             {
                 $process_line = 1;
                 my $src_file;
@@ -5874,7 +5875,7 @@ sub parse_rsync_input_file_on_SN
     if($remotecopycommand !~ /\/rsync$/ and @::postscripts){
         my $rsp = {};
         $rsp->{error}->[0] ="key word 'EXECUTE' is unavailable when the remote copy command specified by '-r|--node-rcp' is $remotecopycommand. Does 'EXECUTEALWAYS' work for you?";
-        xCAT::MsgUtils->message("E", $rsp, $::CALLBACK, 1);         
+        xCAT::MsgUtils->message("E", $rsp, $::CALLBACK, 1);
         return 1;
     }
 
@@ -5884,7 +5885,7 @@ sub parse_rsync_input_file_on_SN
 #-------------------------------------------------------------------------------
 
 =head3
-       run_rsync_postscripts 
+       run_rsync_postscripts
 
         This executes the postscript file on the nodes where
 	    the corresponding rsync file was updated
@@ -5894,20 +5895,20 @@ sub parse_rsync_input_file_on_SN
         For example:  node1: tmp/test/file1  ( yes it leaves the first / off)
         This routine must match that list to the input list of postscripts.
         If there is a match, for example
-        The postscript file is /tmp/test/file1.post  and tmp/test/file1 was 
-        updated, then it builds a xdsh command to the node to run  
+        The postscript file is /tmp/test/file1.post  and tmp/test/file1 was
+        updated, then it builds a xdsh command to the node to run
         /tmp/test/file1.post.
         On the service node, the file will be in $syncdir/tmp/test/file1.post.
-        Also the routine must preserve all other messages returned from rsync, 
-        to return to the admin.  It will remove the messages that the files 
+        Also the routine must preserve all other messages returned from rsync,
+        to return to the admin.  It will remove the messages that the files
         were updated, that is all of from hostname: <full file path>.	
        Input: the output from the xdcp rsync run
             : @::postscripts  to run
 
         Comments:
           Needs to remove the lines from rsync that are return to let
-          me know files were updated from the output to determine which 
-          postscripts to run and leave any other messages 
+          me know files were updated from the output to determine which
+          postscripts to run and leave any other messages
           to return to the admin.
 
 =cut
@@ -5990,31 +5991,31 @@ sub run_rsync_postscripts
 #-------------------------------------------------------------------------------
 
 =head3
-       &bld_and_run_append 
+       &bld_and_run_append
 
         This builds the parm list and executes (xdsh) the append script file
         on the nodes where
         the corresponding append file was updated.
-        The append postscript has been previous sync'd to the nodes. 
+        The append postscript has been previous sync'd to the nodes.
         These are the scripts after APPEND: in the syncfile
 
         rsync returns a list of files that have been updated
         in the form   hostname: <full file path>
         For example:  node1: tmp/test/file1  ( yes it leaves the first / off)
         This routine must match that list to the input list of append files.
-        If there is a match, it will add the append function to 
-        the append script 
+        If there is a match, it will add the append function to
+        the append script
        Input: the output from the xdcp rsync run
             : @::appendlines  to run
 
         Comments:
           Needs to remove the lines from rsync that are return to let
-          me know files were updated from the output to determine which 
-          postscripts to run and leave any other messages 
+          me know files were updated from the output to determine which
+          postscripts to run and leave any other messages
           to return to the admin.
 
         Runs xdsh with input to call /opt/xcat/share/xcat/scripts/xdcpappend.sh
-        which will perform the append function on the node.  
+        which will perform the append function on the node.
         Input is the nodesyncfiledir appendfile:orgfile appendfile2:orgfile2....
 =cut
 
@@ -6129,31 +6130,31 @@ sub bld_and_run_append
 #-------------------------------------------------------------------------------
 
 =head3
-       &bld_and_run_merge 
+       &bld_and_run_merge
 
         This builds the parm list and executes (xdsh) the merge script file
         on the nodes where
         the corresponding merge file was updated.
-        The merge script has been previous sync'd to the nodes. 
+        The merge script has been previous sync'd to the nodes.
         These are the scripts after MERGE: in the syncfile
 
         rsync returns a list of files that have been updated
         in the form   hostname: <full file path>
         For example:  node1: tmp/test/file1  ( yes it leaves the first / off)
         This routine must match that list to the input list of merge files.
-        If there is a match, it will add the merge function to 
-        the merge script 
+        If there is a match, it will add the merge function to
+        the merge script
        Input: the output from the xdcp rsync run
             : @::mergelines  to run
 
         Comments:
           Needs to remove the lines from rsync that are return to let
-          me know files were updated from the output to determine which 
-          postscripts to run and leave any other messages 
+          me know files were updated from the output to determine which
+          postscripts to run and leave any other messages
           to return to the admin.
 
         Runs xdsh with input to call /opt/xcat/share/xcat/scripts/xdcpmerge.sh
-        which will perform the merge function on the node.  
+        which will perform the merge function on the node.
         Input is the nodesyncfiledir mergefile1:orgfile mergefile2:orgfile2....]        Note: MERGE is only support on Linux and for /etc/passwd,/etc/shadow,
               and /etc/group
 =cut
@@ -6280,10 +6281,10 @@ sub bld_and_run_merge
 #-------------------------------------------------------------------------------
 
 =head3
-     run_always_rsync_postscript 
+     run_always_rsync_postscript
 
   This subroutine runs the xdsh command for all the scripts listed in the
-  EXECUTEALWAYS: clause of the synclist file. 
+  EXECUTEALWAYS: clause of the synclist file.
 
 =cut
 
@@ -6685,7 +6686,7 @@ sub show_dsh_config
 
 #-------------------------------------------------------------------------------
 
-=head3 
+=head3
      get_config
 
     Substitute specific keywords in hash
diff --git a/perl-xCAT/xCAT/DSHCore.pm b/perl-xCAT/xCAT/DSHCore.pm
index 4ac392bdf..381e44b94 100644
--- a/perl-xCAT/xCAT/DSHCore.pm
+++ b/perl-xCAT/xCAT/DSHCore.pm
@@ -29,13 +29,13 @@ use xCAT::Utils;
 
         Returns:
         	$pid - process identifer for the forked process
-                
+
         Globals:
         	None
-    
+
         Error:
         	None
-    
+
         Example:
         	$pid = xCAT::DSHCore->fork_no_output('hostname1PID', @command_array);
 
@@ -94,13 +94,13 @@ sub fork_no_output
 
         Returns:
         	$pid - process identifer for the forked process
-                
+
         Globals:
         	None
-    
+
         Error:
         	None
-    
+
         Example:
         	$pid = xCAT::DSHCore->fork_no_output('hostname1PID', @command_array);
 
@@ -168,7 +168,7 @@ sub fork_output
         Forks a process for the given command array and returns the process
         ID for the forked process and references to all I/O pipes for STDOUT
         and STDERR. In the child process, it will invoke the xCAT::DSHCore->fork_no_output()
-        for the first command which is a no-output command and waitpid(). And then execute 
+        for the first command which is a no-output command and waitpid(). And then execute
         the left commands in the child process.
 
         Arguments:
@@ -177,13 +177,13 @@ sub fork_output
 
         Returns:
         	$pid - process identifer for the forked process
-                
+
         Globals:
         	None
-    
+
         Error:
         	None
-    
+
         Example:
         	$pid = xCAT::DSHCore->fork_output_for_commands('hostname1PID', @command_array);
 
@@ -274,13 +274,13 @@ sub fork_output_for_commands
         Returns:
         	1 if the EOF reached on $read_fh
         	undef otherwise
-                
+
         Globals:
         	None
-    
+
         Error:
         	None
-    
+
         Example:
 
         Comments:
@@ -479,13 +479,13 @@ sub pipe_handler
         Returns:
         	1 if the EOF reached on $read_fh
         	undef otherwise
-                
+
         Globals:
         	None
-    
+
         Error:
         	None
-    
+
         Example:
 
         Comments:
@@ -640,13 +640,13 @@ sub pipe_handler_buffer
         Returns:
         	@no_response - list of hostnames that did not respond
         	undef if fping is not installed
-                
+
         Globals:
         	None
-    
+
         Error:
         	None
-    
+
         Example:
         	@bad_hosts = xCAT::DSHCore->ping_hostnames(@host_list);
 
diff --git a/perl-xCAT/xCAT/DiscoveryUtils.pm b/perl-xCAT/xCAT/DiscoveryUtils.pm
index 874387517..0cbcffa77 100644
--- a/perl-xCAT/xCAT/DiscoveryUtils.pm
+++ b/perl-xCAT/xCAT/DiscoveryUtils.pm
@@ -9,10 +9,10 @@ $XML::Simple::PREFERRED_PARSER = 'XML::Parser';
 
 use xCAT::MsgUtils;
 
-=head3 update_discovery_data 
+=head3 update_discovery_data
  Update the discovery data from the xcat request to discoverydata table to indicate the discovery events
  arg1 - the request
- 
+
 =cut
 
 sub update_discovery_data {
diff --git a/perl-xCAT/xCAT/ExtTab.pm b/perl-xCAT/xCAT/ExtTab.pm
index f97312e13..133a506bd 100644
--- a/perl-xCAT/xCAT/ExtTab.pm
+++ b/perl-xCAT/xCAT/ExtTab.pm
@@ -119,9 +119,9 @@ foreach (@extSchema) {
 
 =head3  updateTables
 
-     It is called by xcatd to generate the user-defined tables 
-  if they do not exist, it also updates the tables if there is 
-  a schema change. 
+     It is called by xcatd to generate the user-defined tables
+  if they do not exist, it also updates the tables if there is
+  a schema change.
 
 
 =cut
@@ -141,14 +141,14 @@ sub updateTables
 
 #--------------------------------------------------------------------------
 
-=head3   
+=head3
     Note this is a copy of the one in Table.pm but we cannot use any of the
     xCAT perl libraries in this routine,since the function was done in the
     Begin block.
-    Description: get_filelist 
+    Description: get_filelist
 
     Arguments:
-             directory,filelist,type 
+             directory,filelist,type
     Returns:
             The list of sql files to be processed which consists of all the
 			files with <name>.sql  and <name>_<databasename>.sql
@@ -228,15 +228,15 @@ sub get_filelist
 
 #--------------------------------------------------------------------------
 
-=head3   
+=head3
 
     Note this is a copy of the one in Table.pm but we cannot use any of the
     xCAT perl libraries in this routine,since the function was done in the
 
-    Description: get_xcatcfg 
+    Description: get_xcatcfg
 
     Arguments:
-              none 
+              none
     Returns:
               the database name from /etc/xcat/cfgloc or sqlite
     Globals:
diff --git a/perl-xCAT/xCAT/FSPUtils.pm b/perl-xCAT/xCAT/FSPUtils.pm
index 5320078b6..397f50fe2 100644
--- a/perl-xCAT/xCAT/FSPUtils.pm
+++ b/perl-xCAT/xCAT/FSPUtils.pm
@@ -32,16 +32,16 @@ use xCAT::MsgUtils qw(verbose_message);
 
 #-------------------------------------------------------------------------------
 
-=head3   getHcpAttribs 
+=head3   getHcpAttribs
  Description:
      Build 2 Hashes from ppc/vpd table
-     one hash is : CEC/Frame is the Key, FSPs/BPAs are the value. 
+     one hash is : CEC/Frame is the Key, FSPs/BPAs are the value.
      the other is: fsp/bpa is the key, the side is the value.
 
  Arguments:
      $request: this hash will be usded to store the ppc hash and vpd hash
      $tabs: the hash store the new tables for ppc and bpd.
-    Returns: 
+    Returns:
     Globals:
         none
     Error:
@@ -105,18 +105,18 @@ sub getHcpAttribs
 
 #-------------------------------------------------------------------------------
 
-=head3   getIPaddress 
- Description:    
+=head3   getIPaddress
+ Description:
         Used by DFM related functions. When getting the IPs for CECs' FSPs, or
         getting the IPs for Frames' BPAs. And the IPs order is A-0,A-1,B-0,B-1.
 	When getting the IP for one FSP or one BPA, if the $nodetocheck it one IP,
 	it will return the IP immediately; if not, it will get the IP of the FSP or BPA.
-                         
+
  Arguments:
-    $request: Because getIPaddress() is always used for one node after the process fork. Avoiding to 
+    $request: Because getIPaddress() is always used for one node after the process fork. Avoiding to
               access the DB for each node in the subprocess, we should collect the attributs before
 	      process fork, and put the attributes in the $request variable. For the getIpaddress().
-              The $request parameter should include the ppc hash which mapping the CEC->FSPs and 
+              The $request parameter should include the ppc hash which mapping the CEC->FSPs and
               Frames->BPAs, and vpd hash the fsp->side and the bpa->side.
     $type:    the type of the $nodetocheck
     $nodetocheck:  Node name,  only one node at a time.
@@ -248,11 +248,11 @@ sub getIPaddress
 
 =head3  fsp_api_action
     Description:
-        invoke the fsp_api to perform the functions 
+        invoke the fsp_api to perform the functions
 
     Arguments:
-        $node_name: 
-        $attrs: an attributes hash 
+        $node_name:
+        $attrs: an attributes hash
 	$action: the operations on the fsp, bpa or lpar
 	$tooltype: 0 for HMC, 1 for HNM
     Returns:
@@ -428,11 +428,11 @@ sub fsp_api_action {
 
 =head3  fsp_state_action
     Description:
-        invoke the fsp_api to perform the functions(all_lpars_state) 
+        invoke the fsp_api to perform the functions(all_lpars_state)
 
     Arguments:
-        $node_name: 
-        $attrs: an attributes hash 
+        $node_name:
+        $attrs: an attributes hash
 	$action: the operations on the fsp, bpa or lpar
 	$tooltype: 0 for HMC, 1 for HNM
     Returns:
@@ -522,11 +522,11 @@ sub fsp_state_action {
 
 =head3  fsp_api_create_partition
     Description:
-        invoke the fsp_api to perform the functions 
+        invoke the fsp_api to perform the functions
 
     Arguments:
-        $node_name: 
-        $attrs: an attributes hash 
+        $node_name:
+        $attrs: an attributes hash
 	$action: the operations on the fsp, bpa or lpar
 	$tooltype: 0 for HMC, 1 for HNM
     Returns:
diff --git a/perl-xCAT/xCAT/InstUtils.pm b/perl-xCAT/xCAT/InstUtils.pm
index a8f987b34..ce5a8a112 100755
--- a/perl-xCAT/xCAT/InstUtils.pm
+++ b/perl-xCAT/xCAT/InstUtils.pm
@@ -183,7 +183,7 @@ sub myxCATname
 
 	returns 1 if the hostname is the node I am running on
 
-	Gets all the interfcaes defined on this node and sees if 
+	Gets all the interfcaes defined on this node and sees if
 		any of them match the IP of the hostname passed in
 
     Arguments:
@@ -610,7 +610,7 @@ sub restore_request
 
 =head3   taghash
 
-		Add a non-numeric tag to any hash keys that are numeric.  
+		Add a non-numeric tag to any hash keys that are numeric.
 
 		Arguments:
         Returns:
@@ -665,11 +665,11 @@ sub taghash
 
     Comments:
 		Based on "os" attr of node definition. If attr is not set,
-        defaults to OS of current system.   
+        defaults to OS of current system.
 
 	Example:
-    	my ($rc, $AIXnodes, $Linuxnodes) 
-					= xCAT::InstUtils->getOSnodes(\@noderange) 
+    	my ($rc, $AIXnodes, $Linuxnodes)
+					= xCAT::InstUtils->getOSnodes(\@noderange)
 
 =cut
 
@@ -713,7 +713,7 @@ sub getOSnodes
 
 =head3   get_server_nodes
 
-   		Determines the server node names as known by a lists of nodes. 
+   		Determines the server node names as known by a lists of nodes.
 
     Arguments:
                 $nodes: A list of node names.
diff --git a/perl-xCAT/xCAT/KitPluginUtils.pm b/perl-xCAT/xCAT/KitPluginUtils.pm
index 082c93b65..a3ea7b21d 100644
--- a/perl-xCAT/xCAT/KitPluginUtils.pm
+++ b/perl-xCAT/xCAT/KitPluginUtils.pm
@@ -28,13 +28,13 @@ require xCAT::Table;
 
     Returns: Return hash table which indexes the node names
     by kitname (ref)
-    e.g., 
+    e.g.,
          { "kitname1" => ["node11","node12",...],
            "kitname2" => ["node21","node22",...]
            ...
          }
 
-    Examples: 
+    Examples:
         my @nodes = ("node11", "node12",...);
         my $result = xCAT::KitPluginUtils->get_kits_used_by_nodes(\@nodes);
 
@@ -89,20 +89,20 @@ sub get_kits_used_by_nodes {
 =head3  get_kits_used_by_osimages
 
     Get the kits used by a list of osimages. An osimage
-    uses a kit if one or more of the kit's components 
+    uses a kit if one or more of the kit's components
     are associated with the osimage.
 
     Arguments: list of osimage names (ref)
 
     Returns: Return hash table which indexes the osimage
     names by kitname (ref)
-    e.g., 
+    e.g.,
          { "kitname1" => ["osimage11","osimage12",...],
            "kitname2" => ["osimage21","osimage22",...]
            ...
          }
 
-    Examples: 
+    Examples:
       my @osimages = ("osimage11","osimage12", ...);
       my $result = xCAT::KitPluginUtils->get_kits_used_by_osimages(\@osimages);
 
@@ -176,15 +176,15 @@ sub get_kits_used_by_osimages {
 
     Arguments: list of image profile names (ref)
 
-    Returns: Return hash table which indexes the image 
+    Returns: Return hash table which indexes the image
     profile names by kitname (ref)
-    e.g., 
+    e.g.,
          { "kitname1" => ["imgprofile11","imgprofile12",...],
            "kitname2" => ["imgprofile21","imgprofile22",...]
            ...
          }
 
-    Examples: 
+    Examples:
       my @imgprofiles = ("imgprofile11","imgprofile12",...);
       my $result = xCAT::KitPluginUtils->get_kits_used_by_image_profiles(\@imgprofiles);
 
diff --git a/perl-xCAT/xCAT/MacMap.pm b/perl-xCAT/xCAT/MacMap.pm
index 1c8668411..a3cf3acbe 100644
--- a/perl-xCAT/xCAT/MacMap.pm
+++ b/perl-xCAT/xCAT/MacMap.pm
@@ -90,14 +90,14 @@ sub namesmatch {
 MacMap attempts to do it's best to determine whether or not a particular SNMP description of
 a port matches the user specified value in the configuration.  Generally, if the configuration
 consists of non-stacked switches without line cards, the user should only need to specify the
-port number without any characters or / characters.  If the configuration contains line cards 
-or stacked switches, use of that particular switch's appropriate / syntax in generally called 
-for.  The exception being stacked SMC 8848 switches, in which all ports are still single 
+port number without any characters or / characters.  If the configuration contains line cards
+or stacked switches, use of that particular switch's appropriate / syntax in generally called
+for.  The exception being stacked SMC 8848 switches, in which all ports are still single
 numbers, and the ports on the second switch begin at 57.
 
-If difficulty is encountered, or a switch is attempted with a format that doesn't match any 
+If difficulty is encountered, or a switch is attempted with a format that doesn't match any
 existing rule, it is recommended to use snmpwalk on the switch with the .1.3.6.1.2.1.31.1.1.1.1
-OID, and have the switch table port value match exactly the format suggested by that OID. 
+OID, and have the switch table port value match exactly the format suggested by that OID.
 
 =cut
 
@@ -267,7 +267,7 @@ sub scan_qbridge_vlans {
     Descriptions:
         Retrieve information (switchport and the mac addresses got for that port) for the specified switch or all switches if no specified.
     Arguments:
-        $req: the xcat request hash 
+        $req: the xcat request hash
         $callback: the function to output information
     Returns:
         The hash variable store retrieved inforamtions
@@ -368,7 +368,7 @@ sub dump_mac_info {
                     }
                     @{ $ret{$switch}->{$snmpportname}->{MACaddress} } = @{ $self->{macinfo}->{$switch}->{$snmpportname} };
                     @{ $ret{$switch}->{$snmpportname}->{Vlanid} } = @{ $self->{vlaninfo}->{$switch}->{$snmpportname} };
-                    @{ $ret{$switch}->{$snmpportname}->{Mtu} } = @{ $self->{mtuinfo}->{$switch}->{$snmpportname} }; 
+                    @{ $ret{$switch}->{$snmpportname}->{Mtu} } = @{ $self->{mtuinfo}->{$switch}->{$snmpportname} };
                 }
             }
         }
@@ -408,7 +408,7 @@ sub find_mac {
     #If requesting a cache only check or the cache is a mere 20 seconds old
     #don't bother querying switches
     if ($cachedonly or ($self->{timestamp} > (time() - 20))) { return undef; }
-    
+
     my $runstart = time;
     $self->refresh_table($discover_switch);    #not cached or stale cache, refresh
     my $runstop = time;
@@ -498,7 +498,7 @@ sub refresh_table {
 
     #Build hash of switch port names per switch
     $self->{switches} = {};
-    
+
     #get nodetype from nodetype table, build a temp hash
     my $typehash;
     my $ntable = xCAT::Table->new('nodetype');
@@ -529,17 +529,14 @@ sub refresh_table {
             xCAT::MsgUtils->message("S", "xCAT Table error:" . $entry->{node} . "Has missing or invalid switch.switch and/or switch.port fields");
         }
     }
+
     my $children = 0;
     my $inputs   = new IO::Select;
     $SIG{CHLD} = sub { while (waitpid(-1, WNOHANG) > 0) { $children-- } };
-    foreach my $entry (@entries) {
-        if ($checked_pairs{ $entry->{switch} }) {
-            next;
-        }
+    foreach my $entry (keys %{$self->{switches}}) {
         while ($children > 64) {
             $self->handle_output($inputs);
         }
-        $checked_pairs{ $entry->{switch} } = 1;
         pipe my $child, my $parent;
         $child->autoflush(1);
         $parent->autoflush(1);
@@ -550,7 +547,7 @@ sub refresh_table {
             $children--;
             close($child);
             close($parent);
-            xCAT::MsgUtils->message("S", "refresh_table: failed to fork refresh_switch process for $entry->{switch},skip...");
+            xCAT::MsgUtils->message("S", "refresh_table: failed to fork refresh_switch process for $entry,skip...");
             next;
         }
 
@@ -558,10 +555,10 @@ sub refresh_table {
             $SIG{CHLD} = 'DEFAULT';
             close($child);
             my $runstart = time;
-            $self->refresh_switch($parent, $community, $entry->{switch});
+            $self->refresh_switch($parent, $community, $entry);
             my $runstop = time;
             my $diffduration = $runstop - $runstart;
-            xCAT::MsgUtils->trace(0, ($diffduration > 10) ? "w" : "d", "refresh_switch $entry->{switch} ElapsedTime:$diffduration sec");
+            xCAT::MsgUtils->trace(0, ($diffduration > 10) ? "w" : "d", "refresh_switch $entry ElapsedTime:$diffduration sec");
             exit(0);
         }
         close($parent);
@@ -722,7 +719,7 @@ sub refresh_switch {
 
     if($self->{switchparmhash}->{$switch}->{switchtype} eq 'onie'){
         #for cumulus switch, the MAC table can be retrieved with ssh
-        #which is much faster than snmp 
+        #which is much faster than snmp
         my $mymac;
         my $myport;
 
@@ -738,11 +735,11 @@ sub refresh_switch {
             foreach (@res){
                 if($_ =~ m/^([0-9a-z]{2}:[0-9a-z]{2}:[0-9a-z]{2}:[0-9a-z]{2}:[0-9a-z]{2}:[0-9a-z]{2}) dev swp([0-9]+) vlan ([0-9]+) .*/){
                     $mymac=$1;
-                    $myport=$2;         
+                    $myport=$2;
                     $myport=sprintf("%d",$myport);
                     my $macport=$2;
                     my $macvlan=$3;
- 
+
                     #try all the possible port number formats
                     #e.g, "5","swp5","05","swp05"
                     unless(exists $self->{switches}->{$switch}->{$myport}){
@@ -824,7 +821,7 @@ sub refresh_switch {
                 $self->{macinfo}->{$switch}->{ErrorStr} = "This command does not support Mellanox IB Switch";
                 return;
             }
-        } 
+        }
         last;
     }
 
@@ -965,7 +962,7 @@ sub refresh_switch {
                 # Skip "permanent" ports
                 if (!defined($mactostate->{$_}) || $mactostate->{$_} != 4) {
                     push @{ $index_to_mac{$index} }, $macstring;
-                    push @{ $index_to_vlan{$index} }, $vlan;    
+                    push @{ $index_to_vlan{$index} }, $vlan;
                }
             }
             foreach my $boid (keys %$bridgetoifmap) {
diff --git a/perl-xCAT/xCAT/MsgUtils.pm b/perl-xCAT/xCAT/MsgUtils.pm
index d4876281e..466110fd1 100644
--- a/perl-xCAT/xCAT/MsgUtils.pm
+++ b/perl-xCAT/xCAT/MsgUtils.pm
@@ -73,13 +73,13 @@ This program module file, supports the xcat messaging and logging
 			If address of the callback is not provide, then
 			the message will be displayed to STDERR or STDOUT or
 			added to SYSLOG.  See flags below.
-    
-        	If logging (L) is requested, the message structure 
-			must be a simple string. The routine will convert 
-			it to the appropriate callback structure, if a callback 
+
+        	If logging (L) is requested, the message structure
+			must be a simple string. The routine will convert
+			it to the appropriate callback structure, if a callback
         	is provided.
 	        Note for logging xCAT:MsgUtils->start_logging and
-	        xCAT:MstUtils->stop_logging must be used to 
+	        xCAT:MstUtils->stop_logging must be used to
 			open and close the log.
 
 			For compatibility with existing code, the message routine will
@@ -120,31 +120,31 @@ This program module file, supports the xcat messaging and logging
 				routine and only use the I flag for the message.
 				If V flag is detected, it will be changed to an I flag.
                 W - warning this is displayed/logged by daemon/Client.pm.
-                L - Log error to xCAT Log on the local machine. 
+                L - Log error to xCAT Log on the local machine.
 					Routine must have setup log by calling
-					MsgUtils->start_log routine which returns 
+					MsgUtils->start_log routine which returns
 					$::LOG_FILE_HANDLE.  Log is closed with
 					MsgUtils->stop_log routine. Note can be combined with
 					other flags:
-                    LS - Log to xCAT Log and Syslog  
+                    LS - Log to xCAT Log and Syslog
                     LSE/LSI - Log to xCAT Log and Syslog  and display
 					if this option is used the message must be a simple
 					string. The message routine will format for callback
-					based on the (D,E,I,W) flag. 
- 
+					based on the (D,E,I,W) flag.
+
 
             Here's the meaning of the 1st character, if no callback specified:
 
                 D - DATA  goes to STDOUT
                 E - error.  This type of message will be sent to STDERR.
                 si - informational status info (sinfo)
-                I - informational  goes to STDOUT 
+                I - informational  goes to STDOUT
                 N - Node informational  goes to STDOUT
                 S - Message will be logged to syslog ( severe error)
                      Note S can be combined with other flags for example
 		            SE logs message to syslog and is sent to STDERR.
 			        SA logs message to syslog and to the auditlog DB table. (only xcatd)
-		        A logs message auditlog DB table only. (only for xcatd) 
+		        A logs message auditlog DB table only. (only for xcatd)
                 V - verbose.  This flag is not valid, the calling routine
 				should check for verbose mode before calling the message
 
@@ -158,7 +158,7 @@ This program module file, supports the xcat messaging and logging
 					$::LOG_FILE_HANDLE.  Log is closed with
 					MsgUtils->stop_log routine. Note can be combined with
 					other flags:
-                    LS - Log to xCAT Log and Syslog  
+                    LS - Log to xCAT Log and Syslog
                     LSE/LSI - Log to xCAT Log and Syslog  and display
 
     Returns:
@@ -177,39 +177,39 @@ This program module file, supports the xcat messaging and logging
 		# Message to STDERR
         xCAT::MsgUtils->message('E', "Operation $value1 failed\n");
 		
-        # Message to Syslog 
+        # Message to Syslog
         xCAT::MsgUtils->message('S', "Host $host not responding\n");
 		
-        # Message to Syslog and auditlog table (only used by xcatd) 
+        # Message to Syslog and auditlog table (only used by xcatd)
 		# see tabdump -d auditlog
         my $rsp = {};
 		$rsp->{syslogdata}->[0] = "$host not responding\n"; # for syslog
 		# the next data is for auditlog table,  audittime added below
-		$rsp->{userid} ->[0] = $user; 
-		$rsp->{clientname} -> [0] = $client; 
-		$rsp->{clienttype} -> [0] = $clienttype; 
-		$rsp->{command} -> [0] = $command; 
-		$rsp->{noderange} -> [0] = $noderange; 
-		$rsp->{args} -> [0] = $arguments; 
-		$rsp->{status} -> [0] = $status; 
+		$rsp->{userid} ->[0] = $user;
+		$rsp->{clientname} -> [0] = $client;
+		$rsp->{clienttype} -> [0] = $clienttype;
+		$rsp->{command} -> [0] = $command;
+		$rsp->{noderange} -> [0] = $noderange;
+		$rsp->{args} -> [0] = $arguments;
+		$rsp->{status} -> [0] = $status;
         xCAT::MsgUtils->message('SA', $rsp);
 		
-        # Message to only  auditlog table (only used by xcatd) 
+        # Message to only  auditlog table (only used by xcatd)
 		# see tabdump -d auditlog
         my $rsp = {};
-		$rsp->{userid} ->[0] = $user; 
-		$rsp->{clientname} -> [0] = $client; 
-		$rsp->{clienttype} -> [0] = $clienttype; 
-		$rsp->{command} -> [0] = $command; 
-		$rsp->{noderange} -> [0] = $noderange; 
-		$rsp->{args} -> [0] = $arguments; 
-		$rsp->{status} -> [0] = $status; 
+		$rsp->{userid} ->[0] = $user;
+		$rsp->{clientname} -> [0] = $client;
+		$rsp->{clienttype} -> [0] = $clienttype;
+		$rsp->{command} -> [0] = $command;
+		$rsp->{noderange} -> [0] = $noderange;
+		$rsp->{args} -> [0] = $arguments;
+		$rsp->{status} -> [0] = $status;
         xCAT::MsgUtils->message('A', $rsp);
 		
-        # Message to Log and Syslog 
+        # Message to Log and Syslog
         xCAT::MsgUtils->message('LS', "Host $host not responding\n");
 		
-        # Message to Log 
+        # Message to Log
         xCAT::MsgUtils->message('L', "Host $host not responding\n");
 
     Use with callback
@@ -273,7 +273,7 @@ This program module file, supports the xcat messaging and logging
 
 
     Returns:
-       1 for internal error ( invalid input to the routine) 
+       1 for internal error ( invalid input to the routine)
 
 
 
@@ -669,10 +669,10 @@ sub warn_message
 		    $msg = "Host not responding\n";
 	        xCAT::MsgUtils->message("L", $msg);
 						 .
-						  
+						
 	      my $rc=xCAT::MsgUtils->stop_logging(); # close log
 			 	
-                
+
 =cut
 
 #--------------------------------------------------------------------------------
@@ -680,7 +680,7 @@ sub warn_message
 =head3 start_logging
 
         Start logging messages to a logfile. Return the log file handle so it
-        can be used for updates and to close the file when done logging 
+        can be used for updates and to close the file when done logging
 		using stop_logging.
 
         Arguments:
@@ -791,9 +791,9 @@ sub stop_logging
 
 =head3    backup_logfile
 
-        Backup the current logfile. Move logfile to logfile.1. 
+        Backup the current logfile. Move logfile to logfile.1.
 		Shift all other logfiles
-        (logfile.[1-3]) up one number. The original logfile.4 is removed as in a FIFO.   
+        (logfile.[1-3]) up one number. The original logfile.4 is removed as in a FIFO.
 
         Arguments:
                 $logfile ( full path)
@@ -852,23 +852,23 @@ sub verbose_message
 =head3 trace
 
     Display different level trace message in syslog.
-    
+
     Arguments:
-        $verbose: indicate whether current command is with -V option. 1 is yes and 0 is no.  
+        $verbose: indicate whether current command is with -V option. 1 is yes and 0 is no.
         $level: the level of trace message, can be one of "I","W","E","D","i","w","e","d".
             "I" or "i": means information level.
             "W" or "w": means warning level.
             "E" or "e": means error level.
             "D" or "d": means debug level.
-        
+
             As long as the trace subroutine is called, "information", "warning" and "error" level message will be displayed in syslog.
             The "debug" level message is displayed in syslog only when any one of the below two conditions is true
             1. The current command with -V option. i.e. $verbose=1.
-            2. The xcatdebugmode, which is an attribute of site table, equals 1. 
-        
+            2. The xcatdebugmode, which is an attribute of site table, equals 1.
+
             If $level is not any one of "I","W","E","D","i","w","e","d", the trace subroutine do nothing.
-        
-        $logcontent: the specific message wanted to be displayed in syslog   
+
+        $logcontent: the specific message wanted to be displayed in syslog
     Returns:
         none
 		
@@ -877,7 +877,7 @@ sub verbose_message
 		
     Note:
         Label "xcat" and trace message level, such as "INFO", "ERR", "WARNING" AND "DEBUG", will be added before real trace message automatically. It's convenient to filter in syslog.
-    
+
     Example:
         xCAT::MsgUtils->trace(1,"D","this is debug trace message");
         xCAT::MsgUtils->trace(0,"i","this is information trace message");
@@ -988,7 +988,7 @@ sub perf_log_process
 =cut
 
 #-----------------------------------------------------------------
-sub report_node_error 
+sub report_node_error
 {
     shift;
     my ($cb, $node, $msg) = @_;
diff --git a/perl-xCAT/xCAT/NetworkUtils.pm b/perl-xCAT/xCAT/NetworkUtils.pm
index 7dba4a965..7e34e7d81 100755
--- a/perl-xCAT/xCAT/NetworkUtils.pm
+++ b/perl-xCAT/xCAT/NetworkUtils.pm
@@ -47,15 +47,15 @@ This program module file, is a set of network utilities used by xCAT commands.
 
 		Gets the network domain for a list of nodes
 
-		The domain value comes from the network definition 
+		The domain value comes from the network definition
 		associated with the node ip address.
 
-		If the network domain is not set then the default is to 
+		If the network domain is not set then the default is to
 		use the site.domain value
 
     Arguments:
        list of nodes
-    Returns: 
+    Returns:
 		error - undef
 		success - hash ref of domains for each node
     Globals:
@@ -99,18 +99,18 @@ sub getNodeDomains()
 
 #-------------------------------------------------------------------------------
 
-=head3  gethostnameandip 
+=head3  gethostnameandip
     Works for both IPv4 and IPv6.
-    Takes either a host name or an IP address string 
-    and performs a lookup on that name, 
+    Takes either a host name or an IP address string
+    and performs a lookup on that name,
     returns an array with two elements: the hostname, the ip address
-    if the host name or ip address can not be resolved, 
+    if the host name or ip address can not be resolved,
     the corresponding element in the array will be undef
     Arguments:
        hostname or ip address
     Returns: the hostname and the ip address
     Globals:
-        
+
     Error:
         none
     Example:
@@ -139,13 +139,13 @@ sub gethostnameandip()
 =head3  gethostname
     Works for both IPv4 and IPv6.
     Takes an IP address string and performs a lookup on that name,
-    returns the hostname of the ip address 
+    returns the hostname of the ip address
     if the ip address can not be resolved, returns undef
     Arguments:
        ip address
     Returns: the hostname
     Globals:
-        cache: %::iphosthash 
+        cache: %::iphosthash
     Error:
         none
     Example:
@@ -237,7 +237,7 @@ sub gethostname()
     Error:
         none
     Example:
-        my $ip = xCAT::NetworkUtils->getipaddr($hostname);                  
+        my $ip = xCAT::NetworkUtils->getipaddr($hostname);
     Comments:
         none
 =cut
@@ -317,7 +317,7 @@ sub getipaddr
             @addrinfo=Socket6::getaddrinfo($iporhost, 0, $reqfamily, SOCK_STREAM, 6,Socket6::AI_NUMERICHOST());
         }else{
             @addrinfo=Socket6::getaddrinfo($iporhost, 0, $reqfamily, SOCK_STREAM, 6);
-        }  
+        }
         my ($family, $socket, $protocol, $ip, $name) = splice(@addrinfo, 0, 5);
         unless($reqfamily == AF_INET6){
             if($isip){
@@ -369,9 +369,9 @@ sub getipaddr
         {
             return undef;
         }
-        
+
         my $myip=inet_ntoa($packed_ip);
-        
+
         unless($isip) {
             $::hostiphash{$iporhost}{hostip}=$myip;
         }
@@ -409,7 +409,7 @@ sub clearcache
 #-------------------------------------------------------------------------------
 
 =head3  linklocaladdr
-    Only for IPv6.               
+    Only for IPv6.
     Takes a mac address, calculate the IPv6 link local address
     Arguments:
        mac address
@@ -419,7 +419,7 @@ sub clearcache
     Error:
         none
     Example:
-        my $linklocaladdr = xCAT::NetworkUtils->linklocaladdr($mac);                   
+        my $linklocaladdr = xCAT::NetworkUtils->linklocaladdr($mac);
     Comments:
         none
 =cut
@@ -474,7 +474,7 @@ sub linklocaladdr {
     chcek if the ip address is in the subnet
     Arguments:
        ip address, netmask, subnet
-    Returns: 
+    Returns:
        1 - if the ip address is in the subnet
        0 - if the ip address is NOT in the subnet
     Globals:
@@ -510,7 +510,7 @@ sub ishostinsubnet{
         } elsif($mask =~ /^0x/i ) {
             $maskType=2;
         }
-    } 
+    }
 
     my $ret=xCAT::NetworkUtils::isInSameSubnet( $ip, $subnet, $mask, $maskType);
     if(defined $ret and $ret==1){
@@ -630,7 +630,7 @@ sub setup_ipv6_forwarding
     Arguments:
        prefix length
     Returns:
-       netmask - netmask like ffff:ffff:ffff:ffff:0000:0000:0000:0000 
+       netmask - netmask like ffff:ffff:ffff:ffff:0000:0000:0000:0000
        0 - if the prefix length is not correct
     Globals:
     Error:
@@ -659,7 +659,7 @@ sub prefixtomask {
 
 #-------------------------------------------------------------------------------
 
-=head3  my_ip_in_subnet 
+=head3  my_ip_in_subnet
     Get the facing ip for some specific network
 
     Arguments:
@@ -696,8 +696,8 @@ sub my_ip_in_subnet
 
 #-------------------------------------------------------------------------------
 
-=head3  ip_forwarding_enabled 
-    Check if the ip_forward enabled on the system 
+=head3  ip_forwarding_enabled
+    Check if the ip_forward enabled on the system
 
     Arguments:
     Returns:
@@ -958,23 +958,23 @@ sub my_hexnets
     Description:
         Get the hostname of an IP addresses. First from hosts table, and then try system resultion.
         If there is a shortname, it will be returned. Otherwise it will return long name. If the IP cannot be resolved, return undef;
-        
+
     Arguments:
         $ip: the IP to get;
-        
-    Returns:  
+
+    Returns:
         Return: the hostname.
 For an example
-        
+
     Globals:
         none
-        
+
     Error:
         none
-        
+
     Example:
         xCAT::NetworkUtils::get_host_from_ip('192.168.200.1')
-    
+
     Comments:
 =cut
 
@@ -989,23 +989,23 @@ sub get_host_from_ip
 =head3 isPingable
     Description:
         Check if an IP address can be pinged
-        
+
     Arguments:
         $ip: the IP to ping;
-        
-    Returns:  
+
+    Returns:
         Return: 1 indicates yes; 0 indicates no.
 For an example
-        
+
     Globals:
         none
-        
+
     Error:
         none
-        
+
     Example:
         xCAT::NetworkUtils::isPingable('192.168.200.1')
-    
+
     Comments:
         none
 =cut
@@ -1044,25 +1044,25 @@ sub isPingable
 =head3 my_nets
     Description:
         Return a hash ref that contains all subnet and netmask on the mn (or sn). This subroutine can be invoked on both Linux and AIX.
-        
+
     Arguments:
         none.
-        
-    Returns:  
+
+    Returns:
         Return a hash ref. Each entry will be: <subnet/mask>=><existing ip>;
         For an example:
             '192.168.200.0/255.255.255.0' => '192.168.200.246';
 For an example
-        
+
     Globals:
         none
-        
+
     Error:
         none
-        
+
     Example:
         xCAT::NetworkUtils::my_nets().
-    
+
     Comments:
         none
 =cut
@@ -1208,7 +1208,7 @@ sub my_if_netmap
          Returns my ip address in the same network with the specified node
          Linux only
     Arguments:
-        nodename 
+        nodename
     Returns:
 	result and error message or my ip address
 	1. If node can not be resolved, the return info will be like this:
@@ -1216,7 +1216,7 @@ sub my_if_netmap
 	2. If no IP found that matching the giving node, the return info will be:
 	[2, "The IP address of node $node is in an undefined subnet"].
 	3. If IP found:
-	[0,ip1,ip2,...] 
+	[0,ip1,ip2,...]
     Globals:
         none
     Error:
@@ -1276,10 +1276,10 @@ sub my_ip_facing
 #-------------------------------------------------------------------------------
 
 =head3   my_ip_facing_aix
-         Returns my ip address  
+         Returns my ip address
          AIX only
     Arguments:
-        nodename 
+        nodename
     Returns:
     Globals:
         none
@@ -1336,7 +1336,7 @@ sub my_ip_facing_aix
 =head3 formatNetmask
     Description:
         Transform netmask to one of 3 formats (255.255.255.0, 24, 0xffffff00).
-        
+
     Arguments:
         $netmask: the original netmask
         $origType: the original netmask type. The valid value can be 0, 1, 2:
@@ -1344,19 +1344,19 @@ sub my_ip_facing_aix
             Type 1: 24
             Type 2: 0xffffff00
         $newType: the new netmask type, valid values can be 0,1,2, as above.
-        
-    Returns:  
+
+    Returns:
         Return undef if any error. Otherwise return the netmask in new format.
-        
+
     Globals:
         none
-        
+
     Error:
         none
-        
+
     Example:
         xCAT::NetworkUtils::formatNetmask( '24', 1, 0); #return '255.255.255.0'.
-    
+
     Comments:
         none
 =cut
@@ -1407,7 +1407,7 @@ sub formatNetmask
 =head3 isInSameSubnet
     Description:
         Check if 2 given IP addresses are in same subnet
-        
+
     Arguments:
         $ip1: the first IP
         $ip2: the second IP
@@ -1416,20 +1416,20 @@ sub formatNetmask
             Type 1: 24
             Type 2: 0xffffff00
         $masktype: the netmask type, 3 possible values: 0,1,2, as indicated above
-        
-    Returns:  
+
+    Returns:
         1: they are in same subnet
         undef: not in same subnet
-        
+
     Globals:
         none
-        
+
     Error:
         none
-        
+
     Example:
         xCAT::NetworkUtils::isInSameSubnet( '192.168.10.1', '192.168.10.2', '255.255.255.0', 0);
-    
+
     Comments:
         none
 =cut
@@ -1649,8 +1649,8 @@ sub nodeonmynet
 
 =head3   getNodeIPaddress
     Arguments:
-       Node name  only one at a time 
-    Returns: ip address(s) 
+       Node name  only one at a time
+    Returns: ip address(s)
     Globals:
         none
     Error:
@@ -1694,7 +1694,7 @@ sub getNodeIPaddress
 
 =head3   checkNodeIPaddress
     Arguments:
-       Node name  only one at a time 
+       Node name  only one at a time
     Returns: a hash object contains IP or Error
     Globals:
         none
@@ -1939,7 +1939,7 @@ sub gethost_ips
 
 #-------------------------------------------------------------------------------
 
-=head3 get_subnet_aix 
+=head3 get_subnet_aix
     Description:
         To get present subnet configuration by parsing the output of 'netstat'. Only designed for AIX.
     Arguments:
@@ -1948,7 +1948,7 @@ sub gethost_ips
         @aix_nrn : An array with entries in format "net:nic:netmask:flag". Following is an example entry:
             9.114.47.224:en0:27:U
     Globals:
-        none 
+        none
     Error:
         none
     Example:
@@ -1998,7 +1998,7 @@ sub get_subnet_aix
 =head3 determinehostname  and ip address(s)
 
   Used on the service node to figure out what hostname and ip address(s)
-  are valid names and addresses 
+  are valid names and addresses
   Input: None
   Output: ipaddress(s),nodename
 =cut
@@ -2044,7 +2044,7 @@ sub determinehostname
 
 #-----------------------------------------------------------------------------
 
-=head3 toIP 
+=head3 toIP
 
  IPv4 function to convert hostname to IP address
 
@@ -2171,9 +2171,9 @@ sub isIpaddr
 
 #-------------------------------------------------------------------------------
 
-=head3  getNodeNameservers 
+=head3  getNodeNameservers
     Description:
-        Get nameservers of  specified nodes. 
+        Get nameservers of  specified nodes.
         The priority: noderes.nameservers > networks.nameservers > site.nameservers
     Arguments:
         node: node name list
@@ -2229,9 +2229,9 @@ sub getNodeNameservers {
 
 #-------------------------------------------------------------------------------
 
-=head3   getNodeNetworkCfg 
+=head3   getNodeNetworkCfg
     Description:
-        Get node network configuration, including "IP, hostname(the nodename),and netmask" by this node's name. 
+        Get node network configuration, including "IP, hostname(the nodename),and netmask" by this node's name.
 
     Arguments:
         node: the nodename
@@ -2343,14 +2343,14 @@ sub getNodesNetworkCfg
 
 #-------------------------------------------------------------------------------
 
-=head3   get_hdwr_ip 
+=head3   get_hdwr_ip
     Description:
-        Get hardware(CEC, BPA) IP from the hosts table, and then /etc/hosts. 
+        Get hardware(CEC, BPA) IP from the hosts table, and then /etc/hosts.
 
     Arguments:
         node: the nodename(cec, or bpa)
     Returns:
-        Return the node IP 
+        Return the node IP
         -1  - Failed to get the IP.
     Globals:
         none
@@ -2396,7 +2396,7 @@ sub get_hdwr_ip
     Arguments:
        nodes-- an array of nodes.
     Returns:
-       a hash that has the node status. The format is: 
+       a hash that has the node status. The format is:
           {alive=>[node1, node3,...], unreachable=>[node4, node2...]}
 =cut
 
@@ -2704,25 +2704,25 @@ sub get_all_nicips {
             ksdevice - Specify network device for Anaconda. For rh6 and earlier. Format: 'ksdevice={$mac|$nicname}'
             BOOTIF - Specify network device for Anaconda. The boot device which set by pxe. xCAT also set it if the bootload is not pxe. Format 'BOOTIF={$mac}'
             ifname - Specify a interfacename<->mac pair, it will set the interfacename to the interface which has the <mac>. Format 'ifname=$ifname:$mac'
-               # This will only be generated when linuximage.nodebootif is set. 
+               # This will only be generated when linuximage.nodebootif is set.
             bootdev - Specify the boot device. Mostly it's used with <ip> parameter and when there are multiple <ip> params. Format 'bootdev={$mac|$ifname}
             ip - Specify the network configuration for an interface. Format: 'ip=dhcp', 'ip=$ifname:dhcp'
-           
+
             netdevice - Specify network device for Linuxrc (Suse bootloader). Format: 'netdevice={$mac|$nicname}'
-           
+
             netdev - Specify the interfacename which is used by xCAT diskless boot script to select the network interface. Format: 'netdev=$nicname'
 
         Reference:
             Redhat anaconda doc: https://github.com/rhinstaller/anaconda/blob/master/docs/boot-options.txt
             Suse Linuxrc do: https://en.opensuse.org/SDB:Linuxrc
-            
+
     Arguments:
         $installnic   <- node.installnic
         $primarynic <- node.primarynic
         $macmac    <- node.mac
         $nodebootif <- linuximage.nodebootif
-        
-    Returns: 
+
+    Returns:
         $net_params - The key will be the parameter name, the value for the key will be the parameter value.
         Valid Parameter Name:
             ksdevice
diff --git a/perl-xCAT/xCAT/PPCrflash.pm b/perl-xCAT/xCAT/PPCrflash.pm
index 89184a49c..4e080174b 100644
--- a/perl-xCAT/xCAT/PPCrflash.pm
+++ b/perl-xCAT/xCAT/PPCrflash.pm
@@ -12,7 +12,7 @@ use xCAT::Utils;
 use xCAT::TableUtils;
 use Getopt::Long;
 use File::Spec;
-use POSIX qw(tmpnam);
+use File::Temp;
 
 my $packages_dir = ();
 my $activate     = ();
@@ -662,7 +662,7 @@ sub rflash {
     ########################
     # Now build a temporary file containing the stanzas to be run on the HMC
     ###################
-    my $tmp_file = tmpnam();    # the file handle of the stanza
+    my $tmp_file = File::Temp::tmpnam();    # the file handle of the stanza
     ##############################
     # Open the temp file
     ##########################
diff --git a/perl-xCAT/xCAT/ProfiledNodeUtils.pm b/perl-xCAT/xCAT/ProfiledNodeUtils.pm
index 65cb35804..d12e05fef 100644
--- a/perl-xCAT/xCAT/ProfiledNodeUtils.pm
+++ b/perl-xCAT/xCAT/ProfiledNodeUtils.pm
@@ -80,7 +80,7 @@ sub get_allocable_staticips_innet
                     $rank - The start number.
                     $amount - The total hostname number to be generated.
       Returns     : numric hostname list
-      Example     : 
+      Example     :
               calling  genhosts_with_numric_tmpl("compute#NNnode") will return a list like:
               ("compute00node", "compute01node", ..."compute98node", "compute99node")
 =cut
@@ -104,7 +104,7 @@ sub genhosts_with_numric_tmpl
                     $prefix - the prefix string of hostname format.
                     $appendix - the appendix string of hostname format
                     $numlen - The number length in hostname format.
-      Example     : 
+      Example     :
               calling  split_hostname("compute#NNnode") will return a list like:
               ("compute", "node", 2)
 =cut
@@ -145,7 +145,7 @@ sub split_hostname
                     $rank - the start number for numric part
                     $amount - the amount of hostnames to be generated.
       Returns     : numric hostname list
-      Example     : 
+      Example     :
               calling  gen_numric_hostnames("compute", "node",2) will return a list like:
               ("compute00node", "compute01node", ..."compute98node", "compute99node")
 =cut
@@ -182,9 +182,9 @@ sub gen_numric_hostnames
       Returns     : hostname format type value:
                     "numric" - numric hostname format.
                     "rack" - rack info hostname format.
-      Example     : 
+      Example     :
               calling  get_hostname_format_type("compute#NNnode") will return "numric"
-              calling  get_hostname_format_type("compute-#RR-#NN") will return "rack" 
+              calling  get_hostname_format_type("compute-#RR-#NN") will return "rack"
 =cut
 
 #-------------------------------------------------------------------------------
@@ -235,8 +235,8 @@ sub get_hostname_format_type {
       Arguments   : $format - rack hostname format
                     $racknum - rack number.
       Returns     : numric hostname format.
-      Example     : 
-           calling  rackformat_to_numricformat("compute-#RR-#NN", 1) will return "compute-01-#NN" 
+      Example     :
+           calling  rackformat_to_numricformat("compute-#RR-#NN", 1) will return "compute-01-#NN"
 =cut
 
 #-------------------------------------------------------------------------------
@@ -385,7 +385,7 @@ sub get_nodes_nic_attrs {
 
 =head3 get_netprofile_bmcnet
       Description : Get bmc network name of a network profile.
-      Arguments   : $nettmpl - network profile name 
+      Arguments   : $nettmpl - network profile name
       Returns     : bmc network name of this network profile.
 =cut
 
@@ -406,7 +406,7 @@ sub get_netprofile_bmcnet {
 
 =head3 get_netprofile_provisionnet
       Description : Get deployment network of a network profile.
-      Arguments   : $nettmpl - network profile name 
+      Arguments   : $nettmpl - network profile name
       Returns     : deployment network name of this network profile.
 =cut
 
@@ -455,11 +455,11 @@ sub get_output_filename
       Description : Get all chassis in system.
       Arguments   : hashref: if not set, return a array ref.
                              if set, return a hash ref.
-                    type   : "all", get all chassis, 
+                    type   : "all", get all chassis,
                              "cmm", get all chassis whose type is cmm
                     if type not specify, it is 'all'
       Returns     : ref for chassis list.
-      Example     : 
+      Example     :
                     my $arrayref = xCAT::ProfiledNodeUtils->get_all_chassis();
                     my $hashref = xCAT::ProfiledNodeUtils->get_all_chassis(1);
                     my $hashref = xCAT::ProfiledNodeUtils->get_all_chassis(1, 'cmm');
@@ -495,7 +495,7 @@ sub get_all_chassis
       Arguments   : hashref: if not set, return a array ref.
                              if set, return a hash ref.
       Returns     : ref for rack list.
-      Example     : 
+      Example     :
                     my $arrayref = xCAT::ProfiledNodeUtils->get_all_rack();
                     my $hashref = xCAT::ProfiledNodeUtils->get_all_rack(1);
 =cut
@@ -554,7 +554,7 @@ sub get_racks_for_chassises
 
 =head3 get_allnode_singleattrib_hash
       Description : Get all records of a column from a table, then return a hash.
-                    The return hash's keys are the records of this attribute 
+                    The return hash's keys are the records of this attribute
                     and values are all set as 1.
       Arguments   : $tabname - the table name.
                     $attr - the attribute name.
@@ -636,7 +636,7 @@ sub get_db_switchports
       Arguments   : hashref: if not set, return a array ref.
                              if set, return a hash ref.
       Returns     : ref for CECs list.
-      Example     : 
+      Example     :
                     my $arrayref = xCAT::ProfiledNodeUtils->get_all_cecs();
                     my $hashref = xCAT::ProfiledNodeUtils->get_all_cecs(1);
 =cut
@@ -675,7 +675,7 @@ sub get_all_cecs
       Description : Get all LPAR ids  in system.
       Arguments   : ref of all cecs
       Returns     : ref for LPAR ids hash.
-      Example     : 
+      Example     :
                     my $arrayref = xCAT::ProfiledNodeUtils->get_all_lparids(\%allcecs);
 =cut
 
@@ -1070,12 +1070,12 @@ sub is_kvm_hypv_node
 #-------------------------------------------------------------------------------
 
 =head3 get_nodes_cmm
-      Description : Get the CMM of nodelist 
+      Description : Get the CMM of nodelist
       Arguments   : $nodelist - the ref of node list array
       Returns     : $cmm - the ref of hash like
                     {
                       "cmm1" => 1,
-                      "cmm2" => 1                          
+                      "cmm2" => 1
                     }
 =cut
 
@@ -1229,7 +1229,7 @@ sub update_windows_prodkey
 =head3 check_nicips
     Description: Check if the nicips defined in MAC file is correct
                  format
-    Arguments: $installnic: the installnic defined in networkprofile 
+    Arguments: $installnic: the installnic defined in networkprofile
                $netprofileattrsref: the attributes of all nics in networkprofile
                $freeipshash:  the hash of networks' staticrange
                $nicips: the string of nicips defined in MAC file
@@ -1300,7 +1300,7 @@ sub check_nicips {
 =head3 gen_chain_for_profiles
     Description: Generate a chain string based on Network/Hardware/Image profiles.
     Arguments: $profiles_hash: The reference for profiles hash.
-             For example: 
+             For example:
              $profiles_hash = { 'HardwareProfile' => 'IBM_NeXtScale_M4',
                                 'ImageProfile' => 'rhels6.5-x86_64-stateful-compute',
                                 'NetworkProfile' => 'default_network_profile',
@@ -1390,10 +1390,10 @@ sub gen_chain_for_profiles {
 #-------------------------------------------------------------------------------
 
 =head3 get_all_vmhosts
-      Description : Get all vm hosts/hypervisor from DB. 
+      Description : Get all vm hosts/hypervisor from DB.
       Arguments   : N/A
       Returns     : ref for vm hosts/hypervisor hash.
-      Example     : 
+      Example     :
                     my $hashref = xCAT::ProfiledNodeUtils->get_all_vmhosts();
 =cut
 
diff --git a/perl-xCAT/xCAT/RSH.pm b/perl-xCAT/xCAT/RSH.pm
index 8a03e9db2..2e5ea48e0 100644
--- a/perl-xCAT/xCAT/RSH.pm
+++ b/perl-xCAT/xCAT/RSH.pm
@@ -34,13 +34,13 @@ if ($^O eq 'linux') {
         Returns:
         	A command array for the rsh command with the appropriate
         	arguments as defined in the $config hash table
-               
+
         Globals:
         	$RSH_CMD
-    
+
         Error:
         	None
-    
+
         Example:
         	xCAT::RSH->remote_shell_command($config_hash, '/usr/bin/rsh');
 
@@ -92,13 +92,13 @@ sub remote_shell_command {
         Returns:
         	A command array for the rcp command with the appropriate
         	arguments as defined in the $config hash table
-                
+
         Globals:
         	$RCP_CMD
-    
+
         Error:
         	None        	
-    
+
         Example:
         	xCAT::RSH->remote_copy_command($config_hash, '/usr/bin/rcp');
 
diff --git a/perl-xCAT/xCAT/RSYNC.pm b/perl-xCAT/xCAT/RSYNC.pm
index bd6d6efa3..d36694cf0 100644
--- a/perl-xCAT/xCAT/RSYNC.pm
+++ b/perl-xCAT/xCAT/RSYNC.pm
@@ -37,18 +37,18 @@ if ($^O eq 'linux')
         	$class - Calling module name (discarded)
         	$config - Reference to copy command configuration hash table
         	$exec_path - Path to rsync executable
-        	$localhost - 1 indicates we are running on the Management Node 
+        	$localhost - 1 indicates we are running on the Management Node
 
         Returns:
         	A command array for the rsync command with the appropriate
         	arguments as defined in the $config hash table
-                
+
         Globals:
         	None
-    
+
         Error:
         	None        	
-    
+
         Example:
         	xCAT::RSYNC->remote_copy_command($config_hash, '/usr/bin/rsync');
 
diff --git a/perl-xCAT/xCAT/RemoteShellExp.pm b/perl-xCAT/xCAT/RemoteShellExp.pm
index a9388d512..15dbf6104 100755
--- a/perl-xCAT/xCAT/RemoteShellExp.pm
+++ b/perl-xCAT/xCAT/RemoteShellExp.pm
@@ -6,7 +6,7 @@ package xCAT::RemoteShellExp;
 
 #-----------------------------------------------------------------------------
 
-=head1   RemoteShellExp 
+=head1   RemoteShellExp
  Uses perl  Expect to set up ssh passwordless login on the input node list
  Called from  xdsh  <nodelist> -K command
  It works for node and devices ( such as QLogic Switch).
@@ -35,12 +35,12 @@ package xCAT::RemoteShellExp;
                   node.
    DSH_TO_USERID - The userid on the node where the ssh keys will be updated.
    DSH_ENABLE_SSH - Node to node root passwordless ssh will be setup.
-   DSH_ZONE_SSHKEYS  - directory containing the zones root .ssh keys 
+   DSH_ZONE_SSHKEYS  - directory containing the zones root .ssh keys
 
  Usage: remoteshellexp
-   [-t node list]  test ssh connection to the node 
-   [-k] Generates the ssh keys needed , for the user on the MN. 
-   [-s node list]  copies the ssh keys to the nodes 
+   [-t node list]  test ssh connection to the node
+   [-k] Generates the ssh keys needed , for the user on the MN.
+   [-s node list]  copies the ssh keys to the nodes
    optional $timeout = timeout value for the expect.  Usually from the xdsh -t flag
    default timeout is 10 seconds
     exit 0 - good
@@ -48,9 +48,9 @@ package xCAT::RemoteShellExp;
     exit 2 - usage error
 
 Examples:
-$rc=xCAT::RemoteShellExp->remoteshellexp("k",$callback,$remoteshellcmd,$nodes,$timeout); 
-$rc=xCAT::RemoteShellExp->remoteshellexp("s",$callback,$remoteshellcmd,$nodes,$timeout); 
-$rc=xCAT::RemoteShellExp->remoteshellexp("t",$callback,$remoteshellcmd,$nodes,$timeout); 
+$rc=xCAT::RemoteShellExp->remoteshellexp("k",$callback,$remoteshellcmd,$nodes,$timeout);
+$rc=xCAT::RemoteShellExp->remoteshellexp("s",$callback,$remoteshellcmd,$nodes,$timeout);
+$rc=xCAT::RemoteShellExp->remoteshellexp("t",$callback,$remoteshellcmd,$nodes,$timeout);
 
 =cut
 
@@ -226,10 +226,10 @@ sub remoteshellexp
 
 #-----------------------------------------------------------------------------
 
-=head3    gensshkeys 
+=head3    gensshkeys
 	
       Generates new ssh keys for the input userid on the MN, if they do not
-      already exist.  Test for id_rsa key existence. 
+      already exist.  Test for id_rsa key existence.
 
 =cut
 
@@ -355,9 +355,9 @@ sub gensshkeys
 
 #-----------------------------------------------------------------------------
 
-=head3    testkeys 
+=head3    testkeys
 	
-      Test to see if the remoteshell setup worked 
+      Test to see if the remoteshell setup worked
 
 =cut
 
@@ -479,9 +479,9 @@ sub testkeys
 
 #-------------------------------------------------------------------------------
 
-=head3    sendnodeskeys 
+=head3    sendnodeskeys
 	
-      Setup the ssh keys on the nodes 
+      Setup the ssh keys on the nodes
 
 =cut
 
@@ -592,7 +592,7 @@ sub sendnodeskeys
             my $rsp = {};
             $rsp->{error}->[0] = "Permission denied, please make sure the user $to_userid has been created on the node $node and the input password is right\n";
             xCAT::MsgUtils->message("E", $rsp, $::CALLBACK);
-        }        
+        }
         if (defined($result[1]))
         {
             my $msg = $result[1];
@@ -791,9 +791,9 @@ sub sendnodeskeys
 
 #-------------------------------------------------------------------------------
 
-=head3    senddeviceskeys 
+=head3    senddeviceskeys
 	
-      Setup the ssh keys on the switches 
+      Setup the ssh keys on the switches
 
 =cut
 
diff --git a/perl-xCAT/xCAT/SINV.pm b/perl-xCAT/xCAT/SINV.pm
index 51852c4cd..1a6887dad 100644
--- a/perl-xCAT/xCAT/SINV.pm
+++ b/perl-xCAT/xCAT/SINV.pm
@@ -3,11 +3,11 @@
 
 #------------------------------------------------------------------------------
 
-=head1    SINV 
+=head1    SINV
 
 =head2    Package Description
 
-This program module file supplies a set of utility programs for  
+This program module file supplies a set of utility programs for
 the sinv command.
 
 
@@ -44,8 +44,8 @@ my @errresult;
 
 #------------------------------------------------------------------------------
 
-=head3   usage  			    	 
-  Display usage message 
+=head3   usage  			    	
+  Display usage message
 
 =cut
 
@@ -77,8 +77,8 @@ sub usage
 
 #------------------------------------------------------------------------------
 
-=head3   parse_and_run_sinv  			    	 
-   Checks input arguments and runs sinv from the plugin 
+=head3   parse_and_run_sinv  			    	
+   Checks input arguments and runs sinv from the plugin
 
 =cut
 
@@ -593,20 +593,20 @@ sub parse_and_run_sinv
 =head3   buildreport (note originally written only for xdsh but
 		 now supports rinv also)
 
-  This routine will take the input template and compare against 
-  the output of the dsh command and build a report of the differences. 
+  This routine will take the input template and compare against
+  the output of the dsh command and build a report of the differences.
   Read a nodes worth of data from the dsh command
   Call compareoutput- compares the dsh to the template
   Get the template and nodename returned from compareoutput and build hash
   Call writereport to take the hash and write the report to the output file
   Cleanup
-  Input (report file, file containing dsh run,template file,template count 
+  Input (report file, file containing dsh run,template file,template count
          whether to remove the generated templates, original dsh node list,
 		 ignorefirsttemplate,exactmatch)
 
   If exactmatch is chosen, a diff is done against the template and the output.
-  If not exactmatch, then each record (line) in the template must be 
-  checked against the node's output to determine, if it exists. 
+  If not exactmatch, then each record (line) in the template must be
+  checked against the node's output to determine, if it exists.
 
 =cut
 
@@ -805,7 +805,7 @@ sub buildreport
 
 #------------------------------------------------------------------------------
 
-=head3   compareoutput  			    	 
+=head3   compareoutput  			    	
  The purpose of this routine is to build sets of nodes
    that have the same configuration.  We will build up
    to template_cnt sets.  If more nodes are not part of these
@@ -973,7 +973,7 @@ sub compareoutput
 
 #------------------------------------------------------------------------------
 
-=head3   diffoutput  			    	 
+=head3   diffoutput  			    	
  The purpose of this routine is to build sets of nodes
    that have the same configuration.  We will build up
    to template_cnt sets.  If more nodes are not part of these
@@ -1152,9 +1152,9 @@ sub diffoutput
 
 #------------------------------------------------------------------------------
 
-=head3   writereport  			    	 
+=head3   writereport  			    	
 
- The purpose of this routine is to write the report to the output file 
+ The purpose of this routine is to write the report to the output file
 
 =cut
 
@@ -1313,9 +1313,9 @@ sub writereport
 
 #------------------------------------------------------------------------------
 
-=head3   xdshoutput  			    	 
+=head3   xdshoutput  			    	
 
- Check xdsh output  - get output from command and pipe to xdshcoll 
+ Check xdsh output  - get output from command and pipe to xdshcoll
 
 =cut
 
@@ -1370,7 +1370,7 @@ sub xdshoutput
 
 #------------------------------------------------------------------------------
 
-=head3   rinvoutput  			    	 
+=head3   rinvoutput  			    	
 
  Check rinv output  - get output from command
 
@@ -1449,11 +1449,11 @@ sub rinvoutput
 
 #------------------------------------------------------------------------------
 
-=head3   storeresults 			    	 
+=head3   storeresults 			    	
 
   Runs command output through xdshcoll and stores in /tmp/<tempfile>
  store results in $tempfile or $templatepath ( for seed node) based on
- $processflag = seednode 
+ $processflag = seednode
 =cut
 
 #------------------------------------------------------------------------------
diff --git a/perl-xCAT/xCAT/SSH.pm b/perl-xCAT/xCAT/SSH.pm
index 0f6d0b30e..f7b70fff1 100644
--- a/perl-xCAT/xCAT/SSH.pm
+++ b/perl-xCAT/xCAT/SSH.pm
@@ -36,14 +36,14 @@ our $ssh_version = xCAT::SSH->validate_ssh_version;
         Returns:
         	A command array for the ssh command with the appropriate
         	arguments as defined in the $config hash table
-               
+
         Globals:
         	$ssh_version
         	$SSH_CMD
-    
+
         Error:
         	None
-    
+
         Example:
         	xCAT::SSH->remote_shell_command($config_hash, '/usr/bin/ssh');
 
@@ -99,14 +99,14 @@ sub remote_shell_command {
         Returns:
         	A command array for the scp command with the appropriate
         	arguments as defined in the $config hash table
-                
+
         Globals:
         	$ssh_version
         	$SCP_CMD
-    
+
         Error:
         	None        	
-    
+
         Example:
         	xCAT::SSH->remote_copy_command($config_hash, '/usr/bin/scp');
 
@@ -147,7 +147,7 @@ sub remote_copy_command {
         {
             $scpfile = "/tmp/scp_$$config{'dest-host'}";
         }
-       
+
         open SCPCMDFILE, "> $scpfile"
           or die "Can not open file $scpfile";
         if ($$config{'dest-user'})
@@ -183,7 +183,7 @@ sub remote_copy_command {
                         "$exec_path -p -r $src_file_diff_dest $dest_user_host:$dest_dir/$diff_basename\n";
                 }
             }
-        }        
+        }
 
         close SCPCMDFILE;
         chmod 0755, $scpfile;
@@ -231,13 +231,13 @@ sub remote_copy_command {
         Returns:
         	The string 'OpenSSH' if OpenSSH is used
         	undef otherwise
-                
+
         Globals:
         	$SSH_CMD
-    
+
         Error:
         	None
-    
+
         Example:
         	$ssh_version = xCAT::SSH->validate_ssh_version;
 
diff --git a/perl-xCAT/xCAT/Schema.pm b/perl-xCAT/xCAT/Schema.pm
index dc053e541..c2e1c33da 100755
--- a/perl-xCAT/xCAT/Schema.pm
+++ b/perl-xCAT/xCAT/Schema.pm
@@ -213,7 +213,7 @@ qq{ link,ro - The file is readonly, and will be placed in tmpfs on the booted no
 'nicmodel' => 'Model of NICs that will be provided to VMs (i.e. e1000, rtl8139, virtio, etc)',
             'bootorder' => 'Boot sequence (i.e. net,hd)',
 'clockoffset' => 'Whether to have guest RTC synced to "localtime" or "utc"  If not populated, xCAT will guess based on the nodetype.os contents.',
-            'virtflags' => 'General flags used by the virtualization method.  
+            'virtflags' => 'General flags used by the virtualization method.
           For example, in Xen it could, among other things, specify paravirtualized setup, or direct kernel boot.  For a hypervisor/dom0 entry, it is the virtualization method (i.e. "xen").  For KVM, the following flag=value pairs are recognized:
             imageformat=[raw|fullraw|qcow2]
                 raw is a generic sparse file that allocates storage on demand
@@ -221,7 +221,7 @@ qq{ link,ro - The file is readonly, and will be placed in tmpfs on the booted no
                 qcow2 is a sparse, copy-on-write capable format implemented at the virtualization layer rather than the filesystem level
             clonemethod=[qemu-img|reflink]
                 qemu-img allows use of qcow2 to generate virtualization layer copy-on-write
-                reflink uses a generic filesystem facility to clone the files on your behalf, but requires filesystem support such as btrfs 
+                reflink uses a generic filesystem facility to clone the files on your behalf, but requires filesystem support such as btrfs
             placement_affinity=[migratable|user_migratable|pinned]',
 'vncport' => 'Tracks the current VNC display port (currently not meant to be set',
 'textconsole' => 'Tracks the Psuedo-TTY that maps to the serial port or console of a VM',
@@ -815,7 +815,7 @@ passed as argument rather than by table value',
             otherpkglist => 'The fully qualified name of the file that stores non-distro package lists that will be included in the image. It could be set to multiple paths. The multiple paths must be separated by ",".',
             otherpkgdir => 'The base directory and urls of internet repos from which the non-distro packages are retrived. Only 1 local directory is supported at present. The entries should be delimited with comma ",". Currently, the internet repos are only supported on Ubuntu and Redhat.',
             exlist => 'The fully qualified name of the file that stores the file names and directory names that will be excluded from the image during packimage command.  It is used for diskless image only.',
-            postinstall => 'Supported in diskless image only. The fully qualified name of the scripts running in non-chroot mode after the package installation but before initrd generation during genimage. If multiple scripts are specified, they should be seperated with comma ",". A set of osimage attributes are exported as the environment variables to be used in the postinstall scripts:
+            postinstall => 'Supported in diskless image only. The fully qualified name of the scripts and the user-specified arguments running in non-chroot mode after the package installation but before initrd generation during genimage. If multiple scripts are specified, they should be seperated with comma ",". The arguments passed to each postinstall script include  4 implicit arguments(<rootimage path>,<os version>,<os arch>,<profile>) and the user-specified arguments. A set of osimage attributes are exported as the environment variables to be used in the postinstall scripts:
 
       IMG_ARCH(The architecture of the osimage, such as "ppc64le","x86_64"),
       IMG_NAME(The name of the osimage, such as "rhels7.3-ppc64le-netboot-compute"),
@@ -1579,26 +1579,26 @@ zvmivp => {
         table_desc   => 'Stores NIC details.',
         descriptions => {
             node   => 'The node or group name.',
-            nicips => 'Comma-separated list of IP addresses per NIC. 
+            nicips => 'Comma-separated list of IP addresses per NIC.
                 To specify one ip address per NIC:
                     <nic1>!<ip1>,<nic2>!<ip2>,..., for example, eth0!10.0.0.100,ib0!11.0.0.100
                 To specify multiple ip addresses per NIC:
                     <nic1>!<ip1>|<ip2>,<nic2>!<ip1>|<ip2>,..., for example, eth0!10.0.0.100|fd55::214:5eff:fe15:849b,ib0!11.0.0.100|2001::214:5eff:fe15:849a. The xCAT object definition commands support to use nicips.<nicname> as the sub attributes.
                 Note: The primary IP address must also be stored in the hosts.ip attribute. The nichostnamesuffixes should specify one hostname suffix for each ip address.',
-            nichostnamesuffixes => 'Comma-separated list of hostname suffixes per NIC. 
+            nichostnamesuffixes => 'Comma-separated list of hostname suffixes per NIC.
                         If only one ip address is associated with each NIC:
                             <nic1>!<ext1>,<nic2>!<ext2>,..., for example, eth0!-eth0,ib0!-ib0
                         If multiple ip addresses are associated with each NIC:
-                            <nic1>!<ext1>|<ext2>,<nic2>!<ext1>|<ext2>,..., for example,  eth0!-eth0|-eth0-ipv6,ib0!-ib0|-ib0-ipv6. 
-                        The xCAT object definition commands support to use nichostnamesuffixes.<nicname> as the sub attributes. 
+                            <nic1>!<ext1>|<ext2>,<nic2>!<ext1>|<ext2>,..., for example,  eth0!-eth0|-eth0-ipv6,ib0!-ib0|-ib0-ipv6.
+                        The xCAT object definition commands support to use nichostnamesuffixes.<nicname> as the sub attributes.
 
                         Note:  According to DNS rules a hostname must be a text string up to 24 characters drawn from the alphabet (A-Z), digits (0-9) and minus sign (-). When you are specifying "nichostnamesuffixes" or "nicaliases" make sure the resulting hostnames will conform to this naming convention',
-            nichostnameprefixes => 'Comma-separated list of hostname prefixes per NIC. 
+            nichostnameprefixes => 'Comma-separated list of hostname prefixes per NIC.
                         If only one ip address is associated with each NIC:
                             <nic1>!<ext1>,<nic2>!<ext2>,..., for example, eth0!eth0-,ib0!ib-
                         If multiple ip addresses are associated with each NIC:
-                            <nic1>!<ext1>|<ext2>,<nic2>!<ext1>|<ext2>,..., for example,  eth0!eth0-|eth0-ipv6i-,ib0!ib-|ib-ipv6-. 
-                        The xCAT object definition commands support to use nichostnameprefixes.<nicname> as the sub attributes. 
+                            <nic1>!<ext1>|<ext2>,<nic2>!<ext1>|<ext2>,..., for example,  eth0!eth0-|eth0-ipv6i-,ib0!ib-|ib-ipv6-.
+                        The xCAT object definition commands support to use nichostnameprefixes.<nicname> as the sub attributes.
                         Note:  According to DNS rules a hostname must be a text string up to 24 characters drawn from the alphabet (A-Z), digits (0-9) and minus sign (-). When you are specifying "nichostnameprefixes" or "nicaliases" make sure the resulting hostnames will conform to this naming convention',
             nictypes => 'Comma-separated list of NIC types per NIC. <nic1>!<type1>,<nic2>!<type2>, e.g. eth0!Ethernet,ib0!Infiniband. The xCAT object definition commands support to use nictypes.<nicname> as the sub attributes.',
             niccustomscripts => 'Comma-separated list of custom scripts per NIC.  <nic1>!<script1>,<nic2>!<script2>, e.g. eth0!configeth eth0, ib0!configib ib0. The xCAT object definition commands support to use niccustomscripts.<nicname> as the sub attribute
@@ -1610,7 +1610,7 @@ zvmivp => {
                     <nic1>!<network1>|<network2>,<nic2>!<network1>|<network2>, for example, eth0!10_0_0_0-255_255_0_0|fd55:faaf:e1ab:336::/64,ib0!11_0_0_0-255_255_0_0|2001:db8:1:0::/64. The xCAT object definition commands support to use nicnetworks.<nicname> as the sub attributes.',
             nicaliases => 'Comma-separated list of hostname aliases for each NIC.
                 Format: eth0!<alias list>,eth1!<alias1 list>|<alias2 list>
-                    For multiple aliases per nic use a space-separated list. 
+                    For multiple aliases per nic use a space-separated list.
                 For example: eth0!moe larry curly,eth1!tom|jerry',
             nicextraparams => 'Comma-separated list of extra parameters that will be used for each NIC configuration.
                 If only one ip address is associated with each NIC:
diff --git a/perl-xCAT/xCAT/Scope.pm b/perl-xCAT/xCAT/Scope.pm
index 215709361..b1eeaf204 100644
--- a/perl-xCAT/xCAT/Scope.pm
+++ b/perl-xCAT/xCAT/Scope.pm
@@ -33,7 +33,7 @@ sub split_node_array {
     my $capacity = shift;
 
     if ($max_sub < 2) {return [$source];}
- 
+
     my @dest = ();
     my $total = $#{$source} + 1;
     my $n_sub = int ($total / $capacity);
@@ -83,7 +83,7 @@ sub split_node_array {
 
 =head3 get_parallel_scope
 
-    Convert a request object to an array of multiple requests according to the 
+    Convert a request object to an array of multiple requests according to the
     splitted node range.
 
     Arguments:
@@ -112,7 +112,7 @@ sub get_parallel_scope {
     # Just return the origin one if node range is not big enough.
     if ($#{$subsets} < 1) { return [$req]; }
 
-    my @requests = (); 
+    my @requests = ();
     foreach (@$subsets) {
         my $reqcopy = {%$req};
         $reqcopy->{node} = $_;
@@ -125,7 +125,7 @@ sub get_parallel_scope {
 
 =head3 get_broadcast_scope_with_parallel
 
-    Convert a request object to an array of multiple requests according to the 
+    Convert a request object to an array of multiple requests according to the
     splitted node range. Also it replicates the requests to all required service
     nodes or management node.
 
@@ -186,9 +186,9 @@ sub get_broadcast_scope_with_parallel {
 
 =head3 get_broadcast_disjoint_scope_with_parallel
 
-    Convert a request object to an array of multiple requests according to the 
+    Convert a request object to an array of multiple requests according to the
     splitted node range. Also it replicates the requests to all required service
-    nodes or management node, but the request to a service node will only contains 
+    nodes or management node, but the request to a service node will only contains
     the node range it manages.
 
     Arguments:
diff --git a/perl-xCAT/xCAT/ServiceNodeUtils.pm b/perl-xCAT/xCAT/ServiceNodeUtils.pm
index 13051df88..c89fcfe31 100755
--- a/perl-xCAT/xCAT/ServiceNodeUtils.pm
+++ b/perl-xCAT/xCAT/ServiceNodeUtils.pm
@@ -75,7 +75,7 @@ sub readSNInfo
 =head3 isServiceReq
 
 
-  Checks the service node table in the database to see 
+  Checks the service node table in the database to see
   if input Service should be setup on the
   input service node or Management Node (used by AAsn.pm)
 
@@ -84,7 +84,7 @@ sub readSNInfo
         hash of services to setup  for this service node
     Globals:
         $::RUNCMD_RC = 0; good
-        $::RUNCMD_RC = 1; error 
+        $::RUNCMD_RC = 1; error
     Error:
         none
     Example:
@@ -205,13 +205,13 @@ sub isServiceReq
 
 #-----------------------------------------------------------------------------
 
-=head3 getAllSN 
- 
-    Returns an array of all service nodes from service node table 
+=head3 getAllSN
+
+    Returns an array of all service nodes from service node table
 
     Arguments:
        ALL"  - will also return the management node in the array, if
-        if has been defined in the servicenode table 
+        if has been defined in the servicenode table
     Returns:
 		array of Service Nodes or empty array, if none
     Globals:
@@ -271,20 +271,20 @@ sub getAllSN
 
 #-----------------------------------------------------------------------------
 
-=head3 getSNandNodes 
- 
+=head3 getSNandNodes
+
     Returns an hash-array of all service nodes and the nodes they service
 
     Arguments:
-       none 
+       none
 #-----------------------------------------------------------------------------
 
-=head3 getSNandNodes 
- 
+=head3 getSNandNodes
+
     Returns an hash-array of all service nodes and the nodes they service
 
     Arguments:
-       none 
+       none
     Returns:
 	 Service Nodes and the nodes they service or empty , if none
     Globals:
@@ -322,24 +322,24 @@ sub getSNandNodes
 
 #-----------------------------------------------------------------------------
 
-=head3 getSNList 
- 
+=head3 getSNList
+
 	Reads the servicenode table. Will return all the enabled Service Nodes
 	that will setup the input Service ( e.g tftpserver,nameserver,etc)
 	If service is blank, then will return the list of all enabled Service
-	Nodes. 
+	Nodes.
 
     Arguments:
-       Servicename ( xcat,tftpserver,dhcpserver,conserver,etc) 
+       Servicename ( xcat,tftpserver,dhcpserver,conserver,etc)
        If no servicename, returns all Servicenodes
-       "ALL" argument means you also want the MN returned. It can be in the 
-       servicenode list.  If no "ALL", take out the MN if it is there. 
+       "ALL" argument means you also want the MN returned. It can be in the
+       servicenode list.  If no "ALL", take out the MN if it is there.
     Returns:
-	  Array of service node names 
+	  Array of service node names
     Globals:
         none
     Error:
-        1 - error  
+        1 - error
     Example:
          $sn= xCAT::ServiceNodeUtils->getSNList($servicename) { blah; }
          $sn= xCAT::ServiceNodeUtils->getSNList($servicename,"ALL") { blah; }
@@ -376,7 +376,7 @@ sub getSNList
     @servicenodes=xCAT::NodeRange::noderange(join(',',map {$_->{node}} @servicenodes));
     if($options eq "ALL"){
         return @servicenodes;
-    }    
+    }
 
     @servicenodes = $nodetab->getAllAttribsWhere("node in ("."\'".join("\',\'", @servicenodes)."\'".") and groups not like '%__mgmtnode%'",'node');
     return map {$_->{node}} @servicenodes;
@@ -397,7 +397,7 @@ sub getSNList_orig
     }
     my @nodes = $servicenodetab->getAllNodeAttribs([$service]);
     $servicenodetab->close;
-    
+
     foreach my $node (@nodes)
     {
         if (!defined($service) || ($service eq "")) # want all the service nodes
@@ -443,7 +443,7 @@ sub getSNList_orig
 =head3 get_ServiceNode
 
      Will get the Service node ( name or ipaddress) as known by the Management
-	 Node  or Node for the input nodename or ipadress of the node 
+	 Node  or Node for the input nodename or ipadress of the node
          which can be a Service Node.
          If the input node is a Service Node then it's Service node
          is always the Management Node.
@@ -711,7 +711,7 @@ sub get_ServiceNode
 	 as known by the Management
 	 Server or Node for the input nodename or ipadress of the node
 	 It will then format the output into a single servicenode key with values
-	 the list of nodes service by that service node.  This routine will 
+	 the list of nodes service by that service node.  This routine will
 	 break up pools of service nodes into individual node in the hash unlike
 	 get_ServiceNode which leaves the pool as the key.
 
@@ -729,7 +729,7 @@ sub get_ServiceNode
 		specific service like tftp
 
 
-	 output: A hash ref  of arrays, the key is a single service node 
+	 output: A hash ref  of arrays, the key is a single service node
 	          pointing to
 			 a list of nodes that are serviced by that service node
 	        'rra000-m'=>['blade01', 'testnode']
@@ -861,14 +861,14 @@ sub getAIXSNinterfaces
 
 #-----------------------------------------------------------------------------
 
-=head3  
- 
-    getSNandCPnodes - Take an array of nodes and returns 
-    an array of the service 
-    nodes and an array of the computenode . 
+=head3
+
+    getSNandCPnodes - Take an array of nodes and returns
+    an array of the service
+    nodes and an array of the computenode .
 
     Arguments:
-       none 
+       none
     Returns:
 		array of Service Nodes and/or array of compute nodesarray of compute nodes       empty array, if none
     Globals:
diff --git a/perl-xCAT/xCAT/Table.pm b/perl-xCAT/xCAT/Table.pm
index ee95b7be8..d50846d6d 100644
--- a/perl-xCAT/xCAT/Table.pm
+++ b/perl-xCAT/xCAT/Table.pm
@@ -688,14 +688,14 @@ sub buildcreatestmt
 
 #--------------------------------------------------------------------------
 
-=head3   
+=head3
 
-    Description: get_datatype_string ( for mysql,sqlite,postgresql) 
+    Description: get_datatype_string ( for mysql,sqlite,postgresql)
 
     Arguments:
-                Table column,database,types 
+                Table column,database,types
     Returns:
-              the datatype for the column being defined 
+              the datatype for the column being defined
     Globals:
 
     Error:
@@ -734,14 +734,14 @@ sub get_datatype_string {
 
 #--------------------------------------------------------------------------
 
-=head3   
+=head3
 
-    Description: get_datatype_string_db2 ( for DB2) 
+    Description: get_datatype_string_db2 ( for DB2)
 
     Arguments:
-                Table column,database,types,tablename,table schema 
+                Table column,database,types,tablename,table schema
     Returns:
-              the datatype for the column being defined 
+              the datatype for the column being defined
     Globals:
 
     Error:
@@ -793,12 +793,12 @@ sub get_datatype_string_db2 {
 
 #--------------------------------------------------------------------------
 
-=head3   
+=head3
 
-    Description: get_xcatcfg 
+    Description: get_xcatcfg
 
     Arguments:
-              none 
+              none
     Returns:
               the database name from /etc/xcat/cfgloc or sqlite
     Globals:
@@ -1106,7 +1106,7 @@ sub new
                  Handles adding attributes
                  Handles removing attributes but does not really remove them
                  from the database.
-                 Handles adding keys  
+                 Handles adding keys
 
     Arguments: Hash containing Database and Table Handle and schema
 
@@ -1117,9 +1117,9 @@ sub new
     Error:
 
     Example: my $nodelisttab=xCAT::Table->new('nodelist');
-             $nodelisttab->updateschema(); 
+             $nodelisttab->updateschema();
 	     $nodelisttab->close();
- 
+
     Comments:
         none
 
@@ -1942,7 +1942,7 @@ sub setAttribs
     Description:
        This function sets the attributes for the rows selected by the where clause.
     Warning, because we support mulitiple databases (SQLite,MySQL and DB2) that
-    require different syntax.  Any code using this routine,  must call the 
+    require different syntax.  Any code using this routine,  must call the
     Utils->getDBName routine and code the where clause that is appropriate for
     each supported database.
 
@@ -2294,7 +2294,7 @@ sub setNodesAttribs {
 	        Attribute type array
     Returns:
 
-			two layer hash reference (->{nodename}->{attrib} 
+			two layer hash reference (->{nodename}->{attrib}
     Globals:
 
     Error:
@@ -2312,10 +2312,6 @@ sub setNodesAttribs {
 #--------------------------------------------------------------------------------
 sub getNodesAttribs {
     my $self = shift;
-    if ($dbworkerpid > 0) {
-        return dbc_call($self, 'getNodesAttribs', @_);
-    }
-    $self->trace_db(START_TYPE);
     my $nodelist = shift;
     unless ($nodelist) { $nodelist = []; } #common to be invoked with undef seemingly
     my %options = ();
@@ -2326,6 +2322,21 @@ sub getNodesAttribs {
     } else {
         @attribs = @_;
     }
+
+    if (!exists($options{hierarchy_attrs})) {
+        my @hierarchy_attrs = ();
+        my $hierarchy_field = xCAT::TableUtils->get_site_attribute("hierarchicalattrs");
+        if ($hierarchy_field) {
+            @hierarchy_attrs = split(/,/, $hierarchy_field);
+        }
+        $options{hierarchy_attrs} = \@hierarchy_attrs;
+    }
+
+    if ($dbworkerpid > 0) {
+        return dbc_call($self, 'getNodesAttribs', $nodelist, \@attribs, %options);
+    }
+
+    $self->trace_db(START_TYPE);
     my @realattribs = @attribs; #store off the requester attribute list, the cached columns may end up being a superset and we shouldn't return more than asked
       #it should also be the case that cache will be used if it already is in play even if below cache threshold.  This would be desired behavior
     if (scalar(@$nodelist) > $cachethreshold) {
@@ -2348,12 +2359,12 @@ sub getNodesAttribs {
         $self->{nodelist}->{_use_cache} = 1;
     }
     my $rethash;
-    my @hierarchy_attrs = ();
-    my $hierarchy_field = xCAT::TableUtils->get_site_attribute("hierarchicalattrs");
-    if ($hierarchy_field) {
-        @hierarchy_attrs = split(/,/, $hierarchy_field);
-    }
-    $options{hierarchy_attrs} = \@hierarchy_attrs;
+    #my @hierarchy_attrs = ();
+    #my $hierarchy_field = xCAT::TableUtils->get_site_attribute("hierarchicalattrs");
+    #if ($hierarchy_field) {
+    #    @hierarchy_attrs = split(/,/, $hierarchy_field);
+    #}
+    #$options{hierarchy_attrs} = \@hierarchy_attrs;
     foreach (@$nodelist) {
         my @nodeentries = $self->getNodeAttribs($_, \@realattribs, %options);
         $rethash->{$_} = \@nodeentries;    #$self->getNodeAttribs($_,\@attribs);
@@ -2732,20 +2743,10 @@ sub transRegexAttrs
 sub getNodeAttribs
 {
     my $self = shift;
-    if ($dbworkerpid > 0) { #TODO: should this be moved outside of the DB worker entirely?  I'm thinking so, but I don't dare do so right now...
-         #the benefit would be the potentially computationally intensive substitution logic would be moved out and less time inside limited
-         #db worker scope
-        return dbc_call($self, 'getNodeAttribs', @_);
-    }
-    $self->trace_db(START_TYPE);
-
-    if (!defined($self->{dbh})) {
-        xCAT::MsgUtils->message("S", "xcatd: DBI is missing, Please check the db access process.");
-        return undef;
-    }
     my $node = shift;
-    my @attribs;
+
     my %options = ();
+    my @attribs;
     if (ref $_[0]) {
         @attribs = @{ shift() };
         %options = @_;
@@ -2761,6 +2762,17 @@ sub getNodeAttribs
         }
         $options{hierarchy_attrs} = \@hierarchy_attrs;
     }
+    if ($dbworkerpid > 0) { #TODO: should this be moved outside of the DB worker entirely?  I'm thinking so, but I don't dare do so right now...
+         #the benefit would be the potentially computationally intensive substitution logic would be moved out and less time inside limited
+         #db worker scope
+        return dbc_call($self, 'getNodeAttribs', $node, \@attribs, %options);
+    }
+    $self->trace_db(START_TYPE);
+
+    if (!defined($self->{dbh})) {
+        xCAT::MsgUtils->message("S", "xcatd: DBI is missing, Please check the db access process.");
+        return undef;
+    }
 
     my $datum;
     my $oldusecache;
@@ -2968,7 +2980,7 @@ sub getNodeAttribs_nosub_old
 
 =head3 getNodeAttribs_nosub_returnany
 
-    Description:  not used, kept for reference 
+    Description:  not used, kept for reference
 
     Arguments:
 
@@ -3311,17 +3323,17 @@ sub getAllEntries
 
     When using a general Where clause with SQL statement then
     because we support mulitiple databases (SQLite,MySQL and DB2) that
-    require different syntax.  Any code using this routine,  must call the 
+    require different syntax.  Any code using this routine,  must call the
     Utils->getDBName routine and code the where clause that is appropriate for
     each supported database.
 
     When the input is the array of attr<operator> val  strings, the routine will
-    build the correct Where clause for the database we are running. 
+    build the correct Where clause for the database we are running.
 
     Arguments:
        Database Handle
        Where clause
-       or 
+       or
        array of attr<operator>val strings to be build into a Where clause
     Returns:
         Array of attributes
@@ -3336,7 +3348,7 @@ sub getAllEntries
     returns  node and group attributes
     $nodelist->getAllAttribsWhere("groups like '%".$atom."%'",'ALL');
     returns  all attributes
-    
+
     Input of attr<operator>val strings
 
     $nodelist->getAllAttribsWhere(array of attr<operator>val,'node','group');
@@ -3425,7 +3437,7 @@ sub getAllAttribsWhere
                  Table handle
 	         Attribute list
                  optional hash return style
-                 ( changes the return hash structure format) 
+                 ( changes the return hash structure format)
     Returns:
                  Array of attribute values
     Globals:
@@ -3484,6 +3496,12 @@ sub getAllNodeAttribs
     $self->{nodelist}->_build_cache([ 'node', 'groups' ]);
     $self->{_use_cache} = 1;
     $self->{nodelist}->{_use_cache} = 1;
+
+    my @hierarchy_attrs = ();
+    my $hierarchy_field = xCAT::TableUtils->get_site_attribute("hierarchicalattrs");
+    if ($hierarchy_field) {
+        @hierarchy_attrs = split(/,/, $hierarchy_field);
+    }
     while (my $data = $query->fetchrow_hashref())
     {
 
@@ -3504,12 +3522,13 @@ sub getAllNodeAttribs
             #}  end SF 3580
 
             #my $localhash = $self->getNodesAttribs(\@nodes,$attribq); #NOTE:  This is stupid, rebuilds the cache for every entry, FIXME
-            my %options;
-            my @hierarchy_attrs = ();
-            my $hierarchy_field = xCAT::TableUtils->get_site_attribute("hierarchicalattrs");
-            if ($hierarchy_field) {
-                @hierarchy_attrs = split(/,/, $hierarchy_field);
-            }
+
+            #my @hierarchy_attrs = ();
+            #my $hierarchy_field = xCAT::TableUtils->get_site_attribute("hierarchicalattrs");
+            #if ($hierarchy_field) {
+            #    @hierarchy_attrs = split(/,/, $hierarchy_field);
+            #}
+            my %options = ();
             $options{hierarchy_attrs} = \@hierarchy_attrs;
             foreach (@nodes)
             {
@@ -3683,7 +3702,7 @@ sub getAllAttribs
         Build delete statement and'ing the elements of the hash
         DELETE FROM nodelist WHERE ("groups" = "compute1" AND "node" = "node1")
 
-        If called with no attributes, it will delete all entries in the table. 
+        If called with no attributes, it will delete all entries in the table.
           $table->delEntries();
           $table->commit;
     Comments:
@@ -4167,15 +4186,15 @@ sub getDescriptions {
 
 #--------------------------------------------------------------------------
 
-=head3  isAKey 
-    Description:  Checks to see if table field is a table key 
+=head3  isAKey
+    Description:  Checks to see if table field is a table key
 
     Arguments:
-               Table field 
-	       List of keys 
+               Table field
+	       List of keys
     Returns:
                1= is a key
-               0 = not a key 
+               0 = not a key
     Globals:
 
     Error:
@@ -4226,12 +4245,12 @@ sub getAutoIncrementColumns {
 
 #--------------------------------------------------------------------------
 
-=head3   
+=head3
 
-    Description: get_filelist 
+    Description: get_filelist
 
     Arguments:
-             directory,filelist,type 
+             directory,filelist,type
     Returns:
             The list of sql files to be processed which consists of all the
 			files with <name>.sql  and <name>_<databasename>.sql
@@ -4245,7 +4264,7 @@ sub getAutoIncrementColumns {
 	my @filelist =get_filelist($directory,$filelist,$type);
             where type = "sql" or "pm"
          Note either input a directory path in $directory of an array of
-          full path to filenames in $filelist.  See runsqlcmd for example. 
+          full path to filenames in $filelist.  See runsqlcmd for example.
 
 =cut
 
@@ -4321,15 +4340,15 @@ sub get_filelist
 
 #--------------------------------------------------------------------------
 
-=head3   
+=head3
 
-    Description: delimitcol 
+    Description: delimitcol
 
     Arguments:
-                attribute name 
+                attribute name
     Returns:
               The attribute(column)
-			  delimited appropriately for the runnning Database 
+			  delimited appropriately for the runnning Database
     Globals:
 
     Error:
@@ -4359,24 +4378,24 @@ sub delimitcol {
 
 #--------------------------------------------------------------------------
 
-=head3   
+=head3
 
-    Description: buildwhereclause 
+    Description: buildwhereclause
 
     Arguments:
                  Array of the following
                    attr<operator> val  where the operator can be the following:
-                == 
-                != 
-                =~ 
-                !~ 
-                 >   
-                 <   
-                 >=  
-                 <=  
+                ==
+                !=
+                =~
+                !~
+                 >
+                 <
+                 >=
+                 <=
 
     Returns:
-             Where clause with SQL appropriate for the running DB 
+             Where clause with SQL appropriate for the running DB
     Globals:
 
     Error:
@@ -4457,15 +4476,15 @@ sub buildWhereClause {
 =head3 writeAllEntries
 
     Description:  Read entire table and writes all entries to file
-                  This routine was written specifically for the tabdump 
+                  This routine was written specifically for the tabdump
                   command.
 
     Arguments:
-          filename or path 
+          filename or path
 
     Returns:
        0=good
-       1=bad 
+       1=bad
     Globals:
 
     Error:
@@ -4665,18 +4684,18 @@ sub output_table {
 
 =head3 getMAXMINEntries
 
-    Description: Select the rows in  the Table which has the MAX and the row with the 
+    Description: Select the rows in  the Table which has the MAX and the row with the
                  Min value for the input attribute.
-                 Currently only the auditlog and evenlog are setup to have such an attribute (recid). 
+                 Currently only the auditlog and evenlog are setup to have such an attribute (recid).
 
     Arguments:
            Table handle
            attribute name ( e.g. recid)
 
     Returns:
-        HASH 
+        HASH
             max=>  max value
-            min=>  min value 
+            min=>  min value
     Globals:
 
     Error:
@@ -4684,7 +4703,7 @@ sub output_table {
     Example:
 
 	 my $tabh = xCAT::Table->new($table);
-         my $recs=$tabh->getEntries("recid"); # returns row with recid max value in database 
+         my $recs=$tabh->getEntries("recid"); # returns row with recid max value in database
                                               # and the row with the min value.
 
     Comments:
diff --git a/perl-xCAT/xCAT/TableUtils.pm b/perl-xCAT/xCAT/TableUtils.pm
index ffe5d88e3..472a2aedc 100755
--- a/perl-xCAT/xCAT/TableUtils.pm
+++ b/perl-xCAT/xCAT/TableUtils.pm
@@ -141,27 +141,27 @@ sub list_all_node_groups
 
 #--------------------------------------------------------------------------------
 
-=head3   bldnonrootSSHFiles 	 
-	  	 
-	            Builds authorized_keyfiles for the non-root id 	 
-	            It must not only contain the public keys for the non-root id 	 
-	                    but also the public keys for root 	 
-	  	 
-	         Arguments: 	 
-	               from_userid -current id running xdsh from the command line 	 
-	         Returns: 	 
-	  	 
-	         Globals: 	 
-	               $::CALLBACK 	 
-	         Error: 	 
-	  	 
-	         Example: 	 
-	                 xCAT::TableUtils->bldnonrootSSHFiles; 	 
-	  	 
-	         Comments: 	 
-	                 none 	 
-	  	 
-=cut 	 
+=head3   bldnonrootSSHFiles 	
+	  	
+	            Builds authorized_keyfiles for the non-root id 	
+	            It must not only contain the public keys for the non-root id 	
+	                    but also the public keys for root 	
+	  	
+	         Arguments: 	
+	               from_userid -current id running xdsh from the command line 	
+	         Returns: 	
+	  	
+	         Globals: 	
+	               $::CALLBACK 	
+	         Error: 	
+	  	
+	         Example: 	
+	                 xCAT::TableUtils->bldnonrootSSHFiles; 	
+	  	
+	         Comments: 	
+	                 none 	
+	  	
+=cut 	
 
 #--------------------------------------------------------------------------------
 
@@ -187,7 +187,7 @@ sub bldnonrootSSHFiles
         if (!(-e "$home/.ssh/id_rsa.pub"))
         {
             $rsp->{data}->[0] = "$home/.ssh/id_rsa.pub does not exist!";
-            xCAT::MsgUtils->message("I", $rsp, $::CALLBACK);            
+            xCAT::MsgUtils->message("I", $rsp, $::CALLBACK);
             return 1;
         }
     }
@@ -213,7 +213,7 @@ sub bldnonrootSSHFiles
         if(!(-e "$home/.ssh/authorized_keys")){
             $rsp->{data}->[0] = "$home/.ssh/authorized_keys does not exist, make sure you have setup the ssh-keys on this service node.\n";
             xCAT::MsgUtils->message("E", $rsp, $::CALLBACK);
-            return (1);   
+            return (1);
         }
         $cmd = " cp $home/.ssh/authorized_keys $home/.ssh/tmp/authorized_keys";
     }
@@ -264,7 +264,7 @@ sub bldnonrootSSHFiles
 
 =head3   setupSSH
 
-        Generates if needed and Transfers the ssh keys 
+        Generates if needed and Transfers the ssh keys
 		fOr a userid to setup ssh to the input nodes.
 
         Arguments:
@@ -274,7 +274,7 @@ sub bldnonrootSSHFiles
 
         Env Variables: $DSH_FROM_USERID,  $DSH_TO_USERID, $DSH_REMOTE_PASSWORD
           the ssh keys are transferred from the $DSH_FROM_USERID to the $DSH_TO_USERID
-          on the node(s).  The DSH_REMOTE_PASSWORD and the DSH_FROM_USERID 
+          on the node(s).  The DSH_REMOTE_PASSWORD and the DSH_FROM_USERID
                must be obtained by
 		         the calling script or from the xdsh client
 
@@ -388,7 +388,7 @@ sub setupSSH
 
 
     unless(open(FILE, ">$home/.ssh/copy.sh"))
-    { 
+    {
         $rsp->{data}->[0] ="cannot create file $home/.ssh/copy.sh, please make sure the directory \"$home/.ssh\" exists and ssh keys have been setup on this node!\n";
         xCAT::MsgUtils->message("E", $rsp, $::CALLBACK);
         return 1;
@@ -535,10 +535,10 @@ rmdir \"/tmp/$to_userid\" \n";
 
 #--------------------------------------------------------------------------------
 
-=head3  sendkeysNOzones 
+=head3  sendkeysNOzones
 
-        Transfers the ssh keys 
-		for the root id on the nodes no zones 
+        Transfers the ssh keys
+		for the root id on the nodes no zones
           key from ~/.ssh   site.sshbetweennodes honored
 
 
@@ -549,7 +549,7 @@ rmdir \"/tmp/$to_userid\" \n";
 
         Env Variables: $DSH_FROM_USERID,  $DSH_TO_USERID, $DSH_REMOTE_PASSWORD
           the ssh keys are transferred from the $DSH_FROM_USERID to the $DSH_TO_USERID
-          on the node(s).  The DSH_REMOTE_PASSWORD and the DSH_FROM_USERID 
+          on the node(s).  The DSH_REMOTE_PASSWORD and the DSH_FROM_USERID
                must be obtained by
 		         the calling script or from the xdsh client
 
@@ -616,13 +616,13 @@ sub sendkeysNOzones
 
 #--------------------------------------------------------------------------------
 
-=head3  sendkeysTOzones 
+=head3  sendkeysTOzones
 
-        Transfers the ssh keys 
+        Transfers the ssh keys
 		for the root id on the nodes using the zone table.
        If in a zone, then root ssh keys for the node will be taken from the zones ssh keys not ~/.ssh
        zones are only supported on nodes that are not a service node.
-       Also for the call to  RemoteShellExp,  we must group the nodes that are in the same zone 
+       Also for the call to  RemoteShellExp,  we must group the nodes that are in the same zone
 
 
         Arguments:
@@ -632,7 +632,7 @@ sub sendkeysNOzones
 
         Env Variables: $DSH_FROM_USERID,  $DSH_TO_USERID, $DSH_REMOTE_PASSWORD
           the ssh keys are transferred from the $DSH_FROM_USERID to the $DSH_TO_USERID
-          on the node(s).  The DSH_REMOTE_PASSWORD and the DSH_FROM_USERID 
+          on the node(s).  The DSH_REMOTE_PASSWORD and the DSH_FROM_USERID
                must be obtained by
 		         the calling script or from the xdsh client
 
@@ -778,7 +778,7 @@ sub sendkeysTOzones
 
 =head3    cpSSHFiles
 
-           Builds authorized_keyfiles for root 
+           Builds authorized_keyfiles for root
 
         Arguments:
                install directory path
@@ -932,7 +932,7 @@ sub GetNodeOSARCH
 #-------------------------------------------------------------------------------
 
 =head3   logEventsToDatabase
-       Logs the given events info to the xCAT's 'eventlog' database 
+       Logs the given events info to the xCAT's 'eventlog' database
     Arguments:
         arrayref -- A pointer to an array. Each element is a hash that contains an events.
         The hash should contain the at least one of the following keys:
@@ -946,9 +946,9 @@ sub GetNodeOSARCH
           id -- The location or the resource name where the event occurred.
           severity -- The severity of the event. Valid values are: informational, warning, critical.
           message -- The full description of the event.
-	  rawdata -- The data that associated with the event.         
+	  rawdata -- The data that associated with the event.
   Returns:
-       (ret code, error message) 
+       (ret code, error message)
   Example:
     my  @a=();
     my $event={
@@ -1021,11 +1021,11 @@ sub logEventsToDatabase
 #-------------------------------------------------------------------------------
 
 =head3   logEventsToTealDatabase
-       Logs the given events info to the TEAL's 'x_tealeventlog' database 
+       Logs the given events info to the TEAL's 'x_tealeventlog' database
     Arguments:
         arrayref -- A pointer to an array. Each element is a hash that contains an events.
   Returns:
-       (ret code, error message) 
+       (ret code, error message)
 
 =cut
 
@@ -1145,7 +1145,7 @@ sub setAppStatus
         $status
     Returns:
         none
-        
+
     Globals:
         none
     Error:
@@ -1261,27 +1261,28 @@ sub getAppStatus
   get_site_attribute
 
 	Arguments:
-
+                $attribute -- the attribute you want to get
+                $dvalue    -- Optional, the default string value if the attribute does not exist
 	Returns:
 	    The value of the attribute requested from the site table
-	Globals:
-		none
-	Error:
-		undef
-	Example:
-	   @attr=xCAT::TableUtils->get_site_attribute($attribute);
-	Comments:
-		none
+        Globals:
+                %::XCATSITEVALS
+        Error:
+                undef
+        Example:
+           @attr=xCAT::TableUtils->get_site_attribute($attribute);
+        Comments:
+                none
 
 =cut
 
 #------------------------------------------------------------------------
 sub get_site_attribute
 {
-    my ($class, $attr) = @_;
+    my ($class, $attr, $dvalue) = @_;
 
     my $values;
-    if (defined($::XCATSITEVALS{$attr})) {
+    if (%::XCATSITEVALS) {
         $values = ($::XCATSITEVALS{$attr});
     } else {
         my $sitetab = xCAT::Table->new('site');
@@ -1300,7 +1301,8 @@ sub get_site_attribute
 
         }
     }
-    return $values;
+    return $values if ( defined $values);
+    return $dvalue;
 }
 
 
@@ -1533,17 +1535,17 @@ sub get_site_Master
 
 #-------------------------------------------------------------------------------
 
-=head3 checkCredFiles 
+=head3 checkCredFiles
         Checks the various credential files on the Management Node to
 		make sure the permission are correct for using and transferring
 		to the nodes and service nodes.
 		Also removes /install/postscripts/etc/xcat/cfgloc if found
     Arguments:
-      $callback 
+      $callback
     Returns:
         0 - ok
     Globals:
-        none 
+        none
     Error:
          warnings of possible missing files  and directories
     Example:
@@ -1755,15 +1757,15 @@ sub checkCredFiles
 
 #-------------------------------------------------------------------------------
 
-=head3  enableSSH 
+=head3  enableSSH
     Description:
         Reads the site.sshbetweennodes attribute and determines
-        if the input node should be enabled to ssh between nodes 
+        if the input node should be enabled to ssh between nodes
     Arguments:
-        $node 
+        $node
     Returns:
        1 = enable ssh
-       0 = do not enable ssh 
+       0 = do not enable ssh
     Globals:
         none
     Error:
@@ -1837,23 +1839,23 @@ sub enablessh
 
 #-------------------------------------------------------------------------------
 
-=head3  enableSSH 
+=head3  enableSSH
     Description:
         The function is same as enablessh() above. Before using this function,
         the $sn_hash for noderange, and $groups_hash for site.sshbetweennodes should be
         got.  This is performance improvement.
     Arguments:
         $node  --  node name
-        $sn_hash -- if the node is one sn, key is the node name, and value is 1. 
+        $sn_hash -- if the node is one sn, key is the node name, and value is 1.
                     if the node is not a sn, the key isn't in this hash
         $groups_hash -- there are two keys:
                      1.  Each group in the value of site.sshbetweennodes could be the key
-                     2.  Each node in the groups from the value of site.sshbetweennodes , if the 
+                     2.  Each node in the groups from the value of site.sshbetweennodes , if the
                          value isn't ALLGROUPS or NOGROUPS.
-          
+
     Returns:
        1 = enable ssh
-       0 = do not enable ssh 
+       0 = do not enable ssh
     Globals:
         none
     Error:
@@ -1923,7 +1925,7 @@ sub enableSSH
 
 
 =head3 getrootimage
-    Get the directory of root image for a node; 
+    Get the directory of root image for a node;
     Note: This subroutine only works for diskless node
 
     Arguments:
@@ -1977,13 +1979,13 @@ sub getrootimage()
 
 
 =head3 getimagenames
-    Get an array of osimagenames that correspond to the input node array; 
+    Get an array of osimagenames that correspond to the input node array;
 
     Arguments:
-     Array of nodes 
+     Array of nodes
     Returns:
-      array of all the osimage names that are the provmethod for the nodes 
-      undef - no osimage names 
+      array of all the osimage names that are the provmethod for the nodes
+      undef - no osimage names
     Globals:
         none
     Error:
@@ -2034,9 +2036,9 @@ sub getimagenames()
 
     Arguments:
       node
-      tabhd: the handler of 'nodelist' table, 
+      tabhd: the handler of 'nodelist' table,
       groups: the groups attribute need to be merged.
-              Can be an array or string. 
+              Can be an array or string.
     Globals:
         none
     Error:
@@ -2081,9 +2083,9 @@ sub updatenodegroups {
 
     Arguments:
       node
-      tabhd: the handler of 'nodelist' table, 
+      tabhd: the handler of 'nodelist' table,
       groups: the groups that need to be removed.
-              Can be an array or string. 
+              Can be an array or string.
     Globals:
         none
     Error:
diff --git a/perl-xCAT/xCAT/Usage.pm b/perl-xCAT/xCAT/Usage.pm
index f767133cc..74882f372 100755
--- a/perl-xCAT/xCAT/Usage.pm
+++ b/perl-xCAT/xCAT/Usage.pm
@@ -8,7 +8,7 @@ use xCAT::Utils;
 
 =head1  xCAT::Usage
 =head2    Package Description
-  xCAT usage module. Some commands such as rpower have different implementations 
+  xCAT usage module. Some commands such as rpower have different implementations
   for different hardware. This module holds the usage string for these kind
   of commands so that the usage can be referenced from different modules.
 =cut
@@ -24,7 +24,7 @@ my %usage = (
        rnetboot <noderange> [ipl= address]",
     "rpower" => "",
     "rpower.common" =>
-    "Usage: 
+    "Usage:
     Common:
        rpower <noderange> [--nodeps] [on|onstandby|off|suspend|reset|stat|state|boot] [-V|--verbose] [-m table.colum==expectedstatus][-m table.colum==expectedstatus...] [-r <retrycount>] [-t <timeout>]
        rpower [-h|--help|-v|--version]
@@ -74,7 +74,7 @@ my %usage = (
 ",
     "rbeacon" =>"",
     "rbeacon.common" =>
-      "Usage: 
+      "Usage:
     Common:
        rbeacon [-h|--help|-v|--version|-V|--verbose]
     ",
@@ -87,7 +87,7 @@ my %usage = (
     "rbeacon.openbmc" =>
     "OpenPOWER (OpenBMC) specific:
        rbeacon [on|off|stat]
-    ",    
+    ",
     "rvitals" => "",
     "rvitals.common" =>
       "Usage:
@@ -123,7 +123,7 @@ my %usage = (
        reventlog [-h|--help|-v|--version]",
     "rinv" => "",
     "rinv.common" =>
-      "Usage: 
+      "Usage:
     Common:
        rinv <noderange> [all|model|serial] [-V|--verbose]
        rinv [-h|--help|-v|--version]
@@ -132,12 +132,12 @@ my %usage = (
     "BMC/MPA specific:
        rinv <noderange> [model|serial|asset|vpd|deviceid|guid|firm|dimm|mprom|all]
     OpenPOWER (IPMI) server specific:
-       rinv <noderange> [model|serial|deviceid|uuid|guid|vpd|mprom|firm|all] 
+       rinv <noderange> [model|serial|deviceid|uuid|guid|vpd|mprom|firm|all]
     ",
     "rinv.openbmc" =>
     "OpenPOWER (OpenBMC) server specific:
        rinv <noderange> [model][serial][firm][cpu][dimm][all] [-V|--verbose]
-    ", 
+    ",
     "rinv.end" =>
     "PPC specific(with HMC):
        rinv <noderange> [all|bus|config|serial|model|firm]
@@ -160,7 +160,7 @@ my %usage = (
 "Usage: rsetboot <noderange> [net|hd|cd|floppy|def|stat] [-u] [-p]
        rsetboot [-h|--help|-v|--version]",
     "rbootseq" =>
-      "Usage: 
+      "Usage:
        Common:
            rbootseq [-h|--help|-v|--version|-V|--verbose]
        Blade specific:
@@ -172,7 +172,7 @@ my %usage = (
        rscan [-h|--help|-v|--version]",
     "rspconfig" => "",
     "rspconfig.common" =>
-      "Usage: 
+      "Usage:
    Common:
        rspconfig [-h|--help|-v|--version|-V|--verbose]
    ",
@@ -215,7 +215,7 @@ my %usage = (
        rspconfig <singlenode> [frame=number]
        rspconfig <singlenode> [USERID=passwd] [updateBMC=<y|n>]
        rspconfig <noderange>  [sshcfg=<enable|disable>|
-           snmpcfg=<enable|disable>|                             
+           snmpcfg=<enable|disable>|
            pd1=<nonred|redwoperf|redwperf>|
            pd2=<nonred|redwoperf|redwperf>|
            network=<*|[ip],[host],[gateway],[netmask]>|
@@ -276,11 +276,11 @@ my %usage = (
       "Usage:
         rspreset <noderange>",
     "getmacs" =>
-      "Usage: 
+      "Usage:
    Common:
        getmacs [-h|--help|-v|--version]
    PPC specific:
-       getmacs <noderange> [-F filter] 
+       getmacs <noderange> [-F filter]
        getmacs <noderange> [-M]
        getmacs <noderange> [-V| --verbose] [-f] [-d] [--arp] | [-D {[-o] [-S server] [-G gateway] [-C client] | [--noping]}]
    blade specific:
@@ -328,7 +328,7 @@ my %usage = (
    Common:
        chvm [-h|--help|-v|--version]
    PPC (with HMC) specific:
-       chvm <noderange> [-p profile][-V|--verbose] 
+       chvm <noderange> [-p profile][-V|--verbose]
        chvm <noderange> <attr>=<val> [<attr>=<val>...]
    PPC (using Direct FSP Management) specific:
        chvm <noderange> --p775 [-p <profile>]
@@ -373,7 +373,7 @@ my %usage = (
        chvm noderange [--setipl ipl_target load_parms parms]
        chvm noderange [--setpassword password]",
     "rmvm" =>
-      "Usage: rmvm <noderange> [--service][-V|--verbose] 
+      "Usage: rmvm <noderange> [--service][-V|--verbose]
        rmvm [-h|--help|-v|--version],
        rmvm [-p] [-f]
        PPC (using Direct FSP Management) specific:
@@ -402,7 +402,7 @@ my %usage = (
        makentp [-a|--all] [-V|--verbose]",
     "rflash" => "",
     "rflash.common" =>
-    "Usage: 
+    "Usage:
     Common:
         rflash [ -h|--help|-v|--version|-V|--verbose]
     ",
@@ -411,7 +411,7 @@ my %usage = (
     Lenovo Dense Enclosure Manager specific:
         rflash <noderange> http://<server>/path/to/update.rom
     PPC (with HMC) specific:
-	rflash <noderange> -p <rpm_directory> [--activate {concurrent | disruptive}] 
+	rflash <noderange> -p <rpm_directory> [--activate {concurrent | disruptive}]
 	rflash <noderange> {--commit | --recover}
     PPC (using Direct FSP Management) specific:
 	rflash <noderange> -p <rpm_directory> [--activate {disruptive|deferred}] [-d <data_directory>]
@@ -430,42 +430,42 @@ my %usage = (
     "mkhwconn" =>
       "Usage:
     mkhwconn [-h|--help]
-    
+
     PPC (with HMC) specific:
     mkhwconn noderange -t [--bind] [-V|--verbose]
     mkhwconn noderange -p single_hmc [-P HMC passwd] [-V|--verbose]
-    
+
     PPC (using Direct FSP Management) specific:
     mkhwconn noderange -t [-T tooltype] [--port port_value]
     mkhwconn noderange -s [hmcnode] [-P HMC passwd] [-V|--verbose]",
     "rmhwconn" =>
       "Usage:
     rmhwconn [-h|--help]
-    
+
     PPC (with HMC) specific:
     rmhwconn noderange [-V|--verbose]
-    
+
     PPC (using Direct FSP Management) specific:
     rmhwconn noderange [-T tooltype]
     rmhwconn noderange -s",
     "lshwconn" =>
       "Usage:
     lshwconn [-h|--help]
-    
+
     PPC (with HMC) specific:
     lshwconn noderange [-V|--verbose]
-    
+
     PPC (using Direct FSP Management) specific:
     lshwconn noderange [-T tooltype]
     lshwconn noderange -s",
     "renergy" =>
       "Usage:
-    renergy [-h | --help] 
-    renergy [-v | --version] 
+    renergy [-h | --help]
+    renergy [-v | --version]
 
     Power 6 server specific :
       renergy noderange [-V] { all | { [savingstatus] [cappingstatus] [cappingmaxmin] [cappingvalue] [cappingsoftmin] [averageAC] [averageDC] [ambienttemp] [exhausttemp] [CPUspeed] } }
-      renergy noderange [-V] { {savingstatus}={on | off} | {cappingstatus}={on | off} | {cappingwatt}=watt | {cappingperc}=percentage } 
+      renergy noderange [-V] { {savingstatus}={on | off} | {cappingstatus}={on | off} | {cappingwatt}=watt | {cappingperc}=percentage }
 
     Power 7 server specific :
       renergy noderange [-V] { all | { [savingstatus] [dsavingstatus] [cappingstatus] [cappingmaxmin] [cappingvalue] [cappingsoftmin] [averageAC] [averageDC] [ambienttemp] [exhausttemp] [CPUspeed] [syssbpower] [sysIPLtime] [fsavingstatus] [ffoMin] [ffoVmin] [ffoTurbo] [ffoNorm] [ffovalue] } }
@@ -481,15 +481,15 @@ my %usage = (
       For a blade server nodes:
         renergy noderange [-V] { all | [averageDC] [capability] [cappingvalue] [CPUspeed] [maxCPUspeed] [savingstatus] [dsavingstatus] }
         renergy noderange [-V] { savingstatus={on | off} | dsavingstatus={on-norm | on-maxp | off} }
- 
+
     Flex specific :
       For Flex Management Modules:
         renergy noderange [-V] { all | [powerstatus] [powerpolicy] [powermodule] [avaiablepower] [reservedpower] [remainpower] [inusedpower] [availableDC] [averageAC] [thermaloutput] [ambienttemp] [mmtemp] }
- 
+
       For Flex node (power and x86):
         renergy noderange [-V] { all | [averageDC] [capability] [cappingvalue] [cappingmaxmin] [cappingmax] [cappingmin] [cappingGmin] [CPUspeed] [maxCPUspeed] [savingstatus] [dsavingstatus] }
         renergy noderange [-V] { cappingstatus={on | off} | cappingwatt=watt | cappingperc=percentage | savingstatus={on | off} | dsavingstatus={on-norm | on-maxp | off} }
- 
+
     iDataPlex specific :
       renergy noderange [-V] [ { cappingmaxmin | cappingmax | cappingmin } ] [cappingstatus] [cappingvalue] [relhistogram]
       renergy noderange [-V] { cappingstatus={on | enable | off | disable} | {cappingwatt|cappingvalue}=watt }
@@ -504,7 +504,7 @@ my %usage = (
     updatenode <noderange> [-V|--verbose] [-k|--security] [-s|--sn] [-t <timeout>]
     or
     updatenode <noderange> [-V|--verbose] [-F|--sync | -f|--snsync] [-r|--node-rcp <node_remote_copy>] [-l|--user[username]] [--fanout=[fanout value]] [-S|--sw] [-t <timeout>]
-        [-P|--scripts [script1,script2,...]] [-s|--sn] 
+        [-P|--scripts [script1,script2,...]] [-s|--sn]
         [-A|--updateallsw] [-c|--cmdlineonly] [-d alt_source_dir]
         [attr=val [attr=val...]]
     or
@@ -513,19 +513,19 @@ my %usage = (
 Options:
     <noderange> A list of nodes or groups.
 
-    [-k|--security] Update the security keys and certificates for the 
+    [-k|--security] Update the security keys and certificates for the
         target nodes.
 
     [-F|--sync] Perform File Syncing.
 
-    [--fanout]  Allows you to assign the fanout value for the command. 
+    [--fanout]  Allows you to assign the fanout value for the command.
         See xdsh/xdcp fanout parameter in the man page.
 
-    [-f|--snsync] Performs File Syncing to the service nodes that service 
+    [-f|--snsync] Performs File Syncing to the service nodes that service
         the nodes in the noderange.
- 
+
     [-r|--node-rcp] Specifies  the  full  path of the remote copy command used for sync files to node targets, such as /usr/bin/rsync and /usr/bin/scp
-   
+
     [-g|--genmypost] Will generate a new mypostscript file for the
         the nodes in the noderange, if site precreatemypostscripts is 1 or YES.
 
@@ -534,10 +534,10 @@ Options:
 
     [-S|--sw] Perform Software Maintenance.
 
-    [-P|--scripts] Execute postscripts listed in the postscripts table or 
+    [-P|--scripts] Execute postscripts listed in the postscripts table or
         parameters.
 
-    [-c|--cmdlineonly] Only use AIX software maintenance information 
+    [-c|--cmdlineonly] Only use AIX software maintenance information
         provided on the command line. (AIX only)
 
     [-s|--sn] Set the server information stored on the nodes.
@@ -545,17 +545,17 @@ Options:
     [-t|--timeout] Time out in seconds to allow the command to run. Default is no timeout,
         except for updatenode -k which has a 10 second default timeout.
 
-    [-A|--updateallsw] Install or update all software contained in the source 
+    [-A|--updateallsw] Install or update all software contained in the source
         directory. (AIX only)
 
     [-d <alt_source_dir>] Used to indicate a source directory other than
-        the standard lpp_source directory specified in the xCAT osimage 
+        the standard lpp_source directory specified in the xCAT osimage
         definition.  (AIX only)
 
-    [script1,script2,...] A comma separated list of postscript names. 
+    [script1,script2,...] A comma separated list of postscript names.
         If omitted, all the post scripts defined for the nodes will be run.
 
-    [attr=val [attr=val...]]  Specifies one or more 'attribute equals value' 
+    [attr=val [attr=val...]]  Specifies one or more 'attribute equals value'
         pairs, separated by spaces. (AIX only)",
     "lsflexnode" =>
       "Usage:
@@ -609,7 +609,7 @@ Options:
 );
 
 # Rebuild full command usage from its components
-$usage{"rspconfig"} = $usage{"rspconfig.common"} . 
+$usage{"rspconfig"} = $usage{"rspconfig.common"} .
                       $usage{"rspconfig.begin"} .
                       $usage{"rspconfig.openbmc"} .
                       "   " .
@@ -618,7 +618,7 @@ $usage{"rspconfig"} = $usage{"rspconfig.common"} .
 $usage{"rspconfig.openbmc"} = $usage{"rspconfig.common"} .
                       $usage{"rspconfig.openbmc"};
 
-$usage{"rinv"} = $usage{"rinv.common"} . 
+$usage{"rinv"} = $usage{"rinv.common"} .
                       $usage{"rinv.begin"} .
                       $usage{"rinv.openbmc"} .
                       $usage{"rinv.end"};
@@ -633,7 +633,7 @@ $usage{"rbeacon"} = $usage{"rbeacon.common"} .
 $usage{"rbeacon.openbmc"} = $usage{"rbeacon.common"} .
                       $usage{"rbeacon.openbmc"};
 
-$usage{"rvitals"} = $usage{"rvitals.common"} . 
+$usage{"rvitals"} = $usage{"rvitals.common"} .
                       $usage{"rvitals.begin"} .
                       $usage{"rvitals.openbmc"} .
                       $usage{"rvitals.end"};
@@ -641,7 +641,7 @@ $usage{"rvitals"} = $usage{"rvitals.common"} .
 $usage{"rvitals.openbmc"} = $usage{"rvitals.common"} .
                       $usage{"rvitals.openbmc"};
 
-$usage{"rflash"} = $usage{"rflash.common"} . 
+$usage{"rflash"} = $usage{"rflash.common"} .
                       $usage{"rflash.begin"} .
                       $usage{"rflash.openbmc"} .
                       "   " .
@@ -650,7 +650,7 @@ $usage{"rflash"} = $usage{"rflash.common"} .
 $usage{"rflash.openbmc"} = $usage{"rflash.common"} .
                       $usage{"rflash.openbmc"};
 
-$usage{"rpower"} = $usage{"rpower.common"} . 
+$usage{"rpower"} = $usage{"rpower.common"} .
                       $usage{"rpower.begin"} .
                       $usage{"rpower.openbmc"} .
                       $usage{"rpower.end"};
@@ -731,7 +731,7 @@ sub getVersion {
 
 =head3   parseCommand
       This function parses the given command to see if the usage or version string
-      need to be returned. 
+      need to be returned.
     Arguments:
         command
         arguments
@@ -784,14 +784,14 @@ sub parseCommand {
 #-------------------------------------------------------------------------------
 
 sub validateArgs {
-    my $command=shift; 
+    my $command=shift;
     if ($command =~ /xCAT::Usage/) { $command = shift; }
-  
-    my $count=0; 
+
+    my $count=0;
     my @extrargs=@_;
     if($command =~ m/^(nodeset|rinstall|winstall)$/ ){
-        #suppose that argument like "-p foo" have been processed and 
-        #filtered by GetOpt subroutine 
+        #suppose that argument like "-p foo" have been processed and
+        #filtered by GetOpt subroutine
         #fortunately the commands in this branch does not have such options
         foreach(@extrargs){
             if($_ and $_ !~ m/^-[-]?\S+/){
@@ -803,5 +803,5 @@ sub validateArgs {
         }
     }
 
-    return [0]; 
+    return [0];
 }
diff --git a/perl-xCAT/xCAT/Utils.pm b/perl-xCAT/xCAT/Utils.pm
index 7b76bcb9c..8f9ad89a7 100644
--- a/perl-xCAT/xCAT/Utils.pm
+++ b/perl-xCAT/xCAT/Utils.pm
@@ -161,7 +161,7 @@ sub clroptionvars
     Arguments:
         mac: If requesting a UUIDv1, the mac to use to base it upon
     Returns:
-        string representation of a UUDv4, 
+        string representation of a UUDv4,
             for example: f16196d1-7534-41c1-a0ae-a9633b030583
             for example: f16196d1-7534-41c1-a0ae-a9633b030583
 
@@ -556,11 +556,11 @@ sub isLinux
 
 #-------------------------------------------------------------------------------
 
-=head3   Version 
+=head3   Version
     Arguments:
         Optional 'short' string to request only the version;
     Returns:
-       xcat Version number 
+       xcat Version number
     Globals:
         none
     Error:
@@ -575,7 +575,7 @@ sub isLinux
 sub Version
 {
     my $version = shift;
-    
+
     #force reload the xCAT::Version in case the perl-xcat is upgraded but xcatd is not restarted
     if($INC{'xCAT/Version.pm'}){
         delete $INC{'xCAT/Version.pm'};
@@ -792,13 +792,13 @@ sub list_nodes_in_nodegroups
 #-----------------------------------------------------------------------
 
 =head3
- isMemberofGroup 
+ isMemberofGroup
 
 	Arguments:  node,group
 
 	Returns:
 	   1 = is  a member
-           0 = not a member 
+           0 = not a member
 
 	Globals:
 		none
@@ -1012,7 +1012,7 @@ sub runcmd3 { #a proper runcmd that indpendently returns stdout, stderr, pid and
    is joined into a single string with the newlines separating the lines.
 
    Arguments:
-     command, exitcode, reference to output, streaming mode 
+     command, exitcode, reference to output, streaming mode
    Returns:
 	   see below
    Globals:
@@ -1191,7 +1191,7 @@ sub runcmd
 	   refoutput - type of output to build
          Not set - array
           1 -  reference to an array
-          2 -  returns the response hash as received from the plugin.   
+          2 -  returns the response hash as received from the plugin.
 
 
    Returns:
@@ -1215,16 +1215,16 @@ sub runcmd
    Example:
       return output as reference to an array
 		my $outref = xCAT::Utils->runxcmd($cmd,$sub_req, -2, 1);
-      
+
       return response hash from plugin .  Will not display error msg for any
-      exit_code setting. 
+      exit_code setting.
 		my $outref = xCAT::Utils->runxcmd($cmd,$sub_req, -1, 2);
 
    Comments:
 		   If refoutput is 1, then the output will be returned as a
 		   reference to an array for efficiency.
 
-		   If refoutput is 2, then the response hash will be returned  
+		   If refoutput is 2, then the response hash will be returned
          as output.  runxcmd will not parse the request structure, nor
          will it display the error message despite the exit_code setting.
          The caller will need to display the error.
@@ -1235,9 +1235,9 @@ sub runcmd
 		   in the arg array.
 
          The caller to the runxcmd is responsible for filename expansion, that
-         would have been done if the command was run on the command line.  
-         For example,  the xdcp node1 /tmp/testfile*  /tmp command needs to 
-         have the /tmp/testfile* argument expanded before call xdcp with 
+         would have been done if the command was run on the command line.
+         For example,  the xdcp node1 /tmp/testfile*  /tmp command needs to
+         have the /tmp/testfile* argument expanded before call xdcp with
          runxcmd.   The easy way to do this is to use the perl glob function.
               @files=glob "/tmp/testfile*";
 
@@ -1505,7 +1505,7 @@ sub runxcmd_output
 =head3    runxcmd_output2
 
  Internal subroutine for runxcmd to capture the output
-	from the xCAT daemon subrequest call. Returns the response hash 
+	from the xCAT daemon subrequest call. Returns the response hash
 =cut
 
 #-------------------------------------------------------------------------------
@@ -1650,8 +1650,8 @@ sub isServiceNode
     Arguments:
         none
     Returns:
-        1 - localHost is Management Node 
-        0 - localHost is not a Management Node 
+        1 - localHost is Management Node
+        0 - localHost is not a Management Node
     Globals:
         none
     Error:
@@ -1744,15 +1744,15 @@ sub update_xCATSN
 
 #-----------------------------------------------------------------------------
 
-=head3 isSN 
- 
+=head3 isSN
+
 	Determines if the input node name is a service node
-	Reads the servicenode table. nodename must be service node name as 
+	Reads the servicenode table. nodename must be service node name as
 	known by the Management node.
 
-    returns 1 if input host is a service node 
+    returns 1 if input host is a service node
     Arguments:
-       hostname 
+       hostname
     Returns:
         1 - is  Service Node
         0 - is not a Service Node
@@ -1798,19 +1798,19 @@ sub isSN
 #-------------------------------------------------------------------------------
 
 =head3    isMounted
-    Checks if the input directory is already mounted 
+    Checks if the input directory is already mounted
     Arguments:
-       directory 
+       directory
     Returns:
-        1 - directory is mounted 
-        0 - directory is not mounted 
+        1 - directory is mounted
+        0 - directory is not mounted
     Globals:
         none
     Error:
         -1 error
     Example:
          if (xCAT::Utils->isMounted($directory)) { blah; }
-    Comments: 
+    Comments:
         none
 =cut
 
@@ -1852,17 +1852,17 @@ sub isMounted
 
 #-------------------------------------------------------------------------------
 
-=head3   runxcatd 
-    Stops or starts xcatd  
+=head3   runxcatd
+    Stops or starts xcatd
     Arguments:
         xcatstart - start the daemon,  restart if already running
         xcatstop - stop the daemon
     Returns:
-        0 = not error, 1 = error 
+        0 = not error, 1 = error
     Globals:
         none
     Error:
-	   
+	
     Example:
         my $rc = xCAT::runxcatd("xcatstart") ; ( starts xcatd)
         my $rc = xCAT::runxcatd("xcatstop") ; ( stops xcatd)
@@ -1930,11 +1930,11 @@ sub runxcatd
 
 =head3   get_image_name
        get a name for the install image on AIX and Linux, to be used
-       by xdsh and sinv for the nodename 
+       by xdsh and sinv for the nodename
     Arguments:
         path to image.
     Returns:
-       imagename 
+       imagename
 
 =cut
 
@@ -1965,8 +1965,8 @@ sub get_image_name
 #-------------------------------------------------------------------------------
 
 =head3   StartService
-	Supports AIX only, use startservice for Linux 
-	Used by the service node plugin (AAsn.pm) to start requested services. 
+	Supports AIX only, use startservice for Linux
+	Used by the service node plugin (AAsn.pm) to start requested services.
     Checks to see if the input service is already started. If it is started
 	it stops and  starts the service. Otherwise
 	it just starts the service.
@@ -2215,7 +2215,7 @@ sub CheckVersion
 #-------------------------------------------------------------------------------
 
 =head3  osver
-        Returns the os and version of the System you are running on 
+        Returns the os and version of the System you are running on
     Arguments:
         $type: which type of os infor you want.  Supported values are:
                all,os,version,release
@@ -2542,7 +2542,7 @@ sub is_locked
 #----------------------------------------------------------------------------
 
 =head3  parse_selection_string
-        Parse the selection string and 
+        Parse the selection string and
         write the parsed result into %wherehash
 
         Arguments:
@@ -2610,7 +2610,7 @@ sub parse_selection_string()
 #----------------------------------------------------------------------------
 
 =head3  selection_string_match
-        Check whether a node matches the selection string 
+        Check whether a node matches the selection string
         defined in hash %wherehash
 
         Arguments:
@@ -2676,17 +2676,17 @@ sub selection_string_match()
 
 #-------------------------------------------------------------------------------
 
-=head3 check_deployment_monitoring_settings 
+=head3 check_deployment_monitoring_settings
        Check the deployment retry monitoring settings.
     Arguments:
       $request: request hash
-      $mstring: The monitoring setting string 
-               specified with the -m flag for rpower or rnetboot 
+      $mstring: The monitoring setting string
+               specified with the -m flag for rpower or rnetboot
     Returns:
         0 - ok
         1 - failed
     Globals:
-        none 
+        none
     Example:
          my $rc=xCAT::Utils->check_deployment_monitoring_settings($opt(m))
     Comments:
@@ -2979,7 +2979,7 @@ sub monitor_installation()
 
 #-------------------------------------------------------------------------------
 
-=head3   get_unique_members 
+=head3   get_unique_members
     Description:
         Return an array which have unique members
 
@@ -3080,12 +3080,12 @@ sub updateEtcHosts
 
 #-------------------------------------------------------------------------------
 
-=head3   getDBName 
+=head3   getDBName
     Description:
-        Returns the current database (SQLITE,DB2,MYSQL,PG) 
+        Returns the current database (SQLITE,DB2,MYSQL,PG)
 
     Arguments:
-        None 
+        None
     Returns:
         Return string.
     Globals:
@@ -3165,12 +3165,12 @@ sub full_path
 #-------------------------------------------------------------------------------
 
 =head3    isStateful
-    returns 1 if localHost is a Stateful install 
+    returns 1 if localHost is a Stateful install
     Arguments:
         none
     Returns:
-        1 - localHost is Stateful 
-        0 - localHost is not Stateful 
+        1 - localHost is Stateful
+        0 - localHost is not Stateful
     Globals:
         none
     Error:
@@ -3212,19 +3212,19 @@ sub isStateful
 
 #-----------------------------------------------------------------------------
 
-=head3    setupAIXconserver 
+=head3    setupAIXconserver
 	
-    Set AIX conserver 
+    Set AIX conserver
 
 =cut
 
 #-------------------------------------------------------------------------------
 
-=head3  setupAIXconserver 
+=head3  setupAIXconserver
     Description:
         Set AIX conserver
     Arguments:
-        $verbose: 
+        $verbose:
     Returns:
         Return result of the operation
     Globals:
@@ -3336,8 +3336,8 @@ sub setupAIXconserver
 
 =head3    isSELINUX
     Returns:
-       returns 0 if SELINUX is  enabled 
-       returns 1 if SELINUX is not enabled 
+       returns 0 if SELINUX is  enabled
+       returns 1 if SELINUX is not enabled
     Globals:
         none
     Error:
@@ -3345,7 +3345,7 @@ sub setupAIXconserver
     Example:
          if (xCAT::Utils->isSELINUX()) { blah; }
     Comments:
-       This is tested on Redhat,  may need more for SLES 
+       This is tested on Redhat,  may need more for SLES
 =cut
 
 #-------------------------------------------------------------------------------
@@ -3368,10 +3368,10 @@ sub isSELINUX
 
 #-------------------------------------------------------------------------------
 
-=head3   noderangecontainsMN 
+=head3   noderangecontainsMN
     Returns:
-       returns nothing, if ManagementNode is not the input noderange 
-       returns name of MN,  if Management Node is in the input noderange 
+       returns nothing, if ManagementNode is not the input noderange
+       returns name of MN,  if Management Node is in the input noderange
     Globals:
         none
     Error:
@@ -3394,7 +3394,7 @@ sub noderangecontainsMn
     # name
     my @mnames;   # management node names in the database, members of __mgmtnode
     my $tab = xCAT::Table->new('nodelist');
-    
+
     my @nodelist = $tab->getAllAttribsWhere("node in ("."\'".join("\',\'", @noderange)."\'".") and groups like '%__mgmtnode%'",'node');
     return map {$_->{node}} @nodelist;            # if no MN in the noderange, return nothing
 }
@@ -3463,7 +3463,7 @@ my %MTM_P6P7 = (
 
 #-----------------------------------------------------------------------------
 
-=head3   isP6P7 
+=head3   isP6P7
 	
     Check whether a MTM is a P6 or P7 machine
     Parameter: MTM of Power machine
@@ -3684,8 +3684,8 @@ sub filter_nodes {
 
 #-------------------------------------------------------------------------------
 
-=head3   filter_nostatusupdate() 
-     
+=head3   filter_nostatusupdate()
+
     filter out the nodes which support provision status feedback from the status-nodes hash
     Returns:
        returns the filtered status-nodes hash
@@ -3930,16 +3930,16 @@ sub time2string
 }
 #--------------------------------------------------------------------------------
 
-=head3  specialservicemgr 
+=head3  specialservicemgr
     some special services cannot be processed in sysVinit, upstart and systemd framework, should be process here...
     Arguments:
-      service name: 
+      service name:
       action:        start/stop/restart/status/enable/disable
-      outputoption:  
+      outputoption:
                      1:        return a hashref with the keys:"retcode","retmsg"
                      otherwise: return retcode only
     Returns:
-      
+
                      a hashref if $outputoption is 1,the hash structure is:
                                  {"retcode"=>(status code, 0 for running/active,1 for stopped/inactive,2 for failed)
                                   "retmsg" =>(status string, running/active/stopped/inactive/failed)
@@ -3948,7 +3948,7 @@ sub time2string
 
                      retcode:   127 if the service specified is not processed
                                 the exit code of the service operation if the service specified is processed
-    
+
     Globals:
         none
     Error:
@@ -4023,21 +4023,21 @@ sub specialservicemgr {
 
 #--------------------------------------------------------------------------------
 
-=head3   servicemap 
-    returns the name of service unit(for systemd) or service daemon(for SYSVinit). 
+=head3   servicemap
+    returns the name of service unit(for systemd) or service daemon(for SYSVinit).
     Arguments:
       $svcname: the name of the service
       $svcmgrtype: the service manager type:
                    0: SYSVinit
                    1: systemd
-                   2: upstart  
+                   2: upstart
     Returns:
       the name of service unit or service daemon
       undef on fail
     Globals:
         none
     Error:
-      None 
+      None
     Example:
          my $svc = xCAT::Utils->servicemap($svcname,1);
     Comments:
@@ -4142,7 +4142,7 @@ sub servicemap {
 
 #--------------------------------------------------------------------------------
 
-=head3  startservice  
+=head3  startservice
     start a service
     Arguments:
       service name
@@ -4217,7 +4217,7 @@ sub startservice {
 
 #--------------------------------------------------------------------------------
 
-=head3  stopservice  
+=head3  stopservice
     stop a service
     Arguments:
       service name
@@ -4289,7 +4289,7 @@ sub stopservice {
 
 #--------------------------------------------------------------------------------
 
-=head3  restartservice  
+=head3  restartservice
     restart a service
     Arguments:
       service name
@@ -4357,8 +4357,8 @@ sub restartservice {
 
 #--------------------------------------------------------------------------------
 
-=head3   checkservicestatus 
-    returns theservice status. 
+=head3   checkservicestatus
+    returns theservice status.
     Arguments:
       $svcname: the name of the service
       $outputoption[optional]:
@@ -4376,7 +4376,7 @@ sub restartservice {
     Globals:
         none
     Error:
-      None 
+      None
     Example:
          my $ret = xCAT::Utils-checkservicestatus($svcname,1);
          my $retcode = xCAT::Utils-checkservicestatus($svcname);
@@ -4475,7 +4475,7 @@ sub checkservicestatus {
 
 #--------------------------------------------------------------------------------
 
-=head3  enableservice 
+=head3  enableservice
    enable a service to start it on the system bootup
     Arguments:
       service name
@@ -4551,7 +4551,7 @@ sub enableservice {
 
 #--------------------------------------------------------------------------------
 
-=head3  disableservice  
+=head3  disableservice
     disable a service to prevent it from starting on system bootup
     Arguments:
       service name
diff --git a/perl-xCAT/xCAT/Version.pm b/perl-xCAT/xCAT/Version.pm
index 95cfcb865..086799bde 100644
--- a/perl-xCAT/xCAT/Version.pm
+++ b/perl-xCAT/xCAT/Version.pm
@@ -21,11 +21,11 @@ use strict;
 
 #-------------------------------------------------------------------------------
 
-=head3   Version 
+=head3   Version
     Arguments:
         Optional 'short' string to request only the version;
     Returns:
-       xcat Version number 
+       xcat Version number
     Globals:
         none
     Error:
diff --git a/perl-xCAT/xCAT/Yum.pm b/perl-xCAT/xCAT/Yum.pm
index 368992a78..61da4db59 100644
--- a/perl-xCAT/xCAT/Yum.pm
+++ b/perl-xCAT/xCAT/Yum.pm
@@ -16,7 +16,7 @@ sub localize_yumrepo {
     my $pkgdir = shift;
     $distname=shift;
     $arch=shift;
-    
+
     mkpath("$distrepopfx/$pkgdir");
     open($yumrepofile, ">", "$distrepopfx/$pkgdir/local-repository.tmpl");
     my %options = (
diff --git a/perl-xCAT/xCAT/Zone.pm b/perl-xCAT/xCAT/Zone.pm
index 5f525d58d..babb42281 100644
--- a/perl-xCAT/xCAT/Zone.pm
+++ b/perl-xCAT/xCAT/Zone.pm
@@ -37,16 +37,16 @@ This program module file, is a set of Zone utilities used by xCAT *zone commands
 
 #--------------------------------------------------------------------------------
 
-=head3    genSSHRootKeys 
+=head3    genSSHRootKeys
     Arguments:
-      callback for error messages 
-      directory in which to put the ssh RSA keys 
-      zonename 
+      callback for error messages
+      directory in which to put the ssh RSA keys
+      zonename
       rsa private key to use for generation ( optional)
     Returns:
     Error:  1 - key generation failure.
     Example:
-     $rc =xCAT::Zone->genSSHRootKeys($callback,$keydir,$rsakey); 
+     $rc =xCAT::Zone->genSSHRootKeys($callback,$keydir,$rsakey);
 =cut
 
 #--------------------------------------------------------------------------------
@@ -144,13 +144,13 @@ sub genSSHRootKeys
 
 #--------------------------------------------------------------------------------
 
-=head3    getdefaultzone 
+=head3    getdefaultzone
     Arguments:
-      None 
+      None
     Returns:
     Name of the current default  zone from the zone table
     Example:
-     my $defaultzone =xCAT::Zone->getdefaultzone($callback); 
+     my $defaultzone =xCAT::Zone->getdefaultzone($callback);
 =cut
 
 #--------------------------------------------------------------------------------
@@ -185,13 +185,13 @@ sub getdefaultzone
 
 #--------------------------------------------------------------------------------
 
-=head3    iszonedefined 
+=head3    iszonedefined
     Arguments:
-      zonename 
+      zonename
     Returns:
      1 if the zone is already in the zone table.
     Example:
-     xCAT::Zone->iszonedefined($zonename); 
+     xCAT::Zone->iszonedefined($zonename);
 =cut
 
 #--------------------------------------------------------------------------------
@@ -212,14 +212,14 @@ sub iszonedefined
 
 #--------------------------------------------------------------------------------
 
-=head3  getzonekeydir 
+=head3  getzonekeydir
     Arguments:
-      zonename 
+      zonename
     Returns:
-     path to the root ssh keys for the zone /etc/xcat/sshkeys/<zonename>/.ssh 
-     1 - zone not defined 
+     path to the root ssh keys for the zone /etc/xcat/sshkeys/<zonename>/.ssh
+     1 - zone not defined
     Example:
-     xCAT::Zone->getzonekeydir($zonename); 
+     xCAT::Zone->getzonekeydir($zonename);
 =cut
 
 #--------------------------------------------------------------------------------
@@ -239,13 +239,13 @@ sub getzonekeydir
 
 #--------------------------------------------------------------------------------
 
-=head3    getmyzonename 
+=head3    getmyzonename
     Arguments:
-       $node -one nodename      
+       $node -one nodename
     Returns:
-     $zonename 
+     $zonename
     Example:
-     my $zonename=xCAT::Zone->getmyzonename($node); 
+     my $zonename=xCAT::Zone->getmyzonename($node);
 =cut
 
 #--------------------------------------------------------------------------------
@@ -268,14 +268,14 @@ sub getmyzonename
 
 #--------------------------------------------------------------------------------
 
-=head3    enableSSHbetweennodes 
+=head3    enableSSHbetweennodes
     Arguments:
-      zonename 
+      zonename
     Returns:
      1 if the  sshbetweennodes attribute is yes/1 or undefined
-     0 if the  sshbetweennodes attribute is no/0 
+     0 if the  sshbetweennodes attribute is no/0
     Example:
-     xCAT::Zone->enableSSHbetweennodes($zonename); 
+     xCAT::Zone->enableSSHbetweennodes($zonename);
 =cut
 
 #--------------------------------------------------------------------------------
@@ -316,14 +316,14 @@ sub enableSSHbetweennodes
 
 #--------------------------------------------------------------------------------
 
-=head3    usingzones 
+=head3    usingzones
     Arguments:
-      none 
+      none
     Returns:
      1 if the zone table is not empty
      0 if empty
     Example:
-     xCAT::Zone->usingzones; 
+     xCAT::Zone->usingzones;
 =cut
 
 #--------------------------------------------------------------------------------
@@ -352,9 +352,9 @@ sub usingzones
      Hash array  by zonename point to the nodes in that zonename  and sshkeydir
       <zonename1> -> {nodelist} -> array of nodes in the zone
                  -> {sshkeydir} -> directory containing ssh RSA keys
-                 -> {defaultzone} ->  is it the default zone             
+                 -> {defaultzone} ->  is it the default zone
     Example:
-     my %zonehash =xCAT::Zone->getzoneinfo($callback,@nodearray); 
+     my %zonehash =xCAT::Zone->getzoneinfo($callback,@nodearray);
     Rules:
        If the nodes nodelist.zonename attribute is a zonename, it is assigned to that zone
        If the nodes nodelist.zonename attribute is undefined:
@@ -449,11 +449,11 @@ sub getzoneinfo
 =head3    getnodesinzone
     Arguments:
      callback
-     zonename 
+     zonename
     Returns:
-     Array of nodes 
+     Array of nodes
     Example:
-     my @nodes =xCAT::Zone->getnodesinzone($callback,$zonename); 
+     my @nodes =xCAT::Zone->getnodesinzone($callback,$zonename);
 =cut
 
 #--------------------------------------------------------------------------------
diff --git a/perl-xCAT/xCAT/data/switchinfo.pm b/perl-xCAT/xCAT/data/switchinfo.pm
index b5793f01c..6fab0f150 100644
--- a/perl-xCAT/xCAT/data/switchinfo.pm
+++ b/perl-xCAT/xCAT/data/switchinfo.pm
@@ -1,6 +1,6 @@
 # IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html
 
-#This module includes some glocal table to look up the switch type via mac and vendor 
+#This module includes some glocal table to look up the switch type via mac and vendor
 
 package xCAT::data::switchinfo;
 
diff --git a/perl-xCAT/xCAT/zvmCPUtils.pm b/perl-xCAT/xCAT/zvmCPUtils.pm
index 22f5e67b7..66dffe22e 100644
--- a/perl-xCAT/xCAT/zvmCPUtils.pm
+++ b/perl-xCAT/xCAT/zvmCPUtils.pm
@@ -921,7 +921,7 @@ sub smapiFlashCopy {
                         "" means that the current class is to be used
                         anything else is the class to set on the punched file
     Returns     : Operation results ("Done" or "Failed" with additional info)
-    Example     : my $response = xCAT::zvmCPUtils->punch2Reader( $user, $hcp, $userId, $srcFile, 
+    Example     : my $response = xCAT::zvmCPUtils->punch2Reader( $user, $hcp, $userId, $srcFile,
                                                                  $tgtFile, $options, $spoolClass );
 
 =cut
diff --git a/perl-xCAT/xCAT/zvmMsgs.pm b/perl-xCAT/xCAT/zvmMsgs.pm
index 6544f941a..e29e0f5e4 100644
--- a/perl-xCAT/xCAT/zvmMsgs.pm
+++ b/perl-xCAT/xCAT/zvmMsgs.pm
@@ -1407,4 +1407,4 @@ sub buildMsg {
     }
 
     return ( $recAction, $sev, $retMsg, $retExtra );
-}
\ No newline at end of file
+}
diff --git a/perl-xCAT/xCAT/zvmUtils.pm b/perl-xCAT/xCAT/zvmUtils.pm
index 893278fd5..3b3c698b0 100644
--- a/perl-xCAT/xCAT/zvmUtils.pm
+++ b/perl-xCAT/xCAT/zvmUtils.pm
@@ -4657,7 +4657,7 @@ sub injectMNKey {
     print $fh encode_json($md_json);
     close $fh;
 
-    # Replace the meta_data.json file in original config drive with the modified one 
+    # Replace the meta_data.json file in original config drive with the modified one
     system( "find $cfgpath/openstack -name meta_data.json -print | xargs -i cp  $cfgpath/meta_data.json {}");
     `rm -f $cfgpath/meta_data.json`;
 
diff --git a/src/proxydhcp.c b/src/proxydhcp.c
index 745707619..efd092f78 100644
--- a/src/proxydhcp.c
+++ b/src/proxydhcp.c
@@ -9,7 +9,7 @@
 #include <signal.h>
 #include <syslog.h>
 
-// the chunk size for each alloc 
+// the chunk size for each alloc
 int chunknum = 200;
 int doreload = 0;
 int verbose = 0;
@@ -28,7 +28,7 @@ int nodenum = 0;
 void reload(int sig) {
     doreload = 1;
 }
-// the subroutine which is used to load configuration from 
+// the subroutine which is used to load configuration from
 // /var/lib/xcat/proxydhcp.cfg to *data
 void loadcfg () {
     nodenum = 0;
@@ -75,7 +75,7 @@ char *getwinpepath(char *node) {
     return NULL;
 }
 
-    
+
 int main(int argc, char *argv[]) {
     int i;
     for(i = 0; i < argc; i++)
@@ -151,11 +151,11 @@ int main(int argc, char *argv[]) {
         // use select to wait for the 4011 request packages coming
         fd_set fds;
         FD_ZERO(&fds);
-        FD_SET(serverfd, &fds); 
+        FD_SET(serverfd, &fds);
         struct timeval timeout;
         timeout.tv_sec = 30;
         timeout.tv_usec = 0;
-        
+
         int rc;
         if ((rc = select(serverfd+1,&fds,0,0, &timeout)) <= 0) {
             if (doreload) {
@@ -165,12 +165,12 @@ int main(int argc, char *argv[]) {
             if (verbose) {syslog(LOG_DEBUG, "reload /var/lib/xcat/proxydhcp.cfg\n");}
             continue;
         }
-        
+
         if (doreload) {
             loadcfg();
             if (verbose) {syslog(LOG_DEBUG, "reload /var/lib/xcat/proxydhcp.cfg\n");}
         }
-        
+
         pktsize = recvmsg(serverfd,&msg,0);
         if (pktsize < 320) {
             continue;
@@ -183,7 +183,7 @@ int main(int argc, char *argv[]) {
                 myip = ((struct in_pktinfo*)(CMSG_DATA(cmsgptr)))->ipi_addr.s_addr;
             }
         }
-        
+
         // get the ip of dhcp client
         clientip = 0;
         int i;
@@ -201,20 +201,20 @@ int main(int argc, char *argv[]) {
                 if (place) {
                     *place = '\0';
                 }
-                
+
                 winpepath = getwinpepath(host->h_name);
                 if (winpepath == NULL) {
                     winpepath = defaultwinpe;
                 }
                 if (verbose) {
                     sprintf(logmsg, "Received proxydhcp request from %s\n", host->h_name);
-                    syslog(LOG_DEBUG, logmsg); 
+                    syslog(LOG_DEBUG, logmsg);
                 }
             }
         } else {
             winpepath = defaultwinpe;
         }
-        
+
         // get the Vendor class identifier
         char *arch = NULL;
         unsigned char *p = clientpacket + 0xf0;
@@ -226,7 +226,7 @@ int main(int argc, char *argv[]) {
                 p += *(p+1) + 2;
             }
         }
-        
+
         char winboot[50]; // the bootload of winpe
         memset(winboot, 0, 50);
         if (0 == memcmp(arch, "00000", 5)) {  // bios boot mode
@@ -247,7 +247,7 @@ int main(int argc, char *argv[]) {
         strncpy(txtptr, winboot ,128); // keeping 128 in there just in case someone changes the string
         //strncpy(txtptr,"winboot/new/Boot/bootmgfw.efi",128); // keeping 128 in there just in case someone changes the string
         //strncpy(txtptr,"Boot/pxeboot.0",128); // keeping 128 in there just in case someone changes the string
-        clientpacket[0xf0]=0x35; //DHCP MSG type 
+        clientpacket[0xf0]=0x35; //DHCP MSG type
         clientpacket[0xf1]=0x1; // LEN of 1
         clientpacket[0xf2]=0x5; //DHCP ACK
         clientpacket[0xf3]=0x36; //DHCP server identifier
@@ -256,7 +256,7 @@ int main(int argc, char *argv[]) {
         clientpacket[0xf6] = (myip>>16)&0xff;
         clientpacket[0xf7] = (myip>>8)&0xff;
         clientpacket[0xf8] = (myip)&0xff;
-        
+
         char winBCD[50];
         strcpy(winBCD, winpepath);
         strcat(winBCD, "Boot/BCD");
diff --git a/src/xcatflowrequest.c b/src/xcatflowrequest.c
index 7bf604370..d96692bd0 100644
--- a/src/xcatflowrequest.c
+++ b/src/xcatflowrequest.c
@@ -10,7 +10,7 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <string.h>
-int main(int argc, char* argv[]) { 
+int main(int argc, char* argv[]) {
 	int server;
 	struct addrinfo hints;
 	struct addrinfo *results,*cur;
diff --git a/travis.pl b/travis.pl
index 7dc5ea8de..71f6ad95f 100644
--- a/travis.pl
+++ b/travis.pl
@@ -72,7 +72,7 @@ sub get_files_recursive
         print "[get_files_recursive]: failed to open $dir :$!\n";
         return 1;
     }
-    
+
     for (; ;)
     {
         my $direntry = readdir($fd);
@@ -126,7 +126,7 @@ sub check_pr_format{
         #print Dumper $pr_content;
         print "[check_pr_format] pr title = $pr_title\n";
         print "[check_pr_format] pr body = $pr_body \n";
-        
+
         my $checkrst="";
         if(! $pr_title){
             $checkrst.="Missing title.";
@@ -134,7 +134,7 @@ sub check_pr_format{
         if(! $pr_body){
              $checkrst.="Missing description.";
         }
-        
+
         if(! $pr_milestone){
              $checkrst.="Missing milestone.";
         }
@@ -148,14 +148,14 @@ sub check_pr_format{
 
         if(length($checkrst) == 0){
             $check_result_str .= "> **PR FORMAT CORRECT**";
-            send_back_comment("$check_result_str"); 
+            send_back_comment("$check_result_str");
         }else{
             if($checkrst =~ /milestone/ || $checkrst =~ /labels/){
                 $check_result_str .= "> **PR FORMAT WARNING** : $checkrst";
                 send_back_comment("$check_result_str");
             }else{
                 $check_result_str .= "> **PR FORMAT ERROR** : $checkrst";
-                send_back_comment("$check_result_str"); 
+                send_back_comment("$check_result_str");
                 return 1;
             }
         }
@@ -167,8 +167,8 @@ sub check_pr_format{
 # Fuction name: check_commit_owner
 # Description: Verify commits are not done by specified user
 # Attributes: user login to reject
-# Return: 
-#     Error string -User rejected, 
+# Return:
+#     Error string -User rejected,
 #     Empty string -User not rejected
 #--------------------------------------------------------
 sub check_commit_owner{
@@ -258,7 +258,7 @@ sub send_back_comment{
             }
         }
     }
-    
+
      print "[send_back_comment] method = $post_method to $post_url\n";
      `curl -u "$ENV{'xcatbotuser'}:$ENV{'xcatbotpw'}" -X $post_method -d '{"body":"$message"}' $post_url`;
 }
@@ -303,7 +303,7 @@ sub build_xcat_core{
     }
 
 #    my $buildpath ="/home/travis/build/xcat-core/";
-#    my @buildfils = (); 
+#    my @buildfils = ();
 #    get_files_recursive("$buildpath", \@buildfils);
 #    print "\n-----------Dumper build files-----------\n";
 #    print Dumper \@buildfils;
@@ -318,7 +318,7 @@ sub build_xcat_core{
 # Return code:
 #--------------------------------------------------------
 sub install_xcat{
-    
+
     my @cmds = ("cd ./../../xcat-core && sudo ./mklocalrepo.sh",
                "sudo chmod 777 /etc/apt/sources.list",
                "sudo echo \"deb [arch=amd64] http://xcat.org/files/xcat/repos/apt/devel/xcat-dep trusty main\" >> /etc/apt/sources.list",
@@ -350,11 +350,11 @@ sub install_xcat{
         print ">>>>>Dumper the output of '$cmd'\n";
         print Dumper \@output;
         $check_result_str .= "> **INSTALL XCAT ERROR** : Please click ``Details`` label in ``Merge pull request`` box for detailed information";
-        send_back_comment("$check_result_str");     
+        send_back_comment("$check_result_str");
         return 1;
     }else{
         print "[install_xcat] $cmd ....[Pass]\n";
-        
+
         print "\n------Config xcat and verify xcat is working correctly-----\n";
         @cmds = ("sudo -s /opt/xcat/share/xcat/scripts/setup-local-client.sh -f travis",
                  "sudo -s /opt/xcat/sbin/chtab priority=1.1 policy.name=travis policy.rule=allow",
@@ -408,7 +408,7 @@ sub check_syntax{
         foreach my $file (@files) {
             next if($file =~ /\/opt\/xcat\/share\/xcat\/netboot\/genesis\//);
             next if($file =~ /\/opt\/xcat\/probe\//);
-        
+
             @output = runcmd("file $file");
             if($output[0] =~ /perl /i){
                 @output = runcmd("sudo bash -c '. /etc/profile.d/xcat.sh && perl -I /opt/xcat/lib/perl -I /opt/xcat/lib -I /usr/lib/perl5 -I /usr/share/perl -c $file'");
@@ -459,7 +459,7 @@ sub run_fast_regression_test{
         print Dumper \@output;
     }
 
-    $cmd = "sudo bash -c '. /etc/profile.d/xcat.sh && xcattest -l bundleinfo'";
+    $cmd = "sudo bash -c '. /etc/profile.d/xcat.sh && xcattest -h'";
     @output = runcmd("$cmd");
     if($::RUNCMD_RC){
          print RED "[run_fast_regression_test] $cmd ....[Failed]\n";
@@ -468,9 +468,9 @@ sub run_fast_regression_test{
          return 1;
     }else{
          print "[run_fast_regression_test] $cmd .....:\n";
-         print Dumper \@output; 
+         print Dumper \@output;
     }
-  
+
     my $hostname = `hostname`;
     chomp($hostname);
     print "hostname = $hostname\n";
@@ -481,16 +481,50 @@ sub run_fast_regression_test{
          print RED "[run_fast_regression_test] $cmd ....[Failed]";
          print "[run_fast_regression_test] error dumper:\n";
          print Dumper \@output;
-         return 1; 
+         return 1;
     }
-    
+
     print "Dumper regression conf file:\n";
-    @output = runcmd("cat $conf_file"); 
+    @output = runcmd("cat $conf_file");
     print Dumper \@output;
 
-    my @caseslist = runcmd("sudo bash -c '. /etc/profile.d/xcat.sh && xcattest -l caselist -b MN_basic.bundle'");
+
+    $cmd = "sudo bash -c '. /etc/profile.d/xcat.sh && xcattest -s \"mn_only-wait_fix\" -l'";
+    my  @caseslist = runcmd("$cmd");
+    if($::RUNCMD_RC){
+         print RED "[run_fast_regression_test] $cmd ....[Failed]\n";
+         print "[run_fast_regression_test] error dumper:\n";
+         print Dumper \@caseslist;
+         return 1;
+    }else{
+         print "[run_fast_regression_test] $cmd .....:\n";
+         print Dumper \@caseslist;
+    }
+
+    #This is a black list for CI test
+    #It is useful for debug or development
+    #please ignore during common work
+#    {
+#        sub array_filter {
+#            my $src_array_ref    = shift;
+#            my $filter_array_ref = shift;
+#
+#            my @left_array;
+#            foreach my $item (@{$src_array_ref}) {
+#                my $hit = 0;
+#                foreach my $f (@{$filter_array_ref}) {
+#                    $hit = 1 if ($f eq $item);
+#                }
+#                push @left_array, $item unless ($hit);
+#            }
+#            @$src_array_ref = @left_array;
+#        }
+#
+#        #my @filter_cases=("testtest");
+#        #array_filter(\@caseslist, \@filter_cases);
+#    }
+
     my $casenum = @caseslist;
-    
     my $x = 0;
     my @failcase;
     my $passnum = 0;
@@ -519,7 +553,7 @@ sub run_fast_regression_test{
         $check_result_str .= "> **FAST REGRESSION TEST Failed**: Totalcase $casenum Passed $passnum Failed $failnum FailedCases: $log_str.  Please click ``Details`` label in ``Merge pull request`` box for detailed information";
         send_back_comment("$check_result_str");
         return 1;
-    }else{   
+    }else{
         $check_result_str .= "> **FAST REGRESSION TEST Successful**: Totalcase $casenum Passed $passnum Failed $failnum";
         send_back_comment("$check_result_str");
     }
diff --git a/xCAT-IBMhpc/debian/copyright b/xCAT-IBMhpc/debian/copyright
index f61d34dfe..87e60f492 100644
--- a/xCAT-IBMhpc/debian/copyright
+++ b/xCAT-IBMhpc/debian/copyright
@@ -85,4 +85,4 @@ Everyone is permitted to copy and distribute copies of this Agreement, but in or
 
 This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
 
- 
+
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.post b/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.post
index 802c92bd4..3431a1b51 100644
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.post
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.post
@@ -5,12 +5,12 @@
 #
 # Linux: for stateful (full-disk install) and stateless/statelite nodes
 #     For stateful nodes: run as part of IBMhpc.postbootscript.
-#     For stateless/statelite nodes: run as postscript, you will need to 
+#     For stateless/statelite nodes: run as postscript, you will need to
 #       copy this script to /install/postscripts and specify it to nodes'
 #       postscripts attribute.
 #
 
 
-# BSR configuration on Power 775 cluster. More BSR configuration should 
+# BSR configuration on Power 775 cluster. More BSR configuration should
 # be done by PE postinstall in genimage or postbootscript in stateful install
 #chown root:bsr /dev/bsr*
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.postbootscript b/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.postbootscript
index f6692e9f2..d3de66513 100755
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.postbootscript
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.postbootscript
@@ -22,7 +22,7 @@ $ps_dir/compilers_license
 # Run script to install PE and accept license
 $ps_dir/pe_install-1200
 
-# Run script to accept LoadLeveler license, install product rpms, 
+# Run script to accept LoadLeveler license, install product rpms,
 # and do some config
 $ps_dir/loadl_install-5103
 
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.rhel.postinstall b/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.rhel.postinstall
index a88ebf8fb..82f63fbc5 100755
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.rhel.postinstall
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.rhel.postinstall
@@ -3,12 +3,12 @@
 #-- IBMhpc.postinstall
 #--    Run this script from your <profile>.postinstall to perform the following
 #--    general setup in your diskless image for your HPC cluster:
-#--        - create entries in /etc/fstab for basic filesystems 
+#--        - create entries in /etc/fstab for basic filesystems
 #--        - enables the "cons" entry in /etc/inittab
 #--        - create initial copies of /etc/passwd and other files in the image
 #--        - turn on the "at" service
 #--        - turn on xinetd
-#--        - 
+#--        -
 #--
 #-- it gets these arguments:
 #--
@@ -45,7 +45,7 @@ echo "co:2345:respawn:/sbin/agetty -L 38400 console" >> $installroot/etc/inittab
 # Create initial copies of /etc/passwd and others in case they are needed
 # by other postscripts
 # If you would like xCAT to keep these up to date,
-# use the xCAT syncfiles function which runs during 
+# use the xCAT syncfiles function which runs during
 # packimage/liteimg and at other times
 cp -p /etc/passwd $installroot/etc/passwd
 cp -p /etc/group $installroot/etc/group
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.sles.postinstall b/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.sles.postinstall
index 1c93749e4..e29d9a7d9 100755
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.sles.postinstall
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc.sles.postinstall
@@ -3,12 +3,12 @@
 #-- IBMhpc.postinstall
 #--    Run this script from your <profile>.postinstall to perform the following
 #--    general setup in your diskless image for your HPC cluster:
-#--        - create entries in /etc/fstab for basic filesystems 
+#--        - create entries in /etc/fstab for basic filesystems
 #--        - enables the "cons" entry in /etc/inittab
 #--        - create initial copies of /etc/passwd and other files in the image
 #--        - turn on the "at" service
 #--        - turn on xinetd
-#--        - 
+#--        -
 #--
 #-- it gets these arguments:
 #--
@@ -44,7 +44,7 @@ echo "$TMP_inittab" > $installroot/etc/inittab
 # Create initial copies of /etc/passwd and others in case they are needed
 # by other postscripts
 # If you would like xCAT to keep these up to date,
-# use the xCAT syncfiles function which runs during 
+# use the xCAT syncfiles function which runs during
 # packimage/liteimg and at other times
 cp -p /etc/passwd $installroot/etc/passwd
 cp -p /etc/group $installroot/etc/group
@@ -60,8 +60,8 @@ chroot $installroot chkconfig xinetd on
 # Automatically mount /dev/cpuset at node boot
 if ! grep 'cpuset' $installroot/etc/init.d/boot.local ; then
 cat <<END >>$installroot/etc/init.d/boot.local
-if test -e /dev/cpuset || mkdir -p /dev/cpuset ; then 
-	mount -t cpuset none /dev/cpuset 
+if test -e /dev/cpuset || mkdir -p /dev/cpuset ; then
+	mount -t cpuset none /dev/cpuset
 fi
 END
 fi
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/aix-clean-jitter b/xCAT-IBMhpc/share/xcat/IBMhpc/aix-clean-jitter
index c21de83b9..55952e29f 100644
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/aix-clean-jitter
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/aix-clean-jitter
@@ -12,7 +12,7 @@ rmitab shdaemon > /dev/null 2>&1
 
 #to disable topasrec, which runs as a cron job, need remove the following entry from /etc/inittab:
 #xmdaily:2:once:/usr/bin/topasrec -L -s 300 -R 1 -r 6 -o /etc/perf/daily/ -ypersistent=1 2>&1 >/dev/null #Start local binary recording
-rmitab xmdaily > /dev/null 2>&1 
+rmitab xmdaily > /dev/null 2>&1
 
 #to disable PM data collection, which is really topasout, run:
 #55 23 * * * /var/perf/pm/bin/pmcfg  >/dev/null 2>&1     #Enable PM Data Collection
@@ -46,7 +46,7 @@ rmitab gsa_updmn > /dev/null 2>&1
 #artex:2:wait:/usr/sbin/artexset -c -R /etc/security/artex/config/master_profile.xml > /dev/console 2>&1
 rmitab artex > /dev/null 2>&1
 
-#this is HACMP function . . . 
+#this is HACMP function . . .
 #clcomd:23456789:once:/usr/bin/startsrc -s clcomd
 rmitab clcomd > /dev/null 2>&1
 
@@ -67,11 +67,11 @@ rmitab pconsole > /dev/null 2>&1
 #rcnetwlm:23456789:wait:/etc/rc.netwlm start> /dev/console 2>&1 # Start netwlm
 rmitab rcnetwlm > /dev/null 2>&1
 
-#to disable cimservices, need to comment cimservices and platform agent: 
+#to disable cimservices, need to comment cimservices and platform agent:
 #cimservices:2:once:/usr/bin/startsrc -s cimsys >/dev/null 2>&1
 #platform_agent:2:once:/usr/bin/startsrc -s platform_agent >/dev/null 2>&1
-rmitab cimservices > /dev/null 2>&1 
-rmitab platform_agent > /dev/null 2>&1 
+rmitab cimservices > /dev/null 2>&1
+rmitab platform_agent > /dev/null 2>&1
 
 #we WILL want to add in RMC (RSCT) monitoring at some point
 #ctrmc:2:once:/usr/bin/startsrc -s ctrmc > /dev/console 2>&1
@@ -97,7 +97,7 @@ then
     grep -q "^start /usr/lib/sendmail" /etc/rc.tcpip
     if [[ $? -eq 0 ]] then
 	cat /etc/rc.tcpip | sed 's/^start \/usr\/lib\/sendmail/#start \/usr\/lib\/sendmail/' > /tmp/rc.tcpip.tmpfile.$$
-	cp  -p /etc/rc.tcpip /etc/rc.tcpip.prev 
+	cp  -p /etc/rc.tcpip /etc/rc.tcpip.prev
 	mv  /tmp/rc.tcpip.tmpfile.$$  /etc/rc.tcpip
     fi
     stopsrc -s sendmail > /dev/null 2>&1
@@ -141,7 +141,7 @@ if [[ ! -f /var/spool/cron/crontabs/root.before.clean_jitter ]] then
 
     egrep -v "bin\/pmcfg|bin\/stcron|bin\/dumpctr|ras\/dumpcheck|bin\/errclear" /var/spool/cron/crontabs/root > /var/spool/cron/crontabs/root.after.clean_jitter
 
-    cp /var/spool/cron/crontabs/root.after.clean_jitter /var/spool/cron/crontabs/root 
+    cp /var/spool/cron/crontabs/root.after.clean_jitter /var/spool/cron/crontabs/root
 fi
 
 #for i in $(ps -efk | egrep "\/usr\/sbin\/cron|topasrec" | grep -v grep | awk ' { print $2} ') ; do
@@ -178,7 +178,7 @@ sleep 1
 grep -q cosched3 /etc/poe.priority 2> /dev/null
 if [[ $? -ne 0 ]] then
     echo '*  cosched1    18    100    97    10' >> /etc/poe.priority
-    echo '*  cosched2    13    100    99.5  10' >> /etc/poe.priority 
+    echo '*  cosched2    13    100    99.5  10' >> /etc/poe.priority
     echo '*  cosched3    13    100    99     3' >> /etc/poe.priority
     echo '*  cosched4    18    100    97     1' >> /etc/poe.priority
     chmod 644 /etc/poe.priority
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/compilers/compilers_license b/xCAT-IBMhpc/share/xcat/IBMhpc/compilers/compilers_license
index 57a296402..49d0bb070 100755
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/compilers/compilers_license
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/compilers/compilers_license
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# 
+#
 # Sample script to accept licenses for the IBM vacpp and xlf compilers
 # For AIX:
 #    do nothing, license accepted with installp -Y flag
@@ -57,6 +57,6 @@ if [ $OS != "AIX" ]; then
            echo 1 | chroot $installroot /$xlf_script
        fi
     fi
-fi  
+fi
 
 
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/compilers/upc_license b/xCAT-IBMhpc/share/xcat/IBMhpc/compilers/upc_license
index 9f282e845..21e13d391 100644
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/compilers/upc_license
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/compilers/upc_license
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# 
+#
 # Sample script to accept licenses for the IBM upc compilers
 # For AIX:
 #    do nothing, license accepted with installp -Y flag
@@ -27,6 +27,6 @@ if [ $OS != "AIX" ]; then
            echo 1 | chroot $installroot /$upc_script
        fi
     fi
-fi  
+fi
 
 
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.ppc64.postinstall b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.ppc64.postinstall
index d342eab5c..d5935cae3 100755
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.ppc64.postinstall
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.ppc64.postinstall
@@ -58,7 +58,7 @@ installroot=$installroot pedir=$otherpkgs/pe NODESETSTATE=genimage   $hpc/pe/pe_
 #installroot=$installroot essldir=$otherpkgs/essl NODESETSTATE=genimage   $hpc/essl/essl_install
 
 
-# Run script to accept LoadLeveler license, install product rpms, 
+# Run script to accept LoadLeveler license, install product rpms,
 # and do some config
 installroot=$installroot loadldir=$otherpkgs/loadl NODESETSTATE=genimage   $hpc/loadl/loadl_install-5103
 
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.x86_64.otherpkgs.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.x86_64.otherpkgs.pkglist
index c4ebb4cdc..a7d5a77ea 100644
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.x86_64.otherpkgs.pkglist
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.x86_64.otherpkgs.pkglist
@@ -1,3 +1,3 @@
 #INCLUDE:/opt/xcat/share/xcat/IBMhpc/gpfs/gpfs.x86_64.otherpkgs.pkglist#
-#INCLUDE:/opt/xcat/share/xcat/IBMhpc/pe/pe-1200.rhels6.x86_64.otherpkgs.pkglist#   
+#INCLUDE:/opt/xcat/share/xcat/IBMhpc/pe/pe-1200.rhels6.x86_64.otherpkgs.pkglist#
 #INCLUDE:/opt/xcat/share/xcat/IBMhpc/loadl/loadl-5103.otherpkgs.pkglist#
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.x86_64.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.x86_64.pkglist
index 6cbc33e63..22f43ace8 100644
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.x86_64.pkglist
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.x86_64.pkglist
@@ -1,2 +1,2 @@
 #INCLUDE:/opt/xcat/share/xcat/IBMhpc/IBMhpc.rhels6.x86_64.pkglist#
-#INCLUDE:/opt/xcat/share/xcat/IBMhpc/pe/pe-1200.rhels6.x86_64.pkglist#    
+#INCLUDE:/opt/xcat/share/xcat/IBMhpc/pe/pe-1200.rhels6.x86_64.pkglist#
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.x86_64.postinstall b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.x86_64.postinstall
index 1147a189c..7d42a24b8 100644
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.x86_64.postinstall
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.x86_64.postinstall
@@ -57,7 +57,7 @@ installroot=$installroot pedir=$otherpkgs/pe NODESETSTATE=genimage   $hpc/pe/pe_
 #installroot=$installroot essldir=$otherpkgs/essl NODESETSTATE=genimage   $hpc/essl/essl_install
 
 
-# Run script to accept LoadLeveler license, install product rpms, 
+# Run script to accept LoadLeveler license, install product rpms,
 # and do some config
 installroot=$installroot loadldir=$otherpkgs/loadl NODESETSTATE=genimage   $hpc/loadl/loadl_install-5103
 
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.ppc64.otherpkgs.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.ppc64.otherpkgs.pkglist
index 60208da41..164c2b793 100644
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.ppc64.otherpkgs.pkglist
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.ppc64.otherpkgs.pkglist
@@ -1,4 +1,4 @@
-# Sample otherpkgs pkglist for installing all IBM HPC products in a 
+# Sample otherpkgs pkglist for installing all IBM HPC products in a
 # SLES11 PPC64 diskless image
 
 #INCLUDE:/opt/xcat/share/xcat/IBMhpc/compilers/compilers.otherpkgs.pkglist#
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.ppc64.postinstall b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.ppc64.postinstall
index ca3eebaa1..4361e586c 100755
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.ppc64.postinstall
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.ppc64.postinstall
@@ -58,7 +58,7 @@ installroot=$installroot pedir=$otherpkgs/pe NODESETSTATE=genimage   $hpc/pe/pe_
 # installroot=$installroot essldir=$otherpkgs/essl NODESETSTATE=genimage   $hpc/essl/essl_install
 
 
-# Run script to accept LoadLeveler license, install product rpms, 
+# Run script to accept LoadLeveler license, install product rpms,
 # and do some config
 installroot=$installroot loadldir=$otherpkgs/loadl NODESETSTATE=genimage   $hpc/loadl/loadl_install-5103
 
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.x86_64.otherpkgs.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.x86_64.otherpkgs.pkglist
index 77159fbd5..2ee70d02c 100644
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.x86_64.otherpkgs.pkglist
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.x86_64.otherpkgs.pkglist
@@ -1,3 +1,3 @@
 #INCLUDE:/opt/xcat/share/xcat/IBMhpc/gpfs/gpfs.x86_64.otherpkgs.pkglist#
-#INCLUDE:/opt/xcat/share/xcat/IBMhpc/pe/pe-1200.sles11.x86_64.otherpkgs.pkglist#   
+#INCLUDE:/opt/xcat/share/xcat/IBMhpc/pe/pe-1200.sles11.x86_64.otherpkgs.pkglist#
 #INCLUDE:/opt/xcat/share/xcat/IBMhpc/loadl/loadl-5103.otherpkgs.pkglist#
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.x86_64.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.x86_64.pkglist
index 1f7c1b602..aa8076169 100644
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.x86_64.pkglist
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.x86_64.pkglist
@@ -1,2 +1,2 @@
 #INCLUDE:/opt/xcat/share/xcat/IBMhpc/IBMhpc.sles11.x86_64.pkglist#
-#INCLUDE:/opt/xcat/share/xcat/IBMhpc/pe/pe-1200.sles11.x86_64.pkglist#    
+#INCLUDE:/opt/xcat/share/xcat/IBMhpc/pe/pe-1200.sles11.x86_64.pkglist#
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.x86_64.postinstall b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.x86_64.postinstall
index 3748172fc..7b49819f4 100644
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.x86_64.postinstall
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.x86_64.postinstall
@@ -57,7 +57,7 @@ installroot=$installroot pedir=$otherpkgs/pe NODESETSTATE=genimage   $hpc/pe/pe_
 #installroot=$installroot essldir=$otherpkgs/essl NODESETSTATE=genimage   $hpc/essl/essl_install
 
 
-# Run script to accept LoadLeveler license, install product rpms, 
+# Run script to accept LoadLeveler license, install product rpms,
 # and do some config
 installroot=$installroot loadldir=$otherpkgs/loadl NODESETSTATE=genimage   $hpc/loadl/loadl_install-5103
 
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.rhels6.ppc64.postinstall b/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.rhels6.ppc64.postinstall
index ddda8dd35..77b819184 100755
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.rhels6.ppc64.postinstall
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.rhels6.ppc64.postinstall
@@ -52,7 +52,7 @@ installroot=$installroot NODESETSTATE=genimage   $hpc/compilers/compilers_licens
 # Run script to install PE and accept license
 installroot=$installroot pedir=$otherpkgs/pe NODESETSTATE=genimage   $hpc/pe/pe_install-1200
 
-# Run script to accept LoadLeveler license, install product rpms, 
+# Run script to accept LoadLeveler license, install product rpms,
 # and do some config
 installroot=$installroot loadldir=$otherpkgs/loadl NODESETSTATE=genimage   $hpc/loadl/loadl_install-5103
 
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.rhels6.x86_64.otherpkgs.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.rhels6.x86_64.otherpkgs.pkglist
index c4ebb4cdc..a7d5a77ea 100644
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.rhels6.x86_64.otherpkgs.pkglist
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.rhels6.x86_64.otherpkgs.pkglist
@@ -1,3 +1,3 @@
 #INCLUDE:/opt/xcat/share/xcat/IBMhpc/gpfs/gpfs.x86_64.otherpkgs.pkglist#
-#INCLUDE:/opt/xcat/share/xcat/IBMhpc/pe/pe-1200.rhels6.x86_64.otherpkgs.pkglist#   
+#INCLUDE:/opt/xcat/share/xcat/IBMhpc/pe/pe-1200.rhels6.x86_64.otherpkgs.pkglist#
 #INCLUDE:/opt/xcat/share/xcat/IBMhpc/loadl/loadl-5103.otherpkgs.pkglist#
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.rhels6.x86_64.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.rhels6.x86_64.pkglist
index 8bad0a3a3..a0cc1a84d 100644
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.rhels6.x86_64.pkglist
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.rhels6.x86_64.pkglist
@@ -1,4 +1,4 @@
 #INCLUDE:/opt/xcat/share/xcat/IBMhpc/IBMhpc.rhels6.x86_64.pkglist#
-#INCLUDE:/opt/xcat/share/xcat/IBMhpc/pe/pe-1200.rhels6.x86_64.pkglist#    
+#INCLUDE:/opt/xcat/share/xcat/IBMhpc/pe/pe-1200.rhels6.x86_64.pkglist#
 #INCLUDE:/opt/xcat/share/xcat/IBMhpc/compilers/compilers.rhels6.pkglist#
 #INCLUDE:/opt/xcat/share/xcat/IBMhpc/essl/essl.pkglist#
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.rhels6.x86_64.postinstall b/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.rhels6.x86_64.postinstall
index 4e391983d..d63667d61 100644
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.rhels6.x86_64.postinstall
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.rhels6.x86_64.postinstall
@@ -52,7 +52,7 @@ installroot=$installroot   $hpc/gpfs/gpfs_mmsdrfs
 # Run script to install PE and accept license
 installroot=$installroot pedir=$otherpkgs/pe NODESETSTATE=genimage   $hpc/pe/pe_install-1200
 
-# Run script to accept LoadLeveler license, install product rpms, 
+# Run script to accept LoadLeveler license, install product rpms,
 # and do some config
 installroot=$installroot loadldir=$otherpkgs/loadl NODESETSTATE=genimage   $hpc/loadl/loadl_install-5103
 
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.sles11.ppc64.otherpkgs.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.sles11.ppc64.otherpkgs.pkglist
index 60208da41..164c2b793 100644
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.sles11.ppc64.otherpkgs.pkglist
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.sles11.ppc64.otherpkgs.pkglist
@@ -1,4 +1,4 @@
-# Sample otherpkgs pkglist for installing all IBM HPC products in a 
+# Sample otherpkgs pkglist for installing all IBM HPC products in a
 # SLES11 PPC64 diskless image
 
 #INCLUDE:/opt/xcat/share/xcat/IBMhpc/compilers/compilers.otherpkgs.pkglist#
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.sles11.ppc64.postinstall b/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.sles11.ppc64.postinstall
index 25f8ec2af..86eeffda8 100755
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.sles11.ppc64.postinstall
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.sles11.ppc64.postinstall
@@ -58,7 +58,7 @@ installroot=$installroot pedir=$otherpkgs/pe NODESETSTATE=genimage   $hpc/pe/pe_
 #installroot=$installroot essldir=$otherpkgs/essl NODESETSTATE=genimage   $hpc/essl/essl_install
 
 
-# Run script to accept LoadLeveler license, install product rpms, 
+# Run script to accept LoadLeveler license, install product rpms,
 # and do some config
 installroot=$installroot loadldir=$otherpkgs/loadl NODESETSTATE=genimage   $hpc/loadl/loadl_install-5103
 
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.sles11.x86_64.otherpkgs.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.sles11.x86_64.otherpkgs.pkglist
index 77159fbd5..2ee70d02c 100644
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.sles11.x86_64.otherpkgs.pkglist
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.sles11.x86_64.otherpkgs.pkglist
@@ -1,3 +1,3 @@
 #INCLUDE:/opt/xcat/share/xcat/IBMhpc/gpfs/gpfs.x86_64.otherpkgs.pkglist#
-#INCLUDE:/opt/xcat/share/xcat/IBMhpc/pe/pe-1200.sles11.x86_64.otherpkgs.pkglist#   
+#INCLUDE:/opt/xcat/share/xcat/IBMhpc/pe/pe-1200.sles11.x86_64.otherpkgs.pkglist#
 #INCLUDE:/opt/xcat/share/xcat/IBMhpc/loadl/loadl-5103.otherpkgs.pkglist#
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.sles11.x86_64.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.sles11.x86_64.pkglist
index 1f7c1b602..aa8076169 100644
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.sles11.x86_64.pkglist
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.sles11.x86_64.pkglist
@@ -1,2 +1,2 @@
 #INCLUDE:/opt/xcat/share/xcat/IBMhpc/IBMhpc.sles11.x86_64.pkglist#
-#INCLUDE:/opt/xcat/share/xcat/IBMhpc/pe/pe-1200.sles11.x86_64.pkglist#    
+#INCLUDE:/opt/xcat/share/xcat/IBMhpc/pe/pe-1200.sles11.x86_64.pkglist#
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.sles11.x86_64.postinstall b/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.sles11.x86_64.postinstall
index 3748172fc..7b49819f4 100644
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.sles11.x86_64.postinstall
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/dev-compute.sles11.x86_64.postinstall
@@ -57,7 +57,7 @@ installroot=$installroot pedir=$otherpkgs/pe NODESETSTATE=genimage   $hpc/pe/pe_
 #installroot=$installroot essldir=$otherpkgs/essl NODESETSTATE=genimage   $hpc/essl/essl_install
 
 
-# Run script to accept LoadLeveler license, install product rpms, 
+# Run script to accept LoadLeveler license, install product rpms,
 # and do some config
 installroot=$installroot loadldir=$otherpkgs/loadl NODESETSTATE=genimage   $hpc/loadl/loadl_install-5103
 
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/essl/essl_install b/xCAT-IBMhpc/share/xcat/IBMhpc/essl/essl_install
index 3d9ec7e5a..e7703fb93 100755
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/essl/essl_install
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/essl/essl_install
@@ -1,6 +1,6 @@
-#!/bin/sh 
+#!/bin/sh
 
-# 
+#
 # Sample script to accept licenses and install ESSL and PESSL packages
 # For AIX:
 #    TBD
@@ -22,7 +22,7 @@ fi
 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        
+    #  Copy rpms directly from the xCAT management node and install
         mkdir -p /tmp/essl
         rm -f -R /tmp/essl/*
         cd /tmp/essl
@@ -62,6 +62,6 @@ if [ $OS != "AIX" ]; then
         fi
         rm -rf $installroot/$tmpdir
     fi
-fi  
+fi
 
 
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/essl/essl_install_pessl4100 b/xCAT-IBMhpc/share/xcat/IBMhpc/essl/essl_install_pessl4100
index fd4ad6efd..bef218b96 100644
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/essl/essl_install_pessl4100
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/essl/essl_install_pessl4100
@@ -1,6 +1,6 @@
-#!/bin/sh 
+#!/bin/sh
 
-# 
+#
 # Sample script to accept licenses and install ESSL and PESSL packages
 # For AIX:
 #    TBD
@@ -22,7 +22,7 @@
 #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        
+#    #  Copy rpms directly from the xCAT management node and install
 #        mkdir -p /tmp/essl
 #        rm -f -R /tmp/essl/*
 #        cd /tmp/essl
@@ -64,6 +64,6 @@
 #        #fi
 #        rm -rf $installroot/$tmpdir
 #    fi
-#fi  
+#fi
 #
 #
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/essl/min-essl.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/essl/min-essl.pkglist
index 7a3d8dab6..11f5fa178 100755
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/essl/min-essl.pkglist
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/essl/min-essl.pkglist
@@ -3,7 +3,7 @@
 bc
 #the following are needed by the license accptance, and removed afterward
 xorg-x11-libX11-32bit
-xorg-x11-libXau-32bit 
-xorg-x11-libXext-32bit 
+xorg-x11-libXau-32bit
+xorg-x11-libXext-32bit
 xorg-x11-libXp-32bit
 xorg-x11-libxcb-32bit
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/gpfs/gpfs_start b/xCAT-IBMhpc/share/xcat/IBMhpc/gpfs/gpfs_start
index f643442c0..7933fe55a 100755
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/gpfs/gpfs_start
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/gpfs/gpfs_start
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # Run this script as a postscript on any node to start the GPFS daemon
-# 
+#
 # If you have any special network dependencies, you may want to add code
 # to check them first
 
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/gpfs/gpfs_updates b/xCAT-IBMhpc/share/xcat/IBMhpc/gpfs/gpfs_updates
index 5d8c9fd34..f03eee8a2 100755
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/gpfs/gpfs_updates
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/gpfs/gpfs_updates
@@ -1,19 +1,19 @@
 #!/bin/sh
 
-# 
-# Sample script to install and configure GPFS 
+#
+# Sample script to install and configure GPFS
 # For AIX:
-#    Assumes the GPFS filesets and updates were installed using 
+#    Assumes the GPFS filesets and updates were installed using
 #    xCAT bundle files or some other mechanism. This script does not
 #    install additional software.
 #    It will do the following:
-#      - create /var/mmfs/etc/nsddevices that simply returns 0 
+#      - create /var/mmfs/etc/nsddevices that simply returns 0
 #      - add GPFS paths to profile
 # For Linux:
 #    Assumes the base GPFS rpms were installed with the xCAT 'otherpkgs'
 #    postscript (stateful install) or with the otherpkgs processing of
 #    genimage (stateless/statelite install).  This script will install any
-#    gpfs update rpms that exist on the xCAT management node in the 
+#    gpfs update rpms that exist on the xCAT management node in the
 #    /install/post/otherpkgs/gpfs_updates directory.
 #    This is necessary because the GPFS updates can ONLY be installed
 #    after the base rpms have been installed, and the update rpms cannot
@@ -37,7 +37,7 @@ UPDATES_DIR='post/otherpkgs/gpfs_updates'
 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        
+    #  Copy rpms directly from the xCAT management node and install
         mkdir -p /tmp/gpfs_updates
         rm -f -R /tmp/gpfs_updates/*
         cd /tmp/gpfs_updates
@@ -66,9 +66,9 @@ if [ $OS != "AIX" ]; then
         fi
       fi
     fi
-fi  
+fi
 
-## Create an empty nsddevices script for GPFS 
+## Create an empty nsddevices script for GPFS
 ## This assumes that the node is NOT an NSD server
 #if [ $OS == "AIX" ]; then
 #    # Create the script on the node
@@ -95,7 +95,7 @@ if [ $OS == "AIX" ]; then
     # add to /etc/profile
     if ! grep 'mmfs' $installroot/etc/profile > /dev/null 2>&1; then
         echo 'export PATH=$PATH:/usr/lpp/mmfs/bin' >> $installroot/etc/profile
-    fi 
+    fi
 else  # assume Linux
     gpfsprofile=/etc/profile.d/gpfs
     if [ $NODESETSTATE == "genimage" ]; then
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/loadl/litefile.csv b/xCAT-IBMhpc/share/xcat/IBMhpc/loadl/litefile.csv
index 682b09e52..440df675d 100644
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/loadl/litefile.csv
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/loadl/litefile.csv
@@ -1,4 +1,4 @@
 #image,file,options,comments,disable
 "ALL","/home/",,"for user management, PE,LL use non-root user",
 "ALL","/var/loadl/","persistent","used by LL log, spool and exec",
-"ALL","/etc/LoadL.cfg","tmpfs","used by LL llcompute.sh",
\ No newline at end of file
+"ALL","/etc/LoadL.cfg","tmpfs","used by LL llcompute.sh",
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/loadl/loadl_install b/xCAT-IBMhpc/share/xcat/IBMhpc/loadl/loadl_install
index 8ed952837..18a891f0f 100755
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/loadl/loadl_install
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/loadl/loadl_install
@@ -1,4 +1,4 @@
-#!/bin/sh  
+#!/bin/sh
 
 #
 # Sample script to accept license and install LoadLeveler resmgr package
@@ -13,19 +13,19 @@
 #    Change the owner of these directories (modify "loadl_admin" and
 #           "loadl_group" if not using loadl:loadl)
 #    If run from genimage, copy in /etc/LoadL.cfg from MN into image
-#    
+#
 
 
 OS=`uname`
 INSTALL_DIR='/install'
 LOADL_DIR=$loadldir
 
-#### 
+####
 #  Linux Note:  This script only installs the LoadL_resmgr_full rpm
 #  To also install the LoadL_scheduler rpm, remove the "-c resmgr"
 #  option from the line below
 #  Also, change the bin path below to the correct directory
-#### 
+####
 linux_loadl_license_script="/opt/ibmll/LoadL/sbin/install_ll -c resmgr"
 #linux_loadl_license_script="/opt/ibmll/LoadL/sbin/install_ll"
 linux_loadl_bin=/opt/ibmll/LoadL/resmgr/full/bin
@@ -116,16 +116,16 @@ fi
 
 # Create LoadLeveler Directories:
 # For stateless nodes, these directories need to be created in the image
-# since they will be in memory only, and will be lost on node reboot. 
-# You may choose to modify this approach and use a more 
-# persistent location. 
-# For statelite, make sure the directory is writable;  
-# this will also be a memory-only copy of the files unless you set 
-# the directory "persistent" in the statelite table.  
+# since they will be in memory only, and will be lost on node reboot.
+# You may choose to modify this approach and use a more
+# persistent location.
+# For statelite, make sure the directory is writable;
+# this will also be a memory-only copy of the files unless you set
+# the directory "persistent" in the statelite table.
 if [ $NODESETSTATE != "genimage" ]; then
    # running as a postscript in a full-disk install or AIX diskless install
    installroot=""
-fi  
+fi
 mkdir -p $installroot$logdir/execute
 mkdir -p $installroot$logdir/spool
 mkdir -p $installroot$logdir/log
@@ -146,7 +146,7 @@ chown -R $loadl_admin:$loadl_group $installroot$logdir/
 #fi
 
 
-# UNCOMMENT to  Start loadleveler during postscripts 
+# UNCOMMENT to  Start loadleveler during postscripts
 #if [ $NODESETSTATE != "genimage" ]; then
 #   /usr/lpp/LoadL/resmgr/full/bin/llrctl start
 #fi
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/loadl/loadl_install-5103 b/xCAT-IBMhpc/share/xcat/IBMhpc/loadl/loadl_install-5103
index 187dd87cf..4d089404b 100755
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/loadl/loadl_install-5103
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/loadl/loadl_install-5103
@@ -1,4 +1,4 @@
-#!/bin/sh  
+#!/bin/sh
 
 #
 # Sample script to accept license and install LoadLeveler resmgr package
@@ -13,7 +13,7 @@
 #    Change the owner of these directories (modify "loadl_admin" and
 #           "loadl_group" if not using loadl:loadl)
 #    If run from genimage, copy in /etc/LoadL.cfg from MN into image
-#    
+#
 
 OS=`uname`
 
@@ -81,16 +81,16 @@ fi
 
 # Create LoadLeveler Directories:
 # For stateless nodes, these directories need to be created in the image
-# since they will be in memory only, and will be lost on node reboot. 
-# You may choose to modify this approach and use a more 
-# persistent location. 
-# For statelite, make sure the directory is writable;  
-# this will also be a memory-only copy of the files unless you set 
-# the directory "persistent" in the statelite table.  
+# since they will be in memory only, and will be lost on node reboot.
+# You may choose to modify this approach and use a more
+# persistent location.
+# For statelite, make sure the directory is writable;
+# this will also be a memory-only copy of the files unless you set
+# the directory "persistent" in the statelite table.
 if [ $NODESETSTATE != "genimage" ]; then
    # running as a postscript in a full-disk install or AIX diskless install
    installroot=""
-fi  
+fi
 mkdir -p $installroot$logdir/execute
 mkdir -p $installroot$logdir/spool
 mkdir -p $installroot$logdir/log
@@ -111,7 +111,7 @@ chown -R $loadl_admin:$loadl_group $installroot$logdir/
 #fi
 
 
-# UNCOMMENT to  Start loadleveler during postscripts 
+# UNCOMMENT to  Start loadleveler during postscripts
 #if [ $NODESETSTATE != "genimage" ]; then
 #   /usr/lpp/LoadL/resmgr/full/bin/llrctl start
 #fi
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/login.rhel6.ppc64.otherpkgs.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/login.rhel6.ppc64.otherpkgs.pkglist
index 7660fe1ed..fb2c9edc2 100644
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/login.rhel6.ppc64.otherpkgs.pkglist
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/login.rhel6.ppc64.otherpkgs.pkglist
@@ -5,4 +5,4 @@
 #INCLUDE:/opt/xcat/share/xcat/IBMhpc/loadl/login-loadl.otherpkgs.pkglist#
 
 xcat/xcat-core/perl-xCAT
-xcat/xcat-core/xCAT-client
\ No newline at end of file
+xcat/xcat-core/xCAT-client
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/login.sles11.ppc64.otherpkgs.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/login.sles11.ppc64.otherpkgs.pkglist
index 77bacf166..3f3bfbce7 100644
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/login.sles11.ppc64.otherpkgs.pkglist
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/login.sles11.ppc64.otherpkgs.pkglist
@@ -1,5 +1,5 @@
-# Sample otherpkgs pkglist for installing all IBM HPC products in a 
-# SLES11 PPC64 login node 
+# Sample otherpkgs pkglist for installing all IBM HPC products in a
+# SLES11 PPC64 login node
 
 #INCLUDE:/opt/xcat/share/xcat/IBMhpc/compilers/compilers.otherpkgs.pkglist#
 #NEW_INSTALL_LIST#
@@ -9,4 +9,4 @@
 #INCLUDE:/opt/xcat/share/xcat/IBMhpc/loadl/login-loadl.otherpkgs.pkglist#
 
 xcat/xcat-core/perl-xCAT
-xcat/xcat-core/xCAT-client
\ No newline at end of file
+xcat/xcat-core/xCAT-client
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/min-IBMhpc.rhels6.cleanup b/xCAT-IBMhpc/share/xcat/IBMhpc/min-IBMhpc.rhels6.cleanup
index 951306755..aa369f6b3 100755
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/min-IBMhpc.rhels6.cleanup
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/min-IBMhpc.rhels6.cleanup
@@ -20,13 +20,13 @@ profile=$4
 workdir=$5
 
 #uninstall the ibm-java2 and rpms pulled in by it
-rpm -e  --root $installroot ibm-java2-ppc64-jre.ppc64 libXp.ppc libXp.ppc64  
+rpm -e  --root $installroot ibm-java2-ppc64-jre.ppc64 libXp.ppc libXp.ppc64
 
 #uninstall the rpms pulled in by LoadL_resmgr
-rpm -e --nodeps --root $installroot libX11.ppc libX11.ppc64  libX11-common libXext.ppc libXext.ppc64 libXScrnSaver.ppc64 libXau.ppc libXau.ppc64 libICE.ppc64 libSM.ppc64 libXmu.ppc64 libXt.ppc64 libXtst.ppc64 libXi.ppc64 libxcb.ppc libxcb.ppc64 libstdc++.ppc libstdc++.ppc64 
+rpm -e --nodeps --root $installroot libX11.ppc libX11.ppc64  libX11-common libXext.ppc libXext.ppc64 libXScrnSaver.ppc64 libXau.ppc libXau.ppc64 libICE.ppc64 libSM.ppc64 libXmu.ppc64 libXt.ppc64 libXtst.ppc64 libXi.ppc64 libxcb.ppc libxcb.ppc64 libstdc++.ppc libstdc++.ppc64
 
 #uninstall the rpms pulled in by vacpp.rte
-rpm -e --nodeps --root $installroot gcc.ppc64 gcc-c++.ppc64  cpp.ppc64 glibc-devel.ppc glibc-devel.ppc64 glibc-headers.ppc64  libstdc++-devel.ppc libstdc++-devel.ppc64   
+rpm -e --nodeps --root $installroot gcc.ppc64 gcc-c++.ppc64  cpp.ppc64 glibc-devel.ppc glibc-devel.ppc64 glibc-headers.ppc64  libstdc++-devel.ppc libstdc++-devel.ppc64
 
 #uninstall rpms that should not be on a compute node
 #rpm -e --root $installroot libjpeg libtiff fontconfig freetype
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/min-IBMhpc.sles11.cleanup b/xCAT-IBMhpc/share/xcat/IBMhpc/min-IBMhpc.sles11.cleanup
index 90202746a..5fde1123a 100755
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/min-IBMhpc.sles11.cleanup
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/min-IBMhpc.sles11.cleanup
@@ -20,7 +20,7 @@ profile=$4
 workdir=$5
 
 #uninstall the ibm-java2 and rpms pulled in by it
-rpm -e  --root $installroot ibm-java2-ppc64-jre xorg-x11-libX11-32bit xorg-x11-libXau-32bit xorg-x11-libXext-32bit xorg-x11-libXp-32bit xorg-x11-libxcb-32bit 
+rpm -e  --root $installroot ibm-java2-ppc64-jre xorg-x11-libX11-32bit xorg-x11-libXau-32bit xorg-x11-libXext-32bit xorg-x11-libXp-32bit xorg-x11-libxcb-32bit
 
 #uninstall the rpms pulled in by LoadL_resmgr
 rpm -e --nodeps --root $installroot xorg-x11-libICE xorg-x11-libSM xorg-x11-libX11 xorg-x11-libXau  xorg-x11-libXext xorg-x11-libXfixes  xorg-x11-libXmu xorg-x11-libXp  xorg-x11-libXpm xorg-x11-libXprintUtil  xorg-x11-libXrender xorg-x11-libXt  xorg-x11-libXv xorg-x11-libfontenc  xorg-x11-libs xorg-x11-libxcb xorg-x11-libxkbfile
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.rhels6.ppc64.otherpkgs.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.rhels6.ppc64.otherpkgs.pkglist
index 1228dfda8..c1eb042d9 100755
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.rhels6.ppc64.otherpkgs.pkglist
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.rhels6.ppc64.otherpkgs.pkglist
@@ -1,17 +1,17 @@
-# Sample otherpkgs pkglist for installing all IBM HPC products in a 
-# RHEL6 PPC64  minimal  diskless image 
+# Sample otherpkgs pkglist for installing all IBM HPC products in a
+# RHEL6 PPC64  minimal  diskless image
 
 #INCLUDE:/opt/xcat/share/xcat/IBMhpc/compilers/min-compilers.otherpkgs.pkglist#
 
-# NEW_INSTALL_LIST 
+# NEW_INSTALL_LIST
 
 #INCLUDE:/opt/xcat/share/xcat/IBMhpc/gpfs/min-gpfs.otherpkgs.pkglist#
 #INCLUDE:/opt/xcat/share/xcat/IBMhpc/pe/pe.otherpkgs.pkglist#
 #INCLUDE:/opt/xcat/share/xcat/IBMhpc/essl/essl.otherpkgs.pkglist#
 #INCLUDE:/opt/xcat/share/xcat/IBMhpc/loadl/loadl.otherpkgs.pkglist#
 
-# For full-disk (stateful) images EDIT below to use rsct.otherpkgs 
+# For full-disk (stateful) images EDIT below to use rsct.otherpkgs
 # For diskless
-# rpms are installed with postinstall script 
+# rpms are installed with postinstall script
 
 #do not INCLUDE:/opt/xcat/share/xcat/IBMhpc/rsct/rsct.otherpkgs.pkglist#
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.rhels6.ppc64.postinstall b/xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.rhels6.ppc64.postinstall
index 52e163271..9cb204a3c 100755
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.rhels6.ppc64.postinstall
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.rhels6.ppc64.postinstall
@@ -58,7 +58,7 @@ installroot=$installroot pedir=$otherpkgs/pe NODESETSTATE=genimage   $hpc/pe/pe_
 #installroot=$installroot essldir=$otherpkgs/essl NODESETSTATE=genimage   $hpc/essl/essl_install
 
 
-# Run script to accept LoadLeveler license, install product rpms, 
+# Run script to accept LoadLeveler license, install product rpms,
 # and do some config
 installroot=$installroot loadldir=$otherpkgs/loadl NODESETSTATE=genimage   $hpc/loadl/loadl_install
 
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.sles11.ppc64.otherpkgs.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.sles11.ppc64.otherpkgs.pkglist
index 65e0973fc..59c738ba1 100644
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.sles11.ppc64.otherpkgs.pkglist
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.sles11.ppc64.otherpkgs.pkglist
@@ -1,4 +1,4 @@
-# Sample otherpkgs pkglist for installing all IBM HPC products in a 
+# Sample otherpkgs pkglist for installing all IBM HPC products in a
 # SLES11 PPC64  minimal  diskless image
 
 #INCLUDE:/opt/xcat/share/xcat/IBMhpc/compilers/min-compilers.otherpkgs.pkglist#
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.sles11.ppc64.postinstall b/xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.sles11.ppc64.postinstall
index 2849f9c25..4163714a4 100755
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.sles11.ppc64.postinstall
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/min-compute.sles11.ppc64.postinstall
@@ -58,7 +58,7 @@ installroot=$installroot pedir=$otherpkgs/pe NODESETSTATE=genimage   $hpc/pe/pe_
 #installroot=$installroot essldir=$otherpkgs/essl NODESETSTATE=genimage   $hpc/essl/essl_install
 
 
-# Run script to accept LoadLeveler license, install product rpms, 
+# Run script to accept LoadLeveler license, install product rpms,
 # and do some config
 installroot=$installroot loadldir=$otherpkgs/loadl NODESETSTATE=genimage   $hpc/loadl/loadl_install
 
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/ml-tuning b/xCAT-IBMhpc/share/xcat/IBMhpc/ml-tuning
index 18972b539..72ae47c1f 100644
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/ml-tuning
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/ml-tuning
@@ -6,12 +6,12 @@
 
 chdev -l mlt0 -a agg_killtime=-1  2>/dev/null    # allow "agg_interval" and "agg_threshold" to default
 
-# The effect of the above is that complete ml route entries last forever, incomplete entries time out 
+# The effect of the above is that complete ml route entries last forever, incomplete entries time out
 # in 40 seconds, and there are no keepalive probes for complete entries (to reduce OS jitter).
 
-# The following is also recommended to improve balance across hf interfaces (assuming sequential ml 
-# addressing, at least within each drawer). Note that "agg_hash"  must be set PRIOR to the ml interface 
-# being configured. 
+# The following is also recommended to improve balance across hf interfaces (assuming sequential ml
+# addressing, at least within each drawer). Note that "agg_hash"  must be set PRIOR to the ml interface
+# being configured.
 
 chdev -l mlt0 -a agg_hash=2  2>/dev/null
 
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/ckpt.sh b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/ckpt.sh
index 486aa1c3c..f3024fc39 100755
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/ckpt.sh
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/ckpt.sh
@@ -31,5 +31,5 @@ done
 if [ -f /root/.ckpt.key ]; then
     cat /root/.ckpt.key > /sys/kernel/checkpoint/checksum_key
 else
-    echo 'ERROR:  no checkpoint key found' 
+    echo 'ERROR:  no checkpoint key found'
 fi
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe-1200.rhels6.x86_64.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe-1200.rhels6.x86_64.pkglist
index 552404465..adc7a8a01 100644
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe-1200.rhels6.x86_64.pkglist
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe-1200.rhels6.x86_64.pkglist
@@ -3,7 +3,7 @@
 #  Temporary for xCAT 2.6:
 #    You should comment out these packages when running with HFI,
 #    but you will also then need to use the xCAT 2.6 pe_install script
-#    that does a force install of pe.  The current pe packages prereq 
+#    that does a force install of pe.  The current pe packages prereq
 #    these libibverbs packages.
 libibverbs.i686
 libibverbs.x86_64
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe-1200.sles11.x86_64.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe-1200.sles11.x86_64.pkglist
index c0de25076..a9e2256a8 100644
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe-1200.sles11.x86_64.pkglist
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe-1200.sles11.x86_64.pkglist
@@ -3,7 +3,7 @@
 #  Temporary for xCAT 2.6:
 #    You should comment out these packages when running with HFI,
 #    but you will also then need to use the xCAT 2.6 pe_install script
-#    that does a force install of pe.  The current pe packages prereq 
+#    that does a force install of pe.  The current pe packages prereq
 #    these libibverbs packages.
 libibverbs
 libibverbs-32bit
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe-1200.x86_64.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe-1200.x86_64.pkglist
index 552404465..adc7a8a01 100644
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe-1200.x86_64.pkglist
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe-1200.x86_64.pkglist
@@ -3,7 +3,7 @@
 #  Temporary for xCAT 2.6:
 #    You should comment out these packages when running with HFI,
 #    but you will also then need to use the xCAT 2.6 pe_install script
-#    that does a force install of pe.  The current pe packages prereq 
+#    that does a force install of pe.  The current pe packages prereq
 #    these libibverbs packages.
 libibverbs.i686
 libibverbs.x86_64
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install
index 77dd71dc8..f35460876 100644
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install
@@ -1,4 +1,4 @@
-#!/bin/sh 
+#!/bin/sh
 #
 #
 # Sample script to customize options for PE
@@ -15,7 +15,7 @@
 #          (java accept program will hang)
 #        - Copy PE license files from MN into image
 #        - Install PE rpms
-#    - Create a smaller PNSD log file in /tmp 
+#    - Create a smaller PNSD log file in /tmp
 #    - Configure poe.limits file
 
 OS=`uname`
@@ -48,7 +48,7 @@ if [ $OS != "AIX" ]; 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 
+        rpm -Uvh --force ibm_lapi*.rpm ibm_pe*.rpm ppe_*.rpm
         cd /
         rm -Rf /tmp/pe
     fi
@@ -69,7 +69,7 @@ if [ $OS != "AIX" ]; then
             mkdir -p $installroot/etc/opt/ibmhpc/license
             cp -pR /etc/opt/ibmhpc/license/* $installroot/etc/opt/ibmhpc/license
             # Install PE product rpms
-            INUCLIENTS=1 INUBOSTYPE=1 zypper -R $installroot install $PE_DIR/ibm_lapi*.rpm $PE_DIR/ibm_pe*.rpm $PE_DIR/ppe_*.rpm 
+            INUCLIENTS=1 INUBOSTYPE=1 zypper -R $installroot install $PE_DIR/ibm_lapi*.rpm $PE_DIR/ibm_pe*.rpm $PE_DIR/ppe_*.rpm
         else
         # For Redhat, etc., assume yum is available on the system running genimage
             if [ ! -d /etc/opt/ibmhpc/license ] ; then
@@ -85,7 +85,7 @@ if [ $OS != "AIX" ]; then
             cp -pR /etc/opt/ibmhpc/license/* $installroot/etc/opt/ibmhpc/license
  	    #chroot $installroot /opt/ibmhpc/install/sbin/accept_ppe_license.sh
             # Install PE product rpms
-            INUCLIENTS=1 INUBOSTYPE=1 yum --installroot $installroot --nogpgcheck install $PE_DIR/ibm_lapi*.rpm $PE_DIR/ibm_pe*.rpm $PE_DIR/ppe_*.rpm 
+            INUCLIENTS=1 INUBOSTYPE=1 yum --installroot $installroot --nogpgcheck install $PE_DIR/ibm_lapi*.rpm $PE_DIR/ibm_pe*.rpm $PE_DIR/ppe_*.rpm
         fi
     fi
 fi
@@ -93,7 +93,7 @@ fi
 
 
 # Configure the PNSD.cfg to use a smaller log so it doesn't use so much memory
-# for a stateless image.  Normally, pnsd creates this file if it does not 
+# for a stateless image.  Normally, pnsd creates this file if it does not
 # exist, but it will not fill it in if it does exist.
 if [ ! -f $installroot/etc/PNSD.cfg ]; then
     echo "log_file = /tmp/serverlog" > $installroot/etc/PNSD.cfg
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install-1100 b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install-1100
index dc971b285..f1d0a794e 100755
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install-1100
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install-1100
@@ -1,11 +1,11 @@
-#!/bin/sh 
+#!/bin/sh
 #
 #
 # Sample script to customize options for PE
 # For AIX:
 #    TBD
 # For Linux:
-#    - Create a smaller PNSD log file in /tmp 
+#    - Create a smaller PNSD log file in /tmp
 #    - Configure poe.limits file
 
 OS=`uname`
@@ -24,7 +24,7 @@ if [ $NODESETSTATE != "genimage" ]; then
 fi
 
 # Configure the PNSD.cfg to use a smaller log so it doesn't use so much memory
-# for a stateless image.  Normally, pnsd creates this file if it does not 
+# for a stateless image.  Normally, pnsd creates this file if it does not
 # exist, but it will not fill it in if it does exist.
 if [ ! -f $installroot/etc/PNSD.cfg ]; then
     echo "log_file = /tmp/serverlog" > $installroot/etc/PNSD.cfg
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install-1200 b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install-1200
index e4b303760..6706c7bb0 100644
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install-1200
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install-1200
@@ -1,38 +1,38 @@
-#!/bin/sh 
+#!/bin/sh
 #
 #
 # Sample script to customize options for PE
 # For AIX:
 #    TBD
 # For Linux:
-#    - Create a smaller PNSD log file in /tmp 
+#    - Create a smaller PNSD log file in /tmp
 #    - Configure poe.limits file
 #    - Generate and store checkpoint key
 #    - BSR support configuration
 
 OS=`uname`
 
-# On AIX, need to correctly configure LAPI kernel extensions on a 
+# On AIX, need to correctly configure LAPI kernel extensions on a
 # diskless node boot
 # (added for PE 1.2 and newer releases)
 if [ "$OS" == "AIX" ]; then
   if [ "$NODESETSTATE" = "netboot" -o \
        "$NODESETSTATE" = "statelite" -o \
        "$NODESETSTATE" = "diskless" -o \
-       "$NODESETSTATE" = "dataless" ]; then 
+       "$NODESETSTATE" = "dataless" ]; then
        # Unconfigure any existing LAPI kernel extension
        if [ -x /etc/methods/ucfgzcmem ] ; then
-           /etc/methods/ucfgzcmem 
+           /etc/methods/ucfgzcmem
        fi
        # Configure the LAPI kernel extension at the latest level
        if [ -x /etc/methods/cfgzcmem ] ; then
-           /etc/methods/cfgzcmem 
+           /etc/methods/cfgzcmem
        fi
   fi
 fi
 
 # Configure the PNSD.cfg to use a smaller log so it doesn't use so much memory
-# for a stateless image.  Normally, pnsd creates this file if it does not 
+# for a stateless image.  Normally, pnsd creates this file if it does not
 # exist, but it will not fill it in if it does exist.
 if [ ! -f $installroot/etc/PNSD.cfg ]; then
     echo "log_file = /tmp/serverlog" > $installroot/etc/PNSD.cfg
@@ -116,7 +116,7 @@ if [ "$OS" == "AIX" ]; then
     /usr/sbin/trustchk -ry ALL >/dev/null 2>&1
 fi
 
-# BSR configuration, uncomment the following lines to enable BSR configuration on Power Linux cluter.  
+# BSR configuration, uncomment the following lines to enable BSR configuration on Power Linux cluter.
 #if [ "$OS" != "AIX" ]; then
 #    if [ $NODESETSTATE == "install" ] || [ $NODESETSTATE == "boot" ]; then
 #        groupadd bsr
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/ping-all/README.AIX b/xCAT-IBMhpc/share/xcat/IBMhpc/ping-all/README.AIX
index 37618d66c..5aaf5abc1 100644
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/ping-all/README.AIX
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/ping-all/README.AIX
@@ -2,7 +2,7 @@ Run as root on the EMS.
 
 This test uses xdsh and uses "lpar" for the node group. Use a different node group if desired.
 
-Note xdsh can leave behind processes if you do a <CNTRL-C> in the middle of a command.  
+Note xdsh can leave behind processes if you do a <CNTRL-C> in the middle of a command.
 To gaurd against results which are messed up by old copies of the ping test, kill
 any leftover ping processes.
 
@@ -10,7 +10,7 @@ any leftover ping processes.
 1)  Create the ping_address_file. This is only required if changes have been made since the last
     run; e.g., octants deconfigured, ARP entries changed, etc.
 
-    "./create_ping_address_file [interface]"    
+    "./create_ping_address_file [interface]"
 
     If the "interface" argument is not provided, it defaults to "ml0" as the interface to test.
 
@@ -23,7 +23,7 @@ any leftover ping processes.
 3)  Copy "ping_all" to /tmp on each node:
 
     xdcp lpar -v ping_all /tmp
-     
+
 4)  Remove any output files from previous runs:
 
     xdsh lpar -v "rm /tmp/ping.all.out 2>/dev/null"
@@ -39,6 +39,6 @@ any leftover ping processes.
 
     xdsh lpar -v "ls -l /tmp/ping.all.out 2>/dev/null" | sort -n +5
 
-    If a given set of "ping.all.out" files are the same length, it's likely they will have 
+    If a given set of "ping.all.out" files are the same length, it's likely they will have
     duplicate ping failures.
 
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/ping-all/create_ping_address_file b/xCAT-IBMhpc/share/xcat/IBMhpc/ping-all/create_ping_address_file
index b447dce2d..535df34c0 100755
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/ping-all/create_ping_address_file
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/ping-all/create_ping_address_file
@@ -1,10 +1,10 @@
 #!/bin/ksh
 if [[ -n $1 ]] then
     interface=$1
-else 
+else
     interface=ml0
 fi
 
-xdsh lpar -v "/usr/sbin/ifconfig $interface | grep inet | cut -d':' -f2   | cut -d' ' -f2 | head -2 " | sort -n | tee ping_address_file  
+xdsh lpar -v "/usr/sbin/ifconfig $interface | grep inet | cut -d':' -f2   | cut -d' ' -f2 | head -2 " | sort -n | tee ping_address_file
 
 
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/ping-all/ping_all b/xCAT-IBMhpc/share/xcat/IBMhpc/ping-all/ping_all
index c9e6992ac..ce352e4b1 100755
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/ping-all/ping_all
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/ping-all/ping_all
@@ -1,7 +1,7 @@
 #!/bin/ksh
 
 function do_pings {
-    #set -x 
+    #set -x
 
     integer dest_array_index=0
     integer total_ping_count=0
@@ -62,7 +62,7 @@ else
    file=$1
 fi
 
-#ifconfig -a  | grep 'inet ' | awk ' { print $2 } ' | grep -v 127.0.0.1 | 
+#ifconfig -a  | grep 'inet ' | awk ' { print $2 } ' | grep -v 127.0.0.1 |
 ip -4 -oneline addr show 2>/dev/null |grep inet | sed -ne "s/.*inet //p"|awk -F ' ' '{print $1}'|awk -F '/' '{print $1}'|
 while read my_address ; do
     ##print "checking $my_address"
@@ -73,7 +73,7 @@ while read my_address ; do
         integer starting_line_minus_1=$starting_line-1
         tail +${starting_line} $file         >  /tmp/current_ping_address_file
         head -${starting_line_minus_1} $file >> /tmp/current_ping_address_file
-        file=/tmp/current_ping_address_file 
+        file=/tmp/current_ping_address_file
         do_pings
         found_flag=1
         break
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/rsct/min-rsct.exlist b/xCAT-IBMhpc/share/xcat/IBMhpc/rsct/min-rsct.exlist
index 93a167f0a..d04542ec7 100755
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/rsct/min-rsct.exlist
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/rsct/min-rsct.exlist
@@ -10,7 +10,7 @@
 ./usr/sbin/rsct/include*
 ./usr/sbin/rsct/man/*
 ./usr/sbin/rsct/bin/trap2rmcd
-./usr/sbin/rsct/bin/ctadmingroup 
+./usr/sbin/rsct/bin/ctadmingroup
 ./usr/sbin/rsct/bin/mkcdef
 
 #fc funcitons
@@ -32,7 +32,7 @@
 ./usr/sbin/rsct/bin/fcstrip.sed
 ./usr/sbin/rsct/bin/fcsysparse
 ./usr/sbin/rsct/bin/fcteststk
-./usr/sbin/rsct/bin/fcinit.sh 
+./usr/sbin/rsct/bin/fcinit.sh
 #java interface
 ./usr/sbin/rsct/lib/java.exp
 ./usr/sbin/rsct/lib/librmcjni.so
@@ -43,32 +43,32 @@
 
 #remove assuming ctbackup/ctrestore not being used
 ./usr/sbin/rsct/bin/ctrestore
-./usr/sbin/rsct/bin/ctbrdefs  
-./usr/sbin/rsct/bin/ctbackup  
+./usr/sbin/rsct/bin/ctbrdefs
+./usr/sbin/rsct/bin/ctbackup
 
 #remove assuming trace spooling is not used
-./usr/sbin/rsct/bin/chkspool  
-./usr/sbin/rsct/bin/showtr 
+./usr/sbin/rsct/bin/chkspool
+./usr/sbin/rsct/bin/showtr
 ./usr/sbin/rsct/bin/lstrsp
 
 #remove; CtSec verification utility
-./usr/sbin/rsct/bin/ctsvhbar 
+./usr/sbin/rsct/bin/ctsvhbar
 ./usr/sbin/rsct/bin/ctsvhbal
-./usr/sbin/rsct/bin/ctsvhbac  
-./usr/sbin/rsct/bin/ctaclfck  
-./usr/sbin/rsct/bin/ctsidmck  
+./usr/sbin/rsct/bin/ctsvhbac
+./usr/sbin/rsct/bin/ctaclfck
+./usr/sbin/rsct/bin/ctsidmck
 
 #remove; System Registry diagnostic tool
-./usr/sbin/rsct/bin/sr_lstfs    
-./usr/sbin/rsct/bin/sr_lsfds       
-./usr/sbin/rsct/bin/sr_filter_trace   
-./usr/sbin/rsct/bin/sr_dump_table_raw 
-./usr/sbin/rsct/bin/sr_dump_table   
-./usr/sbin/rsct/bin/sr_diag        
-./usr/sbin/rsct/bin/ct_sr_trace_scan 
-./usr/sbin/rsct/bin/ct_sr_file_scan 
+./usr/sbin/rsct/bin/sr_lstfs
+./usr/sbin/rsct/bin/sr_lsfds
+./usr/sbin/rsct/bin/sr_filter_trace
+./usr/sbin/rsct/bin/sr_dump_table_raw
+./usr/sbin/rsct/bin/sr_dump_table
+./usr/sbin/rsct/bin/sr_diag
+./usr/sbin/rsct/bin/ct_sr_trace_scan
+./usr/sbin/rsct/bin/ct_sr_file_scan
 
-#System Registry -api commnd; probably not needed  
+#System Registry -api commnd; probably not needed
 ./usr/sbin/rsct/bin/rmsrtbl-api
 ./usr/sbin/rsct/bin/rmsrrow-api
 ./usr/sbin/rsct/bin/mksrtbl-api
@@ -76,10 +76,10 @@
 ./usr/sbin/rsct/bin/mksrcol-api
 ./usr/sbin/rsct/bin/lssrtbldef-api
 ./usr/sbin/rsct/bin/lssrtbl-api
-./usr/sbin/rsct/bin/lssr-api 
-./usr/sbin/rsct/bin/chsrfld-api 
+./usr/sbin/rsct/bin/lssr-api
+./usr/sbin/rsct/bin/chsrfld-api
 
-#remove if not monitoring IBM.NetworkInterface resources 
+#remove if not monitoring IBM.NetworkInterface resources
 ./usr/sbin/rsct/bin/IBM.ConfigRMd
 
 #remove if not using LPRM
@@ -104,9 +104,9 @@
 
 #remove if not using Condition/Response
 ./usr/sbin/rsct/bin/IBM.ERrmd
-./usr/sbin/rsct/bin/stopcondresp 
-./usr/sbin/rsct/bin/startcondresp 
-./usr/sbin/rsct/bin/rmresponse 
+./usr/sbin/rsct/bin/stopcondresp
+./usr/sbin/rsct/bin/startcondresp
+./usr/sbin/rsct/bin/rmresponse
 ./usr/sbin/rsct/bin/rmcondresp
 ./usr/sbin/rsct/bin/rmcondition
 ./usr/sbin/rsct/bin/mkresponse
@@ -120,7 +120,7 @@
 ./usr/sbin/rsct/bin/chcondition
 ./usr/sbin/rsct/bin/wallevent
 ./usr/sbin/rsct/bin/notifyevent
-./usr/sbin/rsct/bin/msgevent 
+./usr/sbin/rsct/bin/msgevent
 ./usr/sbin/rsct/bin/logevent
 ./usr/sbin/rsct/bin/ewallevent
 ./usr/sbin/rsct/bin/enotifyevent
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/rsct/rsct.exlist b/xCAT-IBMhpc/share/xcat/IBMhpc/rsct/rsct.exlist
index 95476f8fb..c2febef2b 100755
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/rsct/rsct.exlist
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/rsct/rsct.exlist
@@ -4,7 +4,7 @@
 ./usr/sbin/rsct/include*
 ./usr/sbin/rsct/man/*
 ./usr/sbin/rsct/bin/trap2rmcd
-./usr/sbin/rsct/bin/ctadmingroup 
+./usr/sbin/rsct/bin/ctadmingroup
 ./usr/sbin/rsct/bin/mkcdef
 
 #java interface
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/rsct/rsct_install b/xCAT-IBMhpc/share/xcat/IBMhpc/rsct/rsct_install
index 3db9042ff..2481c8704 100755
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/rsct/rsct_install
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/rsct/rsct_install
@@ -1,6 +1,6 @@
-#!/bin/sh 
+#!/bin/sh
 
-# 
+#
 # Sample script to accept licenses and install RSCT packages
 # For AIX:
 #    do nothing - RSCT gets installed with base AIX
@@ -25,7 +25,7 @@ if [ $OS != "AIX" ]; then
     #  Do nothing - use rsct.otherpkgs.pkglist to install the
     #  rsct rpms
     #fi
- 
+
 
     if [ $NODESETSTATE == "genimage" ]; then
     # Being called from <image>.postinstall script
@@ -33,20 +33,20 @@ if [ $OS != "AIX" ]; then
         if [[ $OS = sles* ]] || [[ $OS = suse* ]] || [[ -f /etc/SuSE-release ]]; then
         # For SLES, assume zypper is available on the system running genimage
             # rsct don't need license. So not install and accept the rsct license on the MN
-            
+
             # Install RSCT product rpms
-            INUCLIENTS=1 INUBOSTYPE=1 zypper -n -R $installroot install $RSCT_DIR/src-*.rpm $RSCT_DIR/rsct.core-*.rpm $RSCT_DIR/rsct.core.utils-*.rpm 
+            INUCLIENTS=1 INUBOSTYPE=1 zypper -n -R $installroot install $RSCT_DIR/src-*.rpm $RSCT_DIR/rsct.core-*.rpm $RSCT_DIR/rsct.core.utils-*.rpm
         else
         # For Redhat, etc., assume yum is available on the system running genimage
             # rsct don't need license. So not install and accept the rsct license on the MN
             # Install RSCT product rpms
-            INUCLIENTS=1 INUBOSTYPE=1 yum -y --installroot $installroot --nogpgcheck install $RSCT_DIR/src-*.rpm $RSCT_DIR/rsct.core-*.rpm $RSCT_DIR/rsct.core.utils-*.rpm 
+            INUCLIENTS=1 INUBOSTYPE=1 yum -y --installroot $installroot --nogpgcheck install $RSCT_DIR/src-*.rpm $RSCT_DIR/rsct.core-*.rpm $RSCT_DIR/rsct.core.utils-*.rpm
         fi
     fi
 
 
 
-fi  
+fi
 
 exit 0
 
diff --git a/xCAT-OpenStack-baremetal/debian/copyright b/xCAT-OpenStack-baremetal/debian/copyright
index f61d34dfe..87e60f492 100644
--- a/xCAT-OpenStack-baremetal/debian/copyright
+++ b/xCAT-OpenStack-baremetal/debian/copyright
@@ -85,4 +85,4 @@ Everyone is permitted to copy and distribute copies of this Agreement, but in or
 
 This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
 
- 
+
diff --git a/xCAT-OpenStack-baremetal/lib/perl/xCAT_plugin/openstack.pm b/xCAT-OpenStack-baremetal/lib/perl/xCAT_plugin/openstack.pm
index f232d7bb4..0127adf28 100644
--- a/xCAT-OpenStack-baremetal/lib/perl/xCAT_plugin/openstack.pm
+++ b/xCAT-OpenStack-baremetal/lib/perl/xCAT_plugin/openstack.pm
@@ -488,9 +488,9 @@ sub opsaddimage {
 #-------------------------------------------------------------------------------
 
 =head3  deploy_ops_bm_node
-	This is a internel command called by OpenStack xCAT-baremetal driver. 
-	It prepares the node by adding the config_ops_bm_node postbootscript 
-	to the postscript table for the node, then call nodeset and then boot 
+	This is a internel command called by OpenStack xCAT-baremetal driver.
+	It prepares the node by adding the config_ops_bm_node postbootscript
+	to the postscript table for the node, then call nodeset and then boot
 	the node up.
 =cut
 
@@ -706,7 +706,7 @@ sub deploy_hmc_node {
 =head3  cleanup_ops_bm_node
 	This is a internel command called by OpenStack xCAT-baremetal driver.
 	It undoes all the changes made by deploy_ops_bm_node command. It removes
-	the config_ops_bmn_ode postbootscript from the postscript table for the 
+	the config_ops_bmn_ode postbootscript from the postscript table for the
 	node, removes the alias ip and then power off the node.
 =cut
 
@@ -811,7 +811,7 @@ sub cleanup_ops_bm_node {
 
 =head3  add_postscript
 
-	It adds the 'config_ops_bm_node' postbootscript to the 
+	It adds the 'config_ops_bm_node' postbootscript to the
 	postscript table for the given node.
 
 =cut
@@ -884,7 +884,7 @@ sub add_postscript {
 
 =head3  remove_postscript
 
-	It removes the 'config_ops_bm_node' postbootscript from 
+	It removes the 'config_ops_bm_node' postbootscript from
 	the postscript table for the given node.
 
 =cut
diff --git a/xCAT-OpenStack-baremetal/lib/python/xcat/openstack/baremetal/driver.py b/xCAT-OpenStack-baremetal/lib/python/xcat/openstack/baremetal/driver.py
index e42348be2..78bd31529 100644
--- a/xCAT-OpenStack-baremetal/lib/python/xcat/openstack/baremetal/driver.py
+++ b/xCAT-OpenStack-baremetal/lib/python/xcat/openstack/baremetal/driver.py
@@ -89,7 +89,7 @@ class xCATBareMetalDriver(bm_driver.BareMetalDriver):
             nodename = self.xcat.get_xcat_node_name(macs)
             imagename = self._get_xCAT_image_name(image_meta)
             hostname = instance.get('hostname')
-            
+
             #get the network information for the new node
             interfaces = bm_utils.map_network_interfaces(network_info, CONF.use_ipv6)
             if CONF.use_ipv6:
@@ -108,7 +108,7 @@ class xCATBareMetalDriver(bm_driver.BareMetalDriver):
             bm_driver._update_state(context, node, instance, baremetal_states.DEPLOYING)
             self.xcat.deploy_node(nodename, imagename, hostname, fixed_ip, netmask, gateway)
             bm_driver._update_state(context, node, instance, baremetal_states.ACTIVE)
-        except Exception as e: 
+        except Exception as e:
             with excutils.save_and_reraise_exception():
                 LOG.error(_("Error occured while deploying instance %(instance)s "
                             "on baremetal node %(node)s: %(error)s") %
@@ -135,13 +135,13 @@ class xCATBareMetalDriver(bm_driver.BareMetalDriver):
         :param bad_volumes_callback: Function to handle any bad volumes
             encountered
         """
-        try: 
+        try:
             node = bm_driver._get_baremetal_node_by_instance_uuid(instance['uuid'])
             macs = self.macs_for_instance(instance)
             nodename = self.xcat.get_xcat_node_name(macs)
             self.xcat.reboot_node(nodename)
             bm_driver._update_state(context, node, instance, baremetal_states.RUNNING)
-        except xcat_exception.xCATCommandError as e: 
+        except xcat_exception.xCATCommandError as e:
             with excutils.save_and_reraise_exception():
                 LOG.error(_("Error occured while rebooting instance %(instance)s "
                             "on baremetal node %(node)s: %(error)s") %
@@ -171,7 +171,7 @@ class xCATBareMetalDriver(bm_driver.BareMetalDriver):
         context = nova_context.get_admin_context()
         try:
             node = bm_driver._get_baremetal_node_by_instance_uuid(instance['uuid'])
-            
+
         except exception.InstanceNotFound:
             LOG.warning(_("Destroy function called on a non-existing instance %s")
                         % instance['uuid'])
@@ -182,7 +182,7 @@ class xCATBareMetalDriver(bm_driver.BareMetalDriver):
             nodename = self.xcat.get_xcat_node_name(macs)
             interfaces = bm_utils.map_network_interfaces(network_info, CONF.use_ipv6)
             fixed_ip=None
-            if interfaces and interfaces[0]: 
+            if interfaces and interfaces[0]:
                 if CONF.use_ipv6:
                     fixed_ip = interfaces[0].get('address_v6')
                 else:
@@ -199,11 +199,11 @@ class xCATBareMetalDriver(bm_driver.BareMetalDriver):
             self._detach_block_devices(instance, block_device_info)
             self._stop_firewall(instance, network_info)
             self._unplug_vifs(instance, network_info)
-            
+
             bm_driver._update_state(context, node, None, baremetal_states.DELETED)
         except Exception as e:
             with excutils.save_and_reraise_exception():
-                LOG.error(_("Error occurred while destroying instance %s: %s") 
+                LOG.error(_("Error occurred while destroying instance %s: %s")
                           % (instance['uuid'], str(e)))
                 bm_driver._update_state(context, node, instance,
                                         baremetal_states.ERROR)
@@ -213,7 +213,7 @@ class xCATBareMetalDriver(bm_driver.BareMetalDriver):
         macs = self.macs_for_instance(instance)
         nodename = self.xcat.get_xcat_node_name(macs)
         self.xcat.power_off_node(nodename)
-            
+
 
     def power_on(self, context, instance, network_info, block_device_info=None,
                  node=None):
diff --git a/xCAT-OpenStack-baremetal/lib/python/xcat/openstack/baremetal/exception.py b/xCAT-OpenStack-baremetal/lib/python/xcat/openstack/baremetal/exception.py
index 38ce5bf60..a8d866d6a 100644
--- a/xCAT-OpenStack-baremetal/lib/python/xcat/openstack/baremetal/exception.py
+++ b/xCAT-OpenStack-baremetal/lib/python/xcat/openstack/baremetal/exception.py
@@ -34,8 +34,8 @@ class xCATCommandError(xCATException):
 class xCATInvalidImageError(xCATException):
     errmsg = _("The image %(image)s is not an xCAT image")
 
-class xCATDeploymentFailure(xCATException):    
+class xCATDeploymentFailure(xCATException):
     errmsg = _("xCAT node deployment failed for node %(node)s:%(error)s")
 
-class xCATRebootFailure(xCATException):    
+class xCATRebootFailure(xCATException):
     errmsg = _("xCAT node rebooting failed for node %(node)s:%(error)s")
diff --git a/xCAT-OpenStack-baremetal/lib/python/xcat/openstack/baremetal/xcat_driver.py b/xCAT-OpenStack-baremetal/lib/python/xcat/openstack/baremetal/xcat_driver.py
index b4068d92e..71b69f2a9 100644
--- a/xCAT-OpenStack-baremetal/lib/python/xcat/openstack/baremetal/xcat_driver.py
+++ b/xCAT-OpenStack-baremetal/lib/python/xcat/openstack/baremetal/xcat_driver.py
@@ -32,13 +32,13 @@ xcat_opts = [
                 default=0),
     cfg.IntOpt('reboot_timeout',
                 help='Timeout for rebooting a node. Default: 0 second (unlimited)',
-                default=0),    
+                default=0),
     cfg.IntOpt('deploy_checking_interval',
                 help='Checking interval for node deployment. Default: 10 seconds',
                 default=10),
     cfg.IntOpt('reboot_checking_interval',
                 help='Checking interval for rebooting a node. Default: 5 seconds',
-                default=5),    
+                default=5),
    ]
 xcat_group = cfg.OptGroup(name='xcat',
                           title='xCAT Options')
@@ -74,13 +74,13 @@ class xCAT(object):
             out, err = self._exec_xcat_command("lsdef -w mac=%s" % mac)
             if out:
                 return out.split(" ")[0]
-        
+
         errstr='No node found in xCAT with the following mac address: ' \
             + ','.join(macs)
         LOG.warning(errstr)
         raise exception.xCATCommandError(errstr)
 
-        
+
     def deploy_node(self, nodename, imagename, hostname, fixed_ip, netmask, gateway):
         """
         Install the node.
@@ -91,7 +91,7 @@ class xCAT(object):
         """
         out, err = self._exec_xcat_command(
             "deploy_ops_bm_node %(node)s --image %(image)s"
-            " --host %(host)s --ip %(ip)s --mask %(mask)s" 
+            " --host %(host)s --ip %(ip)s --mask %(mask)s"
             % {'node': nodename,
                'image': imagename,
                'host': hostname,
@@ -139,7 +139,7 @@ class xCAT(object):
         else:
             self._wait_for_node_reboot(nodename)
             return power_states.ON
-    
+
     def power_off_node(self, nodename):
         """Power off the node."""
         state = self.get_node_power_state(nodename)
@@ -163,10 +163,10 @@ class xCAT(object):
                     " for node %s:%s") % (nodename, err)
             LOG.warning(errstr)
             raise exception.xCATCommandError(errstr)
-        
+
         self._wait_for_node_reboot(nodename)
         return power_states.ON
-        
+
 
     def get_node_power_state(self, nodename):
         out, err = self._exec_xcat_command("rpower %s stat" % nodename)
@@ -183,9 +183,9 @@ class xCAT(object):
                     return power_states.ON
                 elif state == 'off':
                     return power_states.OFF
-            
+
             return power_states.ERROR
-            
+
     def _wait_for_node_deploy(self, nodename):
         """Wait for xCAT node deployment to complete."""
         locals = {'errstr':''}
diff --git a/xCAT-OpenStack-baremetal/pods/man1/opsaddbmnode.1.pod b/xCAT-OpenStack-baremetal/pods/man1/opsaddbmnode.1.pod
index 39cf1f424..a7462ced7 100644
--- a/xCAT-OpenStack-baremetal/pods/man1/opsaddbmnode.1.pod
+++ b/xCAT-OpenStack-baremetal/pods/man1/opsaddbmnode.1.pod
@@ -46,14 +46,14 @@ Please make sure the following xCAT tables are filled with correct information f
 
 =head1 Parameters
 
-I<noderage> is a comma separated node or node group names. 
+I<noderage> is a comma separated node or node group names.
 
 
 =head1 OPTIONS
 
 =over 10
 
-=item B<-s>    The node name of the OpenStack compute host that hosts the baremetal nodes. 
+=item B<-s>    The node name of the OpenStack compute host that hosts the baremetal nodes.
 
 =item B<-h|--help>     Display usage message.
 
diff --git a/xCAT-OpenStack-baremetal/pods/man1/opsaddimage.1.pod b/xCAT-OpenStack-baremetal/pods/man1/opsaddimage.1.pod
index 511d68a0a..3c449ca4f 100644
--- a/xCAT-OpenStack-baremetal/pods/man1/opsaddimage.1.pod
+++ b/xCAT-OpenStack-baremetal/pods/man1/opsaddimage.1.pod
@@ -4,7 +4,7 @@ B<opsaddimage> - It adds or removes nodes for the vlan.
 
 =head1 SYNOPSIS
 
-B<opsaddimage> I<image1,image2,...> B<-n> I<new_name1,new_name2,...> [B<-c> I<controller>] [B<-V>|B<--verbose>] 
+B<opsaddimage> I<image1,image2,...> B<-n> I<new_name1,new_name2,...> [B<-c> I<controller>] [B<-V>|B<--verbose>]
 
 B<opsaddimage> [B<-h>|B<--help>]
 
@@ -12,22 +12,22 @@ B<opsaddimage> [B<-v>|B<--version>]
 
 =head1 DESCRIPTION
 
-The B<opsaddimage> command adds a list of xCAT images into the OpenStack cloud. 
+The B<opsaddimage> command adds a list of xCAT images into the OpenStack cloud.
 
-Under the cover, it creates a fake image and registers the fake image into OpenStack with command B<glance image-create>. It sets the property in the image to indicate that this is an xCAT image and also stores the original xCAT image name in the property for further reference. 
+Under the cover, it creates a fake image and registers the fake image into OpenStack with command B<glance image-create>. It sets the property in the image to indicate that this is an xCAT image and also stores the original xCAT image name in the property for further reference.
 
-The xCAT image names can be listed using B<lsdef -t osimage> command.      
+The xCAT image names can be listed using B<lsdef -t osimage> command.
 
 =head1 Parameters
 
-I<image1,image1...> a comma separated xCAT images names. 
+I<image1,image1...> a comma separated xCAT images names.
 
 
 =head1 OPTIONS
 
 =over 10
 
-=item B<-n>    a comma separated new image names in the OpenStack. If omitted, the default is the original xCAT image nanme.  
+=item B<-n>    a comma separated new image names in the OpenStack. If omitted, the default is the original xCAT image nanme.
 
 =item B<-c>  the node name of the OpenStack controller. This node must be an xCAT managed node.
 
diff --git a/xCAT-OpenStack-baremetal/share/xcat/openstack/postscripts/config_ops_bm_node b/xCAT-OpenStack-baremetal/share/xcat/openstack/postscripts/config_ops_bm_node
index e67f48393..229f8d135 100755
--- a/xCAT-OpenStack-baremetal/share/xcat/openstack/postscripts/config_ops_bm_node
+++ b/xCAT-OpenStack-baremetal/share/xcat/openstack/postscripts/config_ops_bm_node
@@ -1,4 +1,4 @@
-#!/bin/sh 
+#!/bin/sh
 # IBM(c) 2014 EPL license http://www.eclipse.org/legal/epl-v10.html
 
 # xCAT post script for configuring the openstack baremetal node.
@@ -116,7 +116,7 @@ change_host_name()
             echo "HOSTNAME=$str_hostname" >> $conf_file
         fi
     fi
-    
+
 }
 
 str_os_type=$(get_os_type)
@@ -192,7 +192,7 @@ if [[ -n $2 ]]; then
         continue
     fi
 	echo "mac=$mac"
-    
+
     #find the nic that has the mac
     if [[ -z $nic ]];  then
         #go to each nic to match the mac address
@@ -207,7 +207,7 @@ if [[ -n $2 ]]; then
     echo "nic=$nic"
 
 	#now setup the ip alias
-    setup_ip $str_os_type $nic:0 $ops_ip $ops_mask 
+    setup_ip $str_os_type $nic:0 $ops_ip $ops_mask
 fi
 
 
diff --git a/xCAT-OpenStack-baremetal/share/xcat/openstack/postscripts/deconfig_ops_bm_node b/xCAT-OpenStack-baremetal/share/xcat/openstack/postscripts/deconfig_ops_bm_node
index 81ef22564..f8b1866d4 100755
--- a/xCAT-OpenStack-baremetal/share/xcat/openstack/postscripts/deconfig_ops_bm_node
+++ b/xCAT-OpenStack-baremetal/share/xcat/openstack/postscripts/deconfig_ops_bm_node
@@ -1,4 +1,4 @@
-#!/bin/sh 
+#!/bin/sh
 # IBM(c) 2014 EPL license http://www.eclipse.org/legal/epl-v10.html
 
 # xCAT post script for deconfiguring the openstack baremetal node.
@@ -37,7 +37,7 @@ change_host_name()
     if [ "$str_os_type" = "sles" ];then
         echo "Persistently changing the hostname not implemented yet."
     #debian ubuntu and rh7
-    elif [ -f "/etc/hostname" ];then 
+    elif [ -f "/etc/hostname" ];then
         conf_file="/etc/hostname"
         echo "$str_hostname" > $conf_file
     else
@@ -75,7 +75,7 @@ if [[ -n $1 ]]; then
 	echo "nic=$nic, ops_ip=$ops_ip"
 
 	ifconfig $nic del $ops_ip
- 
+
 	#delete the configuration file
     if [ "$str_os_type" = "sles" ]; then
         str_conf_file="/etc/sysconfig/network/ifcfg-$nic"
diff --git a/xCAT-OpenStack-ironic/ironic_baremetal/README.rst b/xCAT-OpenStack-ironic/ironic_baremetal/README.rst
index 9fad8f287..c05b91b2a 100644
--- a/xCAT-OpenStack-ironic/ironic_baremetal/README.rst
+++ b/xCAT-OpenStack-ironic/ironic_baremetal/README.rst
@@ -13,12 +13,12 @@ Ironic is a project in Openstack, it will replace the nova-baremetal in juno rel
 without change any code in Openstack. Ironic xCAT driver takes the advantage of xcat and openstack, we can use it to deploy the baremetal machine very easily.
 
 Before using this driver, we must setup the openstack environment at least for two nodes( ironic conductor and neutron network node can't setup on the same node)
-Ironic conductor and the baremetal node( waiting for deploy) must in the same vlan 
+Ironic conductor and the baremetal node( waiting for deploy) must in the same vlan
 
-Add the follows in the ironic egg-info entry_points.txt file (ironic.drivers section) 
+Add the follows in the ironic egg-info entry_points.txt file (ironic.drivers section)
 
 pxe_xcat = ironic.drivers.xcat:XCATBaremetalDriver
- 
+
 When the openstack with ironic is ready, just execute command in the ironic_xcat directory as follows:
 
 $ python setup.py install
@@ -29,10 +29,10 @@ Initialize the xcat environment according  to http://sourceforge.net/p/xcat/wiki
 Using xCAT baremetal driver need config site table and run copycds to generate image. The node definition is not requirement.
 
 Ironic use neutron as the network service.
-Check the openvswitch config on the network node ,make sure brbm bridge connect to the baremetal node. 
+Check the openvswitch config on the network node ,make sure brbm bridge connect to the baremetal node.
 
 ==================================================================================
-Some Example to use the xCAT baremetal driver. 
+Some Example to use the xCAT baremetal driver.
 
 $touch /tmp/rhelhpc6.5-x86_64-install-compute.qcow2;glance image-create --name rhelhpc6.5-x86_64-install-compute --public --disk-format qcow2 --container-format bare --property xcat_image_name='rhels6.4-x86_64-install-compute' < /tmp/rhelhpc6.5-x86_64-install-compute.qcow2
 --name rhelhpc6.5-x86_64-install-compute is the image name in xcat. You can use lsdef -t osimage on the ironic-conductor node which xcat is installed.
diff --git a/xCAT-OpenStack-ironic/ironic_baremetal/ironic/drivers/modules/xcat_exception.py b/xCAT-OpenStack-ironic/ironic_baremetal/ironic/drivers/modules/xcat_exception.py
index 2e2f4a187..14dd1df34 100644
--- a/xCAT-OpenStack-ironic/ironic_baremetal/ironic/drivers/modules/xcat_exception.py
+++ b/xCAT-OpenStack-ironic/ironic_baremetal/ironic/drivers/modules/xcat_exception.py
@@ -22,4 +22,4 @@ class GetNetworkIdFailure(IronicException):
     message = _("get node network in failed for mac %(mac_address)s")
 
 class FailedToGetInfoOnPort(IronicException):
-    message = _("Show info on port: %(port_id)s failed.")
\ No newline at end of file
+    message = _("Show info on port: %(port_id)s failed.")
diff --git a/xCAT-OpenStack-ironic/ironic_baremetal/ironic/drivers/modules/xcat_util.py b/xCAT-OpenStack-ironic/ironic_baremetal/ironic/drivers/modules/xcat_util.py
index 738d6aef0..e68de8947 100644
--- a/xCAT-OpenStack-ironic/ironic_baremetal/ironic/drivers/modules/xcat_util.py
+++ b/xCAT-OpenStack-ironic/ironic_baremetal/ironic/drivers/modules/xcat_util.py
@@ -107,4 +107,4 @@ def exec_xcatcmd(driver_info, command, args):
                                             args=args)
     finally:
         LAST_CMD_TIME[driver_info['xcat_node']] = time.time()
-    return out, err
\ No newline at end of file
+    return out, err
diff --git a/xCAT-OpenStack-ironic/ironic_baremetal/ironic/drivers/xcat.py b/xCAT-OpenStack-ironic/ironic_baremetal/ironic/drivers/xcat.py
index 8eca8bf91..082701a1b 100644
--- a/xCAT-OpenStack-ironic/ironic_baremetal/ironic/drivers/xcat.py
+++ b/xCAT-OpenStack-ironic/ironic_baremetal/ironic/drivers/xcat.py
@@ -24,4 +24,4 @@ class XCATBaremetalDriver(base.BaseDriver):
         self.console = ipmitool.IPMIShellinaboxConsole()
         self.deploy = xcat_pxe.PXEDeploy()
         self.management = ipmitool.IPMIManagement()
-        self.vendor = pxe.VendorPassthru()
\ No newline at end of file
+        self.vendor = pxe.VendorPassthru()
diff --git a/xCAT-OpenStack-ironic/ironic_baremetal/setup.cfg b/xCAT-OpenStack-ironic/ironic_baremetal/setup.cfg
index e972c1f67..4c3e49873 100644
--- a/xCAT-OpenStack-ironic/ironic_baremetal/setup.cfg
+++ b/xCAT-OpenStack-ironic/ironic_baremetal/setup.cfg
@@ -23,7 +23,7 @@ packages =
     ironic
 
 [entry_points]
-ironic.drivers =    
+ironic.drivers =
     agent_ipmitool = ironic.drivers.agent:AgentAndIPMIToolDriver
 	agent_pyghmi = ironic.drivers.agent:AgentAndIPMINativeDriver
 	agent_ssh = ironic.drivers.agent:AgentAndSSHDriver
diff --git a/xCAT-OpenStack/debian/changelog b/xCAT-OpenStack/debian/changelog
index 0c268ac0f..64bc8f17f 100644
--- a/xCAT-OpenStack/debian/changelog
+++ b/xCAT-OpenStack/debian/changelog
@@ -1,5 +1,5 @@
 xcat-openstack (2.9) unstable; urgency=low
 
-  * Initial release 
+  * Initial release
 
  -- root <root@unknown>  Mon, 01 Jul 2013 15:04:41 +0800
diff --git a/xCAT-OpenStack/debian/copyright b/xCAT-OpenStack/debian/copyright
index f61d34dfe..87e60f492 100644
--- a/xCAT-OpenStack/debian/copyright
+++ b/xCAT-OpenStack/debian/copyright
@@ -85,4 +85,4 @@ Everyone is permitted to copy and distribute copies of this Agreement, but in or
 
 This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
 
- 
+
diff --git a/xCAT-OpenStack/lib/perl/xCAT/Cloud.pm b/xCAT-OpenStack/lib/perl/xCAT/Cloud.pm
index 5b9ba2067..e385e4332 100644
--- a/xCAT-OpenStack/lib/perl/xCAT/Cloud.pm
+++ b/xCAT-OpenStack/lib/perl/xCAT/Cloud.pm
@@ -22,10 +22,10 @@ use strict;
 
 #-----------------------------------------------------------------------------
 
-=head3 getcloudinfo 
+=head3 getcloudinfo
 
-   This function will be invoked by Postage.pm.  
-   get the chef cookbook repository for each cloud from the clouds table, and 
+   This function will be invoked by Postage.pm.
+   get the chef cookbook repository for each cloud from the clouds table, and
    then get all the node --> cloud from the cloud table. The two type information
    will be stored in the %info
 
@@ -34,13 +34,13 @@ use strict;
 
     Arguments:
          none
-    Returns: 
+    Returns:
            \%info
-                        
+
     Error:
         none
     Example:
-         
+
     Comments:
         none
 
@@ -94,10 +94,10 @@ sub getcloudinfo
 
 #-----------------------------------------------------------------------------
 
-=head3 getcloudres 
+=head3 getcloudres
 
-   This function will be invoked by Postage.pm. And it's only for one chef-server. 
-   1. get the chef cookbook repository for the clouds on one chef-server. 
+   This function will be invoked by Postage.pm. And it's only for one chef-server.
+   1. get the chef cookbook repository for the clouds on one chef-server.
    All the clouds's repositoryies on one chef-server should be the same one.
    2. get the cloud list for one chef-server
    3. get the cloud name for each node on the same chef-server
@@ -106,13 +106,13 @@ sub getcloudinfo
     Arguments:
          $cloudinfo_hash -- This is from the getcloudinfo function.
          $clients -- an array which stores different cloud nodes(chef-client)
-    Returns: 
+    Returns:
           $cloudres -- a string including cloud information
-                        
+
     Error:
         none
     Example:
-         
+
     Comments:
         none
 
diff --git a/xCAT-OpenStack/postscripts/configbr-ex b/xCAT-OpenStack/postscripts/configbr-ex
index 97dea5380..13418d9b6 100755
--- a/xCAT-OpenStack/postscripts/configbr-ex
+++ b/xCAT-OpenStack/postscripts/configbr-ex
@@ -8,8 +8,8 @@ pubinterface=$PUBINTERFACE
 if [ -z "pubinterface" ]
 then
      errmsg="no pubinterface setting for the $NODE's cloudname in clouds table"
-     logger -t xcat -p local4.err $errmsg 
-     echo $errmsg 
+     logger -t xcat -p local4.err $errmsg
+     echo $errmsg
      exit -1
 fi
 ifconfig $pubinterface 0
@@ -28,8 +28,8 @@ else
         str_nic_type="ethernet"
     else
         errmsg="currently, it only supports eth|en, instead of $pubinterface."
-        logger -t xcat -p local4.err $errmsg 
-        echo $errmsg 
+        logger -t xcat -p local4.err $errmsg
+        echo $errmsg
         exit -1;
     fi
 fi
diff --git a/xCAT-OpenStack/postscripts/configgw b/xCAT-OpenStack/postscripts/configgw
index e2b97be77..9ca3c2815 100755
--- a/xCAT-OpenStack/postscripts/configgw
+++ b/xCAT-OpenStack/postscripts/configgw
@@ -1,4 +1,4 @@
-#!/bin/bash 
+#!/bin/bash
 
 str_dir_name=`dirname $0`
 . $str_dir_name/xcatlib.sh
@@ -47,7 +47,7 @@ if [ -f "/etc/debian_version" ];then
     debianpreconf
     #delete the gateway from all configuration files
     sed -i "s/.*gateway.*//" /etc/network/interfaces.d/*
-    
+
     str_conf_file="/etc/network/interfaces.d/$str_nic_name"
     echo "  gateway $str_gateway --" >> $str_conf_file
 elif [ -f "/etc/SuSE-release" ];then
diff --git a/xCAT-OpenStack/postscripts/loadclouddata b/xCAT-OpenStack/postscripts/loadclouddata
index f461c646b..9bbf9065d 100755
--- a/xCAT-OpenStack/postscripts/loadclouddata
+++ b/xCAT-OpenStack/postscripts/loadclouddata
@@ -1,19 +1,19 @@
-#!/bin/sh  
+#!/bin/sh
 # IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html
 
-# This script, ("loadclouddata"), is a sample xCAT post script for 
-#	upload the openstack-cookbooks, roles, enviornment to the 
-#       xCAT chef-server node, and then create the chef-client 
+# This script, ("loadclouddata"), is a sample xCAT post script for
+#	upload the openstack-cookbooks, roles, enviornment to the
+#       xCAT chef-server node, and then create the chef-client
 #        nodes, and then assign the role and environment name to the
-#       chef-client nodes  
+#       chef-client nodes
 #
-#	Make sure your script is executable and that is is in the 
+#	Make sure your script is executable and that is is in the
 #	/install/postscripts directory on the xCAT management node.
 #
-#	You must add the script name to the list of scripts that 
+#	You must add the script name to the list of scripts that
 #	must be run at install time,  or use it with updatenode.
 #
-# 	To use this script you should make sure it gets run after the 
+# 	To use this script you should make sure it gets run after the
 #	"mountinstall" script or any other scipts that may need to use
 #       scripts in the /install directory.
 #	
@@ -68,7 +68,7 @@ else
     then
         devmode=0
         run_all=1
-    else 
+    else
         errmsg="no argument $arg in the loadchefdata script"
         logger -t xcat -p local4.err "$errmsg"
         echo "$errmsg"
@@ -77,7 +77,7 @@ else
   done
 fi
 
-if [ $devmode -eq 0 ] 
+if [ $devmode -eq 0 ]
 then
    if [ $only_load_cookbook -eq 1 -o $only_load_role -eq 1 -o $only_load_clouddata -eq 1 ]
    then
@@ -98,7 +98,7 @@ fi
 
 # enter the repository director
 # for example: cd /install/chef-cookbooks/grizzy-xcat/
-if [ ! -d "$REPOSITORY" ] 
+if [ ! -d "$REPOSITORY" ]
 then
     errmsg="Error! Not an available OpenStack Chef cookbooks repository for the cloud $CLOUDLIST.Please check the clouds table."
     logger -t xcat -p local4.err $errmsg
@@ -113,7 +113,7 @@ then
    knife cookbook bulk delete '.*' -y  > /dev/null 2>&1
    knife cookbook upload -o cookbooks --all
    if [ $? != 0 ]
-   then  
+   then
        errmsg="Failed to run knife cookbook upload -o cookbooks --all on the chefserver $NODE."
        logger -t xcat -p local4.err "$errmsg"
        echo $errmsg
@@ -127,7 +127,7 @@ then
     knife role bulk delete '.*' -y  > /dev/null 2>&1
     knife role from file roles/*.rb
     if [ $? != 0 ]
-    then  
+    then
        errmsg="Failed to run \'knife role from file roles/*.rb\'  on the chefserver $NODE."
        logger -t xcat -p local4.err $errmsg
        echo $errmsg
@@ -156,9 +156,9 @@ then
         echo "loading the enviornment file $cloud.rb for $cloud"
         # knife environment delete xcat_per-tenant_routers_with_private_networks  -y
         # knife environment delete xcat_per-tenant_routers_with_private_networks  -y
-        # load the environment file 
+        # load the environment file
         # knife environment from file environments/xcat_per-tenant_routers_with_private_networks.rb
-        if [ ! -e "$REPOSITORY/environments/$cloud.rb" ] 
+        if [ ! -e "$REPOSITORY/environments/$cloud.rb" ]
         then
             errmsg="$REPOSITORY/environments/$cloud.rb doesn't exsit. run mkclouddata at first."
             logger -t xcat -p local4.err $errmsg
@@ -167,7 +167,7 @@ then
         fi
         knife environment from file environments/$cloud.rb
         if [ $? != 0 ]
-        then  
+        then
             errmsg="Failed to run \'knife environment from file environments/$cloud.rb\' on the chef-server $NODE."
             logger -t xcat -p local4.err $errmsg
             echo $errmsg
@@ -191,7 +191,7 @@ then
         # knife node create test3 -d
         knife node create $c_fullname -d
         if [ $? != 0 ]
-        then  
+        then
             errmsg="Failed to run \'knife node create $client -d\' on the chef-server $NODE."
             logger -t xcat -p local4.err $errmsg
             echo $errmsg
@@ -199,7 +199,7 @@ then
         fi
 
         roles=`hget $client roles`
-        if [ -z $roles ] 
+        if [ -z $roles ]
         then
             errmsg="No value of the attribute cfgmgtroles is set for $client. Please check the cfgmgt table."
             logger -t xcat -p local4.err $errmsg
@@ -207,26 +207,26 @@ then
             exit 1
         fi
 
-        roles=`echo $roles | sed -e 's/ /,/g'` 
-        r="";        
+        roles=`echo $roles | sed -e 's/ /,/g'`
+        r="";
         for onerole in $roles
         do
             r+="role[$onerole],"
         done
- 
+
         # assign the role for the chef node
         knife node run_list add $c_fullname "$r"
         if [ $? != 0 ]
-        then  
+        then
             errmsg="Failed to run knife node run_list add $client '$r' on the chef-server $NODE."
             logger -t xcat -p local4.err $errmsg
             echo $errmsg
             exit 1
         fi
 
-        # assign the new environment to the chef client node 
+        # assign the new environment to the chef client node
         newenv=`hget $client cloud`
-        if [ -z $newenv ] 
+        if [ -z $newenv ]
         then
             errmsg="No value of the attribute cloud is set for $client. Please check the cloud table."
             logger -t xcat -p local4.err $errmsg
@@ -236,7 +236,7 @@ then
         origenv=`knife node show $c_fullname -E | sed -e 's/[ ]*//g'| awk -F: '{print $2}'`
         EDITOR="sed -e s/$origenv/$newenv/ -i" knife node edit $c_fullname
         if [ $? != 0 ]
-        then  
+        then
             errmsg="Failed to run knife node edit $client on the chef-server $NODE."
             logger -t xcat -p local4.err $errmsg
             echo $errmsg
@@ -245,7 +245,7 @@ then
 
 
     done
-    
+
     IFS=$OIFS
 fi
 
@@ -253,16 +253,16 @@ fi
 if [ $devmode -eq 0 ]
 then
     bags=(db_passwords  secrets  service_passwords  user_passwords)
-    
+
     if [ ! -e "$REPOSITORY/databags" ]
     then
         mkdir -p "$REPOSITORY/databags"
-    fi 
-   
+    fi
+
     databag_key="$REPOSITORY/databags/openstack_databag_key"
     openssl rand -base64 512 > $databag_key
     if [ $? != 0 ]
-    then  
+    then
         errmsg="Failed to use openssl to generate the data bag key on $NODE. Please check whether openssl is installed."
         logger -t xcat -p local4.err "$errmsg"
         echo "$errmsg"
@@ -273,18 +273,18 @@ then
     then
         mkdir -p "/etc/chef/"
     fi
-    
-    #for knife command 
+
+    #for knife command
     cp -f $databag_key "/etc/chef/encrypted_data_bag_secret"
     #for other chef-client nodes
     cp -f $databag_key "/etc/chef-server/encrypted_data_bag_secret"
-   
+
    # add the path of encrypted_data_bag_secret to knife.rb file
    if ! grep -w -q 'encrypted_data_bag_secret' /root/.chef/knife.rb
    then
        echo "encrypted_data_bag_secret '/etc/chef/openstack_encrypted_data_bag_secret'" >> /root/.chef/knife.rb
    fi
- 
+
    # delete the old databags
    knife data bag list | xargs -i knife data bag delete -y {}
 
@@ -305,7 +305,7 @@ then
        do
            knife data bag from file $bag $REPOSITORY/databags/$bag/$item --secret-file $databag_key
            if [ $? != 0 ]
-           then  
+           then
                errmsg="Failed to run knife data bag from file $bag $REPOSITORY/databags/$bag/$item --secret-file $databag_key"
                logger -t xcat -p local4.err "$errmsg"
                echo "$errmsg"
diff --git a/xCAT-OpenStack/postscripts/setup_openstack_repo b/xCAT-OpenStack/postscripts/setup_openstack_repo
index 7e17b7dde..5468df008 100755
--- a/xCAT-OpenStack/postscripts/setup_openstack_repo
+++ b/xCAT-OpenStack/postscripts/setup_openstack_repo
@@ -1,13 +1,13 @@
-#!/bin/sh 
+#!/bin/sh
 # IBM(c) 2013 EPL license http://www.eclipse.org/legal/epl-v10.html
 #-------------------------------------------------------------------------------
 #=head1  setup_openstack_repo
-#=head2  This command adds the OpenStack repository to the node. It is run 
+#=head2  This command adds the OpenStack repository to the node. It is run
 #        as a postscript.
 #        Usage:
 #        For OpenStack Grizzly: setup_openstack_repo
-#        For other OpenStack versions: setup_openstack_repo folsom 
-#        
+#        For other OpenStack versions: setup_openstack_repo folsom
+#
 #=cut
 #-------------------------------------------------------------------------------
 
diff --git a/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_allinone.rb.tmpl b/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_allinone.rb.tmpl
index ec93c9f8e..2cb882cce 100644
--- a/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_allinone.rb.tmpl
+++ b/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_allinone.rb.tmpl
@@ -16,7 +16,7 @@ override_attributes(
   "openstack" => {
     "developer_mode" => true,
     "db"=>{
-       "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#", 
+       "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#",
         "compute"=>{
            "host"=>"#TABLE:clouds:name=$CLOUD:hostip#"
         },
@@ -44,7 +44,7 @@ override_attributes(
         "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#"
      },
     "identity"=>{
-        "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#", 
+        "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#",
         "db"=>{
             "username"=>"keystone",
             "password"=> "keystone"
@@ -95,7 +95,7 @@ override_attributes(
           "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#"
        },
        "registry"=>{
-          "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#" 
+          "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#"
        },
        "image_upload" => false,
        "upload_images" => ["cirros"],
@@ -152,10 +152,10 @@ override_attributes(
        "config" => {
            "ram_allocation_ratio" => 5.0
        },
-       "libvirt" => { 
-           "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#",  
-           "virt_type" => "#TABLE:clouds:name=$CLOUD:virttype#" 
-       }    
+       "libvirt" => {
+           "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#",
+           "virt_type" => "#TABLE:clouds:name=$CLOUD:virttype#"
+       }
     }
   }
   )
diff --git a/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_allinone_develop_false.rb.tmpl b/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_allinone_develop_false.rb.tmpl
index e22cdb58b..0797b2719 100644
--- a/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_allinone_develop_false.rb.tmpl
+++ b/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_allinone_develop_false.rb.tmpl
@@ -19,7 +19,7 @@ override_attributes(
         "key_path"=>"/etc/chef/encrypted_data_bag_secret"
     },
     "db"=>{
-       "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#", 
+       "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#",
         "compute"=>{
            "host"=>"#TABLE:clouds:name=$CLOUD:hostip#"
         },
@@ -47,7 +47,7 @@ override_attributes(
         "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#"
      },
     "identity"=>{
-        "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#", 
+        "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#",
         "db"=>{
             "username"=>"keystone",
             "password"=> "keystone"
@@ -98,7 +98,7 @@ override_attributes(
           "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#"
        },
        "registry"=>{
-          "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#" 
+          "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#"
        },
        "image_upload" => false,
        "upload_images" => ["cirros"],
@@ -155,10 +155,10 @@ override_attributes(
        "config" => {
            "ram_allocation_ratio" => 5.0
        },
-       "libvirt" => { 
-           "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#",  
-           "virt_type" => "#TABLE:clouds:name=$CLOUD:virttype#" 
-       }    
+       "libvirt" => {
+           "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#",
+           "virt_type" => "#TABLE:clouds:name=$CLOUD:virttype#"
+       }
     }
   }
   )
diff --git a/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_keystone_swift_allinone.rb.tmpl b/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_keystone_swift_allinone.rb.tmpl
index cf41f73af..38c83865a 100644
--- a/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_keystone_swift_allinone.rb.tmpl
+++ b/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_keystone_swift_allinone.rb.tmpl
@@ -2,7 +2,7 @@
 # IBM(c) 2013 EPL license http://www.eclipse.org/legal/epl-v10.html
 #
 #
-# When using this template, you should change the proxy-cidr and object-cidr 
+# When using this template, you should change the proxy-cidr and object-cidr
 # according to your actual network environment!!!!!!!!
 #
 
@@ -33,7 +33,7 @@ override_attributes(
   "openstack" => {
     "developer_mode" => true,
     "db"=>{
-       "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#", 
+       "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#",
         "compute"=>{
            "host"=>"#TABLE:clouds:name=$CLOUD:hostip#"
         },
@@ -61,7 +61,7 @@ override_attributes(
         "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#"
      },
     "identity"=>{
-        "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#", 
+        "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#",
         "db"=>{
             "username"=>"keystone",
             "password"=> "keystone"
@@ -112,7 +112,7 @@ override_attributes(
           "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#"
        },
        "registry"=>{
-          "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#" 
+          "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#"
        },
        "image_upload" => false,
        "upload_images" => ["cirros"],
@@ -169,10 +169,10 @@ override_attributes(
        "config" => {
            "ram_allocation_ratio" => 5.0
        },
-       "libvirt" => { 
-           "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#",  
-           "virt_type" => "#TABLE:clouds:name=$CLOUD:virttype#" 
-       }    
+       "libvirt" => {
+           "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#",
+           "virt_type" => "#TABLE:clouds:name=$CLOUD:virttype#"
+       }
     }
   }
   )
diff --git a/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_per-tenant_routers_with_private_networks.rb.tmpl b/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_per-tenant_routers_with_private_networks.rb.tmpl
index 5832657f0..2e73b1cbf 100644
--- a/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_per-tenant_routers_with_private_networks.rb.tmpl
+++ b/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_per-tenant_routers_with_private_networks.rb.tmpl
@@ -1,4 +1,4 @@
-# 
+#
 # IBM(c) 2013 EPL license http://www.eclipse.org/legal/epl-v10.html
 # http://docs.openstack.org/grizzly/openstack-network/admin/content/app_demo_routers_with_private_networks.html
 #
@@ -18,7 +18,7 @@ override_attributes(
   "openstack" => {
     "developer_mode" => true,
     "db"=>{
-       "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#", 
+       "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#",
         "compute"=>{
            "host"=>"#TABLE:clouds:name=$CLOUD:hostip#"
         },
@@ -45,7 +45,7 @@ override_attributes(
         "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#"
      },
     "identity"=>{
-        "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#", 
+        "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#",
         "db"=>{
             "username"=>"keystone",
             "password"=> "keystone"
@@ -97,7 +97,7 @@ override_attributes(
         "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#"
      },
     "registry"=>{
-        "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#" 
+        "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#"
      },
      "image_upload" => false,
      "upload_images" => ["cirros"],
@@ -125,7 +125,7 @@ override_attributes(
             "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#"
          },
         "l3"=>{
-            "external_network_bridge_interface"=>"#TABLE:clouds:name=$CLOUD:pubinterface#" 
+            "external_network_bridge_interface"=>"#TABLE:clouds:name=$CLOUD:pubinterface#"
          },
         "allow_overlapping_ips" => "True",
         "use_namespaces" => "True",
@@ -133,7 +133,7 @@ override_attributes(
             "tenant_network_type"=>"gre",
             "tunnel_id_ranges"=>"1:1000",
             "enable_tunneling"=>"True",
-            "local_ip_interface"=>"#TABLE:clouds:name=$CLOUD:datainterface#" 
+            "local_ip_interface"=>"#TABLE:clouds:name=$CLOUD:datainterface#"
         }
    },
    "compute" => {
@@ -142,10 +142,10 @@ override_attributes(
            "host"=>"#TABLE:clouds:name=$CLOUD:hostip#"
         },
        "xvpvnc_proxy"=>{
-           "bind_interface"=>"#TABLE:clouds:name=$CLOUD:pubinterface#" 
+           "bind_interface"=>"#TABLE:clouds:name=$CLOUD:pubinterface#"
        },
        "novnc_proxy"=>{
-           "bind_interface"=>"#TABLE:clouds:name=$CLOUD:pubinterface#" 
+           "bind_interface"=>"#TABLE:clouds:name=$CLOUD:pubinterface#"
        },
        "network" => {
            "service_type" => "quantum",
@@ -153,10 +153,10 @@ override_attributes(
       "config" => {
            "ram_allocation_ratio" => 5.0
       },
-      "libvirt" => { 
-           "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#",  
-           "virt_type" => "#TABLE:clouds:name=$CLOUD:virttype#" 
-      }    
+      "libvirt" => {
+           "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#",
+           "virt_type" => "#TABLE:clouds:name=$CLOUD:virttype#"
+      }
    }
   }
   )
diff --git a/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_per-tenant_routers_with_private_networks_develop_false.rb.tmpl b/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_per-tenant_routers_with_private_networks_develop_false.rb.tmpl
index 9eec03a8b..fe68af260 100644
--- a/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_per-tenant_routers_with_private_networks_develop_false.rb.tmpl
+++ b/xCAT-OpenStack/share/xcat/templates/cloud_environment/grizzly_per-tenant_routers_with_private_networks_develop_false.rb.tmpl
@@ -1,4 +1,4 @@
-# 
+#
 # IBM(c) 2013 EPL license http://www.eclipse.org/legal/epl-v10.html
 # http://docs.openstack.org/grizzly/openstack-network/admin/content/app_demo_routers_with_private_networks.html
 #
@@ -21,7 +21,7 @@ override_attributes(
         "key_path"=>"/etc/chef/encrypted_data_bag_secret"
     },
     "db"=>{
-       "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#", 
+       "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#",
         "compute"=>{
            "host"=>"#TABLE:clouds:name=$CLOUD:hostip#"
         },
@@ -48,7 +48,7 @@ override_attributes(
         "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#"
      },
     "identity"=>{
-        "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#", 
+        "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#",
         "db"=>{
             "username"=>"keystone",
             "password"=> "keystone"
@@ -100,7 +100,7 @@ override_attributes(
         "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#"
      },
     "registry"=>{
-        "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#" 
+        "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#"
      },
      "image_upload" => false,
      "upload_images" => ["cirros"],
@@ -127,7 +127,7 @@ override_attributes(
             "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#"
          },
         "l3"=>{
-            "external_network_bridge_interface"=>"#TABLE:clouds:name=$CLOUD:pubinterface#" 
+            "external_network_bridge_interface"=>"#TABLE:clouds:name=$CLOUD:pubinterface#"
          },
         "allow_overlapping_ips" => "True",
         "use_namespaces" => "True",
@@ -135,7 +135,7 @@ override_attributes(
             "tenant_network_type"=>"gre",
             "tunnel_id_ranges"=>"1:1000",
             "enable_tunneling"=>"True",
-            "local_ip_interface"=>"#TABLE:clouds:name=$CLOUD:datainterface#" 
+            "local_ip_interface"=>"#TABLE:clouds:name=$CLOUD:datainterface#"
         }
    },
    "compute" => {
@@ -144,10 +144,10 @@ override_attributes(
            "host"=>"#TABLE:clouds:name=$CLOUD:hostip#"
         },
        "xvpvnc_proxy"=>{
-           "bind_interface"=>"#TABLE:clouds:name=$CLOUD:pubinterface#" 
+           "bind_interface"=>"#TABLE:clouds:name=$CLOUD:pubinterface#"
        },
        "novnc_proxy"=>{
-           "bind_interface"=>"#TABLE:clouds:name=$CLOUD:pubinterface#" 
+           "bind_interface"=>"#TABLE:clouds:name=$CLOUD:pubinterface#"
        },
        "network" => {
            "service_type" => "quantum",
@@ -155,10 +155,10 @@ override_attributes(
       "config" => {
            "ram_allocation_ratio" => 5.0
       },
-      "libvirt" => { 
-           "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#",  
-           "virt_type" => "#TABLE:clouds:name=$CLOUD:virttype#" 
-      }    
+      "libvirt" => {
+           "bind_interface"=>"#TABLE:clouds:name=$CLOUD:mgtinterface#",
+           "virt_type" => "#TABLE:clouds:name=$CLOUD:virttype#"
+      }
    }
   }
   )
diff --git a/xCAT-SoftLayer/bin/getslnodes.py b/xCAT-SoftLayer/bin/getslnodes.py
index 51ee03662..b8b4b5334 100755
--- a/xCAT-SoftLayer/bin/getslnodes.py
+++ b/xCAT-SoftLayer/bin/getslnodes.py
@@ -5,11 +5,11 @@ Usage: getslnodes.py [-h] [-v] [<hostname-match>]
 
 Description:
 Query your SoftLayer account and get attributes for each bare metal server.
-The attributes can be piped to 'mkdef -z' to define the nodes into the xCAT 
-Database so that xCAT can manage them.  
+The attributes can be piped to 'mkdef -z' to define the nodes into the xCAT
+Database so that xCAT can manage them.
 
 getslnodes requires a the .softlayer configuration file defined which can
-be set by running "sl config setup" on the command line. 
+be set by running "sl config setup" on the command line.
 
 positional arguments:
   hostname-match  Select servers that include this partial hostname.
@@ -29,7 +29,7 @@ except ImportError as e:
     print 'Error: install missing python module before running this command: ' + str(e)
     sys.exit(2)
 
-def get_sl_servers(): 
+def get_sl_servers():
 
     # username, api_key, endpoint_url come from the .softlayer file
     client = SoftLayer.Client()
@@ -44,9 +44,9 @@ def get_sl_servers():
     # But those 2 operations are ANDed together, so it will not work.  And currently, filtering does not work on fullyQualifiedDomainName.
     #
     servers = client['Account'].getHardware(mask=mask)
-    return servers 
-   
-def print_xcat_node_stanza(servers, hnmatch): 
+    return servers
+
+def print_xcat_node_stanza(servers, hnmatch):
 
     for server in servers:
         if hnmatch and server['fullyQualifiedDomainName'].find(hnmatch) == -1:
@@ -92,11 +92,11 @@ def print_xcat_node_stanza(servers, hnmatch):
 
 if __name__ == '__main__':
     try:
-        arguments = (docopt.docopt(__doc__, version="1.0")) 
+        arguments = (docopt.docopt(__doc__, version="1.0"))
         # print arguments
 
         servers = get_sl_servers()
-        if arguments['--verbose']: 
+        if arguments['--verbose']:
             pprint.pprint(servers)
 
         print_xcat_node_stanza(servers, arguments['<hostname-match>'])
@@ -106,6 +106,6 @@ if __name__ == '__main__':
     except SoftLayer.exceptions.SoftLayerAPIError as e:
         print e
 
-    sys.exit(1) 
+    sys.exit(1)
 
 
diff --git a/xCAT-SoftLayer/bin/softlayer_storage.py b/xCAT-SoftLayer/bin/softlayer_storage.py
index d52609e5d..2ed96423a 100755
--- a/xCAT-SoftLayer/bin/softlayer_storage.py
+++ b/xCAT-SoftLayer/bin/softlayer_storage.py
@@ -7,14 +7,14 @@ Usage:
 Options:
     -h --help                  Show help screen
     --version                  Show version
-    --type=<type>              Type of File Storage to mount ( consistent | nas ) 
+    --type=<type>              Type of File Storage to mount ( consistent | nas )
     --hostname=<hostname>      SoftLayer Storage hostname
-    --username=<username>      SoftLayer Storage LUN username 
+    --username=<username>      SoftLayer Storage LUN username
     --password=<password>      SoftLayer Storage LUN password
     --mountpoint=<mountpoint>  The mountpoint to use [default: /mnt/nas]
 
 Description:
-    For consistent performance file storate, make sure the host accessing the 
+    For consistent performance file storate, make sure the host accessing the
     file storage has been authorized through the SoftLayer portal.
 """
 import os
@@ -29,7 +29,7 @@ if path.startswith('/opt'):
 
 from xcat import xcatutils
 
-def mount_nas_storage(hostname, user, passwd, mountPoint): 
+def mount_nas_storage(hostname, user, passwd, mountPoint):
     print "Attempting to mount the NAS File Storage at %s" %(mountPoint)
 
     if xcatutils.isMounted(mountPoint):
@@ -37,17 +37,17 @@ def mount_nas_storage(hostname, user, passwd, mountPoint):
 
     cmd = "mount -t cifs //%s/%s -o username=%s,password=%s,rw,nounix,iocharset=utf8,file_mode=0644,dir_mode=0755 %s" %(hostname, user, user, passwd, mountPoint)
     out,err = xcatutils.run_command(cmd)
-    if err: 
+    if err:
         raise xcatutils.xCatError("Error when mounting. (%s)" %(err))
-    else: 
+    else:
         print "Success\n"
 
-    # To help out with automount, print this msg 
+    # To help out with automount, print this msg
     print "\nNote: To configure automount on reboot, add the following into /etc/fstab:"
     cmd = "//%s/%s   %s cifs defaults,username=%s,password=%s 0 0" %(hostname,user,mountPoint,user,passwd)
     print "%s\n" %(cmd)
 
-def mount_consistent_storage(hostname, user, mountPoint): 
+def mount_consistent_storage(hostname, user, mountPoint):
     # TODO: would be good to be able to specify the nfs version as a argument
     print "Attempting to mount the Consistent Performance File Storage at %s" %(mountPoint)
 
@@ -56,12 +56,12 @@ def mount_consistent_storage(hostname, user, mountPoint):
 
     cmd = "mount -t nfs4 %s:/%s %s" %(hostname, user, mountPoint)
     out,err = xcatutils.run_command(cmd)
-    if err: 
+    if err:
         raise xcatutils.xCatError("Error when mounting. (%s)" %(err))
-    else: 
+    else:
         print "Success\n"
 
-    # To help out with automount, print this msg 
+    # To help out with automount, print this msg
     print "\nNote: To configure automount on reboot, add the following into /etc/fstab:"
     cmd = "%s:/%s %s nfs4 defaults,hard,intr 0 0" %(hostname,user,mountPoint)
     print "%s\n" %(cmd)
@@ -71,36 +71,36 @@ def unmount_storage(mountPoint):
 
     if not xcatutils.isMounted(mountPoint):
         raise xcatutils.xCatError("The mount point %s is NOT mounted." %(mountPoint))
-    else: 
+    else:
         cmd = "umount %s" %(mountPoint)
         out,err = xcatutils.run_command(cmd)
 
-        if err: 
+        if err:
             print "Encountered error while unmounting..."
             print err
 
 
-def setup_softlayer_storage(): 
-    # 
-    # set code defaults to consistent file storage options 
-    # 
+def setup_softlayer_storage():
+    #
+    # set code defaults to consistent file storage options
+    #
     requirePassword=False
     preReqPackages = ['nfs-utils','nfs-utils-lib']
 
     #
-    # if NAS is selected as the type, override the code defaults 
+    # if NAS is selected as the type, override the code defaults
     #
     if 'nas' in arguments['--type']:
         requirePassword=True
         preReqPackages = ['cifs-utils']
 
     #
-    # verify information before starting 
+    # verify information before starting
     #
-    if arguments['--hostname'] is None: 
+    if arguments['--hostname'] is None:
         arguments['--hostname'] = xcatutils.getUserInput("Enter the SoftLayer storage hostname")
 
-    if arguments['--username'] is None: 
+    if arguments['--username'] is None:
         arguments['--username'] = xcatutils.getUserInput("Enter the SoftLayer storage username")
 
     if arguments['--password'] is None and requirePassword:
@@ -113,7 +113,7 @@ def setup_softlayer_storage():
     xcatutils.installPackages(preReqPackages)
 
     #
-    # mount the file storage 
+    # mount the file storage
     #
     if 'nas' in arguments['--type']:
         mount_nas_storage(arguments['--hostname'],arguments['--username'],arguments['--password'],arguments['--mountpoint'])
@@ -124,11 +124,11 @@ def setup_softlayer_storage():
 
 if __name__ == '__main__':
     try:
-        arguments = (docopt.docopt(__doc__, version="1.0")) 
+        arguments = (docopt.docopt(__doc__, version="1.0"))
 
         if not arguments['--type'] in ('nas', 'consistent'):
             raise xcatutils.xCatError("The type=%s is not a supported file system type." %(arguments['--type']))
-            
+
         if arguments['unmount']:
             unmount_storage(arguments['--mountpoint'])
         else:
@@ -137,4 +137,4 @@ if __name__ == '__main__':
     except docopt.DocoptExit as e:
         print e
     except xcatutils.xCatError as e:
-        print "xCatError: %s" %(e) 
+        print "xCatError: %s" %(e)
diff --git a/xCAT-SoftLayer/lib/python/xcat/xcatutils.py b/xCAT-SoftLayer/lib/python/xcat/xcatutils.py
index e36d638bb..4643c13a3 100644
--- a/xCAT-SoftLayer/lib/python/xcat/xcatutils.py
+++ b/xCAT-SoftLayer/lib/python/xcat/xcatutils.py
@@ -10,8 +10,8 @@ class xCatError(Exception):
     def __str__(self):
         return repr(self.value)
 
-def isMounted(mountPoint): 
-    if os.path.ismount(mountPoint): 
+def isMounted(mountPoint):
+    if os.path.ismount(mountPoint):
         return True
     else:
         return False
@@ -33,21 +33,21 @@ def isRhel():
     myDistro = platform.linux_distribution()
     if "Red Hat Enterprise Linux Server" or "CentOS" in myDistro:
        return True
-    else: 
+    else:
        return False
 
-def isSles(): 
+def isSles():
     myDistro = platform.linux_distribution()
     if "SUSE Linux Enterprise Server" in myDistro:
        return True
-    else: 
+    else:
        return False
 
 def isUbuntu():
     myDistro = platform.linux_distribution()
     if "Ubuntu" in myDistro:
        return True
-    else: 
+    else:
        return False
 
 def getUserInput(question):
@@ -55,31 +55,31 @@ def getUserInput(question):
     return response
 
 def filterInstalledPackages(pkglist=[]):
-    fulllist = "" 
+    fulllist = ""
 
     if isRhel():
         # using YUM
-        import yum 
+        import yum
         yb = yum.YumBase()
 
         for x in pkglist:
             if not yb.rpmdb.searchNevra(name='%s' %(x)):
-                fulllist += "%s " %(x) 
-   
+                fulllist += "%s " %(x)
+
     return fulllist
- 
+
 def installPackages(pkglist=[]):
     fulllist = filterInstalledPackages(pkglist)
 
     if isRhel():
-        if fulllist.strip() != "": 
+        if fulllist.strip() != "":
             cmd = "yum -y install %s" %(fulllist)
             out,err = xcatutils.run_command(cmd)
 
-    elif isSles(): 
+    elif isSles():
         print "Using zyppr..."
     elif isUbuntu():
         print "Using apt-get..."
     else:
-        print "Error!" 
+        print "Error!"
 
diff --git a/xCAT-SoftLayer/pods/man1/getslnodes.1.pod b/xCAT-SoftLayer/pods/man1/getslnodes.1.pod
index d9e3bbb1c..c89fb61d2 100644
--- a/xCAT-SoftLayer/pods/man1/getslnodes.1.pod
+++ b/xCAT-SoftLayer/pods/man1/getslnodes.1.pod
@@ -4,7 +4,7 @@ B<getslnodes> - queries your SoftLayer account and gets attributes for each serv
 
 =head1 SYNOPSIS
 
-B<getslnodes> [B<-v>|B<--verbose>] [I<hostname-match>]  
+B<getslnodes> [B<-v>|B<--verbose>] [I<hostname-match>]
 
 B<getslnodes> [B<-?> | B<-h> | B<--help>]
 
@@ -15,7 +15,7 @@ server.  The attributes can be piped to 'mkdef -z' to define the nodes
 in the xCAT DB so that xCAT can manage them.
 
 Before using this command, you must download and install the SoftLayer API perl module.
-For example: 
+For example:
 
    cd /usr/local/lib
    git clone https://github.com/softlayer/softlayer-api-perl-client.git
diff --git a/xCAT-SoftLayer/pods/man1/pushinitrd.1.pod b/xCAT-SoftLayer/pods/man1/pushinitrd.1.pod
index 45c6e0168..73b8dc409 100644
--- a/xCAT-SoftLayer/pods/man1/pushinitrd.1.pod
+++ b/xCAT-SoftLayer/pods/man1/pushinitrd.1.pod
@@ -4,7 +4,7 @@ B<pushinitrd> - queries your SoftLayer account and gets attributes for each serv
 
 =head1 SYNOPSIS
 
-B<pushinitrd> [B<-v>|B<--verbose>]  [B<-w> I<waittime>] [I<noderange>]  
+B<pushinitrd> [B<-v>|B<--verbose>]  [B<-w> I<waittime>] [I<noderange>]
 
 B<pushinitrd> [B<-?> | B<-h> | B<--help>]
 
diff --git a/xCAT-SoftLayer/si-post-install/15all.configefi b/xCAT-SoftLayer/si-post-install/15all.configefi
index 34b112f0c..d76c4fb58 100755
--- a/xCAT-SoftLayer/si-post-install/15all.configefi
+++ b/xCAT-SoftLayer/si-post-install/15all.configefi
@@ -51,7 +51,7 @@ else
         echo "Can not find the boot device, return error"
         exit 1
     fi
-    
+
     # set grub to use this boot device
     if grep -qe '^VERSION\s*=\s*11' /etc/SuSE-release; then
         #sles11, run grub-install.unsupported directly
diff --git a/xCAT-SoftLayer/si-post-install/99all.killsyslog b/xCAT-SoftLayer/si-post-install/99all.killsyslog
index 348910189..6f2f5245a 100755
--- a/xCAT-SoftLayer/si-post-install/99all.killsyslog
+++ b/xCAT-SoftLayer/si-post-install/99all.killsyslog
@@ -22,4 +22,4 @@ sync
 #todo: remove
 #echo "Processes still using /:"
 #fuser -v /
-#sleep 30
\ No newline at end of file
+#sleep 30
diff --git a/xCAT-UI/configure.php b/xCAT-UI/configure.php
index f518ad157..a0b19786d 100644
--- a/xCAT-UI/configure.php
+++ b/xCAT-UI/configure.php
@@ -14,4 +14,4 @@ if (!isAuthenticated()) {
 } else {
     loadContent();
 }
-?>
\ No newline at end of file
+?>
diff --git a/xCAT-UI/css/login.css b/xCAT-UI/css/login.css
index 8aea60065..9ad5b8479 100644
--- a/xCAT-UI/css/login.css
+++ b/xCAT-UI/css/login.css
@@ -57,4 +57,4 @@ body {
 	text-align: right;
 	color: #f5f5f5;
 	font-weight: bold;
-}
\ No newline at end of file
+}
diff --git a/xCAT-UI/css/style.css b/xCAT-UI/css/style.css
index ae084294f..4417c0126 100644
--- a/xCAT-UI/css/style.css
+++ b/xCAT-UI/css/style.css
@@ -870,4 +870,4 @@ td.jqplot-table-legend>div {
 #discoverTab td{
     border-style: none;
     text-align: left;
-}
\ No newline at end of file
+}
diff --git a/xCAT-UI/debian/copyright b/xCAT-UI/debian/copyright
index f61d34dfe..87e60f492 100644
--- a/xCAT-UI/debian/copyright
+++ b/xCAT-UI/debian/copyright
@@ -85,4 +85,4 @@ Everyone is permitted to copy and distribute copies of this Agreement, but in or
 
 This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
 
- 
+
diff --git a/xCAT-UI/ganglianode.php b/xCAT-UI/ganglianode.php
index 88f8d060f..8ec61d9c6 100644
--- a/xCAT-UI/ganglianode.php
+++ b/xCAT-UI/ganglianode.php
@@ -90,4 +90,4 @@ echo <<<EEE
     </body>
 </html>
 EEE;
-?>
\ No newline at end of file
+?>
diff --git a/xCAT-UI/help.php b/xCAT-UI/help.php
index 95bf6e353..e5141cef6 100644
--- a/xCAT-UI/help.php
+++ b/xCAT-UI/help.php
@@ -14,4 +14,4 @@ if (!isAuthenticated()) {
 } else {
     loadContent();
 }
-?>
\ No newline at end of file
+?>
diff --git a/xCAT-UI/index.php b/xCAT-UI/index.php
index b55a5842c..aa26906c7 100644
--- a/xCAT-UI/index.php
+++ b/xCAT-UI/index.php
@@ -15,4 +15,4 @@ if (!isAuthenticated()) {
 } else {
     loadContent();
 }
-?>
\ No newline at end of file
+?>
diff --git a/xCAT-UI/js/configure/configure.js b/xCAT-UI/js/configure/configure.js
index 79cff6f25..8888915ca 100644
--- a/xCAT-UI/js/configure/configure.js
+++ b/xCAT-UI/js/configure/configure.js
@@ -555,4 +555,4 @@ function updatePanel(data) {
 
     infoBar.append(icon, msg, close);
     infoBar.prependTo($('#' + dialogId));
-}
\ No newline at end of file
+}
diff --git a/xCAT-UI/js/configure/discover.js b/xCAT-UI/js/configure/discover.js
index 719c8be2e..6a3bab7a8 100644
--- a/xCAT-UI/js/configure/discover.js
+++ b/xCAT-UI/js/configure/discover.js
@@ -379,4 +379,4 @@ function complete() {
     $('#discoverContentDiv').append(showStr);
 
     createDiscoverButtons();
-}
\ No newline at end of file
+}
diff --git a/xCAT-UI/js/configure/files.js b/xCAT-UI/js/configure/files.js
index 4c79af81f..8f5bead7a 100644
--- a/xCAT-UI/js/configure/files.js
+++ b/xCAT-UI/js/configure/files.js
@@ -333,4 +333,4 @@ function deleteFile(container, file) {
             }
         }
     });
-}
\ No newline at end of file
+}
diff --git a/xCAT-UI/js/configure/service.js b/xCAT-UI/js/configure/service.js
index 036de8dce..13d40ea13 100644
--- a/xCAT-UI/js/configure/service.js
+++ b/xCAT-UI/js/configure/service.js
@@ -1311,4 +1311,4 @@ function deleteGroupDialog(groups) {
             }
         }
     });
-}
\ No newline at end of file
+}
diff --git a/xCAT-UI/js/configure/update.js b/xCAT-UI/js/configure/update.js
index 1d8684891..1dab10795 100644
--- a/xCAT-UI/js/configure/update.js
+++ b/xCAT-UI/js/configure/update.js
@@ -319,4 +319,4 @@ function showUpdateResult(data) {
     });
 
     $('#rpm button').attr('disabled', '');
-}
\ No newline at end of file
+}
diff --git a/xCAT-UI/js/configure/users.js b/xCAT-UI/js/configure/users.js
index 0faf86959..9117ba4f1 100644
--- a/xCAT-UI/js/configure/users.js
+++ b/xCAT-UI/js/configure/users.js
@@ -546,4 +546,4 @@ function openDeleteUserDialog(users) {
             }
         }
     });
-}
\ No newline at end of file
+}
diff --git a/xCAT-UI/js/custom/blade.js b/xCAT-UI/js/custom/blade.js
index adbfefb66..c3c771962 100644
--- a/xCAT-UI/js/custom/blade.js
+++ b/xCAT-UI/js/custom/blade.js
@@ -916,4 +916,4 @@ function updateBladeProvisionExistingStatus(data) {
             $('#' + statBarId).find('div').append('<pre>It will take several minutes before the nodes are up and ready. Use rcons to monitor the status of the install.</pre>');
         }
     }
-}
\ No newline at end of file
+}
diff --git a/xCAT-UI/js/custom/customUtils.js b/xCAT-UI/js/custom/customUtils.js
index e1b80e34b..c8500c505 100644
--- a/xCAT-UI/js/custom/customUtils.js
+++ b/xCAT-UI/js/custom/customUtils.js
@@ -796,4 +796,4 @@ function selectAll4Table(event, obj) {
     var status = obj.attr('checked');
     tableObj.find(' :checkbox').attr('checked', status);
     event.stopPropagation();
-}
\ No newline at end of file
+}
diff --git a/xCAT-UI/js/custom/esx.js b/xCAT-UI/js/custom/esx.js
index c20b05c3c..6da1b2ad2 100644
--- a/xCAT-UI/js/custom/esx.js
+++ b/xCAT-UI/js/custom/esx.js
@@ -745,4 +745,4 @@ function updateESXProvisionStatus(data) {
             $('#' + statBarId).find('div').append('<pre>It will take several minutes before the nodes are up and ready. Use rcons to monitor the status of the install.</pre>');
         }
     }
-}
\ No newline at end of file
+}
diff --git a/xCAT-UI/js/custom/hmc.js b/xCAT-UI/js/custom/hmc.js
index f8ffc0d16..a89ef0f9c 100644
--- a/xCAT-UI/js/custom/hmc.js
+++ b/xCAT-UI/js/custom/hmc.js
@@ -2002,4 +2002,4 @@ function nonihCreateLpar(parentDiv) {
     var showStr = 'The machine type is not P7 IH, so you had to create lpars by command line manually.';
     parentDiv.append(createInfoBar(showStr));
     return;
-}
\ No newline at end of file
+}
diff --git a/xCAT-UI/js/custom/ipmi.js b/xCAT-UI/js/custom/ipmi.js
index 8adf1c915..f3e93584d 100644
--- a/xCAT-UI/js/custom/ipmi.js
+++ b/xCAT-UI/js/custom/ipmi.js
@@ -1035,4 +1035,4 @@ function idataplexInitPowerOn() {
     var infoBar = createInfoBar('Click the refresh button to check all nodes\' status.');
     $('#poweronDiv').append(infoBar);
     createDiscoverButtons();
-}
\ No newline at end of file
+}
diff --git a/xCAT-UI/js/custom/kvm.js b/xCAT-UI/js/custom/kvm.js
index 39552654d..73f39459c 100644
--- a/xCAT-UI/js/custom/kvm.js
+++ b/xCAT-UI/js/custom/kvm.js
@@ -740,4 +740,4 @@ function updateKVMProvisionStatus(data) {
             $('#' + statBarId).find('div').append('<pre>It will take several minutes before the nodes are up and ready. Use rcons to monitor the status of the install.</pre>');
         }
     }
-}
\ No newline at end of file
+}
diff --git a/xCAT-UI/js/help/help.js b/xCAT-UI/js/help/help.js
index aee8f7149..2f7abf9dc 100644
--- a/xCAT-UI/js/help/help.js
+++ b/xCAT-UI/js/help/help.js
@@ -924,4 +924,4 @@ function updateStatusBar(data) {
         var prg = writeRsp(rsp, '');
         $('#' + statBarId).find('div').append(prg);
     }
-}
\ No newline at end of file
+}
diff --git a/xCAT-UI/js/monitor/gangliamon.js b/xCAT-UI/js/monitor/gangliamon.js
index 7aadafbab..bd62e4cf4 100644
--- a/xCAT-UI/js/monitor/gangliamon.js
+++ b/xCAT-UI/js/monitor/gangliamon.js
@@ -1055,4 +1055,4 @@ function addZoomDiv(obj) {
     $('#zoomDiv').append(newli);
 
     drawGangliaNodesArea();
-}
\ No newline at end of file
+}
diff --git a/xCAT-UI/js/monitor/monitor.js b/xCAT-UI/js/monitor/monitor.js
index d55341cf5..306a9242b 100644
--- a/xCAT-UI/js/monitor/monitor.js
+++ b/xCAT-UI/js/monitor/monitor.js
@@ -278,4 +278,4 @@ function updateMonStatus(data) {
     // Prepend info or warning bar to tab
     bar.prependTo($('#monitorTab .form'));
     bar.delay(4000).slideUp();
-}
\ No newline at end of file
+}
diff --git a/xCAT-UI/js/monitor/rmcmon.js b/xCAT-UI/js/monitor/rmcmon.js
index 31ef0906f..fae8908a6 100644
--- a/xCAT-UI/js/monitor/rmcmon.js
+++ b/xCAT-UI/js/monitor/rmcmon.js
@@ -1209,4 +1209,4 @@ function createAssociationTable(cond) {
     showStr += '<tbody></table></center>';
 
     return showStr;
-}
\ No newline at end of file
+}
diff --git a/xCAT-UI/js/monitor/xcatmon.js b/xCAT-UI/js/monitor/xcatmon.js
index 9eb8a9a5d..b64c118c4 100644
--- a/xCAT-UI/js/monitor/xcatmon.js
+++ b/xCAT-UI/js/monitor/xcatmon.js
@@ -420,4 +420,4 @@ function deleteXcatMonRow(obj) {
             break;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/xCAT-UI/js/nodes/mtm.js b/xCAT-UI/js/nodes/mtm.js
index 47380cdca..e76477aba 100644
--- a/xCAT-UI/js/nodes/mtm.js
+++ b/xCAT-UI/js/nodes/mtm.js
@@ -41,4 +41,4 @@ var hardwareInfo = {
     '8231-E2C' : [ 'P7 HE', 4 ],
     '9125-F2C' : [ 'Power 775', 2], 
     '78AC-100' : [ 'Power 775', 2] // bpa
-};
\ No newline at end of file
+};
diff --git a/xCAT-UI/js/nodes/nodeset.js b/xCAT-UI/js/nodes/nodeset.js
index 87d84ba1e..4698c728a 100644
--- a/xCAT-UI/js/nodes/nodeset.js
+++ b/xCAT-UI/js/nodes/nodeset.js
@@ -305,4 +305,4 @@ function updateNodesetStatus(data) {
         // Hide loader
         $('#' + statBarId).find('img').hide();
     }
-}
\ No newline at end of file
+}
diff --git a/xCAT-UI/js/nodes/physical.js b/xCAT-UI/js/nodes/physical.js
index 24b010c8c..11a5b778a 100644
--- a/xCAT-UI/js/nodes/physical.js
+++ b/xCAT-UI/js/nodes/physical.js
@@ -932,4 +932,4 @@ function calculateBlank(mtm) {
             return 0;
             break;
     }
-}
\ No newline at end of file
+}
diff --git a/xCAT-UI/js/nodes/rnetboot.js b/xCAT-UI/js/nodes/rnetboot.js
index 7f03e069b..2c1401e6e 100644
--- a/xCAT-UI/js/nodes/rnetboot.js
+++ b/xCAT-UI/js/nodes/rnetboot.js
@@ -220,4 +220,4 @@ function loadNetbootPage(tgtNodes) {
 
     // Select new tab
     tab.select(newTabId);
-}
\ No newline at end of file
+}
diff --git a/xCAT-UI/js/nodes/rscan.js b/xCAT-UI/js/nodes/rscan.js
index 06fdbff09..aa4e37c44 100644
--- a/xCAT-UI/js/nodes/rscan.js
+++ b/xCAT-UI/js/nodes/rscan.js
@@ -171,4 +171,4 @@ function loadRscanPage(tgtNodes) {
 
     // Select new tab
     tab.select(newTabId);
-}
\ No newline at end of file
+}
diff --git a/xCAT-UI/js/nodes/updatenode.js b/xCAT-UI/js/nodes/updatenode.js
index d0a177a40..b96088516 100644
--- a/xCAT-UI/js/nodes/updatenode.js
+++ b/xCAT-UI/js/nodes/updatenode.js
@@ -406,4 +406,4 @@ function loadUpdatenodePage(tgtNodes) {
 
     // Select new tab
     tab.select(newTabId);
-}
\ No newline at end of file
+}
diff --git a/xCAT-UI/js/provision/images.js b/xCAT-UI/js/provision/images.js
index fd4967321..84ad0fa67 100644
--- a/xCAT-UI/js/provision/images.js
+++ b/xCAT-UI/js/provision/images.js
@@ -1459,4 +1459,4 @@ function createImage() {
              data = decodeRsp(data);
         }
     });
-}
\ No newline at end of file
+}
diff --git a/xCAT-UI/js/provision/provision.js b/xCAT-UI/js/provision/provision.js
index f3a394df5..f2cd26211 100644
--- a/xCAT-UI/js/provision/provision.js
+++ b/xCAT-UI/js/provision/provision.js
@@ -255,4 +255,4 @@ function loadProvisionPage() {
         $('#quickProvisionTab').append(provForm);
         appendProvisionSection('quick', provForm);
     }
-}
\ No newline at end of file
+}
diff --git a/xCAT-UI/js/rcons/rcons.js b/xCAT-UI/js/rcons/rcons.js
index 32662baea..0647225cc 100644
--- a/xCAT-UI/js/rcons/rcons.js
+++ b/xCAT-UI/js/rcons/rcons.js
@@ -285,4 +285,4 @@ rconsTerm = function(nodeName, height, width) {
             sendTimeout = window.setTimeout(rconsSend, 1);
         }
     }
-};
\ No newline at end of file
+};
diff --git a/xCAT-UI/js/service/service.js b/xCAT-UI/js/service/service.js
index 0ffcaf7d4..0bd570520 100644
--- a/xCAT-UI/js/service/service.js
+++ b/xCAT-UI/js/service/service.js
@@ -2189,4 +2189,4 @@ function setMaxVM() {
             $.cookie('xcat_' + userName + '_maxvm', rsp, { expires: exDate });
         }
     });
-}
\ No newline at end of file
+}
diff --git a/xCAT-UI/js/service/utils.js b/xCAT-UI/js/service/utils.js
index f7de6cfe4..1e6ce4155 100644
--- a/xCAT-UI/js/service/utils.js
+++ b/xCAT-UI/js/service/utils.js
@@ -1,6 +1,6 @@
 /**
  * Get nodes currently shown in datatable
- * 
+ *
  * @param tableId
  *            Datatable ID
  * @return String of nodes shown
@@ -8,10 +8,10 @@
 function getNodesShown(tableId) {
     // String of nodes shown
     var shownNodes = '';
-    
+
     // Get rows of shown nodes
     var nodes = $('#' + tableId + ' tbody tr');
-                
+
     // Go through each row
     var cols;
     for (var i = 0; i < nodes.length; i++) {
@@ -19,7 +19,7 @@ function getNodesShown(tableId) {
         cols = nodes.eq(i).find('td');
         shownNodes += cols.eq(1).text() + ',';
     }
-    
+
     // Remove last comma
     shownNodes = shownNodes.substring(0, shownNodes.length-1);
     return shownNodes;
@@ -27,17 +27,17 @@ function getNodesShown(tableId) {
 
 /**
  * Find the row index containing a column with a given string
- * 
+ *
  * @param str String to search for
  * @param table Table to check
  * @param col Column to find string under
  * @return The row index containing the search string
  */
-function findRow(str, table, col){    
+function findRow(str, table, col){
     // Get datatable
     var dTable = $(table).dataTable();
     var rows = dTable.fnGetData();
-    
+
     // Loop through each row
     for (var i in rows) {
         // If the column contains the search string
@@ -45,13 +45,13 @@ function findRow(str, table, col){
             return parseInt(i);
         }
     }
-    
+
     return -1;
 }
 
 /**
  * Select all checkboxes in the datatable
- * 
+ *
  * @param event Event on element
  * @param obj Object triggering event
  */
@@ -63,13 +63,13 @@ function selectAll(event, obj) {
     } else {
         checkboxes.attr('checked', false);
     }
-    
+
     event.stopPropagation();
 }
 
 /**
  * Get node attributes from HTTP request data
- * 
+ *
  * @param propNames Hash table of property names
  * @param keys Property keys
  * @param data Data from HTTP request
@@ -120,7 +120,7 @@ function getAttrs(keys, propNames, data) {
 
 /**
  * Create a tool tip for comments
- * 
+ *
  * @param comment Comments to be placed in a tool tip
  * @return Tool tip
  */
@@ -137,7 +137,7 @@ function createCommentsToolTip(comment) {
         'border': '0px',
         'display': 'block'
     });
-    
+
     // Create links to save and cancel changes
     var lnkStyle = {
         'color': '#58ACFA',
@@ -146,17 +146,17 @@ function createCommentsToolTip(comment) {
         'padding': '5px',
         'float': 'right'
     };
-    
+
     var saveLnk = $('<a>Save</a>').css(lnkStyle).hide();
     var cancelLnk = $('<a>Cancel</a>').css(lnkStyle).hide();
     var infoSpan = $('<span>Click to edit</span>').css(lnkStyle);
-    
+
     // Save changes onclick
     saveLnk.bind('click', function(){
         // Get node and comment
         var node = $(this).parent().parent().find('img').attr('id').replace('Tip', '');
         var comments = $(this).parent().find('textarea').val();
-        
+
         // Save comment
         $.ajax( {
             url : 'lib/srv_cmd.php',
@@ -167,45 +167,45 @@ function createCommentsToolTip(comment) {
                 args : '-t;node;-o;' + node + ';usercomment=' + comments,
                 msg : 'out=manageTab;tgt=' + node
             },
-            
+
             success: showChdefOutput
         });
-        
+
         // Hide cancel and save links
         $(this).hide();
         cancelLnk.hide();
     });
-        
+
     // Cancel changes onclick
     cancelLnk.bind('click', function(){
         // Get original comment and put it back
         var orignComments = $(this).parent().find('textarea').text();
         $(this).parent().find('textarea').val(orignComments);
-        
+
         // Hide cancel and save links
         $(this).hide();
         saveLnk.hide();
         infoSpan.show();
     });
-    
+
     // Show save link when comment is edited
     txtArea.bind('click', function(){
         saveLnk.show();
         cancelLnk.show();
         infoSpan.hide();
     });
-        
+
     toolTip.append(txtArea);
     toolTip.append(cancelLnk);
     toolTip.append(saveLnk);
     toolTip.append(infoSpan);
-    
+
     return toolTip;
 }
 
 /**
  * Open a dialog and show given message
- * 
+ *
  * @param type Type of dialog, i.e. warn or info
  * @param msg Message to show
  */
@@ -220,7 +220,7 @@ function prompt(type, msg) {
         'margin': '5px',
         'vertical-align': 'middle'
     });
-    
+
     // Append icon
     var icon;
     var dialog = $('<div></div>');
@@ -229,10 +229,10 @@ function prompt(type, msg) {
     } else {
         icon = $('<span class="ui-icon ui-icon-info"></span>').css(style);
     }
-    
+
     dialog.append(icon);
     dialog.append(msg);
-        
+
     // Open dialog
     dialog.dialog({
         title: type,
@@ -242,7 +242,7 @@ function prompt(type, msg) {
         },
         width: 400,
         buttons: {
-            "Ok": function(){ 
+            "Ok": function(){
                 $(this).dialog("close");
             }
         }
@@ -251,7 +251,7 @@ function prompt(type, msg) {
 
 /**
  * Get nodes that are checked in a given datatable
- * 
+ *
  * @param dTableId The datatable ID
  * @return Nodes that were checked
  */
@@ -262,10 +262,10 @@ function getNodesChecked(dTableId) {
     var nodes = $('#' + dTableId + ' input[type=checkbox]:checked');
     for (var i in nodes) {
         var tgtNode = nodes.eq(i).attr('name');
-        
+
         if (tgtNode){
             tgts += tgtNode;
-            
+
             // Add a comma at the end
             if (i < nodes.length - 1) {
                 tgts += ',';
@@ -278,7 +278,7 @@ function getNodesChecked(dTableId) {
 
 /**
  * Show chdef output
- * 
+ *
  * @param data Data returned from HTTP request
  */
 function showChdefOutput(data) {
@@ -287,7 +287,7 @@ function showChdefOutput(data) {
     var args = data.msg.split(';');
     var tabID = args[0].replace('out=', '');
     var tgt = args[1].replace('tgt=', '');
-    
+
     // Find info bar on nodes tab, if any
     var info = $('#' + tabID).find('.ui-state-highlight');
     if (!info.length) {
@@ -295,19 +295,19 @@ function showChdefOutput(data) {
         info = createInfoBar('');
         $('#' + tabID).append(info);
     }
-        
+
     // Go through output and append to paragraph
     var prg = $('<p></p>');
     for (var i in out) {
         prg.append(tgt + ': ' + out[i] + '<br>');
     }
-    
+
     info.append(prg);
 }
 
 /**
  * Get an attribute of a given node
- * 
+ *
  * @param node The node
  * @param attrName The attribute
  * @return The attribute of the node
@@ -318,7 +318,7 @@ function getUserNodeAttr(node, attrName) {
 
     // Search for the column containing the attribute
     var attrCol = null;
-    
+
     var cols = row.parents('.dataTables_scroll').find('.dataTables_scrollHead thead tr:eq(0) th');
     // Loop through each column
     for (var i in cols) {
@@ -328,7 +328,7 @@ function getUserNodeAttr(node, attrName) {
             break;
         }
     }
-    
+
     // If the column containing the attribute is found
     if (attrCol) {
         // Get the attribute column index
@@ -340,4 +340,4 @@ function getUserNodeAttr(node, attrName) {
     } else {
         return '';
     }
-}
\ No newline at end of file
+}
diff --git a/xCAT-UI/lib/cmd.php b/xCAT-UI/lib/cmd.php
index db9a3a23b..a7a8d67c5 100644
--- a/xCAT-UI/lib/cmd.php
+++ b/xCAT-UI/lib/cmd.php
@@ -76,7 +76,7 @@ if (isset($_GET["cmd"])) {
             $opts_array = array($opts);
         }
     }
-    
+
     // Time needed to update /etc/hosts
     if (strncasecmp($cmd, "makehosts", 9) == 0) {
         sleep(5);
@@ -238,4 +238,4 @@ function extractExtnoderange($xml) {
 
     return $rsp;
 }
-?>
\ No newline at end of file
+?>
diff --git a/xCAT-UI/lib/rcons.php b/xCAT-UI/lib/rcons.php
index c84ed0711..0308142e0 100644
--- a/xCAT-UI/lib/rcons.php
+++ b/xCAT-UI/lib/rcons.php
@@ -93,4 +93,4 @@ function rconsSynchronise($parameter) {
 
     return ($return);
 }
-?>
\ No newline at end of file
+?>
diff --git a/xCAT-UI/lib/srv_cmd.php b/xCAT-UI/lib/srv_cmd.php
index ecb4fc1a4..6477b1c04 100644
--- a/xCAT-UI/lib/srv_cmd.php
+++ b/xCAT-UI/lib/srv_cmd.php
@@ -203,4 +203,4 @@ function extractExtnoderange($xml) {
 
     return $rsp;
 }
-?>
\ No newline at end of file
+?>
diff --git a/xCAT-UI/lib/systemcmd.php b/xCAT-UI/lib/systemcmd.php
index 94bbc4444..e4bb1ad5b 100644
--- a/xCAT-UI/lib/systemcmd.php
+++ b/xCAT-UI/lib/systemcmd.php
@@ -24,7 +24,7 @@ if (isset($_GET["cmd"])) {
     if (isset($_GET["msg"])) {
         $msg = $_GET["msg"];
     }
-    
+
     if ($cmd == "ostype") {
         $ret = strtolower(PHP_OS);
     } else {
@@ -36,4 +36,4 @@ if (isset($_GET["cmd"])) {
     $msg = htmlentities($msg, ENT_QUOTES | ENT_HTML5, 'UTF-8');
     echo json_encode(array("rsp"=>$ret, "msg" => $msg));
 }
-?>
\ No newline at end of file
+?>
diff --git a/xCAT-UI/lib/tabRestore.php b/xCAT-UI/lib/tabRestore.php
index 77e96c8b0..0e44409a4 100644
--- a/xCAT-UI/lib/tabRestore.php
+++ b/xCAT-UI/lib/tabRestore.php
@@ -80,4 +80,4 @@ $xml = submit_request($request, 0, NULL);
 // Reply in the form of JSON
 $rtn = array("rsp" => $xml);
 echo json_encode($rtn);
-?>
\ No newline at end of file
+?>
diff --git a/xCAT-UI/lib/ui.php b/xCAT-UI/lib/ui.php
index c2e8d515c..458105a75 100644
--- a/xCAT-UI/lib/ui.php
+++ b/xCAT-UI/lib/ui.php
@@ -83,4 +83,4 @@ function login() {
         <div id="log-info">Open Source. EPL License.</div>
     </div>';
 }
-?>
\ No newline at end of file
+?>
diff --git a/xCAT-UI/lib/upload.php b/xCAT-UI/lib/upload.php
index 983fa30a1..9371ca81e 100644
--- a/xCAT-UI/lib/upload.php
+++ b/xCAT-UI/lib/upload.php
@@ -26,4 +26,4 @@ if ($type == "text/plain" || $type == "application/octet-stream" || $type == "ap
 } else {
     echo "(Error) File type $type not supported";
 }
-?>
\ No newline at end of file
+?>
diff --git a/xCAT-UI/lib/uploadfile.php b/xCAT-UI/lib/uploadfile.php
index fa382c587..75301d2b6 100644
--- a/xCAT-UI/lib/uploadfile.php
+++ b/xCAT-UI/lib/uploadfile.php
@@ -60,4 +60,4 @@ if (move_uploaded_file($_FILES["file"]["tmp_name"], $path)) {
 	
 	echo $reason;
 }
-?>
\ No newline at end of file
+?>
diff --git a/xCAT-UI/lib/zCmd.php b/xCAT-UI/lib/zCmd.php
index c77f4b5fe..67839b288 100644
--- a/xCAT-UI/lib/zCmd.php
+++ b/xCAT-UI/lib/zCmd.php
@@ -156,4 +156,4 @@ if (isset($_GET["cmd"])) {
     $rtn = array("rsp" => $rsp, "msg" => $msg);
     echo json_encode($rtn);
 }
-?>
\ No newline at end of file
+?>
diff --git a/xCAT-UI/monitor.php b/xCAT-UI/monitor.php
index 29010ad74..908c6684a 100644
--- a/xCAT-UI/monitor.php
+++ b/xCAT-UI/monitor.php
@@ -14,4 +14,4 @@ if (!isAuthenticated()) {
 } else {
     loadContent();
 }
-?>
\ No newline at end of file
+?>
diff --git a/xCAT-UI/provision.php b/xCAT-UI/provision.php
index ef494bee5..afd8bb77a 100644
--- a/xCAT-UI/provision.php
+++ b/xCAT-UI/provision.php
@@ -14,4 +14,4 @@ if (!isAuthenticated()) {
 } else {
     loadContent();
 }
-?>
\ No newline at end of file
+?>
diff --git a/xCAT-buildkit/bin/buildkit b/xCAT-buildkit/bin/buildkit
index dc825a660..eb119cde1 100755
--- a/xCAT-buildkit/bin/buildkit
+++ b/xCAT-buildkit/bin/buildkit
@@ -4,7 +4,7 @@
 
 #-----------------------------------------------------------------------------
 
-=head1   buildkit 
+=head1   buildkit
 
  xCAT/PCM Kit Build utilities
 
@@ -496,7 +496,7 @@ exit $rc;
 
 #-----------------------------------------------------------------------------
 
-=head3    usage 
+=head3    usage
 	
 	Displays message for -h option
 
@@ -505,48 +505,48 @@ exit $rc;
 #-----------------------------------------------------------------------------
 sub usage
 {
-    print "Usage:  
+    print "Usage:
     buildkit [-?│-h│--help] [-v│--version]
 
     To build a new Kit
 
-    buildkit [-V│--verbose] <subcommand> [<kit_name>] [<repo_name>│all] 
+    buildkit [-V│--verbose] <subcommand> [<kit_name>] [<repo_name>│all]
        [-l│--kitloc <directory>]
 
     To add packages to an existing Kit.
 
     buildkit [-V│--verbose] addpkgs <kit_tarfile> [-p│--pkgdir <package_direc-
-       tory_list>] [-k│--kitversion <version>] [-r│--kitrelease <release] 
+       tory_list>] [-k│--kitversion <version>] [-r│--kitrelease <release]
        [-l│--kitloc <kit location>]
 
-    This tool is used to build and manage a Kit package.                          
-    The options are:                                                          
-        -h         - Provide usage info.                                      
+    This tool is used to build and manage a Kit package.
+    The options are:
+        -h         - Provide usage info.
         -k         - Kit version.
         -l         - Location of kit files. (Including kit name.)
         -p         - RPM package directory locations.
         -r         - Kit release.
-        -v         - Provide the version info.                                
-        command    - Several commands are supported. See the list below.      
-        -V         - Verbose mode. Outputs additional debug messages.         
-                                                                              
-    Supported subcommands:                                                       
-     create <kit basename> - creates a new Kit with the specified basename    
-     chkconfig             - checks the Kit build file                        
-     listrepo              - lists the Kit package repositories in the Kit    
-                             build file, and their build status               
-     buildrepo <reponame>  - builds the specified Kit package repository      
-     buildrepo all         - builds all the Kit package repositories      
-     cleanrepo <reponame>  - deletes the build files for the specified Kit    
-                             package repository                               
-     cleanrepo  all        - deletes the build files for all Kit package      
-                             repositories                                     
-     buildtar              - builds the Kit tarfile                           
-     cleantar              - deletes the Kit deployment directory and Kit     
-                             tarfile                   
+        -v         - Provide the version info.
+        command    - Several commands are supported. See the list below.
+        -V         - Verbose mode. Outputs additional debug messages.
+
+    Supported subcommands:
+     create <kit basename> - creates a new Kit with the specified basename
+     chkconfig             - checks the Kit build file
+     listrepo              - lists the Kit package repositories in the Kit
+                             build file, and their build status
+     buildrepo <reponame>  - builds the specified Kit package repository
+     buildrepo all         - builds all the Kit package repositories
+     cleanrepo <reponame>  - deletes the build files for the specified Kit
+                             package repository
+     cleanrepo  all        - deletes the build files for all Kit package
+                             repositories
+     buildtar              - builds the Kit tarfile
+     cleantar              - deletes the Kit deployment directory and Kit
+                             tarfile
      cleanall              - equivalent to buildkit cleanrepo all and
                                             buildkit cleantar
-     addpkgs -p <pkgdir> <kit tarfile> 
+     addpkgs -p <pkgdir> <kit tarfile>
                            - add product package rpms to a shipped tarfile
                              named kitname.NEEDS_PRODUCT_PKGS.tar.bz2
      \n";
@@ -667,7 +667,7 @@ sub kit_buildrepo
 
 =head3    kit_buildrepo1
 	
-          
+
 
 =cut
 
@@ -1224,7 +1224,7 @@ sub edit_bldkitconf
 
 =head3    load_bldkitconf
 	
-   load the kitbuild.conf file into a global data structure and 
+   load the kitbuild.conf file into a global data structure and
    verify that the general syntax is correct.
 
 =cut
@@ -1514,7 +1514,7 @@ sub validate_bldkitconf
                 print "Warning:  Kit osminorversion is set to \"$::bldkit_config->{kit}{entries}[0]->{osminorversion}\", but this does not match kitrepo $kr->{kitrepoid} osminorversion \"$kr->{osminorversion}\".  Processing will continue, but verify that you do not have an error in your buildkit configuration file. \n";
             }
             $reponame .= '.' . $krminor;
-            $::bldkit_config->{kit}{entries}[0]->{osminorversion} = $krminor;            
+            $::bldkit_config->{kit}{entries}[0]->{osminorversion} = $krminor;
         }
         if ((defined($::bldkit_config->{kit}{entries}[0]->{osarch})) &&
             ($::bldkit_config->{kit}{entries}[0]->{osarch} ne
@@ -2172,7 +2172,7 @@ sub build_kitcomp
 
 #-----------------------------------------------------------------------------
 
-=head3   update_kitcomp_kitpkgdeps 
+=head3   update_kitcomp_kitpkgdeps
 	
       Update the kitcomponent kitpkgdeps string
         For any kitpkgdep that does not explicitly specify a version-release
@@ -2181,7 +2181,7 @@ sub build_kitcomp
         comparison string.
       Reason we need to do all this:  We need to force yum/zypper to update
         the product rpms.  A simple package name in the kitcomponent meta rpm
-        REQUIRES entry will not cause the product to get updated if an older 
+        REQUIRES entry will not cause the product to get updated if an older
         version is already installed.  Need to explicitly require this version
         and release of the product package.
       input:  kitcomponent hash
@@ -2264,7 +2264,7 @@ sub update_kitcomp_kitpkgdeps
 
 =head3    gen_kitcomp_spec
 
-   generate the rpm spec file for the kitcomponent  metapkg rpm 
+   generate the rpm spec file for the kitcomponent  metapkg rpm
       input:  kitcomponent hash
               kitrepo hash
 
@@ -2466,7 +2466,7 @@ s/<<<INSERT_kitcomponent_postuninstall_script_HERE>>>/$postunscript/;
 
 #-----------------------------------------------------------------------------
 
-=head3   build_kitcomp_debian 
+=head3   build_kitcomp_debian
 
 
 
@@ -2822,7 +2822,7 @@ s/<<<INSERT_kitcomponent_postuninstall_script_HERE>>>/$postunscript/;
 
 =head3    load_script
 	
-   load a kitcomponent script into a single return string 
+   load a kitcomponent script into a single return string
      with imbedded newline chars
       input:  fullpath of scriptname
 
@@ -3186,7 +3186,7 @@ sub create_builddir
 	
    Create the build directory for a PARTIAL kit (needs external pkgs)
    and copy in all required files for building the kit tar file.
-   This includes most build input without editting files since 
+   This includes most build input without editting files since
    they will need to be generated at addpkgs time.
 
 =cut
@@ -3277,8 +3277,8 @@ sub create_PARTIAL_builddir
 =head3    edit_deployparams
 	
    Edit the kit deployment parameters to make sure it has correct
-   syntax for xCAT otherpkglist support 
-   
+   syntax for xCAT otherpkglist support
+
 
 =cut
 
@@ -3364,7 +3364,7 @@ sub edit_deployparams
 =head3    edit_plugin
 	
    Edit the kit plugin file to insert the full kit name
-   
+
 
 =cut
 
@@ -4058,11 +4058,11 @@ sub NEW_kit_addpkgs
     Check the compatible frameworks of the kit to see if it is
 	compatible with the running code.
 
-    If one of the compatible frameworks of the kit matches one of the 
+    If one of the compatible frameworks of the kit matches one of the
         compatible frameworks of the running code then we're good.
 
     NOTE:  compatible_kitframeworks are the kitframeworks that I can add
-        and kit frameworks that I can be added to. 
+        and kit frameworks that I can be added to.
 
     Returns:
         0 - kit framework value
diff --git a/xCAT-buildkit/debian/copyright b/xCAT-buildkit/debian/copyright
index f61d34dfe..87e60f492 100644
--- a/xCAT-buildkit/debian/copyright
+++ b/xCAT-buildkit/debian/copyright
@@ -85,4 +85,4 @@ Everyone is permitted to copy and distribute copies of this Agreement, but in or
 
 This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
 
- 
+
diff --git a/xCAT-buildkit/lib/perl/xCAT/BuildKitUtils.pm b/xCAT-buildkit/lib/perl/xCAT/BuildKitUtils.pm
index 0ee8c8669..4b9dfc0df 100644
--- a/xCAT-buildkit/lib/perl/xCAT/BuildKitUtils.pm
+++ b/xCAT-buildkit/lib/perl/xCAT/BuildKitUtils.pm
@@ -227,7 +227,7 @@ sub get_latest_version_deb
 
 =head3    find_latest_pkg
 
-          Find the latest rpm package give the rpm name and a list of 
+          Find the latest rpm package give the rpm name and a list of
                  possible package locations.
 
         Arguments:
@@ -325,7 +325,7 @@ sub find_latest_pkg
 
 =head3    find_latest_pkg_deb
 
-          Find the latest deb package give the deb name and a list of 
+          Find the latest deb package give the deb name and a list of
                  possible package locations.
 
         Arguments:
@@ -432,7 +432,7 @@ sub find_latest_pkg_deb
         Example:
 
         Comments:
-                The return value is generated with the Require query 
+                The return value is generated with the Require query
 
 =cut
 
@@ -733,7 +733,7 @@ sub CheckVersion
 #-------------------------------------------------------------------------------
 
 =head3  osver
-        Returns the os and version of the System you are running on 
+        Returns the os and version of the System you are running on
     Arguments:
       none
     Returns:
@@ -898,7 +898,7 @@ sub release_lock {
 
 #-------------------------------------------------------------------------------
 
-=head3   get_unique_members 
+=head3   get_unique_members
     Description:
         Return an array which have unique members
 
diff --git a/xCAT-buildkit/pods/man1/buildkit.1.pod b/xCAT-buildkit/pods/man1/buildkit.1.pod
index b5029a152..7d9c49756 100644
--- a/xCAT-buildkit/pods/man1/buildkit.1.pod
+++ b/xCAT-buildkit/pods/man1/buildkit.1.pod
@@ -8,7 +8,7 @@ B<buildkit> [B<-?>|B<-h>|B<--help>] [B<-v>|B<--version>]
 
 To build a new Kit
 
-B<buildkit> [B<-V>|B<--verbose]> I<subcommand> [I<kit_name>] [I<repo_name> | B<all>] [B<-l>|B<--kitloc> I<kit_location>] 
+B<buildkit> [B<-V>|B<--verbose]> I<subcommand> [I<kit_name>] [I<repo_name> | B<all>] [B<-l>|B<--kitloc> I<kit_location>]
 
 To add packages to an existing Kit.
 
@@ -33,11 +33,11 @@ For example, to create a new kit named "prodkit" in the directory /home/mykits/
 =item 1.
 
 If no location is provided then the command will create a subdirectory called "prodkit" in the current directory "/home/mykits" and the new kit files will be created there.
- 
+
 B<cd /home/mykits>
 
-B<buildkit create prodkit> 
-  
+B<buildkit create prodkit>
+
 or
 
 =item 2.
@@ -47,16 +47,16 @@ If a location is provided then the Kit files will be created there. Note that th
 B<buidkit create prodkit -l /home/mykits/prodkit>
 
 =back
-	 
+	
 In both cases the /home/mykits/prodkit directory is created and the inital files for the kit are created in that directory.
-	  
+	
 The following example illustrates the basic process for building a new Kit. In this example we are building a Kit named "mytstkit".
 
 =over 4
 
 =item 1.
 
-Change to the directory where you wish to create the Kit. 
+Change to the directory where you wish to create the Kit.
 
 =item 2.
 
@@ -98,7 +98,7 @@ B<buildkit listrepo>
 
 For each repo name listed, build the repository.  Note that if you need to build repositories for OS distributions, versions, or architectures that do not match the current system, you may need to copy your kit template directory to an appropriate server to build that repository, and then copy the results back to your main build server.  For example, to build a repo named "rhels6.3" you would run the following command.
 
-B<buildkit buildrepo rhels6.3> 
+B<buildkit buildrepo rhels6.3>
 
 or, you can build all of the repos at one time if there are no OS or architecture dependencies for kitcomponent package builds or kitpackage builds:
 
@@ -156,9 +156,9 @@ Creates a new kit build directory structure for kit I<kit_basename> using the lo
 
 =item  B<chkconfig>
 
-Reads the buildkit.conf file, verifies that the file syntax is correct and that all specified files exist. 
+Reads the buildkit.conf file, verifies that the file syntax is correct and that all specified files exist.
 
-=item  B<listrepo> 
+=item  B<listrepo>
 
 Reads the buildkit.conf file, lists all Kit package repositories listed in the file, and reports the build status for each repository.
 
@@ -170,11 +170,11 @@ Reads the buildkit.conf file, and builds the specified Kit package repository.
 
 Reads the buildkit.conf file, and deletes all the package files and package meta data files from the <kit_location>/build/kit_repodir/I<repo_name> directory.  If B<all> is specified, all kit repository files are deleted.
 
-=item  B<buildtar> 
+=item  B<buildtar>
 
 Reads the buildkit.conf file, validates that all kit repositories have been built, and builds the Kit tar file <kit_location>/I<kitname>.tar.bz2.
 
-=item  B<cleantar> 
+=item  B<cleantar>
 
 Reads the <kit_location>/buildkit.conf file and I<deletes> the following:
 
@@ -188,7 +188,7 @@ Reads the <kit_location>/buildkit.conf file and I<deletes> the following:
 
 - <kit_location>/tmp
 
-- <kit_location>/debbuild 
+- <kit_location>/debbuild
 
 =back
 
@@ -198,7 +198,7 @@ Caution:  Make sure you back up any tar files you would like to keep before runn
 
 Equivalent to running B<buildkit cleanrepo all> and B<buildkit cleantar>.
 
-=item  B<addpkgs> 
+=item  B<addpkgs>
 
 I<kit_tarfile> {B<-p> | B<--pkgdir> I<package_directory_list>} [B<-k> | B<--kitversion> I<version>] [B<-r> | B<--kitrelease> I<release>]
 
diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/buildkit.conf b/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/buildkit.conf
index bc42a7e94..42bf16678 100644
--- a/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/buildkit.conf
+++ b/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/buildkit.conf
@@ -1,13 +1,13 @@
 # Kit Build File
-# 
+#
 # This file was initially auto-generated by the buildkit CLI command.
 # To create a new kit, the user should modify this file accordingly.
 # Refer to the buildkit manpage for further details.
 #
 
-# kit: This section defines general info for the Kit. 
+# kit: This section defines general info for the Kit.
 #      There must be exactly one kit section in a kit build file.
-# 
+#
 # kit attributes:
 #    basename        (mandatory) Kit base name. e.g., kit-lsf
 #    description     (optional)  Kit description.
@@ -24,7 +24,7 @@
 #    kitlicense      (mandatory) Kit license string to be built into all
 #                       kitcomponent packages
 #    kittarfilename  (optional) Filename.tar.bz2 to be used for the generated
-#                       kit.  Default is <basename>-<version>-<ostype>.tar.bz2 
+#                       kit.  Default is <basename>-<version>-<ostype>.tar.bz2
 kit:
    basename=chef
    description=Kit for installing chef server, client and workstation
@@ -35,9 +35,9 @@ kit:
 
 
 # kitrepo: This section defines a Kit Package Repository.
-#          There must be at least one kitrepo section in a kit build file.  
+#          There must be at least one kitrepo section in a kit build file.
 #          If you want to support multiple OSes, you should create a separate
-#          repo for each OS.  Also, no two repos can be defined with the same 
+#          repo for each OS.  Also, no two repos can be defined with the same
 #          OS name, major/minor version and arch. For example, you cannot have
 #          two repos for RHEL 6.2 x86_64 in the same kit.
 #
@@ -48,7 +48,7 @@ kit:
 #    osmajorversion     (mandatory) OS major version. e.g., 6
 #    osminorversion     (optional)  OS minor version.
 #    osarch             (mandatory) OS architecture. e.g., x86_64
-#    compat_osbasenames (optional)  Comma-separated list of compatible 
+#    compat_osbasenames (optional)  Comma-separated list of compatible
 #                         OS distro base names. e.g., centos
 
 kitrepo:
@@ -61,14 +61,14 @@ kitrepo:
    #compat_osbasenames=
 
 
-# kitcomponent: This section defines one Kit Component.  
-#               There can be zero or more kitcomponent sections. 
+# kitcomponent: This section defines one Kit Component.
+#               There can be zero or more kitcomponent sections.
 #               If you want to build a component which supports multiple OSes,
-#               you should create one kitcomponent section for each OS.  
-#               Also, no two components in a kit can be defined with the same 
-#               base name. 
+#               you should create one kitcomponent section for each OS.
+#               Also, no two components in a kit can be defined with the same
+#               base name.
 #               You can define multiple kit components with the same base name
-#               only if each kit component using this base name meets these 
+#               only if each kit component using this base name meets these
 #               requirements:
 #                 - Each kit component must be defined with the same version
 #                   and release number
@@ -95,20 +95,20 @@ kitrepo:
 #    kitpkgdeps      (optional)  Comma-separated list of kit package names that
 #                       will be listed as "REQUIRES" when building this kit
 #                       component. Each package must be defined in a separate
-#                       kitpackage section. Each package must be in the same 
+#                       kitpackage section. Each package must be in the same
 #                       kitrepo as this kit component.
-#    non_native_pkgs (optional)  
-#                       Comma-separated list of non-native package 
-#                       paths that will be included as files in this kit 
-#                       component. All filenames are relative to 
+#    non_native_pkgs (optional)
+#                       Comma-separated list of non-native package
+#                       paths that will be included as files in this kit
+#                       component. All filenames are relative to
 #                       <Kit Build Directory>/source_packages and may contain
 #                       wildcards.  If a filename is prefixed by 'EXTERNALPKGS:'
 #                       the file will not be built into the kit tarfile, but
 #                       will need to be added later with a 'buildkit addpkgs'
-#                       command. 
-#                       Files will be placed in 
+#                       command.
+#                       Files will be placed in
 #                         /opt/xcat/kits/<kitbasename>/<kitcomponent_name>
-#                       when the kitcomponent package is deployed to an 
+#                       when the kitcomponent package is deployed to an
 #                       OS image.
 #                       Kit component deployment scripts must be specified
 #                       to manage these files.
@@ -117,11 +117,11 @@ kitrepo:
 #                       section.
 #   exlist           (optional) Exclude list file for stateless image, relative
 #                       to <Kit Build Directory>/other_files
-#   Kit component deployment scripts (optional)  Each attribute specifies 
+#   Kit component deployment scripts (optional)  Each attribute specifies
 #                       script path relative to <Kit Build Directory>/scripts
 #                       Script attributes:
-#                         preinstall, postinstall, preuninstall, postuninstall, 
-#                         preupgrade, postupgrade, postbootscripts, 
+#                         preinstall, postinstall, preuninstall, postuninstall,
+#                         preupgrade, postupgrade, postbootscripts,
 #                         genimage_postinstall
 kitcomponent:
     basename=chef_server_kit
@@ -132,7 +132,7 @@ kitcomponent:
     kitrepoid=rhels6_x86_64
     kitpkgdeps=chef-server
     postinstall=server.rpm_post
-    postbootscripts=server.post 
+    postbootscripts=server.post
 
 kitcomponent:
     basename=chef_client_kit
@@ -143,7 +143,7 @@ kitcomponent:
     kitrepoid=rhels6_x86_64
     kitpkgdeps=chef
     postinstall=client.rpm_post
-    postbootscripts=client.post 
+    postbootscripts=client.post
 
 kitcomponent:
     basename=chef_workstation_kit
@@ -159,38 +159,38 @@ kitcomponent:
 
 
 # kitpackage: This section defines one Kit Package, and how to build it.
-#             There can be zero or more kitpackage sections.  
+#             There can be zero or more kitpackage sections.
 #             All filenames should be relative paths to
-#                <Kit Build Directory>/source_packages  
-#             If you want to build a package which can run on multiple OSes, 
+#                <Kit Build Directory>/source_packages
+#             If you want to build a package which can run on multiple OSes,
 #             you have two options:
-#               1. Build a separate package for each OS you want to support.  
-#                  For this option, you need to define one kitpackage section 
+#               1. Build a separate package for each OS you want to support.
+#                  For this option, you need to define one kitpackage section
 #                  per supported OS.
-#               2. Build one package that can run on multiple OSes.  
-#                  If you are building an RPM package, you are responsible for 
-#                  creating an RPM spec file that can run on multiple OSes.  
+#               2. Build one package that can run on multiple OSes.
+#                  If you are building an RPM package, you are responsible for
+#                  creating an RPM spec file that can run on multiple OSes.
 #                  For this option, you need to define one kitpackage section
 #                  which contains multiple kitrepoid lines.
-# 
+#
 # kitpackage attributes:
-#    filename   (mandatory) Package filename.  
+#    filename   (mandatory) Package filename.
 #    kitrepoid  (mandatory) A comma-separated list of kit reponames this package
 #                 belongs to.  If multiple repos are defined, the package will
 #                 be built for the first repo only. For the other repos,
 #                 a symlink is created to the package built for the first repo.
-#   Package build methods (optional)  
-#                 Define how to build the packages. 
+#   Package build methods (optional)
+#                 Define how to build the packages.
 #                 If you don't specify a build method, the default behavior is
-#                 to assume the package is pre-built under 
+#                 to assume the package is pre-built under
 #                   <Kit Build Directory>/source_packages
-#                 All files in this section are relative to 
+#                 All files in this section are relative to
 #                   <Kit Build Directory>/source_packages
 #                 There are four methods to build packages.
 #                   1. Use pre-built RPM package
 #                       The filename may contain wildcards to avoid needing to
 #                       specify an explicit package version-release filename.
-#                       isexternalpkg:  'no'|'0', 'yes'|'1'  (default:  'no') 
+#                       isexternalpkg:  'no'|'0', 'yes'|'1'  (default:  'no')
 #                         Indicates whether the RPM package will be added to the
 #                         the kit tar file now as part of the kit build process,
 #                         or whether the customer will need to separately
diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/client.post b/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/client.post
index f76525258..23d69a127 100755
--- a/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/client.post
+++ b/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/client.post
@@ -1,21 +1,21 @@
-#!/bin/sh 
+#!/bin/sh
 # IBM(c) 2013 EPL license http://www.eclipse.org/legal/epl-v10.html
 
 
 #-------------------------------------------------------------------------------
 #=head1  client.post
-#=head2  This command configures the chef client on a xCAT node. It is used 
+#=head2  This command configures the chef client on a xCAT node. It is used
 #        as a postbootscript for chef_client kit
 #=cut
 #-------------------------------------------------------------------------------
-if [ "$NODESETSTATE" = "install" ]; then     
-    #prevent getting called during full install bootup  
+if [ "$NODESETSTATE" = "install" ]; then
+    #prevent getting called during full install bootup
     #because the function will be called in the rpm %post section instead
     exit 0
 else
     if [ -f "/proc/cmdline" ]; then   # prevent running it during install into chroot image
         #configure the chef client configuration files
-	    /xcatpost/config_chef_client "$@" 
+	    /xcatpost/config_chef_client "$@"
     fi
 fi
 
diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/client.rpm_post b/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/client.rpm_post
index 709c34b10..857af6938 100755
--- a/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/client.rpm_post
+++ b/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/client.rpm_post
@@ -1,16 +1,16 @@
-#!/bin/sh 
+#!/bin/sh
 # IBM(c) 2013 EPL license http://www.eclipse.org/legal/epl-v10.html
 
 
 #-------------------------------------------------------------------------------
 #=head1  client.post
-#=head2  This command configures the chef client on a xCAT node. It is used 
+#=head2  This command configures the chef client on a xCAT node. It is used
 #        as a post installation script for chef_client_kit.rpm
 #=cut
 #-------------------------------------------------------------------------------
 if [ -f "/proc/cmdline" ]; then   # prevent running it during install into chroot image
         #configure the chef client configuration files
-	    /xcatpost/config_chef_client "$@" 
+	    /xcatpost/config_chef_client "$@"
 fi
 
 exit 0
diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/server.post b/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/server.post
index 8b5d534d4..bdb880520 100755
--- a/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/server.post
+++ b/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/server.post
@@ -8,14 +8,14 @@
 #        It is used as a postbootscript for chef_server kit
 #=cut
 #-------------------------------------------------------------------------------
-if [ "$NODESETSTATE" = "install" ]; then     
-    #prevent getting called during full install bootup  
+if [ "$NODESETSTATE" = "install" ]; then
+    #prevent getting called during full install bootup
     #because the function will be called in the rpm %post section instead
     exit 0
 else
     if [ -f "/proc/cmdline" ]; then   # prevent running it during install into chroot image
         #Now configure the chef server
-	    /xcatpost/config_chef_server 
+	    /xcatpost/config_chef_server
     fi
 fi
 
diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/server.rpm_post b/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/server.rpm_post
index 8c6ac5de7..f42f7b2d8 100755
--- a/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/server.rpm_post
+++ b/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/server.rpm_post
@@ -10,7 +10,7 @@
 #-------------------------------------------------------------------------------
 if [ -f "/proc/cmdline" ]; then   # prevent running it during install into chroot image
         #Now configure the chef server
-	    /xcatpost/config_chef_server 
+	    /xcatpost/config_chef_server
 fi
 
 exit 0
diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/workstation.post b/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/workstation.post
index 44e5a87a8..9f39b9135 100755
--- a/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/workstation.post
+++ b/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/workstation.post
@@ -1,21 +1,21 @@
-#!/bin/sh 
+#!/bin/sh
 # IBM(c) 2013 EPL license http://www.eclipse.org/legal/epl-v10.html
 
 
 #-------------------------------------------------------------------------------
 #=head1  workstation.post
-#=head2  This command configures the chef workstation on a xCAT node. It is used 
-#        as a postbootscript for chef_workstation kit 
+#=head2  This command configures the chef workstation on a xCAT node. It is used
+#        as a postbootscript for chef_workstation kit
 #=cut
 #-------------------------------------------------------------------------------
-if [ "$NODESETSTATE" = "install" ]; then     
-    #prevent getting called during full install bootup  
+if [ "$NODESETSTATE" = "install" ]; then
+    #prevent getting called during full install bootup
     #because the function will be called in the rpm %post section instead
     exit 0
 else
     if [ -f "/proc/cmdline" ]; then   # prevent running it during install into chroot image
         #configure the chef workstation configuration files
-	    /xcatpost/config_chef_workstation "$@" 
+	    /xcatpost/config_chef_workstation "$@"
     fi
 fi
 
diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/workstation.rpm_post b/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/workstation.rpm_post
index 5446e8fa1..6d0f8ab58 100755
--- a/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/workstation.rpm_post
+++ b/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/scripts/workstation.rpm_post
@@ -1,16 +1,16 @@
-#!/bin/sh 
+#!/bin/sh
 # IBM(c) 2013 EPL license http://www.eclipse.org/legal/epl-v10.html
 
 
 #-------------------------------------------------------------------------------
 #=head1  workstation.post
-#=head2  This command configures the chef workstation on a xCAT node. It is used 
-#        as a post installation script for chef_workstation_kit.rpm 
+#=head2  This command configures the chef workstation on a xCAT node. It is used
+#        as a post installation script for chef_workstation_kit.rpm
 #=cut
 #-------------------------------------------------------------------------------
 if [ -f "/proc/cmdline" ]; then   # prevent running it during install into chroot image
         #configure the chef workstation configuration files
-	    /xcatpost/config_chef_workstation "$@" 
+	    /xcatpost/config_chef_workstation "$@"
 fi
 
 exit 0
diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/puppet/puppet-x86_64/buildkit.conf b/xCAT-buildkit/share/xcat/kits/kit_build/puppet/puppet-x86_64/buildkit.conf
index 7adca4452..ef304eb99 100644
--- a/xCAT-buildkit/share/xcat/kits/kit_build/puppet/puppet-x86_64/buildkit.conf
+++ b/xCAT-buildkit/share/xcat/kits/kit_build/puppet/puppet-x86_64/buildkit.conf
@@ -1,13 +1,13 @@
 # Kit Build File
-# 
+#
 # This file was initially auto-generated by the buildkit CLI command.
 # To create a new kit, the user should modify this file accordingly.
 # Refer to the buildkit manpage for further details.
 #
 
-# kit: This section defines general info for the Kit. 
+# kit: This section defines general info for the Kit.
 #      There must be exactly one kit section in a kit build file.
-# 
+#
 # kit attributes:
 #    basename        (mandatory) Kit base name. e.g., kit-lsf
 #    description     (optional)  Kit description.
@@ -23,7 +23,7 @@
 #    kitlicense      (mandatory) Kit license string to be built into all
 #                       kitcomponent packages
 #    kittarfilename  (optional) Filename.tar.bz2 to be used for the generated
-#                       kit.  Default is <basename>-<version>-<ostype>.tar.bz2 
+#                       kit.  Default is <basename>-<version>-<ostype>.tar.bz2
 kit:
    basename=puppet
    description=Kit for installing puppet server and client
@@ -38,9 +38,9 @@ kit:
 
 
 # kitrepo: This section defines a Kit Package Repository.
-#          There must be at least one kitrepo section in a kit build file.  
+#          There must be at least one kitrepo section in a kit build file.
 #          If you want to support multiple OSes, you should create a separate
-#          repo for each OS.  Also, no two repos can be defined with the same 
+#          repo for each OS.  Also, no two repos can be defined with the same
 #          OS name, major/minor version and arch. For example, you cannot have
 #          two repos for RHEL 6.2 x86_64 in the same kit.
 #
@@ -51,7 +51,7 @@ kit:
 #    osmajorversion     (mandatory) OS major version. e.g., 6
 #    osminorversion     (optional)  OS minor version.
 #    osarch             (mandatory) OS architecture. e.g., x86_64
-#    compat_osbasenames (optional)  Comma-separated list of compatible 
+#    compat_osbasenames (optional)  Comma-separated list of compatible
 #                         OS distro base names. e.g., centos
 
 kitrepo:
@@ -64,14 +64,14 @@ kitrepo:
    #compat_osbasenames=
 
 
-# kitcomponent: This section defines one Kit Component.  
-#               There can be zero or more kitcomponent sections. 
+# kitcomponent: This section defines one Kit Component.
+#               There can be zero or more kitcomponent sections.
 #               If you want to build a component which supports multiple OSes,
-#               you should create one kitcomponent section for each OS.  
-#               Also, no two components in a kit can be defined with the same 
-#               base name. 
+#               you should create one kitcomponent section for each OS.
+#               Also, no two components in a kit can be defined with the same
+#               base name.
 #               You can define multiple kit components with the same base name
-#               only if each kit component using this base name meets these 
+#               only if each kit component using this base name meets these
 #               requirements:
 #                 - Each kit component must be defined with the same version
 #                   and release number
@@ -96,13 +96,13 @@ kitrepo:
 #    kitpkgdeps      (optional)  Comma-separated list of kit package names that
 #                       will be listed as "REQUIRES" when building this kit
 #                       component. Each package must be defined in a separate
-#                       kitpackage section. Each package must be in the same 
+#                       kitpackage section. Each package must be in the same
 #                       kitrepo as this kit component.
 #    non_native_pkgs (optional)  TBD -- NOT SUPPORTED YET!
-#                       Comma-separated list of non-native package 
-#                       paths that will be included as files in this kit 
-#                       component. All filenames are relative to 
-#                       <Kit Build Directory>/source_packages 
+#                       Comma-separated list of non-native package
+#                       paths that will be included as files in this kit
+#                       component. All filenames are relative to
+#                       <Kit Build Directory>/source_packages
 #                       Kit component deployment scripts must be specified
 #                       to manage these files.
 #   driverpacks      (optional) Comma-separated list of driver package filenames
@@ -110,11 +110,11 @@ kitrepo:
 #                       section.
 #   exlist           (optional) Exclude list file for stateless image, relative
 #                       to <Kit Build Directory>/other_files
-#   Kit component deployment scripts (optional)  Each attribute specifies 
+#   Kit component deployment scripts (optional)  Each attribute specifies
 #                       script path relative to <Kit Build Directory>/scripts
 #                       Script attributes:
-#                         preinstall, postinstall, preuninstall, postuninstall, 
-#                         preupgrade, postupgrade, postbootscripts, 
+#                         preinstall, postinstall, preuninstall, postuninstall,
+#                         preupgrade, postupgrade, postbootscripts,
 #                         genimage_postinstall
 kitcomponent:
     basename=puppet_client_kit
@@ -125,7 +125,7 @@ kitcomponent:
     kitrepoid=rhels6_x86_64
     kitpkgdeps=puppet
     postinstall=client.rpm_post
-    postbootscripts=client.post 
+    postbootscripts=client.post
 
 kitcomponent:
     basename=puppet_server_kit
@@ -136,40 +136,40 @@ kitcomponent:
     kitrepoid=rhels6_x86_64
     kitpkgdeps=puppet-server
     postinstall=server.rpm_post
-    postbootscripts=server.post  
+    postbootscripts=server.post
 
 
 # kitpackage: This section defines one Kit Package, and how to build it.
-#             There can be zero or more kitpackage sections.  
+#             There can be zero or more kitpackage sections.
 #             All filenames should be relative paths to
-#                <Kit Build Directory>/source_packages  
-#             If you want to build a package which can run on multiple OSes, 
+#                <Kit Build Directory>/source_packages
+#             If you want to build a package which can run on multiple OSes,
 #             you have two options:
-#               1. Build a separate package for each OS you want to support.  
-#                  For this option, you need to define one kitpackage section 
+#               1. Build a separate package for each OS you want to support.
+#                  For this option, you need to define one kitpackage section
 #                  per supported OS.
-#               2. Build one package that can run on multiple OSes.  
-#                  If you are building an RPM package, you are responsible for 
-#                  creating an RPM spec file that can run on multiple OSes.  
+#               2. Build one package that can run on multiple OSes.
+#                  If you are building an RPM package, you are responsible for
+#                  creating an RPM spec file that can run on multiple OSes.
 #                  For this option, you need to define one kitpackage section
 #                  which contains multiple kitrepoid lines.
-# 
+#
 # kitpackage attributes:
 #    filename   (mandatory) Package filename
-#    kitrepoid  (mandatory) The repo(s) this package belongs to.  
+#    kitrepoid  (mandatory) The repo(s) this package belongs to.
 #                 If multiple repos are defined, the package will be built for
 #                 the first repo only. For the other repos, a symlink is created
 #                 to the package built for the first repo.
-#   Package build methods (optional)  
-#                 Define how to build the packages. 
+#   Package build methods (optional)
+#                 Define how to build the packages.
 #                 If you don't specify a build method, the default behavior is
-#                 to assume the package is pre-built under 
+#                 to assume the package is pre-built under
 #                   <Kit Build Directory>/source_packages
-#                 All files in this section are relative to 
+#                 All files in this section are relative to
 #                   <Kit Build Directory>/source_packages
 #                 There are four methods to build packages.
 #                   1. Use pre-built RPM package
-#                       isexternalpkg:  'no'|'0', 'yes'|'1'  (default:  'no') 
+#                       isexternalpkg:  'no'|'0', 'yes'|'1'  (default:  'no')
 #                         Indicates whether the RPM package will be added to the
 #                         the kit tar file now as part of the kit build process,
 #                         or whether the customer will need to separately
diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/puppet/puppet-x86_64/scripts/client.post b/xCAT-buildkit/share/xcat/kits/kit_build/puppet/puppet-x86_64/scripts/client.post
index bdec2334a..a0a548486 100755
--- a/xCAT-buildkit/share/xcat/kits/kit_build/puppet/puppet-x86_64/scripts/client.post
+++ b/xCAT-buildkit/share/xcat/kits/kit_build/puppet/puppet-x86_64/scripts/client.post
@@ -1,20 +1,20 @@
-#!/bin/sh 
+#!/bin/sh
 # IBM(c) 2013 EPL license http://www.eclipse.org/legal/epl-v10.html
 
 
 #-------------------------------------------------------------------------------
 #=head1  client.post
-#=head2  This command configures the puppet client on a xCAT node. It is used 
-#        as a postbootscript for puppet kit. 
+#=head2  This command configures the puppet client on a xCAT node. It is used
+#        as a postbootscript for puppet kit.
 #=cut
 #-------------------------------------------------------------------------------
-if [ "$NODESETSTATE" = "install" ]; then     
-    #prevent getting called during full install bootup  
+if [ "$NODESETSTATE" = "install" ]; then
+    #prevent getting called during full install bootup
     #because the function will be called in the rpm %post section instead
     exit 0
 else
     #configure the puppet agent configuration files
-    /xcatpost/config_puppet_client "$@" 
+    /xcatpost/config_puppet_client "$@"
 fi
 
 exit 0
diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/puppet/puppet-x86_64/scripts/client.rpm_post b/xCAT-buildkit/share/xcat/kits/kit_build/puppet/puppet-x86_64/scripts/client.rpm_post
index e6c12c2df..65b311191 100755
--- a/xCAT-buildkit/share/xcat/kits/kit_build/puppet/puppet-x86_64/scripts/client.rpm_post
+++ b/xCAT-buildkit/share/xcat/kits/kit_build/puppet/puppet-x86_64/scripts/client.rpm_post
@@ -1,17 +1,17 @@
-#!/bin/sh 
+#!/bin/sh
 # IBM(c) 2013 EPL license http://www.eclipse.org/legal/epl-v10.html
 
 
 #-------------------------------------------------------------------------------
 #=head1  client.rpm_post
-#=head2  This command configures the puppet client on a xCAT node. It is used 
-#        as a post installation script for puppet_client_kit.rpm. 
+#=head2  This command configures the puppet client on a xCAT node. It is used
+#        as a post installation script for puppet_client_kit.rpm.
 #=cut
 #-------------------------------------------------------------------------------
 
 if [ -f "/proc/cmdline" ]; then   # prevent running it during install into chroot image
     #configure the puppet agent configuration files
-    /xcatpost/config_puppet_client "$@" 
+    /xcatpost/config_puppet_client "$@"
 fi
 
 exit 0
diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/puppet/puppet-x86_64/scripts/server.post b/xCAT-buildkit/share/xcat/kits/kit_build/puppet/puppet-x86_64/scripts/server.post
index b253cf331..7a11229ff 100755
--- a/xCAT-buildkit/share/xcat/kits/kit_build/puppet/puppet-x86_64/scripts/server.post
+++ b/xCAT-buildkit/share/xcat/kits/kit_build/puppet/puppet-x86_64/scripts/server.post
@@ -8,8 +8,8 @@
 #        It is used as a postbootscript for puppet kit.
 #=cut
 #-------------------------------------------------------------------------------
-if [ "$NODESETSTATE" = "install" ]; then     
-    #prevent getting called during full install bootup  
+if [ "$NODESETSTATE" = "install" ]; then
+    #prevent getting called during full install bootup
     #because the function will be called in the rpm %post section instead
     exit 0
 else
@@ -18,7 +18,7 @@ else
 	
     #restart puppet master
     service puppetmaster stop
-    kill $(ps auxww | grep puppet | grep master | grep -v grep | awk '{print $2}') 
+    kill $(ps auxww | grep puppet | grep master | grep -v grep | awk '{print $2}')
     service puppetmaster start
 fi
 
diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/puppet/puppet-x86_64/scripts/server.rpm_post b/xCAT-buildkit/share/xcat/kits/kit_build/puppet/puppet-x86_64/scripts/server.rpm_post
index 7e2e81899..2b2af0709 100755
--- a/xCAT-buildkit/share/xcat/kits/kit_build/puppet/puppet-x86_64/scripts/server.rpm_post
+++ b/xCAT-buildkit/share/xcat/kits/kit_build/puppet/puppet-x86_64/scripts/server.rpm_post
@@ -12,10 +12,10 @@
 if [ -f "/proc/cmdline" ]; then   # prevent running it during install into chroot image
     #Now configure the pupper server
     /xcatpost/config_puppet_server "$@"
-    
+
         #restart puppet master
     service puppetmaster stop
-    kill $(ps auxww | grep puppet | grep master | grep -v grep | awk '{print $2}') 
+    kill $(ps auxww | grep puppet | grep master | grep -v grep | awk '{print $2}')
     service puppetmaster start
 fi
 
diff --git a/xCAT-buildkit/share/xcat/kits/kit_template/buildkit.conf b/xCAT-buildkit/share/xcat/kits/kit_template/buildkit.conf
index edeeb644b..f38c68be2 100644
--- a/xCAT-buildkit/share/xcat/kits/kit_template/buildkit.conf
+++ b/xCAT-buildkit/share/xcat/kits/kit_template/buildkit.conf
@@ -1,8 +1,8 @@
 # Kit Build File
-# 
+#
 # A unique version of this file is automatically generated for a new Kit
-# when you run the buildkit command to create a new Kit. The basic template 
-# for this file is contained in the /opt/xcat/share/xcat/kits/kit_template 
+# when you run the buildkit command to create a new Kit. The basic template
+# for this file is contained in the /opt/xcat/share/xcat/kits/kit_template
 # directory.  Once the initial version of this file is generated you will
 # have to modify it by adding the details needed to build your new Kit.
 #
@@ -48,9 +48,9 @@
 #                      Use 1 for yes, 0 for no. Default: 0
 #
 #    kitdeployparams (optional)  Filename containing a list of kit deployment
-#                       parameters.  The name should be the full path name of 
-#                       the file relative to <Kit Build Directory>/other_files 
-#                     
+#                       parameters.  The name should be the full path name of
+#                       the file relative to <Kit Build Directory>/other_files
+#
 #    kitlicense      (mandatory) Kit license string to be built into all
 #                       kitcomponent packages.  (template default "EPL")
 #
@@ -75,7 +75,7 @@ kit:
   # osarch=
   # isinternal=
   # kitdeployparams=sample/kitdeployparams.lst
-  # kittarfilename=  
+  # kittarfilename=
 #
 # kitrepo: This stanza defines a Kit Package Repository.
 #          There must be at least one kitrepo stanza in a kit build file.
@@ -86,8 +86,8 @@ kit:
 #
 # kitrepo attributes:
 #    kitrepoid      (mandatory) Kit package repository ID. Must be unique within
-#                   this file.  A typical name may be something like: 
-#                   "<osbasename><osmajorversion>.<osminorversion>_<osarch>". 
+#                   this file.  A typical name may be something like:
+#                   "<osbasename><osmajorversion>.<osminorversion>_<osarch>".
 #                     (ex. "rhels6.4_x86_64")
 #
 #    osbasename     (mandatory) OS distro base name. (ex. "rhels")
@@ -119,17 +119,17 @@ kitrepo:
 #                 - Each kit component must be defined with the same version
 #                   and release number
 #                 - Each kit component must be defined with a unique kitrepoid
-# 
+#
 # kitcomponent attributes:
-#    basename        (mandatory) Kit component base name 
+#    basename        (mandatory) Kit component base name
 #                           (ex. "myproduct_compute")
 #
 #    description     (optional)  Kit component description
 #
-#    version         (optional)  Kit component version.  The default is 
+#    version         (optional)  Kit component version.  The default is
 #                        the kit version.
 #
-#    release         (optional)  Kit component release.  The default is the 
+#    release         (optional)  Kit component release.  The default is the
 #                            kit release.
 #
 #    serverroles     (mandatory) Comma-separated list of node types that this
@@ -144,17 +144,17 @@ kitrepo:
 #                       dependencies.  These kit components can be included in
 #                       this kit or in other kits.
 #
-#    ospkgdeps       (optional)  Comma-separated list of OS RPM dependency 
+#    ospkgdeps       (optional)  Comma-separated list of OS RPM dependency
 #                       basenames.
 #                       These packages must be shipped with the OS distro.
 #                       (ex. "libacl(x86-32)")
 #
-#    kitpkgdeps      (mandatory IF product RPMs will be included in this Kit)  
-#                       Comma-separated list of RPM basenames. Each RPM must 
-#                       be defined in a separate kitpackage stanza. Each RPM 
-#                       package must be in the same kitrepo as this kit component. 
+#    kitpkgdeps      (mandatory IF product RPMs will be included in this Kit)
+#                       Comma-separated list of RPM basenames. Each RPM must
+#                       be defined in a separate kitpackage stanza. Each RPM
+#                       package must be in the same kitrepo as this kit component.
 #                       (ex. "xlc(x86-32)")
-#                 
+#
 #    non_native_pkgs (optional)
 #                       Comma-separated list of non-native package
 #                       paths that will be included as files in this kit
@@ -221,7 +221,7 @@ kitcomponent:
 #
 #
 # kitpackage attributes:
-#   filename   (mandatory) Package filename. The filename may contain 
+#   filename   (mandatory) Package filename. The filename may contain
 #                         wildcards to avoid needing to
 #                       specify an explicit package version-release filename.
 #
@@ -230,17 +230,17 @@ kitcomponent:
 #                 be built for the first repo only. For the other repos,
 #                 a symlink is created to the package built for the first repo.
 #
-#    isexternalpkg  (mandatory) Indicates if the package will be included 
+#    isexternalpkg  (mandatory) Indicates if the package will be included
 #                      in this kit or added later.
 #                   'no' or '0' means the package is included.
 #                   'yes' or '1'  means the packages will be added later.
 #                   The default if not set is 'no'.
 #
-#    rpm_prebuiltdir  (mandatory IF isexternalpkg=no)  Path to the directory 
-#                      containing the pre-built RPMs relative to 
+#    rpm_prebuiltdir  (mandatory IF isexternalpkg=no)  Path to the directory
+#                      containing the pre-built RPMs relative to
 #                   <Kit Build Directory>/source_packages directory.
-#                   For example, if the file is 
-#                   "<Kit Build Directory>/source_packages/foobar/foo.rpm" 
+#                   For example, if the file is
+#                   "<Kit Build Directory>/source_packages/foobar/foo.rpm"
 #                   then set "rpm_prebuiltdir=foobar".
 kitpackage:
    filename=pkg1-*.noarch.rpm
diff --git a/xCAT-buildkit/share/xcat/kits/kit_template/plugins/sample/imageprofile.pm b/xCAT-buildkit/share/xcat/kits/kit_template/plugins/sample/imageprofile.pm
index dc1108125..4da8db07e 100644
--- a/xCAT-buildkit/share/xcat/kits/kit_template/plugins/sample/imageprofile.pm
+++ b/xCAT-buildkit/share/xcat/kits/kit_template/plugins/sample/imageprofile.pm
@@ -96,7 +96,7 @@ $PLUGIN_KITNAME = "<<<buildkit_WILL_INSERT_kitname_HERE>>>";
 =head1
 
     Image Profile Kit Plugin
-    This plugin contains commands to run custom actions 
+    This plugin contains commands to run custom actions
     during image profile operations.
 
 =cut
@@ -232,7 +232,7 @@ sub process_request {
 
 =head3  kitimagepregenerate
 
-     This command is called before an image profile 
+     This command is called before an image profile
      is created with a specified set of parameters.
 
      Command-line interface:
@@ -303,7 +303,7 @@ sub kitimagepregenerate {
 
 =head3  kitimagepostgenerate
 
-     This command is called after an image profile 
+     This command is called after an image profile
      is created.
 
      Command-line interface:
@@ -353,7 +353,7 @@ sub kitimagepostgenerate {
 
 =head3  kitimageprecopy
 
-     This command is called before an image profile 
+     This command is called before an image profile
      is copied with a specified set of parameters.
 
      Command-line interface:
@@ -424,7 +424,7 @@ sub kitimageprecopy {
 
 =head3  kitimagepostcopy
 
-     This command is called after an image profile 
+     This command is called after an image profile
      is copied.
 
      Command-line interface:
@@ -474,7 +474,7 @@ sub kitimagepostcopy {
 
 =head3  kitimagepreupdate
 
-     This command is called before an image profile 
+     This command is called before an image profile
      is updated with a specified set of parameters.
 
      Command-line interface:
@@ -545,7 +545,7 @@ sub kitimagepreupdate {
 
 =head3  kitimagepostupdate
 
-     This command is called after an image profile 
+     This command is called after an image profile
      is updated.
 
      Command-line interface:
@@ -594,7 +594,7 @@ sub kitimagepostupdate {
 
 =head3  kitimagepredelete
 
-     This command is called before an image profile 
+     This command is called before an image profile
      is deleted.
 
      Command-line interface:
@@ -644,7 +644,7 @@ sub kitimagepredelete {
 
 =head3  kitimagepostdelete
 
-     This command is called after an image profile 
+     This command is called after an image profile
      is deleted.
 
      Command-line interface:
@@ -695,7 +695,7 @@ sub kitimagepostdelete {
 
 =head3  parse_str_arg
 
-    Utility function to extract the string value of an 
+    Utility function to extract the string value of an
     argument in this format:
          PARAM=string1
 
@@ -725,7 +725,7 @@ sub parse_str_arg {
 
 =head3  parse_list_arg
 
-    Utility function to extract the list of values of 
+    Utility function to extract the list of values of
     an argument in this format:
          PARAM=value1,value2,value3
 
diff --git a/xCAT-buildkit/share/xcat/kits/kit_template/plugins/sample/nodemgmt.pm b/xCAT-buildkit/share/xcat/kits/kit_template/plugins/sample/nodemgmt.pm
index 8df5872fb..2cd58785c 100644
--- a/xCAT-buildkit/share/xcat/kits/kit_template/plugins/sample/nodemgmt.pm
+++ b/xCAT-buildkit/share/xcat/kits/kit_template/plugins/sample/nodemgmt.pm
@@ -85,7 +85,7 @@ $PLUGIN_KITNAME = "<<<buildkit_WILL_INSERT_kitname_HERE>>>";
 =head1
 
     Node Management Kit Plugin
-    This plugin contains commands to run custom actions 
+    This plugin contains commands to run custom actions
     during node management operations.
 
 =cut
@@ -197,7 +197,7 @@ sub process_request {
 
 =head3  kitnodeadd
 
-    This command is called when one or more nodes are added 
+    This command is called when one or more nodes are added
     to the cluster.
 
     Command-line interface:
@@ -248,7 +248,7 @@ sub kitnodeadd {
 
 =head3  kitnoderemove
 
-    This command is called when one or more nodes are 
+    This command is called when one or more nodes are
     removed from the cluster.
 
     Command-line interface:
@@ -299,7 +299,7 @@ sub kitnoderemove {
 
 =head3  kitnodeupdate
 
-    This command is called when the configuration of one 
+    This command is called when the configuration of one
     or more nodes are updated.
 
     Command-line interface:
@@ -351,7 +351,7 @@ sub kitnodeupdate {
 =head3  kitnoderefresh
 
     This command is called to refresh node-related configuration
-    files. 
+    files.
 
     Command-line interface:
          kitnoderefresh <noderange>
diff --git a/xCAT-buildkit/share/xcat/kits/kit_template/scripts/sample/genimage_post.sh b/xCAT-buildkit/share/xcat/kits/kit_template/scripts/sample/genimage_post.sh
index 98829792d..d47430437 100644
--- a/xCAT-buildkit/share/xcat/kits/kit_template/scripts/sample/genimage_post.sh
+++ b/xCAT-buildkit/share/xcat/kits/kit_template/scripts/sample/genimage_post.sh
@@ -5,14 +5,14 @@ rpmdir="/opt/xcat/kits/<<<buildkit_WILL_INSERT_kit_basename_HERE>>>/<<<buildkit_
 if [[ ! -z "$installroot" ]]; then
     if [ -n "`ls $installroot$rpmdir/*.deb 2> /dev/null`" ] ; then
         dpkg -i --force-all --instdir=$installroot  $installroot$rpmdir/*.deb
-   
+
     elif [ -n "`ls $installroot$rpmdir/*.rpm 2> /dev/null`" ] ; then
         rpm --force --root $installroot -Uvh $installroot$rpmdir/*.rpm
     fi
 else
     if [ -n "`ls $rpmdir/*.deb 2> /dev/null`" ] ; then
         dpkg -i --force-all $rpmdir/*.deb
-    
+
     elif [ -n "`ls $rpmdir/*.rpm 2> /dev/null`" ] ; then
         rpm --force -Uvh $rpmdir/*.rpm
     fi
diff --git a/xCAT-buildkit/share/xcat/kits/kitcomponent.spec.template b/xCAT-buildkit/share/xcat/kits/kitcomponent.spec.template
index 6032399db..f6237ff71 100644
--- a/xCAT-buildkit/share/xcat/kits/kitcomponent.spec.template
+++ b/xCAT-buildkit/share/xcat/kits/kitcomponent.spec.template
@@ -31,7 +31,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %pre
 <<<INSERT_kitcomponent_preinstall_script_HERE>>>
-   
+
 
 <<<INSERT_kitcomponent_preupgrade_script_HERE>>>
 
diff --git a/xCAT-client/bin/db2sqlsetup b/xCAT-client/bin/db2sqlsetup
index bb84dfd18..1ace78436 100755
--- a/xCAT-client/bin/db2sqlsetup
+++ b/xCAT-client/bin/db2sqlsetup
@@ -4,39 +4,39 @@
 
 #-----------------------------------------------------------------------------
 
-=head1   db2sqlsetup 
+=head1   db2sqlsetup
 
 
 
- This script is called after the installation of DB2 
+ This script is called after the installation of DB2
    on xCAT.  It will automate the setup of the DB2 to run
    xCAT on the IBM DB2 database on AIX and Linux.
-   On AIX ( AIX61J - AIX61 TL5(AIX 6.1.5.0)) or later and Linux. 
+   On AIX ( AIX61J - AIX61 TL5(AIX 6.1.5.0)) or later and Linux.
    As an option it will also setup the ODBC for C/C++ applications
    to be able to use the database.
    It will setup an xcatdb
-   database ,a db2instance id, name xcatdb ( same as database), 
+   database ,a db2instance id, name xcatdb ( same as database),
    and instance  password to be used in the /etc/xcat/cfgloc file
    to access the database.
-   It will interact for the password to assign to the xcatdb 
+   It will interact for the password to assign to the xcatdb
    for the Unix id and DB2 instance id,
-   unless the XCATDB2PW env var is set to the password for the instance id. 
+   unless the XCATDB2PW env var is set to the password for the instance id.
    For Client setup, it will interact for the hostname or ip address
    of the DB2 Server as known by the Service Node, unless the
    XCATDB2SERVER  environement variable is set.
-   See man db2setup for more information   
-   The script will assume the default install paths of /opt/IBM/db2 for AIX and 
-   /opt/ibm/db2 for Linux,  unless overridden with the XCATDB2INSPATH 
-   environment variable. 
+   See man db2setup for more information
+   The script will assume the default install paths of /opt/IBM/db2 for AIX and
+   /opt/ibm/db2 for Linux,  unless overridden with the XCATDB2INSPATH
+   environment variable.
    The script will assume /var/lib/db2 for the xcat db2 database directory
-   unless the 
+   unless the
    DATABASELOC environment variable is set or the site.databaseloc attribute is
    set.  The environment variable should match the
    databaseloc attribute in the site table, but the DATABASELOC environment
-   variable will take precedence. DATABASELOC points to the directory that 
+   variable will take precedence. DATABASELOC points to the directory that
    contains the db2 database directory,  so  if DATABASELOC=/db2database then
-   the actual location for the db2 database is /db2database/db2.    
-   
+   the actual location for the db2 database is /db2database/db2.
+
 =cut
 
 BEGIN
@@ -557,7 +557,7 @@ exit;
 
 #-----------------------------------------------------------------------------
 
-=head3    usage 
+=head3    usage
 	
 	Displays message for -h option
 
@@ -579,9 +579,9 @@ sub usage
 
 #-----------------------------------------------------------------------------
 
-=head3    startxcatd 
+=head3    startxcatd
 	
-  start the daemon 
+  start the daemon
 
 =cut
 
@@ -612,9 +612,9 @@ sub startxcatd
 
 #-----------------------------------------------------------------------------
 
-=head3    shutdownxcatd 
+=head3    shutdownxcatd
 	
-  shutdown the daemon 
+  shutdown the daemon
 
 =cut
 
@@ -643,9 +643,9 @@ sub shutdownxcatd
 
 #-----------------------------------------------------------------------------
 
-=head3    backupxcatdb 
+=head3    backupxcatdb
 	
-   Backup xCATdb 
+   Backup xCATdb
 
 =cut
 
@@ -695,9 +695,9 @@ sub backupxcatdb
 
 #-----------------------------------------------------------------------------
 
-=head3  mkdb2user 
+=head3  mkdb2user
 	
-         adds db2instance user and group and xcatdb instance id 
+         adds db2instance user and group and xcatdb instance id
 =cut
 
 #-----------------------------------------------------------------------------
@@ -867,11 +867,11 @@ sub mkdb2user
 
 #-----------------------------------------------------------------------------
 
-=head3   setupservices   
+=head3   setupservices
 
 	
-  add db2 xcatdb instance entries into /etc/services on Server or Client 
-  
+  add db2 xcatdb instance entries into /etc/services on Server or Client
+
 
 =cut
 
@@ -906,14 +906,14 @@ db2c_xcatdb     50001/tcp    # Port for server connection";
 
 #-----------------------------------------------------------------------------
 
-=head3   setupinstance   
+=head3   setupinstance
 
 	
- Create the db2 server or client instance 
+ Create the db2 server or client instance
  For server
- run <db2installpath>/instance/db2icrt -a server -p db2c_xcatdb -u xcatdb xcatdb 
+ run <db2installpath>/instance/db2icrt -a server -p db2c_xcatdb -u xcatdb xcatdb
  For Client
- run <db2installpath>/instance/db2icrt -s client xcatdb 
+ run <db2installpath>/instance/db2icrt -s client xcatdb
 
 
 =cut
@@ -1034,11 +1034,11 @@ sub setupinstance
 
 #-----------------------------------------------------------------------------
 
-=head3   rundb2cmd  
+=head3   rundb2cmd
 
 	
-  Run a commmand as the xcatdb instance id 
-  Input: command 
+  Run a commmand as the xcatdb instance id
+  Input: command
 
 =cut
 
@@ -1061,7 +1061,7 @@ sub rundb2cmd
 
 #-----------------------------------------------------------------------------
 
-=head3   setupdb2env  
+=head3   setupdb2env
 
 	
   Setup the db2 environment variables and libpaths
@@ -1143,10 +1143,10 @@ sub setupdb2env
 
 #-----------------------------------------------------------------------------
 
-=head3   db2start 
+=head3   db2start
 
 	
-    Start the db2 server 
+    Start the db2 server
 
 =cut
 
@@ -1188,10 +1188,10 @@ sub db2start
 
 #-----------------------------------------------------------------------------
 
-=head3   catalogServer 
+=head3   catalogServer
 
 	
-   Catalog the location of the db2 server on the Service Node 
+   Catalog the location of the db2 server on the Service Node
 
 =cut
 
@@ -1230,10 +1230,10 @@ sub catalogServer
 
 #-----------------------------------------------------------------------------
 
-=head3   updateDBM 
+=head3   updateDBM
 
 	
-   Setup configuration requirements for the DBM 
+   Setup configuration requirements for the DBM
 
 =cut
 
@@ -1259,10 +1259,10 @@ sub updateDBM
 
 #-----------------------------------------------------------------------------
 
-=head3   createxcatdb 
+=head3   createxcatdb
 
 	
-   Create the xcat database 
+   Create the xcat database
 
 =cut
 
@@ -1381,10 +1381,10 @@ sub createxcatdb
 
 #-----------------------------------------------------------------------------
 
-=head3   db2reboot 
+=head3   db2reboot
 
 	
-    Setup for db2 to start on reboot  
+    Setup for db2 to start on reboot
 
 =cut
 
@@ -1484,7 +1484,7 @@ ly restart on reboot.");
 
 #-----------------------------------------------------------------------------
 
-=head3   setupODBC 
+=head3   setupODBC
 	
          Will setup the ODBC.  C++ applications are running
 		 that need access to the DB2 database for example LoadLeveler.
@@ -1820,10 +1820,10 @@ sub setupODBC
 
 #-----------------------------------------------------------------------------
 
-=head3   createcfgloc 
+=head3   createcfgloc
 	
-		 Creates the cfgloc file 
-                 to run xCAT on DB2 
+		 Creates the cfgloc file
+                 to run xCAT on DB2
 
 =cut
 
@@ -1883,8 +1883,8 @@ sub createcfgloc
 
 #-----------------------------------------------------------------------------
 
-=head3   restorexcatdb 
-	   
+=head3   restorexcatdb
+	
 		Restores the database from ~/xcat-dbback and restarts the xcatd using
 	        DB2	
 	
@@ -1936,9 +1936,9 @@ sub restorexcatdb
 
 #-----------------------------------------------------------------------------
 
-=head3   updatecrontab 
-	   
-	    Sets up a crontab entry to reorg the database, once a week on Sunday 
+=head3   updatecrontab
+	
+	    Sets up a crontab entry to reorg the database, once a week on Sunday
                night midnight	
 	
 =cut
@@ -1961,7 +1961,7 @@ sub updatecrontab
 
 =head3    adddb2paths
 	
- Add paths to db2 commands to /etc/profile and ~.profile 
+ Add paths to db2 commands to /etc/profile and ~.profile
 
 =cut
 
@@ -2100,8 +2100,8 @@ qq~echo '# xCAT DB2 setup\nPATH=\$PATH:$db2paths\nexport PATH\n' >>$profname~;
 #-----------------------------------------------------------------------------
 
 =head3   remove
-	   
-		remove DB2 on management node or service node. if you want to remove it 
+	
+		remove DB2 on management node or service node. if you want to remove it
 		from service node, you should use -s and -r flag together.
              Note this function is not supported and the code has not been
              kept up to date
@@ -2508,11 +2508,11 @@ sub remove
 
 #-----------------------------------------------------------------------------
 
-=head3    updatepasswd 
+=head3    updatepasswd
 	
    if -S , then update the xcatdb instance password on the MN
       -C , then update the xcatdb instance password on the clients (SN)
-      if just -p , then update the xcatdb intance password on both  
+      if just -p , then update the xcatdb intance password on both
 
 =cut
 
diff --git a/xCAT-client/bin/mysqlsetup b/xCAT-client/bin/mysqlsetup
index 36a39b86c..b7ad6f850 100755
--- a/xCAT-client/bin/mysqlsetup
+++ b/xCAT-client/bin/mysqlsetup
@@ -4,19 +4,19 @@
 
 #-----------------------------------------------------------------------------
 
-=head1   mysqlsetup 
+=head1   mysqlsetup
 
 
 
  This script  automates the setup of the MySQL/MariaDB server  and creates the xCAT database to run
   xCAT on MySQL/MariaDB.
-   Note: it will setup an xcat database (xcatdb),a xcatadmin id , and a MySQL root password. 
+   Note: it will setup an xcat database (xcatdb),a xcatadmin id , and a MySQL root password.
    It will interact for the
-   password to assign, unless the XCATMYSQLADMIN_PW and the XCATMYSQLROOT_PW 
-   env variables are set to the admin and mysql root password, resp.   
-   Setups up AIX and Linux,  but most work needs to be done on AIX. 
-   See man mysqlsetup for more information and the xCAT2.SetupMySQL.pdf 
-   documentation. 
+   password to assign, unless the XCATMYSQLADMIN_PW and the XCATMYSQLROOT_PW
+   env variables are set to the admin and mysql root password, resp.
+   Setups up AIX and Linux,  but most work needs to be done on AIX.
+   See man mysqlsetup for more information and the xCAT2.SetupMySQL.pdf
+   documentation.
 
 =cut
 
@@ -415,7 +415,7 @@ if (($::INIT) && ($::xcatrunningmysql == 0))
         $hname = `hostname`;
         chomp $hname;
     }
-    
+
     #my ($name, $aliases, $addrtype, $length, @addrs) = gethostbyname($hname);
     my $ipaddr = xCAT::NetworkUtils->getipaddr($hname);
     if ($ipaddr)
@@ -501,7 +501,7 @@ exit;
 
 #-----------------------------------------------------------------------------
 
-=head3    usage 
+=head3    usage
 	
 	Displays message for -h option
 
@@ -523,7 +523,7 @@ sub usage
 
 #-----------------------------------------------------------------------------
 
-=head3    setulimits 
+=head3    setulimits
 	
      sets ulimits unlimited, needed to run MySQL
 	 update /etc/security/limits with the info
@@ -606,9 +606,9 @@ sub setulimits
 
 #-----------------------------------------------------------------------------
 
-=head3    backupxcatdb 
+=head3    backupxcatdb
 	
-   Backup xCATdb 
+   Backup xCATdb
 
 =cut
 
@@ -664,9 +664,9 @@ sub backupxcatdb
 
 #-----------------------------------------------------------------------------
 
-=head3    shutdownxcatd 
+=head3    shutdownxcatd
 	
-  shutdown the daemon 
+  shutdown the daemon
 
 =cut
 
@@ -697,10 +697,10 @@ sub shutdownxcatd
 
 #-----------------------------------------------------------------------------
 
-=head3   fixinstall 
+=head3   fixinstall
 	
-        If AIX, Fixes ownership and permssion on install 
-         adds mysql user and group 
+        If AIX, Fixes ownership and permssion on install
+         adds mysql user and group
 	
 =cut
 
@@ -775,7 +775,7 @@ sub fixinstalldir
 
 #-----------------------------------------------------------------------------
 
-=head3   initmysqldb 
+=head3   initmysqldb
 
 	
     Create the MySQL data directory and initialize the grant tables
@@ -940,10 +940,10 @@ sub initmysqldb
 
 #-----------------------------------------------------------------------------
 
-=head3   mysqlstart 
+=head3   mysqlstart
 
 	
-    Start the mysql server 
+    Start the mysql server
 
 =cut
 
@@ -1023,10 +1023,10 @@ sub mysqlstart
 
 #-----------------------------------------------------------------------------
 
-=head3   mysqlreboot 
+=head3   mysqlreboot
 
 	
-    Setup for MySQL to start on reboot 
+    Setup for MySQL to start on reboot
 
 =cut
 
@@ -1151,10 +1151,10 @@ sub verifymysqlroot
 
 #-----------------------------------------------------------------------------
 
-=head3   setupmysqlroot 
+=head3   setupmysqlroot
 
 	
-    Set mysql root password in the database 
+    Set mysql root password in the database
 
 =cut
 
@@ -1196,9 +1196,9 @@ sub setupmysqlroot
 
 #-----------------------------------------------------------------------------
 
-=head3    setupxcatdb 
+=head3    setupxcatdb
 	
-      Creates the xcatdb in MySQL 
+      Creates the xcatdb in MySQL
       Add xcatadmin to the database
 	  Give Management Node database access
 
@@ -1335,9 +1335,9 @@ sub setupxcatdb
 
 #-----------------------------------------------------------------------------
 
-=head3    setupLL 
+=head3    setupLL
 	
-      Adds special LoadLeveler setup in MySQL 
+      Adds special LoadLeveler setup in MySQL
 	
 =cut
 
@@ -1453,11 +1453,11 @@ sub setupLL
 
 #-----------------------------------------------------------------------------
 
-=head3   addhosts 
+=head3   addhosts
 	
          Will add all host ids that need access to the MySQL database.
 		 User will input names, ipaddress or wild cards like 9.112.%.%
-		 or %.ibm.com in a file after the -f flag.  
+		 or %.ibm.com in a file after the -f flag.
 
 =cut
 
@@ -1591,7 +1591,7 @@ sub addhosts
 
 #-----------------------------------------------------------------------------
 
-=head3   setupODBC 
+=head3   setupODBC
 	
          Will setup the ODBC. Only needed if C, C++ applications are running
 		 that need access to the MySQL database for example LoadLeveler.
@@ -1832,7 +1832,7 @@ sub setupODBC
 
 #-----------------------------------------------------------------------------
 
-=head3   createcfgloc 
+=head3   createcfgloc
 	
 		 Creates the cfgloc.mysql file which will be copied to cfgloc
                  to run xCAT on MySQL
@@ -1885,8 +1885,8 @@ sub createcfgloc
 
 #-----------------------------------------------------------------------------
 
-=head3   restorexcatdb 
-	   
+=head3   restorexcatdb
+	
 		Restores the database from ~/xcat-dbback and restarts the xcatd using
 		MySQL
 	
diff --git a/xCAT-client/bin/pgsqlsetup b/xCAT-client/bin/pgsqlsetup
index 5e9152c3c..b5b85b611 100755
--- a/xCAT-client/bin/pgsqlsetup
+++ b/xCAT-client/bin/pgsqlsetup
@@ -4,14 +4,14 @@
 
 #-----------------------------------------------------------------------------
 
-=head1   pgsqlsetup 
+=head1   pgsqlsetup
 
 
 
- This is script is called after the installation or upgrade of PostgreSQL 
+ This is script is called after the installation or upgrade of PostgreSQL
    on xCAT.  It will automate the setup of the PostgreSQL and xCAT to run
    xCAT on the PostgreSQL DB on AIX and Linux.
-   On AIX 6.1 or later , It will setup an xcatdb database ,a postgres id, 
+   On AIX 6.1 or later , It will setup an xcatdb database ,a postgres id,
    a xcatadm id and password to be used in the /etc/xcat/cfgloc file
    to access the database.
    On Linux , It will setup an xcatdb database , and get an xcatadm password
@@ -21,11 +21,11 @@
 
    You can set the XCATPGPW environment variable to a password for the database
    to avoid prompting otherwise it will prompt for the
-   password to assign to the xcatadm userid for the Unix id and PgSQL database 
-   id.   
+   password to assign to the xcatadm userid for the Unix id and PgSQL database
+   id.
 
-   Setups up AIX 6.1+ and Linux,  but most work needs to be done on AIX. 
-   See man pgsqlsetup for more information and the documentation. 
+   Setups up AIX 6.1+ and Linux,  but most work needs to be done on AIX.
+   See man pgsqlsetup for more information and the documentation.
 
    If the -P flag is supplied, we are supporting setup under PCM.
     Additional setup for PCM is required.
@@ -136,7 +136,7 @@ if ((!($INIT)) && ($SETUPODBC))
 my $listenaddrs = undef;
 if (@LISTENADDRS)
 {
-    $listenaddrs = join ',', @LISTENADDRS;  
+    $listenaddrs = join ',', @LISTENADDRS;
 }
 
 #
@@ -424,7 +424,7 @@ exit;
 
 #-----------------------------------------------------------------------------
 
-=head3    usage 
+=head3    usage
 	
 	Displays message for -h option
 
@@ -446,9 +446,9 @@ sub usage
 
 #-----------------------------------------------------------------------------
 
-=head3    shutdownxcatd 
+=head3    shutdownxcatd
 	
-  shutdown the daemon 
+  shutdown the daemon
 
 =cut
 
@@ -477,9 +477,9 @@ sub shutdownxcatd
 
 #-----------------------------------------------------------------------------
 
-=head3    backupxcatdb 
+=head3    backupxcatdb
 	
-   Backup xCATdb 
+   Backup xCATdb
 
 =cut
 
@@ -529,9 +529,9 @@ sub backupxcatdb
 
 #-----------------------------------------------------------------------------
 
-=head3  mkpgusers 
+=head3  mkpgusers
 	
-         adds postgres user and group and xcatadm id 
+         adds postgres user and group and xcatadm id
          Only needed on AIX,  Linux install does this	
          Note this does not support postgresql 9.0 on AIX
 =cut
@@ -642,11 +642,11 @@ sub mkpgusers
 
 #-----------------------------------------------------------------------------
 
-=head3   runpostgrescmd  
+=head3   runpostgrescmd
 
 	
-  Run a commmand as the postgres id 
-  Input: command 
+  Run a commmand as the postgres id
+  Input: command
 
 =cut
 
@@ -665,12 +665,12 @@ sub runpostgrescmd
 
 #-----------------------------------------------------------------------------
 
-=head3   runpgcmd_chkoutput  
+=head3   runpgcmd_chkoutput
 
 	
-  Run a commmand as the postgres id 
+  Run a commmand as the postgres id
   Input: command
-  Output: return code 
+  Output: return code
   Note: this version checks for specific error conditions
 
 =cut
@@ -714,7 +714,7 @@ sub runpgcmd_chkoutput
 
 #-----------------------------------------------------------------------------
 
-=head3   initpgdb 
+=head3   initpgdb
 
 	
     Create the PostgreSQL database and setup the config files
@@ -737,7 +737,7 @@ sub initpgdb
     }
     &runpostgrescmd($cmd);
 
-    # insert  MN ip address and any -a addresses 
+    # insert  MN ip address and any -a addresses
     # in the # IPv4 local connections: stanza of
     # the /var/lib/pgsql/data/pg_hba.conf file
     # if it is not already there
@@ -802,7 +802,7 @@ sub initpgdb
         if ($::osname eq 'Linux')
         {
             $cmd = qq~ echo listen_addresses = \\'localhost,$::MN\\' >> $pgconf~;
-             if ($::listenaddrs) 
+             if ($::listenaddrs)
              {
                  $cmd = qq~ echo listen_addresses = \\'localhost,$::MN,$::listenaddrs\\' >> $pgconf~;
              }
@@ -863,12 +863,12 @@ sub initpgdb
 
 #-----------------------------------------------------------------------------
 
-=head3   pgstart 
+=head3   pgstart
 
 	
-    Start or restart the Postgresql server 
-    startflg = 0  start postgresql 
-    startflg = 1  restart postgresql 
+    Start or restart the Postgresql server
+    startflg = 0  start postgresql
+    startflg = 1  restart postgresql
 
 =cut
 
@@ -942,10 +942,10 @@ sub pgstart
 
 #-----------------------------------------------------------------------------
 
-=head3   pgreboot 
+=head3   pgreboot
 
 	
-    Setup for postgresql to start on reboot, only Linux 
+    Setup for postgresql to start on reboot, only Linux
 
 =cut
 
@@ -990,10 +990,10 @@ sub pgreboot
 
 #-----------------------------------------------------------------------------
 
-=head3    setupxcatdb 
+=head3    setupxcatdb
 	
-      Creates the xcatdb in Postgresql 
-      Add xcatadm to the database and make owner of the database 
+      Creates the xcatdb in Postgresql
+      Add xcatadm to the database and make owner of the database
 
 =cut
 
@@ -1162,7 +1162,7 @@ sub setupxcatdb
 
 #-----------------------------------------------------------------------------
 
-=head3   setupODBC 
+=head3   setupODBC
 	
          Will setup the ODBC interface to the ODBC. Only supported on Linux
 
@@ -1319,10 +1319,10 @@ sub setupODBC
 
 #-----------------------------------------------------------------------------
 
-=head3   createcfgloc 
+=head3   createcfgloc
 	
 		 Creates the cfgloc file which will be copied to cfgloc
-                 to run xCAT on PostgreSQL 
+                 to run xCAT on PostgreSQL
 
 =cut
 
@@ -1369,8 +1369,8 @@ sub createcfgloc
 
 #-----------------------------------------------------------------------------
 
-=head3   restorexcatdb 
-	   
+=head3   restorexcatdb
+	
 		Restores the database from ~/xcat-dbback and restarts the xcatd using
 	   PostgreSQL	
 	
diff --git a/xCAT-client/bin/rcons b/xCAT-client/bin/rcons
index 0064caf97..a04f39dac 100755
--- a/xCAT-client/bin/rcons
+++ b/xCAT-client/bin/rcons
@@ -4,7 +4,7 @@
 
 # To handle cases like running this via sudo, get the home dir properly
 os=`uname`
-if [ "$os" == "Linux" ]; then 
+if [ "$os" == "Linux" ]; then
     HOME=`getent passwd $(whoami)|cut -d: -f 6`
     export HOME
 fi
@@ -59,7 +59,7 @@ for parameter in $@; do
 done
 
 # xCAT 2.9.1 allows for an option to use confluent as a rcons replacement and only use
-# confluent if this keyword is defined in the site table.  This allows for confluent to 
+# confluent if this keyword is defined in the site table.  This allows for confluent to
 # be installed on the xCAT management node and switch between conserver & confluent
 USE_CONFLUENT=0
 # If conluent is not enable, check the service status of goconserver.
@@ -91,7 +91,7 @@ fi
 if [ $USE_CONFLUENT == "1" ] && ([ -x "/opt/confluent/bin/confetty" ] || [ -x "/usr/bin/confetty" ] || [ -x "/usr/local/bin/confetty" ]); then
     # use confluent, make sure conserver is not also running
     CONSERVER_RC=`pidof conserver >> /dev/null; echo $?`
-    if [[ ${CONSERVER_RC} == 0 ]]; then 
+    if [[ ${CONSERVER_RC} == 0 ]]; then
         echo "Error: consoleservice is set to 'confluent' but conserver is running.  Stop conserver, run makeconfluentcfg, and retry..."
         exit 1
     fi
@@ -113,8 +113,8 @@ if [ $USE_CONFLUENT == "1" ] && ([ -x "/opt/confluent/bin/confetty" ] || [ -x "/
 		CONSERVER=$(getent hosts $CONSERVER|awk '{print $1}')
 	fi
         declare -a ipaddrs=`ip -o a | awk {'print $4'} | cut -d/ -f1 | grep -v : | tr '\n' ' '`
-        for IP in ${ipaddrs[*]}; do 
-            if [[ "${CONSERVER}" == "${IP}" ]]; then 
+        for IP in ${ipaddrs[*]}; do
+            if [[ "${CONSERVER}" == "${IP}" ]]; then
                 # conserver is the same node, do not connect using -s
                 CONSERVER=""
                 break
@@ -179,9 +179,9 @@ elif [ $USE_GOCONSERVER == "1" ]; then
 elif [ -f "/usr/bin/console" ] || [ -f "/bin/console" ]; then
     # use conserver
     # make sure confluent is not also running, only if confluent is installed
-    if [[ -f "/etc/init.d/confluent" ]]; then 
+    if [[ -f "/etc/init.d/confluent" ]]; then
         CONFLUENT_RC=`service confluent status >& /dev/null; echo $?`
-        if [[ ${CONFLUENT_RC} == 0 ]]; then 
+        if [[ ${CONFLUENT_RC} == 0 ]]; then
             echo "Error: consoleservice is set to 'conserver' but confluent is running.  Stop confluent, run makeconservercf, and retry..."
             exit 1
         fi
@@ -190,7 +190,7 @@ elif [ -f "/usr/bin/console" ] || [ -f "/bin/console" ]; then
     if [ -z "$CONSERVER" ]; then
         CONSERVER=`nodels $1 nodehm.conserver 2>/dev/null | awk -F: '{print $2}' | tr -d ' '`
     fi
-    
+
     if [ -z "$CONSERVER" ]; then
 	CONSERVER=$XCATHOST
     fi
@@ -236,19 +236,19 @@ EOF
         sed -i 's/sslauthority/sslcacertificatefile/1' $HOME/.consolerc
     fi
     exec console $FORCE -M $CONSERVER $1
-else 
+else
     if [[ "$FORCE" == "-s" ]]; then
 	echo "Read-only mode is not supported, please run rcons without -s option."
 	exit 1
     fi
     #deal with consoles directly
-    output=`nodels $1 nodehm.conserver nodehm.cons nodehm.mgt 2>&1` 
+    output=`nodels $1 nodehm.conserver nodehm.cons nodehm.mgt 2>&1`
     if [ $? -ne 0 ]; then
 	echo "$output"
 	exit 1
-    fi 
+    fi
 
-    if [ -z "$CONSERVER" ]; then  
+    if [ -z "$CONSERVER" ]; then
 	CONSERVER=`echo "$output"|grep nodehm.conserver|cut -d: -f3|tr -d ' \n'`
     fi
     CONS=`echo "$output" |grep /nodehm.cons$/|cut -d: -f3 | tr -d ' \n'`
@@ -259,7 +259,7 @@ else
 	echo "Error: nodehm.mgt or nodehm.cons for node $1 not setup."
 	exit 1;
     fi
-    
+
     #check if conserver is local host
     result=`ping -c1 $CONSERVER 2>&1`
     if [ $? -eq 0 ]; then
@@ -277,7 +277,7 @@ else
         if [ $? -eq 0 ]; then
            CONSERVER=""
         fi
-    else 
+    else
 	echo "Error: conserver $CONSERVER is not reachable."
         exit 1;
     fi
@@ -286,7 +286,7 @@ else
     # check if others are using the console
     if [[ -n $CONSERVER ]]; then
         ssh $CONSERVER ps -ef |grep $1 |grep -v grep |grep "$XCATROOT/share/xcat/cons" > /dev/null
-    else 
+    else
         ps -ef |grep $1 |grep -v grep |grep "$XCATROOT/share/xcat/cons" > /dev/null
     fi
     if [ $? -eq 0 ]; then
diff --git a/xCAT-client/bin/rinstall b/xCAT-client/bin/rinstall
index 2d68b3f37..05c56dfff 100755
--- a/xCAT-client/bin/rinstall
+++ b/xCAT-client/bin/rinstall
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl 
+#!/usr/bin/env perl
 # IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html
 
 # Used as a convience command combined of [nodech]-nodeset-rsetboot-rpower-[rcons/wcons]
diff --git a/xCAT-client/bin/tcons b/xCAT-client/bin/tcons
index 8801c5e06..5210dd71e 100755
--- a/xCAT-client/bin/tcons
+++ b/xCAT-client/bin/tcons
@@ -1,19 +1,19 @@
 #!/bin/sh
-f=1                                                                    
-p=0                                                                    
+f=1
+p=0
 for i in `nodels "$1"`; do
-    if [ "$f" = 1 ]; then                                              
-        f=0                                                            
-    	qdate=$((`date +%s`+5))
-        tmux new-session -d -s tcons_$$ -x 800 -y 800 "rcons $i;if [ \`date +%s\` -lt $qdate ]; then echo Press enter to close; read qdate; fi"       
-        continue                                                       
-    fi                                                                 
-    tmux select-pane -t $p                                             
+    if [ "$f" = 1 ]; then
+        f=0
+        qdate=$((`date +%s`+5))
+        tmux new-session -d -s tcons_$$ -x 800 -y 800 "rcons $i;if [ \`date +%s\` -lt $qdate ]; then echo Press enter to close; read qdate; fi"
+        continue
+    fi
+    tmux select-pane -t $p
     tmux set-option pane-border-status top > /dev/null 2>&1 | cat > /dev/null
-    p=$((p+1))                                                         
+    p=$((p+1))
     qdate=$((`date +%s`+5))
     tmux split -h "rcons $i;if [ \`date +%s\` -lt $qdate ]; then echo Press enter to close; read qdate; fi"
     tmux select-layout tiled
-done                                                                   
+done
 tmux select-pane -t 0
-tmux attach -t tcons_$$                                                
+tmux attach -t tcons_$$
diff --git a/xCAT-client/bin/verifynode b/xCAT-client/bin/verifynode
index b031ba968..cf8d51ae3 100644
--- a/xCAT-client/bin/verifynode
+++ b/xCAT-client/bin/verifynode
@@ -3022,4 +3022,4 @@ if ( $needToFinishLogFile ) {
     finishLogFile();
 }
 
-exit $rc;
\ No newline at end of file
+exit $rc;
diff --git a/xCAT-client/bin/xcatchroot b/xCAT-client/bin/xcatchroot
index fb2c755e2..694fd4c9b 100755
--- a/xCAT-client/bin/xcatchroot
+++ b/xCAT-client/bin/xcatchroot
@@ -3,16 +3,16 @@
 #(C)IBM Corp
 ################################################################
 # Usage:
-#		xcatchroot -h 
+#		xcatchroot -h
 #		xcatchroot [-v] -i osimage  cmd_string
 #
 #
 # WARNING:
-#			Be very careful when using this script!!!  Make sure you are 
+#			Be very careful when using this script!!!  Make sure you are
 #			very clear about exactly what you are changing and what effect
 #			it will have.
 #
-#			As a precaution it is advisable to make a copy of the original 
+#			As a precaution it is advisable to make a copy of the original
 #			spot in case your changes wind up corrupting the image.
 #
 # Note:
@@ -24,18 +24,18 @@
 #			modification.
 #
 #			In the bosboot code, there is a check for the creation of a boot
-#			image; if the image creation is anything other than disk, the 
+#			image; if the image creation is anything other than disk, the
 #			odm values are not picked up. You will have to confirm that
 #			the bosboot command in your spot has the check removed.
 #
-#           Edit the bosboot command contained in the spot (save a backup). 
+#           Edit the bosboot command contained in the spot (save a backup).
 #			(ex. "vi <path_to_spotName>/usr/sbin/bosboot"). Search for
 #			"zap it as". The next line checks to see if the
 #			device prefix is "hdisk".  Comment out the line and the
 #			corresponding "fi" which ends the "if" statement.  Now this
 #			code will always execute. Save changes.
 #
-# Note:  	Always run the NIM check operation after you are done updating 
+# Note:  	Always run the NIM check operation after you are done updating
 #			your spot.
 #
 #        		nim -Fo check spotName
@@ -95,7 +95,7 @@ do
 	case ${z} in
 
 		h)			echo $usage
-					exit 0 
+					exit 0
 					;;
 
 		i)			# xCAT osimage name
@@ -177,10 +177,10 @@ if ${LSNIM} $spot >/dev/null ; then
 		then
 			echo "Running command: ${LSNIM} -a location $spotObj | ${AWK} '/location/ {print $3}'\n"
 		fi
-		location=`${LSNIM} -a location $spotObj | ${AWK} '/location/ {print $3}'` 
+		location=`${LSNIM} -a location $spotObj | ${AWK} '/location/ {print $3}'`
 
 	else
-		echo "ERROR: Cannot use chroot with remote resources $spot." 
+		echo "ERROR: Cannot use chroot with remote resources $spot."
 		echo "xcatchroot: ERROR: Cannot use chroot with remote resources $spot." | logger -t xcat  -p local4.err
 		exit 1
 	fi
diff --git a/xCAT-client/bin/zvmMsg b/xCAT-client/bin/zvmMsg
index d7b451c26..b10df0486 100644
--- a/xCAT-client/bin/zvmMsg
+++ b/xCAT-client/bin/zvmMsg
@@ -110,4 +110,4 @@ if ( $group eq '' ) {
 }
 
 FINISH:
-exit;
\ No newline at end of file
+exit;
diff --git a/xCAT-client/bin/zxcatIVP.pl b/xCAT-client/bin/zxcatIVP.pl
index 5e1a79604..4a0d6a8b5 100644
--- a/xCAT-client/bin/zxcatIVP.pl
+++ b/xCAT-client/bin/zxcatIVP.pl
@@ -1130,7 +1130,7 @@ sub hexDecode {
 
 =head3   logTest
 
-    Description : Log the start and result of a test.  
+    Description : Log the start and result of a test.
                   Failures are added to syslog and printed as script output.
     Arguments   : Status of the test:
                       bypassed: Bypassed a test (STDOUT, optionally SYSLOGged)
@@ -1331,7 +1331,7 @@ sub setOverrides{
     # Don't specify the same option on both the command line and in the environment variable.
     if ( defined $glob_moreCmdOps ) {
         $glob_moreCmdOps =~ hexDecode( $glob_moreCmdOps );
-        ($rc, $unrecognizedOps) = GetOptionsFromString( 
+        ($rc, $unrecognizedOps) = GetOptionsFromString(
             $glob_moreCmdOps,
             'bypassMsg=s'               => \$cmdOp_bypassMsg,
             'cNAddress=s'               => \$cmdOp_cNAddress,
diff --git a/xCAT-client/debian/copyright b/xCAT-client/debian/copyright
index 2926a3f87..a52f21f06 100644
--- a/xCAT-client/debian/copyright
+++ b/xCAT-client/debian/copyright
@@ -94,4 +94,4 @@ Everyone is permitted to copy and distribute copies of this Agreement, but in or
 
 This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
 
- 
+
diff --git a/xCAT-client/debian/postrm b/xCAT-client/debian/postrm
index 224d603dd..aaa4c1a20 100644
--- a/xCAT-client/debian/postrm
+++ b/xCAT-client/debian/postrm
@@ -22,7 +22,7 @@ set -e
 case "$1" in
     purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
     ;;
-    
+
     remove)
        if [ -f "/proc/cmdline" ]; then   # prevent running it during install into chroot image
              rm /etc/profile.d/xcat.*
diff --git a/xCAT-client/podchecker b/xCAT-client/podchecker
index 1b5fb6d29..b8b7f7b9f 100755
--- a/xCAT-client/podchecker
+++ b/xCAT-client/podchecker
@@ -68,7 +68,7 @@ POD files are ok.
 B<podchecker> returns the exit status 1 if at least one of
 the given POD files has syntax errors.
 
-The status 2 indicates that at least one of the specified 
+The status 2 indicates that at least one of the specified
 files does not contain I<any> POD commands.
 
 Status 1 overrides status 2. If you want unambiguous
diff --git a/xCAT-client/pods/man1/addkitcomp.1.pod b/xCAT-client/pods/man1/addkitcomp.1.pod
index 2d3bdfaf4..99b138700 100644
--- a/xCAT-client/pods/man1/addkitcomp.1.pod
+++ b/xCAT-client/pods/man1/addkitcomp.1.pod
@@ -17,7 +17,7 @@ B<Note:> xCAT Kit support is ONLY available for Linux operating systems.
 =head1 OPTIONS
 
 =over 10
- 
+
 =item B<-a|--adddeps>
 
 Assign kitcomponent dependencies to the osimage.
@@ -74,7 +74,7 @@ A comma-delimited list of valid full kit component names or kit component basena
 
  addkitcomp -a -i rhels6.2-ppc64-netboot-compute comp-test2-1.0-1-rhels-6.2-ppc64
 
-3. To add a kit component to osimage with incompatable osarch, osversion or ostype, use the -f (force) option: 
+3. To add a kit component to osimage with incompatable osarch, osversion or ostype, use the -f (force) option:
 
  addkitcomp -f -i rhels6.2-ppc64-netboot-compute comp-test1-1.0-1-rhels-6.2-ppc64
 
diff --git a/xCAT-client/pods/man1/bmcdiscover.1.pod b/xCAT-client/pods/man1/bmcdiscover.1.pod
index 63d30b815..00d6d8170 100644
--- a/xCAT-client/pods/man1/bmcdiscover.1.pod
+++ b/xCAT-client/pods/man1/bmcdiscover.1.pod
@@ -13,47 +13,47 @@ B<bmcdiscover> [B<--sn> I<SN_nodename>] [B<-s> I<scan_method>] [B<-u> I<bmc_user
 
 =head1 DESCRIPTION
 
-The B<bmcdiscover> command will discover Baseboard Management Controllers (BMCs) using a scan method.  
+The B<bmcdiscover> command will discover Baseboard Management Controllers (BMCs) using a scan method.
 
-The command uses B<nmap> to scan active nodes over a specified IP range.  The IP range format should be a format that is acceptable by B<nmap>. 
+The command uses B<nmap> to scan active nodes over a specified IP range.  The IP range format should be a format that is acceptable by B<nmap>.
 
 The B<bmcdiscover> command can also obtain some information about the BMC. (Check username/password, IP address source, DHCP/static configuration)
 
-Note: The scan method currently support is B<nmap>. 
+Note: The scan method currently support is B<nmap>.
 
 =head1 OPTIONS
 
 =over 10
 
-=item B<--range>       
+=item B<--range>
 
-Specify one or more IP ranges acceptable to nmap.  IP range can be hostnames, IP addresses, networks, etc.  A single IP address (10.1.2.3), several IPs with commas (10.1.2.3,10.1.2.10), Ip range with "-" (10.1.2.0-100) or an IP range (10.1.2.0/24) can be specified.  If the range is very large, the B<bmcdiscover> command may take a long time to return. 
+Specify one or more IP ranges acceptable to nmap.  IP range can be hostnames, IP addresses, networks, etc.  A single IP address (10.1.2.3), several IPs with commas (10.1.2.3,10.1.2.10), Ip range with "-" (10.1.2.0-100) or an IP range (10.1.2.0/24) can be specified.  If the range is very large, the B<bmcdiscover> command may take a long time to return.
 
 =item B<--sn>
 
 Specify one or more service nodes on which bmcdiscover will run. In hierarchical cluster, the MN may not be able to access the BMC of CN directly, but SN can. With this option, bmcdiscover will be dispatched to the specified SNs. Then, the nodename of the service node that 'bmcdiscover' is running on will be set to the 'servicenode' attribute of the discovered BMC node.
 
-=item B<-s>            
+=item B<-s>
 
 Scan method  (The only supported scan method at this time is B<nmap>)
 
-=item B<-z>            
+=item B<-z>
 
 List the data returned in xCAT stanza format
 
-=item B<-w>            
+=item B<-w>
 
 Write to the xCAT database.
 
-=item B<-i|--bmcip>    
+=item B<-i|--bmcip>
 
 BMC IP address.
 
-=item B<-u|--bmcuser>  
+=item B<-u|--bmcuser>
 
 BMC user name.
 
-=item B<-p|--bmcpasswd>   
+=item B<-p|--bmcpasswd>
 
 BMC user password.
 
@@ -103,7 +103,7 @@ Output is similar to:
 
 4. Discover the BMCs and write the discovered-node definitions into the xCAT database and write out the stanza foramt to the console:
 
-    bmcdiscover -s nmap --range "10.4.22-23.100-254" -w -z 
+    bmcdiscover -s nmap --range "10.4.22-23.100-254" -w -z
 
 =head1 SEE ALSO
 
diff --git a/xCAT-client/pods/man1/cfgve.1.pod b/xCAT-client/pods/man1/cfgve.1.pod
index e2df6268f..c5e35a1ae 100644
--- a/xCAT-client/pods/man1/cfgve.1.pod
+++ b/xCAT-client/pods/man1/cfgve.1.pod
@@ -17,17 +17,17 @@ B<cfgve> B<-t tpl -m> I<manager> B<-o> I<object> [B<-r>]
 
 =head1 DESCRIPTION
 
-The B<cfgve> command can be used to configure a virtual environment for 
+The B<cfgve> command can be used to configure a virtual environment for
 'Storage Domain', 'Network' and 'Template' objects.
 
-The mandatory parameter B<-m> I<manager> is used to specify the address of the 
+The mandatory parameter B<-m> I<manager> is used to specify the address of the
 manager of virtual environment. xCAT needs it to access the RHEV manager.
 
-The mandatory parameter B<-t> I<type> is used to specify the type of the target 
+The mandatory parameter B<-t> I<type> is used to specify the type of the target
 object.
 
-Basically, B<cfgve> command supports five types of object: B<dc>, B<cl>, 
-B<sd>, B<nw> and B<tpl>. 
+Basically, B<cfgve> command supports five types of object: B<dc>, B<cl>,
+B<sd>, B<nw> and B<tpl>.
 
 =over 3
 
@@ -35,7 +35,7 @@ B<dc> - The B<create> and B<remove> operations are supported.
 
 B<cl> - The B<create> and B<remove> operations are supported.
 
-B<sd>  - The B<create>, B<attach>, B<detach>, B<activate>, 
+B<sd>  - The B<create>, B<attach>, B<detach>, B<activate>,
 B<deactivate> and B<remove> operations are supported.
 
 B<nw>  - The B<create>, B<attach>, B<detach> and B<remove> operations are supported.
@@ -60,35 +60,35 @@ To detach the target object.
 =item B<-c>
 To create the target object.
 
-For creating of B<Storage Domain>, the target storage domain will be created 
+For creating of B<Storage Domain>, the target storage domain will be created
 first, then attached to data center and activated.
 
-The parameters that used to create the storage domain are gotten 
+The parameters that used to create the storage domain are gotten
 from 'virtsd' table. The detail parameters in the virtsd table:
 
 =over 3
 
 B<virtsd.node> - The name of the storage domain.
 
-B<virtsd.sdtype> - The type of storage domain. Valid value: data, iso, export. 
+B<virtsd.sdtype> - The type of storage domain. Valid value: data, iso, export.
 Default value is 'data'.
 
 B<virtsd.stype> - The storage type. "nfs" or "localfs".
 
-B<virtsd.location> - The location of the storage. 
-B<nfs>: Format: [nfsserver:nfspath]. 
-The NFS export directory must be configured for read write access and must 
+B<virtsd.location> - The location of the storage.
+B<nfs>: Format: [nfsserver:nfspath].
+The NFS export directory must be configured for read write access and must
 be owned by vdsm:kvm.
 B<localfs>: "/data/images/rhev" is set by default.
 
-B<virtsd.host> - A host must be specified for a storage domain as SPM 
-(Storage Pool Manager) when initialize the storage domain. The role of SPM 
-may be migrated to other host by rhev-m during the running of the datacenter 
-(For example, when the current SPM encountered issue or going to maintenance 
+B<virtsd.host> - A host must be specified for a storage domain as SPM
+(Storage Pool Manager) when initialize the storage domain. The role of SPM
+may be migrated to other host by rhev-m during the running of the datacenter
+(For example, when the current SPM encountered issue or going to maintenance
 status.
 
-B<virtsd.datacenter> - The storage will be attached to. 'Default' data center 
-is the default value. 
+B<virtsd.datacenter> - The storage will be attached to. 'Default' data center
+is the default value.
 
 =back
 
@@ -96,7 +96,7 @@ is the default value.
 
 The name of data center.
 
-Specify the 'Data Center' that will be used for the object to be attached to. 
+Specify the 'Data Center' that will be used for the object to be attached to.
 It is used by <nw> type.
 
 =item B<-f>
@@ -120,11 +120,11 @@ Supported type: nfs; localfs.
 
 Specify the cluster for the network to attach to.
 
-=item B<-m> I<manager> 
+=item B<-m> I<manager>
 
-Specify the manager of the virtual environment. 
+Specify the manager of the virtual environment.
 
-For RHEV, the FQDN (Fully Qualified Domain Name) of the rhev manager have 
+For RHEV, the FQDN (Fully Qualified Domain Name) of the rhev manager have
 to be specified.
 
 =item B<-n> I<vlan ID>
diff --git a/xCAT-client/pods/man1/cfm2xcat.1.pod b/xCAT-client/pods/man1/cfm2xcat.1.pod
index 4680b2057..f5a6c71cf 100644
--- a/xCAT-client/pods/man1/cfm2xcat.1.pod
+++ b/xCAT-client/pods/man1/cfm2xcat.1.pod
@@ -1,21 +1,21 @@
 =head1 NAME
 
-B<cfm2xcat> - Migrates the CFM setup in CSM to the xdcp rsync setup in xCAT. 
+B<cfm2xcat> - Migrates the CFM setup in CSM to the xdcp rsync setup in xCAT.
 
 =head1 B<SYNOPSIS>
 
 B<cfm2xcat> [B<-i> I<path of the CFM distribution files generated>] [B<-o> I<path of the xdcp rsync files generated from the CFM distribution files>]
 
-B<cfm2xcat> [B<-h>] 
+B<cfm2xcat> [B<-h>]
 
 
 =head1 B<DESCRIPTION>
 
-Copy the cfm2xcat command to the CSM Management Server.  Run the command, indicating where you want your files saved with the -i and -o flags. They can be in the same directory.   
+Copy the cfm2xcat command to the CSM Management Server.  Run the command, indicating where you want your files saved with the -i and -o flags. They can be in the same directory.
 
 The cfm2xcat command will run cfmupdatenode -a, saving the generated CFM distribution files in the directory indicates with (-i). From those distribution files, it will generate xdcp rsync input files (-F option on xdcp) in the directory indicated by ( -o).
 
-Check the rsync files generated.  There will be a file generated (rsyncfiles)  from the input -o option on the command, and the same file with a (.nr) extension generated for each different noderange that will used to sync files based on your CFM setup in CSM. The rsyncfiles will contain the rsync file list.   The rsyncfiles.nr will contain the noderange. If multiple noderanges then the file name (rsyncfiles)  will be appended with a number. 
+Check the rsync files generated.  There will be a file generated (rsyncfiles)  from the input -o option on the command, and the same file with a (.nr) extension generated for each different noderange that will used to sync files based on your CFM setup in CSM. The rsyncfiles will contain the rsync file list.   The rsyncfiles.nr will contain the noderange. If multiple noderanges then the file name (rsyncfiles)  will be appended with a number.
 
 =head1 OPTIONS
 
diff --git a/xCAT-client/pods/man1/chdef.1.pod b/xCAT-client/pods/man1/chdef.1.pod
index a5428d089..c3c36f542 100644
--- a/xCAT-client/pods/man1/chdef.1.pod
+++ b/xCAT-client/pods/man1/chdef.1.pod
@@ -6,7 +6,7 @@ B<chdef> - Change xCAT data object definitions.
 
 B<chdef> [B<-h>|B<--help>] [B<-t> I<object-types>]
 
-B<chdef> [B<-t> I<object-types>] [B<-o> I<object-names>] [B<-n> I<new-name>] [I<node>] 
+B<chdef> [B<-t> I<object-types>] [B<-o> I<object-names>] [B<-n> I<new-name>] [I<node>]
 
 B<chdef> [B<-V>|B<--verbose>] [B<-t> I<object-types>] [B<-o> I<object-names>]
 [B<-d>|B<--dynamic>] [B<-p>|B<--plus>] [B<-m>|B<--minus>] [B<-z>|B<--stanza>]
@@ -64,7 +64,7 @@ A set of comma delimited object types.  Use the help option to get a list of val
 
 Verbose mode.
 
-=item B<-w> I<attr==val> B<-w> I<attr=~val> ... 
+=item B<-w> I<attr==val> B<-w> I<attr=~val> ...
 
 Use one or multiple -w flags to specify the selection string that can be used to select objects. The operators ==, !=, =~ and !~ are available. Use the help option to get a list of valid attributes for each object type.
 
@@ -164,13 +164,13 @@ To change the node hwtype, this command will change the value of ppc.nodetype.
 
 To change the policy table for policy number 7.0 for admin1
 
- chdef -t policy -o 7.0 name=admin1 rule=allow 
+ chdef -t policy -o 7.0 name=admin1 rule=allow
 
 =item 12.
 
 To change the node nic attributes
 
- chdef -t node -o cn1 nicips.eth0="1.1.1.1|1.2.1.1" nicnetworks.eth0="net1|net2" nictypes.eth0="Ethernet" 
+ chdef -t node -o cn1 nicips.eth0="1.1.1.1|1.2.1.1" nicnetworks.eth0="net1|net2" nictypes.eth0="Ethernet"
 
 
 =item 13.
diff --git a/xCAT-client/pods/man1/chhypervisor.1.pod b/xCAT-client/pods/man1/chhypervisor.1.pod
index 5c7802dd6..83025a9ba 100644
--- a/xCAT-client/pods/man1/chhypervisor.1.pod
+++ b/xCAT-client/pods/man1/chhypervisor.1.pod
@@ -52,10 +52,10 @@ B<chhypervisor> I<noderange> [B<--smcli> I<function> I<arguments>]
 
 The B<chhypervisor> command can be used to configure the RHEV-h.
 
-The rhev-h host will register to the rhev-m automatically, but admin needs to 
+The rhev-h host will register to the rhev-m automatically, but admin needs to
 approve the host can be added to the 'cluster' with B<-a> flag .
 
-After registering, the network interfaces of host need to be added to the 'network' of 
+After registering, the network interfaces of host need to be added to the 'network' of
 RHEV. And the power management for the host should be configured so that
 rhev-m could make proper decision when certain host encountered error.
 
@@ -75,8 +75,8 @@ B<hypervisor.mgr> - The rhev manager (The FQDN of rhev-m server) for the host.
 
 B<hypervisor.interface> - The configuration for the nics. Refer to B<-n>.
 
-B<hypervisor.cluster> - The cluster that the host will be added to. The 
-default is 'Default' cluster if not specified. 
+B<hypervisor.cluster> - The cluster that the host will be added to. The
+default is 'Default' cluster if not specified.
 
 =back
 
@@ -94,45 +94,45 @@ Before approve, the status of the host must be 'pending_approval'.
 =item B<-n>
 Configure the network interfaces for the host.
 
-Note: This operation only can be run when host is in 'maintenance mode'. 
+Note: This operation only can be run when host is in 'maintenance mode'.
 Use B<-d> to switch the host to 'maintenance' mode.
 
 The interfaces which configured in hypervisor.interface will be added
 to the network of RHEV.
 
 The format of hypervisor.interface is multiple [network:interfacename:
-protocol:IP:netmask:gateway] sections separated with '|'. For example: 
+protocol:IP:netmask:gateway] sections separated with '|'. For example:
 [rhevm2:eth0:static:10.1.0.236:255.255.255.0:0.0.0.0].
 
 =over 2
 
-B<network> - The logic network which has been created by 'cfgve -t nw' 
+B<network> - The logic network which has been created by 'cfgve -t nw'
 or the default management network 'rhevm'.
 
 B<interfacename> - Physical network name: 'eth0','eth1'...
 
-B<protocol> - To identify which boot protocol to use for the interface: dhcp 
+B<protocol> - To identify which boot protocol to use for the interface: dhcp
 or static.
 
 B<IP> - The IP address for the interface.
 
 B<netmask> - The network mask for the interface.
 
-B<gateway> - The gateay for the interface. This field only can be set when 
-the interface is added to 'rhevm' network. 
+B<gateway> - The gateay for the interface. This field only can be set when
+the interface is added to 'rhevm' network.
 
 =back
 
 =item B<-p>
 Configure the power management for the host.
 
-The power management must be configured for the rhev-h host to make the 
-rhev-m to monitor the power status of the host, so that when certain host 
+The power management must be configured for the rhev-h host to make the
+rhev-m to monitor the power status of the host, so that when certain host
 failed to function, rhev-m will fail over certain role like SPM to other active host.
 
-For rack mounted server, the bmc IP and user:password need to be set for the 
-power management (These parameters are gotten from ipmi table). rhev-m uses the 
-ipmi protocol to get the power status of the host. 
+For rack mounted server, the bmc IP and user:password need to be set for the
+power management (These parameters are gotten from ipmi table). rhev-m uses the
+ipmi protocol to get the power status of the host.
 
 =item B<-e>
 To activate the host.
@@ -151,9 +151,9 @@ Display usage message.
 
 =item B<--adddisk2pool> I<function> I<region> I<volume> I<group>
 
-Add a disk to a disk pool defined in the EXTENT CONTROL. Function type can be 
-either: (4) Define region as full volume and add to group OR (5) Add existing 
-region to group. If the volume already exists in the EXTENT CONTROL, use 
+Add a disk to a disk pool defined in the EXTENT CONTROL. Function type can be
+either: (4) Define region as full volume and add to group OR (5) Add existing
+region to group. If the volume already exists in the EXTENT CONTROL, use
 function 5. If the volume does not exist in the EXTENT CONTROL, but is attached
 to SYSTEM, use function 4.
 
@@ -171,15 +171,15 @@ Create a virtual switch.
 
 =item B<--addzfcp2pool> I<pool> I<status> I<wwpn> I<lun> I<size> I<owner>
 
-Add a zFCP device to a device pool defined in xCAT. The device must have been 
-carved up in the storage controller and configured with a WWPN/LUN before it 
-can be added to the xCAT storage pool. z/VM does not have the ability to 
+Add a zFCP device to a device pool defined in xCAT. The device must have been
+carved up in the storage controller and configured with a WWPN/LUN before it
+can be added to the xCAT storage pool. z/VM does not have the ability to
 communicate directly with the storage controller to carve up disks dynamically.
 
 =item B<--removediskfrompool> I<function> I<region> I<group>
 
-Remove a disk from a disk pool defined in the EXTENT CONTROL. Function type can 
-be either: (1) Remove region, (2) Remove region from group, (3) Remove region 
+Remove a disk from a disk pool defined in the EXTENT CONTROL. Function type can
+be either: (1) Remove region, (2) Remove region from group, (3) Remove region
 from all groups, OR (7) Remove entire group .
 
 =item B<--removescsi> I<device_number> I<persist (YES or NO)>
@@ -200,11 +200,11 @@ Remove a zFCP device from a device pool defined in xCAT.
 
 =item B<--smcli> I<function> I<arguments>
 
-Execute a SMAPI function. A list of APIs supported can be found by using the 
-help flag, e.g. chhypervisor pokdev61 --smcli -h. Specific arguments associated 
-with a SMAPI function can be found by using the help flag for the function, 
-e.g. chhypervisor pokdev61 --smcli Image_Query_DM -h. Only z/VM 6.2 and older 
-SMAPI functions are supported at this time. Additional SMAPI functions will be 
+Execute a SMAPI function. A list of APIs supported can be found by using the
+help flag, e.g. chhypervisor pokdev61 --smcli -h. Specific arguments associated
+with a SMAPI function can be found by using the help flag for the function,
+e.g. chhypervisor pokdev61 --smcli Image_Query_DM -h. Only z/VM 6.2 and older
+SMAPI functions are supported at this time. Additional SMAPI functions will be
 added in subsequent zHCP versions.
 
 =back
@@ -256,22 +256,22 @@ To deactivate the host 'host1', enter:
 To add a disk to a disk pool defined in the EXTENT CONTROL, enter:
 
  chhypervisor pokdev61 --adddisk2pool 4 DM1234 DM1234 POOL1
- 
+
 =item 2.
 To add a zFCP device to a device pool defined in xCAT, enter:
 
  chhypervisor pokdev61 --addzfcp2pool zfcp1 free 500501234567C890 4012345600000000 8G
- 
+
 =item 3.
 To remove a region from a group in the EXTENT CONTROL, enter:
 
  chhypervisor pokdev61 --removediskfrompool 2 DM1234 POOL1
-  
+
 =item 4.
 To remove a zFCP device from a device pool defined in xCAT, enter:
 
  chhypervisor pokdev61 --removezfcpfrompool zfcp1 4012345600000000 500501234567C890
-  
+
 =item 5.
 To execute a SMAPI function (Image_Query_DM), enter:
 
diff --git a/xCAT-client/pods/man1/chkosimage.1.pod b/xCAT-client/pods/man1/chkosimage.1.pod
index 92d72a84b..d050d2f9e 100644
--- a/xCAT-client/pods/man1/chkosimage.1.pod
+++ b/xCAT-client/pods/man1/chkosimage.1.pod
@@ -6,18 +6,18 @@ B<chkosimage> - Use this xCAT command to check an xCAT osimage.
 
 B<chkosimage [-h | --help ]>
 
-B<chkosimage [-V] [-c|--clean]> I<osimage_name> 
+B<chkosimage [-V] [-c|--clean]> I<osimage_name>
 
 =head1 DESCRIPTION
 
 This command is currently supported for AIX osimages only.
 
-Use this command to verify if the NIM lpp_source directories contain the 
+Use this command to verify if the NIM lpp_source directories contain the
 correct software.  The lpp_source directory must contain all the software
-that is specified in the "installp_bundle" and "otherpkgs" 
-attributes of the osimage definition. 
+that is specified in the "installp_bundle" and "otherpkgs"
+attributes of the osimage definition.
 
-The command gets the name of the lpp_source resource from the xCAT osimage 
+The command gets the name of the lpp_source resource from the xCAT osimage
 definition and the location of the lpp_source directory from the NIM resource
 definition.
 
@@ -27,16 +27,16 @@ Note: Remember to use the prefixes, "I:", "R:", and "E:", respectively,
 when specifying package names in an installp_bundle file or an otherpkgs list.
 
 In addition to checking for missing software the chkosimage command will
-also check to see if there are multiple matches.  This could happen 
+also check to see if there are multiple matches.  This could happen
 when you use wildcards in the software file names. For example,  if you
-have perl-xCAT* in a bundle file it could match multiple versions of the xCAT 
+have perl-xCAT* in a bundle file it could match multiple versions of the xCAT
 rpm package saved in your lpp_source directory.
 
 If this happens you must remove the unwanted versions of the rpms.  If the
 extra rpms are not removed you will get install errors.
 
-To help with this process you can use the "-c|--clean" option.  This 
-option will keep the rpm package with the most recent timestamp and 
+To help with this process you can use the "-c|--clean" option.  This
+option will keep the rpm package with the most recent timestamp and
 remove the others.
 
 The chkosimage command should always be used to verify the lpp_source content
@@ -57,7 +57,7 @@ Display usage message.
 
 =item I<osimage_name>
 
-The name of the xCAT for AIX osimage definition. 
+The name of the xCAT for AIX osimage definition.
 
 =item B<-V |--verbose>
 
@@ -82,7 +82,7 @@ An error has occurred.
 =over 3
 
 =item 1.
-Check the XCAT osimage called "61image" to verify that the lpp_source 
+Check the XCAT osimage called "61image" to verify that the lpp_source
 directories contain all the software that is specified in the
 "installp_bundle" and "otherpkgs" attributes.
 
diff --git a/xCAT-client/pods/man1/chvm.1.pod b/xCAT-client/pods/man1/chvm.1.pod
index f1ac27855..52331a325 100644
--- a/xCAT-client/pods/man1/chvm.1.pod
+++ b/xCAT-client/pods/man1/chvm.1.pod
@@ -31,11 +31,11 @@ B<chvm> I<noderange> [B<--cpupin> I<hostcpuset>]
 
 B<chvm> I<noderange> [B<--membind> I<numanodeset>]
 
-B<chvm> I<noderange> [B<--devpassthru> I<pcidevice>...]     
+B<chvm> I<noderange> [B<--devpassthru> I<pcidevice>...]
+
+B<chvm> I<noderange> [B<--devdetach> I<pcidevice>...]
 
-B<chvm> I<noderange> [B<--devdetach> I<pcidevice>...]     
 
-   
 =head2 VMware/KVM specific:
 
 B<chvm> I<noderange> [B<-a> I<size>] [B<-d> I<disk>] [B<-p> I<disk>] [B<--resize> I<disk>=I<size>] [B<--cpus> I<count>] [B<--mem> I<memory>]
@@ -106,7 +106,7 @@ B<chvm> I<noderange> [B<--undedicatedevice> I<device_address>]
 
 =head2 PPC (with HMC) specific:
 
-The chvm command modifies the partition profile for the partitions specified in noderange. A partitions current profile can be read using lsvm, modified, and piped into the chvm command, or changed with the -p flag. 
+The chvm command modifies the partition profile for the partitions specified in noderange. A partitions current profile can be read using lsvm, modified, and piped into the chvm command, or changed with the -p flag.
 
 This command also supports to change specific partition attributes by specifying one or more "attribute equals value" pairs in command line directly, without whole partition profile.
 
@@ -114,15 +114,15 @@ This command also supports to change specific partition attributes by specifying
 
 For Power 755(use option I<--p775> to specify):
 
-chvm could be used to change the octant configuration values for generating LPARs. chvm is designed to set the Octant configure value to split the CPU and memory for partitions, and set Octant Memory interleaving value. The chvm will only set the pending attributes value. After chvm, the CEC needs to be rebooted manually for the pending values to be enabled. Before reboot the cec, the administrator can use chvm to change the partition plan. If the partition needs I/O slots, the administrator should use chvm to assign the I/O slots. 
+chvm could be used to change the octant configuration values for generating LPARs. chvm is designed to set the Octant configure value to split the CPU and memory for partitions, and set Octant Memory interleaving value. The chvm will only set the pending attributes value. After chvm, the CEC needs to be rebooted manually for the pending values to be enabled. Before reboot the cec, the administrator can use chvm to change the partition plan. If the partition needs I/O slots, the administrator should use chvm to assign the I/O slots.
 
-chvm is also designed to assign the I/O slots to the new LPAR. Both the current IO owning lpar and the new IO owning lpar must be powered off before an IO assignment. Otherwise, if the I/O slot is belonged to an Lpar and the LPAR is power on, the command will return an error when trying to assign that slot to a different lpar. 
+chvm is also designed to assign the I/O slots to the new LPAR. Both the current IO owning lpar and the new IO owning lpar must be powered off before an IO assignment. Otherwise, if the I/O slot is belonged to an Lpar and the LPAR is power on, the command will return an error when trying to assign that slot to a different lpar.
 
 The administrator should use lsvm to get the profile content, and then edit the content, and add the node name with ":" manually before the I/O which will be assigned to the node. And then the profile can be piped into the chvm command, or changed with the -p flag.
 
 For normal power machine:
 
-chvm could be used to modify the resources assigned to partitions. The admin shall specify the attributes with options I<vmcpus>, I<vmmemory>, I<add_physlots>, I<vmothersetting>, I<add_vmnics> and/or I<add_vmstorage>. If nothing specified, nothing will be returned. 
+chvm could be used to modify the resources assigned to partitions. The admin shall specify the attributes with options I<vmcpus>, I<vmmemory>, I<add_physlots>, I<vmothersetting>, I<add_vmnics> and/or I<add_vmstorage>. If nothing specified, nothing will be returned.
 
 
 =head2 zVM specific:
@@ -175,13 +175,13 @@ Specify the operation is for Power 775 machines.
 
 Starting numeric id of the newly created partitions. For Power 775 using Direct FSP Management, the id value only could be B<1>, B<5>, B<9>, B<13>, B<17>, B<21>, B<25> and B<29>. Shall work with option B<--p775>.
 
-=item B<-m>     
+=item B<-m>
 
 memory interleaving. The setting value only could be B<1> or B<2>. B<2> means B<non-interleaved> mode (also 2MC mode), the memory cannot be shared across the processors in an octant. B<1> means B<interleaved> mode (also 8MC mode) , the memory can be shared. The default value is B<1>. Shall work with option B<--p775>.
 
-=item B<-r>    
+=item B<-r>
 
-partition rule. Shall work with option B<--p775>. 
+partition rule. Shall work with option B<--p775>.
 
 If all the octants configuration value are same in one CEC,  it will be  " B<-r>  B<0-7>:I<value>" .
 
@@ -201,7 +201,7 @@ Name of I/O slots assignment profile. Shall work with option B<--p775>.
 
 =item B<lparname>={B<*>|B<name>}
 
-Set LPAR name for the specified lpars. If '*' specified, it means to get names from xCAT database and then set them for the specified lpars. If a string is specified, it only supports single node and the string will be set for the specified lpar. The user can use lsvm to check the lparnames for lpars. 
+Set LPAR name for the specified lpars. If '*' specified, it means to get names from xCAT database and then set them for the specified lpars. If a string is specified, it only supports single node and the string will be set for the specified lpar. The user can use lsvm to check the lparnames for lpars.
 
 =item B<vmcpus=value> B<vmmemory=value> B<add_physlots=value> B<vmothersetting=value>
 
@@ -209,7 +209,7 @@ To specify the parameters that will be modified.
 
 =item B<add_vmnics=value> B<add_vmstorage=value> [B<--vios>]
 
-To create new virtual adapter for the specified node. 
+To create new virtual adapter for the specified node.
 
 =item B<del_physlots=drc_index1,drc_index2...>
 
@@ -262,26 +262,26 @@ Change the size of the Hard disk.  The disk in I<qcow2> format can not be set to
 To pin guest domain virtual CPUs to physical host CPUs specified with I<hostcpuset>.
 I<hostcpuset> is a list of physical CPU numbers. Its syntax is a comma separated list and a special
 markup using '-' and '^' (ex. '0-4', '0-3,^2') can also be allowed. The '-' denotes the range and
-the '^' denotes exclusive. 
+the '^' denotes exclusive.
 
 Note: The expression is sequentially evaluated, so "0-15,^8" is identical to "9-14,0-7,15" but not
 identical to "^8,0-15".
 
 =item B<--membind numanodeset>
 
-It is possible to restrict a guest to allocate memory from the specified set of NUMA nodes I<numanodeset>. 
+It is possible to restrict a guest to allocate memory from the specified set of NUMA nodes I<numanodeset>.
 If the guest vCPUs are also pinned to a set of cores located on that same set of NUMA nodes, memory
 access is local and improves memory access performance.
 
 =item B<--devpassthru pcidevice1,pcidevice2...>
 
-The PCI passthrough gives a guest VM direct access to I/O devices I<pcidevice1,pcidevice2...>. 
+The PCI passthrough gives a guest VM direct access to I/O devices I<pcidevice1,pcidevice2...>.
 The PCI devices are assigned to a virtual machine, and the virtual machine can use this I/O exclusively.
-The devices list are a list of comma separated PCI device names delimited with comma, the PCI device names can be obtained by running B<virsh nodedev-list> on the host.  
+The devices list are a list of comma separated PCI device names delimited with comma, the PCI device names can be obtained by running B<virsh nodedev-list> on the host.
 
 =item B<--devdetach pcidevice1,pcidevice2...>
 
-To detaching the PCI devices which are attached to VM guest via PCI passthrough from the VM guest. The devices list are a list of comma separated PCI device names delimited with comma, the PCI device names can be obtained by running B<virsh nodedev-list> on the host.  
+To detaching the PCI devices which are attached to VM guest via PCI passthrough from the VM guest. The devices list are a list of comma separated PCI device names delimited with comma, the PCI device names can be obtained by running B<virsh nodedev-list> on the host.
 
 
 =back
@@ -328,12 +328,12 @@ Adds a v-disk to a virtual machine's directory entry.
 
 =item B<--addzfcp> I<pool> I<device_address> I<loaddev> I<size> I<tag> I<wwpn> I<lun>
 
-Add a zFCP device to a device pool defined in xCAT. The device must have been 
-carved up in the storage controller and configured with a WWPN/LUN before it can 
-be added to the xCAT storage pool. z/VM does not have the ability to communicate 
-directly with the storage controller to carve up disks dynamically. xCAT will 
-find the a zFCP device in the specified pool that meets the size required, if 
-the WWPN and LUN are not given. The device address can be automatically assigned 
+Add a zFCP device to a device pool defined in xCAT. The device must have been
+carved up in the storage controller and configured with a WWPN/LUN before it can
+be added to the xCAT storage pool. z/VM does not have the ability to communicate
+directly with the storage controller to carve up disks dynamically. xCAT will
+find the a zFCP device in the specified pool that meets the size required, if
+the WWPN and LUN are not given. The device address can be automatically assigned
 by specifying 'auto'. The WWPN/LUN can be set as the LOADDEV in the directory
 entry if (1) is specified as the 'loaddev'.
 
@@ -451,7 +451,7 @@ Output is similar to:
 
 =head2 PPC (using Direct FSP Management) specific:
 
-1. For Power 775, to create a new partition lpar1 on the first octant of the cec cec01, lpar1 will use all the cpu and memory of the octant 0, enter: 
+1. For Power 775, to create a new partition lpar1 on the first octant of the cec cec01, lpar1 will use all the cpu and memory of the octant 0, enter:
 
  mkdef -t node -o lpar1 mgt=fsp groups=all parent=cec01   nodetype=lpar   hcp=cec01
 
@@ -492,7 +492,7 @@ then:
 
  chvm lpar1-lpar9 --p775 -i 1 -m 1  -r 0:5,1-7:1
 
-Output is similar to: 
+Output is similar to:
 
  lpar1: Success
  lpar2: Success
@@ -526,7 +526,7 @@ then run the command:
 Output is similar to:
 
  lpar1: Success
- 
+
 7. For Normal Power machine, to modify the resource assigned to a partition:
 
 Before modify, the resource assigned to node 'lpar1' can be shown with:
@@ -553,8 +553,8 @@ To modify the resource assignment:
  chvm lpar1 vmcpus=1/2/16 vmmemory=1G/8G/32G add_physlots=0x21010202
 
 The output is similar to:
- 
- lpar1: Success 
+
+ lpar1: Success
 
 The resource information after modification is similar to:
 
@@ -572,7 +572,7 @@ The resource information after modification is similar to:
  lpar1: 1/2/2
  lpar1: 128.
 
-Note: The physical I/O resources specified with I<add_physlots> will be appended to the specified partition. The physical I/O resources which are not specified but belonged to the partition will not be removed. For more information about I<add_physlots>, refer to L<lsvm(1)|lsvm.1>.  
+Note: The physical I/O resources specified with I<add_physlots> will be appended to the specified partition. The physical I/O resources which are not specified but belonged to the partition will not be removed. For more information about I<add_physlots>, refer to L<lsvm(1)|lsvm.1>.
 
 =head2 VMware/KVM specific:
 
@@ -587,31 +587,31 @@ Output is similar to:
 1. To adds a 3390 (ECKD) disk to a virtual machine's directory entry:
 
   chvm gpok3 --add3390 POOL1 0101 2G MR
-  
+
 Output is similar to:
-  
+
   gpok3: Adding disk 0101 to LNX3... Done
-  
+
 2. To add a network adapter to a virtual machine's directory entry:
 
   chvm gpok3 --addnic 0600 QDIO 3
-  
+
 Output is similar to:
-  
+
   gpok3: Adding NIC 0900 to LNX3... Done
 
 3. To connects a given network adapter to a GuestLAN:
 
   chvm gpok3 --connectnic2guestlan 0600 GLAN1 LN1OWNR
-  
+
 Output is similar to:
-  
+
   gpok3: Connecting NIC 0600 to GuestLan GLAN1 on LN1OWNR... Done
- 
+
 4. To connects a given network adapter to a vSwitch:
- 
+
   chvm gpok3 --connectnic2vswitch 0600 VSW1
- 
+
 Output is similar to:
 
   gpok3: Connecting NIC 0600 to vSwitch VSW1 on LNX3... Done
@@ -619,7 +619,7 @@ Output is similar to:
 5. To removes a minidisk from a virtual machine's directory entry:
 
   chvm gpok3 --removedisk 0101
- 
+
 Output is similar to:
 
   gpok3: Removing disk 0101 on LNX3... Done
@@ -627,7 +627,7 @@ Output is similar to:
 6. To Removes a network adapter from a virtual machine's directory entry:
 
   chvm gpok3 --removenic 0700
- 
+
 Output is similar to:
 
   gpok3: Removing NIC 0700 on LNX3... Done
diff --git a/xCAT-client/pods/man1/chzone.1.pod b/xCAT-client/pods/man1/chzone.1.pod
index 4a7fbe4bd..4ac96916d 100644
--- a/xCAT-client/pods/man1/chzone.1.pod
+++ b/xCAT-client/pods/man1/chzone.1.pod
@@ -1,10 +1,10 @@
 =head1 B<NAME>
 
-B<chzone> - Changes a zone defined  in the cluster. 
+B<chzone> - Changes a zone defined  in the cluster.
 
 =head1 B<SYNOPSIS>
 
-B<chzone> I<zonename>  [B<--defaultzone>] B<[-K]> [B<-k> I<full path to the ssh RSA private key>] [B<-a> I<noderange> | B<-r> I<noderange>] [B<-g>] [B<-f>] [B<-s> B<{yes|no}>] [B<-V>] 
+B<chzone> I<zonename>  [B<--defaultzone>] B<[-K]> [B<-k> I<full path to the ssh RSA private key>] [B<-a> I<noderange> | B<-r> I<noderange>] [B<-g>] [B<-f>] [B<-s> B<{yes|no}>] [B<-V>]
 
 B<chzone> [B<-h> | B<-v>]
 
@@ -13,20 +13,20 @@ B<chzone> [B<-h> | B<-v>]
 
 The B<chzone> command is designed to change the definition of a zone previous defined in the cluster.
 The chzone command is only supported on Linux ( No AIX support).
-The nodes are not updated with the new root ssh keys by chzone. You must run updatenode -k  or xdsh -K to the nodes to update the root ssh keys to the new generated zone keys. This will also sync any service nodes with the zone keys, if you have a hierarchical cluster.   
+The nodes are not updated with the new root ssh keys by chzone. You must run updatenode -k  or xdsh -K to the nodes to update the root ssh keys to the new generated zone keys. This will also sync any service nodes with the zone keys, if you have a hierarchical cluster.
 Note: if any zones in the zone table, there must be one and only one defaultzone. Otherwise, errors will occur.
 
 =head1 B<OPTIONS>
 
 =over 5
 
-=item B<-h>|B<--help> 
+=item B<-h>|B<--help>
 
-Displays usage information. 
+Displays usage information.
 
-=item B<-v>|B<--version> 
+=item B<-v>|B<--version>
 
-Displays command version and build date. 
+Displays command version and build date.
 
 =item B<-k | --sshkeypath> I<full path to the ssh RSA private key>
 
@@ -42,7 +42,7 @@ The nodes are not automatically updated with the new root ssh keys by chzone. Yo
 if B<--defaultzone> is input, then it will set the zone defaultzone attribute to yes.
 if B<--defaultzone> is input and another zone is currently the default,
 then the B<-f> flag must be used to force a change to the new defaultzone.
-If B<-f> flag is not use an error will be returned and no change made. 
+If B<-f> flag is not use an error will be returned and no change made.
 Note: if any zones in the zone table, there must be one and only one defaultzone. Otherwise, errors will occur.
 
 =item B<-a | --addnoderange> I<noderange>
@@ -61,13 +61,13 @@ it will remove the group name "zonename" from each node in the noderange.
 
 =item B<-s| --sshbetweennodes> B<yes|no>
 
-If -s entered, the zone sshbetweennodes attribute will be set to yes or no based on the input. When this is set to yes, then ssh will be setup to allow passwordless root access between nodes.  If no, then root will be prompted for a password when running ssh between the nodes in the zone. 
+If -s entered, the zone sshbetweennodes attribute will be set to yes or no based on the input. When this is set to yes, then ssh will be setup to allow passwordless root access between nodes.  If no, then root will be prompted for a password when running ssh between the nodes in the zone.
 
-=item B<-f | --force> 
+=item B<-f | --force>
 
 Used with the B<--defaultzone> flag to override the current default zone.
 
-=item B<-g | --assigngroup> 
+=item B<-g | --assigngroup>
 
 Used with the B<-a> or B<-r> flag to add or remove the group zonename for all nodes in the input noderange.
 
@@ -93,14 +93,14 @@ To generate new root ssh keys for zone2A using the ssh id_rsa private key in /ro
 
  chzone zone2A -k /root/.ssh
 
-Note: you must use xdsh -K or updatenode -k to update the nodes with the new keys 
+Note: you must use xdsh -K or updatenode -k to update the nodes with the new keys
 
 =item 3.
 To generate new root ssh keys for zone2A, enter :
 
- chzone zone2A -K  
+ chzone zone2A -K
 
-Note: you must use xdsh -K or updatenode -k to update the nodes with the new keys 
+Note: you must use xdsh -K or updatenode -k to update the nodes with the new keys
 
 =item 4.
 To add a new group of nodes (compute3) to zone3 and add zone3 group to the nodes,  enter:
@@ -116,7 +116,7 @@ To remove a group of nodes (compute4) from zone4 and remove zone4 group from the
 =item 6.
 To change the sshbetweennodes setting on the zone to not allow passwordless ssh between nodes,  enter:
 
- chzone zone5 -s no 
+ chzone zone5 -s no
 
 Note: you must use B<xdsh -K> or B<updatenode -k> to update the nodes with this new setting.
 
diff --git a/xCAT-client/pods/man1/clonevm.1.pod b/xCAT-client/pods/man1/clonevm.1.pod
index 81de9c85e..cf026fda4 100644
--- a/xCAT-client/pods/man1/clonevm.1.pod
+++ b/xCAT-client/pods/man1/clonevm.1.pod
@@ -8,19 +8,19 @@ B<clonevm> I<noderange> [ B<-t> I<master_to_be_made> | B<-b> I<master_to_base_vm
 
 =head1 DESCRIPTION
 
-Command to promote a VM's current configuration and storage to a master as well as 
+Command to promote a VM's current configuration and storage to a master as well as
 performing the converse operation of creating VMs based on a master.
 
-By default, attempting to create a master from a running VM will produce an error. 
+By default, attempting to create a master from a running VM will produce an error.
 The B<--force> argument will request that a master be made of the VM anyway.
 
-Also, by default a VM that is used to create a master will be rebased as a thin 
+Also, by default a VM that is used to create a master will be rebased as a thin
 clone of that master. If the B<--force> argument is used to create a master of a powered
-on vm, this will not be done.  Additionally, the B<--detached> option can be used to 
-explicitly request that a clone not be tethered to a master image, allowing the 
+on vm, this will not be done.  Additionally, the B<--detached> option can be used to
+explicitly request that a clone not be tethered to a master image, allowing the
 clones to not be tied to the health of a master, at the cost of additional storage.
 
-When promoting a VM's current state to master, all related virtual disks will be 
+When promoting a VM's current state to master, all related virtual disks will be
 copied and merged with any prerequisite images.  A master will not be tethered to
 other masters.
 
diff --git a/xCAT-client/pods/man1/configfpc.1.pod b/xCAT-client/pods/man1/configfpc.1.pod
index 10ab7944b..1c4396e93 100644
--- a/xCAT-client/pods/man1/configfpc.1.pod
+++ b/xCAT-client/pods/man1/configfpc.1.pod
@@ -8,7 +8,7 @@ B<configfpc> B<-i> I<interface>
 
 B<configfpc> B<-i> I<interface> B<--ip> I<default ip address>
 
-B<configfpc> [B<-V>|B<--verbose>] 
+B<configfpc> [B<-V>|B<--verbose>]
 
 B<configfpc> [B<-h>|B<--help>|B<-?>]
 
@@ -22,9 +22,9 @@ There are several bits of information that must be included in the xCAT database
 
 You must create the FPC node definitions for all FPCs being discovered including the IP address and switch port information.
 
-The B<configfpc> command discovers the FPCs and collects the MAC address. The MAC address is used to relate the FPC to a FPC node using the switch information for this MAC. Once the relationship is discovered the FPC is configured with the FPC node IP settings. 
+The B<configfpc> command discovers the FPCs and collects the MAC address. The MAC address is used to relate the FPC to a FPC node using the switch information for this MAC. Once the relationship is discovered the FPC is configured with the FPC node IP settings.
 
-This process is repeated until no more FPCs are discovered. 
+This process is repeated until no more FPCs are discovered.
 
 For more information on xCAT support of NeXtScale and configfpc see the following doc:
 XCAT_NeXtScale_Clusters
@@ -35,11 +35,11 @@ XCAT_NeXtScale_Clusters
 
 =item B<-i> I<interface>
 
-Use this flag to specify which xCAT MN interface (example: eth4) that is connected to the NeXtScale FPCs. This option is required. 
+Use this flag to specify which xCAT MN interface (example: eth4) that is connected to the NeXtScale FPCs. This option is required.
 
 =item B<--ip> I<default ip address>
 
-Use this flag to override the default ip address of 192.168.0.100 with a new address. 
+Use this flag to override the default ip address of 192.168.0.100 with a new address.
 
 =item B<-V>|B<--verbose>
 
@@ -52,12 +52,12 @@ Verbose mode
 =over 6
 
 =item 1.
-To discover and configure all NeXtScale Fan Power Controllers (FPCs) connected on eth0 interface. 
+To discover and configure all NeXtScale Fan Power Controllers (FPCs) connected on eth0 interface.
 
  configfpc -i eth0
 
 =item 2.
-To override the default ip address and run in Verbose mode. 
+To override the default ip address and run in Verbose mode.
 
  configfpc -i eth0 --ip 196.68.0.100 -V
 
diff --git a/xCAT-client/pods/man1/csm2xcat.1.pod b/xCAT-client/pods/man1/csm2xcat.1.pod
index dffc47c79..34ba5313b 100644
--- a/xCAT-client/pods/man1/csm2xcat.1.pod
+++ b/xCAT-client/pods/man1/csm2xcat.1.pod
@@ -1,17 +1,17 @@
 =head1 NAME
 
-B<csm2xcat> - Allows the migration of a CSM database to an xCAT database. 
+B<csm2xcat> - Allows the migration of a CSM database to an xCAT database.
 
 =head1 SYNOPSIS
 
 B<csm2xcat> [B<--dir> I<path>]
 
-B<csm2xcat> [B<-h>] 
+B<csm2xcat> [B<-h>]
 
 
 =head1 DESCRIPTION
 
-The csm2xcat command must be run on the Management Server of the CSM system that you want to migrate to xCAT.  The command will build  two xCAT stanza files that can update the xCAT database with the chdef command. 
+The csm2xcat command must be run on the Management Server of the CSM system that you want to migrate to xCAT.  The command will build  two xCAT stanza files that can update the xCAT database with the chdef command.
 
 Copy the csm2xcat command to the CSM Management Server.  Run the command, indicating where you want your stanza files saved with the B<--dir> parameter.  Check the stanza files to see if the information is what you want put in the xCAT database. Copy the two stanza files: node.stanza, device.stanza back to your xCAT Management node, and run the chdef command to input into the xCAT database.
 
diff --git a/xCAT-client/pods/man1/db2sqlsetup.1.pod b/xCAT-client/pods/man1/db2sqlsetup.1.pod
index 8d9e9f059..67f6a1d41 100644
--- a/xCAT-client/pods/man1/db2sqlsetup.1.pod
+++ b/xCAT-client/pods/man1/db2sqlsetup.1.pod
@@ -1,6 +1,6 @@
 =head1 NAME
 
-B<db2sqlsetup> - Sets up the IBM DB2 for xCAT to use.  
+B<db2sqlsetup> - Sets up the IBM DB2 for xCAT to use.
 
 =head1 SYNOPSIS
 
@@ -13,26 +13,26 @@ B<db2sqlsetup> [B<-i>|B<--init>] {B<-S> | B<-C>} [B<-o>|B<--setupODBC>] [B<-V>|B
 
 B<db2sqlsetup> [B<-i>|B<--init>] {B<-S>} [B<-N>|B<--nostart>] [B<-o>|B<--setupODBC>] [B<-V>|B<--verbose>]
 
-B<db2sqlsetup> [B<-o>|B<--setupODBC>] {B<-S> | B<-C>} [B<-V>|B<--verbose>] 
+B<db2sqlsetup> [B<-o>|B<--setupODBC>] {B<-S> | B<-C>} [B<-V>|B<--verbose>]
 
 B<db2sqlsetup> [B<-p>|B<--passwd>] [B<-S> | B<-C>]
 
 =head1 DESCRIPTION
 
 B<db2sqlsetup> - Sets up the IBM DB2 database for xCAT to use. The db2sqlsetup script is run on the Management Node, after the DB2 Server code has been installed, to setup the DB2 Server (-S).
-The xcatd daemon will be stopped during migration on the MN.  No xCAT commands should be run during the init process, because we will be migrating the xCAT database to DB2 and restarting the xcatd daemon. 
+The xcatd daemon will be stopped during migration on the MN.  No xCAT commands should be run during the init process, because we will be migrating the xCAT database to DB2 and restarting the xcatd daemon.
 
-The db2sqlsetup script must be  run on each Service Node, after the DB2 Client code has been installed, to setup the DB2 Client (-C). There are two postscripts that are provided ( db2install and odbcsetup) that will automatically setup you Service Node  as a DB2 client. 
+The db2sqlsetup script must be  run on each Service Node, after the DB2 Client code has been installed, to setup the DB2 Client (-C). There are two postscripts that are provided ( db2install and odbcsetup) that will automatically setup you Service Node  as a DB2 client.
 
 For full information on the setup of DB2,  see Setting_Up_DB2_as_the_xCAT_DB.
 
 When running of db2sqlsetup on the MN:
 One password must be supplied for the setup,  a password for the xcatdb unix id which will be used as the DB2 instance id and database name.  The password will be prompted for interactively or can be input with the XCATDB2PW  environment variable.
 The script will create the xcat database instance (xcatdb) in the /var/lib/db2 directory unless overridden by setting the site.databaseloc attribute.  This attribute should not be set to the directory that is defined in the installloc attribute and it is recommended that the databaseloc be a new filesystem dedicated to the DB2 database, especially in very large clusters.
- 
-When running db2sqlseutp on the SN: 
-Not only will the password for the DB2 instance Id be prompted for and must match the one on the Management Node;  but also the hostname or ip address of the Management Node as known by the Service Node must be supplied , unless the XCATDB2SERVER environment variable is set.  
-You can automatically install and setup of DB2 on the SN using the db2install and odbcsetup postscripts and not need to manually run the command.  See the full documentation. 
+
+When running db2sqlseutp on the SN:
+Not only will the password for the DB2 instance Id be prompted for and must match the one on the Management Node;  but also the hostname or ip address of the Management Node as known by the Service Node must be supplied , unless the XCATDB2SERVER environment variable is set.
+You can automatically install and setup of DB2 on the SN using the db2install and odbcsetup postscripts and not need to manually run the command.  See the full documentation.
 
 Note: On AIX , root must be running ksh and on Linux,  bash shell.
 
@@ -54,11 +54,11 @@ Displays verbose messages.
 
 =item B<-i|--init>
 
-The init option is used to setup an installed DB2 database on AIX or Linux (p-Series) so that xCAT can use the database. This must be combined with either the -S or -C flag to indicate whether we are setting up the Server or the Client. With the -S flag, it involves creating the xcatdb database, the xcatdb instance id, allowing access to the xcatdb database by the Management Node. It also backs up the current xCAT database and restores it into the newly setup xcatdb DB2 database.  It creates the /etc/xcat/cfgloc file to point the xcatd daemon to the DB2 database and restarts the xcatd daemon using the database. 
+The init option is used to setup an installed DB2 database on AIX or Linux (p-Series) so that xCAT can use the database. This must be combined with either the -S or -C flag to indicate whether we are setting up the Server or the Client. With the -S flag, it involves creating the xcatdb database, the xcatdb instance id, allowing access to the xcatdb database by the Management Node. It also backs up the current xCAT database and restores it into the newly setup xcatdb DB2 database.  It creates the /etc/xcat/cfgloc file to point the xcatd daemon to the DB2 database and restarts the xcatd daemon using the database.
 
 =item B<-p|--passwd>
 
-The password change option is to change the database access password for the DB2 xcatdb database. If -S is input then it will only change the password on the DB2 Server (MN).  If -C is input it will only change on the DB2 clients (SN).  If neither -S or -C are input with this flag, then it will change both the DB2 Server and Clients. When changing the password the xcatd daemon will be stopped and restarted.  Any other tools accessing the database should also be stopped before changing and restarted after changing. 
+The password change option is to change the database access password for the DB2 xcatdb database. If -S is input then it will only change the password on the DB2 Server (MN).  If -C is input it will only change on the DB2 clients (SN).  If neither -S or -C are input with this flag, then it will change both the DB2 Server and Clients. When changing the password the xcatd daemon will be stopped and restarted.  Any other tools accessing the database should also be stopped before changing and restarted after changing.
 
 =item B<-S|-C>
 
@@ -67,7 +67,7 @@ This options says whether to setup the Server (-S) on the Management Node, or th
 
 =item B<-N|--nostart>
 
-This option with the -S flag will create the database, but will not backup and restore xCAT tables into the database. It will create the cfgloc file such that the next start of xcatd will try and contact the database.  This can be used to setup the xCAT DB2 database during or before install. 
+This option with the -S flag will create the database, but will not backup and restore xCAT tables into the database. It will create the cfgloc file such that the next start of xcatd will try and contact the database.  This can be used to setup the xCAT DB2 database during or before install.
 
 
 =item B<-o|--setupODBC>
diff --git a/xCAT-client/pods/man1/dumpxCATdb.1.pod b/xCAT-client/pods/man1/dumpxCATdb.1.pod
index fbdf7e392..62730dbde 100644
--- a/xCAT-client/pods/man1/dumpxCATdb.1.pod
+++ b/xCAT-client/pods/man1/dumpxCATdb.1.pod
@@ -15,9 +15,9 @@ B<dumpxCATdb> [B<-h>|B<--help>] [B<-v>|B<--version>]
 
 If not using the binary dump option (-b), then the dumpxCATdb command creates .csv files for xCAT database tables and puts them in the directory given by the -p flag. These files can be used by the restorexCATdb command to restore the database. The command will read the list of tables in the site.skiptables attribute and not backup those tables.
 Supports using XCAT_SKIPTABLES env variable to provide a list of skip tables.
-The command will never backup TEAL or ISNM tables, except isnm_config.  To dump TEAL tables use the documented process for TEAL.  For ISNM use tabdump, after using tabprune to get to prune unnecessary records. 
+The command will never backup TEAL or ISNM tables, except isnm_config.  To dump TEAL tables use the documented process for TEAL.  For ISNM use tabdump, after using tabprune to get to prune unnecessary records.
 
-If using the binary dump option for the DB2 or postgreSQL database, then the routine will use the Database provide utilities for backup of the entire database.  
+If using the binary dump option for the DB2 or postgreSQL database, then the routine will use the Database provide utilities for backup of the entire database.
 
 =head1 OPTIONS
 
@@ -30,7 +30,7 @@ B<-V>          Verbose.
 
 B<-a>          All, without this flag the eventlog and auditlog will be skipped.
 
-B<-b>          This flag is only used for the DB2 or postgreSQL database. The routine will use the database backup utilities to create a binary backup of the entire  database. Note to use this backup on DB2, you will have first had to modify the logging of the database and have taken an offline initial backup. Refer to the xCAT DB2 documentation for more instructions.  
+B<-b>          This flag is only used for the DB2 or postgreSQL database. The routine will use the database backup utilities to create a binary backup of the entire  database. Note to use this backup on DB2, you will have first had to modify the logging of the database and have taken an offline initial backup. Refer to the xCAT DB2 documentation for more instructions.
 
 B<-p>          Path to the directory to dump the database. It will be created, if it does not exist.
 
diff --git a/xCAT-client/pods/man1/genimage.1.pod b/xCAT-client/pods/man1/genimage.1.pod
index bc4f09d8b..56dfb2af1 100644
--- a/xCAT-client/pods/man1/genimage.1.pod
+++ b/xCAT-client/pods/man1/genimage.1.pod
@@ -14,7 +14,7 @@ B<genimage> [B<-h> | B<--help> | B<-v> | B<--version>]
 
 =head1 DESCRIPTION
 
-Generates a stateless and a statelite image that can be used to boot xCAT nodes in a diskless mode.  
+Generates a stateless and a statelite image that can be used to boot xCAT nodes in a diskless mode.
 
 genimage will use the osimage definition for information to generate this image.  Additional options specified on the command line will override any corresponding previous osimage settings, and will be written back to the osimage definition.
 
@@ -29,7 +29,7 @@ for stateless: B<packimage>
 
 for statelite: B<liteimg>
 
-Besides prompting for some parameter values, the B<genimage> command takes default guesses for the parameters not specified or not defined in the I<osimage> and I<linuximage> tables. It also assumes default answers for questions from the yum/zypper command when installing rpms into the image. Use B<--interactive> flag if you want the yum/zypper command to prompt you for the answers.  
+Besides prompting for some parameter values, the B<genimage> command takes default guesses for the parameters not specified or not defined in the I<osimage> and I<linuximage> tables. It also assumes default answers for questions from the yum/zypper command when installing rpms into the image. Use B<--interactive> flag if you want the yum/zypper command to prompt you for the answers.
 
 If B<--onlyinitrd> is specified, genimage only regenerates the initrd for a stateless image to be used for a diskless install.
 
@@ -72,7 +72,7 @@ This argument is now optional, and allows you to specify the network boot interf
 This argument is now optional, and allows you to specify the driver
 modules needed for the network interface(s) on your stateless nodes.  If
 you do not specify this option, the default is to include all recent IBM
-xSeries network drivers.  
+xSeries network drivers.
 
 If specified, I<nodenetdrivers> should be a comma separated list of
 network drivers to be used by the stateless nodes (Ie.: -n tg3,e1000).
@@ -108,15 +108,15 @@ in the install image.
 
 =item B<-g> I<krpmver>
 
-Use this flag to specify the rpm version for kernel packages in the image. It must be present if -k flag is specified in the command for SLES. Generally, the value of -g is the part after B<linux-> and before B<.rpm> in a kernel rpm name. 
+Use this flag to specify the rpm version for kernel packages in the image. It must be present if -k flag is specified in the command for SLES. Generally, the value of -g is the part after B<linux-> and before B<.rpm> in a kernel rpm name.
 
 =item B<-m> statelite
 
 This flag is for Ubuntu, Debian and Fedora12 only. Use this flag to specify if you want to generate statelite image. The default is to generate stateless image for these three operating systems. For others, this flag is invalid because both stateless and statelite images will be generated with this command.
 
-=item B<--interactive> 
+=item B<--interactive>
 
-This flag allows the user to answer questions from yum/zypper command when installing rpms into the image. If it is not specified, '-y' will be passed to the yum command and '--non-interactive --no-gpg-checks' will be passed to the zypper command as default answers. 
+This flag allows the user to answer questions from yum/zypper command when installing rpms into the image. If it is not specified, '-y' will be passed to the yum command and '--non-interactive --no-gpg-checks' will be passed to the zypper command as default answers.
 
 =item B<--dryrun>
 
@@ -125,7 +125,7 @@ This flag shows the underlying call to the os specific genimage function. The us
 
 =item B<-t> I<tmplimit>
 
-(Deprecated) This flag allows the user to setup the /tmp and the /var/tmp file system sizes. This flag is no longer supported. You can overwrite any file system size using the .postinstall script where you can create a new /etc/fstab file. 
+(Deprecated) This flag allows the user to setup the /tmp and the /var/tmp file system sizes. This flag is no longer supported. You can overwrite any file system size using the .postinstall script where you can create a new /etc/fstab file.
 
 =item B<--ignorekernelchk>
 
diff --git a/xCAT-client/pods/man1/geninitrd.1.pod b/xCAT-client/pods/man1/geninitrd.1.pod
index f2d4cfc7a..bd4b132a4 100644
--- a/xCAT-client/pods/man1/geninitrd.1.pod
+++ b/xCAT-client/pods/man1/geninitrd.1.pod
@@ -6,7 +6,7 @@ B<geninitrd> - Generate an initrd (initial ramfs) which to be used for stateful
 
 B<geninitrd> I<imagename> [B<--ignorekernelchk>]
 
-B<geninitrd> [B<-h> | B<--help>] 
+B<geninitrd> [B<-h> | B<--help>]
 
 
 =head1 DESCRIPTION
@@ -17,26 +17,26 @@ B<Diskful Osimage>
 
 =over 2
 
-If the B<imagename> is a stateful one (The provmethod attribute for the osimage is 'install'), 
-this command is used to rebuild the initrd to inject the new drivers from driver rpms or 
-'update distro' and copy the rebuilt initrd and new kernel (If there's new kernel in 'update 
+If the B<imagename> is a stateful one (The provmethod attribute for the osimage is 'install'),
+this command is used to rebuild the initrd to inject the new drivers from driver rpms or
+'update distro' and copy the rebuilt initrd and new kernel (If there's new kernel in 'update
 distro') to the directory I</tftpboot/xcat/<imagename>>.
 
-If the initrd has been rebuilt by geninitrd, when run nodeset, the I<--noupdateinitrd> option 
+If the initrd has been rebuilt by geninitrd, when run nodeset, the I<--noupdateinitrd> option
 should be used to skip the rebuilding of initrd to improve the performance.
 
-Three attributes of osimage object can be used to specify the Driver RPM location and Driver names 
+Three attributes of osimage object can be used to specify the Driver RPM location and Driver names
 for injecting new drivers to initrd.
 
-B<netdrivers> - comma separated driver names that need to be injected to the initrd. 
-The postfix '.ko' can be ignored. The netdrivers attribute must be set to specify the new driver list. 
-If you want to load all the drivers from the driver rpms, using the keyword allupdate. 
+B<netdrivers> - comma separated driver names that need to be injected to the initrd.
+The postfix '.ko' can be ignored. The netdrivers attribute must be set to specify the new driver list.
+If you want to load all the drivers from the driver rpms, using the keyword allupdate.
 
 B<driverupdatesrc> - comma separated driver rpm packages (full path should be specified)
 
-B<osupdatename> - comma separated 'osdistroupdate' object. Each 'osdistroupdate' object specifies a 
-Linux distro update. When run geninitrd, 'kernel-*.rpm' will be searched from osdistroupdate.dirpath 
-to get all the rpm packages and then search the drivers from the rpm packages. 
+B<osupdatename> - comma separated 'osdistroupdate' object. Each 'osdistroupdate' object specifies a
+Linux distro update. When run geninitrd, 'kernel-*.rpm' will be searched from osdistroupdate.dirpath
+to get all the rpm packages and then search the drivers from the rpm packages.
 
 Refer to the doc: Using_Linux_Driver_Update_Disk
 
@@ -47,10 +47,10 @@ B<Stateless Osimage>
 =over 2
 
 If the B<imagename> is a stateless one (The provmethod attribute for the osimage is 'netboot'),
-this command is used to generate the initrd from the rootimg which generated by 'genimage' command. 
+this command is used to generate the initrd from the rootimg which generated by 'genimage' command.
 So the 'genimage' must be run once before running the geninitrd command.
 
-Two attributes of osimage object can be used to specify the Driver RPM location and Driver names 
+Two attributes of osimage object can be used to specify the Driver RPM location and Driver names
 for injecting new drivers to initrd.
 
 B<netdrivers> - comma separated driver names that need to be injected to the initrd.
@@ -61,7 +61,7 @@ B<driverupdatesrc> - comma separated driver rpm packages (full path should be sp
 
 =back
 
- 
+
 =head1 Parameters
 
 I<imagename> specifies the name of an os image definition to be used. The specification for the image is stored in the I<osimage> table and I<linuximage> table.
diff --git a/xCAT-client/pods/man1/getmacs.1.pod b/xCAT-client/pods/man1/getmacs.1.pod
index 8bbbb8d17..beb877afb 100644
--- a/xCAT-client/pods/man1/getmacs.1.pod
+++ b/xCAT-client/pods/man1/getmacs.1.pod
@@ -40,35 +40,35 @@ Note: If "B<-d>" is specified, all the MAC of the blades will be displayed. If n
 
 =head1 OPTIONS
 
-B<--arp>          
+B<--arp>
 
 Read MAC address with ARP protocol.
 
-B<-C>          
+B<-C>
 
-Specify the IP address of the partition for ping test. The default is to read from xCAT database if no B<-C> specified. 
+Specify the IP address of the partition for ping test. The default is to read from xCAT database if no B<-C> specified.
 
-B<-d>          
+B<-d>
 
 Display MAC only. The default is to write the first valid adapter MAC to the xCAT database.
 
-B<-D>          
+B<-D>
 
 Perform discovery for mac address.  By default, it will run ping test to test the connection between adapter and xCAT management node. Use '--noping' can skip the ping test to save time. Be aware that in this way, the lpars will be reset.
 
-B<-f>          
+B<-f>
 
 Force immediate shutdown of the partition. This flag must be used with -D flag.
 
-B<-F>          
+B<-F>
 
 Specify filters to select the correct adapter.  Acceptable filters are Type, MAC_Address, Phys_Port_Loc, Adapter, Port_Group, Phys_Port, Logical_Port, VLan, VSwitch, Curr_Conn_Speed.
 
-B<-G>          
+B<-G>
 
 Gateway IP address of the partition.  The default is to read from xCAT database if no B<-G> specified.
 
-B<-h>          
+B<-h>
 
 Display usage message.
 
@@ -80,25 +80,25 @@ B<--noping>
 
 Only can be used with '-D' to display all the available adapters with mac address but do NOT run ping test.
 
-B<-o>          
+B<-o>
 
 Read MAC address when the lpar is in openfirmware state.  This option mush be used with [B<-D>] option to perform ping test. Before use B<-o>, the lpar must be in openfirmware state.
 
-B<-S>          
+B<-S>
 
 The IP address of the machine to ping.  The default is to read from xCAT database if no B<-S> specified.
 
-B<-v>          
+B<-v>
 
 Command Version.
 
-B<-V>         
+B<-V>
 
 Verbose output.
 
 B<-i>
 
-Specify the interface whose mac address will be collected and written into mac table. If 4 mac addresses are returned by option '-d', they all are the mac addresses of the blade. The N can start from 0(map to the eth0 of the blade) to 3. If 5 mac addresses are returned, the 1st mac address must be the mac address of the blade's FSP, so the N will start from 1(map to the eth0 of the blade) to 4. 
+Specify the interface whose mac address will be collected and written into mac table. If 4 mac addresses are returned by option '-d', they all are the mac addresses of the blade. The N can start from 0(map to the eth0 of the blade) to 3. If 5 mac addresses are returned, the 1st mac address must be the mac address of the blade's FSP, so the N will start from 1(map to the eth0 of the blade) to 4.
 
 
 =head1 RETURN VALUE
@@ -111,7 +111,7 @@ Specify the interface whose mac address will be collected and written into mac t
 =head1 EXAMPLES
 
 1. To retrieve the MAC address for the HMC-managed partition lpar4 and write the first valid adapter MAC to the xCAT database, enter:
- 
+
  getmacs lpar4
 
 Output is similar to:
diff --git a/xCAT-client/pods/man1/groupfiles4dsh.1.pod b/xCAT-client/pods/man1/groupfiles4dsh.1.pod
index 7f2281eba..11169cdc5 100644
--- a/xCAT-client/pods/man1/groupfiles4dsh.1.pod
+++ b/xCAT-client/pods/man1/groupfiles4dsh.1.pod
@@ -1,6 +1,6 @@
 =head1 NAME
 
-B<groupfiles4dsh> - Builds a directory of files for each defined nodegroup in xCAT. 
+B<groupfiles4dsh> - Builds a directory of files for each defined nodegroup in xCAT.
 
 =head1 SYNOPSIS
 
@@ -49,7 +49,7 @@ To use with dsh:
    export DSH_NODEGROUP_PATH= /tmp/nodegroupfiles
 
    dsh  -N all  date   (where all is a group defined in xCAT)
-   dsh -a date  (will look in all nodegroupfiles and build a list of all nodes) 
+   dsh -a date  (will look in all nodegroupfiles and build a list of all nodes)
 
 =head1 FILES
 
diff --git a/xCAT-client/pods/man1/imgcapture.1.pod b/xCAT-client/pods/man1/imgcapture.1.pod
index 5c67d9a8a..841cd9848 100644
--- a/xCAT-client/pods/man1/imgcapture.1.pod
+++ b/xCAT-client/pods/man1/imgcapture.1.pod
@@ -18,11 +18,11 @@ The B<imgcapture> command supports two image types: B<diskless> and B<sysclone>.
 
 The B<diskless> type:
 
-The attributes of osimage will be used to capture and prepare the root image. The B<osver>, B<arch> and B<profile> attributes for the stateless/statelite image to be created are duplicated from the B<node>'s attribute. If the B<-p|--profile> I<profile> option is specified, the image will be created under "/<I<installroot>>/netboot/<osver>/<arch>/<I<profile>>/rootimg". 
+The attributes of osimage will be used to capture and prepare the root image. The B<osver>, B<arch> and B<profile> attributes for the stateless/statelite image to be created are duplicated from the B<node>'s attribute. If the B<-p|--profile> I<profile> option is specified, the image will be created under "/<I<installroot>>/netboot/<osver>/<arch>/<I<profile>>/rootimg".
 
 The default files/directories excluded in the image are specified by /opt/xcat/share/xcat/netboot/<os>/<I<profile>>.<osver>.<arch>.imgcapture.exlist; also, you can put your customized file (<I<profile>>.<osver>.<arch>.imgcapture.exlist) to /install/custom/netboot/<osplatform>. The directories in the default I<.imgcapture.exlist> file are necessary to capture the image from the diskful Linux node managed by xCAT, don't remove it.
 
-The image captured will be extracted into the /<I<installroot>>/netboot/<B<osver>>/<B<arch>>/<B<profile>>/rootimg directory. 
+The image captured will be extracted into the /<I<installroot>>/netboot/<B<osver>>/<B<arch>>/<B<profile>>/rootimg directory.
 
 After the B<imgcapture> command returns without any errors, you can customize the rootimg and run the B<liteimg>/B<packimage> command with the options you want.
 
@@ -40,7 +40,7 @@ The B<imgcapture> command will create the I<osimage> definition after the image
 
 Specify the osimage type you want to capture, two types are supported: diskless and sysclone.
 
-=item B<-p|--profile> I<profile> 
+=item B<-p|--profile> I<profile>
 
 Assign I<profile> as the profile of the image to be created.
 
@@ -72,7 +72,7 @@ For S390x:
 
 If the network interface is not in the above list, you'd better specify the driver modules with this option.
 
-=item B<-h|--help> 
+=item B<-h|--help>
 
 Display the usage message.
 
diff --git a/xCAT-client/pods/man1/imgexport.1.pod b/xCAT-client/pods/man1/imgexport.1.pod
index 0e535a57b..46c165a1a 100644
--- a/xCAT-client/pods/man1/imgexport.1.pod
+++ b/xCAT-client/pods/man1/imgexport.1.pod
@@ -45,7 +45,7 @@ For statelite:
 where x is the name of the profile.
 
 
-Any files specified by the B<-e> flag will also be exported. If B<-p> flag is specified, the names of the postscripts and the postbootscripts for the given node will be exported. The postscripts themselves need to be manualy exported using B<-e> flag. 
+Any files specified by the B<-e> flag will also be exported. If B<-p> flag is specified, the names of the postscripts and the postbootscripts for the given node will be exported. The postscripts themselves need to be manualy exported using B<-e> flag.
 
 For statelite, the litefile table settings for the image will also be exported. The litetree and statelite tables are not exported.
 
@@ -55,15 +55,15 @@ For statelite, the litefile table settings for the image will also be exported.
 
 =item B<-e|--extra> I<srcfile:destdir>
 
-Pack up extra files. If I<destdir> is omitted, the destination directory will be the same as the source directory. 
+Pack up extra files. If I<destdir> is omitted, the destination directory will be the same as the source directory.
 
 =item B<-h|--help>
 
 Display usage message.
-  
+
 =item B<-p|--postscripts> I<node_name>
 
-Get the names of the postscripts and postbootscripts for the given node and pack them into the image. 
+Get the names of the postscripts and postbootscripts for the given node and pack them into the image.
 
 =item B<-v|--verbose>
 
@@ -71,11 +71,11 @@ Verbose output.
 
 =item I<image_name>
 
-The name of the image. Use B<lsdef -t osimage> to find out all the image names. 
+The name of the image. Use B<lsdef -t osimage> to find out all the image names.
 
 =item I<destination>
 
-The output bundle file name. 
+The output bundle file name.
 
 =back
 
@@ -98,7 +98,7 @@ foo.tgz will be built in the current working directory.  Make sure that you have
 
  imgexport Default_Stateless_1265981465 foo.tgz -e /install/postscripts/myscript1 -e /tmp/mydir:/usr/mydir
 
-In addition to all the default files, this will export I</install/postscripts/myscript1> and the whole directory I</tmp/dir> into the file called foo.tgz.  And when imgimport is called  I</install/postscripts/myscript1> will be copied into the same directory and I</tmp/mydir> will be copied to I</usr/mydir>. 
+In addition to all the default files, this will export I</install/postscripts/myscript1> and the whole directory I</tmp/dir> into the file called foo.tgz.  And when imgimport is called  I</install/postscripts/myscript1> will be copied into the same directory and I</tmp/mydir> will be copied to I</usr/mydir>.
 
 3. To include postscript with your image:
 
diff --git a/xCAT-client/pods/man1/imgimport.1.pod b/xCAT-client/pods/man1/imgimport.1.pod
index 2757ee48a..1c1891485 100644
--- a/xCAT-client/pods/man1/imgimport.1.pod
+++ b/xCAT-client/pods/man1/imgimport.1.pod
@@ -40,22 +40,22 @@ For statelite, the following files will be copied to the appropriate directories
   x.postinstall
   x.exlist
 
-where x is the profile name. 
+where x is the profile name.
 
-Any extra files, included by B<--extra> flag in the B<imgexport> command, will also be copied to the appropriate directories. 
+Any extra files, included by B<--extra> flag in the B<imgexport> command, will also be copied to the appropriate directories.
 
 For statelite, the litefile table will be updated for the image. The litetree and statelite tables are not imported.
 
 If B<-p> flag is specified, the I<postscripts> table will be updated with the postscripts and the postbootscripts names from the image for the nodes given by this flag.
 
-If B<-f> flag is not specified, all the files will be copied to the same directories as the source. If it is specified, the old profile name x will be changed to the new and the files will be copied to the appropriate directores for the new profiles. For example, I</opt/xcat/share/xcat/netboot/sles/x.pkglist> will be copied to I</install/custom/netboot/sles/compute_new.pkglist> and I</install/netboot/sles11/ppc64/x/kernel> will be copied to I</install/netboot/sles11/ppc64/compute_new/kernel>. This flag is commonly used when you want to copy the image on the same xCAT mn so you can make modification on the new one. 
+If B<-f> flag is not specified, all the files will be copied to the same directories as the source. If it is specified, the old profile name x will be changed to the new and the files will be copied to the appropriate directores for the new profiles. For example, I</opt/xcat/share/xcat/netboot/sles/x.pkglist> will be copied to I</install/custom/netboot/sles/compute_new.pkglist> and I</install/netboot/sles11/ppc64/x/kernel> will be copied to I</install/netboot/sles11/ppc64/compute_new/kernel>. This flag is commonly used when you want to copy the image on the same xCAT mn so you can make modification on the new one.
 
-After this command, you can run the B<nodeset> command and then start deploying the nodes. You can also choose to modify the files and run the following commands before the node deployment. 
+After this command, you can run the B<nodeset> command and then start deploying the nodes. You can also choose to modify the files and run the following commands before the node deployment.
 
 For stateful:
   nodeset
 
-For stateless: 
+For stateless:
   genimage
   packimage
   nodeset
@@ -72,7 +72,7 @@ For statelite
 
 =item B<-f|--profile> I<new_profile>
 
-Import the image with a new profile name. 
+Import the image with a new profile name.
 
 =item B<-h|--help>
 
@@ -101,14 +101,14 @@ Verbose output.
  imgimport foo.gz
 
 
-2. Import the image with postscript names. 
+2. Import the image with postscript names.
 
  imgimport foo.gz -p node1,node2
 
 The I<postscripts> table will be updated with the name of the I<postscripts> and the I<postbootscripts> for node1 and node2.
 
 
-3. Import the image with a new profile name 
+3. Import the image with a new profile name
 
  imgimport foo.gz -f compute_test
 
diff --git a/xCAT-client/pods/man1/liteimg.1.pod b/xCAT-client/pods/man1/liteimg.1.pod
index 9f8ed39ff..bc9052f68 100644
--- a/xCAT-client/pods/man1/liteimg.1.pod
+++ b/xCAT-client/pods/man1/liteimg.1.pod
@@ -12,7 +12,7 @@ B<liteimg> I<imagename>
 
 =head1 DESCRIPTION
 
-This command modifies the statelite image by creating a series of links. 
+This command modifies the statelite image by creating a series of links.
 It creates 2 levels of indirection so that files can be modified while in
 their image state as well as during runtime. For example, a file like
 <$imgroot>/etc/ntp.conf will have the following operations done to it:
diff --git a/xCAT-client/pods/man1/lsdef.1.pod b/xCAT-client/pods/man1/lsdef.1.pod
index 1a1b23f9f..ac677d0f1 100644
--- a/xCAT-client/pods/man1/lsdef.1.pod
+++ b/xCAT-client/pods/man1/lsdef.1.pod
@@ -6,12 +6,12 @@ B<lsdef> - Use this command to list xCAT data object definitions.
 
 B<lsdef> [B<-h>|B<--help>] [B<-t> I<object-types>] [B<-i> I<attr-list>]
 
-B<lsdef> [B<-V>|B<--verbose>] [B<-l>|B<--long>] [B<-s>|B<--short>] [B<-a>|B<--all>] [B<-S>] 
+B<lsdef> [B<-V>|B<--verbose>] [B<-l>|B<--long>] [B<-s>|B<--short>] [B<-a>|B<--all>] [B<-S>]
 [B<-t> I<object-types>] [B<-o> I<object-names>] [B<-z>|B<--stanza>] [B<-i> I<attr-list>]
 [B<-c>|B<--compress>] [B<--osimage>] [B<--nics>] [[B<-w> I<attr>==I<val>]
 [B<-w> I<attr>=~I<val>] ...] [I<noderange>]
 
-B<lsdef> [B<-l>|B<--long>] [B<-a>|B<--all>] [B<-t> I<object-types>] [B<-z>|B<--stanza>] 
+B<lsdef> [B<-l>|B<--long>] [B<-a>|B<--all>] [B<-t> I<object-types>] [B<-z>|B<--stanza>]
 [B<-i> I<attr-list>] [B<--template> [I<template-object-name>]]
 
 =head1 DESCRIPTION
@@ -33,7 +33,7 @@ To list auditlog or eventlog objects, use lsdef -t auditlog or lsdef -t eventlog
 =item B<-c|--compress>
 
 Display information in compressed mode, each output line has format "<object name>: <data>".
-The output can be passed to command xcoll or xdshbak for formatted output. 
+The output can be passed to command xcoll or xdshbak for formatted output.
 The -c flag must be used with -i flag.
 
 =item B<-h|--help>
@@ -52,7 +52,7 @@ List the complete object definition.
 
 Only list the object names.
 
-=item B<-S> 
+=item B<-S>
 
 List all the hidden nodes (FSP/BPA nodes) with other ones.
 
@@ -237,7 +237,7 @@ To list all the object definition templates shipped in xCAT.
 =item 19.
 
 To display the details of "node" object definition template "ppc64le-template" shipped in xCAT.
-  
+
  lsdef -t node --template ppc64le-template
 
 =item 20.
diff --git a/xCAT-client/pods/man1/lsdocker.1.pod b/xCAT-client/pods/man1/lsdocker.1.pod
index 0f414696c..9448f87f8 100644
--- a/xCAT-client/pods/man1/lsdocker.1.pod
+++ b/xCAT-client/pods/man1/lsdocker.1.pod
@@ -15,7 +15,7 @@ B<lsdocker> {B<-v>|B<--version>}
 
 =head1 DESCRIPTION
 
-B<lsdocker> To list docker instance info or all the running docker instance info if dockerhost is specified. 
+B<lsdocker> To list docker instance info or all the running docker instance info if dockerhost is specified.
 
 =head1 OPTIONS
 
diff --git a/xCAT-client/pods/man1/lsflexnode.1.pod b/xCAT-client/pods/man1/lsflexnode.1.pod
index 4fa436316..3086333b7 100644
--- a/xCAT-client/pods/man1/lsflexnode.1.pod
+++ b/xCAT-client/pods/man1/lsflexnode.1.pod
@@ -9,18 +9,18 @@ B<lsflexnode> [B<-h> | B<--help>]
 
 B<lsflexnode> [B<-v> | B<--version>]
 
-B<lsflexnode> I<noderange> 
+B<lsflexnode> I<noderange>
 
 
 =head1 DESCRIPTION
 
-IBM BladeCenter HX5 offers flexibility ideal that the blades can be combined together for scalability. 
+IBM BladeCenter HX5 offers flexibility ideal that the blades can be combined together for scalability.
 
 There are several concepts to support the HX5 multiple blades combination:
 
 =over 2
 
-B<Complex>: Multiple blades which combined by a scalability card is a complex. 
+B<Complex>: Multiple blades which combined by a scalability card is a complex.
 
 B<Partition>: A logic concept which containing part of the B<Blade slot node> in a complex. Each partition can map to a system to install Operating System. Each partition could have 1HX5, 1HX5+1MD or 2HX5+2MD. (MD is the Memory Drawer)
 
@@ -28,7 +28,7 @@ B<Blade slot node>: The physical blade which installed in the slot of a chassis.
 
 =back
 
-A B<Complex> will be created automatically when a multiple blades combination is installed. In this B<Complex>, every blade belongs to it is working as a B<Blade slot node>. 
+A B<Complex> will be created automatically when a multiple blades combination is installed. In this B<Complex>, every blade belongs to it is working as a B<Blade slot node>.
 
 A B<Partition> can be created base on the B<Complex>, each B<Partition> can have one or multiple B<Blade slot node>.
 
@@ -57,7 +57,7 @@ The meaning of attributes which displayed by the B<lsflexnode>. The word 'node'
 
 =over 4
 
-=item B<Complex>  
+=item B<Complex>
 
 The unique numeric identifier for a complex installed in the chassis.
 
diff --git a/xCAT-client/pods/man1/lshwconn.1.pod b/xCAT-client/pods/man1/lshwconn.1.pod
index 6e958831e..e45d3631e 100644
--- a/xCAT-client/pods/man1/lshwconn.1.pod
+++ b/xCAT-client/pods/man1/lshwconn.1.pod
@@ -18,7 +18,7 @@ B<lshwconn> I<noderange> B<-T> I<tooltype>
 
 =head1 DESCRIPTION
 
-This command is used to display the connection status for CEC and Frame node. 
+This command is used to display the connection status for CEC and Frame node.
 
 =head1 OPTIONS
 
diff --git a/xCAT-client/pods/man1/lskit.1.pod b/xCAT-client/pods/man1/lskit.1.pod
index 01adde594..fe450efc4 100644
--- a/xCAT-client/pods/man1/lskit.1.pod
+++ b/xCAT-client/pods/man1/lskit.1.pod
@@ -94,7 +94,7 @@ The data inside <kitinfo> is returned as:
 
 =item B<-V|--verbose>
 
-Display additional progress and error messages. 
+Display additional progress and error messages.
 
 =item B<-v|--version>
 
@@ -146,7 +146,7 @@ To list the framework value of a Kit tarfile.
 Output is similar to:
 
   Extracting the kit.conf file from /myhome/mykits/pperte-1.3.0.2-0-x86_64.tar.bz2. Please wait.
-  
+
         kitframework=2
         compatible_kitframeworks=0,1,2
 
diff --git a/xCAT-client/pods/man1/lskitcomp.1.pod b/xCAT-client/pods/man1/lskitcomp.1.pod
index dfd6e307c..46a90fa3d 100644
--- a/xCAT-client/pods/man1/lskitcomp.1.pod
+++ b/xCAT-client/pods/man1/lskitcomp.1.pod
@@ -78,7 +78,7 @@ The data inside <kitinfo> is returned as:
 
 =item B<-V|--verbose>
 
-Display additional progress and error messages. 
+Display additional progress and error messages.
 
 =item B<-v|--version>
 
@@ -140,7 +140,7 @@ To list kit components compatible with "rhels-6.2-x86_64" osdistro and "computen
 =item 6.
 
 To list the kit component "testkit-compute-1.0-1-ubuntu-14.04-ppc64el" with XML tags, enter:
-  
+
   XCATXMLTRACE=1 lskitcomp -x testkit-compute-1.0-1-ubuntu-14.04-ppc64el
 
 =back
diff --git a/xCAT-client/pods/man1/lskitdeployparam.1.pod b/xCAT-client/pods/man1/lskitdeployparam.1.pod
index 576204a5d..1ce466a5c 100644
--- a/xCAT-client/pods/man1/lskitdeployparam.1.pod
+++ b/xCAT-client/pods/man1/lskitdeployparam.1.pod
@@ -52,7 +52,7 @@ Return the output with XML tags.  The data is returned as:
 
 =item B<-V|--verbose>
 
-Display additional progress and error messages. 
+Display additional progress and error messages.
 
 =item B<-v|--version>
 
diff --git a/xCAT-client/pods/man1/lskmodules.1.pod b/xCAT-client/pods/man1/lskmodules.1.pod
index b6f3b78a2..35c5c62bf 100644
--- a/xCAT-client/pods/man1/lskmodules.1.pod
+++ b/xCAT-client/pods/man1/lskmodules.1.pod
@@ -12,7 +12,7 @@ B<lskmodules> [B<-?> | B<-h> | B<--help> | B<-v> | B<--version>]
 
 =head1 DESCRIPTION
 
-The B<lskmodules> command finds the kernel driver module files (*.ko) in the specified input locations, runs the modinfo command against each file, and returns the driver name and description.  If -x is specified, the output is returned with XML tags.  
+The B<lskmodules> command finds the kernel driver module files (*.ko) in the specified input locations, runs the modinfo command against each file, and returns the driver name and description.  If -x is specified, the output is returned with XML tags.
 
 Input to the command can specify any number or combination of the input options.
 
@@ -54,7 +54,7 @@ This option is intended for use by other programs.  The XML will not be displaye
 
 =item B<-V|--verbose>
 
-Display additional progress and error messages. 
+Display additional progress and error messages.
 
 =item B<-v|--version>
 
diff --git a/xCAT-client/pods/man1/lsslp.1.pod b/xCAT-client/pods/man1/lsslp.1.pod
index fe1e04cac..d68df623b 100755
--- a/xCAT-client/pods/man1/lsslp.1.pod
+++ b/xCAT-client/pods/man1/lsslp.1.pod
@@ -29,13 +29,13 @@ B<-n>          Only display and write the newly discovered hardware.
 
 B<-u>          Do unicast to a specified IP range. Must be used with B<-s> and B<--range>. The B<-u> flag is not supported on AIX.
 
-B<--range>     Specify one or more IP ranges. Must be use in unicast mode. It accepts multiple formats. For example, 192.168.1.1/24, 40-41.1-2.3-4.1-100. If the range is huge, for example, 192.168.1.1/8, lsslp may take a very long time for node scan. So the range should be exactly specified. 
+B<--range>     Specify one or more IP ranges. Must be use in unicast mode. It accepts multiple formats. For example, 192.168.1.1/24, 40-41.1-2.3-4.1-100. If the range is huge, for example, 192.168.1.1/8, lsslp may take a very long time for node scan. So the range should be exactly specified.
 
 B<-r>          Display Raw SLP response.
 
 B<-C>          The number of the expected responses specified by the user.  When using this flag, lsslp will not return until the it has found all the nodes or time out.  The default max time is 3 seconds. The user can use -T flag the specify the time they want to use.  A short time will limit the time costing, while a long time will help to find all the nodes.
-  
-B<-T>          The number in seconds to limit the time of lsslp.             
+
+B<-T>          The number in seconds to limit the time of lsslp.
 
 
 B<-s>          Service type interested in discovering.
@@ -121,7 +121,7 @@ Output is similar to:
         ip=192.168.200.125
         groups=hmc,all
         mgt=hmc
-        mac=00:1a:64:fb:7d:50        
+        mac=00:1a:64:fb:7d:50
         hidden=0
  192.168.200.244:
         objtype=node
@@ -175,7 +175,7 @@ Output is similar to:
 
 5. To list all discovered service types in stanza format and display the IP address, enter:
 
- lsslp -w 
+ lsslp -w
 
 Output is similar to:
 
@@ -206,17 +206,17 @@ Output is similar to:
 
 6. To list all the CECs, enter:
 
- lsslp -s CEC 
- 
+ lsslp -s CEC
+
  device  type-model  serial-number  side  ip-addresses  hostname
  FSP     9117-MMB    105EBEP        A-1   20.0.0.138    20.0.0.138
  FSP     9117-MMB    105EBEP        B-1   20.0.0.139    20.0.0.139
  CEC     9117-MMB    105EBEP                            Server-9117-MMB-SN105EBEP
 
- 
+
 7. To list all the nodes defined in database which have no SLP response.
 
-  lsslp -I 
+  lsslp -I
 
 Output is similar to:
 
@@ -247,11 +247,11 @@ or lsslp CEC1,CEC2,CEC3
   FSP     8205-E6B    1000ECP        B-0   192.168.200.39  192.168.200.39
   FSP     8205-E6B    1000ECP        A-1   50.0.0.31       50.0.0.27
   FSP     8205-E6B    1000ECP        B-1   50.0.0.32       50.0.0.28
-  CEC     8205-E6B    1000ECP                              CEC3  
+  CEC     8205-E6B    1000ECP                              CEC3
 
 
 9. To list all discovered CMM in stanza format, enter:
-   lsslp -s CMM -m -z 
+   lsslp -s CMM -m -z
 
  e114ngmm1:
         objtype=node
diff --git a/xCAT-client/pods/man1/lstree.1.pod b/xCAT-client/pods/man1/lstree.1.pod
index 618151539..99ecb1907 100644
--- a/xCAT-client/pods/man1/lstree.1.pod
+++ b/xCAT-client/pods/man1/lstree.1.pod
@@ -65,7 +65,7 @@ Output is similar to:
  |__mycn12
  |__mycn13
  ......
-        
+
 =item 2.
 
 To display the tree of service node hierarchy for service node "mysn01".
diff --git a/xCAT-client/pods/man1/lsve.1.pod b/xCAT-client/pods/man1/lsve.1.pod
index a2da16334..813006339 100644
--- a/xCAT-client/pods/man1/lsve.1.pod
+++ b/xCAT-client/pods/man1/lsve.1.pod
@@ -8,17 +8,17 @@ B<lsve> [B<-t> I<type>] [B<-m> I<manager>] [B<-o> I<object>]
 
 =head1 DESCRIPTION
 
-The B<lsve> command can be used to list a virtual environment for 
+The B<lsve> command can be used to list a virtual environment for
 'Data Center', 'Cluster', 'Storage Domain', 'Network' and 'Template' objects.
 
-The mandatory parameter B<-m> I<manager> is used to specify the address of the 
+The mandatory parameter B<-m> I<manager> is used to specify the address of the
 manager of virtual environment. xCAT needs it to access the RHEV manager.
 
-The mandatory parameter B<-t> I<type> is used to specify the type of the target 
+The mandatory parameter B<-t> I<type> is used to specify the type of the target
 object.
 
-Basically, B<lsve> command supports three types of object: B<dc>, B<cl>, B<sd>, B<nw> 
-and B<tpl>. 
+Basically, B<lsve> command supports three types of object: B<dc>, B<cl>, B<sd>, B<nw>
+and B<tpl>.
 
 The parameter B<-o object> is used to specify which object to list. If no B<-o> is specified,
 all the objects with the B<-t> type will be displayed.
@@ -31,7 +31,7 @@ all the objects with the B<-t> type will be displayed.
 Display usage message.
 
 =item B<-m>
-Specify the manager of the virtual environment. 
+Specify the manager of the virtual environment.
 
 For RHEV, the FQDN (Fully Qualified Domain Name) of the rhev manager have to be specified.
 
diff --git a/xCAT-client/pods/man1/lsvm.1.pod b/xCAT-client/pods/man1/lsvm.1.pod
index ac802ed7a..9e4b272db 100644
--- a/xCAT-client/pods/man1/lsvm.1.pod
+++ b/xCAT-client/pods/man1/lsvm.1.pod
@@ -40,12 +40,12 @@ The pump mode value has the valid options:
   1 - Node Pump Mode
   2 - Chip Pump Mode
 
-The Memory Interleaving Mode has 3 valid options: 
+The Memory Interleaving Mode has 3 valid options:
   0 - not Applicable
   1 - interleaved
   2 - non-interleaved
 
-More information about this part, refer to the section Using the *vm commands to define partitions in xCAT DFM  in the doc below. 
+More information about this part, refer to the section Using the *vm commands to define partitions in xCAT DFM  in the doc below.
   XCAT_Power_775_Hardware_Management
 
 =head2 For KVM and VMware
@@ -53,7 +53,7 @@ More information about this part, refer to the section Using the *vm commands to
 If I<noderange> is a hypervisor, virtual machines defined on that hypervisor will be displayed. If I<noderange> is a VM, details for that VM will be displayed.
 
 Note: Only the virtual machine which is in power on state can be listed by B<lsvm> command.
-  
+
 =head2 For zVM:
 
 Show the directory entry for a given virtual machine.
@@ -61,19 +61,19 @@ Show the directory entry for a given virtual machine.
 
 =head1 OPTIONS
 
-B<-h>          
+B<-h>
 
 Display usage message.
 
-B<-v>          
+B<-v>
 
 Command version.
 
-B<-V>          
+B<-V>
 
 Verbose output.
 
-B<-a>          
+B<-a>
 
 List all the profiles for one partition
 
@@ -81,7 +81,7 @@ B<--p775>
 
 Specify the operation is for Power 775 machines.
 
-B<-l>          
+B<-l>
 
 Show lparnames for lpars. It shall work with option B<--p775>.
 
@@ -112,7 +112,7 @@ Output is similar to:
    name=lp3,lpar_name=lp3,lpar_id=3,os_type=aixlinux,all_resources=0,min_mem=128,desired_mem=128,max_mem=128,proc_mode=shared,min_proc_units=0.10,desired_proc_units=0.10,max_proc_units=4.00,min_procs=1,desired_procs=1,max_procs=4,sharing_mode=uncap,uncap_weight=128,io_slots=none,lpar_io_pool_ids=none,max_virtual_slots=6, "virtual_serial_adapters=0/server/1/any//any/1,1/server/1/any//any/1",virtual_scsi_adapters=2/client/1/10-B7D1G/13/1,virtual_eth_adapters=4/0/1//0/0,boot_mode=of,conn_monitoring=0,auto_start=1, power_ctrl_lpar_ids=none
 
 3. For Power 775, to list the I/O slot information of lpar1, enter:
- 
+
  lsvm lpar1 --p775
 
 Output is similar to:
@@ -167,7 +167,7 @@ Output is similar to:
 6. To list the lparname of lpars, enter:
 
  lsvm cec1 -l --p775
- 
+
 Output is similar to:
 
  lpar1: 1: 514/U78A9.001.0123456-P1-C17/0x21010202/2/1: 32: 0/3/3
@@ -221,7 +221,7 @@ Output is similar to:
 
 8. For DFM-managed normal power machine, list out the detailed resource information:
 
- lsvm cec 
+ lsvm cec
 
 Output is similar to:
 
@@ -248,12 +248,12 @@ Output is similar to:
   Bytes per BSR array:  4096
   Available BSR array:  256
 
-Note: The lines listed in "All Physical I/O info" section represent all the physical I/O resource information. The format is like "owner_lparid,slot_id,physical resource name,drc_index,slot_class_code(class description)". The 'drc index' is short for Dynamic Resource Configuration Index, it uniquely indicates a physical I/O resource in a normal power machine. 
+Note: The lines listed in "All Physical I/O info" section represent all the physical I/O resource information. The format is like "owner_lparid,slot_id,physical resource name,drc_index,slot_class_code(class description)". The 'drc index' is short for Dynamic Resource Configuration Index, it uniquely indicates a physical I/O resource in a normal power machine.
 
 9. For DFM-managed partition on normal power machine, list out the detailed information:
 
-  lsvm lpar1 
- 
+  lsvm lpar1
+
 Output is similar to:
 
   lpar1: Lpar Processor Info:
diff --git a/xCAT-client/pods/man1/lsxcatd.1.pod b/xCAT-client/pods/man1/lsxcatd.1.pod
index ce9c2ec1f..266c0752d 100644
--- a/xCAT-client/pods/man1/lsxcatd.1.pod
+++ b/xCAT-client/pods/man1/lsxcatd.1.pod
@@ -24,15 +24,15 @@ Display usage message.
 
 =item B<-d|--database>
 
-Displays information about the current database being used by xCAT. 
+Displays information about the current database being used by xCAT.
 
 =item B<-t|--nodetype>
 
-Displays whether the node is a Management Node or a Service Node. 
+Displays whether the node is a Management Node or a Service Node.
 
 =item B<-a|--all>
 
-Displays all information about the daemon supported by the command. 
+Displays all information about the daemon supported by the command.
 
 =back
 
@@ -50,7 +50,7 @@ Displays all information about the daemon supported by the command.
 
 To display information about the current database:
 
- lsxcatd -d 
+ lsxcatd -d
 
 Output is similar to:
 
@@ -64,9 +64,9 @@ Output is similar to:
 
 To display all information:
 
- lsxcatd -a 
+ lsxcatd -a
 
-Output is similar to: 
+Output is similar to:
 
  Version 2.8.5 (git commit 0d4888af5a7a96ed521cb0e32e2c918a9d13d7cc, built Tue Jul 29 02:22:47 EDT 2014)
  This is a Management Node
diff --git a/xCAT-client/pods/man1/makentp.1.pod b/xCAT-client/pods/man1/makentp.1.pod
index 28ef68f0b..34c915613 100755
--- a/xCAT-client/pods/man1/makentp.1.pod
+++ b/xCAT-client/pods/man1/makentp.1.pod
@@ -28,7 +28,7 @@ I<site.ntpservers> -- the NTP servers for the service node and compute node to s
 
 =back
 
-To setup NTP on the compute node, add B<setupntp> postscript to the I<postscripts> table and run I<updatenode node -P setupntp> command. 
+To setup NTP on the compute node, add B<setupntp> postscript to the I<postscripts> table and run I<updatenode node -P setupntp> command.
 
 
 =head1 OPTIONS
@@ -36,21 +36,21 @@ To setup NTP on the compute node, add B<setupntp> postscript to the I<postscript
 =over 10
 
 
-=item B<-a|--all>          
+=item B<-a|--all>
 
 Setup NTP servers for both management node and the service node. If management node has SLES installed and used as I<ntpservers>, it is recommanded to use the B<setupntp> postscript to set up NTP server for service nodes.
 
 
-=item B<-h|--help>          
+=item B<-h|--help>
 
 Display usage message.
 
 
-=item B<-v|--version>  
+=item B<-v|--version>
 
 Command Version.
 
-=item B<-V|--verbose>    
+=item B<-V|--verbose>
 
 Verbose output.
 
diff --git a/xCAT-client/pods/man1/mkdef.1.pod b/xCAT-client/pods/man1/mkdef.1.pod
index af59220b2..e712674f1 100644
--- a/xCAT-client/pods/man1/mkdef.1.pod
+++ b/xCAT-client/pods/man1/mkdef.1.pod
@@ -11,7 +11,7 @@ B<mkdef> [B<-V>|B<--verbose>] [B<-t> I<object-types>] [B<--template> I<template-
 
 =head1 DESCRIPTION
 
-This command is used to create xCAT object definitions which are stored in the xCAT database. If the definition already exists it will return an error message. The force option may be used to re-create a definition.  In this case the old definition will be remove and the new definition will be created. 
+This command is used to create xCAT object definitions which are stored in the xCAT database. If the definition already exists it will return an error message. The force option may be used to re-create a definition.  In this case the old definition will be remove and the new definition will be created.
 
 
 =head1 OPTIONS
@@ -56,7 +56,7 @@ Name of the xCAT shipped object definition template or an existing object, from
 
 Verbose mode.
 
-=item B<-w> I<attr==val> B<-w> I<attr=~val> ... 
+=item B<-w> I<attr==val> B<-w> I<attr=~val> ...
 
 Use one or multiple -w flags to specify the selection string that can be used to select objects. The operators ==, !=, =~ and !~ are available. For mkdef command, the -w flag only makes sense for creating dynamic node group. Use the help option to get a list of valid attributes for each object type.
 
@@ -151,15 +151,15 @@ To create a dynamic node group definition called SLESNodes containing all the SL
 
 =item 10.
 
-To create a entry (7.0) in the policy table for user admin1 
+To create a entry (7.0) in the policy table for user admin1
 
- mkdef -t policy -o 7.0 name=admin1 rule=allow 
+ mkdef -t policy -o 7.0 name=admin1 rule=allow
 
 =item 11.
 
 To create a node definition with nic attributes
 
- mkdef -t node cn1 groups=all nicips.eth0="1.1.1.1|1.2.1.1" nicnetworks.eth0="net1|net2" nictypes.eth0="Ethernet" 
+ mkdef -t node cn1 groups=all nicips.eth0="1.1.1.1|1.2.1.1" nicnetworks.eth0="net1|net2" nictypes.eth0="Ethernet"
 
 =item 12.
 
diff --git a/xCAT-client/pods/man1/mkdocker.1.pod b/xCAT-client/pods/man1/mkdocker.1.pod
index dcb4eb0e4..0ac21f038 100644
--- a/xCAT-client/pods/man1/mkdocker.1.pod
+++ b/xCAT-client/pods/man1/mkdocker.1.pod
@@ -57,13 +57,13 @@ Attach standard streams to a tty, including stdin if it is not closed.
 
 =item B<ExposedPorts>
 
-An object mapping ports to an empty object in the form of: 
+An object mapping ports to an empty object in the form of:
 
  "ExposedPorts": { "<port>/\<tcp|udp>: {}" }
 
 =item B<HostConfig: {"Binds"}>
 
-A list of volume bindings for this docker instance, the form will be: 
+A list of volume bindings for this docker instance, the form will be:
 
  "HostConfig": {"Binds":["<dir_on_dockerhost>:<dir_in_instance>"]}
 
diff --git a/xCAT-client/pods/man1/mkdsklsnode.1.pod b/xCAT-client/pods/man1/mkdsklsnode.1.pod
index 3b51f160f..a56d670ce 100644
--- a/xCAT-client/pods/man1/mkdsklsnode.1.pod
+++ b/xCAT-client/pods/man1/mkdsklsnode.1.pod
@@ -18,7 +18,7 @@ This command will also create a NIM resolv_conf resource to be used when install
 
 The "domain" and "nameservers" attributes can be set in either the xCAT "network" definition used by the nodes or in the xCAT cluster "site" definition. The setting in the "network" definition will take priority.
 
-The "search" field of the resolv.conf file will contain a list all the domains 
+The "search" field of the resolv.conf file will contain a list all the domains
 listed in the xCAT network definitions and the xCAT site definition.
 
 The "nameservers" value can either be set to a specific IP address or the "<xcatmaster>" key word.  The "<xcatmaster>" key word means that the value of the "xcatmaster" attribute of the node definition will be used in the /etc/resolv.conf file.  (I.e.  The name of the install server as known by the node.)
@@ -39,7 +39,7 @@ When creating a new NIM machine definition the default is to use the same name a
 
 You can use the "-n" option of the mkdsklsnode command to create and initialize an alternate NIM machine definition for the same physical nodes. This option allows you to set up a new image to use when a node is next rebooted while the node is currently running.  This is possible because the NIM name for a machine definition does not have to be the hostname of the node.  This allows you to have multiple NIM machine definitions for the same physical node. The naming convention for the new NIM machine name is "<xcat_node_name>_<image_name>", (Ex. "node01_61spot"). Since all the NIM initialization can be done while the node is running the downtime for for the node is reduced to the time it takes to reboot.
 
-B<Note:> When using the "-n" option make sure that the new osimage you specify and all the NIM resources that are used are different than what are currently being used on the nodes.  The NIM resources should not be shared between the old osimage and the new osimage. 
+B<Note:> When using the "-n" option make sure that the new osimage you specify and all the NIM resources that are used are different than what are currently being used on the nodes.  The NIM resources should not be shared between the old osimage and the new osimage.
 
 You can use the force option to reinitialize a node if it already has resources allocated or it is in the wrong NIM state. This option will reset the NIM node and deallocate resources before reinitializing. Use this option with caution since reinitializing a node will stop the node if it is currently running.
 
diff --git a/xCAT-client/pods/man1/mkflexnode.1.pod b/xCAT-client/pods/man1/mkflexnode.1.pod
index ed8d47f57..1f906e078 100644
--- a/xCAT-client/pods/man1/mkflexnode.1.pod
+++ b/xCAT-client/pods/man1/mkflexnode.1.pod
@@ -17,7 +17,7 @@ B<mkflexnode> I<noderange>
 A flexible node is a B<Partition> in a complex. Creating a flexible node is to create a partition which including all the slots defined in the xCAT blade node.
 
 Before creating a flexible node, a general xCAT blade node should be defined. The I<id> attribute of this node should be a node range like 'a-b', it means the blades installed in slots 'a-b' need to be assigned to the partition. 'a' is the start slot, 'b' is the end slot. If this partition only have one slot, the slot range can be 'a'.
- 
+
 The action of creating flexible node will impact the hardware status. Before creating it, the blades in the slot range should be in B<power off> state.
 
 After the creating, use the B<lsflexnode> to check the status of the node.
diff --git a/xCAT-client/pods/man1/mkhwconn.1.pod b/xCAT-client/pods/man1/mkhwconn.1.pod
index 0f47b3668..763ced7d2 100644
--- a/xCAT-client/pods/man1/mkhwconn.1.pod
+++ b/xCAT-client/pods/man1/mkhwconn.1.pod
@@ -29,7 +29,7 @@ This command is useful when you have multiple HMCs, each of which will manage a
 each HMC which CECs/Frames it should manage.  When using this, you should turn off the self-discovery on each HMC.  You also need
 to put all the HMCs and all the Frames on a single flat service network.
 
-When B<-t> is specified, this command reads the connection information from the xCAT ppc table (e.g. the parent attribute), and read the user/password from the ppcdirect table. Then this command will assign CEC nodes and Frame nodes to HMC nodes. 
+When B<-t> is specified, this command reads the connection information from the xCAT ppc table (e.g. the parent attribute), and read the user/password from the ppcdirect table. Then this command will assign CEC nodes and Frame nodes to HMC nodes.
 
 When B<-p> is specified, this command gets the connection information from command line arguments. If B<-P> is not specified, the default password for CEC and Frame nodes is used.
 
@@ -116,7 +116,7 @@ To setup the connections for all CEC nodes in node group cec to hardware server,
 
 To setup the connections for all cecs nodes in node group cec to hardware server, and the tooltype value is lpar, and the port value is 1:
 
- mkhwconn cec -t -T lpar --port 1 
+ mkhwconn cec -t -T lpar --port 1
 
 =item 5.
 
diff --git a/xCAT-client/pods/man1/mknimimage.1.pod b/xCAT-client/pods/man1/mknimimage.1.pod
index 700ccdc43..31e185d1a 100644
--- a/xCAT-client/pods/man1/mknimimage.1.pod
+++ b/xCAT-client/pods/man1/mknimimage.1.pod
@@ -22,17 +22,17 @@ When creating a mksysb image definition you must specify either the "-n" or the
 
 B<Adding software and configuration files to the osimage.>
 
-When creating a diskless osimage definition you also have the option of automatically updating the NIM SPOT resource.  You can have additional software installed or you can have configuration files added or updated.  To have software installed you must provide either the names of NIM installp_bundle resources or fileset names on the command line using the "attr=val" option. You may also supply the installp flags, RPM flags, emgr flags to use when installing the software. 
+When creating a diskless osimage definition you also have the option of automatically updating the NIM SPOT resource.  You can have additional software installed or you can have configuration files added or updated.  To have software installed you must provide either the names of NIM installp_bundle resources or fileset names on the command line using the "attr=val" option. You may also supply the installp flags, RPM flags, emgr flags to use when installing the software.
 
 To have configuration files updated you must provide the full path name of a "synclists" file which contains the list of actual files to update.  The xCAT osimage definition that is created will contain the installp_bundle, otherpkgs, and synclists files that are provided on the command line.
 
 B<Updating an existing xCAT osimage>
 
-If you wish to update an existing diskless image after it has already been created you can use the "-u" (update) option.  In this case the xCAT osimage definition will not be updated. 
+If you wish to update an existing diskless image after it has already been created you can use the "-u" (update) option.  In this case the xCAT osimage definition will not be updated.
 
-There are two ways to use the update feature.  
+There are two ways to use the update feature.
 
-You can update the osimage definition and run the B<mknimimage> command with no "installp_bundle", "otherpkgs", or "synclists" command line values. The information for updating the SPOT will come from the osimage definition only.  This has the advantage of keeping a record of any changes that were made to the SPOT. 
+You can update the osimage definition and run the B<mknimimage> command with no "installp_bundle", "otherpkgs", or "synclists" command line values. The information for updating the SPOT will come from the osimage definition only.  This has the advantage of keeping a record of any changes that were made to the SPOT.
 
 Or, you could do a more ad hoc update by providing one or more of the "installp_bundle", "otherpkgs", or "synclists" values on the command line. If any of these values are provided the B<mknimimage> command will use those values only. The osimage definition will not be used or updated.
 
@@ -75,7 +75,7 @@ To remove specific NIM resource definitions use the AIX B<nim> command. ("nim -o
 
 =item I<attr=val [attr=val ...]>
 
-Specifies one or more "attribute equals value" pairs, separated by spaces. Attr=val pairs must be specified last on the command line. 
+Specifies one or more "attribute equals value" pairs, separated by spaces. Attr=val pairs must be specified last on the command line.
 
 Currently supported attributes:
 
@@ -114,11 +114,11 @@ The name of a NIM mksysb resource.
 One or more comma separated installp, emgr, or rpm packages.  The packages must
 have prefixes of 'I:', 'E:', or 'R:', respectively. (ex. R:foo.rpm)
 
-=item B<paging> 
+=item B<paging>
 
 The name of the NIM paging resource.
 
-=item B<resolv_conf> 
+=item B<resolv_conf>
 
 The name of the NIM resolv_conf resource.
 
@@ -157,7 +157,7 @@ The alternate flags to be passed along to the AIX installp command. (The default
 =item B<rpm_flags>
 
 The alternate flags to be passed along to the AIX rpm command. (The default for
-rpm_flags is "-Uvh ".) The mknimimage command will check each rpm to see if 
+rpm_flags is "-Uvh ".) The mknimimage command will check each rpm to see if
 it is installed.  It will not be reinstalled unless you specify the appropriate
 rpm option, such as '--replacepkgs'.
 
@@ -167,11 +167,11 @@ The alternate flags to be passed along to the AIX emgr command. (There is no def
 
 =item B<dumpsize>
 
-The maximum size for a single dump image the dump resource will accept. Space is not allocated until a client starts to dump. The default size is 50GB. The dump resource should be large enough to hold the expected AIX dump and snap data. 
+The maximum size for a single dump image the dump resource will accept. Space is not allocated until a client starts to dump. The default size is 50GB. The dump resource should be large enough to hold the expected AIX dump and snap data.
 
 =item B<max_dumps>
 
-The maximum number of archived dumps for an individual client. The default is one. 
+The maximum number of archived dumps for an individual client. The default is one.
 
 =item B<snapcollect>
 
@@ -239,7 +239,7 @@ Use this option to specify that a NIM "shared_root" resource be created for the
 
 =item B<-s> I<image_source>
 
-The source of software to use when creating the new NIM lpp_source resource. This could be a source directory or a previously defined NIM lpp_source resource name. 
+The source of software to use when creating the new NIM lpp_source resource. This could be a source directory or a previously defined NIM lpp_source resource name.
 
 =item B<-t nimtype>
 
@@ -319,13 +319,13 @@ Note:  If you also wish to have the original lpp_source copied and defined use t
 
  mknimimage -t diskless -s 61cosi_lpp_source 611cosi tmp=mytmp home=myhome
 
-10) Create a diskless image and update it with additional software using rpm flags and configuration files. 
+10) Create a diskless image and update it with additional software using rpm flags and configuration files.
 
  mknimimage -t diskless -s 61cosi_lpp_source 61dskls otherpkgs=I:fset1,R:foo.rpm,E:IZ38930TL0.120304.epkg.Z synclists=/install/mysyncfile rpm_flags="-i --nodeps"
 
 The xCAT osimage definition created by this command will include the "otherpkgs" and "synclists" values.  The NIM SPOT resource associated with this osimage will be updated with the additional software using rpm flags "-i --nodeps" and configuration files.
 
-11) Update an existing diskless image (AIX/NIM SPOT) using the information saved in the xCAT "61dskls" osimage definition. Also specify verbose messages.  
+11) Update an existing diskless image (AIX/NIM SPOT) using the information saved in the xCAT "61dskls" osimage definition. Also specify verbose messages.
 
  mknimimage -V -u 61dskls
 
@@ -335,7 +335,7 @@ The xCAT osimage definition created by this command will include the "otherpkgs"
 
 Note that when "installp_bundle", "otherpkgs", or "synclists" values are specified with the "-u" option then the xCAT osimage definition is not used or updated.
 
-13) Update an existing image to support NFSv4. Also specify verbose messages.  
+13) Update an existing image to support NFSv4. Also specify verbose messages.
 
  mknimimage -V -u 61dskls nfs_vers=4
 
diff --git a/xCAT-client/pods/man1/mkvm.1.pod b/xCAT-client/pods/man1/mkvm.1.pod
index fd98f4525..aeda27df6 100644
--- a/xCAT-client/pods/man1/mkvm.1.pod
+++ b/xCAT-client/pods/man1/mkvm.1.pod
@@ -42,7 +42,7 @@ B<mkvm> I<noderange> [I<source_virtual_machine>] [B<pool=> I<disk_pool>]
 
 =head2 For PPC (with HMC) specific:
 
-The first form of B<mkvm> command creates new partition(s) with the same profile/resources as the partition specified by I<singlenode>. The -i and I<noderange> specify the starting numeric partition number and the I<noderange> for the newly created partitions, respectively. The LHEA port numbers and the HCA index numbers will be automatically increased if they are defined in the source partition. 
+The first form of B<mkvm> command creates new partition(s) with the same profile/resources as the partition specified by I<singlenode>. The -i and I<noderange> specify the starting numeric partition number and the I<noderange> for the newly created partitions, respectively. The LHEA port numbers and the HCA index numbers will be automatically increased if they are defined in the source partition.
 
 The second form of this command duplicates all the partitions from the source specified by I<profile> to the destination specified by I<destcec>. The source and destination CECs can be managed by different HMCs.
 
@@ -58,7 +58,7 @@ If no option is specified, a partition using the parameters specified with attri
 
 =head2 For KVM and VMware:
 
-The B<mkvm> command creates new virtual machine(s) with the I<disksize> size of hard disk, I<memsize> size of memory and I<cpucount> number of cpu. 
+The B<mkvm> command creates new virtual machine(s) with the I<disksize> size of hard disk, I<memsize> size of memory and I<cpucount> number of cpu.
 
 =head2 For zVM:
 
@@ -70,11 +70,11 @@ The second form of this creates a new virtual machine with the same profile/reso
 
 =over 10
 
-=item B<-h|--help>       
+=item B<-h|--help>
 
 Display usage message.
 
-=item B<-c>              
+=item B<-c>
 
 The cec (fsp) name for the destination.
 
@@ -82,13 +82,13 @@ The cec (fsp) name for the destination.
 
 The cpu count which will be created for the kvm/vmware virtual machine.
 
-=item B<--full>          
+=item B<--full>
 
 Request to create a new full system partition for each CEC.
 
 =item B<vmcpus=> I<value> B<vmmemory=> I<value> B<vmphyslots=> I<value> B<vmothersetting=> I<value> B<vmnics=> I<value> B<vmstorage=> I<value> [B<--vios>]
 
-To specify the parameters which are used to create a partition. The I<vmcpus>, I<vmmemory> are necessary, and the value specified with this command have a more high priority. If the value of any of the three options is not specified, the corresponding value specified for the node object will be used. If any of the three attributes is neither specified with this command nor specified with the node object, error information will be returned. To reference to L<lsvm(1)|lsvm.1> for more information about 'drc_index' for I<vmphyslots>.  
+To specify the parameters which are used to create a partition. The I<vmcpus>, I<vmmemory> are necessary, and the value specified with this command have a more high priority. If the value of any of the three options is not specified, the corresponding value specified for the node object will be used. If any of the three attributes is neither specified with this command nor specified with the node object, error information will be returned. To reference to L<lsvm(1)|lsvm.1> for more information about 'drc_index' for I<vmphyslots>.
 
 The option I<vios> is used to specify the partition that will be created is a VIOS partition. If specified, the value for I<vmstorage> shall be number which indicate the number of vSCSI server adapter will be created, and if no value specified for I<vmphyslots>, all the physical slot of the power machine will be asigned to VIOS partition. If not specified, it shall be in form of I<vios_name:server_slotid> to specify the vios and the virtual slot id of the vSCSI server adapter that will be connected from the Logical partition.
 
@@ -96,11 +96,11 @@ The option I<vios> is used to specify the partition that will be created is a VI
 
 If the storage already exists, remove it before creating a new virtual machine.
 
-=item B<-i>              
+=item B<-i>
 
-Starting numeric id of the newly created partitions. 
+Starting numeric id of the newly created partitions.
 
-=item B<-l>              
+=item B<-l>
 
 The partition name of the source.
 
@@ -108,7 +108,7 @@ The partition name of the source.
 
 The memory size which will be used for the new created kvm/vmware virtual machine. Unit is Megabyte.
 
-=item B<-p>             
+=item B<-p>
 
 The file that contains the profiles for the source partitions.
 
@@ -116,11 +116,11 @@ The file that contains the profiles for the source partitions.
 
 The size of storage which will be created for the kvm/vmware virtual machine.
 
-=item B<-v|--version>    
+=item B<-v|--version>
 
 Command Version.
 
-=item B<-V|--verbose>    
+=item B<-V|--verbose>
 
 Verbose output.
 
@@ -198,7 +198,7 @@ Output is similar to:
 5. To create a new zVM virtual machine (gpok3) based on a directory entry:
 
  mkvm gpok3 /tmp/dirEntry.txt
- 
+
 Output is similar to:
 
  gpok3: Creating user directory entry for LNX3... Done
@@ -242,11 +242,11 @@ First, define a node object:
  mkdef -t node -o lpar1 mgt=fsp cons=fsp nodetype=ppc,osi id=1 hcp=cec parent=cec hwtype=lpar groups=lpar,all
 
 Then, create the partition on the specified cec.
- 
+
  mkvm lpar1 --full
 
 The output is similar to:
- 
+
  lpar1: Done
 
 To query the resources allocated to node 'lpar1'
@@ -274,7 +274,7 @@ The output is similar to:
   lpar1: 256.
 
 
-Note: The 'parent' attribute for node 'lpar1' is the object name of physical power machine that the full partition will be created on. 
+Note: The 'parent' attribute for node 'lpar1' is the object name of physical power machine that the full partition will be created on.
 
 9. To create a partition using some of the resources on normal power machine.
 
@@ -285,7 +285,7 @@ After a node object is defined, the resources that will be used for the partitio
  chdef lpar1 vmcpus=1/4/16 vmmemory=1G/4G/32G vmphyslots=0x21010201,0x21010200 vmothersetting=bsr:128,hugepage:2
 
 Then, create the partion on the specified cec.
- 
+
  mkvm lpar1
 
 Option 2:
@@ -295,7 +295,7 @@ Option 2:
 The outout is similar to:
 
  lpar1: Done
- 
+
 Note: The 'vmplyslots' specify the drc index of the physical slot device. Every drc index shall be delimited with ','. The 'vmothersetting' specify two kinds of resource, bsr(Barrier Synchronization Register) specified the num of BSR arrays, hugepage(Huge Page Memory) specified the num of huge pages.
 
 To query the resources allocated to node 'lpar1'
diff --git a/xCAT-client/pods/man1/mkzone.1.pod b/xCAT-client/pods/man1/mkzone.1.pod
index 78cbad0f1..9480b92b5 100644
--- a/xCAT-client/pods/man1/mkzone.1.pod
+++ b/xCAT-client/pods/man1/mkzone.1.pod
@@ -1,10 +1,10 @@
 =head1 B<NAME>
 
-B<mkzone> - Defines a new zone in the cluster. 
+B<mkzone> - Defines a new zone in the cluster.
 
 =head1 B<SYNOPSIS>
 
-B<mkzone> I<zonename>  [B<--defaultzone>] [B<-k> I<full path to the ssh RSA private key>] [B<-a> I<noderange>] [B<-g>] [B<-f>] [B<-s> I<{yes|no}>] [B<-V>] 
+B<mkzone> I<zonename>  [B<--defaultzone>] [B<-k> I<full path to the ssh RSA private key>] [B<-a> I<noderange>] [B<-g>] [B<-f>] [B<-s> I<{yes|no}>] [B<-V>]
 
 B<mkzone> [B<-h> | B<-v>]
 
@@ -12,20 +12,20 @@ B<mkzone> [B<-h> | B<-v>]
 
 The B<mkzone> command is designed to divide the xCAT cluster into multiple zones. The nodes in each zone will share common root ssh keys. This allows the nodes in a zone to be able to as root ssh to each other without password, but cannot do the same to any node in another zone. All zones share a common xCAT Management Node and database including the site table, which defines the attributes of the entire cluster.
 The mkzone command is only supported on Linux ( No AIX support).
-The nodes are not updated with the new root ssh keys by mkzone.  You must run updatenode -k  or xdsh -K to the nodes to update the root ssh keys to the new generated zone keys. This will also sync any service nodes with the zone keys, if you have a hierarchical cluster.   
+The nodes are not updated with the new root ssh keys by mkzone.  You must run updatenode -k  or xdsh -K to the nodes to update the root ssh keys to the new generated zone keys. This will also sync any service nodes with the zone keys, if you have a hierarchical cluster.
 Note: if any zones in the zone table, there must be one and only one defaultzone. Otherwise, errors will occur.
 
 =head1 B<OPTIONS>
 
 =over 5
 
-=item B<-h>|B<--help> 
+=item B<-h>|B<--help>
 
-Displays usage information. 
+Displays usage information.
 
-=item B<-v>|B<--version> 
+=item B<-v>|B<--version>
 
-Displays command version and build date. 
+Displays command version and build date.
 
 =item B<-k | --sshkeypath> I<full path to the ssh RSA private key>
 
@@ -37,7 +37,7 @@ If -f is not used,  then it will generate a set of root ssh keys for the zone an
 if --defaultzone is input, then it will set the zone defaultzone attribute to yes; otherwise it will set to no.
 if --defaultzone is input and another zone is currently the default,
 then the -f flag must be used to force a change to the new defaultzone.
-If -f flag is not use an error will be returned and no change made. 
+If -f flag is not use an error will be returned and no change made.
 Note: if any zones in the zone table, there must be one and only one defaultzone. Otherwise, errors will occur.
 
 =item B<-a | --addnoderange> I<noderange>
@@ -49,13 +49,13 @@ it will add the group name "zonename" to each node in the noderange.
 =item B<-s| --sshbetweennodes> B<yes|no>
 
 If -s entered, the zone sshbetweennodes attribute will be set to yes or no. It defaults to yes. When this is set to yes, then ssh will be setup
-to allow passwordless root access between nodes.  If no, then root will be prompted for a password when running ssh between the nodes in the zone. 
+to allow passwordless root access between nodes.  If no, then root will be prompted for a password when running ssh between the nodes in the zone.
 
-=item B<-f | --force> 
+=item B<-f | --force>
 
 Used with the (--defaultzone) flag to override the current default zone.
 
-=item B<-g | --assigngroup> 
+=item B<-g | --assigngroup>
 
 Used with the (-a) flag to create the group zonename for all nodes in the input noderange.
 
@@ -74,7 +74,7 @@ To make a new zone1 using defaults, enter:
 
  mkzone zone1
 
-Note: with the first B<mkzone>, you will automatically get the xcatdefault zone created as the default zone.  This zone uses ssh keys from <roothome>/.ssh directory.  
+Note: with the first B<mkzone>, you will automatically get the xcatdefault zone created as the default zone.  This zone uses ssh keys from <roothome>/.ssh directory.
 
 =item 2.
 To make a new zone2 using defaults and make it the default zone enter:
@@ -85,7 +85,7 @@ To make a new zone2 using defaults and make it the default zone enter:
 
 To make a new zone2A using the ssh id_rsa private key in /root/.ssh:
 
- mkzone zone2A -k /root/.ssh 
+ mkzone zone2A -k /root/.ssh
 
 =item 4.
 
diff --git a/xCAT-client/pods/man1/moncfg.1.pod b/xCAT-client/pods/man1/moncfg.1.pod
index 47a3bba3a..6cf105231 100644
--- a/xCAT-client/pods/man1/moncfg.1.pod
+++ b/xCAT-client/pods/man1/moncfg.1.pod
@@ -15,7 +15,7 @@ B<moncfg> I<name> I<[noderange]> B<[-r|--remote]>
 
 =head1 DESCRIPTION
 
-This command is used to configure a 3rd party monitoring software to monitor the xCAT cluster. For example, it modifies the configuration file for the monitoring software so that the nodes can be included in the monitoring domain. The operation is performed on the management node and the service nodes of the given nodes. The operation will also be performed on the nodes if the I<-r> option is specified, though the configuration of the nodes is usually performed during the node deployment stage. 
+This command is used to configure a 3rd party monitoring software to monitor the xCAT cluster. For example, it modifies the configuration file for the monitoring software so that the nodes can be included in the monitoring domain. The operation is performed on the management node and the service nodes of the given nodes. The operation will also be performed on the nodes if the I<-r> option is specified, though the configuration of the nodes is usually performed during the node deployment stage.
 
 
 =head1 Parameters
diff --git a/xCAT-client/pods/man1/mondecfg.1.pod b/xCAT-client/pods/man1/mondecfg.1.pod
index 6f7ccc753..0a0b4b095 100644
--- a/xCAT-client/pods/man1/mondecfg.1.pod
+++ b/xCAT-client/pods/man1/mondecfg.1.pod
@@ -15,7 +15,7 @@ B<mondecfg> I<name> I<[noderange]> B<[-r|--remote]>
 
 =head1 DESCRIPTION
 
-This command is used to deconfigure a 3rd party monitoring software from monitoring the xCAT cluster. The operation is performed on the management node and the service nodes of the given nodes. The operation will also be performed on the nodes if the I<-r> option is specified. The deconfiguration operation will remove the nodes from the 3rd party software's monitoring domain. 
+This command is used to deconfigure a 3rd party monitoring software from monitoring the xCAT cluster. The operation is performed on the management node and the service nodes of the given nodes. The operation will also be performed on the nodes if the I<-r> option is specified. The deconfiguration operation will remove the nodes from the 3rd party software's monitoring domain.
 
 
 =head1 PARAMETERS
diff --git a/xCAT-client/pods/man1/monrm.1.pod b/xCAT-client/pods/man1/monrm.1.pod
index d535317b9..21029500c 100644
--- a/xCAT-client/pods/man1/monrm.1.pod
+++ b/xCAT-client/pods/man1/monrm.1.pod
@@ -17,7 +17,7 @@ This command is used to unregister a monitoring plug-in module from the I<monito
 
 =head1 PARAMETERS
 
-I<name> is the name of the monitoring plug-in module in the I<monitoring> table.  Use I<monls> command to list all the monitoring plug-in modules that can be used. 
+I<name> is the name of the monitoring plug-in module in the I<monitoring> table.  Use I<monls> command to list all the monitoring plug-in modules that can be used.
 
 =head1 OPTIONS
 
diff --git a/xCAT-client/pods/man1/monshow.1.pod b/xCAT-client/pods/man1/monshow.1.pod
index c3aa85385..454f32d50 100755
--- a/xCAT-client/pods/man1/monshow.1.pod
+++ b/xCAT-client/pods/man1/monshow.1.pod
@@ -19,7 +19,7 @@ This command displays the events that happened on the given nodes or the monitor
 
 =head1 PARAMETERS
 
-I<name> is the name of the monitoring plug-in module to be invoked. 
+I<name> is the name of the monitoring plug-in module to be invoked.
 
 I<noderange> is a list of nodes to be showed for. If omitted, the data for all the nodes will be displayed.
 
@@ -30,15 +30,15 @@ B<-h | --help>          Display usage message.
 
 B<-v | --version>      Command Version.
 
-B<-s>	shows the summary data. 
+B<-s>	shows the summary data.
 
 B<-t>	specifies a range of time for the data, The default is last 60 minutes. For example -t 6-4, it will display the data from last 6 minutes to 4 minutes; If it is -t 6, it will display the data from last 6 minutes until now.
 
-B<-a>	specifies a comma-separated list of attributes or metrics names. The default is all. 
+B<-a>	specifies a comma-separated list of attributes or metrics names. The default is all.
 
 B<-w>	specify one or multiple selection string that can be used to select events. The operators ==, !=, =,!,>,<,>=,<= are available.  Wildcards % and _ are supported in the pattern string. % allows you to match any string of any length(including zero length) and _ allows you to match on a single character. The valid attributes are eventtype, monitor, monnode, application, component, id, severity, message, rawdata, comments. Valid severity are: Informational, Warning, Critical.
 
-Operator descriptions: 
+Operator descriptions:
 
 =over 10
 
diff --git a/xCAT-client/pods/man1/mysqlsetup.1.pod b/xCAT-client/pods/man1/mysqlsetup.1.pod
index ba0984a2b..021a972a9 100644
--- a/xCAT-client/pods/man1/mysqlsetup.1.pod
+++ b/xCAT-client/pods/man1/mysqlsetup.1.pod
@@ -1,6 +1,6 @@
 =head1 NAME
 
-B<mysqlsetup> - Sets up the MySQL or MariaDB database for xCAT to use.  
+B<mysqlsetup> - Sets up the MySQL or MariaDB database for xCAT to use.
 
 =head1 SYNOPSIS
 
@@ -13,17 +13,17 @@ B<mysqlsetup> {B<-i>|B<--init>} [B<-f>|B<--hostfile>] [B<-o>|B<--odbc>] [B<-L>|B
 
 B<mysqlsetup> {B<-u>|B<--update>} [B<-f>|B<--hostfile>] [B<-o>|B<--odbc>] [B<-L>|B<--LL>] [B<-V>|B<--verbose>]
 
-B<mysqlsetup> {B<-o>|B<--odbc>} [B<-V>|B<--verbose>] 
+B<mysqlsetup> {B<-o>|B<--odbc>} [B<-V>|B<--verbose>]
 
-B<mysqlsetup> {B<-L>|B<--LL>} [B<-V>|B<--verbose>] 
+B<mysqlsetup> {B<-L>|B<--LL>} [B<-V>|B<--verbose>]
 
 =head1 DESCRIPTION
 
-B<mysqlsetup> - Sets up the MySQL or MariaDB database (linux only for MariaDB) for xCAT to use. The mysqlsetup script is run on the Management Node as root after the MySQL code or MariaDB code has been installed. Before running the init option, the MySQL server should be stopped, if it is running.  The xCAT daemon, xcatd, must be running, do not stop it. No xCAT commands should be run during the init process, because we will be migrating the xCAT database to MySQL or MariaDB and restarting the xcatd daemon as well as the MySQL daemon. For full information on all the steps that will be done, read the "Configure MySQL and Migrate xCAT Data to MySQL" sections in 
+B<mysqlsetup> - Sets up the MySQL or MariaDB database (linux only for MariaDB) for xCAT to use. The mysqlsetup script is run on the Management Node as root after the MySQL code or MariaDB code has been installed. Before running the init option, the MySQL server should be stopped, if it is running.  The xCAT daemon, xcatd, must be running, do not stop it. No xCAT commands should be run during the init process, because we will be migrating the xCAT database to MySQL or MariaDB and restarting the xcatd daemon as well as the MySQL daemon. For full information on all the steps that will be done, read the "Configure MySQL and Migrate xCAT Data to MySQL" sections in
 
 B<Setting_Up_MySQL_as_the_xCAT_DB>
 
-Two passwords must be supplied for the setup,  a password for the xcatadmin id and a password for the root id in the MySQL database.  These will be prompted for interactively, unless the environment variables XCATMYSQLADMIN_PW and  XCATMYSQLROOT_PW are set to the passwords for the xcatadmin id and root id in the database,resp. 
+Two passwords must be supplied for the setup,  a password for the xcatadmin id and a password for the root id in the MySQL database.  These will be prompted for interactively, unless the environment variables XCATMYSQLADMIN_PW and  XCATMYSQLROOT_PW are set to the passwords for the xcatadmin id and root id in the database,resp.
 
 Note below we refer to MySQL but it works the same for MariaDB.
 
@@ -45,16 +45,16 @@ Displays verbose messages.
 
 =item B<-i|--init>
 
-The init option is used to setup a xCAT database on an installed MySQL or MariaDB server for xCAT to use. The mysqlsetup script will check for the installed MariaDB server rpm first and will use MariaDB if it is installed.   This involves creating the xcatdb database, the xcatadmin id, allowing access to the xcatdb database by the Management Node. It customizes the my.cnf configuration file for xcat and starts the MySQL server.  It also backs up the current xCAT database and restores it into the newly setup xcatdb MySQL database.  It creates the /etc/xcat/cfgloc file to point the xcatd daemon to the MySQL database and restarts the xcatd daemon using the database. 
-On AIX, it additionally setup the mysql id and group and corrects the permissions in the MySQL install directories. For AIX, you should be using the MySQL rpms available from the xCAT website. For Linux, you should use the MySQL or MariaDB rpms shipped with the OS. You can chose the -f and/or the -o option, to run after the init. 
+The init option is used to setup a xCAT database on an installed MySQL or MariaDB server for xCAT to use. The mysqlsetup script will check for the installed MariaDB server rpm first and will use MariaDB if it is installed.   This involves creating the xcatdb database, the xcatadmin id, allowing access to the xcatdb database by the Management Node. It customizes the my.cnf configuration file for xcat and starts the MySQL server.  It also backs up the current xCAT database and restores it into the newly setup xcatdb MySQL database.  It creates the /etc/xcat/cfgloc file to point the xcatd daemon to the MySQL database and restarts the xcatd daemon using the database.
+On AIX, it additionally setup the mysql id and group and corrects the permissions in the MySQL install directories. For AIX, you should be using the MySQL rpms available from the xCAT website. For Linux, you should use the MySQL or MariaDB rpms shipped with the OS. You can chose the -f and/or the -o option, to run after the init.
 
 =item B<-u|--update>
 
-To run the update option,  you must first have run the -i option and have xcat successfully running on the MySQL database. You can chose the -f and/or the -o option, to update.    
+To run the update option,  you must first have run the -i option and have xcat successfully running on the MySQL database. You can chose the -f and/or the -o option, to update.
 
 =item B<-f|--hostfile>
 
-This option runs during update, it will take all the host from the input file (provide a full path) and give them database access to the xcatdb in  MySQL for the xcatadmin id. Wildcards and ipaddresses may be used. xCAT  must have been previously successfully setup to use MySQL. xcatadmin and MySQL root password are required. 
+This option runs during update, it will take all the host from the input file (provide a full path) and give them database access to the xcatdb in  MySQL for the xcatadmin id. Wildcards and ipaddresses may be used. xCAT  must have been previously successfully setup to use MySQL. xcatadmin and MySQL root password are required.
 
 =item B<-o|--odbc>
 
@@ -64,7 +64,7 @@ Setting_Up_MySQL_as_the_xCAT_DB
 
 =item B<-L|--LL>
 
-Additional database configuration specifically for the LoadLeveler product. 
+Additional database configuration specifically for the LoadLeveler product.
 See "Add ODBC Support" in
 Setting_Up_MySQL_as_the_xCAT_DB
 
@@ -78,7 +78,7 @@ Setting_Up_MySQL_as_the_xCAT_DB
 B<XCATMYSQLADMIN_PW> - the password for the xcatadmin id that will be assigned in the MySQL database.
 
 =item *
-B<XCATMYSQLROOT_PW> - the password for the root id that will be assigned to the MySQL root id, if the script creates it.  The password to use to run MySQL command to the database as the MySQL root id.  This password may be different than the unix root password on the Management Node.  
+B<XCATMYSQLROOT_PW> - the password for the root id that will be assigned to the MySQL root id, if the script creates it.  The password to use to run MySQL command to the database as the MySQL root id.  This password may be different than the unix root password on the Management Node.
 
 =back
 
@@ -105,13 +105,13 @@ Where the file contains a host per line, for example:
          10.%.%.%
          nodex.cluster.net
 
-=item 3. 
+=item 3.
 
 To setup the ODBC for MySQL xcatdb database access :
 
  mysqlsetup -o
 
-=item 4. 
+=item 4.
 
 To setup MySQL for xCAT and add hosts from /tmp/xcat/hostlist and setup the ODBC in Verbose mode:
 
diff --git a/xCAT-client/pods/man1/nimnodecust.1.pod b/xCAT-client/pods/man1/nimnodecust.1.pod
index 93cba2a36..63147672b 100644
--- a/xCAT-client/pods/man1/nimnodecust.1.pod
+++ b/xCAT-client/pods/man1/nimnodecust.1.pod
@@ -10,7 +10,7 @@ B<nimnodecust [-V] -s> I<lpp_source_name> [B<-p> I<packages>] [B<-b> I<installp_
 
 =head1 DESCRIPTION
 
-This xCAT command can be used to customize AIX/NIM standalone machines. 
+This xCAT command can be used to customize AIX/NIM standalone machines.
 
 The software packages that you wish to install on the nodes must be copied to the appropriate directory locations in the NIM lpp_source resource provided by the "-s" option.  For example, if the location of your lpp_source resource is "/install/nim/lpp_source/61lpp/" then you would copy RPM packages to "/install/nim/lpp_source/61lpp/RPMS/ppc" and you would copy your installp packages to "/install/nim/lpp_source/61lpp/installp/ppc". Typically you would want to copy the packages to the same lpp_source that was used to install the node.  You can find the location for an lpp_source with the AIX lsnim command. (Ex. "lsnim -l <lpp_source_name>")
 
@@ -26,7 +26,7 @@ A bundle file contains a list of package names.  The RPMs must have a prefix of
  I:openssh.base
  I:openssh.license
 
-To create a NIM installp_bundle definition you can use the "nim -o define" operation.  For example, to create a definition called "mypackages" for a bundle file located at "/install/nim/mypkgs.bnd" you could issue the following command. 
+To create a NIM installp_bundle definition you can use the "nim -o define" operation.  For example, to create a definition called "mypackages" for a bundle file located at "/install/nim/mypkgs.bnd" you could issue the following command.
 
  nim -o define -t installp_bundle -a server=master -a location=/install/nim/mypkgs.bnd mypackages
 
@@ -41,7 +41,7 @@ The xCAT nimnodecust command will automatically handle the distribution of the p
 =item I<attr=val [attr=val ...]>
 
 Specifies one or more "attribute equals value" pairs, separated by spaces. Attr=val pairs must be specified last on the command line. These are used to specify
-additional values that can be passed to the underlying NIM commands, ("nim -o cust..."). See the NIM documentation for valid "nim" command line options. 
+additional values that can be passed to the underlying NIM commands, ("nim -o cust..."). See the NIM documentation for valid "nim" command line options.
 
 =item B<-b> I<installp_bundle_names>
 
@@ -79,7 +79,7 @@ An error has occurred.
 
 =head1 EXAMPLES
 
-1) Install the installp package "openssh.base.server" on an xCAT node named "node01".  Assume that the package has been copied to the NIM lpp_source resource called "61lppsource".  
+1) Install the installp package "openssh.base.server" on an xCAT node named "node01".  Assume that the package has been copied to the NIM lpp_source resource called "61lppsource".
 
  nimnodecust -s 61lppsource -p openssh.base.server node01
 
diff --git a/xCAT-client/pods/man1/nodech.1.pod b/xCAT-client/pods/man1/nodech.1.pod
index 468e20c63..c98b3cc57 100644
--- a/xCAT-client/pods/man1/nodech.1.pod
+++ b/xCAT-client/pods/man1/nodech.1.pod
@@ -23,7 +23,7 @@ there.  If "^=" is used, the specified value will be removed from the attribute'
 if it is there.  You can also use "^=" and ",=" in the same command to essentially replace one item
 in the list with another.  (See the Examples section.)
 
-Additionally, as in nodels, boolean expressions can be used to further limit the scope of nodech from 
+Additionally, as in nodels, boolean expressions can be used to further limit the scope of nodech from
 the given noderange.  The operators supported are the same as nodels (=~, !~, ==, and !=).
 
 With these operators in mind, the unambiguous assignment operator is '=@'.  If you need, for example, to set
diff --git a/xCAT-client/pods/man1/nodechprofile.1.pod b/xCAT-client/pods/man1/nodechprofile.1.pod
index 39e741220..76ac04a7e 100644
--- a/xCAT-client/pods/man1/nodechprofile.1.pod
+++ b/xCAT-client/pods/man1/nodechprofile.1.pod
@@ -38,11 +38,11 @@ The nodes to be removed.
 
 B<imageprofile=> I<image-profile>
 
-Sets the new image profile name used by the node, where <image-profile> is the new image profile.  An image profile defines the provisioning method, OS information, kit information, and provisioning parameters for a node. If the "__ImageProfile_imgprofile" group already exists in the nodehm table, then "imgprofile" is used as the image profile name. 
+Sets the new image profile name used by the node, where <image-profile> is the new image profile.  An image profile defines the provisioning method, OS information, kit information, and provisioning parameters for a node. If the "__ImageProfile_imgprofile" group already exists in the nodehm table, then "imgprofile" is used as the image profile name.
 
 B<networkprofile=> I<network-profile>
 
-Sets the new network profile name used by the node, where <network-profile> is the new network profile. A network profile defines the network, NIC, and routes for a node. If the "__NetworkProfile_netprofile" group already exists in the nodehm table, then "netprofile" is used as the network profile name. 
+Sets the new network profile name used by the node, where <network-profile> is the new network profile. A network profile defines the network, NIC, and routes for a node. If the "__NetworkProfile_netprofile" group already exists in the nodehm table, then "netprofile" is used as the network profile name.
 
 B<hardwareprofile=> I<hardware-profile>
 
@@ -56,7 +56,7 @@ Sets the new hardware profile name used by the node, where <hardware-profile> is
 
 =head1 EXAMPLES
 
-=over 2 
+=over 2
 
 =item 1.
 To change the image profile to rhels6.3_packaged for compute nodes compute-000 and compute-001, use the following command:
@@ -68,7 +68,7 @@ To change all of the profiles for compute node compute-000, enter the following
 
  nodechprofile compute-000 imageprofile=rhels6.3_packaged networkprofile=default_cn hardwareprofile=default_ipmi
 
-=back 
+=back
 
 =head1 SEE ALSO
 
diff --git a/xCAT-client/pods/man1/nodediscoverdef.1.pod b/xCAT-client/pods/man1/nodediscoverdef.1.pod
index 162484dce..e004c391c 100644
--- a/xCAT-client/pods/man1/nodediscoverdef.1.pod
+++ b/xCAT-client/pods/man1/nodediscoverdef.1.pod
@@ -1,7 +1,7 @@
 =head1 NAME
 
-B<nodediscoverdef> - Define the undefined discovery request to a predefined xCAT node, 
-or clean up the discovery entries from the discoverydata table 
+B<nodediscoverdef> - Define the undefined discovery request to a predefined xCAT node,
+or clean up the discovery entries from the discoverydata table
 (which can be displayed by nodediscoverls command)
 
 =head1 SYNOPSIS
@@ -21,7 +21,7 @@ xCAT node. The discovery entry can be displayed by B<nodediscoverls> command.
 
 The options B<-u> and B<-n> have to be used together to define a discovery request to a node.
 
-The B<nodediscoverdef> command also can be used to clean up the discovery entries from the 
+The B<nodediscoverdef> command also can be used to clean up the discovery entries from the
 discoverydata table.
 
 The option B<-r> is used to remove discovery entries. If working with B<-u>, the specific entry
diff --git a/xCAT-client/pods/man1/nodediscoverls.1.pod b/xCAT-client/pods/man1/nodediscoverls.1.pod
index bde7b37e0..7dedbab91 100644
--- a/xCAT-client/pods/man1/nodediscoverls.1.pod
+++ b/xCAT-client/pods/man1/nodediscoverls.1.pod
@@ -4,7 +4,7 @@ B<nodediscoverls> -  List the discovered nodes
 
 =head1 SYNOPSIS
 
-B<nodediscoverls> [B<-t seq>|B<profile>|B<switch>|B<blade>|B<manual>|B<undef>|B<all>] [B<-l>] 
+B<nodediscoverls> [B<-t seq>|B<profile>|B<switch>|B<blade>|B<manual>|B<undef>|B<all>] [B<-l>]
 
 B<nodediscoverls> [B<-u> I<uuid>] [B<-l>]
 
diff --git a/xCAT-client/pods/man1/nodediscoverstart.1.pod b/xCAT-client/pods/man1/nodediscoverstart.1.pod
index 4e3b98d37..ab1bde74b 100755
--- a/xCAT-client/pods/man1/nodediscoverstart.1.pod
+++ b/xCAT-client/pods/man1/nodediscoverstart.1.pod
@@ -98,7 +98,7 @@ Sets the node groups that the discovered nodes should be put in for either the S
 =item B<rack=>I<rack-name>>
 
 Sets the rack name where the node is located for either the Sequential Discovery or Profile Discovery methods.
- 
+
 =item B<chassis=>I<chassis-name>
 
 Sets the chassis name that the Blade server or PureFlex blade is located in, for either the Sequential Discovery or Profile Discovery methods. This option is used for the Blade server and PureFlex system only. You cannot specify this option with the rack option.
@@ -121,11 +121,11 @@ Specifies the osimage name that will be associated with the new discovered node,
 
 =item B<-n|--dns>
 
-Specifies to run makedns <nodename> for any new discovered node. This is useful mainly for non-predefined configuration, before running the "nodediscoverstart -n", the user needs to run makedns -n to initialize the named setup on the management node.  
+Specifies to run makedns <nodename> for any new discovered node. This is useful mainly for non-predefined configuration, before running the "nodediscoverstart -n", the user needs to run makedns -n to initialize the named setup on the management node.
 
 =item B<-s|--skipbmcsetup>
 
-Specifies to skip the bmcsetup during the sequential discovery process, if the bmciprange is specified with nodediscoverstart command, the BMC will be setup automatically during the discovery process, if the user does not want to run bmcsetup, could specify the "-s|--skipbmcsetup" with nodediscoverstart command to skip the bmcsetup.   
+Specifies to skip the bmcsetup during the sequential discovery process, if the bmciprange is specified with nodediscoverstart command, the BMC will be setup automatically during the discovery process, if the user does not want to run bmcsetup, could specify the "-s|--skipbmcsetup" with nodediscoverstart command to skip the bmcsetup.
 
 =item B<-V|--verbose>
 
diff --git a/xCAT-client/pods/man1/nodediscoverstatus.1.pod b/xCAT-client/pods/man1/nodediscoverstatus.1.pod
index f65597e40..ad198860a 100644
--- a/xCAT-client/pods/man1/nodediscoverstatus.1.pod
+++ b/xCAT-client/pods/man1/nodediscoverstatus.1.pod
@@ -1,6 +1,6 @@
 =head1 NAME
 
-B<nodediscoverstatus> - gets the node discovery process status 
+B<nodediscoverstatus> - gets the node discovery process status
 
 =head1 SYNOPSIS
 
@@ -31,7 +31,7 @@ Command Version.
 
 To determine if there are some nodes discovered and the discovered nodes' status, enter the following command:
 
- nodediscoverstatus 
+ nodediscoverstatus
 
 =head1 SEE ALSO
 
diff --git a/xCAT-client/pods/man1/nodediscoverstop.1.pod b/xCAT-client/pods/man1/nodediscoverstop.1.pod
index b8ce5b563..e0e6fdae3 100644
--- a/xCAT-client/pods/man1/nodediscoverstop.1.pod
+++ b/xCAT-client/pods/man1/nodediscoverstop.1.pod
@@ -30,7 +30,7 @@ Command Version.
 
 =head1 EXAMPLES
 
- nodediscoverstop 
+ nodediscoverstop
 
 =head1 SEE ALSO
 
diff --git a/xCAT-client/pods/man1/nodegrpch.1.pod b/xCAT-client/pods/man1/nodegrpch.1.pod
index 0f65922a9..8475b0565 100644
--- a/xCAT-client/pods/man1/nodegrpch.1.pod
+++ b/xCAT-client/pods/man1/nodegrpch.1.pod
@@ -15,11 +15,11 @@ B<nodegrpch> [B<-?> | B<-h> | B<--help>]
 =head1 DESCRIPTION
 
 The nodegrpch command is similar to the nodech command, but ensures that the parameters are
-declared at the group level rather than the node specific level, and clears conflicting node 
-specific overrides of the specified groups.   Using table.column=value will do a 
-verbatim assignment.  If ",=" is used instead of "=", the specified value will be prepended to the 
-attribute's comma separated list, if it is not already there.  If "^=" is used, the specified 
-value will be removed from the attribute's comma separated list, if it is there.  You can also 
+declared at the group level rather than the node specific level, and clears conflicting node
+specific overrides of the specified groups.   Using table.column=value will do a
+verbatim assignment.  If ",=" is used instead of "=", the specified value will be prepended to the
+attribute's comma separated list, if it is not already there.  If "^=" is used, the specified
+value will be removed from the attribute's comma separated list, if it is there.  You can also
 use "^=" and ",=" in the same command to essentially replace one item
 in the list with another.  (See the Examples section.)
 
diff --git a/xCAT-client/pods/man1/nodeimport.1.pod b/xCAT-client/pods/man1/nodeimport.1.pod
index 2c3b670f7..b471eb436 100644
--- a/xCAT-client/pods/man1/nodeimport.1.pod
+++ b/xCAT-client/pods/man1/nodeimport.1.pod
@@ -74,7 +74,7 @@ To import nodes using a profile, follow the following steps:
   "__NetworkProfile_default_mn","static","static",,,,
   "__NetworkProfile_default_cn","static",,,,,
   "__ImageProfile_rhels6.2-x86_64-install-compute","static","static",,,,
-   
+
   # lsdef -t group __NetworkProfile_default_cn
   Object name: __NetworkProfile_default_cn
       grouptype=static
@@ -86,9 +86,9 @@ To import nodes using a profile, follow the following steps:
       nictypes=eth0:Ethernet
       primarynic=eth0
 
-2. Prepare a node information file. 
+2. Prepare a node information file.
 
-  Example of a node information file, a blade and a rack server defined: 
+  Example of a node information file, a blade and a rack server defined:
   # hostinfo begin
   # This entry defines a blade.
   __hostname__:
@@ -116,7 +116,7 @@ To import nodes using a profile, follow the following steps:
      slotid=1
   # hostinfo end.
 
-  Example of a node information file, a switch auto discovery node defined: 
+  Example of a node information file, a switch auto discovery node defined:
   # hostinfo begin
   # This entry defines a blade.
   __hostname__:
@@ -128,15 +128,15 @@ To import nodes using a profile, follow the following steps:
   __hostname__:
      mac=b8:ac:6f:37:59:28
      cec=mycec
-  
+
   __hostname__:
      mac=b8:ac:6f:37:59:28
      cec=mycec
      lparid=2
   # Node information file ends.
-  
+
   Example of a node information file that specifies a PowerKVM Guest node that uses KVM management:
-  
+
   # Node information file begins
   # This entry defines a PowerKVM Guest node.
   # Make sure the node 'vm01' is already created on Hypervisor
@@ -179,7 +179,7 @@ B<nicips=<nics-ip>> This is an optional item.
 
 Description: Lists the IP address for each network interface configuration (NIC) used by the node, excluding the provisioning network, where <nics-ip> is in the form <nic1>!<nic-ip1>,<nic2>!<nic-ip2>,.... For example, if you have 2 network interfaces configured, the nicips attribute should list both network interfaces:  nicips=eth1!10.10.10.11,bmc!192.168.10.3. If the nicips attribute is not specified, the IP addresses are generated automatically according to the network profile.
 
-B<rack=<rack-name>> This is an optional item. 
+B<rack=<rack-name>> This is an optional item.
 
 Description: node location info. Specify the rack name which this node will be placed into. If not specify this item, there will be no node location info set for this node. this item must be specified together with height + unit.
 
@@ -197,7 +197,7 @@ Description: node location info, for rack server only. Specify the node's start
 
 B<vmhost=<PowerKVM Hypervisior Host Name>>  This is a mandatory option for defining PowerKVM Guest nodes.
 
-Description: Specifies the vmhost of a Power KVM Guest node, where <vmhost> is the host name of PowerKVM Hypervisior. 
+Description: Specifies the vmhost of a Power KVM Guest node, where <vmhost> is the host name of PowerKVM Hypervisior.
 
 3. Import the nodes, by using the following commands. Note: If we want to import PureFlex X/P nodes, hardware profile must be set to a PureFlex hardware type.
 
diff --git a/xCAT-client/pods/man1/nodels.1.pod b/xCAT-client/pods/man1/nodels.1.pod
index e3e76cd58..ca6d61a70 100644
--- a/xCAT-client/pods/man1/nodels.1.pod
+++ b/xCAT-client/pods/man1/nodels.1.pod
@@ -4,7 +4,7 @@ B<nodels> - lists the nodes, and their attributes, from the xCAT database.
 
 =head1 SYNOPSIS
 
-B<nodels> [I<noderange>] [B<-b> | B<--blame>] [B<-H> | B<--with-fieldname>] [B<-S>] [I<table.column> | I<shortname>] [I<...>]  
+B<nodels> [I<noderange>] [B<-b> | B<--blame>] [B<-H> | B<--with-fieldname>] [B<-S>] [I<table.column> | I<shortname>] [I<...>]
 
 B<nodels> [I<noderange>] [B<-H> | B<--with-fieldname>] [I<table>]
 
@@ -34,7 +34,7 @@ nodehm.mgt
 
 =back
 
-nodels can also select based on table value criteria. The following operators are available: 
+nodels can also select based on table value criteria. The following operators are available:
 
 =over 15
 
@@ -77,7 +77,7 @@ Force display of table name and column name context for each result
 
 For values inherited from groups, display which groups provided the inheritance
 
-=item B<-S> 
+=item B<-S>
 
 List all the hidden nodes (FSP/BPA nodes) with other ones.
 
diff --git a/xCAT-client/pods/man1/nodestat.1.pod b/xCAT-client/pods/man1/nodestat.1.pod
index e7a82a232..d2b4ecdbe 100644
--- a/xCAT-client/pods/man1/nodestat.1.pod
+++ b/xCAT-client/pods/man1/nodestat.1.pod
@@ -24,9 +24,9 @@ By default, it works as following:
 When -m is specified and there are settings in the monsetting table, it displays the status of the applications specified in the monsetting table. When -p is specified it shows the power status for the nodes that are not pingable. When -u is specified it saves the status info into the xCAT database. Node's pingable status and deployment status is saved in the nodelist.status column. Node's application status is saved in the nodelist.appstatus column.
 
 
-To specify settings in the B<monsetting> table, use 'xcatmon' as the name, 'apps' as the key and the value will be a list of comma separated list of application names. For each application, you can specify the port number that can be queried on the nodes to get the running status. Or you can specify a command that can be called to get the node status from. The command can be a command that can be run locally at the management node or the service node for hierarchical cluster, or a command that can be run remotely on the nodes. 
+To specify settings in the B<monsetting> table, use 'xcatmon' as the name, 'apps' as the key and the value will be a list of comma separated list of application names. For each application, you can specify the port number that can be queried on the nodes to get the running status. Or you can specify a command that can be called to get the node status from. The command can be a command that can be run locally at the management node or the service node for hierarchical cluster, or a command that can be run remotely on the nodes.
 
-The following is an example of the settings in the B<monsetting> table: 
+The following is an example of the settings in the B<monsetting> table:
 
     name key value
     xcatmon apps ssh,ll,gpfs,someapp
@@ -38,10 +38,10 @@ The following is an example of the settings in the B<monsetting> table:
 Keywords to use:
 
     apps -- a list of comma separated application names whose status will be queried. For how to get the status of each app, look for app name in the key field in a different row.
-    port -- the application daemon port number, if not specified, use internal list, then /etc/services. 
+    port -- the application daemon port number, if not specified, use internal list, then /etc/services.
     group -- the name of a node group that needs to get the application status from. If not specified, assume all the nodes in the nodelist table. To specify more than one groups, use group=a,group=b format.
     cmd -- the command that will be run locally on mn or sn.
-    lcmd -- the command that will be run the mn only. 
+    lcmd -- the command that will be run the mn only.
     dcmd -- the command that will be run distributed on the nodes using xdsh <nodes> ....
 
 For commands specified by 'cmd' and 'lcmd', the input of is a list of comma separated node names, the output must be in the following format:
@@ -50,7 +50,7 @@ For commands specified by 'cmd' and 'lcmd', the input of is a list of comma sepa
   node2:string2
   ...
 
-For the command specified by 'dcmd', no input is needed, the output can be a string. 
+For the command specified by 'dcmd', no input is needed, the output can be a string.
 
 
 =head1 B<Options>
@@ -63,7 +63,7 @@ Uses fping instead of nmap even if nmap is available.  If you seem to be having
 
 =item B<-m>|B<--usemon>
 
-Uses the settings from the B<monsetting> table to determine a list of applications that need to get status for. 
+Uses the settings from the B<monsetting> table to determine a list of applications that need to get status for.
 
 =item B<-p>|B<--powerstat>
 
@@ -71,7 +71,7 @@ Gets the power status for the nodes that are 'noping'.
 
 =item B<-u>|B<--updatedb>
 
-Updates the status and appstatus columns of the nodelist table with the returned running status from the given nodes. 
+Updates the status and appstatus columns of the nodelist table with the returned running status from the given nodes.
 
 =item B<-v>|B<--version>
 
@@ -88,7 +88,7 @@ Print help.
 
 =over 2
 
-=item 1.  
+=item 1.
 
  nodestat compute
 
@@ -100,7 +100,7 @@ Output is similar to:
  node4   pbs
  node5   noping
 
-=item 2.  
+=item 2.
 
  nodestat compute -p
 
@@ -113,12 +113,12 @@ Output is similar to:
  node5   noping(Shutting down)
 
 
-=item 3. 
+=item 3.
 
  nodestat compute -u
 
 Output is similar to:
- 
+
  node1   sshd
  node2   sshd
  node3   ping
@@ -126,7 +126,7 @@ Output is similar to:
  node5   noping
 
 
-=item 4. 
+=item 4.
 
  nodestat compute -m
 
diff --git a/xCAT-client/pods/man1/packimage.1.pod b/xCAT-client/pods/man1/packimage.1.pod
index 05f2cdeff..dbca7c266 100644
--- a/xCAT-client/pods/man1/packimage.1.pod
+++ b/xCAT-client/pods/man1/packimage.1.pod
@@ -12,9 +12,9 @@ B<packimage> [B<-m>|B<--method> I<cpio|tar>] [B<-c>|B<--compress> I<gzip|pigz|xz
 
 =head1 DESCRIPTION
 
-Packs the stateless image from the chroot file system into a file to be sent to the node for a diskless boot. 
+Packs the stateless image from the chroot file system into a file to be sent to the node for a diskless boot.
 
-Note: For an osimage that is deployed on a cluster, running packimage will overwrite the existing rootimage file and be unavailable to the compute nodes while packimage is running. 
+Note: For an osimage that is deployed on a cluster, running packimage will overwrite the existing rootimage file and be unavailable to the compute nodes while packimage is running.
 
 =head1 PARAMETERS
 
diff --git a/xCAT-client/pods/man1/pasu.1.pod b/xCAT-client/pods/man1/pasu.1.pod
index cb60c5c54..3497d8ffd 100644
--- a/xCAT-client/pods/man1/pasu.1.pod
+++ b/xCAT-client/pods/man1/pasu.1.pod
@@ -57,7 +57,7 @@ If you want this output to be displayed, use this flag.
 
 =item B<-i|--interface> I<hostname-suffix>
 
-The hostname suffix to be appended to the node names.  
+The hostname suffix to be appended to the node names.
 
 =item B<-V|--verbose>
 
diff --git a/xCAT-client/pods/man1/pgsqlsetup.1.pod b/xCAT-client/pods/man1/pgsqlsetup.1.pod
index 45c736d91..20a607912 100644
--- a/xCAT-client/pods/man1/pgsqlsetup.1.pod
+++ b/xCAT-client/pods/man1/pgsqlsetup.1.pod
@@ -1,6 +1,6 @@
 =head1 NAME
 
-B<pgsqlsetup> - Sets up the PostgreSQL database for xCAT to use.  
+B<pgsqlsetup> - Sets up the PostgreSQL database for xCAT to use.
 
 =head1 SYNOPSIS
 
@@ -11,12 +11,12 @@ B<pgsqlsetup> {B<-v> | B<--version>}
 
 B<pgsqlsetup> {B<-i> | B<--init>} [B<-N> | B<--nostart>] [B<--listen> | B<-l> I<address>] [B<--access> | B<-a> I<address>] [B<-P> | B<--PCM>] [B<-o> | B<--odbc>] [B<-V> | B<--verbose>]
 
-B<pgsqlsetup> {B<-o> | B<--setupODBC>} [B<-V> | B<--verbose>] 
+B<pgsqlsetup> {B<-o> | B<--setupODBC>} [B<-V> | B<--verbose>]
 
 =head1 DESCRIPTION
 
-B<pgsqlsetup> - Sets up the PostgreSQL database for xCAT to use. The pgsqlsetup script is run on the Management Node as root after the PostgreSQL code has been installed. The xcatd daemon will be stopped during migration.  No xCAT commands should be run during the init process, because we will be migrating the xCAT database to PostgreSQL and restarting the xcatd daemon as well as the PostgreSQL daemon. For full information on all the steps that will be done reference 
-One password must be supplied for the setup,  a password for the xcatadm unix id and the same password for the xcatadm database id.  The password will be prompted for interactively or you can set the XCATPGPW environment variable to the password and then there will be no prompt.  
+B<pgsqlsetup> - Sets up the PostgreSQL database for xCAT to use. The pgsqlsetup script is run on the Management Node as root after the PostgreSQL code has been installed. The xcatd daemon will be stopped during migration.  No xCAT commands should be run during the init process, because we will be migrating the xCAT database to PostgreSQL and restarting the xcatd daemon as well as the PostgreSQL daemon. For full information on all the steps that will be done reference
+One password must be supplied for the setup,  a password for the xcatadm unix id and the same password for the xcatadm database id.  The password will be prompted for interactively or you can set the XCATPGPW environment variable to the password and then there will be no prompt.
 
 =head1 OPTIONS
 
@@ -36,9 +36,9 @@ Displays verbose messages.
 
 =item B<-i|--init>
 
-The init option is used to setup an installed PostgreSQL database so that xCAT can use the database.  This involves creating the xcat database, the xcat admin id, allowing access to the xcatdb database by the Management Node. It customizes the postgresql.conf configuration file, adds the management server to the pg_hba.conf and starts the PostgreSQL server.  It also backs up the current xCAT database and restores it into the newly setup xcatdb PostgreSQL database.  It creates the /etc/xcat/cfgloc file to point the xcatd daemon to the PostgreSQL database and restarts the xcatd daemon using the database. 
+The init option is used to setup an installed PostgreSQL database so that xCAT can use the database.  This involves creating the xcat database, the xcat admin id, allowing access to the xcatdb database by the Management Node. It customizes the postgresql.conf configuration file, adds the management server to the pg_hba.conf and starts the PostgreSQL server.  It also backs up the current xCAT database and restores it into the newly setup xcatdb PostgreSQL database.  It creates the /etc/xcat/cfgloc file to point the xcatd daemon to the PostgreSQL database and restarts the xcatd daemon using the database.
 On AIX, it additionally setup the xcatadm unix id and the postgres id and group. For AIX, you should be using the PostgreSQL rpms available from the xCAT website. For Linux, you should use the PostgreSQL rpms shipped with the OS. You can chose the -o option, to run after the init.
-To add additional nodes to access the PostgreSQL server, setup on the Management Node, use the -a option.   
+To add additional nodes to access the PostgreSQL server, setup on the Management Node, use the -a option.
 
 For more documentation see:Setting_Up_PostgreSQL_as_the_xCAT_DB
 
@@ -84,7 +84,7 @@ To setup PostgreSQL for xCAT to run on the PostgreSQL xcatdb database :
 
  pgsqlsetup -i
 
-=item 2. 
+=item 2.
 To setup the ODBC for PostgreSQL xcatdb database access :
 
  pgsqlsetup -o
diff --git a/xCAT-client/pods/man1/piflash.1.pod b/xCAT-client/pods/man1/piflash.1.pod
index 2d83fbe3a..9d4752f5f 100644
--- a/xCAT-client/pods/man1/piflash.1.pod
+++ b/xCAT-client/pods/man1/piflash.1.pod
@@ -10,4 +10,4 @@ B<piflash> <noderange> --package <filename>
 
 =head1 DESCRIPTION
 
-B<piflash> Remotely applies firmware updates to servers.
\ No newline at end of file
+B<piflash> Remotely applies firmware updates to servers.
diff --git a/xCAT-client/pods/man1/psh.1.pod b/xCAT-client/pods/man1/psh.1.pod
index 876929d88..6805a1702 100644
--- a/xCAT-client/pods/man1/psh.1.pod
+++ b/xCAT-client/pods/man1/psh.1.pod
@@ -19,7 +19,7 @@ Note:
 This command does not run through xcatd like most xCAT commands do.
 This means you must either run it on the management node, or have a network connection between
 your machine and the nodes. It does not support hierarchy, use xdsh to run remote command from the
-management node to the compute node via a service node. 
+management node to the compute node via a service node.
 
 B<psh> arguments need to precede noderange, otherwise, you will get unexpected errors.
 
@@ -36,7 +36,7 @@ assumes those host names have been set up to resolve to the IP address of each o
 =item B<-f> I<fanout>
 
 Specifies a fanout value for the maximum number of  concur-
-rently  executing  remote shell processes. 
+rently  executing  remote shell processes.
 
 =item B<-l> I<user>
 
diff --git a/xCAT-client/pods/man1/rbootseq.1.pod b/xCAT-client/pods/man1/rbootseq.1.pod
index a81eee0f0..60af1df71 100644
--- a/xCAT-client/pods/man1/rbootseq.1.pod
+++ b/xCAT-client/pods/man1/rbootseq.1.pod
@@ -30,7 +30,7 @@ in effect for these blades until set differently.
 For PPC (using Direct FSP Management) specific:
 
 B<rbootseq> sets the ethernet (net) or hfi device as the first boot device for the specified PPC LPARs.
-The B<rbootseq> command requires that the ethernet or hfi mac address is stored in the mac table, and that the network information is correct in the networks table. 
+The B<rbootseq> command requires that the ethernet or hfi mac address is stored in the mac table, and that the network information is correct in the networks table.
 
 =head1 OPTIONS
 
diff --git a/xCAT-client/pods/man1/rcons.1.pod b/xCAT-client/pods/man1/rcons.1.pod
index 1ecd3e409..640ffac82 100644
--- a/xCAT-client/pods/man1/rcons.1.pod
+++ b/xCAT-client/pods/man1/rcons.1.pod
@@ -34,8 +34,8 @@ is already open in read-write mode. The -f flag can not be used with the -s flag
 
 =item B<-s>
 
-Open the console in read-only (spy) mode, in this mode all the escape sequences work, but all other keyboard input is 
-discarded. The -s flag can not be used with the -f flag. 
+Open the console in read-only (spy) mode, in this mode all the escape sequences work, but all other keyboard input is
+discarded. The -s flag can not be used with the -f flag.
 
 =item B<-h>|B<--help>
 
diff --git a/xCAT-client/pods/man1/renergy.1.pod b/xCAT-client/pods/man1/renergy.1.pod
index 4f6db4017..18580e603 100644
--- a/xCAT-client/pods/man1/renergy.1.pod
+++ b/xCAT-client/pods/man1/renergy.1.pod
@@ -4,9 +4,9 @@ B<renergy> - remote energy management tool
 
 =head1 B<SYNOPSIS>
 
-B<renergy> [B<-h> | B<--help>] 
+B<renergy> [B<-h> | B<--help>]
 
-B<renergy> [B<-v> | B<--version>] 
+B<renergy> [B<-v> | B<--version>]
 
 B<Power 6 server specific :>
 
@@ -14,7 +14,7 @@ B<Power 6 server specific :>
 
 B<renergy> I<noderange> [B<-V>] {B<all | [savingstatus] [cappingstatus] [cappingmaxmin] [cappingvalue] [cappingsoftmin] [averageAC] [averageDC] [ambienttemp] [exhausttemp] [CPUspeed] [syssbpower] [sysIPLtime]>}
 
-B<renergy> I<noderange> [B<-V>] {B<savingstatus={on | off} | cappingstatus={on | off} | cappingwatt=watt | cappingperc=percentage>} 
+B<renergy> I<noderange> [B<-V>] {B<savingstatus={on | off} | cappingstatus={on | off} | cappingwatt=watt | cappingperc=percentage>}
 
 =back
 
@@ -36,8 +36,8 @@ B<renergy> I<noderange> [B<-V>] {B<all | [savingstatus] [dsavingstatus] [average
 
 B<renergy> I<noderange> B<[-V] {savingstatus={on | off} | dsavingstatus={on-norm | on-maxp | off} | fsavingstatus={on | off} | ffovalue=MHZ }>
 
-I<NOTE:> The setting operation for B<Power 8> server is only supported 
-for the server which is running in PowerVM mode. Do NOT run the setting 
+I<NOTE:> The setting operation for B<Power 8> server is only supported
+for the server which is running in PowerVM mode. Do NOT run the setting
 for the server which is running in OPAL mode.
 
 =back
@@ -50,7 +50,7 @@ B<For Management Modules:>
 
 =over 4
 
-B<renergy> I<noderange> [B<-V>] {B<all | pd1all | pd2all | [pd1status] [pd2status] [pd1policy] [pd2policy] [pd1powermodule1] [pd1powermodule2] [pd2powermodule1] [pd2powermodule2] [pd1avaiablepower] [pd2avaiablepower] [pd1reservedpower] [pd2reservedpower] [pd1remainpower] [pd2remainpower] [pd1inusedpower] [pd2inusedpower] [availableDC] [averageAC] [thermaloutput] [ambienttemp] [mmtemp]>} 
+B<renergy> I<noderange> [B<-V>] {B<all | pd1all | pd2all | [pd1status] [pd2status] [pd1policy] [pd2policy] [pd1powermodule1] [pd1powermodule2] [pd2powermodule1] [pd2powermodule2] [pd1avaiablepower] [pd2avaiablepower] [pd1reservedpower] [pd2reservedpower] [pd1remainpower] [pd2remainpower] [pd1inusedpower] [pd2inusedpower] [availableDC] [averageAC] [thermaloutput] [ambienttemp] [mmtemp]>}
 
 =back
 
@@ -60,7 +60,7 @@ B<For a blade server nodes:>
 
 B<renergy> I<noderange> [B<-V>] {B<all | [averageDC] [capability] [cappingvalue] [CPUspeed] [maxCPUspeed] [savingstatus] [dsavingstatus]>}
 
-B<renergy> I<noderange> [B<-V>] {B<savingstatus={on | off} | dsavingstatus={on-norm | on-maxp | off}>} 
+B<renergy> I<noderange> [B<-V>] {B<savingstatus={on | off} | dsavingstatus={on-norm | on-maxp | off}>}
 
 =back
 
@@ -112,28 +112,28 @@ B<renergy> I<noderange> {B<powerusage | temperature>}
 =head1 B<DESCRIPTION>
 
 This B<renergy> command can be used to manage the energy consumption of
-IBM servers which support IBM EnergyScale technology. Through this command, 
-user can query and set the power saving and power capping status, and also can 
-query the average consumed energy, the ambient and exhaust temperature, 
+IBM servers which support IBM EnergyScale technology. Through this command,
+user can query and set the power saving and power capping status, and also can
+query the average consumed energy, the ambient and exhaust temperature,
 the processor frequency for a server.
 
 B<renergy> command supports IBM POWER6, POWER7 and POWER8 rack-mounted servers,
-BladeCenter management modules, blade servers, and iDataPlex servers. 
+BladeCenter management modules, blade servers, and iDataPlex servers.
 For I<Power6> and I<Power7> rack-mounted servers, the following specific hardware types are supported:
 I<8203-E4A>, I<8204-E8A>, I<9125-F2A>, I<8233-E8B>, I<8236-E8C>.
 For I<Power8> server, there's no hardware type restriction.
 
-The parameter I<noderange> needs to be specified for the B<renergy> command to 
-get the target servers. The I<noderange> should be a list of CEC node names, blade 
+The parameter I<noderange> needs to be specified for the B<renergy> command to
+get the target servers. The I<noderange> should be a list of CEC node names, blade
 management module node names or blade server node names. Lpar name
 is not acceptable here.
 
-B<renergy> command can accept multiple of energy attributes to query or one of energy 
-attribute to set. If only the attribute name is specified, without the '=', B<renergy> 
-gets and displays the current value. Otherwise, if specifying the attribute with '=' like 
-'savingstatus=on', B<renergy> will set the attribute savingstatus to value 'on'. 
+B<renergy> command can accept multiple of energy attributes to query or one of energy
+attribute to set. If only the attribute name is specified, without the '=', B<renergy>
+gets and displays the current value. Otherwise, if specifying the attribute with '=' like
+'savingstatus=on', B<renergy> will set the attribute savingstatus to value 'on'.
 
-The attributes listed in the B<SYNOPSIS> section are which ones can be handled by 
+The attributes listed in the B<SYNOPSIS> section are which ones can be handled by
 B<renergy> command. But for each specific type of server, there are some attributes that
 are not supported. If user specifies an attribute which is not supported by a specific
 server, the return value of this attribute will be 'na'.
@@ -144,11 +144,11 @@ The supported attributes for each specific system p hardware type is listed as f
 
 =over 2
 
-B<8203-E4A>, B<8204-E8A> 
+B<8203-E4A>, B<8204-E8A>
 
 =over 4
 
-Supported attributes: 
+Supported attributes:
 
 B<Query>: savingstatus,cappingstatus,cappingmin,cappingmax,
 cappingvalue,cappingsoftmin,averageAC,averageDC,ambienttemp,
@@ -158,14 +158,14 @@ B<Set>:   savingstatus,cappingstatus,cappingwatt,cappingperc
 
 =back
 
-B<9125-F2A> 
+B<9125-F2A>
 
 =over 4
 
-Supported attributes: 
+Supported attributes:
 
 B<Query>: savingstatus,averageAC,ambienttemp,exhausttemp,
-CPUspeed 
+CPUspeed
 
 B<Set>:   savingstatus
 
@@ -206,7 +206,7 @@ B<Non of Above>
 
 =over 4
 
-For the machine type which is not in the above list, the following 
+For the machine type which is not in the above list, the following
 attributes can be tried but not guaranteed:
 
 B<Query>: savingstatus,dsavingstatus,cappingstatus,cappingmin,
@@ -214,28 +214,28 @@ cappingmax,,cappingvalue,cappingsoftmin,averageAC,averageDC,
 ambienttemp,exhausttemp,CPUspeed,syssbpower,sysIPLtime
 
 B<Set>:  savingstatus,dsavingstatus,cappingstatus,cappingwatt,
-cappingperc 
+cappingperc
 
 =back
 
 =back
 
 Note:
-For system P CEC nodes, each query operation for attribute CPUspeed, averageAC 
+For system P CEC nodes, each query operation for attribute CPUspeed, averageAC
 or averageDC needs about 30 seconds to complete. The query for others attributes
 will get response immediately.
 
 =head1 B<PREREQUISITES>
 
-For the I<Power6> and I<Power7> nodes, the B<renergy> command depends 
-on the Energy Management Plugin B<xCAT-pEnergy> to 
-communicate with server.  B<xCAT-pEnergy> can be downloaded from the IBM web site: 
+For the I<Power6> and I<Power7> nodes, the B<renergy> command depends
+on the Energy Management Plugin B<xCAT-pEnergy> to
+communicate with server.  B<xCAT-pEnergy> can be downloaded from the IBM web site:
 http://www.ibm.com/support/fixcentral/. (Other Software -> EM)
 
 NOTE: I<Power8> nodes don't need this specific energy management package.
 
-For iDataPlex nodes, the B<renergy> command depends 
-on the Energy Management Plugin B<xCAT-xEnergy> to 
+For iDataPlex nodes, the B<renergy> command depends
+on the Energy Management Plugin B<xCAT-xEnergy> to
 communicate with server.  This plugin must be requested from IBM.
 
 (The support for BladeCenter energy management is built into base xCAT,
@@ -259,7 +259,7 @@ Verbose output.
 
 =item B<all>
 
-Query all energy attributes which supported by the specific 
+Query all energy attributes which supported by the specific
 type of hardware.
 
 For I<Power8> machines, will not display the attributes
@@ -291,12 +291,12 @@ Query the total DC power available for the entire blade center chassis.
 
 Query the average power consumed (Input). (Unit is watt)
 
-Note: For 9125-F2A,9125-F2C server, the value of attribute 
+Note: For 9125-F2A,9125-F2C server, the value of attribute
 averageAC is the aggregate for all of the servers in a rack.
 
-Note: For Blade Center, the value of attribute 
+Note: For Blade Center, the value of attribute
 averageAC is the total AC power being consumed by all modules
-in the chassis. It also includes power consumed by the Chassis 
+in the chassis. It also includes power consumed by the Chassis
 Cooling Devices for BCH chassis.
 
 =item B<averageAChistory>
@@ -317,19 +317,19 @@ Query the Power Capabilities of the blade server.
 
 staticPowerManagement: the module with the static worst case power values.
 
-fixedPowermanagement: the module with the static power values but ability 
+fixedPowermanagement: the module with the static power values but ability
 to throttle.
 
-dynamicPowerManagement: the module with power meter capability, measurement 
+dynamicPowerManagement: the module with power meter capability, measurement
 enabled, but capping disabled.
 
-dynamicPowerMeasurement1: the module with power meter capability, measurement 
+dynamicPowerMeasurement1: the module with power meter capability, measurement
 enabled, phase 1 only
 
-dynamicPowerMeasurement2: the module with power meter capability, measurement 
+dynamicPowerMeasurement2: the module with power meter capability, measurement
 enabled, phase 2 or higher
 
-dynamicPowerMeasurementWithPowerCapping: the module with power meter capability, 
+dynamicPowerMeasurementWithPowerCapping: the module with power meter capability,
 both measurement and capping enabled, phase 2 or higher
 
 =item B<cappingGmin>
@@ -350,25 +350,25 @@ Query the Minimum of power capping value in watts.
 
 =item B<cappingperc>=B<percentage>
 
-Set the power capping value base on the percentage of 
-the max-min of capping value which getting from 
-I<cappingmaxmim> attribute. The valid value must be 
+Set the power capping value base on the percentage of
+the max-min of capping value which getting from
+I<cappingmaxmim> attribute. The valid value must be
 from 0 to 100.
 
 =item B<cappingsoftmin>
 
-Query the minimum value that can be assigned to power 
+Query the minimum value that can be assigned to power
 capping without guaranteed enforceability. (Unit is watt)
 
 =item B<cappingstatus>
 
-Query the power capping status. The result should be 'on' 
+Query the power capping status. The result should be 'on'
 or 'off'.
 
 =item B<cappingstatus>={B<on> | B<off>}
 
-Set the power capping status. The value must be 'on' 
-or 'off'. This is the switch to turn on or turn off the 
+Set the power capping status. The value must be 'on'
+or 'off'. This is the switch to turn on or turn off the
 power capping function.
 
 =item B<cappingvalue>
@@ -379,10 +379,10 @@ Query the current power capping value. (Unit is watt)
 
 Set the power capping value base on the watt unit.
 
-If the 'watt' >  maximum of I<cappingmaxmin> or 'watt' 
-< I<cappingsoftmin>, the setting operation 
-will be failed. If the 'watt' > I<cappingsoftmin> and 
-'watt' < minimum of I<cappingmaxmin>, the value can NOT be 
+If the 'watt' >  maximum of I<cappingmaxmin> or 'watt'
+< I<cappingsoftmin>, the setting operation
+will be failed. If the 'watt' > I<cappingsoftmin> and
+'watt' < minimum of I<cappingmaxmin>, the value can NOT be
 guaranteed.
 
 =item B<CPUspeed>
@@ -395,28 +395,28 @@ Query the historical records which were generated in last one hour for B<CPUspee
 
 =item B<dsavingstatus>
 
-Query the dynamic power saving status. The result should 
-be 'on-norm', 'on-maxp'  or 'off'. 
+Query the dynamic power saving status. The result should
+be 'on-norm', 'on-maxp'  or 'off'.
 
-If turning on the dynamic power saving, the processor 
-frequency and voltage will be dropped dynamically based on 
-the core utilization. It supports two modes for turn on state: 
+If turning on the dynamic power saving, the processor
+frequency and voltage will be dropped dynamically based on
+the core utilization. It supports two modes for turn on state:
 
-I<on-norm> - means normal, the processor frequency cannot 
-exceed the nominal value; 
+I<on-norm> - means normal, the processor frequency cannot
+exceed the nominal value;
 
-I<on-maxp> - means maximum performance, the processor 
+I<on-maxp> - means maximum performance, the processor
 frequency can exceed the nominal value.
 
 =item B<dsavingstatus>={B<on-norm> | B<on-maxp> | B<off>}
 
-Set the dynamic power saving. The value must be 'on-norm', 
+Set the dynamic power saving. The value must be 'on-norm',
 'on-maxp' or 'off'.
 
-The dsavingstatus setting operation needs about 2 minutes 
+The dsavingstatus setting operation needs about 2 minutes
 to take effect. (The used time depends on the hardware type)
 
-The B<dsavingstatus> only can be turned on when the 
+The B<dsavingstatus> only can be turned on when the
 B<savingstatus> is in turn off status.
 
 =item B<exhausttemp>
@@ -431,7 +431,7 @@ Query the historical records which were generated in last one hour for B<exhaust
 
 Query the fan speed for all the fans which installed in this node. (Unit is RPM - Rotations Per Minute))
 
-If there are multiple fans for a node, multiple lines will be output. And a fan name in bracket will be 
+If there are multiple fans for a node, multiple lines will be output. And a fan name in bracket will be
 appended after B<fanspped> attribute name.
 
 =item B<fanspeedhistory>
@@ -440,22 +440,22 @@ Query the historical records which were generated in last one hour for B<fanspee
 
 =item B<ffoMin>
 
-Query the minimum cpu frequency which can be set for FFO. (Fixed 
+Query the minimum cpu frequency which can be set for FFO. (Fixed
 Frequency Override)
 
 =item B<ffoNorm>
 
-Query the maximum cpu frequency which can be set for FFO. 
+Query the maximum cpu frequency which can be set for FFO.
 
 =item B<ffoTurbo>
 
-Query the advertised maximum cpu frequency (selling point). 
+Query the advertised maximum cpu frequency (selling point).
 
 =item B<ffoVmin>
 
-Query the minimum cpu frequency which can be set for dropping down 
-the voltage to save power. That means when you drop the cpu 
-frequency from the ffoVmin to ffoVmin, the voltage won't change, 
+Query the minimum cpu frequency which can be set for dropping down
+the voltage to save power. That means when you drop the cpu
+frequency from the ffoVmin to ffoVmin, the voltage won't change,
 then there's no obvious power to be saved.
 
 =item B<ffovalue>
@@ -464,30 +464,30 @@ Query the current value of FFO.
 
 =item B<ffovalue>=B<MHZ>
 
-Set the current value of FFO. The valid value of ffovalue should 
+Set the current value of FFO. The valid value of ffovalue should
 be between the ffoMin and ffoNorm.
 
-Note1: Due to the limitation of firmware, the frequency in the range 
-3501 MHz - 3807 MHz can NOT be set to ffovalue. This range may be 
+Note1: Due to the limitation of firmware, the frequency in the range
+3501 MHz - 3807 MHz can NOT be set to ffovalue. This range may be
 changed in future.
 
-Note2: The setting will take effect only when the fsavingstatus is in 
-'on' status. But you need to set the ffovalue to a valid value before 
-enabling the fsavingstatus. (It's a limitation of the initial firmware 
-and will be fixed in future.) 
+Note2: The setting will take effect only when the fsavingstatus is in
+'on' status. But you need to set the ffovalue to a valid value before
+enabling the fsavingstatus. (It's a limitation of the initial firmware
+and will be fixed in future.)
 
 The ffovalue setting operation needs about 1 minute to take effect.
 
 =item B<fsavingstatus>
 
-Query the status of FFO. The result should be 'on' or 'off'. 
+Query the status of FFO. The result should be 'on' or 'off'.
 'on' - enable; 'off' - disable.
 
 =item B<fsavingstatus>={B<on> | B<off>}
 
 Set the status of FFO. The value must be 'on' or 'off'.
 
-'on' - enable. It will take effect only when the B<ffovalue> 
+'on' - enable. It will take effect only when the B<ffovalue>
 has been set to a valid value.
 
 'off' -disable. It will take effect immediately.
@@ -500,20 +500,20 @@ Query the maximum processor frequency. (Unit is MHz)
 
 =item B<mmtemp>
 
-Query the current temperature of management module. 
+Query the current temperature of management module.
 (Unit is centigrade)
 
 =item B<pd1status | powerstatus>
 
-Query the status of power domain 1 for blade management 
+Query the status of power domain 1 for blade management
 module node.
 
-Note: for the attribute without the leading 'pd1' which 
+Note: for the attribute without the leading 'pd1' which
 means there's only one power doamin in the chassis.
 
 =item B<pd1policy | powerpolicy>
 
-Query the power management policy of power domain 1. 
+Query the power management policy of power domain 1.
 
 =item B<pd1powermodule1 | powermodule>
 
@@ -541,7 +541,7 @@ Query the total power being used in power domain 1.
 
 =item B<pd2status>
 
-Query the status of power domain 2 for blade management 
+Query the status of power domain 2 for blade management
 module node.
 
 =item B<pd2policy>
@@ -578,35 +578,35 @@ Query histogram data for wattage information
 
 =item B<savingstatus>
 
-Query the static power saving status. The result should be 
+Query the static power saving status. The result should be
 'on' or 'off'. 'on' - enable; 'off' - disable.
 
 =item B<savingstatus>={B<on> | B<off>}
 
-Set the static power saving. The value must be 'on' or 'off'. 
+Set the static power saving. The value must be 'on' or 'off'.
 
-If turning on the static power saving, the processor frequency 
+If turning on the static power saving, the processor frequency
 and voltage will be dropped to a fixed value to save energy.
 
-The savingstatus setting operation needs about 2 minutes to 
+The savingstatus setting operation needs about 2 minutes to
 take effect. (The used time depends on the hardware type)
 
-The B<savingstatus> only can be turned on when the 
+The B<savingstatus> only can be turned on when the
 B<dsavingstatus> is in turn off status.
 
 =item B<sysIPLtime>
 
-Query the time used from FSP standby to OS standby. 
+Query the time used from FSP standby to OS standby.
 (Unit is Second)
 
 =item B<syssbpower>
 
-Query the system power consumed prior to power on. 
+Query the system power consumed prior to power on.
 (Unit is Watt)
 
 =item B<thermaloutput>
 
-Query the thermal output (load) in BTUs per hour for the blade 
+Query the thermal output (load) in BTUs per hour for the blade
 center chassis.
 
 =item B<powerusage>
@@ -615,7 +615,7 @@ Query System Power Statistics with DCMI (Data Center Manageability Interface).
 
 =item B<temperature>
 
-Query the temperature from DCMI (Data Center Manageability Interface) Temperature sensor. 
+Query the temperature from DCMI (Data Center Manageability Interface) Temperature sensor.
 Currently, only CPU temperature and baseboard temperature sensor available for OpenPOWER servers.
 
 =back
@@ -744,7 +744,7 @@ The output of the query operation:
     blade1: savingstatus: off
 
 =item 6.
-Query the attributes savingstatus, cappingstatus 
+Query the attributes savingstatus, cappingstatus
 and CPUspeed for server CEC1.
 
  renergy CEC1 savingstatus cappingstatus CPUspeed
@@ -762,23 +762,23 @@ Turn on the power saving function of CEC1.
 
 The output of the setting operation:
 
-    CEC1: Set savingstatus succeeded.         
-    CEC1: This setting may need some minutes to take effect.   
+    CEC1: Set savingstatus succeeded.
+    CEC1: This setting may need some minutes to take effect.
 
 =item 8.
-Set the power capping value base on the percentage of the 
+Set the power capping value base on the percentage of the
 max-min capping value. Here, set it to 50%.
 
  renergy CEC1 cappingperc=50
 
-If the maximum capping value of the CEC1 is 850w, and the 
-minimum capping value of the CEC1 is 782w, the Power Capping 
+If the maximum capping value of the CEC1 is 850w, and the
+minimum capping value of the CEC1 is 782w, the Power Capping
 value will be set as ((850-782)*50% + 782) = 816w.
 
 The output of the setting operation:
 
     CEC1: Set cappingperc succeeded.
-    CEC1: cappingvalue: 816     
+    CEC1: cappingvalue: 816
 
 =item 9.
 Query powerusage and temperature for OpenPOWER servers.
diff --git a/xCAT-client/pods/man1/restartxcatd.1.pod b/xCAT-client/pods/man1/restartxcatd.1.pod
index 98047fcf9..a85a93ac4 100644
--- a/xCAT-client/pods/man1/restartxcatd.1.pod
+++ b/xCAT-client/pods/man1/restartxcatd.1.pod
@@ -9,7 +9,7 @@ B<restartxcatd> [[B<-h>|B<--help>] | [B<-v>|B<--version>] | [B<-r>|B<--reload>]]
 
 =head1 DESCRIPTION
 
-The B<restartxcatd> command restarts the xCAT daemon (xcatd). 
+The B<restartxcatd> command restarts the xCAT daemon (xcatd).
 
 B<Linux Specific>
 
@@ -34,7 +34,7 @@ It runs 'stopsrc -s xcatd' to stop xcatd first if xcatd is active, then runs 'st
 If the xcatd subsystem was not created, B<restartxcatd> will create it automatically.
 
 =back
- 
+
 =head1 OPTIONS
 
 
diff --git a/xCAT-client/pods/man1/restorexCATdb.1.pod b/xCAT-client/pods/man1/restorexCATdb.1.pod
index ad7681f7a..72202e08c 100644
--- a/xCAT-client/pods/man1/restorexCATdb.1.pod
+++ b/xCAT-client/pods/man1/restorexCATdb.1.pod
@@ -31,10 +31,10 @@ B<-V|--verbose>   Verbose.
 
 B<-a>             All,without this flag the eventlog and auditlog will be skipped. These tables are skipped by default because restoring will generate new indexes
 
-B<-b>             Restore from the binary image. 
- 
-B<-p|--path>      Path to the directory containing the database restore files. If restoring from the binary image (-b) and using postgeSQL, then this is the complete path to the restore file that was created with dumpxCATdb -b. 
- 
+B<-b>             Restore from the binary image.
+
+B<-p|--path>      Path to the directory containing the database restore files. If restoring from the binary image (-b) and using postgeSQL, then this is the complete path to the restore file that was created with dumpxCATdb -b.
+
 B<-t|--timestamp> Use with the -b flag to designate the timestamp of the binary image to use to restore for DB2.
 
 =head1 RETURN VALUE
diff --git a/xCAT-client/pods/man1/reventlog.1.pod b/xCAT-client/pods/man1/reventlog.1.pod
index 09a1fafd4..6f0255552 100644
--- a/xCAT-client/pods/man1/reventlog.1.pod
+++ b/xCAT-client/pods/man1/reventlog.1.pod
@@ -101,7 +101,7 @@ Output is similar to:
  node4: Resolved 52.
  node4: Resolved 58.
 
-=back 
+=back
 
 =head1 SEE ALSO
 
diff --git a/xCAT-client/pods/man1/rflash.1.pod b/xCAT-client/pods/man1/rflash.1.pod
index 80347d82e..744f9bf20 100644
--- a/xCAT-client/pods/man1/rflash.1.pod
+++ b/xCAT-client/pods/man1/rflash.1.pod
@@ -44,11 +44,11 @@ The B<rflash> command initiates Firmware updates on supported xCAT nodes.  Licen
 
 The command scans the specified directory structure for Firmware update package files applicable to the given nodes and components. And then it will B<automatically> select the B<latest> version for the upgrade. The firmware update files include the Microcode update package and associated XML file. They can be downloaded from the IBM Web site: I<http://www-933.ibm.com/support/fixcentral/>.
 
-The POWER5  and POWER6 systems contain several components that use Licensed Internal Code.  The B<rflash> command supports two of these components: the managed system (also known as the Central Electronics Complex, or CEC) and the power subsystem (also known as the Bulk Power Assembly (BPA) or Bulk Power Controller (BPC)).  Some POWER5 managed systems can be attached to a power subsystem.  These power subsystems can support multiple managed systems.  When the B<rflash> command is invoked, xCAT will determine the managed system or power subsystem associated with that CEC and perform the update. 
+The POWER5  and POWER6 systems contain several components that use Licensed Internal Code.  The B<rflash> command supports two of these components: the managed system (also known as the Central Electronics Complex, or CEC) and the power subsystem (also known as the Bulk Power Assembly (BPA) or Bulk Power Controller (BPC)).  Some POWER5 managed systems can be attached to a power subsystem.  These power subsystems can support multiple managed systems.  When the B<rflash> command is invoked, xCAT will determine the managed system or power subsystem associated with that CEC and perform the update.
 
-The I<noderange> can be an CEC or CEC list, a Lpar or Lpar list and a Frame or Frame list. But CEC (or Lpar) and Frame B<can't> be used at the same time. When the I<noderange> is an CEC or CEC list, B<rflash> will upgrade the firmware of the CEC or CECs in the cec list. If I<noderange> is a Lpar or Lpar list, B<rflash> will update Licensed Internal Code (LIC) on  HMC-attached POWER5 and POWER6 pSeries nodes, and POWER7 systems using Direct FSP management.  If I<noderange> is a Frame or Frame list, B<rflash> will update Licensed Internal Code (LIC) of the power subsystem on  HMC-attached POWER5 and POWER6 pSeries nodes. The I<noderange> can also be the specified node groups. You  can  specify a  comma or space-separated list of node group ranges. See the I<noderange>  man  page  for  detailed usage information. 
+The I<noderange> can be an CEC or CEC list, a Lpar or Lpar list and a Frame or Frame list. But CEC (or Lpar) and Frame B<can't> be used at the same time. When the I<noderange> is an CEC or CEC list, B<rflash> will upgrade the firmware of the CEC or CECs in the cec list. If I<noderange> is a Lpar or Lpar list, B<rflash> will update Licensed Internal Code (LIC) on  HMC-attached POWER5 and POWER6 pSeries nodes, and POWER7 systems using Direct FSP management.  If I<noderange> is a Frame or Frame list, B<rflash> will update Licensed Internal Code (LIC) of the power subsystem on  HMC-attached POWER5 and POWER6 pSeries nodes. The I<noderange> can also be the specified node groups. You  can  specify a  comma or space-separated list of node group ranges. See the I<noderange>  man  page  for  detailed usage information.
 
-The command will update firmware for NeXtScale FPC when given an FPC node and the http information needed to access the firmware. 
+The command will update firmware for NeXtScale FPC when given an FPC node and the http information needed to access the firmware.
 
 
 =head2 PPC (with HMC) specific:
@@ -67,29 +67,29 @@ B<NOTE:>When the B<--commit> or B<--recover> two flags is used, the noderange B<
 
 xCAT recommends that you shutdown your Operating System images and power off your managed systems before applying disruptive updates to managed systems or power subsystems.
 
-Any previously activated code on the affected systems will be automatically accepted into permanent flash by this procedure.  
+Any previously activated code on the affected systems will be automatically accepted into permanent flash by this procedure.
 
-B<IMPORTANT!>  If the power subsystem is recycled, all of its attached managed systems will be recycled. 
+B<IMPORTANT!>  If the power subsystem is recycled, all of its attached managed systems will be recycled.
 
 If it outputs B<"Timeout waiting for prompt"> during the upgrade, set the B<"ppctimeout"> larger in the B<site> table. After the upgrade, remeber to change it back. If run the B<"rflash"> command on an AIX management node, need to make sure the value of B<"useSSHonAIX"> is B<"yes"> in the site table.
 
 =head2 PPC (using Direct FSP Management) specific:
 
-In currently Direct FSP/BPA Management, our B<rflash> doesn't support B<concurrent> value of B<--activate> flag, and supports B<disruptive> and B<deferred>. The B<disruptive> option will cause any affected systems that are powered on to be powered down before installing and activating the update. So we require that the systems should be powered off before do the firmware update. 
+In currently Direct FSP/BPA Management, our B<rflash> doesn't support B<concurrent> value of B<--activate> flag, and supports B<disruptive> and B<deferred>. The B<disruptive> option will cause any affected systems that are powered on to be powered down before installing and activating the update. So we require that the systems should be powered off before do the firmware update.
 
 The B<deferred> option will load the new firmware into the T (temp) side, but will not activate it like the disruptive firmware. The customer will continue to run the Frames and CECs working with the P (perm) side and can wait for a maintenance window where they can activate and boot the Frame/CECs with new firmware levels. Refer to the doc to get more details: XCAT_Power_775_Hardware_Management
 
-In Direct FSP/BPA Management, there is B<-d> I<data_directory> option. The default value is /tmp. When doing firmware update, B<rflash> will put some related data from rpm packages in <data_directory> directory, so the execution of B<rflash> will require available disk space in <data_directory> for the command to properly execute: 
+In Direct FSP/BPA Management, there is B<-d> I<data_directory> option. The default value is /tmp. When doing firmware update, B<rflash> will put some related data from rpm packages in <data_directory> directory, so the execution of B<rflash> will require available disk space in <data_directory> for the command to properly execute:
 
 For one GFW rpm package and one power code rpm package, if the GFW rpm package size is gfw_rpmsize, and the Power code rpm package size is power_rpmsize, it requires that the available disk space should be more than: 1.5*gfw_rpmsize + 1.5*power_rpmsize
 
-For Power 775, the B<rflash> command takes effect on the primary and secondary FSPs or BPAs almost in parallel. 
+For Power 775, the B<rflash> command takes effect on the primary and secondary FSPs or BPAs almost in parallel.
 
 For more details about the Firmware Update using Direct FSP/BPA Management, refer to: XCAT_Power_775_Hardware_Management#Updating_the_BPA_and_FSP_firmware_using_xCAT_DFM
 
 =head2 NeXtScale FPC specific:
 
-The command will update firmware for NeXtScale FPC when given an FPC node and the http information needed to access the firmware. The http information required includes both the MN IP address as well as the directory containing the firmware. It is recommended that the firmware be downloaded and placed in the /install directory structure as the xCAT MN /install directory is configured with the correct permissions for http.  Refer to the doc to get more details: XCAT_NeXtScale_Clusters 
+The command will update firmware for NeXtScale FPC when given an FPC node and the http information needed to access the firmware. The http information required includes both the MN IP address as well as the directory containing the firmware. It is recommended that the firmware be downloaded and placed in the /install directory structure as the xCAT MN /install directory is configured with the correct permissions for http.  Refer to the doc to get more details: XCAT_NeXtScale_Clusters
 
 =head2 OpenPOWER specific (using IPMI):
 
@@ -103,29 +103,29 @@ The command will update firmware for OpenPOWER BMC when given an OpenPOWER node
 
 B<-l|--list>:
 
-The list option will list out available firmware on the BMC.  It provides an interface to display the ID of the various firmware levels.  
+The list option will list out available firmware on the BMC.  It provides an interface to display the ID of the various firmware levels.
 
-The (*) symbol indicates the active running firmware on the server.  
+The (*) symbol indicates the active running firmware on the server.
 
-The (+) symbol indicates the firmware that is pending and a reboot is required to set it to be the active running firmware level. 
+The (+) symbol indicates the firmware that is pending and a reboot is required to set it to be the active running firmware level.
 
 B<-u|--upload>:
 
-The upload option expects a .tar file as the input and will upload the file to the BMC.  Use the list option to view the result. 
+The upload option expects a .tar file as the input and will upload the file to the BMC.  Use the list option to view the result.
 
-B<-a|--activate>: 
+B<-a|--activate>:
 
-The activate option expects either a .tar file or an ID as the input.  If a .tar file is provided, it will upload and activate the firmware in a single step 
+The activate option expects either a .tar file or an ID as the input.  If a .tar file is provided, it will upload and activate the firmware in a single step
 
-To apply the firmware level, a reboot is required to BMC and HOST. 
+To apply the firmware level, a reboot is required to BMC and HOST.
 
 B<Note:> When using B<rflash> in hierarchical environment, the .tar file must be accessible from Service Nodes.
 
 B<-d>:
 
-This option steamlines the update, activate, reboot BMC and reboot HOST procedure. It expects a directory containing both BMC and Host .tar files. When BMC and Host tar files are provided, the command will upload and activate firmware. After BMC becomes activate, it will reboot BMC. If BMC state is Ready, the command will reboot the HOST. If BMC state is NotReady, the command will exit. 
+This option steamlines the update, activate, reboot BMC and reboot HOST procedure. It expects a directory containing both BMC and Host .tar files. When BMC and Host tar files are provided, the command will upload and activate firmware. After BMC becomes activate, it will reboot BMC. If BMC state is Ready, the command will reboot the HOST. If BMC state is NotReady, the command will exit.
 
-B<Note:> When using B<--no-host-reboot>, it will not reboot the host after BMC is reboot. 
+B<Note:> When using B<--no-host-reboot>, it will not reboot the host after BMC is reboot.
 
 B<--delete>:
 
@@ -151,11 +151,11 @@ Specifies the directory where the packages are located.
 
 PPC (without HMC, using Direct FSP Management) specific:
 
-Specifies the directory where the raw data from rpm packages for each CEC/Frame are located. The default directory is /tmp. The option is only used in Direct FSP/BPA Management. 
+Specifies the directory where the raw data from rpm packages for each CEC/Frame are located. The default directory is /tmp. The option is only used in Direct FSP/BPA Management.
 
 OpenPOWER BMC specific (using IPMI):
 
-Used for IBM Power S822LC for Big Data systems only. Specifies the directory where the B<pUpdate> utility and at least one of BMC or Host update files are located. The utility and update files can be downloaded from FixCentral. 
+Used for IBM Power S822LC for Big Data systems only. Specifies the directory where the B<pUpdate> utility and at least one of BMC or Host update files are located. The utility and update files can be downloaded from FixCentral.
 
 =item B<--activate> {B<concurrent> | B<disruptive>}
 
@@ -250,7 +250,7 @@ To update the firmware on IBM Power S822LC for Big Data machine specify the node
  rflash briggs01 -d /root/supermicro/OP825
 
 =item 7.
-To update the firmware on the OpenBMC machine, specify the firmare update file to upload and activate: 
+To update the firmware on the OpenBMC machine, specify the firmare update file to upload and activate:
 
  rflash p9euh02 -a /tmp/witherspoon.pnor.squashfs.tar
 
diff --git a/xCAT-client/pods/man1/rinv.1.pod b/xCAT-client/pods/man1/rinv.1.pod
index 661f067f5..f7aed5981 100644
--- a/xCAT-client/pods/man1/rinv.1.pod
+++ b/xCAT-client/pods/man1/rinv.1.pod
@@ -11,8 +11,8 @@ B<rinv> [B<-h>|B<--help>|B<-v>|B<--version>]
 B<rinv> I<noderange> [B<model>|B<serial>|B<asset>|B<vpd>|B<deviceid>|B<guid>|B<firm>|B<dimm>|B<mprom>|B<all>]
 
 =head2 OpenPOWER (IPMI) server specific:
-  
-B<rinv> I<noderange> [B<model>|B<serial>|B<deviceid>|B<uuid>|B<guid>|B<vpd>|B<mprom>|B<firm>|B<all>] 
+
+B<rinv> I<noderange> [B<model>|B<serial>|B<deviceid>|B<uuid>|B<guid>|B<vpd>|B<mprom>|B<firm>|B<all>]
 
 =head2 OpenPOWER (OpenBMC) server specific:
 
@@ -38,7 +38,7 @@ B<rinv> I<noderange> [B<-t>]
 
 =head2 pdu specific:
 
-B<rinv> I<noderange> 
+B<rinv> I<noderange>
 
 =head2 zVM specific:
 
@@ -127,7 +127,7 @@ Retrieves dual in-line memory module information.
 
 =item B<deviceid>
 
-Retrieves device identification. Usually device, manufacturing and product IDs. 
+Retrieves device identification. Usually device, manufacturing and product IDs.
 
 =item B<uuid>
 
@@ -165,7 +165,7 @@ B<zVM specific :>
 
 =item B<--diskpoolspace>
 
-Calculates the total size of every known storage pool. 
+Calculates the total size of every known storage pool.
 
 =item B<--diskpool> I<pool> I<space>
 
@@ -177,7 +177,7 @@ Lists the FCP device channels that are active, free, or offline. State can be: a
 
 =item B<--diskpoolnames>
 
-Lists the known disk pool names. 
+Lists the known disk pool names.
 
 =item B<--networknames>
 
@@ -286,7 +286,7 @@ Output is similar to:
 
 B<zVM specific :>
 
-=item 5. 
+=item 5.
 
 To list the defined network names available for a given node:
 
@@ -303,14 +303,14 @@ Output is similar to:
  pokdev61: VSWITCH SYSTEM VSW2
  pokdev61: VSWITCH SYSTEM VSW3
 
-=item 6. 
+=item 6.
 
 To list the configuration for a given network:
 
  rinv pokdev61 --getnetwork GLAN1
 
 Output is similar to:
- 
+
  pokdev61: LAN SYSTEM GLAN1        Type: QDIO    Connected: 1    Maxconn: INFINITE
  pokdev61:   PERSISTENT  UNRESTRICTED  IP                        Accounting: OFF
  pokdev61:   IPTimeout: 5                 MAC Protection: Unspecified
@@ -321,7 +321,7 @@ Output is similar to:
 To list the disk pool names available:
 
  rinv pokdev61 --diskpoolnames
- 
+
 Output is similar to:
 
  pokdev61: POOL1
@@ -335,7 +335,7 @@ List the configuration for a given disk pool:
  rinv pokdev61 --diskpool POOL1 free
 
 Output is similar to:
- 
+
  pokdev61: #VolID DevType StartAddr Size
  pokdev61: EMC2C4 3390-09 0001 10016
  pokdev61: EMC2C5 3390-09 0001 10016
@@ -346,7 +346,7 @@ Output is similar to:
 List the known zFCP pool names.
 
  rinv pokdev61 --zfcppoolnames
- 
+
 Output is similar to:
 
  pokdev61: zfcp1
@@ -358,7 +358,7 @@ Output is similar to:
 List the SCSI/FCP devices contained in a given zFCP pool:
 
  rinv pokdev61 --zfcppool zfcp1
-  
+
 Output is similar to:
 
  pokdev61: #status,wwpn,lun,size,range,owner,channel,tag
diff --git a/xCAT-client/pods/man1/rmdef.1.pod b/xCAT-client/pods/man1/rmdef.1.pod
index 347cf18a1..9eb6cc984 100644
--- a/xCAT-client/pods/man1/rmdef.1.pod
+++ b/xCAT-client/pods/man1/rmdef.1.pod
@@ -24,15 +24,15 @@ This command is used to remove xCAT object definitions that are stored in the xC
 
 Clear the whole xCAT database. A backup of the xCAT definitions should be saved before using this option as the xCAT daemons will no longer work once cleared.
 
-To restore: 
+To restore:
 
 =over 5
 
-=item 1. B<export XCATBYPASS=1> and run the B<restorexCATdb> command.  
+=item 1. B<export XCATBYPASS=1> and run the B<restorexCATdb> command.
 
-or 
+or
 
-=item 2. Run B<xcatconfig -d> which initializes the database the same as when xCAT was installed. 
+=item 2. Run B<xcatconfig -d> which initializes the database the same as when xCAT was installed.
 
 =back
 
diff --git a/xCAT-client/pods/man1/rmhwconn.1.pod b/xCAT-client/pods/man1/rmhwconn.1.pod
index d0dd7cad9..74da29858 100644
--- a/xCAT-client/pods/man1/rmhwconn.1.pod
+++ b/xCAT-client/pods/man1/rmhwconn.1.pod
@@ -24,7 +24,7 @@ B<rmhwconn> B<-s>
 
 For PPC (with HMC) specific:
 
-This command is used to disconnect CEC and Frame nodes from HMC nodes, according to the connection information defined in ppc table in xCAT DB. 
+This command is used to disconnect CEC and Frame nodes from HMC nodes, according to the connection information defined in ppc table in xCAT DB.
 
 Note: If a CEC belongs to a frame with a BPA installed, this CEC cannot be disconnected individually. Instead, the whole frame should be disconnected.
 
@@ -80,7 +80,7 @@ To remove the connection for Frame node frame1:
 =item 3.
 
 To disconnect all CEC nodes in node group cec from their related hardware serveri, using lpar tooltype:
- 
+
  rmhwconn cec -T lpar
 
 =back
diff --git a/xCAT-client/pods/man1/rmigrate.1.pod b/xCAT-client/pods/man1/rmigrate.1.pod
index 2be54a94f..3cb693fbd 100644
--- a/xCAT-client/pods/man1/rmigrate.1.pod
+++ b/xCAT-client/pods/man1/rmigrate.1.pod
@@ -12,7 +12,7 @@ B<rmigrate> I<noderange> [B<destination=>I<target_host>] [B<action=>I<action>] [
 
 =head1 B<Description>
 
-B<rmigrate> requests that a guest VM to be moved from the current hypervisor to another.  It will request a live migration if possible.  The vmstorage directory should be shared between the source and destination hypervisors. 
+B<rmigrate> requests that a guest VM to be moved from the current hypervisor to another.  It will request a live migration if possible.  The vmstorage directory should be shared between the source and destination hypervisors.
 
 Note: Make sure SELINUX is disabled and firewall is turned off on source and destination hypervisors.
 
diff --git a/xCAT-client/pods/man1/rmimage.1.pod b/xCAT-client/pods/man1/rmimage.1.pod
index 792b96a0d..5b6fc139d 100644
--- a/xCAT-client/pods/man1/rmimage.1.pod
+++ b/xCAT-client/pods/man1/rmimage.1.pod
@@ -7,7 +7,7 @@ B<rmimage> - Removes the Linux stateless or statelite image from the file system
 B<rmimage [-h | --help]>
 
 
-B<rmimage [-V | --verbose]> I<imagename> B<[--xcatdef]> 
+B<rmimage [-V | --verbose]> I<imagename> B<[--xcatdef]>
 
 =head1 DESCRIPTION
 
@@ -16,16 +16,16 @@ The install dir is setup by using "installdir" attribute set in the site table.
 
 If I<imagename> is specified, this command uses the information in the I<imagename>
 to calculate the image root directory; otherwise, this command uses the operating system name,
-architecture and profile name to calculate the image root directory. 
+architecture and profile name to calculate the image root directory.
 
 The osimage definition will not be removed from the xCAT tables by default,
 specifying the flag B<--xcatdef> will remove the osimage definition,
-or you can use rmdef -t osimage to remove the osimage definition. 
+or you can use rmdef -t osimage to remove the osimage definition.
 
 The statelite image files on the diskful service nodes will not be removed,
-remove the image files on the service nodes manually if necessary, 
+remove the image files on the service nodes manually if necessary,
 for example, use command "rsync -az --delete /install <sn>:/" to remove the image files on the service nodes,
-where the <sn> is the hostname of the service node. 
+where the <sn> is the hostname of the service node.
 
 =head1 Parameters
 
diff --git a/xCAT-client/pods/man1/rmnimimage.1.pod b/xCAT-client/pods/man1/rmnimimage.1.pod
index 530af9fb8..342cee061 100644
--- a/xCAT-client/pods/man1/rmnimimage.1.pod
+++ b/xCAT-client/pods/man1/rmnimimage.1.pod
@@ -52,9 +52,9 @@ Override the check for shared resources when removing an xCAT osimage.
 
 Remove NIM resources from the xCAT management node only.
 
-=item B<-s> I<servicenoderange>    
+=item B<-s> I<servicenoderange>
 
-Remove the NIM resources on these xCAT service nodes only.  Do not remove the NIM resources from the xCAT management node. 
+Remove the NIM resources on these xCAT service nodes only.  Do not remove the NIM resources from the xCAT management node.
 
 =item I<osimage_name>
 
@@ -64,7 +64,7 @@ The name of the xCAT osimage definition.
 
 Verbose mode. This option will display the underlying NIM commands that are being called.
 
-=item B<-x|--xcatdef>   
+=item B<-x|--xcatdef>
 
 Remove the xCAT osimage definition.
 
@@ -88,7 +88,7 @@ An error has occurred.
 
  rmnimimage 61image
 
-The "nim -o remove" operation will be used to remove the NIM resource definitions on the management node as well as any service nodes where the resource has been replicated.   This NIM operation does not completely remove all files and directories associated with the NIM resources. 
+The "nim -o remove" operation will be used to remove the NIM resource definitions on the management node as well as any service nodes where the resource has been replicated.   This NIM operation does not completely remove all files and directories associated with the NIM resources.
 
 2) Remove all the NIM resources specified by the xCAT "61rte" osimage definition.  Delete ALL files and directories associated with the NIM resources. This will also remove the lpp_source resource.
 
diff --git a/xCAT-client/pods/man1/rmvm.1.pod b/xCAT-client/pods/man1/rmvm.1.pod
index 2dcf8cc67..139cf2d56 100644
--- a/xCAT-client/pods/man1/rmvm.1.pod
+++ b/xCAT-client/pods/man1/rmvm.1.pod
@@ -39,7 +39,7 @@ B<--service>   Remove the service partitions of the specified CECs.
 
 B<-p>          KVM: Purge the existence of the VM from persistent storage.  This will erase all storage related to the VM in addition to removing it from the active virtualization configuration. PPC: Remove the specified partition on normal power machine.
 
-B<-f>          Force remove the VM, even if the VM appears to be online.  This will bring down a live VM if requested. 
+B<-f>          Force remove the VM, even if the VM appears to be online.  This will bring down a live VM if requested.
 
 =head1 RETURN VALUE
 
diff --git a/xCAT-client/pods/man1/rmzone.1.pod b/xCAT-client/pods/man1/rmzone.1.pod
index bae05aada..1e3755ff4 100644
--- a/xCAT-client/pods/man1/rmzone.1.pod
+++ b/xCAT-client/pods/man1/rmzone.1.pod
@@ -1,10 +1,10 @@
 =head1 B<NAME>
 
-B<rmzone> - Removes a zone from the cluster. 
+B<rmzone> - Removes a zone from the cluster.
 
 =head1 B<SYNOPSIS>
 
-B<rmzone> I<zonename>  [B<-g>] [B<-f>] 
+B<rmzone> I<zonename>  [B<-g>] [B<-f>]
 
 B<rmzone> [B<-h> | B<-v>]
 
@@ -12,33 +12,33 @@ B<rmzone> [B<-h> | B<-v>]
 =head1 B<DESCRIPTION>
 
 The B<rmzone> command is designed to remove a previously defined zone from the cluster.
-It will remove the zone entry in the zone table.  It will remove the zone from the zonename attributes on the nodes that were assigned to the zone. Optionally, it will remove the zonename group from the nodes that were assigned to the zone. 
-It will also remove the root ssh keys that were created for that zone on the Management Node. 
+It will remove the zone entry in the zone table.  It will remove the zone from the zonename attributes on the nodes that were assigned to the zone. Optionally, it will remove the zonename group from the nodes that were assigned to the zone.
+It will also remove the root ssh keys that were created for that zone on the Management Node.
 The rmzone command is only supported on Linux ( No AIX support).
-The nodes are not automatically updated with new root ssh keys by rmzone.  You must run updatenode -k  or xdsh -K to the nodes to update the root ssh keys. The nodes new ssh key will be assigned from the defaultzone in the zone table, or if  no entries in the zone table,  the keys will come from /root/.ssh.   
-Note: if any zones in the zone table, there must be one and only one defaultzone. Otherwise, errors will occur.  
+The nodes are not automatically updated with new root ssh keys by rmzone.  You must run updatenode -k  or xdsh -K to the nodes to update the root ssh keys. The nodes new ssh key will be assigned from the defaultzone in the zone table, or if  no entries in the zone table,  the keys will come from /root/.ssh.
+Note: if any zones in the zone table, there must be one and only one defaultzone. Otherwise, errors will occur.
 
 
 =head1 B<OPTIONS>
 
 =over 5
 
-=item B<-h>|B<--help> 
+=item B<-h>|B<--help>
 
-Displays usage information. 
+Displays usage information.
 
-=item B<-v>|B<--version> 
+=item B<-v>|B<--version>
 
-Displays command version and build date. 
+Displays command version and build date.
 
-=item B<-f | --force> 
+=item B<-f | --force>
 
 Used to remove a zone that is defined as current default zone.  This should only be done if you are removing all zones, or you will
-adding a new zone or changing an existing zone to be the default zone. 
+adding a new zone or changing an existing zone to be the default zone.
 
-=item B<-g | --assigngroup> 
+=item B<-g | --assigngroup>
 
-Remove the assigned group named B<zonename> from all nodes assigned to the zone being removed. 
+Remove the assigned group named B<zonename> from all nodes assigned to the zone being removed.
 
 =item B<-V>|B<--Verbose>
 
@@ -61,7 +61,7 @@ To remove zone1 from the zone table and the zonename attribute on all it's assig
 
 To remove zone2 from the zone table, the zone2 zonename attribute, and the zone2 group assigned to all nodes that were in zone2, enter:
 
- rmzone zone2 -g 
+ rmzone zone2 -g
 
 =item 3.
 
diff --git a/xCAT-client/pods/man1/rnetboot.1.pod b/xCAT-client/pods/man1/rnetboot.1.pod
index e968e9f2d..19d26630a 100644
--- a/xCAT-client/pods/man1/rnetboot.1.pod
+++ b/xCAT-client/pods/man1/rnetboot.1.pod
@@ -21,41 +21,41 @@ system p nodes.
 
 =head1 OPTIONS
 
-B<-s>          
+B<-s>
 
 Set the boot device order.  Accepted boot devices are hd and net.
 
-B<-F>          
+B<-F>
 
 Force reboot the system no matter what state the node is.  By default, rnetboot will not reboot the node if node is in 'boot' state.
 
-B<-f>          
+B<-f>
 
 Force immediate shutdown of the partition.
 
-B<-m>          
+B<-m>
 
 Use one or multiple -m flags to specify the node attributes and the expected status for the node installation monitoring and automatic retry mechanism. The operators ==, !=, =~ and !~ are valid. This flag must be used with -t flag.
 
 Note: if the "val" fields includes spaces or any other characters that will be parsed by shell, the "attr<oper-ator>val" needs to be quoted. If the operator is "!~", the "attr<operator>val" needs to be quoted using single quote.
 
-B<-r>          
+B<-r>
 
 specify the number of retries that the monitoring process will perform before declaring the failure. The default value is 3. Setting the retrycount to 0 means only monitoring the os installation progress and will not re-initiate the installation if the node status has not been changed to the expected value after timeout. This flag must be used with -m flag.
 
-B<-t>          
+B<-t>
 
 Specify the timeout, in minutes, to wait for the expectedstatus specified by -m flag. This is a required flag if the -m flag is specified.
 
-B<-V|--verbose>          
+B<-V|--verbose>
 
 Verbose output.
 
-B<-h|--help>          
+B<-h|--help>
 
 Display usage message.
 
-B<-v|--version>          
+B<-v|--version>
 
 Command Version.
 
@@ -80,7 +80,7 @@ Command Version.
  rnetboot all -s hd,net
 
  rnetboot all ipl=00c
- 
+
 
 =head1 SEE ALSO
 
diff --git a/xCAT-client/pods/man1/rollupdate.1.pod b/xCAT-client/pods/man1/rollupdate.1.pod
index 50f2dc67d..4ceb5eac5 100644
--- a/xCAT-client/pods/man1/rollupdate.1.pod
+++ b/xCAT-client/pods/man1/rollupdate.1.pod
@@ -14,10 +14,10 @@ B<rollupdate> [B<-?> | B<-h> | B<--help> | B<-v> | B<--version>]
 
 The B<rollupdate> command creates and submits scheduler reservation jobs that will notify xCAT to shutdown a group of nodes, run optional out-of-band commands from the xCAT management node, and reboot the nodes.  Currently, only LoadLeveler is supported as a job scheduler with B<rollupdate>.
 
-Input to the B<rollupdate> command is passed in as stanza data through STDIN.  Information such as the sets of nodes that will be updated, the name of the job scheduler, a template for generating job command files, and other control data are required.  See 
-/opt/xcat/share/xcat/rollupdate/rollupdate.input.sample 
+Input to the B<rollupdate> command is passed in as stanza data through STDIN.  Information such as the sets of nodes that will be updated, the name of the job scheduler, a template for generating job command files, and other control data are required.  See
+/opt/xcat/share/xcat/rollupdate/rollupdate.input.sample
 and
-/opt/xcat/share/xcat/rollupdate/rollupdate_all.input.sample 
+/opt/xcat/share/xcat/rollupdate/rollupdate_all.input.sample
 for stanza keywords, usage, and examples.
 
 The B<rollupdate> command will use the input data to determine each set of nodes that will be managed together as an update group.  For each update group, a job scheduler command file is created and a reservation request is submitted.  When the group of nodes becomes available and the scheduler activates the reservation, the xcatd daemon on the management node will be notified to begin the update process for all the nodes in the update group.  If specified, prescripts will be run, an operating system shutdown command will be sent to each node, out-of-band operations can be run on the management node, and the nodes are powered back on.
@@ -67,7 +67,7 @@ An error has occurred.
 
 =item 1.
 
-To run a cluster rolling update based on the information you have created in the file 
+To run a cluster rolling update based on the information you have created in the file
 /u/admin/rolling_updates/update_all.stanza
 enter:
 
diff --git a/xCAT-client/pods/man1/rpower.1.pod b/xCAT-client/pods/man1/rpower.1.pod
index 6d7a0933c..cadf6cf85 100644
--- a/xCAT-client/pods/man1/rpower.1.pod
+++ b/xCAT-client/pods/man1/rpower.1.pod
@@ -10,7 +10,7 @@ B<rpower> [B<-h>|B<--help>|B<-v>|B<--version>]
 
 =head2 BMC (using IPMI):
 
-B<rpower> I<noderange> [B<on>|B<off>|B<softoff>|B<reset>|B<boot>|B<cycle>|B<stat>|B<state>|B<status>|B<wake>|B<suspend> [B<-w> I<timeout>] [B<-o>] [B<-r>]] 
+B<rpower> I<noderange> [B<on>|B<off>|B<softoff>|B<reset>|B<boot>|B<cycle>|B<stat>|B<state>|B<status>|B<wake>|B<suspend> [B<-w> I<timeout>] [B<-o>] [B<-r>]]
 
 B<rpower> I<noderange> [B<pduon>|B<pduoff>|B<pdustat>|B<pdureset>]
 
@@ -60,7 +60,7 @@ B<rpower> I<noderange> [B<cycle>|B<softoff>]
 
 =head2 Lenovo High-Density Server specific:
 
-B<rpower> I<noderange> [B<on>|B<off>|B<reset>|B<boot>|B<reseat>] 
+B<rpower> I<noderange> [B<on>|B<off>|B<reset>|B<boot>|B<reseat>]
 
 =head2 zVM specific:
 
diff --git a/xCAT-client/pods/man1/rscan.1.pod b/xCAT-client/pods/man1/rscan.1.pod
index 2dd6a677b..e8f47cc47 100644
--- a/xCAT-client/pods/man1/rscan.1.pod
+++ b/xCAT-client/pods/man1/rscan.1.pod
@@ -19,7 +19,7 @@ For the management module of blade, if the blade server is a Flex system P node,
 
 For the KVM host, all the KVM guests on the specified KVM host will be scanned.
 
-Note: The first line of the output always contains information about the hardware control point. When using the rscan command to generate output for HMC or IVM hardware control points, it provides the FSPs and BPAs as part of the output. The only exception is the rscan -u flag which provides updates made hardware control point in the xCAT database. 
+Note: The first line of the output always contains information about the hardware control point. When using the rscan command to generate output for HMC or IVM hardware control points, it provides the FSPs and BPAs as part of the output. The only exception is the rscan -u flag which provides updates made hardware control point in the xCAT database.
 
 =head1 OPTIONS
 
@@ -31,11 +31,11 @@ B<-v|--version>          Command Version.
 
 B<-V|--verbose>          Verbose output.
 
-B<-u>          Updates and then prints out node definitions in the xCAT database for CEC/BPA. It updates the existing nodes that contain the same mtms and serial number for nodes managed by the specified hardware control point. This primarily works with CEC/FSP and frame/BPA nodes when the node name is not the same as the managed system name on hardware control point (HMC), This flag will update the BPA/FSP node name definitions to be listed as the managed system name in the xCAT database.  
+B<-u>          Updates and then prints out node definitions in the xCAT database for CEC/BPA. It updates the existing nodes that contain the same mtms and serial number for nodes managed by the specified hardware control point. This primarily works with CEC/FSP and frame/BPA nodes when the node name is not the same as the managed system name on hardware control point (HMC), This flag will update the BPA/FSP node name definitions to be listed as the managed system name in the xCAT database.
 
 For the Flex system manager, both the blade server and fsp object of xCAT will be updated if the mpa and slot id are matched to the object which has been defined in the xCAT database.
 
-For KVM host, the information of the KVM guests which have been defined in xCAT database will be updated. 
+For KVM host, the information of the KVM guests which have been defined in xCAT database will be updated.
 
 Note: only the matched object will be updated.
 
@@ -43,7 +43,7 @@ B<-n>          For KVM host, the information of the KVM guests, which are not de
 
 B<-w>          Writes output to xCAT database.
 
-For KVM host, updates the information of the KVM guests which have been defined in xCAT database with the same node name and KVM host, creates the definition of the KVM guests which do not exist in xCAT database , and notifies user about the conflicting KVM guests that the name exist in xCAT database but the kvm host is different. 
+For KVM host, updates the information of the KVM guests which have been defined in xCAT database with the same node name and KVM host, creates the definition of the KVM guests which do not exist in xCAT database , and notifies user about the conflicting KVM guests that the name exist in xCAT database but the kvm host is different.
 
 B<-x>          XML format.
 
diff --git a/xCAT-client/pods/man1/rspconfig.1.pod b/xCAT-client/pods/man1/rspconfig.1.pod
index e05e4ae9c..10df8ed4b 100644
--- a/xCAT-client/pods/man1/rspconfig.1.pod
+++ b/xCAT-client/pods/man1/rspconfig.1.pod
@@ -280,7 +280,7 @@ Set or get frame number.  If no framenumber and * specified, framenumber for the
 
 =item B<cec_off_policy>={B<poweroff>|B<stayon>}
 
-Set or get cec off policy after lpars are powered off.  If no cec_off_policy value specified, the cec_off_policy for the nodes will be displayed. the cec_off_policy has two values: B<poweroff> and B<stayon>. B<poweroff> means Power off when last partition powers off. B<stayon> means Stay running after last partition powers off. If cec_off_policy value is specified, the cec off policy will be set for that cec.  
+Set or get cec off policy after lpars are powered off.  If no cec_off_policy value specified, the cec_off_policy for the nodes will be displayed. the cec_off_policy has two values: B<poweroff> and B<stayon>. B<poweroff> means Power off when last partition powers off. B<stayon> means Stay running after last partition powers off. If cec_off_policy value is specified, the cec off policy will be set for that cec.
 
 =item B<HMC_passwd>={I<currentpasswd,newpasswd>}
 
@@ -320,7 +320,7 @@ Display the CEC/BPA system names.
 
 =item B<BSR>
 
-Get Barrier Synchronization Register (BSR) allocation for a CEC. 
+Get Barrier Synchronization Register (BSR) allocation for a CEC.
 
 =item B<huge_page>
 
@@ -328,7 +328,7 @@ Query huge page information or request NUM of huge pages for CEC. If no value sp
 
 =item B<setup_failover>={B<enable> | B<disable>}
 
-Enable or disable the service processor failover function of a CEC or display status of this function. 
+Enable or disable the service processor failover function of a CEC or display status of this function.
 
 =item B<force_failover>
 
@@ -344,7 +344,7 @@ Select the policy for I/O Adapter Enlarged Capacity. This option controls the si
 
 =item B<hostname>
 
-Get or set hostname on the service processor.   
+Get or set hostname on the service processor.
 
 =item B<vlan>
 
@@ -388,14 +388,14 @@ Generate/Manage BMC system dumps. If no sub-option is provided, will generate, w
 
 =over 4
 
-=item 
+=item
 B<-c> will clear a single specified dump, or use 'all' to clear all dumps on the BMC.
 
-=item 
-B<-l> will list all the generated dumps on the BMC. 
+=item
+B<-l> will list all the generated dumps on the BMC.
 
-=item 
-B<-g> will generate a new dump on the BMC. Dump generation can take a few minutes. 
+=item
+B<-g> will generate a new dump on the BMC. Dump generation can take a few minutes.
 
 =item
 B<-d> will download a single dump or all generated dumps from the BMC to /var/log/xcat/dump on management or service node.
@@ -418,7 +418,7 @@ For MPA only. Connecting to the IP of MPA from the hosts.otherinterfaces to set
 
 =item B<network>={I<nic>,{[I<ip>],[I<host>],[I<gateway>],[I<netmask>]}|*}
 
-Not only for FSP/BPA but also for IMM. Get or set the FSP/BPA/IMM network parameters. If '*' is specified, all parameters are read from the xCAT database. 
+Not only for FSP/BPA but also for IMM. Get or set the FSP/BPA/IMM network parameters. If '*' is specified, all parameters are read from the xCAT database.
 If the value of I<ip> is '0.0.0.0', this I<nic> will be configured as a DHCP client. Otherwise this I<nic> will be configured with a static IP.
 
 Note that IPs of FSP/BPAs will be updated with this option, user needs to put the new IPs to /etc/hosts manually or with xCAT command makehosts. For more details, see the man page of makehosts.
@@ -501,7 +501,7 @@ Query or set sysname for CEC or Frame. If no value specified, means to query sys
 
 =item B<pending_power_on_side>={B<temp|perm>}
 
-List or set pending power on side for CEC or Frame. If no pending_power_on_side value specified, the pending power on side for the CECs or frames will be displayed. If specified, the pending_power_on_side value will be set to CEC's FSPs or Frame's BPAs. The value 'temp' means T-side or temporary side. The value 'perm' means P-side or permanent side. 
+List or set pending power on side for CEC or Frame. If no pending_power_on_side value specified, the pending power on side for the CECs or frames will be displayed. If specified, the pending_power_on_side value will be set to CEC's FSPs or Frame's BPAs. The value 'temp' means T-side or temporary side. The value 'perm' means P-side or permanent side.
 
 =item B<time>=I<hh:mm:ss>
 
@@ -515,7 +515,7 @@ Set the blade or MPA textid. When using '*', the textid used is the node name sp
 
 Change the password of the userid B<USERID> for CMM in Flex system cluster. The option I<updateBMC> can be used to specify whether updating the password of BMCs that connected to the specified CMM. The value is 'y' by default which means whenever updating the password of CMM, the password of BMCs will be also updated. Note that there will be several seconds needed before this command complete.
 
-If value "*" is specified for USERID and the object node is I<Flex System X node>, the password used to access the BMC of the System X node through IPMI will be updated as the same password of the userid B<USERID> of the CMM in the same cluster.  
+If value "*" is specified for USERID and the object node is I<Flex System X node>, the password used to access the BMC of the System X node through IPMI will be updated as the same password of the userid B<USERID> of the CMM in the same cluster.
 
 =item B<--resetnet>
 
@@ -543,7 +543,7 @@ Display the version number.
 =item 1.
 To setup new ssh keys on the Management Module mm:
 
- rspconfig mm snmpcfg=enable sshcfg=enable  
+ rspconfig mm snmpcfg=enable sshcfg=enable
 
 =item 2.
 To turn on SNMP alerts for node5:
@@ -666,7 +666,7 @@ Output is similar to:
  fsp01: Success to set IP address,hostname,gateway,netmask
 
 =item 13.
-To configure eth0 on fsp01 to get dynamic IP address from DHCP server: 
+To configure eth0 on fsp01 to get dynamic IP address from DHCP server:
 
  rspconfig fsp01 network=eth0,0.0.0.0
 
@@ -842,12 +842,12 @@ To force service processor failover for cec01:
  cec01: 192.168.2.1: sp=primary,ipadd=192.168.2.1,alt_ipadd=unavailable,state=LINE UP
  cec01: 192.168.1.2: sp=secondary,ipadd=192.168.1.2,alt_ipadd=unavailable,state=LINE UP
  cec01: 192.168.2.2: LINE DOWN
- 
+
  rspconfig cec01 force_failover
 
  cec01: Success.
- 
- lshwconn> cec01                
+
+ lshwconn> cec01
 
  cec01: 192.168.1.1: sp=secondary,ipadd=192.168.1.1,alt_ipadd=unavailable,state=LINE UP
  cec01: 192.168.2.1: LINE DOWN
diff --git a/xCAT-client/pods/man1/sinv.1.pod b/xCAT-client/pods/man1/sinv.1.pod
index 1d6dfa3d5..e8bd98d17 100644
--- a/xCAT-client/pods/man1/sinv.1.pod
+++ b/xCAT-client/pods/man1/sinv.1.pod
@@ -1,6 +1,6 @@
 =head1 B<NAME>
 
-B<sinv> - Checks the software configuration of the nodes in the cluster. 
+B<sinv> - Checks the software configuration of the nodes in the cluster.
 
 =head1 B<SYNOPSIS>
 
@@ -12,12 +12,12 @@ B<sinv> [B<-h> | B<-v>]
 =head1 B<DESCRIPTION>
 
 The B<sinv> command is designed to check the configuration of the nodes in a cluster.
-The command takes as input command line flags, and one or more templates which will be compared against the output of the B<xdsh> command, designated to be run by the B<-c> or B<-f> flag, on the nodes in the noderange. 
+The command takes as input command line flags, and one or more templates which will be compared against the output of the B<xdsh> command, designated to be run by the B<-c> or B<-f> flag, on the nodes in the noderange.
 
-The nodes will then be grouped according to the template they match and a report returned to the administrator in the output file designated by the B<-o> flag, or to stdout. 
+The nodes will then be grouped according to the template they match and a report returned to the administrator in the output file designated by the B<-o> flag, or to stdout.
+
+B<sinv> supports checking the output from the  B<rinv> or B<xdsh> command.
 
-B<sinv> supports checking the output from the  B<rinv> or B<xdsh> command. 
- 
 The B<sinv> command is an xCAT Distributed Shell Utility.
 
 
@@ -38,7 +38,7 @@ The syntax for the B<-c>  parameter is as follows:
 where I<command> is the command to run on the remote
 target. Quotation marks are required to ensure that all commands in the
 list are executed remotely, and that any special characters are interpreted
-correctly on the remote target. 
+correctly on the remote target.
 
 The B<sinv> command does not work with any interactive commands, including
 those that read from standard input.
@@ -56,22 +56,22 @@ Command Protocol can be used. See man B<xdsh> for more details.
 
 =item B<-o>|B<--output> I<report output file>
 
-Optional output file. This is the location of the file that will contain the report of the nodes that match, and do not match, the input templates. If the flag is not used, the output will go to stdout. 
+Optional output file. This is the location of the file that will contain the report of the nodes that match, and do not match, the input templates. If the flag is not used, the output will go to stdout.
 
 =item B<-p>|B<--tp> I<template path>
 
 This is the path to the template file. The template contains the output
-of B<xdsh> or B<rinv> command, that has been run against a "seed" node, a node 
-that contains the configuration that you would like all nodes in your noderange to match. 
+of B<xdsh> or B<rinv> command, that has been run against a "seed" node, a node
+that contains the configuration that you would like all nodes in your noderange to match.
 
 The admin can create the template by running the B<xdsh> or B<rinv> command on
 the seed node, pipe to B<xdshcoll> (required) and store the output
 in the template path. See examples.
 
-B<Note:> The admin can also edit the template to remove any lines that they do not want checked.  
+B<Note:> The admin can also edit the template to remove any lines that they do not want checked.
 
-An alternative method is to use the [B<-s> I<seed node>] parameter, 
-which will automatically build the template for you from the 
+An alternative method is to use the [B<-s> I<seed node>] parameter,
+which will automatically build the template for you from the
 seed node named.
 
 If a a seed node is not provided, then command will automatically use the first node in the noderange as
@@ -82,15 +82,15 @@ the seed node.
 
 This count is the number of templates that the command will use
 to check for nodes matches.  If the template in the template path does not
-match a node, the B<sinv> will check additional templates up 
+match a node, the B<sinv> will check additional templates up
 to the template count.
-  
-For each node, it will compare the node against each template to see if 
-there is a match.  
+
+For each node, it will compare the node against each template to see if
+there is a match.
 If there is no match, and we are not over the template count,
-then a new template will be created from the node output. 
+then a new template will be created from the node output.
 This will result in having all nodes that match a given template reported in
-their group at the end of the run in the output file. 
+their group at the end of the run in the output file.
 If no template count is specified, 0 is the default, and all nodes will
 be compared against the first template.
 
@@ -109,22 +109,22 @@ selected as a seed node.
 This flag suppresses the reporting of the nodes matching the first
 template. In very large systems, you may not want to show the nodes that
 have the correct configuration, since the list could contain thousands of nodes.
-This allows you to only report the nodes that do not match the required 
-configuration. 
+This allows you to only report the nodes that do not match the required
+configuration.
 
 =item B<-e>|B<--exactmatch>
 
 This requires the check of node output against template to be an exact match.
-If this flag is not set, B<sinv> checks to see if the return from the 
-B<xdsh> or B<rinv> command to the nodes contain a match for each line in the input 
+If this flag is not set, B<sinv> checks to see if the return from the
+B<xdsh> or B<rinv> command to the nodes contain a match for each line in the input
 template (except for xdshcoll header and comments). If not in exactmatch mode,
 there can be more lines in the B<xdsh> or B<rinv> return from the nodes.
 
-For example, if running a "rpm -qa | grep xCAT" command, without exactmatch 
+For example, if running a "rpm -qa | grep xCAT" command, without exactmatch
 set, if the node contains more xCAT rpms that listed in the template,
 it would be considered a match, as long as all rpms listed in the template
-were on the node. With exactmatch set, the output must be identical 
-to the template. 
+were on the node. With exactmatch set, the output must be identical
+to the template.
 
 =item B<--devicetype> I<type_of_device>
 
@@ -148,16 +148,16 @@ Specifies a remote user name to use for remote command execution.
 
 =item B<-c>|B<--command>
 
-The B<xdsh> or B<rinv> command that will be run. The command should be enclosed in 
+The B<xdsh> or B<rinv> command that will be run. The command should be enclosed in
 double quotes to insure correct shell interpretation. This parameter must only contain, the node range or the image path (Linux) or spot name for AIX. It cannot be used to set additional input flags to B<xdsh> or B<rinv> (for example B<-s>,B<-T>,B<-e>).  See examples below.
 
 B<Note:> do not add the B<| xdshcoll> to the command,
-it is automatically added by B<sinv>.  B<sinv> also automatically sets the B<-v> flag for B<xdsh>. 
+it is automatically added by B<sinv>.  B<sinv> also automatically sets the B<-v> flag for B<xdsh>.
 
 =item B<-f>|B<--file>
 
-The file containing the B<xdsh> or B<rinv> command that will be run. 
-This should be the fully qualified name of the file. 
+The file containing the B<xdsh> or B<rinv> command that will be run.
+This should be the fully qualified name of the file.
 
 B<Note:> do not add the B<| xdshcoll> to the command in the file,
 it is automatically added by B<sinv>.
@@ -165,7 +165,7 @@ it is automatically added by B<sinv>.
 =item B<-r>|B<--remove>
 
 This flag indicates that generated templates should be removed at the
-at the end of the B<sinv> command execution. 
+at the end of the B<sinv> command execution.
 
 If the flag is specified, then all templates that are generated by the B<sinv>
 command, will be removed. If the first template is created by the admin,
@@ -233,7 +233,7 @@ possibly generating up to two additional
 templates and removing any generated templates at the end, enter:
 
  sinv -c "rinv node1-node4 serial" -s node8 -p /tmp/sinv.template -t 2 -r -o /tmp/rinv.output
- 
+
 =item 6.
 To execute B<sinv> on noderange, I<node1-node4>, using I<node1> as
 the seed node, to generate the sinv.template from the B<xdsh> command (B<-c>),
@@ -245,7 +245,7 @@ Note: the /tmp/sinv.template file must be empty, otherwise it will be used
 as an admin generated template.
 
 =item 7.
-To execute B<sinv> on the Linux osimage defined for cn1.  First build a template from the /etc/hosts on the node. Then run B<sinv> to compare. 
+To execute B<sinv> on the Linux osimage defined for cn1.  First build a template from the /etc/hosts on the node. Then run B<sinv> to compare.
 
  xdsh cn1 "cat /etc/hosts" | xdshcoll > /tmp/sinv2/template"
 
diff --git a/xCAT-client/pods/man1/snmove.1.pod b/xCAT-client/pods/man1/snmove.1.pod
index d1e4fad4d..75d8af79b 100644
--- a/xCAT-client/pods/man1/snmove.1.pod
+++ b/xCAT-client/pods/man1/snmove.1.pod
@@ -43,9 +43,9 @@ When the B<snmove> command is run it modifies the xCAT database to
 switch the primary server to the backup server.
 
 It will also check the other services that are being used for the
-node (tftpserver, monserver, nfsserver, conserver), and if they were set 
+node (tftpserver, monserver, nfsserver, conserver), and if they were set
 to the original service node they will be changed to point to the backup
-service node. 
+service node.
 
 By default the command will modify the nodes so that they will be able to be managed by the backup service node.
 
@@ -55,12 +55,12 @@ You can also have postscripts executed on the nodes by using the -P option if ne
 
 The xCAT B<snmove> command may also be used to synchronize statelite persistent files from the primary service node to the backup service node without actually moving the nodes to the backup servers.
 
-If you run the command with the "-l" option it will attempt to use rsync to update the statelite persistent directory on the backup service node. This will only be done if the server specified in the "statelite" table is the primary service node. 
+If you run the command with the "-l" option it will attempt to use rsync to update the statelite persistent directory on the backup service node. This will only be done if the server specified in the "statelite" table is the primary service node.
 
 When the B<snmove> command is executed the new service node must be running but
 the original service node may be down.
 
-Note: On a Linux cluster, for NFS statelite nodes that do not use external NFS server, if the original service node is down, the nodes it manages will be down too. You must run nodeset command and then reboot the nodes after running snmove. For stateless nodes and RAMDisk statelite nodes, the nodes will be up even if the original service node is down. However, make sure to run nodeset command if you decide to reboot the nodes later.   
+Note: On a Linux cluster, for NFS statelite nodes that do not use external NFS server, if the original service node is down, the nodes it manages will be down too. You must run nodeset command and then reboot the nodes after running snmove. For stateless nodes and RAMDisk statelite nodes, the nodes will be up even if the original service node is down. However, make sure to run nodeset command if you decide to reboot the nodes later.
 
 =head1 OPTIONS
 
@@ -68,7 +68,7 @@ Note: On a Linux cluster, for NFS statelite nodes that do not use external NFS s
 
 =item B<-d|--dest>
 
-Specifies the hostname of the new destination service node as known by (facing) the management node. 
+Specifies the hostname of the new destination service node as known by (facing) the management node.
 
 =item B<-D|--destn>
 
@@ -88,7 +88,7 @@ Use this option to ONLY synchronize any AIX statelite files from the primary ser
 
 =item B<-P|--postscripts>
 
-Specifies a list of extra postscripts to be run on the nodes after the nodes are moved over to the new service node. If B<all> is specified, all the postscripts defined in the postscripts table will be run for the nodes. The specified postscripts must be stored under /install/postscripts directory. 
+Specifies a list of extra postscripts to be run on the nodes after the nodes are moved over to the new service node. If B<all> is specified, all the postscripts defined in the postscripts table will be run for the nodes. The specified postscripts must be stored under /install/postscripts directory.
 
 =item B<-s|--source>
 
diff --git a/xCAT-client/pods/man1/swapnodes.1.pod b/xCAT-client/pods/man1/swapnodes.1.pod
index 63b3c59f2..ca35b93eb 100644
--- a/xCAT-client/pods/man1/swapnodes.1.pod
+++ b/xCAT-client/pods/man1/swapnodes.1.pod
@@ -1,6 +1,6 @@
 =head1 NAME
 
-B<swapnodes> - swap the location info in the db (all the attributes in the ppc table and the nodepos table) between 2 nodes. If swapping within a cec, it will assign the IO adapters that were assigned to the defective node to the available node. 
+B<swapnodes> - swap the location info in the db (all the attributes in the ppc table and the nodepos table) between 2 nodes. If swapping within a cec, it will assign the IO adapters that were assigned to the defective node to the available node.
 
 =head1 SYNOPSIS
 
@@ -10,10 +10,10 @@ B<swapnodes> B<-c> I<current_node> B<-f> I<fip_node> [B<-o>]
 
 =head1 DESCRIPTION
 
-This command is only for Power 775 using Direct FSP Management, and used in Power 775 Availability Plus. 
+This command is only for Power 775 using Direct FSP Management, and used in Power 775 Availability Plus.
 
 The B<swapnodes> command will keep the B<current_node> name in the xCAT table, and use the I<fip_node>'s hardware resource. Besides that, the IO adapters will be assigned to the new hardware resource if they are in the same CEC. So the swapnodes command will do 2 things:
-  
+
 1. Swap the location info in the db between 2 nodes:
 
 All the ppc table attributes (including hcp, id, parent, supernode and so on).
@@ -68,7 +68,7 @@ To swap the service node attributes and IO assignments between sn1 and compute2
 =item 2.
 To swap the service node attributes and IO assignments between sn1 and compute2 which are NOT in the same cec, all the attributes in the ppc table and nodepos table of the two node will be swapped. After the swapping, the sn1 will use the compute2's hardware resource.
 
- swapnodes -c sn1 -f compute2 
+ swapnodes -c sn1 -f compute2
 
 =item 3.
 Only to move the service node (sn1) definition to the compute node (compute2)'s hardware resource, and not move the compute2 definition to the sn1. After the swapping, the sn1 will use the compute2's hardware resource, and the compute2 definition is not changed.
diff --git a/xCAT-client/pods/man1/switchdiscover.1.pod b/xCAT-client/pods/man1/switchdiscover.1.pod
index 20f8e56e1..739ada95b 100755
--- a/xCAT-client/pods/man1/switchdiscover.1.pod
+++ b/xCAT-client/pods/man1/switchdiscover.1.pod
@@ -16,78 +16,78 @@ B<switchdiscover> [I<noderange> | B<--range> I<ip_ranges>] B<[-V] [-w][-r|-x|-z]
 
 =head1 DESCRIPTION
 
-The switchdiscover command scans the subnets and discovers all the switches on the subnets. The command takes a list of subnets as input. The default subnets are the ones that the xCAT management node is on. It uses nmap command as default to discover the switches. However, you can specify other discovery methods such as lldp or snmp with B<-s> flag. You can write the discovered switches into xCAT database with B<-w> flag. This command supports may output formats such as xml(B<-x>), raw(B<-r>) and stanza(B<-z>) in addition to the default format.    
+The switchdiscover command scans the subnets and discovers all the switches on the subnets. The command takes a list of subnets as input. The default subnets are the ones that the xCAT management node is on. It uses nmap command as default to discover the switches. However, you can specify other discovery methods such as lldp or snmp with B<-s> flag. You can write the discovered switches into xCAT database with B<-w> flag. This command supports may output formats such as xml(B<-x>), raw(B<-r>) and stanza(B<-z>) in addition to the default format.
 
 B<--setup> flag is for switch-based switch discovery.  It will find all the discovered switches on the subnets, then match them with predefined switches in the xCATDB. Next, it will set discovered switches with static ip address and hostname based on the predefined switch.  It will also enable snmpv3 configuration. The details of the process are defined in the http://xcat-docs.readthedocs.io/en/latest/advanced/networks/switchdiscover/switches_discovery.html.
 
 To view all the switches defined in the xCAT database use B<lsdef -w "nodetype=switch"> command.
 
-For lldp method, make sure that lldpd package is installed and lldpd is running on the xCAT management node. lldpd comes from xcat-dep package or you can get it from http://vincentbernat.github.io/lldpd/installation.html. 
+For lldp method, make sure that lldpd package is installed and lldpd is running on the xCAT management node. lldpd comes from xcat-dep package or you can get it from http://vincentbernat.github.io/lldpd/installation.html.
 
-For snmp method, make sure that snmpwalk command is installed and snmp is enabled for switches. To install snmpwalk, "yum install net-snmp-utils" for redhat and sles,  "apt-get install snmp" for Ubuntu. The switchdiscover command only check the switches with default community string, if user already configured switch with other commmunity string, need to pass in with B<-c> option for switchdiscover command to be able to discover. 
+For snmp method, make sure that snmpwalk command is installed and snmp is enabled for switches. To install snmpwalk, "yum install net-snmp-utils" for redhat and sles,  "apt-get install snmp" for Ubuntu. The switchdiscover command only check the switches with default community string, if user already configured switch with other commmunity string, need to pass in with B<-c> option for switchdiscover command to be able to discover.
 
 
 =head1 OPTIONS
 
 =over 10
 
-=item I<noderange>  
+=item I<noderange>
 
 The switches which the user want to discover.
 If the user specify the noderange, switchdiscover will just
-return the switches in the node range. Which means it will 
+return the switches in the node range. Which means it will
 help to add the new switches to the xCAT database without
-modifying the existed definitions. But the switches' name 
-specified in noderange should be defined in database in advance. 
-The ips of the switches will be defined in /etc/hosts file. 
-This command will fill the switch attributes for the switches defined. 
+modifying the existed definitions. But the switches' name
+specified in noderange should be defined in database in advance.
+The ips of the switches will be defined in /etc/hosts file.
+This command will fill the switch attributes for the switches defined.
 
-=item B<-h|--help>          
+=item B<-h|--help>
 
 Display usage message.
 
-=item B<--range>  
+=item B<--range>
 
 Specify one or more IP ranges. Each can be an ip address (10.1.2.3) or an ip range (10.1.2.0/24). If the range is huge, for example, 192.168.1.1/8, the switch discover may take a very long time to scan. So the range should be exactly specified.
 
 For nmap and snmp scan method, it accepts multiple formats. For example: 192.168.1.1/24, 40-41.1-2.3-4.1-100.
 
-If the range is not specified, the command scans all the subnets that the active network interfaces (eth0, eth1) are on where this command is issued. 
+If the range is not specified, the command scans all the subnets that the active network interfaces (eth0, eth1) are on where this command is issued.
 
-=item B<-r>          
+=item B<-r>
 
 Display Raw responses.
 
-=item B<-s>  
+=item B<-s>
 
-It is a comma separated list of methods for switch discovery. 
+It is a comma separated list of methods for switch discovery.
 The possible switch scan methods are: lldp, nmap or snmp. The default is nmap.
 
-=item B<-v|--version>  
+=item B<-v|--version>
 
 Command Version.
 
-=item B<-V>    
+=item B<-V>
 
 Verbose output.
 
-=item B<-w>     
+=item B<-w>
 
 Writes output to xCAT database.
 
-=item B<-x>      
+=item B<-x>
 
 XML formatted output.
 
-=item B<-z>          
+=item B<-z>
 
 Stanza formatted output.
 
 =item B<--setup>
 
-Process switch-based switch discovery. Update discovered switch's ip address, hostname and enable snmpv3 configuration based on the predefined switch. 
+Process switch-based switch discovery. Update discovered switch's ip address, hostname and enable snmpv3 configuration based on the predefined switch.
 
-=item B<-c>          
+=item B<-c>
 
 User defined community string for snmp scan.
 
diff --git a/xCAT-client/pods/man1/updatenode.1.pod b/xCAT-client/pods/man1/updatenode.1.pod
index 45a11dde2..dbfd3cb24 100644
--- a/xCAT-client/pods/man1/updatenode.1.pod
+++ b/xCAT-client/pods/man1/updatenode.1.pod
@@ -8,7 +8,7 @@ B<updatenode> I<noderange> [B<-V>|B<--verbose>] [B<-F>|B<--sync>] [B<-f>|B<--sns
 
 B<updatenode> B<noderange> [B<-k>|B<--security>] [B<-t> I<timeout>]
 
-B<updatenode> B<noderange> [B<-g>|B<--genmypost>] 
+B<updatenode> B<noderange> [B<-g>|B<--genmypost>]
 
 B<updatenode> B<noderange> [B<-V>|B<--verbose>] [B<-t> I<timeout>] [I<script1,script2...>]
 
@@ -24,7 +24,7 @@ to perform the following node updates:
 =over 3
 
 =item 1.
-Distribute and synchronize files.  
+Distribute and synchronize files.
 
 =item 2.
 Install or update software on diskful nodes.
@@ -38,14 +38,14 @@ Update the ca and credentials for the service nodes.
 
 =back
 
-The default behavior when no options are input to updatenode will be to run  
+The default behavior when no options are input to updatenode will be to run
 the following options B<-S>, B<-P> and B<-F> options in this order.
-If you wish to limit updatenode to specific 
+If you wish to limit updatenode to specific
 actions you can use combinations of the B<-S>, B<-P>, and B<-F> flags.
 
 For example, If you just want to synchronize configuration file you could
-specify the B<-F> flag.   If you want to synchronize files and update 
-software you would specify the B<-F> and B<-S> flags. See the descriptions 
+specify the B<-F> flag.   If you want to synchronize files and update
+software you would specify the B<-F> and B<-S> flags. See the descriptions
 of these flags and examples below.
 
 The flag B<-k> (B<--security>) can NOT be used together with B<-S>, B<-P>, and B<-F> flags.
@@ -53,11 +53,11 @@ The flag B<-k> (B<--security>) can NOT be used together with B<-S>, B<-P>, and B
 The flag B<-f> (B<--snsync>) can NOT be used together with B<-S>, B<-P>, and B<-F> flags.
 
 
-Note: In a large cluster environment the updating of nodes in an ad hoc 
-manner can quickly get out of hand, leaving the system administrator with 
-a very confusing environment to deal with. The updatenode command is 
-designed to encourage users to handle cluster updates in a manner that 
-is recorded and easily repeatable.  
+Note: In a large cluster environment the updating of nodes in an ad hoc
+manner can quickly get out of hand, leaving the system administrator with
+a very confusing environment to deal with. The updatenode command is
+designed to encourage users to handle cluster updates in a manner that
+is recorded and easily repeatable.
 
 =head2 To distribute and synchronize files
 
@@ -76,17 +76,17 @@ Run the updatenode command to update the nodes.
 
 =back
 
-Files may be distributed and synchronized for both diskless and 
-diskful nodes.  Syncing files to NFS-based statelite nodes is not supported. 
+Files may be distributed and synchronized for both diskless and
+diskful nodes.  Syncing files to NFS-based statelite nodes is not supported.
 
 More information on using the  synchronization file function is in the following doc: Using_Updatenode.
 
 =head3 Create the synclist file
 
-The synclist file contains the configuration entries that specify 
-where the files should be synced to. In the synclist file, each 
-line is an entry which describes the location of the source files 
-and the destination location for the files on the target node. 
+The synclist file contains the configuration entries that specify
+where the files should be synced to. In the synclist file, each
+line is an entry which describes the location of the source files
+and the destination location for the files on the target node.
 
 For more information on creating your synclist files and where to put them, read:
 
@@ -94,7 +94,7 @@ Sync-ing_Config_Files_to_Nodes
 
 
 =head3 Run updatenode to synchronize the files
-        
+
   updatenode <noderange> -F
 
 
@@ -109,14 +109,14 @@ To install/update the packages, run:
 
 B<For Linux systems:>
 
-It this is equivalent to running the 
+It this is equivalent to running the
 following command:
 
  updatenode noderange -P ospkgs,otherpkgs
 
-It will update all the rpms specified in the .pkglist file and .otherpkgs.pkglist 
-file. ospkgs postscript will normally remove all the existing rpm 
-repositories before adding server:/install/<os>/<arch/ as the new repository. 
+It will update all the rpms specified in the .pkglist file and .otherpkgs.pkglist
+file. ospkgs postscript will normally remove all the existing rpm
+repositories before adding server:/install/<os>/<arch/ as the new repository.
 To preserve the existing repositories, you can run the following command instead:
 
   updatenode noderange -P "ospkgs --keeprepo,otherpkgs"
@@ -133,27 +133,27 @@ XCAT_AIX_Diskless_Nodes
 updatenode can also be used in Sysclone environment to push delta changes to target node. After capturing the delta changes from the golden client to management node, just run below command to push delta changes to target nodes.
 
   updatenode <targetnoderange> -S
-  
+
 =head2 To run postscripts
 
-The scripts must be copied to the /install/postscripts 
-directory on the xCAT management node. (Make sure they are 
+The scripts must be copied to the /install/postscripts
+directory on the xCAT management node. (Make sure they are
 executable and world readable.)
 
-To run scripts on a node you must either specify them on the 
-command line or you must add them to the "postscripts" attribute 
-for the node.  
+To run scripts on a node you must either specify them on the
+command line or you must add them to the "postscripts" attribute
+for the node.
 
-To set the postscripts attribute of the node (or group) 
-definition you can use the xCAT chdef command. Set the value to 
-be a comma separated list of the scripts that you want to be 
-executed on the nodes. The order of the scripts in the list 
-determines the order in which they will be run.  You can use the 
-lsdef command to check the postscript order. 
+To set the postscripts attribute of the node (or group)
+definition you can use the xCAT chdef command. Set the value to
+be a comma separated list of the scripts that you want to be
+executed on the nodes. The order of the scripts in the list
+determines the order in which they will be run.  You can use the
+lsdef command to check the postscript order.
 
 Scripts can  be run on both diskless and diskful nodes.
 
-To run all the customization scripts that have been designated 
+To run all the customization scripts that have been designated
 for the nodes, (in the "postscripts and postbootscripts" attributes), type:
 
   updatenode <noderange> -P
@@ -166,15 +166,15 @@ To run a list of scripts, type:
 
   updatenode <noderange> -P "script1 p1 p2,script2"
 
-where p1 p2 are the parameters for script1. 
+where p1 p2 are the parameters for script1.
 
 The flag '-P' can be omitted when only scripts names  are
 specified.
 
-Note: script1,script2 may or may not be designated as scripts to 
-automatically run on the node. However, if you want script1 and 
-script2 to get invoked next time the nodes are deployed then make sure 
-to add them to the "postscripts/postbootscripts" attribute in the database for the nodes. 
+Note: script1,script2 may or may not be designated as scripts to
+automatically run on the node. However, if you want script1 and
+script2 to get invoked next time the nodes are deployed then make sure
+to add them to the "postscripts/postbootscripts" attribute in the database for the nodes.
 
 =head2 Update security
 
@@ -224,7 +224,7 @@ the ssl connections between the xCAT client and xcatd on the service node,
 and the xcatd's between service node and management node. The files in the
 directories /etc/xcat/cert/ and ~/.xcat/ will be updated.
 
-Since the certificates have the validity time, the ntp service is recommended 
+Since the certificates have the validity time, the ntp service is recommended
 to be set up between management node and service node.
 
 Simply running following command to update the security keys:
@@ -240,16 +240,16 @@ Simply running following command to update the security keys:
 
 A set of comma delimited xCAT node names
 and/or group names. See the xCAT "noderange"
-man page for details on additional supported 
+man page for details on additional supported
 formats.
 
 =item I<script1,script2...>
 
-A comma-separated list of script names. 
-The scripts must be executable and copied 
+A comma-separated list of script names.
+The scripts must be executable and copied
 to the /install/postscripts directory.
 Each script can take zero or more parameters.
-If parameters are specified, the whole list needs to be quoted by double quotes. 
+If parameters are specified, the whole list needs to be quoted by double quotes.
 For example:
 
  "script1 p1 p2,script2"
@@ -258,7 +258,7 @@ For example:
 
 Specifies one or more "attribute equals value" pairs, separated by spaces.
 Attr=val pairs must be specified last on the command line.  The currently
-supported attributes are: "installp_bundle", "otherpkgs", "installp_flags", 
+supported attributes are: "installp_bundle", "otherpkgs", "installp_flags",
 "emgr_flags" and "rpm_flags".  These attributes are only valid for AIX software
 maintenance support.
 
@@ -290,7 +290,7 @@ Used to specify a source directory other than the standard lpp_source directory
 
 Specifies that file synchronization should be
 performed on the nodes.  rsync/scp and ssh must
-be installed and configured on the nodes. 
+be installed and configured on the nodes.
 The function is not supported for NFS-based statelite installations.
 For NFS-based statelite installations to sync files, you should use the
 read-only option for files/directories listed in
@@ -319,7 +319,7 @@ litefile table with source location specified in the litetree table.
 
 =item [B<-r>|B<--node-rcp> [I<full_path_to_remote_copy_command>]]
 
-Specifies  the  full  path of the remote copy command used for syncing files to node targets, such as "/usr/bin/rsync" or "/usr/bin/scp". If not specified, rsync will be used by default. 
+Specifies  the  full  path of the remote copy command used for syncing files to node targets, such as "/usr/bin/rsync" or "/usr/bin/scp". If not specified, rsync will be used by default.
 
 Notice: The synclist for "-r /usr/bin/scp" has some differences with "-r /usr/bin/rsync":
 
@@ -344,23 +344,23 @@ Display usage message.
 
 Update the ssh keys and host keys for the service nodes and compute nodes;
 Update the ca and credentials to the service nodes.  Never run this command to the Management Node, it will take down xcatd.
-You must be running updatenode as root to use the -k flag. 
+You must be running updatenode as root to use the -k flag.
 
 =item B<-l>|B<--user> I<user_ID>
 
-Specifies a non-root user name to use for remote command execution. This option is only available when running postscripts (-P) for 
-AIX and Linux and updating software (-S) for Linux only. 
-The non-root userid  must be previously defined as an xCAT user. 
+Specifies a non-root user name to use for remote command execution. This option is only available when running postscripts (-P) for
+AIX and Linux and updating software (-S) for Linux only.
+The non-root userid  must be previously defined as an xCAT user.
 The userid sudo setup will have to be done by the admin on the node.
-This is not supported in a hierarchical cluster, that is the node is serviced by a service node. 
-See the document Granting_Users_xCAT_privileges for required xcat/sudo setup. 
+This is not supported in a hierarchical cluster, that is the node is serviced by a service node.
+See the document Granting_Users_xCAT_privileges for required xcat/sudo setup.
 
 
 =item B<-P|--scripts>
 
-Specifies that postscripts and postbootscripts should be run on the nodes. 
+Specifies that postscripts and postbootscripts should be run on the nodes.
 updatenode -P syncfiles is not supported.  The syncfiles postscript can only
-be run during install.  You should use updatenode <noderange> -F instead. 
+be run during install.  You should use updatenode <noderange> -F instead.
 
 =item B<-S|--sw>
 
@@ -377,7 +377,7 @@ Set the server information stored on the nodes in /opt/xcat/xcatinfo on Linux.
 =item B<-t> I<timeout>
 
 Specifies a timeout in seconds the command will wait for the remote targets to complete. If timeout is not specified
-it will wait indefinitely. updatenode -k is the exception that has a timeout of 10 seconds, unless overridden by this flag.  
+it will wait indefinitely. updatenode -k is the exception that has a timeout of 10 seconds, unless overridden by this flag.
 
 =item B<-v|--version>
 
@@ -405,10 +405,10 @@ To perform all updatenode features for the Linux nodes in the group "compute":
 
  updatenode compute
 
-The command will: run any scripts listed in the nodes "postscripts and postbootscripts" 
-attribute, install or update any software indicated in the 
-/install/custom/install/<ostype>/profile.otherpkgs.pkglist (refer to the 
-B<To install or update software part>), synchronize any files indicated by 
+The command will: run any scripts listed in the nodes "postscripts and postbootscripts"
+attribute, install or update any software indicated in the
+/install/custom/install/<ostype>/profile.otherpkgs.pkglist (refer to the
+B<To install or update software part>), synchronize any files indicated by
 the synclist files specified in the osimage "synclists" attribute.
 
 =item 2.
@@ -417,7 +417,7 @@ To run postscripts,postbootscripts and file synchronization only on the node "cl
  updatenode clstrn01 -F -P
 
 =item 3.
-Running updatenode -P with the syncfiles postscript is not supported. You should use updatenode -F instead. 
+Running updatenode -P with the syncfiles postscript is not supported. You should use updatenode -F instead.
 
 Do not run:
 
@@ -439,26 +439,26 @@ To run the postscripts script1 and script2 on the node "clstrn01":
 
  updatenode clstrn01 -P "script1 p1 p2,script2"
 
-Since flag '-P' can be omitted when only script names are specified, 
+Since flag '-P' can be omitted when only script names are specified,
 the following command is equivalent:
 
  updatenode clstrn01 "script1 p1 p2,script2"
 
-p1 p2 are parameters for script1. 
- 
+p1 p2 are parameters for script1.
+
 
 =item 6.
-To synchronize the files on the node "clstrn01":  Prepare the synclist file. 
-For AIX, set the full path of synclist in the osimage table synclists 
-attribute. For Linux, put the synclist file into the location: 
+To synchronize the files on the node "clstrn01":  Prepare the synclist file.
+For AIX, set the full path of synclist in the osimage table synclists
+attribute. For Linux, put the synclist file into the location:
 /install/custom/<inst_type>/<distro>/<profile>.<os>.<arch>.synclist
 Then:
 
  updatenode clstrn01 -F
 
 =item 7.
-To perform the software update on the Linux node "clstrn01":  Copy the extra 
-rpm into the /install/post/otherpkgs/<os>/<arch>/* and add the rpm names into 
+To perform the software update on the Linux node "clstrn01":  Copy the extra
+rpm into the /install/post/otherpkgs/<os>/<arch>/* and add the rpm names into
 the /install/custom/install/<ostype>/profile.otherpkgs.pkglist .  Then:
 
  updatenode clstrn01 -S
@@ -469,12 +469,12 @@ To update the AIX node named "xcatn11" using the "installp_bundle" and/or
 
  updatenode xcatn11 -V -S
 
-Note: The xCAT "xcatn11" node definition points to an xCAT osimage definition 
+Note: The xCAT "xcatn11" node definition points to an xCAT osimage definition
 which contains the "installp_bundle" and "otherpkgs" attributes as well as
 the name of the NIM lpp_source resource.
 
 =item 9.
-To update the AIX node "xcatn11" by installing the "bos.cpr" fileset using 
+To update the AIX node "xcatn11" by installing the "bos.cpr" fileset using
 the "-agQXY" installp flags.  Also display the output of the installp command.
 
  updatenode xcatn11 -V -S otherpkgs="I:bos.cpr" installp_flags="-agQXY"
@@ -539,7 +539,7 @@ To update the security keys for the node "node01"
  updatenode node01 -k
 
 =item 20.
-To update the service nodes with the files to be synchronized to node group compute: 
+To update the service nodes with the files to be synchronized to node group compute:
 
  updatenode compute -f
 
diff --git a/xCAT-client/pods/man1/xCATWorld.1.pod b/xCAT-client/pods/man1/xCATWorld.1.pod
index e17e823fa..e7ebef2af 100644
--- a/xCAT-client/pods/man1/xCATWorld.1.pod
+++ b/xCAT-client/pods/man1/xCATWorld.1.pod
@@ -1,15 +1,15 @@
 =head1 NAME
- 
-B<xCATWorld> - Sample client program for xCAT.  
- 
+
+B<xCATWorld> - Sample client program for xCAT.
+
 =head1 SYNOPSIS
- 
+
 B<xCATWorld> I<noderange>
 
 =head1 DESCRIPTION
 
-The xCATWorld program gives you a sample client program that interfaces to the /opt/xcat/lib/perl/xCAT_plugin/xCATWorld.pm plugin.  
-For debugging purposes we have an Environment Variable XCATBYPASS.  If export XCATBYPASS=yes, the client will call the plugin without going through the xcat daemon, xcatd. 
+The xCATWorld program gives you a sample client program that interfaces to the /opt/xcat/lib/perl/xCAT_plugin/xCATWorld.pm plugin.
+For debugging purposes we have an Environment Variable XCATBYPASS.  If export XCATBYPASS=yes, the client will call the plugin without going through the xcat daemon, xcatd.
 
 =head1 OPTIONS
 
@@ -19,12 +19,12 @@ For debugging purposes we have an Environment Variable XCATBYPASS.  If export XC
 
 =head1 EXAMPLES
 
-1.To run , enter: 
+1.To run , enter:
 
  xCATWorld nodegrp1
 
 =head1 FILES
- 
+
 /opt/xcat/bin/xCATWorld
 
 
@@ -33,4 +33,4 @@ For debugging purposes we have an Environment Variable XCATBYPASS.  If export XC
 This command is part of the xCAT software product.
 
 
- 
+
diff --git a/xCAT-client/pods/man1/xcat2nim.1.pod b/xCAT-client/pods/man1/xcat2nim.1.pod
index 318aad0df..d525912e0 100644
--- a/xCAT-client/pods/man1/xcat2nim.1.pod
+++ b/xCAT-client/pods/man1/xcat2nim.1.pod
@@ -1,6 +1,6 @@
 =head1 NAME
 
-B<xcat2nim> - Use this command to create and manage AIX NIM definitions based on xCAT node, group and network object definitions.  
+B<xcat2nim> - Use this command to create and manage AIX NIM definitions based on xCAT node, group and network object definitions.
 
 =head1 SYNOPSIS
 
@@ -28,19 +28,19 @@ If the object type you are creating is a node then the object names can be a nod
 
 If you are using xCAT service nodes the B<xcat2nim> command will automatically determine the correct server for the node and create the NIM definitions on that server.
 
-The B<xcat2nim> command support for NIM networks is limited to creating and listing.  
+The B<xcat2nim> command support for NIM networks is limited to creating and listing.
 
 When creating network definitions the command will check to make sure the network definition (or it's equivalent) does not exist and then create the required NIM network, route and interface definitions.  In some cases the equivalent network definition may exist using a different name.  In this case a new definition WILL NOT be created.
 
-To list the NIM definitions that were created you must specify the "list" option and the names of the xCAT objects that were used to create the NIM definitions.  The B<xcat2nim> command will list the corresponding NIM machine, machine group or network definitions using the "lsnim -l" command.  
+To list the NIM definitions that were created you must specify the "list" option and the names of the xCAT objects that were used to create the NIM definitions.  The B<xcat2nim> command will list the corresponding NIM machine, machine group or network definitions using the "lsnim -l" command.
 
-To remove NIM definitions you must specify the "remove" option and the names of the xCAT objects that were used to create the NIM definitions.  
+To remove NIM definitions you must specify the "remove" option and the names of the xCAT objects that were used to create the NIM definitions.
 
 The remove("-r"), force("-f") and update("-u") options are not supported for NIM network definitions.
 
 =head1 OPTIONS
 
-B<-a|--all>             The list of objects will include all xCAT node, group and network objects.  
+B<-a|--all>             The list of objects will include all xCAT node, group and network objects.
 
 I<attr=val [attr=val ...]>  Specifies one or more "attribute equals value" pairs, separated by spaces. Attr=val pairs must be specified last on the command line.  The attribute names must correspond to the attributes supported by the relevant NIM commands.  When providing attr=val pairs on the command line you must not specify more than one object type.
 
@@ -60,7 +60,7 @@ B<-r|--remove>         Remove NIM definitions corresponding to xCAT definitions.
 
 B<-t> I<object-types>       A set of comma delimited xCAT object types. Supported types include: node, group, and network.
 
-Note: If the object type is "group", it means that the B<xcat2nim> command will operate on a NIM machine group definition corresponding to the xCAT node group definition. Before creating a NIM machine group, all the NIM client nodes definition must have been created. 
+Note: If the object type is "group", it means that the B<xcat2nim> command will operate on a NIM machine group definition corresponding to the xCAT node group definition. Before creating a NIM machine group, all the NIM client nodes definition must have been created.
 
 B<-u|--update>        Update existing NIM definitions based on xCAT definitions.
 
diff --git a/xCAT-client/pods/man1/xcatchroot.1.pod b/xCAT-client/pods/man1/xcatchroot.1.pod
index 5d149a47c..d899a82e1 100644
--- a/xCAT-client/pods/man1/xcatchroot.1.pod
+++ b/xCAT-client/pods/man1/xcatchroot.1.pod
@@ -10,7 +10,7 @@ B<xcatchroot [-V] -i> I<osimage_name cmd_string>
 
 =head1 DESCRIPTION
 
-For AIX diskless images this command will modify the AIX SPOT resource using 
+For AIX diskless images this command will modify the AIX SPOT resource using
 the chroot command.  You must include the name of an xCAT osimage
 definition and the command that you wish to have run in the spot.
 
@@ -36,30 +36,30 @@ check operation on the spot.
 
 =back
 
-The xcatchroot command will take care of any of the required setup so that 
+The xcatchroot command will take care of any of the required setup so that
 the command you provide will be able to run in the spot chroot environment.
 It will also mount the lpp_source resource listed in the osimage definition
 so that you can access additional software that you may wish to install.
 
-For example, assume that the location of the spot named in the xCAT osimage 
+For example, assume that the location of the spot named in the xCAT osimage
 definition is /install/nim/spot/614spot/usr. The associated root directory in
 this spot would be /install/nim/spot/614spot/usr/lpp/bos/inst_root.  The chroot
-is automatically done to this new root directory.  The spot location is 
+is automatically done to this new root directory.  The spot location is
 mounted on /.../inst_root/usr so that when your command is run in the chroot
 environment it is actually running commands from the spot usr location.
 
-Also, the location of the lpp_source resource specified in the osimage 
+Also, the location of the lpp_source resource specified in the osimage
 definition will be mounted to a subdirectory of the spot /.../inst_root
-directory.  For example, if the lpp_source location is 
+directory.  For example, if the lpp_source location is
 /install/nim/lpp_source/614lpp_lpp_source then that would be mounted over
-/install/nim/spot/614spot/usr/lpp/bos/inst_root/lpp_source.  
+/install/nim/spot/614spot/usr/lpp/bos/inst_root/lpp_source.
 
 When you provide a command string to run make sure you give the full paths
 of all commands and files assuming the /.../inst_root directory is you root
-directory.  
+directory.
 
 If you wish to install software from the lpp_source location you would
-provide a directory location of /lpp_source (or /lpp_source/installp/ppc 
+provide a directory location of /lpp_source (or /lpp_source/installp/ppc
 or /lpp_source/RPMS/ppc etc.) See the example below.
 
 Always run the NIM check operation after you are done updating your spot.
@@ -67,11 +67,11 @@ Always run the NIM check operation after you are done updating your spot.
 
 =head1 OPTIONS
 
-=over 10 
+=over 10
 
 =item I<cmd_string>
 
-The command you wish to have run in the chroot environment.  (Use a quoted 
+The command you wish to have run in the chroot environment.  (Use a quoted
 string.)
 
 =item B<-h |--help>
@@ -80,7 +80,7 @@ Display usage message.
 
 =item B<-i> I<osimage_name>
 
-The name of the xCAT osimage definition. 
+The name of the xCAT osimage definition.
 
 =item B<-V |--verbose>
 
@@ -102,7 +102,7 @@ An error has occurred.
 
 =head1 EXAMPLES
 
-1) Set the root password to "cluster" in the spot so that when the diskless 
+1) Set the root password to "cluster" in the spot so that when the diskless
 node boots it will have a root password set.
 
  xcatchroot -i 614spot "/usr/bin/echo root:cluster | /usr/bin/chpasswd -c"
diff --git a/xCAT-client/pods/man1/xdcp.1.pod b/xCAT-client/pods/man1/xdcp.1.pod
index ff967abbb..2495b6431 100644
--- a/xCAT-client/pods/man1/xdcp.1.pod
+++ b/xCAT-client/pods/man1/xdcp.1.pod
@@ -6,12 +6,12 @@ B<xdcp> - Concurrently copies files to or from multiple nodes. In addition, prov
 
 B<xdcp> I<noderange>  [[B<-B> | B<--bypass>] [B<-f> I<fanout>] [B<-L>]  [B<-l>  I<userID>] [B<-o> I<node_options>] [B<-p>] [B<-P>] [B<-r> I<node_remote_shell>] [B<-R>] [B<-t> I<timeout>] [B<-T>] [B<-v>] [B<-q>] [B<-X> I<env_list>] I<sourcefile.... targetpath>
 
-B<xdcp> I<noderange>  [B<-F> I<rsync input file>] 
+B<xdcp> I<noderange>  [B<-F> I<rsync input file>]
 
-B<xdcp> I<computenoderange>  [B<-s> B<-F> I<rsync input file>] 
+B<xdcp> I<computenoderange>  [B<-s> B<-F> I<rsync input file>]
 
 
-B<xdcp> [B<-i> I<path to install image>] [B<-F> I<rsync input file>] 
+B<xdcp> [B<-i> I<path to install image>] [B<-F> I<rsync input file>]
 
 
 B<xdcp> [B<-h> | B<-V> | B<-q>]
@@ -22,11 +22,11 @@ B<xdcp> [B<-h> | B<-V> | B<-q>]
 The B<xdcp> command concurrently copies files  to  or  from  remote  target
 nodes. The command issues a remote copy command for each node or device specified. When files are  pulled  from a target,  they  are  placed  into  the  target_path with the name of the
 remote node or device appended to  the  copied  source_file  name.  The
-/usr/bin/rcp command is the model for syntax and security. 
+/usr/bin/rcp command is the model for syntax and security.
 If using hierarchy, then xdcp runs on the service node that is servicing the compute node. The file will first be copied to the path defined in the site table, SNsyncfiledir attribute, or the default path /var/xcat/syncfiles on the service node, if the attribute is not defined. The -P flag will not automatically copy
 the files from the compute node to the Management node, hierarchically.  There
-is a two step process, see B<-P> flag.  
-If the Management Node is target node, it must be defined in the xCAT database with nodetype=mn. When the B<xdcp> command runs the Management Node as the target, it does not use remote commands but uses the local OS copy (B<cp>) command. 
+is a two step process, see B<-P> flag.
+If the Management Node is target node, it must be defined in the xCAT database with nodetype=mn. When the B<xdcp> command runs the Management Node as the target, it does not use remote commands but uses the local OS copy (B<cp>) command.
 
 B<REMOTE> B<USER>:
 
@@ -86,7 +86,7 @@ file to on the target. If multiple source_file files, it specifies
 the directory to copy the source_file files to on the target.
 If the -P flag is specified, the target_path is the local host location
 for the copied files.  The remote file directory structure is recreated
-under target_path and  the  remote  target  name  is  appended 
+under target_path and  the  remote  target  name  is  appended
 to  the   copied source_file name in the target_path directory.
 Note: the targetpath directory must exist.
 
@@ -98,12 +98,12 @@ Runs in bypass mode, use if the xcatd daemon is hung.
 
 Specifies a fanout value for the maximum number of  concur-
 rently  executing  remote shell processes. Serial execution
-can be specified by indicating a fanout value of B<1>.  
+can be specified by indicating a fanout value of B<1>.
 If B<-f> is not specified, a default fanout value of B<64> is used.
 
 =item B<-F>|B<--File> I<rsync input file>
 
-Specifies the path to the file that will be used to  
+Specifies the path to the file that will be used to
 build the B<rsync> command.
 The format of the input file is as follows, each line contains:
 
@@ -131,16 +131,16 @@ For example:
 
 B<Running postscripts after files are sync'd to the nodes>:
 
-After you define the files to rsync, you can add an B<EXECUTE:> clause in the synclist file. The B<EXECUTE:> clause will list all the postscripts that you would like to run after the files are sync'd to the node. 
+After you define the files to rsync, you can add an B<EXECUTE:> clause in the synclist file. The B<EXECUTE:> clause will list all the postscripts that you would like to run after the files are sync'd to the node.
 The postscript file must be of the form B<filename.post>, where the <filename>
 is the <filename> is the from <filename>, reside in the same
 directory as B<filename>, and be executable.
 If the file B<filename> is rsync'd to the node, then the B<filename.post>
 will automatically be run on the node.
-If the file B<filename> is not updated on the node,  the B<filename.post> will not be run.  
+If the file B<filename> is not updated on the node,  the B<filename.post> will not be run.
 
 Putting the B<filename.post> in the file list to rsync to the node is required
-for hierarchical clusters.  It is optional for non-hierarchical clusters. 
+for hierarchical clusters.  It is optional for non-hierarchical clusters.
 
 Another option is the B<EXECUTEALWAYS:> clause in the synclist file.  The B<EXECUTEALWAYS:> will list all the postscripts that you would like to run after the files are sync'd to the nodes.   These scripts will run whether or not any files are sync'd to the nodes.  The scripts have no special format, but must contain the fully qualified path.
 
@@ -160,11 +160,11 @@ For example, your rsynclist file may look like this:
  EXECUTEALWAYS:
  /tmp/myscript
 
-If /tmp/file2 and /tmp/file3  update /tmp/file2 and /tmp/filex on the node, then the postscripts /tmp/file2.post and /tmp/file3.post are automatically run on 
-the node. /tmp/myscript will always be run on the node. 
+If /tmp/file2 and /tmp/file3  update /tmp/file2 and /tmp/filex on the node, then the postscripts /tmp/file2.post and /tmp/file3.post are automatically run on
+the node. /tmp/myscript will always be run on the node.
 
 
-Another option is the B<APPEND:> clause in the synclist file. The B<APPEND:> clause is used to append the contents of the input file to an existing file on the node.  The file to append B<must> already exist on the node and not be part of the synclist that contains the B<APPEND:> clause. 
+Another option is the B<APPEND:> clause in the synclist file. The B<APPEND:> clause is used to append the contents of the input file to an existing file on the node.  The file to append B<must> already exist on the node and not be part of the synclist that contains the B<APPEND:> clause.
 
 For example, your rsynclist file may look like this:
 
@@ -183,9 +183,9 @@ For example, your rsynclist file may look like this:
  /etc/myappenddir/appendfile -> /etc/mysetup/setup
  /etc/myappenddir/appendfile2 -> /etc/mysetup/setup2
 
-When you use the append script,  the file  (left) of the arrow is appended to the file right of the arrow.  In this example, /etc/myappenddir/appendfile is appended to /etc/mysetup/setup file, which must already exist on the node. The /opt/xcat/share/xcat/scripts/xdcpappend.sh is used to accomplish this. 
+When you use the append script,  the file  (left) of the arrow is appended to the file right of the arrow.  In this example, /etc/myappenddir/appendfile is appended to /etc/mysetup/setup file, which must already exist on the node. The /opt/xcat/share/xcat/scripts/xdcpappend.sh is used to accomplish this.
 
-Another option is the B<MERGE:> clause in the synclist file. The B<MERGE:> clause is used to append the contents of the input file to /etc/passwd, /etc/group, or /etc/shadow on a Linux node.  It is only supported for those files and only on Linux. You must not use both the APPEND and MERGE funcion for these three files. The processing could end up not creating the file you desire. The MERGE function is the preferred method, becuase APPEND only adds to the file.  MERGE will add to the file but also insure there are no duplicate entries.   
+Another option is the B<MERGE:> clause in the synclist file. The B<MERGE:> clause is used to append the contents of the input file to /etc/passwd, /etc/group, or /etc/shadow on a Linux node.  It is only supported for those files and only on Linux. You must not use both the APPEND and MERGE funcion for these three files. The processing could end up not creating the file you desire. The MERGE function is the preferred method, becuase APPEND only adds to the file.  MERGE will add to the file but also insure there are no duplicate entries.
 
 For example, your rsynclist file may look like this:
  /tmp/share/file2  ->  /tmp/file2
@@ -204,7 +204,7 @@ For example, your rsynclist file may look like this:
  /custom/mygroups -> /etc/group
  /custom/myshadow -> /etc/shadow
 
-Note: no order can be assumed by the order that the EXECUTE,EXECUTEALWAYS and APPEND clause fall in the synclist file. 
+Note: no order can be assumed by the order that the EXECUTE,EXECUTEALWAYS and APPEND clause fall in the synclist file.
 
 For more information on syncing files to node, read Sync-ing_Config_Files_to_Nodes
 
@@ -243,8 +243,8 @@ them. When the B<-P> flag is used with the B<-R> flag,  ._target  is
 appended to the directory. Only one file per invocation of the
 xdcp pull command can be pulled from the specified  targets.
 Hierarchy is not automatically support yet.   You must first pull
-the file to the Service Node and then pull the file to the Management 
-node. 
+the file to the Service Node and then pull the file to the Management
+node.
 
 =item B<-q>|B<--show-config>
 
@@ -275,13 +275,13 @@ parameter.
 Will only sync the files listed in the synclist (B<-F>), to the service
 nodes for the input compute node list. The files will be placed in the
 directory defined by the site.SNsyncfiledir attribute, or the default
-/var/xcat/syncfiles directory. 
+/var/xcat/syncfiles directory.
 
 =item B<-t>|B<--timeout> I<timeout>
 
 Specifies the time, in seconds, to wait for output from any
 currently executing remote targets. If no output is
-available  from  any  target in the specified I<timeout>, 
+available  from  any  target in the specified I<timeout>,
 B<xdsh> displays an error and terminates execution for the remote
 targets  that  failed to respond. If I<timeout> is not specified,
 B<xdsh> waits indefinitely to continue processing output  from
@@ -298,7 +298,7 @@ messages to standard output during execution to each target.
 
 Verifies each target before executing any  remote  commands
 on  the target. If a target is not responding, execution of
-remote commands for the target is canceled. 
+remote commands for the target is canceled.
 
 =item B<-V>|B<--version>
 
@@ -380,7 +380,7 @@ get is bypassed.
 The xdcp command exit code is 0, if  the  xdcp  command  executed  without
 errors  and  all remote copy commands finished with exit codes of 0. If
 internal xdcp errors occur or the remote copy commands do  not  complete
-successfully,  the xdcp  command exit value is greater than 0.  
+successfully,  the xdcp  command exit value is greater than 0.
 
 
 
@@ -442,7 +442,7 @@ in the cluster, enter:
  xdcp all /tmp/testdir/* /tmp/testdir
 
 =item 6.
-To copy all the files in /tmp/testdir and it's subdirectories 
+To copy all the files in /tmp/testdir and it's subdirectories
 from the local host to node1 in the cluster, enter:
 
  xdcp node1 -R /tmp/testdir /tmp/testdir
@@ -454,7 +454,7 @@ To copy the /etc/hosts  file  from  node1  and  node2  to the
  xdcp node1,node2 -P /etc/hosts /tmp/hosts.dir
 
 =item 8.
-To rsync the /etc/hosts file to your compute nodes: 
+To rsync the /etc/hosts file to your compute nodes:
 
 Create a rsync file /tmp/myrsync, with this line:
 
@@ -470,11 +470,11 @@ Run:
 
 =item 9.
 
-To rsync all the files in /home/mikev to the  compute nodes: 
+To rsync all the files in /home/mikev to the  compute nodes:
 
 Create a rsync file /tmp/myrsync, with this line:
 
-/home/mikev/* -> /home/mikev/      (last / is required) 
+/home/mikev/* -> /home/mikev/      (last / is required)
 
 Run:
 
@@ -483,13 +483,13 @@ Run:
 =item 10.
 To rsync to the compute nodes, using service nodes, the command will first
 rsync the files to the  /var/xcat/syncfiles directory on the service nodes and then rsync the files from that directory to the compute nodes. The /var/xcat/syncfiles default directory on the service nodes, can be changed by putting a directory value in the site table SNsyncfiledir attribute.
- 
+
 
 Create a rsync file /tmp/myrsync, with this line:
 
 /etc/hosts /etc/passwd -> /etc
 
-or 
+or
 
 /etc/hosts /etc/passwd -> /etc/
 
@@ -501,7 +501,7 @@ to update the Compute Nodes
 
 =item 11.
 To rsync to the service nodes in preparation for rsyncing the compute nodes
-during an install from the service node.  
+during an install from the service node.
 
 Create a rsync file /tmp/myrsync, with this line:
 
@@ -511,10 +511,10 @@ Run:
 
  xdcp compute -s -F /tmp/myrsync
 
-to sync the service node for compute 
+to sync the service node for compute
 
 =item 12.
-To rsync the /etc/file1 and file2 to your compute nodes and rename to  filex and filey: 
+To rsync the /etc/file1 and file2 to your compute nodes and rename to  filex and filey:
 
 Create a rsync file /tmp/myrsync, with these line:
 
@@ -540,7 +540,7 @@ Run:
  xdcp -i /install/netboot/fedora9/x86_64/compute/rootimg -F /tmp/myrsync
 
 =item 14.
-To define the Management Node in the database so you can use xdcp, run 
+To define the Management Node in the database so you can use xdcp, run
 
  xcatconfig -m
 
diff --git a/xCAT-client/pods/man1/xdsh.1.pod b/xCAT-client/pods/man1/xdsh.1.pod
index 38596e793..269a51446 100644
--- a/xCAT-client/pods/man1/xdsh.1.pod
+++ b/xCAT-client/pods/man1/xdsh.1.pod
@@ -8,13 +8,13 @@ B<xdsh> I<noderange> [B<-B> | B<--bypass>]  [B<--devicetype> I<type_of_device>]
 [B<-L>]  [B<-l>  I<userID>] [B<-m>] [B<-o> I<node_options>] [B<-Q>] [B<-r> I<node_remote_shell>] [B<-s>] [B<-S> {B<csh>|B<ksh>}] [B<-t> I<timeout>]
 [B<-T>] [B<-v>] [B<-X> I<env_list>] [B<-z>] [B<--sudo>] I<command_list>
 
-B<xdsh> I<noderange>  [B<-K>] 
+B<xdsh> I<noderange>  [B<-K>]
 
-B<xdsh> I<noderange>  [B<-K>] [B<-l>  I<userID>] B<--devicetype> I<type_of_device> 
+B<xdsh> I<noderange>  [B<-K>] [B<-l>  I<userID>] B<--devicetype> I<type_of_device>
 
 B<xdsh> [B<-i> I<image path | nim image name>] I<command_list>
 
-B<xdsh> I<noderange>  [B<-c>] 
+B<xdsh> I<noderange>  [B<-c>]
 
 B<xdsh> [B<-h> | B<-V> | B<-q>]
 
@@ -24,7 +24,7 @@ The B<xdsh> command runs commands in parallel on remote nodes and/or the Managem
 remote shell command for each target specified, and returns the output
 from all targets,
 formatted so that command results  from  all  nodes  can  be  managed.
-If the command is to be executed  on the Management Node, it does not use a remote shell command, but uses the local OS copy or shell command. The Management Node must be defined in the xCAT database. The best way to do this is to use the xcatconfig -m option. 
+If the command is to be executed  on the Management Node, it does not use a remote shell command, but uses the local OS copy or shell command. The Management Node must be defined in the xCAT database. The best way to do this is to use the xcatconfig -m option.
 The B<xdsh> command is an xCAT Distributed Shell Utility.
 
 
@@ -109,7 +109,7 @@ A timeout value for remote command execution can be specified with  the
 B<-t>  flag  or  with  the B<DSH_TIMEOUT> environment variable. If any remote
 target does not provide output to either standard  output  or  standard
 error  within  the  timeout  value,  B<xdsh> displays an error message and
-exits. 
+exits.
 
 If streaming mode is specified with the B<-s> flag, output is returned  as
 it  becomes available from each target, instead of waiting for the
@@ -131,7 +131,7 @@ executed on the remote targets are displayed.
 
 No error detection  or recovery mechanism is provided for remote
 targets. The B<xdsh> command output to standard error and standard output can
-be analyzed to determine the appropriate course of action. 
+be analyzed to determine the appropriate course of action.
 
 B<COMMAND> B<OUTPUT>:
 
@@ -175,13 +175,13 @@ Runs in bypass mode, use if the xcatd daemon is hung.
 =item B<-c>|B<--cleanup>
 
 This flag will have xdsh remove all files from the subdirectories of the
-the directory on the servicenodes, where xdcp stages the copy to the 
+the directory on the servicenodes, where xdcp stages the copy to the
 compute nodes as defined in the site table SNsyncfiledir and nodesyncfiledir
-attribute, when the target is a service node. 
+attribute, when the target is a service node.
 
-It can also be used to remove the nodesyncfiledir directory on the compute 
+It can also be used to remove the nodesyncfiledir directory on the compute
 nodes, which keeps the backup copies of files for the xdcp APPEND function
-support, if a compute node is the target. 
+support, if a compute node is the target.
 
 =item B<-e>|B<--execute>
 
@@ -196,7 +196,7 @@ command to use to copy the script file to node targets.
 
 Specifies that the  I<environment_file>  contains  environment
 variable definitions to export to the target before
-executing the  I<command_list>. 
+executing the  I<command_list>.
 
 =item B<--devicetype> I<type_of_device>
 
@@ -204,14 +204,14 @@ Specify a user-defined device type that references the location
 of relevant device configuration file. The devicetype value must
 correspond to a valid device configuration file.
 xCAT ships some default configuration files
-for Ethernet switches and and IB switches under 
+for Ethernet switches and and IB switches under
 I</opt/xcat/share/xcat/devicetype> directory. If you want to overwrite
 any of the configuration files, copy them to I</var/opt/xcat/>
-directory and cutomize. 
+directory and cutomize.
 For example, I<base/IBSwitch/Qlogic/config> is the configuration
 file location if devicetype is specified as IBSwitch::Qlogic.
-xCAT will first search config file using I</var/opt/xcat/> as the base. 
-If not found, it will search for it using  
+xCAT will first search config file using I</var/opt/xcat/> as the base.
+If not found, it will search for it using
 I</opt/xcat/share/xcat/devicetype/> as the base.
 
 =item B<-f>|B<--fanout> I<fanout_value>
@@ -226,16 +226,16 @@ Displays usage information.
 =item B<-i>|B<--rootimg> I<install image>
 
 For Linux, Specifies the path to the install image on the local node.
-For AIX, specifies the name of the osimage on the local node. Run lsnim 
+For AIX, specifies the name of the osimage on the local node. Run lsnim
 for valid names.
 xdsh will chroot (xcatchroot for AIX) to this path and run the xdsh command against the
-install image.  No other xdsh flags, environment variables apply with 
-this input.  A noderange is not accepted. Only runs on the local host, 
-normally the Management Node. The command you run must not prompt for input, the prompt will not be returned to you, and it will appear that B<xdsh> hangs. 
+install image.  No other xdsh flags, environment variables apply with
+this input.  A noderange is not accepted. Only runs on the local host,
+normally the Management Node. The command you run must not prompt for input, the prompt will not be returned to you, and it will appear that B<xdsh> hangs.
 
 =item B<-K>|B<--ssh-setup>
 
-=item B<-K>|B<--ssh-setup>  B<-l>|B<--user> I<user_ID> B<--devicetype> I<type_of_device> 
+=item B<-K>|B<--ssh-setup>  B<-l>|B<--user> I<user_ID> B<--devicetype> I<type_of_device>
 
 Set up the SSH keys for the user running the command to the specified node list.
 The userid must have the same uid, gid and password as the userid on the node
@@ -247,9 +247,9 @@ If the current user is non-root, the user must be in the policy table and have c
 The non-root users public ssh keys and root's public ssh keys will be put in
 the authorized_keys* files under the non-root users .ssh directory on the node(s).
 Other device types, such as IB switch, are also supported.  The
-device should be defined as a node and nodetype should be defined 
+device should be defined as a node and nodetype should be defined
 as switch before connecting.
-The B<xdsh -K> command must be run from the Management Node. 
+The B<xdsh -K> command must be run from the Management Node.
 
 =item B<-l>|B<--user> I<user_ID>
 
@@ -307,14 +307,14 @@ If not specified, the B<ksh> syntax is used.
 Adding the B<--sudo> flag to the xdsh command will have xdsh run sudo before
 running the command.  This is particular useful when using the B<-e> option.
 This is required when you input B<-l> with a non-root user id and want that id
-to be able to run as root on the node.  The non-root userid will must be 
+to be able to run as root on the node.  The non-root userid will must be
 previously defined as an xCAT user, see process for defining non-root ids in
-xCAT and setting up for using xdsh.  The userid sudo setup will have 
+xCAT and setting up for using xdsh.  The userid sudo setup will have
 to be done by the admin on the node.  This includes, allowing all commands that
 you would like to run with xdsh by using visudo to edit the /etc/sudoers file.
-You must disabl ssh tty requirements by commenting out or removing this line in the /etc/sudoes file "#Defaults    requiretty". 
+You must disabl ssh tty requirements by commenting out or removing this line in the /etc/sudoes file "#Defaults    requiretty".
 See the document Granting_Users_xCAT_privileges for sudo setup requirements.
-This is not supported in a hierarical cluster, that is the nodes are serviced by servicenodes. 
+This is not supported in a hierarical cluster, that is the nodes are serviced by servicenodes.
 
 =item B<-t>|B<--timeout> I<timeout>
 
@@ -324,8 +324,8 @@ available  from  any  target in the specified I<timeout>, B<xdsh>
 displays an error and terminates execution for the remote
 targets  that  failed to respond. If I<timeout> is not specified,
 B<xdsh> waits indefinitely to continue processing output  from
-all  remote  targets. The exception is the B<-K> flag which defaults 
-to 10 seconds. 
+all  remote  targets. The exception is the B<-K> flag which defaults
+to 10 seconds.
 
 =item B<-T>|B<--trace>
 
@@ -455,7 +455,7 @@ Verifies each target before executing any remote commands on the target. If a ta
 To provide backward compatibility for scripts written using B<dsh> in
 AIX and CSM, a tool has been provided B<groupfiles4dsh>,
 which will build node group files from the
-xCAT database that can be used by B<dsh>. See B<man groupfiles4dsh>. 
+xCAT database that can be used by B<dsh>. See B<man groupfiles4dsh>.
 
 =head1 B<SECURITY>
 
@@ -482,7 +482,7 @@ The B<xdsh> command exit code is 0 if the command executed without errors and al
 =over 3
 
 =item 1.
-To set up the SSH keys for root on node1, run as root: 
+To set up the SSH keys for root on node1, run as root:
 
  xdsh node1 -K
 
@@ -509,7 +509,7 @@ environment variable except the DSH_NODE_OPTS, enter:
  xdsh node1 -X `DSH_NODE_OPTS' ps
 
 =item 6.
-To run on Linux, the xdsh command "rpm -qa | grep xCAT" 
+To run on Linux, the xdsh command "rpm -qa | grep xCAT"
 on the service node fedora9 diskless image, enter:
 
  xdsh -i /install/netboot/fedora9/x86_64/service/rootimg "rpm -qa | grep xCAT"
@@ -520,13 +520,13 @@ To run on AIX, the xdsh command "lslpp -l | grep bos" on the NIM 611dskls spot,
  xdsh -i 611dskls "/usr/bin/lslpp -l | grep bos"
 
 =item 8.
-To cleanup the servicenode directory that stages the copy of files to the nodes, enter:  
+To cleanup the servicenode directory that stages the copy of files to the nodes, enter:
 
- xdsh servicenoderange -c  
+ xdsh servicenoderange -c
 
 =item 9.
 
-To define the QLogic IB switch as a node and to set up the SSH keys for IB switch 
+To define the QLogic IB switch as a node and to set up the SSH keys for IB switch
 B<qswitch> with device configuration file
 B</var/opt/xcat/IBSwitch/Qlogic/config> and user name B<username>, enter
 
@@ -540,7 +540,7 @@ To define the Management Node  in the database so you can use B<xdsh>, enter
  xcatconfig -m
 
 =item 11.
-To define the Mellanox switch as a node and run a command to show the ssh keys. 
+To define the Mellanox switch as a node and run a command to show the ssh keys.
 B<mswitch> with and user name B<username>, enter
 
  chdef -t node -o mswitch groups=all nodetype=switch
@@ -555,9 +555,9 @@ To define a BNT Ethernet switch as a node and run a command to create a new vlan
 
  tabch switch=myswitch switches.sshusername=admin switches.sshpassword=passw0rd switches.protocol=[ssh|telnet]
 
-where I<admin> and I<passw0rd> are the SSH user name and password for the switch. 
+where I<admin> and I<passw0rd> are the SSH user name and password for the switch.
 
-If it is for Telnet, add I<tn:> in front of the user name: I<tn:admin>. 
+If it is for Telnet, add I<tn:> in front of the user name: I<tn:admin>.
 
  dsh myswitch --devicetype EthSwitch::BNT 'enable;configure terminal;vlan 3;end;show vlan'
 
diff --git a/xCAT-client/pods/man3/noderange.3.pod b/xCAT-client/pods/man3/noderange.3.pod
index c2ef561b6..aa8a6a4b6 100644
--- a/xCAT-client/pods/man3/noderange.3.pod
+++ b/xCAT-client/pods/man3/noderange.3.pod
@@ -222,12 +222,12 @@ E.g. node2, node3, node20, node30, node21234 all match.
 
 =item 8.
 
-Generates  a  list of nodes which have the value hmc in the nodehm.cons 
-attribute. 
+Generates  a  list of nodes which have the value hmc in the nodehm.cons
+attribute.
 
  nodehm.cons==hmc
 
- nodehm.cons=~hmc 
+ nodehm.cons=~hmc
 
 =item 9.
 
diff --git a/xCAT-client/pods/man8/chtab.8.pod b/xCAT-client/pods/man8/chtab.8.pod
index eeb51824f..3c612649f 100644
--- a/xCAT-client/pods/man8/chtab.8.pod
+++ b/xCAT-client/pods/man8/chtab.8.pod
@@ -18,7 +18,7 @@ B<chtab -d> I<keycolname=keyvalue>[,I<keycolname=keyvalue>,...] I<tablename> [I<
 
 The B<chtab> command adds, deletes or updates the attribute values in the specified table.column for the specified I<keyvalue>.  Normally, the given value will completely replace the current attribute value.  But if "+=" is used instead of "=", the specified value will be appended to the comma separated list of attributes, if it is not already there.
 
-The B<chtab> does not pass through xcatd, so it is not controlled by the policy mechanism. 
+The B<chtab> does not pass through xcatd, so it is not controlled by the policy mechanism.
 
 =head1 OPTIONS
 
@@ -35,10 +35,10 @@ B<-d>          Delete option.
 
 =over 2
 
-=item 0. 
+=item 0.
 The command completed successfully.
 
-=item 1. 
+=item 1.
 An error has occurred.
 
 =back
@@ -47,7 +47,7 @@ An error has occurred.
 
 =over 2
 
-=item 1. 
+=item 1.
 To add a node=node1 to the nodelist table with groups=all:
 
  chtab  node=node1 nodelist.groups=all
@@ -58,13 +58,13 @@ To add a keyword (tftpdir) and value (/tftpboot) to the site table:
  chtab  key=tftpdir site.value=/tftpboot
 
 
-=item 3. 
+=item 3.
 To add node1 to the  nodetype table with os=rhel5:
 
  chtab  node=node1 nodetype.os=rhel5
 
 
-=item 4. 
+=item 4.
 To change node1 in nodetype table setting os=sles:
 
  chtab  node=node1 nodetype.os=sles
diff --git a/xCAT-client/pods/man8/copycds.8.pod b/xCAT-client/pods/man8/copycds.8.pod
index 23a6af93e..ac254ac46 100644
--- a/xCAT-client/pods/man8/copycds.8.pod
+++ b/xCAT-client/pods/man8/copycds.8.pod
@@ -97,7 +97,7 @@ Also, remember to add the new directory to your osimage definition:
  chdef -t osimage myosimage -p pkgdir=/install/rhels6.5-supp/ppc64
 
 =back
- 
+
 =head1 SEE ALSO
 
 L<nodeset(8)|nodeset.8>, L<site(5)|site.5>, L<nodetype(5)|nodetype.5>
diff --git a/xCAT-client/pods/man8/makeconservercf.8.pod b/xCAT-client/pods/man8/makeconservercf.8.pod
index 036c28757..bc2169b8d 100644
--- a/xCAT-client/pods/man8/makeconservercf.8.pod
+++ b/xCAT-client/pods/man8/makeconservercf.8.pod
@@ -24,7 +24,7 @@ and related tables (e.g. mp, ipmi, ppc).  Normally, B<makeconservercf> will writ
 file.  If a I<noderange> is specified, it will write only those nodes to the file.  In either case, if a node
 does not have nodehm.cons set, it will not be written to the file.
 
-If B<-d> is specified, B<makeconservercf> will remove specified nodes from /etc/conserver.cf file. If I<noderange> is not specified, all xCAT nodes will be removed from /etc/conserver.cf file. 
+If B<-d> is specified, B<makeconservercf> will remove specified nodes from /etc/conserver.cf file. If I<noderange> is not specified, all xCAT nodes will be removed from /etc/conserver.cf file.
 
 If B<-C|--cleanup> is specified, B<makeconservercf> will remove console configuration entries from /etc/conserver.cf for the nodes whose definitions have been removed from xCATdb. B<Don't> specify any noderange.
 
@@ -59,7 +59,7 @@ run it on all service nodes, if there are any.
 =item B<-t|--trust> I<hosts>
 
 Add additional trusted hosts into /etc/conserver.cf. The I<hosts> are comma separated list of
-ip addresses or host names. 
+ip addresses or host names.
 
 =item B<-v|--version>
 
@@ -80,10 +80,10 @@ Display usage message.
 
 =over 2
 
-=item 0. 
+=item 0.
 The command completed successfully.
 
-=item 1. 
+=item 1.
 An error has occurred.
 
 =back
diff --git a/xCAT-client/pods/man8/makedhcp.8.pod b/xCAT-client/pods/man8/makedhcp.8.pod
index 95a16633c..c14c77521 100644
--- a/xCAT-client/pods/man8/makedhcp.8.pod
+++ b/xCAT-client/pods/man8/makedhcp.8.pod
@@ -33,7 +33,7 @@ Start by filling out the L<networks(5)|networks.5> table properly.
 =item 2.
 
 Then use the B<makedhcp -n> option to create a new dhcp configuration file.
-You can set the site table, dhcplease attribute to the lease time for the dhcp client. The default value is 43200. 
+You can set the site table, dhcplease attribute to the lease time for the dhcp client. The default value is 43200.
 
 =item 3.
 
@@ -47,7 +47,7 @@ On linux, the configuration information immediately takes effect without a resta
 
 =back
 
-If you need to delete node entries from the DHCP configuration, use the B<-d> flag.  
+If you need to delete node entries from the DHCP configuration, use the B<-d> flag.
 
 =head1 OPTIONS
 
@@ -92,7 +92,7 @@ operation to any service nodes that service the nodes in the noderange.
 
 =item B<-q> I<noderange>
 
-Query the node entries from the DHCP server configuration. On AIX, any entries created by NIM will not be listed. 
+Query the node entries from the DHCP server configuration. On AIX, any entries created by NIM will not be listed.
 
 =item B<-h|--help>
 
@@ -107,7 +107,7 @@ Display usage message.
 =item 0.
 The command completed successfully.
 
-=item 1. 
+=item 1.
 An error has occurred.
 
 =back
@@ -134,9 +134,9 @@ Will cause dhcp on the next request to set root-path appropriately for only node
  makedhcp node5 -s 'option root-path  \"172.16.0.1:/install/freebsd6.2/x86_64\";'
 
 =item 4.
-Query a node from the DHCP server. 
+Query a node from the DHCP server.
 
- # makedhcp -q node01 
+ # makedhcp -q node01
  node01: ip-address = 91.214.34.156, hardware-address = 00:00:c9:c6:6c:42
 
 =back
diff --git a/xCAT-client/pods/man8/makedns.8.pod b/xCAT-client/pods/man8/makedns.8.pod
index 8366b8c8e..047adc2fe 100644
--- a/xCAT-client/pods/man8/makedns.8.pod
+++ b/xCAT-client/pods/man8/makedns.8.pod
@@ -14,11 +14,11 @@ B<makedns> [B<-V>|B<--verbose>] [B<-e>|B<--external>] [B<-d>|B<--delete> I<noder
 
 B<makedns> configures a DNS server on the system you run it on, which is typically the xCAT management node.
 
-The list of nodes to include comes from either the B<noderange> provided on the command line or the entries in the local /etc/hosts files. 
+The list of nodes to include comes from either the B<noderange> provided on the command line or the entries in the local /etc/hosts files.
 
 There are several bits of information that must be included in the xCAT database before running this command.
 
-You must set the B<forwarders> attributes in the xCAT B<site> definition. 
+You must set the B<forwarders> attributes in the xCAT B<site> definition.
 
 The B<forwarders> value should be set to the IP address of one or more nameservers at your site that can resolve names outside of your cluster.  With this set up, all nodes ask the local nameserver to resolve names, and if it is a name that the MN DNS does not know about, it will try the forwarder names.
 
diff --git a/xCAT-client/pods/man8/makegocons.8.pod b/xCAT-client/pods/man8/makegocons.8.pod
index 9d69e3d3d..07b3ee25b 100644
--- a/xCAT-client/pods/man8/makegocons.8.pod
+++ b/xCAT-client/pods/man8/makegocons.8.pod
@@ -10,6 +10,8 @@ B<makegocons> [B<-V|--verbose>] [B<-C|--cleanup>]
 
 =head1 DESCRIPTION
 
+In order to use I<goconserver> instead of I<conserver>, reference https://xcat-docs.readthedocs.io/en/latest/advanced/goconserver/quickstart.html for more information.
+
 The B<makegocons> command will start the goconserver service if it is not started, then
 send the REST request to create or delete the session resource in the goconserver service. The session
 information including the session command or ssh connection parameters (for openbmc) is generated by xcat
@@ -76,10 +78,10 @@ Display usage message.
 
 =over 2
 
-=item 0. 
+=item 0.
 The command completed successfully.
 
-=item 1. 
+=item 1.
 An error has occurred.
 
 =back
diff --git a/xCAT-client/pods/man8/makehosts.8.pod b/xCAT-client/pods/man8/makehosts.8.pod
index 2c366a1a0..47967d62b 100644
--- a/xCAT-client/pods/man8/makehosts.8.pod
+++ b/xCAT-client/pods/man8/makehosts.8.pod
@@ -10,7 +10,7 @@ B<makehosts> {B<-h>|B<--help>}
 
 =head1 DESCRIPTION
 
-B<makehosts> updates the /etc/hosts file based on information stored in the 
+B<makehosts> updates the /etc/hosts file based on information stored in the
 xCAT database object definitions.
 
 The main three bits of information needed are: node hostname, node ip and network domain name.
diff --git a/xCAT-client/pods/man8/makenetworks.8.pod b/xCAT-client/pods/man8/makenetworks.8.pod
index 771ff4eeb..402873c43 100644
--- a/xCAT-client/pods/man8/makenetworks.8.pod
+++ b/xCAT-client/pods/man8/makenetworks.8.pod
@@ -55,10 +55,10 @@ B<-V |--verbose>       Verbose mode.
 
 =over 2
 
-=item 0. 
+=item 0.
 The command completed successfully.
 
-=item 1. 
+=item 1.
 An error has occurred.
 
 =back
diff --git a/xCAT-client/pods/man8/makeroutes.8.pod b/xCAT-client/pods/man8/makeroutes.8.pod
index 77b315ec4..902f1d1f8 100644
--- a/xCAT-client/pods/man8/makeroutes.8.pod
+++ b/xCAT-client/pods/man8/makeroutes.8.pod
@@ -4,11 +4,11 @@ B<makeroutes> - add or delete routes to/from the os route table on nodes.
 
 =head1 SYNOPSIS
 
-B<makeroutes> [B<-r>|B<--routename> I<r1>[I<,r2...>]] 
+B<makeroutes> [B<-r>|B<--routename> I<r1>[I<,r2...>]]
 
 B<makeroutes> [B<-d>|B<--delete>] [B<-r>|B<--routenames> I<r1>[I<,r2...>]]
 
-B<makeroutes> I<noderange> [B<-r>|B<--routename> I<r1>[I<,r2...>]] 
+B<makeroutes> I<noderange> [B<-r>|B<--routename> I<r1>[I<,r2...>]]
 
 B<makeroutes> I<noderange> [B<-d>|B<--delete>] [B<-r>|B<--routenames> I<r1>[I<,r2...>]]
 
@@ -18,7 +18,7 @@ B<makeroutes> [B<-h>|B<--help>|B<-v>|B<--version>]
 
 The B<makeroutes> command adds or deletes routes on the management node or any given nodes. The B<noderange> specifies the nodes where the routes are to be added or removed. When the I<noderange> is omitted, the action will be done on the management node. The B<-r> option specifies the name of routes. The details of the routes are defined in the B<routes> table which contains the route name, subnet, net mask and gateway. If -r option is omitted, the names of the routes found on B<noderes.routenames> for the nodes or on B<site.mnroutenames> for the management node will be used.
 
-If you want the routes be automatically setup during node deployment, first put a list of route names to B<noderes.routenames> and then add I<setroute> script name to the B<postscripts.postbootscripts> for the nodes. 
+If you want the routes be automatically setup during node deployment, first put a list of route names to B<noderes.routenames> and then add I<setroute> script name to the B<postscripts.postbootscripts> for the nodes.
 
 
 =head1 Parameters
@@ -34,7 +34,7 @@ I<noderange> specifies the nodes where the routes are to be added or removed. If
 
 Specifies to delete the given routes. If not specified, the action is to add routes.
 
-=item B<-r|--routename>  
+=item B<-r|--routename>
 
 Specifies a list of comma separated route names defined in the B<routes> table. If omitted, all routes defined in B<noderes.routenames> for nodes or B<site.mnroutenames> for the management node will be used.
 
diff --git a/xCAT-client/pods/man8/mknb.8.pod b/xCAT-client/pods/man8/mknb.8.pod
index 47ca88c04..063abcbcf 100644
--- a/xCAT-client/pods/man8/mknb.8.pod
+++ b/xCAT-client/pods/man8/mknb.8.pod
@@ -11,8 +11,8 @@ B<mknb> I<arch>
 
 The B<mknb> command is run by xCAT automatically when xCAT is installed on the management node.
 It creates a network boot root image (used for node discovery, BMC programming, and flashing)
-for the same architecture that the management node is.  So you normally do not need to run the 
-B<mknb> command yourself.   
+for the same architecture that the management node is.  So you normally do not need to run the
+B<mknb> command yourself.
 
 If you make custom changes to the network boot root image, you will need to run B<mknb> again to regenerate the diskless image to include your changes.  If you have an xCAT Hierarchical Cluster with Service Nodes having local /tftpboot directories (site.sharedtftp=0), you will need to copy the generated root image to each Service Node.
 
@@ -32,10 +32,10 @@ The hardware architecture for which to build the boot image.
 
 =over 2
 
-=item 0. 
+=item 0.
 The command completed successfully.
 
-=item 1. 
+=item 1.
 An error has occurred.
 
 =back
diff --git a/xCAT-client/pods/man8/nodeadd.8.pod b/xCAT-client/pods/man8/nodeadd.8.pod
index a5445dd46..5c995a623 100644
--- a/xCAT-client/pods/man8/nodeadd.8.pod
+++ b/xCAT-client/pods/man8/nodeadd.8.pod
@@ -43,10 +43,10 @@ Display usage message.
 
 =over 3
 
-=item 0. 
+=item 0.
 The command completed successfully.
 
-=item 1. 
+=item 1.
 An error has occurred.
 
 =back
diff --git a/xCAT-client/pods/man8/nodeset.8.pod b/xCAT-client/pods/man8/nodeset.8.pod
index 1265f9bb7..2080c260e 100644
--- a/xCAT-client/pods/man8/nodeset.8.pod
+++ b/xCAT-client/pods/man8/nodeset.8.pod
@@ -4,7 +4,7 @@ B<nodeset> - set the boot state for a noderange
 
 =head1 B<Synopsis>
 
-B<nodeset> I<noderange> [B<boot> | B<stat> [B<-a>]| B<offline> | B<runcmd=bmcsetup> | B<osimage>[=I<imagename>] | B<shell> | B<shutdown>] [B<-V>|B<--verbose>]
+B<nodeset> I<noderange> [B<boot> | B<stat> [B<-a>]| B<offline> | B<runcmd=>I<command> | B<osimage>[=I<imagename>] | B<shell> | B<shutdown>] [B<-V>|B<--verbose>]
 
 B<nodeset> I<noderange> B<osimage>[=I<imagename>] [B<--noupdateinitrd>] [B<--ignorekernelchk>]
 
@@ -61,11 +61,11 @@ Cleanup the current pxe/tftp boot configuration files for the nodes requested
 
 =item B<osimage>|B<osimage=>I<imagename>
 
-Prepare server for installing a node using the specified os image. The os image is defined in the I<osimage> table and I<linuximage> table. If the <imagename> is omitted, the os image name will be obtained from I<nodetype.provmethod> for the node.  
+Prepare server for installing a node using the specified os image. The os image is defined in the I<osimage> table and I<linuximage> table. If the <imagename> is omitted, the os image name will be obtained from I<nodetype.provmethod> for the node.
 
 =item B<--noupdateinitrd>
 
-Skip the rebuilding of initrd when the 'netdrivers', 'drvierupdatesrc' or 'osupdatename' were set for injecting new drivers to initrd. But, the B<geninitrd> command
+Skip the rebuilding of initrd when the 'netdrivers', 'driverupdatesrc' or 'osupdatename' were set for injecting new drivers to initrd. But, the B<geninitrd> command
 should be run to rebuild the initrd for new drivers injecting. This is used to improve the performance of B<nodeset> command.
 
 =item B<--ignorekernelchk>
@@ -74,16 +74,15 @@ Skip the kernel version checking when injecting drivers from osimage.driverupdat
 
 =item B<runimage>=I<task>
 
-If you would like to run a task after deployment, you can define that task with this attribute.    
+If you would like to run a task after deployment, you can define that task with this attribute.
 
 =item B<stat>
 
 Display the current boot loader config file description for the nodes requested. When B<disjointdhcps> is set, using B<-a> to display them on all available service nodes.
 
-=item B<runcmd=bmcsetup>
+=item B<runcmd=>I<command>
 
-This instructs the node to boot to the xCAT nbfs environment and proceed to configure BMC
-for basic remote access.  This causes the IP, netmask, gateway, username, and password to be programmed according to the configuration table.
+This instructs the node to boot to the xCAT genesis environment and specified command to be executed.
 
 =item B<shell>
 
@@ -140,6 +139,11 @@ To run http://$master/image.tgz  after deployment:
 
  nodeset $node runimage=http://$MASTER/image.tgz
 
+=item 3.
+Boot node1 into xCAT genesis environment and execute bmcsetup script. This causes the IP, netmask, gateway, username, and password to be programmed according to the configuration in node object definition.
+
+ rinstall node1 runcmd=bmcsetup
+
 =back
 
 =head1 B<See> B<Also>
diff --git a/xCAT-client/pods/man8/rinstall.8.pod b/xCAT-client/pods/man8/rinstall.8.pod
index 6675b0ca3..68da3c407 100644
--- a/xCAT-client/pods/man8/rinstall.8.pod
+++ b/xCAT-client/pods/man8/rinstall.8.pod
@@ -4,9 +4,11 @@ B<rinstall> - Begin OS provision on a noderange
 
 =head1 B<Synopsis>
 
-B<rinstall> I<noderange> [B<boot> | B<shell> | B<runcmd=bmcsetup>] [B<runimage=>I<task>] [B<-c>|B<--console>] [B<-V>|B<--verbose>]
+B<rinstall> I<noderange> [B<boot> | B<shell> | B<runcmd=>I<command>] [B<-c>|B<--console>] [B<-V>|B<--verbose>]
 
-B<rinstall> I<noderange> [B<osimage>=I<imagename> | I<imagename>] [B<--ignorekernelchk>] [B<-c>|B<--console>] [B<-u>|B<--uefimode>] [B<-V>|B<--verbose>]
+B<rinstall> I<noderange> B<osimage>[=I<imagename>] [B<--noupdateinitrd>][B<--ignorekernelchk>] [B<-c>|B<--console>] [B<-u>|B<--uefimode>] [B<-V>|B<--verbose>]
+
+B<rinstall> I<noderange> B<runimage=>I<task>
 
 B<rinstall> [B<-h>|B<--help>|B<-v>|B<--version>]
 
@@ -14,9 +16,9 @@ B<rinstall> [B<-h>|B<--help>|B<-v>|B<--version>]
 
 B<rinstall> is a convenience command to begin OS provision on a noderange.
 
-If B<osimage>=I<imagename> | I<imagename> is specified or nodetype.provmethod=B<osimage> is set, provision the noderange with the osimage specified/configured.
+If B<osimage>=I<imagename> is specified or B<osimage> is specified and nodetype.provmethod=B<osimage> is set, provision the noderange with the osimage specified/configured.
 
-If B<-c> is specified, it will then run rcons on the node. This is allowed only if one node in the noderange. If need consoles on multiple nodes, see L<winstall(8)|winstall.8>.
+If B<-c> is specified, it will then run B<rcons> on the node. This is allowed only if one node is in the noderange. If consoles are needed on multiple nodes, see L<winstall(8)|winstall.8>.
 
 =head1 B<Options>
 
@@ -26,9 +28,12 @@ If B<-c> is specified, it will then run rcons on the node. This is allowed only
 
 Instruct network boot loader to be skipped, generally meaning boot to hard disk
 
-=item I<imagename> | B<osimage=>I<imagename>
+=item B<osimage>[=I<imagename>]
 
-Prepare server for installing a node using the specified os image. The os image is defined in the I<osimage> table and I<linuximage> table. If the I<imagename> is omitted, the os image name will be obtained from I<nodetype.provmethod> for the node.  
+Prepare server for installing a node using the specified OS image. The OS image is defined in the I<osimage> table and I<linuximage> table. If the I<imagename> is omitted, the OS image name will be obtained from I<nodetype.provmethod> for the node.
+
+=item B<--noupdateinitrd>
+Skip the rebuilding of initrd when the 'netdrivers', 'driverupdatesrc' or 'osupdatename' were set for injecting new drivers to initrd. But, the B<geninitrd> command should be run to rebuild the initrd for new drivers injecting. This is used to improve the performance of B<rinstall> command.
 
 =item B<--ignorekernelchk>
 
@@ -36,11 +41,11 @@ Skip the kernel version checking when injecting drivers from osimage.driverupdat
 
 =item B<runimage=>I<task>
 
-If you would like to run a task after deployment, you can define that task with this attribute.    
+If you would like to run a task after deployment, you can define that task with this attribute.
 
-=item B<runcmd=bmcsetup>
+=item B<runcmd=>I<command>
 
-This instructs the node to boot to the xCAT nbfs environment and proceed to configure BMC for basic remote access.  This causes the IP, netmask, gateway, username, and password to be programmed according to the configuration table.
+This instructs the node to boot to the xCAT genesis environment and specified command to be executed.
 
 =item B<shell>
 
@@ -49,23 +54,23 @@ The node will also be able to be sshed into and have utilities such as wget, tft
 
 =item B<-h>|B<--help>
 
-Display usage message. 
+Display usage message.
 
 =item B<-v>|B<--version>
 
-Display version. 
+Display version.
 
 =item B<-u>|B<--uefimode>
 
-For BMC-based servers, to specify the next boot mode to be "UEFI Mode". 
+For BMC-based servers, to specify the next boot mode to be "UEFI Mode".
 
 =item B<-V>|B<--verbose>
 
-Verbose output. 
+Verbose output.
 
 =item B<-c>|B<--console>
 
-Requests that rinstall runs rcons once the provision starts.  This will only work if there is only one node in the noderange. See L<winstall(8)|winstall.8> for starting consoles on multiple nodes.
+Requests that B<rinstall> runs B<rcons> once the provision starts.  This will only work if there is only one node in the noderange. See L<winstall(8)|winstall.8> for starting consoles on multiple nodes.
 
 =back
 
@@ -89,7 +94,12 @@ Provision node1 and start a console to monitor the process.
 
  rinstall node1 -c
 
-=back 
+=item 4.
+Boot node1 into xCAT genesis environment and execute bmcsetup script. This causes the IP, netmask, gateway, username, and password to be programmed according to the configuration in node object definition.
+
+ rinstall node1 runcmd=bmcsetup
+
+=back
 
 =head1 B<See> B<Also>
 
diff --git a/xCAT-client/pods/man8/rmosdistro.8.pod b/xCAT-client/pods/man8/rmosdistro.8.pod
index fb2527577..6245461ae 100644
--- a/xCAT-client/pods/man8/rmosdistro.8.pod
+++ b/xCAT-client/pods/man8/rmosdistro.8.pod
@@ -1,7 +1,7 @@
 
 =head1 NAME
 
-B<rmosdistro> - remove OS Distro 
+B<rmosdistro> - remove OS Distro
 
 =head1 SYNOPSIS
 
@@ -13,12 +13,12 @@ B<rmosdistro> [B<-h>|B<--help>]
 
 =head1 DESCRIPTION
 
-The B<rmosdistro> command removes the specified OS Distro that was created by B<copycds>. To delete all OS Distro entries, please specify B<[-a|--all]>. If the specified OS Distro is referenced by some osimage, B<[-f|force]> can be used to remove it. 
+The B<rmosdistro> command removes the specified OS Distro that was created by B<copycds>. To delete all OS Distro entries, please specify B<[-a|--all]>. If the specified OS Distro is referenced by some osimage, B<[-f|force]> can be used to remove it.
 
 
 =head1 ARGUMENTS
 
-The OS Distro names to delete, delimited by blank space. 
+The OS Distro names to delete, delimited by blank space.
 
 
 =head1 OPTIONS
@@ -31,7 +31,7 @@ If specified, try to delete all the OS Distros.
 
 =item B<-f>|B<--force>
 
-Remove referenced OS Distros, never prompt. 
+Remove referenced OS Distros, never prompt.
 
 =item B<-h>|B<--help>
 
@@ -41,7 +41,7 @@ Show info of rmosdistro usage.
 
 =head1 RETURN VALUE
 
-Zero:                    
+Zero:
   The command completed successfully.
 
 Nonzero:
@@ -70,5 +70,5 @@ To remove all OS Distros:
 
 =back
 
- 
+
 
diff --git a/xCAT-client/pods/man8/runsqlcmd.8.pod b/xCAT-client/pods/man8/runsqlcmd.8.pod
index dc34a344e..44b93b38f 100644
--- a/xCAT-client/pods/man8/runsqlcmd.8.pod
+++ b/xCAT-client/pods/man8/runsqlcmd.8.pod
@@ -1,29 +1,29 @@
 =head1 NAME
 
-B<runsqlcmd> -Runs sql command files against the current xCAT database.  
+B<runsqlcmd> -Runs sql command files against the current xCAT database.
 
 =head1 SYNOPSIS
 
 
-B<runsqlcmd> 
+B<runsqlcmd>
 
 B<runsqlcmd> [B<-h>|B<--help>]
 
 B<runsqlcmd> [B<-v>|B<--version>]
 
-B<runsqlcmd> [B<-d>|B<--dir> I<directory_path>] [B<-V>|B<--verbose>] 
+B<runsqlcmd> [B<-d>|B<--dir> I<directory_path>] [B<-V>|B<--verbose>]
 
-B<runsqlcmd> [B<-f>|B<--files> I<list of files>] [B<-V>|B<--verbose>] 
+B<runsqlcmd> [B<-f>|B<--files> I<list of files>] [B<-V>|B<--verbose>]
 
-B<runsqlcmd> [B<-V>|B<--verbose>] [I<sql statement>] 
+B<runsqlcmd> [B<-V>|B<--verbose>] [I<sql statement>]
 
 
 =head1 DESCRIPTION
 
-The runsqlcmd routine,  runs the sql statements contained in the *.sql files as input to the command against the current running xCAT database. Only DB2,MySQL and PostgreSQL databases are supported.  SQLite is not supported.  
+The runsqlcmd routine,  runs the sql statements contained in the *.sql files as input to the command against the current running xCAT database. Only DB2,MySQL and PostgreSQL databases are supported.  SQLite is not supported.
 If no directory or filelist is provided,  the default /opt/xcat/lib/perl/xCAT_schema directory is used.
 If the directory is input with the -d flag,  that directory will be used.
-If a comma separated list of files is input with the -f flag, those files will be used. 
+If a comma separated list of files is input with the -f flag, those files will be used.
 
 =head1 OPTIONS
 
@@ -43,7 +43,7 @@ Displays extra debug information.
 
 =item B<-d|--dir>
 
-To use a directory other than the default directory,  enter the directory path here.  
+To use a directory other than the default directory,  enter the directory path here.
 
 =item B<-f|--files>
 
@@ -53,7 +53,7 @@ Comma separated list of files (full path), wildcard (*) can be used.
 
 The files must be of the form <name>.sql or <name>_<database>.sql  where
 
-<database>  is mysql,pgsql, or db2. Files must have permission 0755.  
+<database>  is mysql,pgsql, or db2. Files must have permission 0755.
 
 =item I<sql statement>
 
@@ -68,7 +68,7 @@ Quoted sql statement syntax appropriate for the current database.
 =item 1.
 To run the database appropriate *.sql files in /opt/xcat/lib/perl/xCAT_schema :
 
- runsqlcmd 
+ runsqlcmd
 
 =item 2.
 To run the database appropriate *.sql files in /tmp/mysql:
@@ -81,12 +81,12 @@ To run the database appropriate *.sql files in the input list:
  runsqlcmd -f "/tmp/mysql/test*,/tmp/mysql/test1*"
 
 =item 4.
-To checkout one DB2 sql file: 
+To checkout one DB2 sql file:
 
  runsqlcmd -f /tmp/db2/test_db2.sql
 
 =item 5.
-To run the following command to the database: 
+To run the following command to the database:
 
  runsqlcmd "Select * from site;"
 
diff --git a/xCAT-client/pods/man8/setupiscsidev.8.pod b/xCAT-client/pods/man8/setupiscsidev.8.pod
index dc36139ce..86b07b086 100644
--- a/xCAT-client/pods/man8/setupiscsidev.8.pod
+++ b/xCAT-client/pods/man8/setupiscsidev.8.pod
@@ -39,10 +39,10 @@ Display usage message.
 
 =over 2
 
-=item 0. 
+=item 0.
 The command completed successfully.
 
-=item 1. 
+=item 1.
 An error has occurred.
 
 =back
diff --git a/xCAT-client/pods/man8/tabch.8.pod b/xCAT-client/pods/man8/tabch.8.pod
index 86cdaf97d..22f3eb3aa 100644
--- a/xCAT-client/pods/man8/tabch.8.pod
+++ b/xCAT-client/pods/man8/tabch.8.pod
@@ -34,10 +34,10 @@ B<-d>          Delete option.
 
 =over 2
 
-=item 0. 
+=item 0.
 The command completed successfully.
 
-=item 1. 
+=item 1.
 An error has occurred.
 
 =back
@@ -46,34 +46,34 @@ An error has occurred.
 
 =over 2
 
-=item 1. 
+=item 1.
 To add a node=node1 to the nodelist table with groups=all:
 
  tabch  node=node1 nodelist.groups=all
 
-=item 2. 
+=item 2.
 To add a keyword (tftpdir) and value (/tftpboot) to the site table:
 
  tabch  key=tftpdir site.value=/tftpboot
 
 
-=item 3. 
+=item 3.
 To add node1 to the  nodetype table with os=rhel5:
 
  tabch  node=node1 nodetype.os=rhel5
 
 
-=item 4. 
+=item 4.
 To change node1 in nodetype table setting os=sles:
 
  tabch  node=node1 nodetype.os=sles
 
-=item 5. 
+=item 5.
 To change node1 by appending otherpkgs to the postbootscripts field in the postscripts table:
 
  tabch node=node1 postscripts.postbootscripts+=otherpkgs
 
-=item 6. 
+=item 6.
 To delete node1 from nodetype table:
 
  tabch -d node=node1 nodetype
diff --git a/xCAT-client/pods/man8/tabdump.8.pod b/xCAT-client/pods/man8/tabdump.8.pod
index f43c2f51c..a9f1c7e42 100644
--- a/xCAT-client/pods/man8/tabdump.8.pod
+++ b/xCAT-client/pods/man8/tabdump.8.pod
@@ -4,7 +4,7 @@ B<tabdump> - display an xCAT database table in CSV format.
 
 =head1 SYNOPSIS
 
-B<tabdump> 
+B<tabdump>
 
 B<tabdump> [B<-d>] [I<table>]
 
@@ -42,12 +42,12 @@ Show descriptions of the tables, instead of the contents of the tables.  If a ta
 
 =item B<-n>
 
-Shows the most recent number of entries as supplied on the -n flag from the auditlog or eventlog table.  
+Shows the most recent number of entries as supplied on the -n flag from the auditlog or eventlog table.
 
 =item B<-f>
 
 File name or path to file in which to dump the table. Without this the table is dumped
-to stdout.  Using the -f flag allows the table to be dumped one record at a time. If tables are very large, dumping to stdout can cause problems such as running out of memory. 
+to stdout.  Using the -f flag allows the table to be dumped one record at a time. If tables are very large, dumping to stdout can cause problems such as running out of memory.
 
 =item B<-w> I<'attr==val'> B<-w> I<'attr=~val'> ...
 
@@ -71,10 +71,10 @@ Operator descriptions:
 
 =over 3
 
-=item 0. 
+=item 0.
 The command completed successfully.
 
-=item 1. 
+=item 1.
 An error has occurred.
 
 =back
diff --git a/xCAT-client/pods/man8/tabedit.8.pod b/xCAT-client/pods/man8/tabedit.8.pod
index 9fed121e8..8692d5788 100644
--- a/xCAT-client/pods/man8/tabedit.8.pod
+++ b/xCAT-client/pods/man8/tabedit.8.pod
@@ -43,10 +43,10 @@ default to vi.
 
 =over 3
 
-=item 0. 
+=item 0.
 The command completed successfully.
 
-=item 1. 
+=item 1.
 An error has occurred.
 
 =back
diff --git a/xCAT-client/pods/man8/tabprune.8.pod b/xCAT-client/pods/man8/tabprune.8.pod
index 69b579d54..95b210991 100644
--- a/xCAT-client/pods/man8/tabprune.8.pod
+++ b/xCAT-client/pods/man8/tabprune.8.pod
@@ -4,15 +4,15 @@ B<tabprune> - Deletes records from the eventlog,auditlog,isnm_perf,isnm_perf_sum
 
 =head1 SYNOPSIS
 
-B<tabprune> [B<eventlog | auditlog>]  [B<-V>] [B<-i> I<recid> | B<-n> I<number of records> | B<-p> I<percentage> | B<-d> I<number of days> | B<-a>] 
+B<tabprune> [B<eventlog | auditlog>]  [B<-V>] [B<-i> I<recid> | B<-n> I<number of records> | B<-p> I<percentage> | B<-d> I<number of days> | B<-a>]
 
 B<tabprune> I<tablename> B<-a>
 
-B<tabprune> [B<-h>|B<--help>] [B<-v>|B<--version>] 
+B<tabprune> [B<-h>|B<--help>] [B<-v>|B<--version>]
 
 =head1 DESCRIPTION
 
-The tabprune command is used to delete records from the auditlog, eventlog, isnm_perf, isnm_perf_sum tables. As an option, the table header and all the rows pruned from the specified table will be displayed in CSV (comma separated values) format. The all records options (-a) can be used on any xCAT table. 
+The tabprune command is used to delete records from the auditlog, eventlog, isnm_perf, isnm_perf_sum tables. As an option, the table header and all the rows pruned from the specified table will be displayed in CSV (comma separated values) format. The all records options (-a) can be used on any xCAT table.
 
 =head1 OPTIONS
 
@@ -22,7 +22,7 @@ The tabprune command is used to delete records from the auditlog, eventlog, isnm
 
 Display usage message.
 
-=item B<-V> 
+=item B<-V>
 
 Verbose mode.  This will cause tabprune to display the records that are being deleted from the table, in case
 you want to redirect them to a file to archive them.
@@ -45,7 +45,7 @@ Remove the number of records input.
 
 =item B<-d> I<number of days>
 
-Remove all records that occurred >= than number of days ago. 
+Remove all records that occurred >= than number of days ago.
 
 =back
 
@@ -81,19 +81,19 @@ To remove all the records before recid=200 in the auditlog table:
  tabprune auditlog -i 200
 
 =item 4.
-To remove 400 records from the auditlog table and display the remove records: 
+To remove 400 records from the auditlog table and display the remove records:
 
  tabprune auditlog -V -n 400
 
 =item 5.
-To remove 50% of the  eventlog table: 
+To remove 50% of the  eventlog table:
 
- tabprune eventlog -p 50 
+ tabprune eventlog -p 50
 
 =item 6.
-To remove all records that occurred >= 5 days ago in the eventlog: 
+To remove all records that occurred >= 5 days ago in the eventlog:
 
- tabprune eventlog -d 5 
+ tabprune eventlog -d 5
 
 =back
 
diff --git a/xCAT-client/pods/man8/tabrestore.8.pod b/xCAT-client/pods/man8/tabrestore.8.pod
index fee629d1f..b27673d31 100644
--- a/xCAT-client/pods/man8/tabrestore.8.pod
+++ b/xCAT-client/pods/man8/tabrestore.8.pod
@@ -35,7 +35,7 @@ Display version.
 
 =item B<-a|--addrows>
 
-Add rows from the CSV file to the table instead of replacing the table with the CSV file.  
+Add rows from the CSV file to the table instead of replacing the table with the CSV file.
 
 =back
 
diff --git a/xCAT-client/pods/man8/winstall.8.pod b/xCAT-client/pods/man8/winstall.8.pod
index acc377761..32b822aee 100644
--- a/xCAT-client/pods/man8/winstall.8.pod
+++ b/xCAT-client/pods/man8/winstall.8.pod
@@ -15,7 +15,7 @@ B<winstall> [B<-h>|B<--help>|B<-v>|B<--version>]
 B<winstall> is a convenience command to begin OS provision on a noderange.
 
 If B<osimage>=I<imagename> | I<imagename> is specified or nodetype.provmethod=B<osimage> is set, provision the noderange with the osimage specified/configured.
- 
+
 It  will then run B<wcons> on the noderange.
 
 =head1 B<Options>
@@ -28,7 +28,7 @@ Instruct network boot loader to be skipped, generally meaning boot to hard disk
 
 =item I<imagename> | B<osimage=>I<imagename>
 
-Prepare server for installing a node using the specified os image. The os image is defined in the I<osimage> table and I<linuximage> table. If the I<imagename> is omitted, the os image name will be obtained from I<nodetype.provmethod> for the node.  
+Prepare server for installing a node using the specified os image. The os image is defined in the I<osimage> table and I<linuximage> table. If the I<imagename> is omitted, the os image name will be obtained from I<nodetype.provmethod> for the node.
 
 =item B<--ignorekernelchk>
 
@@ -36,7 +36,7 @@ Skip the kernel version checking when injecting drivers from osimage.driverupdat
 
 =item B<runimage=>I<task>
 
-If you would like to run a task after deployment, you can define that task with this attribute.    
+If you would like to run a task after deployment, you can define that task with this attribute.
 
 =item B<runcmd=bmcsetup>
 
@@ -49,19 +49,19 @@ The node will also be able to be sshed into and have utilities such as wget, tft
 
 =item B<-h>|B<--help>
 
-Display usage message. 
+Display usage message.
 
 =item B<-v>|B<--version>
 
-Display version. 
+Display version.
 
 =item B<-u>|B<--uefimode>
 
-For BMC-based servers, to specify the next boot mode to be "UEFI Mode". 
+For BMC-based servers, to specify the next boot mode to be "UEFI Mode".
 
 =item B<-V>|B<--verbose>
 
-Verbose output. 
+Verbose output.
 
 =back
 
@@ -80,7 +80,7 @@ Provision nodes 1 through 20 with the osimage rhels6.4-ppc64-netboot-compute.
 
  winstall node1-node20 osimage=rhels6.4-ppc64-netboot-compute
 
-=back 
+=back
 
 =head1 B<See> B<Also>
 
diff --git a/xCAT-client/pods/man8/xcatd.8.pod b/xCAT-client/pods/man8/xcatd.8.pod
index b86417d7c..c46d7da5b 100644
--- a/xCAT-client/pods/man8/xcatd.8.pod
+++ b/xCAT-client/pods/man8/xcatd.8.pod
@@ -1,6 +1,6 @@
 =head1 NAME
 
-B<xcatd> - The xCAT daemon 
+B<xcatd> - The xCAT daemon
 
 =head1 SYNOPSIS
 
@@ -21,11 +21,11 @@ See http://xcat-docs.readthedocs.org/en/latest/overview/index.html#xcat-architec
 =item 1.
 To start/stop/restart  xcatd on Linux, enter:
 
- service xcatd start 
+ service xcatd start
 
- service xcatd stop 
+ service xcatd stop
 
- service xcatd restart 
+ service xcatd restart
 
 =item 2.
 To start/stop/restart  xcatd on AIX, enter:
@@ -36,7 +36,7 @@ To start/stop/restart  xcatd on AIX, enter:
 
  startsrc -s xcatd
 
- stopsrc -s xcatd 
+ stopsrc -s xcatd
 
 =back
 
diff --git a/xCAT-client/pods/man8/xcatdebug.8.pod b/xCAT-client/pods/man8/xcatdebug.8.pod
index b76043dac..73776c86d 100644
--- a/xCAT-client/pods/man8/xcatdebug.8.pod
+++ b/xCAT-client/pods/man8/xcatdebug.8.pod
@@ -14,7 +14,7 @@ xCAT offers two trace facilities to debug the xCAT:
 
 B<Subroutine calling trace>
 
-Display the calling trace for subroutine when it is called. 
+Display the calling trace for subroutine when it is called.
 
 The trace message includes: The name of the called subroutine; The arguments which passed to the called subroutine; The calling stack of the subroutine. By default, the trace will be enabled to all the subroutines in the xcatd and plugin modules. The target subroutine can be configured by configuration file or through xcatdebug command line.
 
@@ -72,7 +72,7 @@ The B<commented trace log> can be added in xcatd and plugin modules. But followi
 
 =item B<-f>
 
-Enable or disable the B<subroutine calling trace>. 
+Enable or disable the B<subroutine calling trace>.
 
 For B<enable>, if ignoring the B<-c> flag, all the subroutines in the xcatd and plugin modules will be enabled.
 
@@ -100,7 +100,7 @@ B<subroutine list>: a string like  B<SUBROUTINE_DEFINITION>|B<SUBROUTINE_DEFINIT
 
 Enable or disable the B<commented trace log>.
 
-Note: The xcatd will be restarted for the performing of B<-d> 
+Note: The xcatd will be restarted for the performing of B<-d>
 
 =back
 
diff --git a/xCAT-client/pods/man8/xcatsetup.8.pod b/xCAT-client/pods/man8/xcatsetup.8.pod
index bea98a54c..91f07ab83 100644
--- a/xCAT-client/pods/man8/xcatsetup.8.pod
+++ b/xCAT-client/pods/man8/xcatsetup.8.pod
@@ -21,7 +21,7 @@ the hardware that is connected to the service and cluster networks.  The typical
 
 Install the xCAT software on the management node
 
-=item 2. 
+=item 2.
 
 Create the cluster config file and run xcatsetup
 
@@ -124,7 +124,7 @@ This sample configuration file is for a 2 building block cluster.
    # bpa-b-1-starting-ip = 10.231.2.1
    # This assumes you have 2 service LANs:  a primary service LAN 40.x.y.z/255.0.0.0 that all of the port 0's
    # are connected to, and a backup service LAN 41.x.y.z/255.0.0.0 that all of the port 1's are connected to.
-   # "x" is the frame number and "z" is the bpa/fsp id (1 for the first BPA/FSP in the Frame/CEC, 2 for the 
+   # "x" is the frame number and "z" is the bpa/fsp id (1 for the first BPA/FSP in the Frame/CEC, 2 for the
    # second BPA/FSP in the Frame/CEC). For BPAs "y" is always be 0 and for FSPs "y" is the cec id.
    vlan-1 = 40
    vlan-2 = 41
@@ -436,10 +436,10 @@ using this option.
 
 =over 2
 
-=item 0.  
+=item 0.
 The command completed successfully.
 
-=item 1.  
+=item 1.
 An error has occurred.
 
 =back
diff --git a/xCAT-client/pods/man8/xcatsnap.8.pod b/xCAT-client/pods/man8/xcatsnap.8.pod
index a01d6cc59..c8d5cda5b 100644
--- a/xCAT-client/pods/man8/xcatsnap.8.pod
+++ b/xCAT-client/pods/man8/xcatsnap.8.pod
@@ -1,6 +1,6 @@
 =head1 NAME
 
-B<xcatsnap> - Gathers information for service about the current running xCAT environment.  
+B<xcatsnap> - Gathers information for service about the current running xCAT environment.
 
 =head1 SYNOPSIS
 
@@ -12,14 +12,14 @@ B<xcatsnap> [B<-v>|B<--version>]
 
 B<xcatsnap> [B<-B>|B<--bypass>]
 
-B<xcatsnap> [B<-d>|B<--dir>] 
+B<xcatsnap> [B<-d>|B<--dir>]
 
 =head1 DESCRIPTION
 
 B<xcatsnap> -  The xcatsnap command gathers configuration, log and trace information about the xCAT components that are installed. This command only collects the data on the local node on which this command is run. This command is typically executed when a problem is encountered with any of these components in order to provide service information to the IBM Support Center.
 
 This command should only be executed at the instruction of the IBM Support Center.
- 
+
 =head1 OPTIONS
 
 =over 6
@@ -53,7 +53,7 @@ Run the xcatsnap routine in bypass mode and put info in /tmp/mydir :
 
  xcatsnap -B -d /tmp/mydir
 
-=item 2. 
+=item 2.
 To run the xcatsnap routine and use default directory /tmp/xcatsnap :
 
  xcatsnap
diff --git a/xCAT-client/sbin/dumpxCATdb b/xCAT-client/sbin/dumpxCATdb
index 9bf6527a9..4f0f43390 100644
--- a/xCAT-client/sbin/dumpxCATdb
+++ b/xCAT-client/sbin/dumpxCATdb
@@ -19,11 +19,11 @@ use strict;
 
 #-----------------------------------------------------------------------------
 
-=head1  dumpxCATdb 
+=head1  dumpxCATdb
 
 
 
- dumpxCATdb  -p <directory to place database dump> 
+ dumpxCATdb  -p <directory to place database dump>
  See man page.
 
 =cut
@@ -135,7 +135,7 @@ exit $rc;
 #-----------------------------------------------------------------------------
 
 =head3 parse_args
-  
+
   Parses for  input
 
 =cut
@@ -197,8 +197,8 @@ sub parse_args
 
 #-----------------------------------------------------------------------------
 
-=head3 DB2_bindump 
-  
+=head3 DB2_bindump
+
     Uses the DB2 Database supplied backup utility to backup the database
 
 =cut
@@ -271,8 +271,8 @@ sub DB2_bindump
 
 #-----------------------------------------------------------------------------
 
-=head3 PG_bindump 
-  
+=head3 PG_bindump
+
     Uses the PostgreSQL Database supplied backup utility to backup the database
 
 =cut
diff --git a/xCAT-client/sbin/restorexCATdb b/xCAT-client/sbin/restorexCATdb
index 894ab8eb5..512ed46cc 100644
--- a/xCAT-client/sbin/restorexCATdb
+++ b/xCAT-client/sbin/restorexCATdb
@@ -19,12 +19,12 @@ use strict;
 
 #-----------------------------------------------------------------------------
 
-=head1  restorexCATdb 
+=head1  restorexCATdb
 
 
 
- restorexCATdb  -p <directory containing db restore .csv files> 
- restorexCATdb -b -p <directory binary database backup> 
+ restorexCATdb  -p <directory containing db restore .csv files>
+ restorexCATdb -b -p <directory binary database backup>
 
 
 =cut
@@ -140,7 +140,7 @@ exit $rc;
 #-----------------------------------------------------------------------------
 
 =head3 parse_args
-  
+
   Parses for  input
 
 =cut
@@ -259,8 +259,8 @@ sub DB2_binrestore
 
 #-----------------------------------------------------------------------------
 
-=head3 PG_binrestore 
-  
+=head3 PG_binrestore
+
     Uses the PostgreSQL Database supplied backup utility to restore the database
 
 =cut
diff --git a/xCAT-client/share/xcat/rvid/rvid.blade b/xCAT-client/share/xcat/rvid/rvid.blade
index c8731f0dd..5faf9440d 100755
--- a/xCAT-client/share/xcat/rvid/rvid.blade
+++ b/xCAT-client/share/xcat/rvid/rvid.blade
@@ -8,7 +8,7 @@ if [ -z "$fwmaj" ]; then
     exit 1
 fi
 mkdir -p /tmp/xcat
-if [ ! -f /tmp/xcat/$rvid_server.remotekvm.jar ]; then 
+if [ ! -f /tmp/xcat/$rvid_server.remotekvm.jar ]; then
     wget --no-check-certificate -O /tmp/xcat/$rvid_server.remotekvm.jar http://$rvid_server/private/remotekvm.jar >& /dev/null
 fi
 if [ $fwpref == 'BPET' ]; then
@@ -18,7 +18,7 @@ if [ $fwpref == 'BPET' ]; then
         echo "Unable to securely support $rvid_fwrev in an adequately secure manner, please upgrade to BPET46C or better"
         exit 1
         java -jar /tmp/xcat/$rvid_server.remotekvm.jar $rvid_server -rbs $rvid_authtoken -ba $rvid_ba -port $rvid_port >& /dev/null
-    else 
+    else
         echo "Unknown method for firmware $rvid_fwrev, ensure it is at least BPET42R";
     fi
 else
diff --git a/xCAT-client/share/xcat/rvid/rvid.imm b/xCAT-client/share/xcat/rvid/rvid.imm
index 3dc0e1bd5..b5fc4bf8c 100755
--- a/xCAT-client/share/xcat/rvid/rvid.imm
+++ b/xCAT-client/share/xcat/rvid/rvid.imm
@@ -7,10 +7,10 @@ if [ -z "$JAVADETECTED" ]; then
     exit 1
 fi
 echo $rvid_jnlp > /tmp/xcat/wvid_imm_$$.jnlp
-javaws  /tmp/xcat/wvid_imm_$$.jnlp >& /dev/null 
+javaws  /tmp/xcat/wvid_imm_$$.jnlp >& /dev/null
 if [ ! -z "$rvid_mediajnlp" ]; then
    echo $rvid_mediajnlp > /tmp/xcat/wvid_imm_media_$$.jnlp
-   javaws  /tmp/xcat/wvid_imm_media_$$.jnlp >& /dev/null 
-   rm  /tmp/xcat/wvid_imm_media_$$.jnlp >& /dev/null 
+   javaws  /tmp/xcat/wvid_imm_media_$$.jnlp >& /dev/null
+   rm  /tmp/xcat/wvid_imm_media_$$.jnlp >& /dev/null
 fi
 rm  /tmp/xcat/wvid_imm_$$.jnlp >& /dev/null
diff --git a/xCAT-client/share/xcat/tools/groupfiles4dsh b/xCAT-client/share/xcat/tools/groupfiles4dsh
index 41e5f95ae..faf2aeceb 100755
--- a/xCAT-client/share/xcat/tools/groupfiles4dsh
+++ b/xCAT-client/share/xcat/tools/groupfiles4dsh
@@ -17,25 +17,25 @@ use xCAT::Utils;
 
 #-----------------------------------------------------------------------------
 
-=head1  groupfiles4dsh 
+=head1  groupfiles4dsh
 
 
- This tool will build a directory of files for each defined 
- nodegroup in xCAT.  The file will be named the nodegroup name and 
- contain a list of nodes that belong to the nodegroup. 
- The file can be used as input to the AIX dsh command run in the DSH 
+ This tool will build a directory of files for each defined
+ nodegroup in xCAT.  The file will be named the nodegroup name and
+ contain a list of nodes that belong to the nodegroup.
+ The file can be used as input to the AIX dsh command run in the DSH
  context.
- The purpose of this tool is to allow backward compatiblity with scripts 
+ The purpose of this tool is to allow backward compatiblity with scripts
  that were created using the AIX or CSM dsh command.
 
 
- groupfiles4dsh  -p <directory to place generated nodegroup files> 
+ groupfiles4dsh  -p <directory to place generated nodegroup files>
  example: groupfiles4dsh -p /tmp/dshnodegrpfiles
 
   Use:   export DSH_CONTEXT=DSH  ( default unless CSM is installed)
 		 export DSH_NODE_RSH=/bin/ssh   (default is rsh)
 		 export DSH_NODEGROUP_PATH= /tmp/dshnodegrpfiles
-         
+
 		 dsh  -N all  date  ( all is a group in xCAT)
 		 dsh -a date   ( see man dsh,  DSH context)
 
@@ -68,7 +68,7 @@ exit $rc;
 #-----------------------------------------------------------------------------
 
 =head3 parse_args
-  
+
   Parses for  input
 
 =cut
diff --git a/xCAT-confluent/debian/changelog b/xCAT-confluent/debian/changelog
index 770ec7a4a..47742b0d1 100644
--- a/xCAT-confluent/debian/changelog
+++ b/xCAT-confluent/debian/changelog
@@ -1,5 +1,5 @@
 xcat-confluent (2.10-snap20150325) unstable; urgency=low
 
-  * Initial release 
+  * Initial release
 
  -- root <root@hostname>  Wed, 25 Mar 2015 13:41:35 -0400
diff --git a/xCAT-csm/install/postscripts/ibm-csm-master b/xCAT-csm/install/postscripts/ibm-csm-master
index 468da51a9..864bafc12 100644
--- a/xCAT-csm/install/postscripts/ibm-csm-master
+++ b/xCAT-csm/install/postscripts/ibm-csm-master
@@ -5,18 +5,18 @@
 
 usage()
 {
-   cat << EOF 
+   cat << EOF
    Usage ibm-csm-master options:
-   
+
    Modifies the csm configuration files (if /etc/ibm/csm/ is empty), then executes the local
    post scripts to reflect the change.
 
    OPTIONS
-     -h            Displays this message 
+     -h            Displays this message
      -c <group>    Sets the xCAT group for the compute nodes (default: compute)
      -a <group>    Sets the xCAT group for the aggregator nodes (default: aggregator)
      -u <group>    Sets the xCAT group for the utility nodes (default: utility)
-   
+
 EOF
 }
 
@@ -64,4 +64,4 @@ systemctl restart ${aggregator_daemon}
 # Run the post scripts on the other nodes.
 updatenode ${utility_nodes} -P ibm-csm-utility
 #updatenode ${aggregator_nodes} -P ibm-csm-aggregator
-updatenode  ${compute_nodes} -P ibm-csm-compute 
+updatenode  ${compute_nodes} -P ibm-csm-compute
diff --git a/xCAT-csm/netboot.rh/csm.compute.rhels7.ppc64le.pkglist b/xCAT-csm/netboot.rh/csm.compute.rhels7.ppc64le.pkglist
index 50fb4c7ab..906e4b95e 100644
--- a/xCAT-csm/netboot.rh/csm.compute.rhels7.ppc64le.pkglist
+++ b/xCAT-csm/netboot.rh/csm.compute.rhels7.ppc64le.pkglist
@@ -1,10 +1,10 @@
-# 
-# Basic xCAT Netboot Compute node package List 
-# 
+#
+# Basic xCAT Netboot Compute node package List
+#
 #INCLUDE:/opt/xcat/share/xcat/netboot/rh/compute.rhels7.ppc64le.pkglist#
-# 
-# Mellanox IB required packages 
-# 
+#
+# Mellanox IB required packages
+#
 #INCLUDE:/opt/xcat/share/xcat/ib/netboot/rh/ib.rhels7.ppc64le.pkglist#
 #
 yum
diff --git a/xCAT-genesis-builder/buildrpm b/xCAT-genesis-builder/buildrpm
index 28a544d5b..491dfbebb 100755
--- a/xCAT-genesis-builder/buildrpm
+++ b/xCAT-genesis-builder/buildrpm
@@ -45,8 +45,8 @@ if [ ! -e "./default_module_list" ]; then
     mv ./installkernel ./default_module_list
 fi
 echo "#!/bin/bash" > ./installkernel
-for line in `cat /lib/modules/$KERVER/modules.dep | awk -F: '{print \$1}'`; do 
-    basename $line >> ./installkernel; 
+for line in `cat /lib/modules/$KERVER/modules.dep | awk -F: '{print \$1}'`; do
+    basename $line >> ./installkernel;
 done
 sed -i 's/\(.*\)\.ko.*/instmods \1/g' ./installkernel
 chmod +x ./installkernel
@@ -158,7 +158,7 @@ if [ -e "${DRACUTMODDIR}/cmdlist_check" ]; then
     fi
 fi
 
-mkdir -p /tmp/xcatgenesis.$$/opt/xcat/share/xcat/netboot/genesis/$BUILDARCH/fs 
+mkdir -p /tmp/xcatgenesis.$$/opt/xcat/share/xcat/netboot/genesis/$BUILDARCH/fs
 
 # run dracut
 if [ "$HOSTOS" = "mcp" ]; then
@@ -181,7 +181,7 @@ if [ $? -ne 0 ]; then
 fi
 
 echo Expanding the initramfs into /tmp/xcatgenesis.$$/opt/xcat/share/xcat/netboot/genesis/$BUILDARCH/fs ...
-cd /tmp/xcatgenesis.$$/opt/xcat/share/xcat/netboot/genesis/$BUILDARCH/fs 
+cd /tmp/xcatgenesis.$$/opt/xcat/share/xcat/netboot/genesis/$BUILDARCH/fs
 
 zcat /tmp/xcatgenesis.$$.rfs|cpio -dumi
 
@@ -201,7 +201,7 @@ done
 # create the predictable naming for nics
 LIB_UDEV_RULES="/lib/udev/rules.d/"
 if [ ! -e "$LIB_UDEV_RULES/80-net-name-slot.rules" ]; then
-    cp $DRACUTMODDIR/80-net-name-slot.rules /tmp/xcatgenesis.$$/opt/xcat/share/xcat/netboot/genesis/$BUILDARCH/fs/lib/udev/rules.d/ 
+    cp $DRACUTMODDIR/80-net-name-slot.rules /tmp/xcatgenesis.$$/opt/xcat/share/xcat/netboot/genesis/$BUILDARCH/fs/lib/udev/rules.d/
     if [ $? -ne 0 ]; then
         echo "ERROR - expanding the initramfs, please correct the issues and try again"
         exit 1
@@ -225,5 +225,5 @@ tar jcf ~/rpmbuild/SOURCES/xCAT-genesis-base-$BUILDARCH.tar.bz2 opt
 
 # build the rpm
 echo Building xCAT-genesis-base rpm from ~/rpmbuild/SOURCES/xCAT-genesis-base-$BUILDARCH.tar.bz2 and $DIR/xCAT-genesis-base.spec ...
-rpmbuild -ba $DIR/xCAT-genesis-base.spec 
+rpmbuild -ba $DIR/xCAT-genesis-base.spec
 rm -rf $DRACUTMODDIR
diff --git a/xCAT-genesis-builder/debian/copyright b/xCAT-genesis-builder/debian/copyright
index f61d34dfe..87e60f492 100644
--- a/xCAT-genesis-builder/debian/copyright
+++ b/xCAT-genesis-builder/debian/copyright
@@ -85,4 +85,4 @@ Everyone is permitted to copy and distribute copies of this Agreement, but in or
 
 This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
 
- 
+
diff --git a/xCAT-genesis-builder/dhclient-script b/xCAT-genesis-builder/dhclient-script
index 21c1e0e76..a1987fc1c 100755
--- a/xCAT-genesis-builder/dhclient-script
+++ b/xCAT-genesis-builder/dhclient-script
@@ -45,7 +45,7 @@ elif [ $reason = "BOUND6" ]; then
 	if [ ! -z "$old_ip6_address" ]; then
 		ip addr del dev $interface $old_ip6_address/$old_ip6_prefixlen
 	fi
-	if [ ! -z "$new_ip6_address" ]; then 
+	if [ ! -z "$new_ip6_address" ]; then
 		ip addr add dev $interface $new_ip6_address/$new_ip6_prefixlen
 	fi
 elif [ $reason = "RELEASE" ]; then
diff --git a/xCAT-genesis-builder/install b/xCAT-genesis-builder/install
index b114ed1a5..319f66dba 100755
--- a/xCAT-genesis-builder/install
+++ b/xCAT-genesis-builder/install
@@ -582,16 +582,16 @@ inst "$moddir/dhclient.conf" "/etc/dhclient.conf"
 inst "$moddir/dhclient-script" "/sbin/dhclient-script"
 inst "$moddir/rsyslog.conf" "/etc/rsyslog.conf"
 dracut_install /sbin/rpc.statd /usr/sbin/sm-notify /etc/netconfig rpcbind /etc/host.conf /usr/sbin/rpc.idmapd
-dracut_install ps free find #debug 
-inst_dir /var/lib/nfs 
-inst_dir /var/lib/nfs/statd/sm 
+dracut_install ps free find #debug
+inst_dir /var/lib/nfs
+inst_dir /var/lib/nfs/statd/sm
 inst_dir /var/lib/nfs/statd/sm.bak
 inst_dir /var/lib/nfs/rpc_pipefs/nfs
 inst "/bin/bash" "/bin/sh"
 inst "/lib64/libnss_dns-2.12.so"
 inst "/lib/terminfo/l/linux" "/lib/terminfo/l/linux"
 inst "/lib/terminfo/v/vt100" "/lib/terminfo/v/vt100"
-inst_hook cmdline 10 "$moddir/xcat-cmdline.sh" 
+inst_hook cmdline 10 "$moddir/xcat-cmdline.sh"
 dracut_install /lib64/rsyslog/lmtcpclt.so
 dracut_install /lib64/rsyslog/omtesting.so
 dracut_install /lib64/rsyslog/lmnetstrms.so
diff --git a/xCAT-genesis-builder/install.ubuntu b/xCAT-genesis-builder/install.ubuntu
index 182763474..685f00c7c 100755
--- a/xCAT-genesis-builder/install.ubuntu
+++ b/xCAT-genesis-builder/install.ubuntu
@@ -9,7 +9,7 @@ dracut_install mount.nfs sshd vi reboot lspci parted screen mkfs mkfs.ext4 mkfs.
 dracut_install efibootmgr
 #dracut_install libvirtd /usr/share/libvirt/cpu_map.xml /usr/bin/qemu-img /usr/libexec/qemu-kvm
 dracut_install mkswap df brctl vconfig ifenslave ssh-keygen scp clear dhclient lldpad
-dracut_install lldptool 
+dracut_install lldptool
 dracut_install poweroff ntpq ntp-wait ntpd hwclock date /usr/share/terminfo/x/xterms /etc/nsswitch.conf /etc/services
 dracut_install /usr/sbin/rsyslogd /etc/protocols umount /usr/bin/dpkg /usr/bin/rpm /usr/lib/rpm/rpmrc
 if [ -n $version12 ];then
@@ -625,16 +625,16 @@ else
 dracut_install portmap
 fi
 dracut_install /sbin/rpc.statd /sbin/sm-notify /etc/netconfig /etc/host.conf /usr/sbin/rpc.idmapd
-dracut_install ps free find #debug 
-inst_dir /var/lib/nfs 
-inst_dir /var/lib/nfs/statd/sm 
+dracut_install ps free find #debug
+inst_dir /var/lib/nfs
+inst_dir /var/lib/nfs/statd/sm
 inst_dir /var/lib/nfs/statd/sm.bak
 inst_dir /var/lib/nfs/rpc_pipefs/nfs
 inst "/bin/bash" "/bin/sh"
 inst "/lib64/libnss_dns-2.12.so"
 inst "/lib/terminfo/l/linux" "/lib/terminfo/l/linux"
 inst "/lib/terminfo/v/vt100" "/lib/terminfo/v/vt100"
-inst_hook cmdline 10 "$moddir/xcat-cmdline.sh" 
+inst_hook cmdline 10 "$moddir/xcat-cmdline.sh"
 dracut_install /usr/lib/rsyslog/lmtcpclt.so
 #dracut_install /usr/lib/rsyslog/omtesting.so
 dracut_install /usr/lib/rsyslog/lmnetstrms.so
diff --git a/xCAT-genesis-builder/xcat-cmdline.sh b/xCAT-genesis-builder/xcat-cmdline.sh
index 43ad7f636..f92f5763f 100755
--- a/xCAT-genesis-builder/xcat-cmdline.sh
+++ b/xCAT-genesis-builder/xcat-cmdline.sh
@@ -64,4 +64,4 @@ if [[ ${ARCH} =~ ppc64 ]]; then
     sleep $waittime
 fi
 
-while :; do screen -dr doxcat || screen -S doxcat -L -ln doxcat; done 
+while :; do screen -dr doxcat || screen -S doxcat -L -ln doxcat; done
diff --git a/xCAT-genesis-builder/xcatroot b/xCAT-genesis-builder/xcatroot
index fc506fb3b..3eeec2bf0 100755
--- a/xCAT-genesis-builder/xcatroot
+++ b/xCAT-genesis-builder/xcatroot
@@ -1,5 +1,5 @@
 #!/bin/sh
-echo "Starting xCAT mini-environment" 
+echo "Starting xCAT mini-environment"
 NEWROOT=$3
 XCATMASTER=$XCAT
 while :
diff --git a/xCAT-genesis-scripts/debian/copyright b/xCAT-genesis-scripts/debian/copyright
index f61d34dfe..87e60f492 100644
--- a/xCAT-genesis-scripts/debian/copyright
+++ b/xCAT-genesis-scripts/debian/copyright
@@ -85,4 +85,4 @@ Everyone is permitted to copy and distribute copies of this Agreement, but in or
 
 This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
 
- 
+
diff --git a/xCAT-genesis-scripts/etc/init.d/functions b/xCAT-genesis-scripts/etc/init.d/functions
index d4e3e9624..481fbab08 100644
--- a/xCAT-genesis-scripts/etc/init.d/functions
+++ b/xCAT-genesis-scripts/etc/init.d/functions
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# "SystemImager" 
+# "SystemImager"
 #
 #  Copyright (C) 1999-2011 Brian Elliott Finley <brian@thefinleys.com>
 #
@@ -50,8 +50,8 @@ logmsg() {
     # this is good for envs that have bad consoles
     local FILE=/tmp/si.log
     echo $@ >> $FILE || shellout
-    
-    # if syslog is running, log to it.  In order to avoid hangs we have to 
+
+    # if syslog is running, log to it.  In order to avoid hangs we have to
     # add the "logger: " part in case $@ is ""
     if [ ! -z $USELOGGER ] ;
         then logger "logger: $@"
@@ -120,45 +120,45 @@ write_variables() {
 
     # pass all variables set here on to the hostname.sh script
     rm -f /tmp/variables.txt
-    
+
     echo "HOSTNAME=$HOSTNAME"                   >> /tmp/variables.txt || shellout
     echo "DOMAINNAME=$DOMAINNAME"               >> /tmp/variables.txt
-    
+
     echo "DEVICE=$DEVICE"                       >> /tmp/variables.txt
     echo "IPADDR=$IPADDR"                       >> /tmp/variables.txt
     echo "NETMASK=$NETMASK"                     >> /tmp/variables.txt
     echo "NETWORK=$NETWORK"                     >> /tmp/variables.txt
     echo "BROADCAST=$BROADCAST"                 >> /tmp/variables.txt
-    
+
     echo "GATEWAY=$GATEWAY"                     >> /tmp/variables.txt
     echo "GATEWAYDEV=$GATEWAYDEV"               >> /tmp/variables.txt
-    
+
     echo "IMAGESERVER=$IMAGESERVER"             >> /tmp/variables.txt
     echo "IMAGENAME=$IMAGENAME"                 >> /tmp/variables.txt
-    
+
     echo "LOG_SERVER=$LOG_SERVER"               >> /tmp/variables.txt
     echo "LOG_SERVER_PORT=$LOG_SERVER_PORT" 	>> /tmp/variables.txt
     echo "USELOGGER=$USELOGGER"                 >> /tmp/variables.txt
-    
+
     echo "TMPFS_STAGING=$TMPFS_STAGING"         >> /tmp/variables.txt
-    
+
     echo "SSH=$SSH"	           	 		        >> /tmp/variables.txt
     echo "SSHD=$SSHD"	            		    >> /tmp/variables.txt
     echo "SSH_USER=$SSH_USER"	            	>> /tmp/variables.txt
     echo "SSH_DOWNLOAD_URL=$SSH_DOWNLOAD_URL"	>> /tmp/variables.txt
-    
+
     echo "FLAMETHROWER_DIRECTORY_PORTBASE=$FLAMETHROWER_DIRECTORY_PORTBASE"	>> /tmp/variables.txt
-    
+
     echo "MONITOR_SERVER=$MONITOR_SERVER"       >> /tmp/variables.txt
     echo "MONITOR_PORT=$MONITOR_PORT"           >> /tmp/variables.txt
     echo "MONITOR_CONSOLE=$MONITOR_CONSOLE"     >> /tmp/variables.txt
-    
+
     echo "BITTORRENT=$BITTORRENT"                           >> /tmp/variables.txt
     echo "BITTORRENT_STAGING=$BITTORRENT_STAGING"           >> /tmp/variables.txt
     echo "BITTORRENT_POLLING_TIME=$BITTORRENT_POLLING_TIME" >> /tmp/variables.txt
     echo "BITTORRENT_SEED_WAIT=$BITTORRENT_SEED_WAIT"       >> /tmp/variables.txt
     echo "BITTORRENT_UPLOAD_MIN=$BITTORRENT_UPLOAD_MIN"     >> /tmp/variables.txt
-    
+
     echo "GROUPNAMES=\"$GROUPNAMES\""               >> /tmp/variables.txt
     echo "GROUP_OVERRIDES=\"$GROUP_OVERRIDES\""     >> /tmp/variables.txt
 }
@@ -217,12 +217,12 @@ shellout() {
 #
 ################################################################################
 #
-#   Description:  
+#   Description:
 #   Count the specified number, printing each number, and exit only the count
-#   loop when <ctrl>+<c> is hit (SIGINT, or Signal 2).  Thanks to 
+#   loop when <ctrl>+<c> is hit (SIGINT, or Signal 2).  Thanks to
 #   CCB <ccb@acm.org> for this chunk of code.  -BEF-
 #
-#   Usage: 
+#   Usage:
 #   count_loop 35
 #   count_loop $ETHER_SLEEP
 #
@@ -258,7 +258,7 @@ get_torrents_directory() {
 
     if [ ! -z $FLAMETHROWER_DIRECTORY_PORTBASE ]; then
         #
-        # We're using Multicast, so we should already have a directory 
+        # We're using Multicast, so we should already have a directory
         # full of scripts.  Break out here, so that we don't try to pull
         # the scripts dir again (that would be redundant).
         #
@@ -285,7 +285,7 @@ get_scripts_directory() {
 
     if [ ! -z $FLAMETHROWER_DIRECTORY_PORTBASE ]; then
         #
-        # We're using Multicast, so we should already have a directory 
+        # We're using Multicast, so we should already have a directory
         # full of scripts.  Break out here, so that we don't try to pull
         # the scripts dir again (that would be redundant).
         #
@@ -320,7 +320,7 @@ get_flamethrower_directory() {
 #
 ################################################################################
 #
-# Usage: 
+# Usage:
 #
 #   MODULE_NAME=my_module   # Required
 #   DIR=/my/destination/dir # Required
@@ -437,7 +437,7 @@ flamethrower_client() {
 
     # done
     logmsg 'finished!'
-    logmsg 
+    logmsg
 
     # Unset vars, so next module (which may not have them set) won't use then unintentially
     unset TTL
@@ -635,7 +635,7 @@ get_boel_binaries_tarball() {
 ################################################################################
 #
 # Parse tmpfs options from /proc/cpuinfo
-# 
+#
 parse_tmpfs_opts() {
     logmsg
     logmsg parse_tmpfs_opts
@@ -947,16 +947,16 @@ start_network() {
 
         ### try dhcp ###
         logmsg "IP Address not set with pre-boot settings."
-        
+
         ### BEGIN ether sleep ###
         # Give the switch time to start passing packets.  Some switches won't
         # forward packets until 30 seconds or so after an interface comes up.
         # This means the dhcp server won't even get the request for 30 seconds.
         # Many ethernet cards aren't considered "up" by the switch until the
         # driver is loaded.  Because the driver is compiled directly into the
-        # kernel here, the driver is definitely loaded at this point. 
-        # 
-        # Default is 0.  The recommended setting of ETHER_SLEEP=35 can be set 
+        # kernel here, the driver is definitely loaded at this point.
+        #
+        # Default is 0.  The recommended setting of ETHER_SLEEP=35 can be set
         # with a local.cfg file. -BEF-
         #
         [ -z $ETHER_SLEEP ] && ETHER_SLEEP=0
@@ -968,11 +968,11 @@ start_network() {
         count_loop $ETHER_SLEEP
         logmsg
         ### END ether sleep ###
-        
+
         # create directory to catch dhcp information
         DHCLIENT_DIR="/var/state/dhcp"
         mkdir -p $DHCLIENT_DIR
-        
+
         # combine systemimager code to the stock debian dhclient-script
         # and make executable
         cat /etc/dhclient-script.si-prefix \
@@ -982,7 +982,7 @@ start_network() {
 
         # be sure AF_PACKET is supported in the kernel
         [ -f /lib/modules/`uname -r`/modules.dep ] && modprobe af_packet &> /dev/null
-        
+
         # get info via dhcp
         logmsg
         logmsg "dhclient"
@@ -993,7 +993,7 @@ start_network() {
             logmsg
             shellout
         fi
-        
+
         if [ -z ${DEVICE} ]; then
             # Figure out which interface actually got configured.
             # Suggested by James Oakley.
@@ -1001,13 +1001,13 @@ start_network() {
             DEVICE=`grep interface ${DHCLIENT_DIR}/dhclient.leases | \
                 sed -e 's/^.*interface "//' -e 's/";//'`
         fi
-        
-        # read dhcp info in as variables -- this file will be created by 
+
+        # read dhcp info in as variables -- this file will be created by
         # the /etc/dhclient-start script that is run automatically by
         # dhclient.
         . /tmp/dhcp_info.${DEVICE} || shellout
         ### END dhcp ###
-        
+
         # Re-read configuration information from local.cfg to over-ride
         # DHCP settings, if necessary. -BEF-
         if [ -f /tmp/local.cfg ]; then
@@ -1031,9 +1031,9 @@ ping_test() {
     logmsg ping_test
 
     # The reason we don't ping the IMAGESERVER if FLAMETHROWER_DIRECTORY_PORTBASE
-    # is set, is that the client may never be given, know, or need to know, the 
+    # is set, is that the client may never be given, know, or need to know, the
     # IP address of the imageserver because the client is receiving _all_ of it's
-    # data via multicast, which is more like listening to a channel, as compared 
+    # data via multicast, which is more like listening to a channel, as compared
     # with connecting directly to a server.  -BEF-
     #
     if [ ! -z "$FLAMETHROWER_DIRECTORY_PORTBASE" ]; then
@@ -1042,7 +1042,7 @@ ping_test() {
     else
         PING_DESTINATION=$IMAGESERVER
         HOST_TYPE="SystemImager server"
-    fi 
+    fi
     logmsg
     logmsg "Pinging your $HOST_TYPE to ensure we have network connectivity."
     logmsg
@@ -1128,10 +1128,10 @@ get_hostname_by_hosts_file() {
 
         # add escape characters to IPADDR so that it can be used to find HOSTNAME below
         IPADDR_ESCAPED=`echo "$IPADDR" | sed -e 's/\./\\\./g'`
-        
+
         # get HOSTNAME by parsing hosts file
         logmsg "Searching for this machine's hostname in $FILE by IP: $IPADDR"
-        
+
         # Command summary by line:
         # 1: convert tabs to spaces -- contains a literal tab: <ctrl>+<v> then <tab>
         # 2: remove comments
@@ -1141,7 +1141,7 @@ get_hostname_by_hosts_file() {
         # 6: strip out space(s) before first hostname on line
         # 7: remove any aliases on line
         # 8: remove domain name, leaving naught but the hostname, naked as the day it were born
-        
+
         HOSTNAME=`
             sed 's/[[:space:]]/ /g' $FILE | \
             grep -v '^ *#' | \
@@ -1171,7 +1171,7 @@ get_hostname_by_dns() {
 ################################################################################
 #
 get_base_hostname() {
-    BASE_HOSTNAME=`echo $HOSTNAME | sed "s/[.0-9].*$//"` 
+    BASE_HOSTNAME=`echo $HOSTNAME | sed "s/[.0-9].*$//"`
 }
 #
 ################################################################################
@@ -1199,7 +1199,7 @@ choose_autoinstall_script() {
 
     #
     # Get the base hostname for the last attempt at choosing an autoinstall
-    # script.  For example, if the hostname is compute99, then try to get 
+    # script.  For example, if the hostname is compute99, then try to get
     # compute.master. -BEF-
     #
     get_base_hostname
@@ -1208,7 +1208,7 @@ choose_autoinstall_script() {
     # server). -AR-
     get_group_name
 
-    # 
+    #
     # If SCRIPTNAME is specified as a kernel append, or via local.cfg, then use that script.
     #
     if [ ! -z $SCRIPTNAME ]; then
@@ -1218,7 +1218,7 @@ choose_autoinstall_script() {
         SCRIPTNAMES="${SCRIPTS_DIR}/${SCRIPTNAME} ${SCRIPTS_DIR}/${SCRIPTNAME}.sh ${SCRIPTS_DIR}/${SCRIPTNAME}.master"
 
     else
-        # 
+        #
         # If SCRIPTNAME was not specified, choose one, in order of preference.  First hit wins.
         # Order of preference is:
         #   HOSTNAME                (i.e. node001.sh)
@@ -1332,7 +1332,7 @@ run_pre_install_scripts() {
 
         # Now, to get rid of those pesky newlines. -BEF-
         PRE_INSTALL_SCRIPTS=`echo $PRE_INSTALL_SCRIPTS | tr '\n' ' '`
-        
+
         if [ ! -z "`echo ${PRE_INSTALL_SCRIPTS}|sed 's/ //'`" ]; then
 
             for PRE_INSTALL_SCRIPT in `unique $PRE_INSTALL_SCRIPTS`
@@ -1382,7 +1382,7 @@ run_post_install_scripts() {
 
         # Now, to get rid of those pesky newlines. -BEF-
         POST_INSTALL_SCRIPTS=`echo $POST_INSTALL_SCRIPTS | tr '\n' ' '`
-        
+
         if [ ! -z "`echo ${POST_INSTALL_SCRIPTS}|sed 's/ //'`" ]; then
 
             mkdir -p /a/tmp/post-install/ || shellout
@@ -1434,7 +1434,7 @@ start_sshd() {
 
     # must be owned by root
     chown -R 0.0 /root/
-        
+
     # create a private host key for this autoinstall client
     logmsg
     logmsg "Using ssh-keygen to create this hosts private key"
@@ -1516,7 +1516,7 @@ start_ssh() {
         CMD="ssh -N -l $SSH_USER -n -f -L873:127.0.0.1:873 $IMAGESERVER $REDIRECTION_OPTIONS"
         logmsg $CMD
         $CMD || shellout
-        
+
         # Since we're using SSH, change the $IMAGESERVER variable to reflect
         # the forwarded connection.
         IMAGESERVER=127.0.0.1
@@ -1534,7 +1534,7 @@ start_ssh() {
             logmsg
             get_hostname_by_dns
         fi
-        
+
         if [ -z $HOSTNAME ]; then
             HOST_OR_IP=$IPADDR
         else
@@ -1601,7 +1601,7 @@ send_monitor_msg() {
             cpu=$(echo `cat /proc/cpuinfo | grep "cpu\|clock\|model name\|cpu MHz" | grep -v "cpu family" | sed -ne '1,2p' | sed "s/.*: //" | sed "s/^\([0-9\.]*\)MHz$/(\1 MHz)/" | sed "s/^\([0-9\.]*\)$/(\1 MHz)/"` | sed "s/\(MHz)\)/\1 |/g" | sed "s/ |$//")
         fi
 
-        # Collect the number of CPUs.     
+        # Collect the number of CPUs.
         if [ -z "$ncpus" ]; then
             ncpus=$((`cat /proc/cpuinfo | grep "^processor" | sed -n '$p' | sed "s/.*: \([0-9]\)*$/\1/"` + 1))
         fi
@@ -1720,7 +1720,7 @@ start_report_task() {
         # Evaluate status.
         CURR_SIZE=$(($TOT - $DISKSIZE))
         status=`echo "scale=2; $CURR_SIZE * 100 / $IMAGESIZE" | bc`
-        if [ `echo "scale=2; $status <= 0" | bc` -eq 1 ]; then 
+        if [ `echo "scale=2; $status <= 0" | bc` -eq 1 ]; then
             status=1
         elif [ `echo "scale=2; $status >= 100" | bc` -eq 1 ]; then
             status=99
@@ -1728,7 +1728,7 @@ start_report_task() {
 
         # Send status and bandwidth to the monitor server.
         send_monitor_msg "status=$status:speed=$speed"
-        
+
         # Wait $REPORT_INTERVAL sec between each report -AR-
         sleep $REPORT_INTERVAL
     done
@@ -1764,14 +1764,14 @@ beep_incessantly() {
     { while :;
         do
             echo -n -e "\\a"
-            if [ $SECONDS -lt 60 ]; then 
+            if [ $SECONDS -lt 60 ]; then
                 logmsg "I have been done for $SECONDS seconds.  Reboot me already!"
             else
                 MINUTES=`echo "$SECONDS / 60"|bc`
                 MINUTES_X_SIXTY=`echo "$MINUTES * 60"|bc`
-                if [ "$MINUTES_X_SIXTY" = "$SECONDS" ]; then 
+                if [ "$MINUTES_X_SIXTY" = "$SECONDS" ]; then
                     logmsg "I have been done for $MINUTES minutes now.  Reboot me already!"
-                fi  
+                fi
             fi
             sleep 1
             SECONDS=`echo "$SECONDS + 1"|bc`
diff --git a/xCAT-genesis-scripts/usr/bin/bmcsetup b/xCAT-genesis-scripts/usr/bin/bmcsetup
index 8c0b1f4c2..956f3ad5e 100755
--- a/xCAT-genesis-scripts/usr/bin/bmcsetup
+++ b/xCAT-genesis-scripts/usr/bin/bmcsetup
@@ -5,7 +5,7 @@
 #   dx320
 #     0x2e 0x10 0x4d 0x4f 0x00 0xff
 #
-#   dx340 
+#   dx340
 #     0x30 0x13 0xff 0x00 0x00 0x00
 #
 #   dx360/x3450
@@ -26,8 +26,8 @@ TIMEOUT=15
 #
 # Otherwise the BMC will not respond to ping after running the ipmitool commands in this script
 # It is found that Dell PowerEdge M605 server have the same product ID '43707', but its 'Manufacturer ID' is '674'
-function cold_reset_bmc() { 
-    if [ -z $XPROD ]; then 
+function cold_reset_bmc() {
+    if [ -z $XPROD ]; then
         logger -s -t $log_label -p local4.crit "CRITICAL ERROR - XPROD must be set before calling ${FUNCNAME[0]}"
         rm -f /tmp/ipmicfg.xml
         exit 1
@@ -37,8 +37,8 @@ function cold_reset_bmc() {
     fi
     if [ "$XPROD" = "309" -o "$XPROD" = "43707" ] ; then
         if [ "$XPROD" = "43707" ]; then
-            # OpenPOWER SPECIFIC, the OpenPOWER machines with AMI BMC should NOT need a 
-            # reset after applying ipmitool commands.  However, it seems there is a problem with 
+            # OpenPOWER SPECIFIC, the OpenPOWER machines with AMI BMC should NOT need a
+            # reset after applying ipmitool commands.  However, it seems there is a problem with
             # the BMC where after 15 seconds, it stops responding.  To work around, sleep 30
             # seconds before issuing the reset of the BMC.
             snooze
@@ -50,7 +50,7 @@ function cold_reset_bmc() {
 
         if [ "$XPROD" = "43707" ]; then
             # OpenPOWER SPECIFIC, check the BMC with the following raw command to
-            # make sure that the bmc is really in a "ready" state before continuing 
+            # make sure that the bmc is really in a "ready" state before continuing
             SLEEP_INTERVAL=3
             MAX_ITERATION=100
             tries=0
@@ -66,7 +66,7 @@ function cold_reset_bmc() {
             logger -s -t $log_label -p local4.error "ERROR, After waiting ${TOTAL_SEC} seconds, the BMC is not in a ready state."
         else
             # for Non OpenPOWER servers, just sleep for some set time.
-            sleep 15 
+            sleep 15
 
             TRIES=0
             # Get the LAN information
@@ -75,18 +75,18 @@ function cold_reset_bmc() {
                 let TRIES=TRIES+1
                 if [ $TRIES -gt $TIMEOUT ]; then break; fi
             done
-        fi 
+        fi
     fi
 }
 
 #
 # Function snooze()
 #
-# The purpose of this is to work around the issue with OpenPOWER BMCs after 
+# The purpose of this is to work around the issue with OpenPOWER BMCs after
 # making a change to network configuration, sleep 30 to be sure the changes apply.
 #
-function snooze() { 
-    if [ -z $XPROD ]; then 
+function snooze() {
+    if [ -z $XPROD ]; then
         logger -s -t $log_label -p local4.crit "CRITICAL ERROR - XPROD must be set before calling ${FUNCNAME[0]}"
         rm -f /tmp/ipmicfg.xml
         exit 1
@@ -95,7 +95,7 @@ function snooze() {
         return
     fi
     if [ "$XPROD" = "43707" ]; then
-        # For OpenPOWER Machines 
+        # For OpenPOWER Machines
         logger -s -t $log_label -p local4.debug "OpenPOWER, snooze for 30 seconds..."
         sleep 30
     elif [ "$IPMIMFG" = "19046" -a "$XPROD" = 502 ]; then
@@ -104,10 +104,10 @@ function snooze() {
     else
         sleep 1
     fi
-} 
+}
 
 if ! ipmitool -V 2>/dev/null| grep "version"; then
-    echo "No ipmitool find, please install it first"; 
+    echo "No ipmitool find, please install it first";
     exit 1;
 fi
 
@@ -132,7 +132,7 @@ while [ -z "$BMCIP" -a $IPCFGMETHOD="static" ]; do
     done
     BMCIP=`grep bmcip /tmp/ipmicfg.xml |awk -F\> '{print $2}'|awk -F\< '{print $1}'`
     BMCVLAN=`grep taggedvlan /tmp/ipmicfg.xml |awk -F\> '{print $2}'|awk -F\< '{print $1}'`
-    if [ -z "$BMCVLAN" ]; then 
+    if [ -z "$BMCVLAN" ]; then
         BMCVLAN=off;
     fi
     BMCGW=`grep gateway /tmp/ipmicfg.xml |awk -F\> '{print $2}'|awk -F\< '{print $1}'`
@@ -169,7 +169,7 @@ logger -s -t $log_label -p local4.info "IPMIVER=$IPMIVER, IPMIMFG=$IPMIMFG, XPRO
 
 #
 # IPMIMFG=2 = IBM
-# IPMIMFG=0 = OpenPOWER 
+# IPMIMFG=0 = OpenPOWER
 # IPMIMFG=42817 and XPROD=16975 = OpenBMC
 #
 if [ "$IPMIMFG" == 2 ]; then #IBM
@@ -242,7 +242,7 @@ elif [ "$IPMIMFG" == 20301 -o "$IPMIMFG" == 19046 -a "$XPROD" != 502 ] ; then
                 # after this change, we need to watch and wait to see that it
                 # actually takes effect.  On port change, the service processor
                 # does not migrate the network configuration over
-                # so we might be halfway through setting up when the net config 
+                # so we might be halfway through setting up when the net config
                 # reverts to dhcp then static, which setting a static ip for is
                 # considered invalid
                 CHECKBMCPORT=$(echo $p|awk '{print $1}')
@@ -277,14 +277,14 @@ if [ ! -z "$ISOPENBMC" ]; then
     # Overvide the default value for OpenBMC
     LAN_MED_TYPE="Other LAN"
 fi
-while [ -z "$LANCHAN" ]; do 
+while [ -z "$LANCHAN" ]; do
     logger -s -t $log_label -p local4.info "Auto detecting LAN channel..."
     for TLANCHAN in {1..16}; do
         # Try to get the channel information; then get the MAC which is used for the channel
         if ipmitool channel info $TLANCHAN 2> /dev/null | grep "$LAN_MED_TYPE" > /dev/null 2>&1 && ipmitool raw 0xc 2 $TLANCHAN 5 0 0 > /dev/null 2>&1; then
             LANCHAN=$TLANCHAN
-            break; 
-        fi; 
+            break;
+        fi;
         echo -n "."
     done
     if [ -z "$LANCHAN" ]; then
@@ -293,7 +293,7 @@ while [ -z "$LANCHAN" ]; do
     fi
 done
 logger -s -t $log_label -p local4.info "Detected LAN channel $LANCHAN"
-        
+
 let idev=NUMBMCS
 if [ $IPCFGMETHOD="static" ]; then
     while [ $idev -gt 0 ]; do
@@ -361,7 +361,7 @@ if [ $IPCFGMETHOD="static" ]; then
 else
     if [ -z "$ISOPENBMC" ];then
         let idev=NUMBMCS
-    else 
+    else
         let idev=0
     fi
     while [ $idev -gt 0 ]; do
@@ -371,7 +371,7 @@ else
         while ! ipmitool -d $idev lan set $LANCHAN ipsrc $IPCFGMETHOD; do
             snooze
             let TRIES=TRIES+1
-            if [ $TRIES -gt $TIMEOUT ]; then 
+            if [ $TRIES -gt $TIMEOUT ]; then
                 break;
             fi
         done
@@ -392,11 +392,11 @@ else
     let idev=0
     for b in $BMCVLAN; do
         TRIES=0
-        # Set VLAN for the current channel 
+        # Set VLAN for the current channel
         while ! ipmitool -d $idev lan set $LANCHAN vlan id $b; do
             snooze
             let TRIES=TRIES+1
-            if [ $TRIES -gt $TIMEOUT ]; then 
+            if [ $TRIES -gt $TIMEOUT ]; then
                 break;
             fi
         done
@@ -408,30 +408,30 @@ fi
 # update the node status to 'bmcready' for openbmc, no more configuration is needed.
 if [ ! -z "$ISOPENBMC" ]; then
     # To enable network configuration for openbmc
-    # 
+    #
     # For OpenBMC, FW team still suggest running the raw command instead of access on, use raw for now
     #
     # ipmitool -d 0 lan set $LANCHAN access on
     ipmitool -d 0 raw 0x06 0x40 $LANCHAN 0x42 0x44
     # update the node status to 'bmcready'
     if [ ! -z "$XCATMASTER" ]; then
-        # Wait for some time for the new network setting is ready 
+        # Wait for some time for the new network setting is ready
         snooze
         if ipmitool lan print 1 | grep $BMCIP >/dev/null; then
             updateflag.awk $XCATMASTER 3002 "installstatus bmcready"
         else
             updateflag.awk $XCATMASTER 3002 "installstatus failed"
         fi
-    fi 
+    fi
     rm -f /tmp/ipmicfg.xml
     exit $bmc_config_rc
 fi
 # After network commands are issued, pause to allow the BMC to apply (OpenPOWER)
-snooze 
+snooze
 
 let idev=NUMBMCS-1
 for user in $BMCUS; do
-    if [ "$user" = "" ]; then 
+    if [ "$user" = "" ]; then
         continue
     fi
     DISABLEUSERS=$(ipmitool user list $LANCHAN|grep -v ^ID|grep -v 'NO ACCESS$'|awk '{print $1}')
@@ -457,7 +457,7 @@ for user in $BMCUS; do
     logger -s -t $log_label -p local4.info "CURRENTUSER=$CURRENTUSER, DISABLEUSERS=$DISABLEUSERS"
     for userid in $DISABLEUSERS; do
         TRIES=0
-        # Disable the non-specified user 
+        # Disable the non-specified user
         while ! ipmitool -d $idev user disable $userid; do
             sleep 1
             let TRIES=TRIES+1
@@ -473,7 +473,7 @@ for user in $BMCUS; do
         if [ $TRIES -gt $TIMEOUT ]; then break; fi
     done
     ipmitool raw 6 0x43 $(($LANCHAN|176))  $USERSLOT 4
-    
+
 
     TRIES=0
     # Last param in ipmitool user priv is the channel to set it on.
@@ -483,7 +483,7 @@ for user in $BMCUS; do
     #
     CURRPRIV=`ipmitool -d $idev user list $LANCHAN|grep ^$USERSLOT|awk '{print $6}'`
     logger -s -t $log_label -p local4.info "CURRPRIV=$CURRPRIV"
-    if [ "$CURRPRIV" != "ADMINISTRATOR" ]; then 
+    if [ "$CURRPRIV" != "ADMINISTRATOR" ]; then
         # Set the ADMIN privilege for the specified user
         while ! ipmitool -d $idev user priv $USERSLOT 4 $LANCHAN; do
             sleep 1
@@ -522,7 +522,7 @@ for bmcp in $BMCPW; do
     if [ "$bmcp" = "" ]; then continue; fi
 
     TRIES=0
-    # Set the password for the specified user 
+    # Set the password for the specified user
     while ! ipmitool -d $idev user set password $USERSLOT "$bmcp"; do
         sleep 1
         let TRIES=TRIES+1
@@ -531,7 +531,7 @@ for bmcp in $BMCPW; do
 
     logger -s -t $log_label -p local4.info "Set up following user table: "
     TRIES=0
-    # Display the user list 
+    # Display the user list
     ipmitool -d $idev user list $LANCHAN
     let idev=idev-1
 done
@@ -573,7 +573,7 @@ while [ $idev -gt 0 ]; do
         if [ $TRIES -gt $TIMEOUT ]; then break; fi
     done
     if [ $TRIES -gt $TIMEOUT ]; then logger -s -t $log_label -p local4.err "$MSG: ERROR"; else logger -s -t $log_label -p local4.info "$MSG: OK"; fi
-    
+
     MSG="Enabling IPMI MD5 LAN access"
     logger -s -t $log_label -p local4.info "$MSG"
     TRIES=0
@@ -585,7 +585,7 @@ while [ $idev -gt 0 ]; do
     done
     if [ $TRIES -gt $TIMEOUT ]; then logger -s -t $log_label -p local4.err "$MSG: ERROR"; else logger -s -t $log_label -p local4.info "$MSG: OK"; fi
 
-    if [ ! "$IPMIVER" == "1.5"  ]; then 
+    if [ ! "$IPMIVER" == "1.5"  ]; then
         MSG="Enabling IPMI v 2.0 LAN access"
         logger -s -t $log_label -p local4.info "$MSG"
         # the following goals:
@@ -631,7 +631,7 @@ while [ $idev -gt 0 ]; do
         MSG="Enabling SOL for channel $LANCHAN"
         logger -s -t $log_label -p local4.info "$MSG"
         TRIES=0
-        # Enable the SOL for the channel 
+        # Enable the SOL for the channel
         while ! ipmitool -d $idev raw 0xc 0x21 $LANCHAN 0x1 0x1 > /dev/null; do
             sleep 1
             let TRIES=TRIES+1
@@ -669,10 +669,10 @@ while [ $idev -gt 0 ]; do
             ISOPENPOWER=1
         fi
     fi
- 
-    
+
+
     if [ "$ISOPENPOWER" = '1' ]; then
-        # OpenPOWER BMC specific, turn on the LED beacon light.  
+        # OpenPOWER BMC specific, turn on the LED beacon light.
         #   - default interval, # ipmitool chassis identify
         #                         Chassis identify interval: default (15 seconds)
         #   - 275 is too large, # ipmitool chassis identify 275
diff --git a/xCAT-genesis-scripts/usr/bin/configraid b/xCAT-genesis-scripts/usr/bin/configraid
index 3e2342bf1..3131f42d5 100755
--- a/xCAT-genesis-scripts/usr/bin/configraid
+++ b/xCAT-genesis-scripts/usr/bin/configraid
@@ -1,4 +1,4 @@
-#!/bin/bash 
+#!/bin/bash
 #
 #  This script is used to configure raid.
 #
@@ -63,19 +63,19 @@ function usagesc {
 #
 # handle each create raid
 #
-# input format: stripe_size=16 create_raid=rl#1|pci_id#1014:034a|disk_num#1 
+# input format: stripe_size=16 create_raid=rl#1|pci_id#1014:034a|disk_num#1
 #
 ###############################################################################
 function handle_each_create_raid {
-     
-    local create_raid_list=$1 
+
+    local create_raid_list=$1
     local striple_pair=$2
-      
-    # cut striple_size from striple_pair      
+
+    # cut striple_size from striple_pair
     # if striple_size is null, it will default to the recommended stripe size
     local striple_size=""
     if [ x$striple_pair != x ]; then
-         striple_size=`echo $striple_pair | $awk -F= '{print $2}'` 
+         striple_size=`echo $striple_pair | $awk -F= '{print $2}'`
     else
          striple_size="default"
     fi
@@ -98,7 +98,7 @@ function handle_each_create_raid {
              key=`echo $item | $awk -F# '{print $1}'`
              vla=`echo $item | $awk -F# '{if($1=="disk_names"){$1="";print $0} else { print $2}}' \
                              | $sed -e 's/^\s*//g' -e 's/ /#/g'`
-             case $key in 
+             case $key in
                  rl )
                      raidlevel=$vla
                      ;;
@@ -114,13 +114,13 @@ function handle_each_create_raid {
                  disk_names )
                      disk_names="$vla"
                      ;;
-             esac                  
-         done          
-    fi      
+             esac
+         done
+    fi
 
     if [ x$raidlevel == x ]; then
          log_error "Can not create RAID for $create_raid_list. There is no raid level enter."
-         return 1            
+         return 1
     fi
 
     # if disk_num is null, will pick up all the disks
@@ -128,7 +128,7 @@ function handle_each_create_raid {
          disknum=all
     fi
 
-      
+
     log_info "handle create raid: $create_raid_value"
 
     local pcilocs=""
@@ -150,7 +150,7 @@ function handle_each_create_raid {
         fi
 
         if [ -n "$pcilocs" ]; then
-            handle_create_raid_array "$striple_size" "$raidlevel" "$disknum" "$pcilocs" "null" 
+            handle_create_raid_array "$striple_size" "$raidlevel" "$disknum" "$pcilocs" "null"
         else
             log_error "PCI adapter $pcilocs does not exists!" >&2
             return 1
@@ -162,8 +162,8 @@ function handle_each_create_raid {
 
 ##############################################################################
 #
-# main section to handle delete raid 
-# 
+# main section to handle delete raid
+#
 # input format : delete_raid=[all|dev1#dev2...|null]
 #
 ##############################################################################
@@ -175,7 +175,7 @@ function handle_delete_raid {
     del_value=`echo "$input"|awk -F= '{print $2}'`
     # if delete_raid=all
     if [ "x$del_value" == "xall" -o "x$del_value" == "xALL" ]; then
-       
+
         raid_arrays=`get_all_raid_arrays`
 
     # if delete_raid=null or nothing
@@ -183,9 +183,9 @@ function handle_delete_raid {
 
         log_info "There is no need to delete RAID arrays."
         return 1
-    # if delete_raid=devlist 
+    # if delete_raid=devlist
     else
-        # delete # between raid names        
+        # delete # between raid names
         raid_arrays=`echo ${del_value}|sed 's/#/ /g'`
     fi
 
@@ -194,12 +194,12 @@ function handle_delete_raid {
         res=`is_array $r_a`
         if [ $res -eq 0 ]; then
             if [ "x$valid_arrays" != "x" ]; then
-                valid_arrays=$valid_arrays" "$r_a 
+                valid_arrays=$valid_arrays" "$r_a
             else
                 valid_arrays=$r_a
-            fi 
+            fi
         fi
-    done    
+    done
     if [ "x$valid_arrays" != "x" ]; then
         # delete raid arrays
         delete_ipr_array enforce=1 tryCnt=360 tryInt=60 -- $valid_arrays
@@ -212,7 +212,7 @@ function handle_delete_raid {
 
 #############################################################################################
 #
-# Main section : 
+# Main section :
 #        delete raid
 #        create raid
 #
@@ -242,13 +242,13 @@ do
     cre_raid=`echo "$args" | grep "^create_raid="`
     str_size=`echo "$args" | grep "^stripe_size="`
 
-    if [ x$del_raid != x ]; then 
+    if [ x$del_raid != x ]; then
         del_raid_valid=$del_raid
     fi
-   
+
     if [ x$str_size != x ]; then
         stripe_pair=$str_size
-    fi   
+    fi
 
     # This is for the first create_raid
     if [ x$cre_raid_list == x -a x$cre_raid != x ]; then
diff --git a/xCAT-genesis-scripts/usr/bin/diskdiscover b/xCAT-genesis-scripts/usr/bin/diskdiscover
index a00b43812..7964d1c9c 100755
--- a/xCAT-genesis-scripts/usr/bin/diskdiscover
+++ b/xCAT-genesis-scripts/usr/bin/diskdiscover
@@ -5,12 +5,12 @@
 # This script is to discover disk devices.
 #
 # Input parameter : <PCI_ID> or nothing
-# 
+#
 # Output : disk and RAID arrys information
 #
 #  Examples:
 #  1. When PCI_ID value is 1014:034a, execute "diskdiscover 1014:034a", the output format is as following:
-#   
+#
 #       --------------------------------------------------------------------------
 #       PCI_ID     PCI_SLOT_NAME  Resource_Path  Device  Description   Status
 #       ------     -------------  -------------  ------  -----------   ----------------
@@ -64,7 +64,7 @@ function usagesc {
     echo "Usage: diskdiscover <PCI_ID>"
     echo "       If input parameter is <PCI_ID>, return devices and RAID arrays info by PCI_ID."
     echo "       If there is no value for <PCI_ID>, return all af/jbod disks and RAID arrays info."
-                       
+
 }
 
 ########################################
@@ -74,7 +74,7 @@ function usagesc {
 # if input parameter is PCI_ID:
 #     Get devices and RAID arrays info by PCI_ID
 # if there is no input parameter for PCI_ID :
-#     Get all af disks and jbod disks info 
+#     Get all af disks and jbod disks info
 #     Get all RAID arrays info
 #
 ##########################################
diff --git a/xCAT-genesis-scripts/usr/bin/dodiscovery b/xCAT-genesis-scripts/usr/bin/dodiscovery
index 5a554c0af..1afa958f0 100755
--- a/xCAT-genesis-scripts/usr/bin/dodiscovery
+++ b/xCAT-genesis-scripts/usr/bin/dodiscovery
@@ -4,7 +4,7 @@ log_label="xcat.genesis.dodiscovery"
 #the time when the latest findme request is sent to master
 reqtime=0
 #the timeout value on the waiting for the "processed" response from master
-#when the xcatd on master finished the processing of my findme request, 
+#when the xcatd on master finished the processing of my findme request,
 #a "processed" response will be replied
 maxresptime=180
 
@@ -51,7 +51,7 @@ if [ $timewaiting != 700 -a $timewaiting -gt 450 ]; then
 fi
 logger -s -t $log_label -p local4.info "Network configuration complete, commencing transmit of discovery packets"
 read XCATMASTER XCATPORT < <(grep xcatd= /proc/cmdline| sed 's/.*xcatd=\([^ ]*\).*/\1/' |tr ':' ' ')
-if [[ -z $XCATPORT ]]; then 
+if [[ -z $XCATPORT ]]; then
     XCATPORT=3001
 fi
 export XCATPORT
@@ -60,7 +60,7 @@ export XCATPORT
 while [ ! -r /restart ]; do
 
     #record the current time
-    curtime=$(date +%s)       
+    curtime=$(date +%s)
 
     #the existence of "/processing" indicates that my  findme request is under processing
     if [ -f "/processing"  ]; then
@@ -83,13 +83,13 @@ PLATFORM=unknown
 if [ -r /sys/devices/virtual/dmi/id/product_name ]; then  #x86
 	PRODNAME=`cat /sys/devices/virtual/dmi/id/product_name`
 	IAMAVM=0
-	if [ "$PRODNAME" = "KVM" ]; then 
+	if [ "$PRODNAME" = "KVM" ]; then
 		IAMAVM=1
 		MTM=KVM
 	elif [ "$PRODNAME" = "VMware Virtual Platform" ]; then
 		IAMAVM=1
 		MTM=VMware
-	else 
+	else
 		MTM=`cat /sys/devices/virtual/dmi/id/product_name|awk -F'[' '{print $2}'|awk -F']' '{print $1}'`
 		if [ -z "$MTM" ]; then
 			FRU=`ipmitool fru print 0`
@@ -102,7 +102,7 @@ if [ -r /sys/devices/virtual/dmi/id/product_name ]; then  #x86
 				n=`cat /sys/devices/virtual/dmi/id/product_name`
 				MTM="$m:$n"
 			fi
-		fi 
+		fi
 		SERIAL=`cat /sys/devices/virtual/dmi/id/product_serial`
 	fi
         CPUCOUNT=`cat /proc/cpuinfo |grep "model name"|wc -l`
@@ -121,7 +121,7 @@ elif [ -r /proc/device-tree/model ]; then #POWER
         done
         CPUTYPE=`cat /tmp/cpumod|awk -F':' '{print $2}'|sed -e 's/^ //'`
         SERIAL=`cat /proc/device-tree/system-id -vT | sed -e 's/^.*,//' | sed -e 's/^[\t ]*//'| sed -e 's/[\t ]*\^@//'`
-        # For POWER servers, the /proc/sys/kernel/random/uuid is changing for each query, so use mtms + mac of first up nic as the UUID 
+        # For POWER servers, the /proc/sys/kernel/random/uuid is changing for each query, so use mtms + mac of first up nic as the UUID
         #UUID=`sed -e 's/\(..\)\(..\)\(..\)\(..\)-\(..\)\(..\)-\(..\)\(..\)/\4\3\2\1-\6\5-\8\7/' /proc/sys/kernel/random/uuid`
         UUID=unknown
 
@@ -242,29 +242,29 @@ for dev in `ip link|grep -B1 ether|grep UP|awk '{print $2}'|sed -e s/://|grep -v
         if [ ! -z "$PCI_SLOT" ]; then
         	echo "	<pcidev>$PCI_SLOT</pcidev>" >> /tmp/discopacket
         fi
-        if [ ! -z "$SLOTNAME" ]; then 
+        if [ ! -z "$SLOTNAME" ]; then
         	echo "	<location>$SLOTNAME</location>" >> /tmp/discopacket
         fi
-        if [ ! -z "$ONBOARDINDEX" ]; then 
+        if [ ! -z "$ONBOARDINDEX" ]; then
         	echo "	<onboardeth>$ONBOARDINDEX</onboardeth>" >> /tmp/discopacket
         fi
         if [ ! -z "$FIRMDESC" ]; then
         	echo "	<firmdesc>$FIRMDESC</firmdesc>" >> /tmp/discopacket
         fi
         myswitch=`lldptool -n -i $dev -t -V sysName|grep -v 'System Name TLV'|sed -e 's/^	*//'`
-        if [ ! -z "$myswitch" -a "$myswitch" != "Agent instance for device not found" ]; then
+        if [[ ! -z "$myswitch" && ! "$myswitch" =~ "Agent instance for device not found" ]]; then
         	echo "	<switchname>$myswitch</switchname>" >> /tmp/discopacket
         fi
         for switchaddr in `lldptool -i $dev -n -t -V mngAddr|grep IP|sed -e 's/.*:.//'`; do
-        	if [ "$switchaddr" = "Agent instance for device not found" ]; then break; fi
+        	if [[ "$switchaddr" =~ "Agent instance for device not found" ]]; then break; fi
         	echo "	<switchaddr>$switchaddr</switchaddr>" >> /tmp/discopacket
         done
         myswitchdesc=`lldptool -n -i $dev -t -V sysDesc|grep -v 'System Description TLV'|sed -e 's/^	*//'`
-        if [ ! -z "$myswitchdesc" -a "$myswitchdesc" != "Agent instance for device not found" ]; then	
+        if [[ ! -z "$myswitchdesc" && ! "$myswitchdesc" =~ "Agent instance for device not found" ]]; then
         	echo "	<switchdesc>$myswitchdesc</switchdesc>" >> /tmp/discopacket
         fi
         myport=`lldptool -n -i $dev -t -V portDesc|grep -v 'Port Description TLV'|sed -e 's/^	*//'`
-        if [ ! -z "$myport" -a "$myswitchdesc" != "Agent instance for device not found" ]; then	
+        if [[ ! -z "$myport" && ! "$myport" =~ "Agent instance for device not found" ]]; then
         	echo "	<switchport>$myport</switchport>" >> /tmp/discopacket
         fi
         	
@@ -298,9 +298,9 @@ gzip -9 /tmp/discopacket
 		logger -s -t $log_label -p local4.info "Sending the discovery packet to xCAT ($dhcps:$XCATPORT)..."
 		(cat /tmp/discopacket.gz | udpcat.awk $dhcps $XCATPORT ) &
 	done
-      
+
         #record the time when the "findme request is sent to master"
-        reqtime=$(date +%s) 
+        reqtime=$(date +%s)
 	#cat /tmp/discopacket
 	logger -s -t $log_label -p local4.info "Sleeping 5 seconds..."
 	sleep 5
diff --git a/xCAT-genesis-scripts/usr/bin/doxcat b/xCAT-genesis-scripts/usr/bin/doxcat
index 172972e57..2eb522641 100755
--- a/xCAT-genesis-scripts/usr/bin/doxcat
+++ b/xCAT-genesis-scripts/usr/bin/doxcat
@@ -6,14 +6,14 @@
 log_label="xcat.genesis.doxcat"
 
 # Start rsyslogd and log into a local file specified in /etc/rsyslog.conf
-# Later, once xCAT MN is known, dhclient-script will change 
+# Later, once xCAT MN is known, dhclient-script will change
 # rsyslog.conf file to send log entries to xCAT MN
 RSYSLOGD_VERSION=`rsyslogd -v | grep "rsyslogd" | cut -d" " -f2 | cut -d"." -f1`
 
 # if syslog is running and there's a pid file, kill it before restarting syslogd
-if [ -f /var/run/syslogd.pid ]; then 
+if [ -f /var/run/syslogd.pid ]; then
     kill -TERM `cat /var/run/syslogd.pid`
-fi 
+fi
 
 if [ $RSYSLOGD_VERSION -ge 7 ]; then
     /sbin/rsyslogd
@@ -28,7 +28,7 @@ modprobe acpi_cpufreq 2>/dev/null		# on some machines this fails
 modprobe cpufreq_ondemand
 modprobe ib_ipoib
 if ls /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor &>/dev/null; then
-    if grep -q ondemand /sys/devices/system/cpu/cpu*/cpufreq/scaling_available_governors; then 
+    if grep -q ondemand /sys/devices/system/cpu/cpu*/cpufreq/scaling_available_governors; then
         for gov in /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor; do
             echo -n ondemand > $gov
         done
@@ -39,7 +39,7 @@ if [ ! -z "$BOOTIF" ]; then
 	IBOOTIF=`echo $BOOTIF|sed -e s/^..//`
 	logger -s -t $log_label -p local4.info "Waiting for device with address $BOOTIF to appear.."
 	gripeiter=6000
-	while [ -z "$bootnic" ]; do 
+	while [ -z "$bootnic" ]; do
 		bootnic=`ip link show|grep -B1 $BOOTIF|grep mtu|awk '{print $2}'|sed -e 's/:$//'`
 	        if [ -z "$bootnic" ]; then
 		    bootnic=`ip link show|grep -B1 infiniband|grep -B1 $IBOOTIF|grep mtu|awk '{print $2}'|sed -e 's/:$//'`
@@ -215,7 +215,7 @@ else
                 tries=$(($tries+1))
             done
 
-            logger -s -t $log_label -p local4.info "Acquiring network addresses.."    
+            logger -s -t $log_label -p local4.info "Acquiring network addresses.."
             tries=0
             while [ -z "$bootnic" ]; do
 	        for tmp1 in $ALLUP_NICS; do
@@ -271,7 +271,7 @@ logger -s -t $log_label -p local4.info "Acquired IPv4 address on $bootnic"
 
 ip -4 -o a show dev $bootnic|grep -v 'scope link'|grep -v 'dynamic'|awk '{print $4}'
 
-logger -s -t $log_label -p local4.info "Starting ntpd..." 
+logger -s -t $log_label -p local4.info "Starting ntpd..."
 ntpd -g -x
 
 #TODO(jjohnson2): Replace with some python to get ntp time
@@ -339,7 +339,7 @@ while :; do
         if [ -z "$destiny" -o -n "$grepconfigraid" ]; then
                 logger -s -t $log_label -p local4.info "Running getdestiny --> $XCATMASTER:$XCATPORT"
                 destiny=`getdestiny $XCATMASTER:$XCATPORT`
-        	logger -s -t $log_label -p local4.info "Received destiny=$destiny" 
+        	logger -s -t $log_label -p local4.info "Received destiny=$destiny"
 	fi
 
 	# parse out some values from the destiny
@@ -367,7 +367,7 @@ while :; do
 		/bin/bash
 		logger -s -t $log_label -p local4.info "Exited shell."
 		logger -s -t $log_label -p local4.info "Running nextdestiny $XCATMASTER:$XCATPORT..."
-		/bin/nextdestiny $XCATMASTER:$XCATPORT      
+		/bin/nextdestiny $XCATMASTER:$XCATPORT
 		logger -s -t $log_label -p local4.info "nextdestiny - Complete."
         elif [ "$dest" = osimage ]; then
 		logger -s -t $log_label -p local4.info "Running nextdestiny $XCATMASTER:$XCATPORT..."
@@ -430,11 +430,11 @@ while :; do
                 /bin/dosysclone
                 logger -s -t $log_label -p local4.info "dosysclone - Complete."
                 destiny=''
-                dest='' 
+                dest=''
 	elif [ "$dest" = standby ]; then
 		delay=$((30+$RANDOM%270))
 		while [ $delay -gt 0 ]; do
-			if [ $((delay%10)) == 0 ]; then 
+			if [ $((delay%10)) == 0 ]; then
 				if [ "$XCAT_DISCOVERY_WAS_DONE" == 1 ]; then
 					logger -s -t $log_label -p local4.info "Received request=$dest, will call xCAT back in $delay seconds. Discovery is complete, run nodeset on this node to provision an Operating System"
 				else
@@ -450,7 +450,7 @@ while :; do
 	elif [ "$dest" = shutdown ]; then
 		logger -s -t $log_label -p local4.info "Poweroff..."
 		poweroff -f
-	else 
+	else
                 if [ "$dest" = error ]; then
                     logger -s -t $log_label -p local4.info "$destparameter"
                 else
@@ -460,7 +460,7 @@ while :; do
 		dest=''
 		delay=$((30+$RANDOM%270))
 		while [ $delay -gt 0 ]; do
-			if [ $((delay%10)) == 0 ]; then 
+			if [ $((delay%10)) == 0 ]; then
 				logger -s -t $log_label -p local4.info "... Will retry xCAT in $delay seconds"
 			fi
 			delay=$((delay-1))
diff --git a/xCAT-genesis-scripts/usr/bin/getadapter b/xCAT-genesis-scripts/usr/bin/getadapter
index c91dae564..918d92b97 100755
--- a/xCAT-genesis-scripts/usr/bin/getadapter
+++ b/xCAT-genesis-scripts/usr/bin/getadapter
@@ -7,7 +7,7 @@ export XCATPORT
 ADAPTERFILE="/tmp/adapterinfo"
 SCANNICLOG="/tmp/adapterscan.log"
 
-rm -f "$SCANNICLOG" >/dev/null 2>&1 
+rm -f "$SCANNICLOG" >/dev/null 2>&1
 
 if [ -f "$ADAPTERFILE" ]; then
     echo "rm -f $ADAPTERFILE" > "$SCANNICLOG"
@@ -56,7 +56,7 @@ for n in /sys/class/net/*; do
 done
 
 for pci in `lspci |awk '/Ethernet/ {print $1}' `; do
-    if ! grep -q "$pci" "$ADAPTERFILE" 2>/dev/null; then 
+    if ! grep -q "$pci" "$ADAPTERFILE" 2>/dev/null; then
         tmp=`lspci |grep "$pci"`
         echo '<nic>' >> "$ADAPTERFILE"
         echo "<pcilocation>$pci</pcilocation>" >> "$ADAPTERFILE"
@@ -66,7 +66,7 @@ for pci in `lspci |awk '/Ethernet/ {print $1}' `; do
 done
 
 for pci in `lspci |awk '/Network/ {print $1}' `; do
-    if ! grep -q "$pci" "$ADAPTERFILE" 2>/dev/null; then 
+    if ! grep -q "$pci" "$ADAPTERFILE" 2>/dev/null; then
         tmp=`lspci |grep "$pci"`
         echo '<nic>' >> "$ADAPTERFILE"
         echo "<pcilocation>$pci</pcilocation>" >> "$ADAPTERFILE"
@@ -76,7 +76,7 @@ for pci in `lspci |awk '/Network/ {print $1}' `; do
 done
 
 for pci in `lspci |awk '/Mellanox/ {print $1}' `; do
-    if ! grep -q "$pci" "$ADAPTERFILE" 2>/dev/null; then 
+    if ! grep -q "$pci" "$ADAPTERFILE" 2>/dev/null; then
         tmp=`lspci |grep "$pci"`
         echo '<nic>' >> "$ADAPTERFILE"
         echo "<pcilocation>$pci</pcilocation>" >> "$ADAPTERFILE"
@@ -108,4 +108,4 @@ else
              openssl s_client -connect $dhcps:$XCATPORT  <"$ADAPTERFILE"  >>"$SCANNICLOG" 2>&1
         fi
     fi
-fi
\ No newline at end of file
+fi
diff --git a/xCAT-genesis-scripts/usr/bin/getcert b/xCAT-genesis-scripts/usr/bin/getcert
index f00ffc5b9..5cb40906d 100755
--- a/xCAT-genesis-scripts/usr/bin/getcert
+++ b/xCAT-genesis-scripts/usr/bin/getcert
@@ -27,7 +27,7 @@ cat /tmp/certreq.xml |while read line; do
         echo $line >> /tmp/certreq.xml.new
 done
 mv /tmp/certreq.xml.new /tmp/certreq.xml
-rm /tmp/certreq.b64sig /tmp/certreq.sha512 
+rm /tmp/certreq.b64sig /tmp/certreq.sha512
 cat /tmp/certreq.xml | openssl s_client -connect $XCATDEST -quiet 2> /dev/null > /tmp/certresp.xml
 if grep 'BEGIN CERTIFICATE' /tmp/certresp.xml > /dev/null; then
 	awk '/BEGIN CERTIFICATE/,/END CERTIFICATE/' < /tmp/certresp.xml > /etc/xcat/cert.pem
diff --git a/xCAT-genesis-scripts/usr/bin/getipmi b/xCAT-genesis-scripts/usr/bin/getipmi
index cec1af653..fab0abb54 100755
--- a/xCAT-genesis-scripts/usr/bin/getipmi
+++ b/xCAT-genesis-scripts/usr/bin/getipmi
@@ -22,10 +22,10 @@ if [ -z "$XCATDEST" ]; then
     XCATDEST=$MASTER_IP:$XCATDPORT
 fi
 
-for LANCHAN in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16; do 
-   if ipmitool channel info $LANCHAN 2> /dev/null | grep 802.3 > /dev/null 2>&1 && ipmitool raw 0xc 2 $LANCHAN 5 0 0 > /dev/null 2>&1; 
-     then break; 
-   fi; 
+for LANCHAN in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16; do
+   if ipmitool channel info $LANCHAN 2> /dev/null | grep 802.3 > /dev/null 2>&1 && ipmitool raw 0xc 2 $LANCHAN 5 0 0 > /dev/null 2>&1;
+     then break;
+   fi;
 done
 BMCMAC=`ipmitool lan print $LANCHAN|grep ^MAC|awk '{print $4}'` #bmcconfig may opt to use DHCP, if so we need to feed up the mac address
 #TODO: need a way to get the DUID the service processor may use, perhaps reserve that for 'ibmsetup' since spec doesn't touch ipv6?
diff --git a/xCAT-genesis-scripts/usr/bin/raidcmd b/xCAT-genesis-scripts/usr/bin/raidcmd
index e170b0760..266c65727 100755
--- a/xCAT-genesis-scripts/usr/bin/raidcmd
+++ b/xCAT-genesis-scripts/usr/bin/raidcmd
@@ -6,8 +6,8 @@ iprconfig="iprconfig"
 
 ########################################
 #
-#  iprconfig show-config 
-# 
+#  iprconfig show-config
+#
 ########################################
 function cmd_show_config {
     local lines=""
diff --git a/xCAT-genesis-scripts/usr/bin/raidutils b/xCAT-genesis-scripts/usr/bin/raidutils
index ea472594a..684327db4 100755
--- a/xCAT-genesis-scripts/usr/bin/raidutils
+++ b/xCAT-genesis-scripts/usr/bin/raidutils
@@ -40,7 +40,7 @@ str_dir_name=`dirname $0`
 #
 #  input: pci_id
 #
-#  output: pci locations 
+#  output: pci locations
 #
 ################################################################
 function get_pciloc_by_id {
@@ -67,7 +67,7 @@ function get_pciloc_by_id {
 #
 # input: slocs, for example, 0:0:0:0 0:0:1:0
 #
-# output: <sloc>=<device_name> ... 
+# output: <sloc>=<device_name> ...
 #         <sloc>=<device_name>
 #
 ######################################################
@@ -93,7 +93,7 @@ function convert_sloc_to_sg {
 #
 #  Through PCI/SCSI device to find PCI/SCSI location
 #
-#  input: device names, 
+#  input: device names,
 #         sg0 ...sgn
 #
 #  output: <dev>=<sloc>... <dev>=<sloc>
@@ -170,7 +170,7 @@ function get_raid_create_devices_by_pciloc {
 # return list of ioas on target pciloc with order of Primary --> Secondary --> Others
 #
 # input: pci locations
-# 
+#
 # output: sorted raid adapters location list
 #
 #########################################################################################
@@ -255,7 +255,7 @@ function cut_sloc_from_iprconfig_line {
 #
 # input: pci locations
 #
-# output:  descriptions and status from "iprconfig -c show-config" 
+# output:  descriptions and status from "iprconfig -c show-config"
 #
 ###################################################################
 function find_desc_status_sg {
@@ -274,7 +274,7 @@ function find_desc_status_sg {
         echo $slocs
     done
     return 0
-    
+
 }
 
 #######################################################
@@ -325,7 +325,7 @@ function get_ipr_arrays_by_pciloc {
     local lines=$(cmd_show_arrays)
     local slocs=`for pciloc in $pcilocs
     do
-        echo "$lines" 
+        echo "$lines"
     done `
     [ -n "$slocs" ] && echo "$slocs"
     return 0
@@ -333,7 +333,7 @@ function get_ipr_arrays_by_pciloc {
 
 #####################################################################
 #
-# get all af and jbod disks 
+# get all af and jbod disks
 #
 # input: no
 #
@@ -423,7 +423,7 @@ function get_PCI_ID {
 #
 # output: 0  exist
 #         1  not
-# 
+#
 ##########################################
 function sloc_exist {
     local __sloc="$1"
@@ -488,7 +488,7 @@ function cut_pciloc_from_iprconfig_line {
 # input : array name
 #
 # output : member sloc list
-#          "member_sloc1 member_sloc2 ...." 
+#          "member_sloc1 member_sloc2 ...."
 #
 #############################################
 function get_ipr_array_members {
@@ -645,7 +645,7 @@ function delete_disks_belong_array_from_slocs {
 #
 #         left: member disks , iprconfig_args
 #
-# output : 
+# output :
 #
 ################################################################################
 function create_ipr_array {
diff --git a/xCAT-genesis-scripts/usr/bin/remoteimmsetup b/xCAT-genesis-scripts/usr/bin/remoteimmsetup
index 7be13ab60..027797e5c 100755
--- a/xCAT-genesis-scripts/usr/bin/remoteimmsetup
+++ b/xCAT-genesis-scripts/usr/bin/remoteimmsetup
@@ -10,10 +10,10 @@ if [ -z "$XCATDEST" ]; then
 		fi
 	done
 fi
-for LANCHAN in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16; do 
-   if ipmitool channel info $LANCHAN 2> /dev/null | grep 802.3 > /dev/null 2>&1 && ipmitool raw 0xc 2 $LANCHAN 5 0 0 > /dev/null 2>&1; 
-     then break; 
-   fi; 
+for LANCHAN in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16; do
+   if ipmitool channel info $LANCHAN 2> /dev/null | grep 802.3 > /dev/null 2>&1 && ipmitool raw 0xc 2 $LANCHAN 5 0 0 > /dev/null 2>&1;
+     then break;
+   fi;
 done
 BMCMAC=`ipmitool lan print $LANCHAN|grep ^MAC|awk '{print $4}'` #bmcconfig may opt to use DHCP, if so we need to feed up the mac address
 #TODO: need a way to get the DUID the service processor may use, perhaps reserve that for 'ibmsetup' since spec doesn't touch ipv6?
diff --git a/xCAT-genesis-scripts/usr/bin/restart b/xCAT-genesis-scripts/usr/bin/restart
index a19b862dc..5b5e04dc0 100755
--- a/xCAT-genesis-scripts/usr/bin/restart
+++ b/xCAT-genesis-scripts/usr/bin/restart
@@ -27,7 +27,7 @@ while [ $WAITING -gt 0 ]; do
     for pidfile in /var/run/dhclient.*.pid; do
 	NIC=`echo $pidfile|awk -F. '{print $2}'`
 	dhclient -r -1 -cf /etc/dhclient.conf -pf $pidfile $NIC
-	ip -4 addr flush dev $NIC 
+	ip -4 addr flush dev $NIC
 	dhclient -cf /etc/dhclient.conf -nw -pf $pidfile $NIC
     done
     for pidfile in /var/run/dhclient6.*.pid; do
@@ -37,13 +37,13 @@ while [ $WAITING -gt 0 ]; do
 	ip -6 addr flush dev $NIC  scope site
 	dhclient -6 -pf $pidfile -nw -lf /var/lib/dhclient/dhclient6.leases $NIC
     done
-    
+
     echo -en "Waiting 10 seconds for DHCP changes to take effect          \r"
     for i in 9 8 7 6 5 4 3 2 1; do
        sleep 1
        echo -en "Waiting $i seconds for DHCP changes to take effect    \r"
     done
-    
+
     # restart rsyslog after dhclient
     kill -9 `cat /var/run/syslogd.pid`
     sleep 3
@@ -73,7 +73,7 @@ while [ $WAITING -gt 0 ]; do
         fi
     fi
 done
-        
+
 echo "Done waiting                                                                                                                              ";
 #/etc/init.d/S11stunnel #redo stunnel config
 #exec /etc/init.d/S99xcat.sh
diff --git a/xCAT-genesis-scripts/usr/bin/update_flash b/xCAT-genesis-scripts/usr/bin/update_flash
index 5f3b2e5a6..bc8ab2659 100755
--- a/xCAT-genesis-scripts/usr/bin/update_flash
+++ b/xCAT-genesis-scripts/usr/bin/update_flash
@@ -48,11 +48,11 @@ FLASH_IMG_NULL_DATA=-1003 	# Bad data value in flash list block
 FLASH_IMG_READY=0     		# Firmware img ready for flash on reboot
 
 # manage_flash Status Values
-MANAGE_AUTH=-9002 		# RTAS Not Service Authority Partition 
-MANAGE_ACTIVE_ERR=-9001 	# RTAS Cannot Overwrite Active Img 
-MANAGE_NO_OP=-1099 		# No operation initiated by user 
-MANAGE_PARAM_ERR=-3    		# RTAS Parameter Error 
-MANAGE_HW_ERR=-1    		# RTAS Hardware Error 
+MANAGE_AUTH=-9002 		# RTAS Not Service Authority Partition
+MANAGE_ACTIVE_ERR=-9001 	# RTAS Cannot Overwrite Active Img
+MANAGE_NO_OP=-1099 		# No operation initiated by user
+MANAGE_PARAM_ERR=-3    		# RTAS Parameter Error
+MANAGE_HW_ERR=-1    		# RTAS Hardware Error
 MANAGE_SUCCESS=0		# Operation Successful
 
 # validate_flash Status Values
@@ -102,7 +102,7 @@ usage() {
 	echo "		-n		Do not overwrite Permanent side" >&2
 	echo "				image automatically." >&2
 	echo "		-f <filename>	Update with given image file.  If possible," >&2
-	echo "				the image is automatically validated prior" >&2 
+	echo "				the image is automatically validated prior" >&2
 	echo "				to update." >&2
 	echo "" >&2
 	exit $exit_code
@@ -111,7 +111,7 @@ usage() {
 query_support() {
 	local exit_status=$E_UNSUPPORTED
 
-	if [ ! -r "$PROCVALIDATE" ]; then 
+	if [ ! -r "$PROCVALIDATE" ]; then
 		modprobe rtas_flash || error $E_MODULE "could not load rtas_flash kernel module"
 	fi
 
@@ -184,7 +184,7 @@ echo_validate_return_status() {
 	local rc=$(echo "$output" | head -n 1)
 	local rtas_buf=$(echo "$output" | tail -n +2)
 
-	[ $# -eq 1 ] || error $E_USAGE "echo_validate_return_status(): usage" 
+	[ $# -eq 1 ] || error $E_USAGE "echo_validate_return_status(): usage"
 
 	case "$rc" in
 	$VALIDATE_PARAM_ERR)	
@@ -257,9 +257,9 @@ validate_flash() {
 validate_flash_from_file() {
 	local img_file=$1
 
-	[ $# -eq 1 ] || error $E_USAGE "validate_flash_from_file(): usage" 
+	[ $# -eq 1 ] || error $E_USAGE "validate_flash_from_file(): usage"
 
-	if [ ! -r "$PROCVALIDATE" ]; then 
+	if [ ! -r "$PROCVALIDATE" ]; then
 		modprobe rtas_flash || error $E_MODULE "could not load rtas_flash kernel module"
 		[ -r "$PROCVALIDATE" ] || error $E_PROC_FS "rtas_flash kernel module did not create $PROCVALIDATE"
 	fi
@@ -267,7 +267,7 @@ validate_flash_from_file() {
 	if validate_flash $img_file; then
 		return 0;
 	else
-		case "$?" in 
+		case "$?" in
 		$E_PROC_FS) error $E_PROC_FS "validate: $PROCVALIDATE does not exist";;
 		$E_RTAS) error $E_RTAS "validate: firmware validation not supported on this system";;
 		esac
@@ -277,16 +277,16 @@ validate_flash_from_file() {
 echo_update_status() {
 	local rc="$1"
 	
-	[ $# -eq 1 ] || error $E_USAGE "echo_update_status(): usage" 
+	[ $# -eq 1 ] || error $E_USAGE "echo_update_status(): usage"
 
 	case "$rc" in
-	$FLASH_AUTH) 
+	$FLASH_AUTH)
 		error $E_RTAS "RTAS: Partition does not have authority";;
-	$FLASH_IMG_SHORT) 
+	$FLASH_IMG_SHORT)
 		error $E_IMAGE "Flash image shorter than expected";;
-	$FLASH_IMG_BAD_LEN) 
+	$FLASH_IMG_BAD_LEN)
 		error $E_PROC_FS "Bad length value in flash list block";;
-	$FLASH_IMG_NULL_DATA) 
+	$FLASH_IMG_NULL_DATA)
 		error $E_PROC_FS "Bad data value in flash list block";;
 	$FLASH_IMG_READY)
 		echo "Flash image ready...rebooting the system...";;
@@ -299,13 +299,13 @@ update_flash_from_file() {
 	local output=""
 	local oldkernel=0
 
-	[ $# -eq 1 ] || error $E_USAGE "update_flash_from_file(): usage" 
+	[ $# -eq 1 ] || error $E_USAGE "update_flash_from_file(): usage"
 
 	[ -r "$img_file" ] || error $E_IMAGE "cannot read $img_file"
 
 	flashfile=$PROCFLASH
-	if [ ! -r "$PROCFLASH" ]; then 
-		modprobe rtas_flash 
+	if [ ! -r "$PROCFLASH" ]; then
+		modprobe rtas_flash
 		if [ ! -r "$PROCFLASH" ]; then
 			if [ -r "$OLDPROCFLASH" ]; then
 				oldkernel=1
@@ -340,12 +340,12 @@ echo_manage_return_status() {
 	local output=$2
 	local rc=$(echo $output)
 
-	[ $# -eq 2 ] || error $E_USAGE "echo_manage_return_status(): usage" 
+	[ $# -eq 2 ] || error $E_USAGE "echo_manage_return_status(): usage"
 	
 	case "$rc" in
 	$MANAGE_AUTH)
 		error $E_RTAS "RTAS: manage() Partition does not have authority";;
-	$MANAGE_ACTIVE_ERR)  
+	$MANAGE_ACTIVE_ERR)
 		error $E_RTAS "RTAS: manage() Cannot Overwrite the Active Firmware Image";;
 	$MANAGE_PARAM_ERR)	
 		error $E_RTAS "RTAS: manage() Parameter Error";;
@@ -368,9 +368,9 @@ manage_flash() {
 	local reject_str="0"
 	local output=""
 	
-	[ $# -eq 1 ] || error $E_USAGE "manage_flash(): usage" 
+	[ $# -eq 1 ] || error $E_USAGE "manage_flash(): usage"
 	
-	if [ ! -r "$PROCMANAGE" ]; then 
+	if [ ! -r "$PROCMANAGE" ]; then
 		modprobe rtas_flash || error $E_MODULE "could not load rtas_flash kernel module"
 		[ -r "$PROCMANAGE" ] || error $E_PROC_FS "rtas_flash kernel module did not create $PROCMANAGE"
 	fi
diff --git a/xCAT-genesis-scripts/usr/bin/updateflag.awk b/xCAT-genesis-scripts/usr/bin/updateflag.awk
index 66fbc9ebf..96848f4bb 100755
--- a/xCAT-genesis-scripts/usr/bin/updateflag.awk
+++ b/xCAT-genesis-scripts/usr/bin/updateflag.awk
@@ -5,7 +5,7 @@ BEGIN {
     xcatdhost = ARGV[1]
     xcatdport = ARGV[2]
     flag = ARGV[3]
-    
+
 	if (!flag) flag = "next"
 
 	ns = "/inet/tcp/0/" ARGV[1] "/" xcatdport
diff --git a/xCAT-openbmc-py/debian/changelog b/xCAT-openbmc-py/debian/changelog
index 581c4d50e..4025f560b 100644
--- a/xCAT-openbmc-py/debian/changelog
+++ b/xCAT-openbmc-py/debian/changelog
@@ -1,6 +1,6 @@
 xcat-openbmc-py (2.13.11-snap201802080225) UNRELEASED; urgency=medium
- 
-  
-  
+
+
+
 
  -- root <root@c910f03c05k10>  Thu, 08 Feb 2018 02:25:50 -0500
diff --git a/xCAT-openbmc-py/lib/python/agent/common/utils.py b/xCAT-openbmc-py/lib/python/agent/common/utils.py
index 84e925d9a..252541b6c 100644
--- a/xCAT-openbmc-py/lib/python/agent/common/utils.py
+++ b/xCAT-openbmc-py/lib/python/agent/common/utils.py
@@ -72,7 +72,7 @@ def recv_all(sock, size):
 def update2Ddict(updata_dict, key_a, key_b, value):
     if key_a in updata_dict:
         updata_dict[key_a].update({key_b: value})
-    else: 
+    else:
         updata_dict.update({key_a: {key_b: value}})
 
 def emb_numbers(string):
@@ -97,7 +97,7 @@ def mask_int2str(mask_int):
     return "%s.%s.%s.%s" % (str((mask_num >> 24) & 0xff), str((mask_num >>16)&0xff), str((mask_num >> 8) & 0xff), str(mask_num & 0xff))
 
 def get_full_path(cwd, directory):
-    if not os.path.isabs(directory): 
+    if not os.path.isabs(directory):
         directory = os.path.join(cwd, directory)
     return directory
 
diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py
index cd108fb42..fa1377626 100644
--- a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py
@@ -39,7 +39,7 @@ class OpenBMCBmcConfigTask(ParallelNodesCommand):
        if download_arg == 'all':
             self.callback.info('Downloading all dumps...')
        if not os.path.exists(XCAT_LOG_DUMP_DIR):
-            os.makedirs(XCAT_LOG_DUMP_DIR) 
+            os.makedirs(XCAT_LOG_DUMP_DIR)
 
     def pre_dump_process(self, task, **kw):
 
@@ -158,9 +158,9 @@ class OpenBMCBmcConfigTask(ParallelNodesCommand):
             obmc.login()
             flag = False
             dump_id = obmc.create_dump()
-            self.callback.info('%s: Dump requested. Target ID is %s, waiting for BMC to generate...'  % (node, dump_id)) 
+            self.callback.info('%s: Dump requested. Target ID is %s, waiting for BMC to generate...'  % (node, dump_id))
             for i in range(20):
-                dump_dict = obmc.list_dump_info()            
+                dump_dict = obmc.list_dump_info()
                 if dump_id in dump_dict:
                     flag = True
                     break
@@ -169,7 +169,7 @@ class OpenBMCBmcConfigTask(ParallelNodesCommand):
 
                 sleep( 15 )
 
-            if flag: 
+            if flag:
                 self._dump_download(obmc, node, str(dump_id), flag_dump_process=True)
             else:
                 self.callback.error('Could not find dump %s after waiting %d seconds.' % (dump_id, 20 * 15), node)
@@ -270,7 +270,7 @@ rmdir \"/tmp/$userid\" \n")
                 self.callback.error("get_attributes can not deal with attr %s" % attr, kw['node'])
         if len(netinfo_dict):
             self._get_netinfo(ip=netinfo_dict.get('ip', False), ipsrc=netinfo_dict.get('ipsrc', False), netmask=netinfo_dict.get('netmask', False),
-                              gateway=netinfo_dict.get('gateway', False),vlan= netinfo_dict.get('vlan', False), 
+                              gateway=netinfo_dict.get('gateway', False),vlan= netinfo_dict.get('vlan', False),
                               hostname=netinfo_dict.get('hostname', False),
                               ntpservers=netinfo_dict.get('ntpservers', False), **kw)
 
@@ -306,7 +306,7 @@ rmdir \"/tmp/$userid\" \n")
             else:
                 return self.callback.error("Invalid OpenBMC Hostname %s, can't set to OpenBMC" % kw['nodeinfo']['bmc'], node)
         self._set_apis_values("hostname", hostname, **kw)
-        self._get_netinfo(hostname=True, ntpserver=False, **kw) 
+        self._get_netinfo(hostname=True, ntpserver=False, **kw)
         return
 
     def _set_ntp_servers(self, servers, **kw):
@@ -491,7 +491,7 @@ rmdir \"/tmp/$userid\" \n")
 
         set_success = False
         for net_id, attr in nic_netinfo.items():
-            if (attr['ip'] == ip and 
+            if (attr['ip'] == ip and
                 attr["netmask"] == prefix and
                 attr['gateway'] == gateway):
                 set_success = True
@@ -538,7 +538,7 @@ rmdir \"/tmp/$userid\" \n")
         if 'error' in netinfo:
             return self.callback.info('%s: %s' % (node, netinfo['error']))
 
-        dic_length = len(netinfo) 
+        dic_length = len(netinfo)
         netinfodict = {'ip':[], 'netmask':[], 'gateway':[],
                    'vlan':[], 'ipsrc':[], 'ntpservers':[]}
         for nic,attrs in netinfo.items():
diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_eventlog.py b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_eventlog.py
index baf530c2a..2f4242ed0 100644
--- a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_eventlog.py
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_eventlog.py
@@ -31,7 +31,7 @@ class OpenBMCEventlogTask(ParallelNodesCommand):
             # All records to display
             number_to_display = 0
 
-        obmc = openbmc.OpenBMCRest(name=node, nodeinfo=kw['nodeinfo'], messager=self.callback, debugmode=self.debugmode, verbose=self.verbose) 
+        obmc = openbmc.OpenBMCRest(name=node, nodeinfo=kw['nodeinfo'], messager=self.callback, debugmode=self.debugmode, verbose=self.verbose)
         eventlog_info = []
         try:
             obmc.login()
@@ -56,7 +56,7 @@ class OpenBMCEventlogTask(ParallelNodesCommand):
     def clear_all_ev_records(self, **kw):
 
         node = kw['node']
-        obmc = openbmc.OpenBMCRest(name=node, nodeinfo=kw['nodeinfo'], messager=self.callback, debugmode=self.debugmode, verbose=self.verbose) 
+        obmc = openbmc.OpenBMCRest(name=node, nodeinfo=kw['nodeinfo'], messager=self.callback, debugmode=self.debugmode, verbose=self.verbose)
         try:
             obmc.login()
             obmc.clear_all_eventlog_records()
@@ -87,7 +87,7 @@ class OpenBMCEventlogTask(ParallelNodesCommand):
                 # loop through eventlog_info_dict and collect LED ids to be resolved into a eventlog_ids_to_resolve array
                 for key in list(keys):
                     if "[LED]" in eventlog_info_dict[key]:
-                        if "Resolved: 0" in eventlog_info_dict[key]:
+                        if "Resolved: 0" or "Resolved: false" in eventlog_info_dict[key]:
                             eventlog_ids_to_resolve.append(key)
                         else:
                             if self.verbose:
@@ -96,7 +96,7 @@ class OpenBMCEventlogTask(ParallelNodesCommand):
                 # loop through list of ids and collect ids to resolve into a eventlog_ids_to_resolve array
                 for id_to_resolve in ids.split(','):
                     if id_to_resolve in eventlog_info_dict:
-                        if "Resolved: 0" in eventlog_info_dict[id_to_resolve]:
+                        if "Resolved: 0" or "Resolved: false" in eventlog_info_dict[id_to_resolve]:
                             eventlog_ids_to_resolve.append(id_to_resolve)
                         else:
                             if self.verbose:
diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_flash.py b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_flash.py
index 43be329ea..2b4d21bf7 100644
--- a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_flash.py
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_flash.py
@@ -35,7 +35,7 @@ class OpenBMCFlashTask(ParallelNodesCommand):
         elif not checkv:
             self.callback.info('%s: %s' % (node, msg))
         elif self.verbose:
-            self.callback.info('%s: %s' % (node, msg)) 
+            self.callback.info('%s: %s' % (node, msg))
 
         if update_rc:
             self.activate_result.update({node: msg})
@@ -59,7 +59,7 @@ class OpenBMCFlashTask(ParallelNodesCommand):
             error = 'Cannot access %s. Check the management ' \
                      'node and/or service nodes.' % target_file
             self.callback.error(error)
-            raise Exception('Invalid firmware file %s' % target_file) 
+            raise Exception('Invalid firmware file %s' % target_file)
 
     def validate_activate_firm(self, task, activate_arg, **kw):
 
@@ -99,7 +99,7 @@ class OpenBMCFlashTask(ParallelNodesCommand):
 
         if activate_arg.endswith('.tar'):
             version = self._get_firmware_version(self.firmware_file)
-            self.firmware.update(version) 
+            self.firmware.update(version)
             self.callback.info('Attempting to upload %s, please wait...' % self.firmware_file)
         else:
             self.callback.info('Attempting to activate ID=%s, please wait..' % activate_arg)
@@ -185,7 +185,7 @@ class OpenBMCFlashTask(ParallelNodesCommand):
             for i in version_list:
                 msg = 'Could not find ID for firmware %s to '\
                       'activate, waiting %d seconds and retry...' \
-                       % (i, 10) 
+                       % (i, 10)
                 self._msg_process(node, msg, update_rc=True, checkv=True)
             gevent.sleep ( 10 )
 
@@ -196,9 +196,9 @@ class OpenBMCFlashTask(ParallelNodesCommand):
             self._msg_process(node, msg, msg_type='E')
 
         if error:
-            msg = ' '.join(error) 
+            msg = ' '.join(error)
             self.activate_result.update({node: msg})
-            return [] 
+            return []
 
     def _check_id_status(self, obmc, check_ids, node, only_act=True):
 
@@ -207,7 +207,7 @@ class OpenBMCFlashTask(ParallelNodesCommand):
         process_status = {}
         for i in range(80):
             try:
-                has_functional, firm_obj_dict = obmc.list_firmware() 
+                has_functional, firm_obj_dict = obmc.list_firmware()
             except (SelfServerException, SelfClientException) as e:
                 return self._msg_process(node, e.message, msg_type='E', update_rc=True)
 
@@ -241,7 +241,7 @@ class OpenBMCFlashTask(ParallelNodesCommand):
             msg = 'After %d seconds check the firmware id %s current status is "%s"' \
                   % (80*15, process_status[i], i)
             error.append(msg)
-            self._msg_process(node, msg, msg_type='E') 
+            self._msg_process(node, msg, msg_type='E')
 
         if error:
             msg = ' '.join(error)
@@ -259,8 +259,8 @@ class OpenBMCFlashTask(ParallelNodesCommand):
         if error:
             msg = ' '.join(error)
             self.activate_result.update({node: msg})
-            return 
-        
+            return
+
         self.activate_result.update({node: 'SUCCESS'})
 
     def _reboot_to_effect(self, obmc, no_host_reboot, node):
@@ -281,7 +281,7 @@ class OpenBMCFlashTask(ParallelNodesCommand):
         gevent.sleep( 10 )
 
         bmc_state = None
-        for i in range(20): 
+        for i in range(20):
             try:
                 obmc.login()
                 state = obmc.get_bmc_state()
@@ -301,7 +301,7 @@ class OpenBMCFlashTask(ParallelNodesCommand):
             return self._msg_process(node, error, msg_type='E', update_rc=True)
 
         self._msg_process(node, 'BMC %s' % bmc_state, update_rc=True)
-        
+
         if no_host_reboot:
             self.activate_result.update({node: 'SUCCESS'})
             return
@@ -331,7 +331,7 @@ class OpenBMCFlashTask(ParallelNodesCommand):
             self.callback.update_node_attributes('status', node, 'powering-on')
 
             self._msg_process(node, 'reset')
-            self.activate_result.update({node: 'SUCCESS'}) 
+            self.activate_result.update({node: 'SUCCESS'})
         except (SelfServerException, SelfClientException) as e:
             self._msg_process(node, e.message, update_rc=True)
 
@@ -348,7 +348,7 @@ class OpenBMCFlashTask(ParallelNodesCommand):
 
         firmware_version = ''
         if self.firmware_file:
-            firmware_version = self.firmware.keys()[0] 
+            firmware_version = self.firmware.keys()[0]
             try:
                 obmc.upload_firmware(self.firmware_file)
             except (SelfServerException, SelfClientException) as e:
@@ -427,7 +427,7 @@ class OpenBMCFlashTask(ParallelNodesCommand):
         try:
             obmc.delete_firmware(delete_id)
         except SelfServerException as e:
-            error = e.message 
+            error = e.message
         except SelfClientException as e:
             if e.code == 404:
                 error = 'Invalid ID provided to delete. ' \
@@ -452,7 +452,7 @@ class OpenBMCFlashTask(ParallelNodesCommand):
             return self._msg_process(node, e.message, msg_type='E', update_rc=True)
 
         try:
-            for key, value in self.firmware.items(): 
+            for key, value in self.firmware.items():
                 obmc.upload_firmware(value['file'])
         except (SelfServerException, SelfClientException) as e:
             return self._msg_process(node, e.message, msg_type='E', update_rc=True)
@@ -474,7 +474,7 @@ class OpenBMCFlashTask(ParallelNodesCommand):
                 else:
                     error = e.message
             if error:
-                return self._msg_process(node, error, msg_type='E', update_rc=True) 
+                return self._msg_process(node, error, msg_type='E', update_rc=True)
 
         for key in self.firmware:
             msg = 'rflash %s started, please wait...' % key
@@ -560,13 +560,13 @@ class OpenBMCFlashTask(ParallelNodesCommand):
                 failed_num += 1
                 failed_list.append('%s: %s' % (key, value))
 
-        self.callback.info('-' * 55)
-        self.callback.info('%s complete: Total=%d Success=%d Failed=%d' % \
+        self.callback.info_with_host('-' * 55)
+        self.callback.info_with_host('%s complete: Total=%d Success=%d Failed=%d' % \
                            ('Firmware update', self.nodes_num, success_num, failed_num))
 
         for i in failed_list:
-            self.callback.info(i)
-        self.callback.info('-' * 55)
+            self.callback.info_with_host(i)
+        self.callback.info_with_host('-' * 55)
 
     def post_activate_firm(self, task, activate_arg, **kw):
 
diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_inventory.py b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_inventory.py
index 3061a4814..0b454d426 100644
--- a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_inventory.py
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_inventory.py
@@ -112,7 +112,7 @@ class OpenBMCInventoryTask(ParallelNodesCommand):
             # Extract the data from the BMC
             inventory_info_dict = obmc.get_inventory_info(inventory_type)
 
-            # Process returned inventory_info_dict depending on the inventory requested 
+            # Process returned inventory_info_dict depending on the inventory requested
             if all == 1:
                 # Everything gets displayed, even firmware
                 keys = inventory_info_dict.keys()
@@ -156,7 +156,7 @@ class OpenBMCInventoryTask(ParallelNodesCommand):
         except (SelfServerException, SelfClientException) as e:
             self.callback.error(e.message, node)
 
-        return inventory_info 
+        return inventory_info
 
     def get_firm_info(self, target_file=None, **kw):
 
@@ -179,5 +179,5 @@ class OpenBMCInventoryTask(ParallelNodesCommand):
         return firm_info
 
 
-            
+
 
diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_sensor.py b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_sensor.py
index 12ccefaa7..24d041912 100644
--- a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_sensor.py
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_sensor.py
@@ -55,7 +55,7 @@ class OpenBMCSensorTask(ParallelNodesCommand):
                 info_list.append('%s %s %s: %s' % (led_label, i, led_type, beacon_dict.get(key_type, 'N/A')))
 
         return info_list
-        
+
 
     def get_sensor_info(self, sensor_type, **kw):
 
@@ -118,5 +118,5 @@ class OpenBMCSensorTask(ParallelNodesCommand):
             self.callback.error(e.message, node)
 
         return beacon_info
-                
+
 
diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/flash.py b/xCAT-openbmc-py/lib/python/agent/hwctl/flash.py
index 8f30612ca..ab82062b4 100644
--- a/xCAT-openbmc-py/lib/python/agent/hwctl/flash.py
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/flash.py
@@ -16,7 +16,7 @@ class FlashInterface(object):
         :param task: a Task instance containing the nodes to act on.
         :activate_arg: arg for activate
         """
-        return task.run('activate_firm', activate_arg) 
+        return task.run('activate_firm', activate_arg)
 
     def delete_firm(self, task, delete_id):
         """Delete firmware.
diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py b/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
index f4f559186..1670a51da 100644
--- a/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
@@ -44,7 +44,7 @@ DUMP_URLS = {
         "field" : [],
     },
     "download"  : "download/dump/#ID#",
-    "list"      : "/dump/enumerate", 
+    "list"      : "/dump/enumerate",
 }
 
 GARD_CLEAR_URL = "/org/open_power/control/gard/action/Reset"
@@ -55,7 +55,7 @@ INVENTORY_URLS = {
     "serial"    : "/inventory/system",
     "cpu"       : "/inventory/system/chassis/motherboard/enumerate",
     "dimm"      : "/inventory/system/chassis/motherboard/enumerate",
-}    
+}
 
 LEDS_URL = "/led/physical/enumerate"
 
@@ -408,7 +408,7 @@ class OpenBMCRest(object):
             self._print_error_log(error, cmd=cmd)
             raise SelfClientException(error, code)
 
-        self._print_record_log(data['message'], cmd=cmd) 
+        self._print_record_log(data['message'], cmd=cmd)
 
         return True
 
@@ -480,7 +480,7 @@ class OpenBMCRest(object):
 
     def set_boot_state(self, state):
 
-        payload = { "data": BOOTSOURCE_URLS['field'] + BOOTSOURCE_SET_STATE[state] } 
+        payload = { "data": BOOTSOURCE_URLS['field'] + BOOTSOURCE_SET_STATE[state] }
         self.request('PUT', BOOTSOURCE_URLS['set']['path'], payload=payload, cmd='set_boot_state')
 
     def set_one_time_boot_state(self, state):
@@ -508,7 +508,7 @@ class OpenBMCRest(object):
 
     def get_beacon_info(self):
 
-        beacon_data = self.request('GET', LEDS_URL, cmd='get_beacon_info') 
+        beacon_data = self.request('GET', LEDS_URL, cmd='get_beacon_info')
         try:
             beacon_dict = {}
             for key, value in beacon_data.items():
@@ -546,7 +546,7 @@ class OpenBMCRest(object):
                     label = k.split('/')[-1]
                     value = v['value']
                     sensor_dict[label] = ['%s: %s' % (label, value)]
-                    
+
             return sensor_dict
         except KeyError:
             error = 'Received wrong format response: %s' % sensor_data
@@ -626,7 +626,7 @@ class OpenBMCRest(object):
             fw = OpenBMCImage(key, swinfo)
             if func_list:
                 fw.functional = key in func_list
-            
+
             fw_dict[str(fw)]=fw
 
         return bool(func_list), fw_dict
@@ -634,8 +634,8 @@ class OpenBMCRest(object):
     def upload_firmware(self, upload_file):
 
         headers = {'Content-Type': 'application/octet-stream'}
-        path = HTTP_PROTOCOL + self.bmcip + '/upload/image/' 
-        self.upload('PUT', path, upload_file, headers=headers, cmd='upload_firmware') 
+        path = HTTP_PROTOCOL + self.bmcip + '/upload/image/'
+        self.upload('PUT', path, upload_file, headers=headers, cmd='upload_firmware')
 
     def set_priority(self, firm_id):
 
@@ -801,7 +801,7 @@ class OpenBMCRest(object):
         if clear_arg == 'all':
             payload = { "data": DUMP_URLS['clear_all']['field'] }
             self.request('POST', DUMP_URLS['clear_all']['path'], payload=payload, cmd='clear_dump_all')
-        else: 
+        else:
             path = DUMP_URLS['clear']['path'].replace('#ID#', clear_arg)
             payload = { "data": DUMP_URLS['clear']['field'] }
             self.request('POST', path, payload=payload, cmd='clear_dump')
@@ -829,7 +829,7 @@ class OpenBMCRest(object):
             return dump_dict
         except KeyError:
             error = 'Received wrong format response: %s' % dump_data
-            raise SelfServerException(error) 
+            raise SelfServerException(error)
 
     def download_dump(self, download_id, file_path):
 
@@ -926,12 +926,12 @@ class OpenBMCRest(object):
                         tmp_ntpservers = ''.join(info["NTPServers"])
                         if tmp_ntpservers:
                             ntpservers = tmp_ntpservers
-                        utils.update2Ddict(netinfo, nicid, "ntpservers", ntpservers)            
+                        utils.update2Ddict(netinfo, nicid, "ntpservers", ntpservers)
             return netinfo
         except KeyError:
             error = 'Received wrong format response: %s' % data
             raise SelfServerException(error)
-        
+
 
     def set_ipdhcp(self):
         payload = { "data": [] }
diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/sensor.py b/xCAT-openbmc-py/lib/python/agent/hwctl/sensor.py
index 510b2c920..e70e45c4e 100644
--- a/xCAT-openbmc-py/lib/python/agent/hwctl/sensor.py
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/sensor.py
@@ -17,7 +17,7 @@ class SensorInterface(object):
         :param task: a Task instance containing the nodes to act on.
         :return: sensor info list
         """
-        return task.run('get_sensor_info', sensor_type) 
+        return task.run('get_sensor_info', sensor_type)
 
     def get_beacon_info(self, task, display_type='full'):
         """Return the beacon info of the task's nodes.
diff --git a/xCAT-openbmc-py/lib/python/agent/xcatagent/base.py b/xCAT-openbmc-py/lib/python/agent/xcatagent/base.py
index d75bd7f00..ca9521513 100644
--- a/xCAT-openbmc-py/lib/python/agent/xcatagent/base.py
+++ b/xCAT-openbmc-py/lib/python/agent/xcatagent/base.py
@@ -15,13 +15,13 @@ class BaseManager(object):
         try:
             __import__(module_name)
         except ImportError as err:
-            raise ImportError(err) 
+            raise ImportError(err)
 
         class_name = MODULE_MAP[name]
         return utils.class_func(module_name, class_name)
 
     def process_nodes_worker(self, name, classname, nodes, nodeinfo, command, args):
-        
+
         module_name = 'xcatagent.%s' % name
         obj_func = utils.class_func(module_name, classname)
 
diff --git a/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py b/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py
index c6a64288f..080ddef5e 100644
--- a/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py
+++ b/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py
@@ -23,7 +23,7 @@ from hwctl.executor.openbmc_sensor import OpenBMCSensorTask
 from hwctl.executor.openbmc_eventlog import OpenBMCEventlogTask
 from hwctl.beacon import DefaultBeaconManager
 from hwctl.setboot import DefaultBootManager
-from hwctl.flash import DefaultFlashManager 
+from hwctl.flash import DefaultFlashManager
 from hwctl.inventory import DefaultInventoryManager
 from hwctl.power import DefaultPowerManager
 from hwctl.sensor import DefaultSensorManager
@@ -205,9 +205,9 @@ class OpenBMCManager(base.BaseManager):
             DefaultInventoryManager().get_firm_info(runner, check_arg)
             return
 
-        runner = OpenBMCFlashTask(nodesinfo, callback=self.messager, debugmode=self.debugmode, verbose=self.verbose, cwd=self.cwd[0]) 
+        runner = OpenBMCFlashTask(nodesinfo, callback=self.messager, debugmode=self.debugmode, verbose=self.verbose, cwd=self.cwd[0])
         if opts['--activate']:
-            DefaultFlashManager().activate_firm(runner, opts['--activate'][0]) 
+            DefaultFlashManager().activate_firm(runner, opts['--activate'][0])
         elif opts['--list']:
             DefaultFlashManager().list_firm_info(runner)
         elif opts['-d']:
diff --git a/xCAT-openbmc-py/lib/python/agent/xcatagent/server.py b/xCAT-openbmc-py/lib/python/agent/xcatagent/server.py
index 30f9d0f4d..85a92dddd 100644
--- a/xCAT-openbmc-py/lib/python/agent/xcatagent/server.py
+++ b/xCAT-openbmc-py/lib/python/agent/xcatagent/server.py
@@ -44,6 +44,10 @@ class XCATMessager(utils.Messager):
         d = {'type': MSG_TYPE, 'msg': {'type': 'syslog', 'data': msg}}
         self._send(d)
 
+    def info_with_host(self, msg):
+        d = {'type': MSG_TYPE, 'msg': {'type': 'info_with_host', 'data': msg}}
+        self._send(d)
+
     def update_node_attributes(self, attribute, node, data):
         d = {'type': DB_TYPE, 'attribute': {'name': attribute, 'method': 'set', 'type': 'node', 'node': node, 'value': data}}
         self._send(d)
diff --git a/xCAT-openbmc-py/xCAT-openbmc-py.spec b/xCAT-openbmc-py/xCAT-openbmc-py.spec
index 3070167fd..e40044c0e 100644
--- a/xCAT-openbmc-py/xCAT-openbmc-py.spec
+++ b/xCAT-openbmc-py/xCAT-openbmc-py.spec
@@ -17,14 +17,14 @@ AutoReqProv: no
 %endif
 
 BuildArch: noarch
-Requires: xCAT-server 
+Requires: xCAT-server
 Requires: python-gevent >= 1.2.2-2
 Requires: python-greenlet >= 0.4.13-2
 Requires: python-paramiko >= 2.0.0
 Requires: python2-docopt python-requests python-scp
 
 %description
-xCAT-openbmc-py provides openbmc related functions. 
+xCAT-openbmc-py provides openbmc related functions.
 
 %prep
 %setup -q -n xCAT-openbmc-py
diff --git a/xCAT-probe/debian/copyright b/xCAT-probe/debian/copyright
index f61d34dfe..87e60f492 100644
--- a/xCAT-probe/debian/copyright
+++ b/xCAT-probe/debian/copyright
@@ -85,4 +85,4 @@ Everyone is permitted to copy and distribute copies of this Agreement, but in or
 
 This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
 
- 
+
diff --git a/xCAT-probe/lib/perl/LogParse.pm b/xCAT-probe/lib/perl/LogParse.pm
index 3161703ac..ec8cb98b7 100644
--- a/xCAT-probe/lib/perl/LogParse.pm
+++ b/xCAT-probe/lib/perl/LogParse.pm
@@ -25,20 +25,20 @@ use File::Basename;
             $self->{verbose}:scalar, Offer verbose information, used for handling feature logic
             $self->{load_type}:scalar, $::MONITOR or $::REPLAY, used for distinguishing monitor and replay.
         private attributes:
-            $self->{log_open_info}: reference of a hash, used to save the log file operating information. 
+            $self->{log_open_info}: reference of a hash, used to save the log file operating information.
             $self->{current_ref_year}: scalar, the year information of current time. such as 2016. Used for log time parsing
             $self->{current_ref_time}:  scalar, the epoch format of current time, such as 1472437250. Used for log time parsing
 
-            $self->{debug}: Scalar, offer debug information, used for hanlde code logic, used by developer to debug function running 
+            $self->{debug}: Scalar, offer debug information, used for hanlde code logic, used by developer to debug function running
             $self->{debuglogpath}: Scalar, the path of debug log files
             $self->{debuglogfd}: File descriptor of debug log files
 
             The structure of "log_open_info" hash is:
-            $self->{log_open_info}->{<logfileshortname>}{openfd}  : The file descriptor of sepecific openning log file       
+            $self->{log_open_info}->{<logfileshortname>}{openfd}  : The file descriptor of sepecific openning log file
             $self->{log_open_info}->{<logfileshortname>}{rotate_file_list} : Array, all rotate file about related log file
-            $self->{log_open_info}->{<logfileshortname>}{openning_file_index} : scalar, the index of openning file in rotate_file_list 
+            $self->{log_open_info}->{<logfileshortname>}{openning_file_index} : scalar, the index of openning file in rotate_file_list
             $self->{log_open_info}->{<logfileshortname>}{next_read_point} : scalar, the read point of one log file, used by 'seek' function
-            $self->{log_open_info}->{<logfileshortname>}{filetype} : scalar, the type of current log file, $::LOGTYPE_RSYSLOG or $::LOGTYPE_HTTP 
+            $self->{log_open_info}->{<logfileshortname>}{filetype} : scalar, the type of current log file, $::LOGTYPE_RSYSLOG or $::LOGTYPE_HTTP
             $self->{log_open_info}->{<logfileshortname>}{next_start_time} : scalar, the next read time
 
     Returns:
@@ -116,7 +116,7 @@ sub obtain_candidate_mn_hostname_in_log {
         A hash which save all candidate log file information
         $candidate_log{<label>}{file}
         $candidate_log{<label>}{type}
-        <label> : The short name of log file 
+        <label> : The short name of log file
         file:  The log file name, including full path
         type: The valid types are $::LOGTYPE_HTTP and $::LOGTYPE_RSYSLOG, refer to 'probe_global_constant' for more information.
 =cut
@@ -166,9 +166,9 @@ sub obtain_log_file_list {
         Public function. Obtian logs which belong to a specific second from candidate log files.
     Arguments:
         the_time_to_load:(input attribute) the specific second.
-        valid_one_second_log_set_ref: (output attribute) the space which save the vaild logs. A array of reference of hash. 
+        valid_one_second_log_set_ref: (output attribute) the space which save the vaild logs. A array of reference of hash.
                                       Refer to fucnction "obtain_log_content" for the hash structure of one log.
-        
+
     Returns:
         1: success
         0: failed
@@ -452,10 +452,10 @@ sub obtain_valid_log_start_point {
 
 =head3
     Description:
-        Convert one line original log which comes from log file to a hash. 
+        Convert one line original log which comes from log file to a hash.
 
     Arguments:
-        log_type     :(input attribute) valid log type are $::LOGTYPE_RSYSLOG and $::LOGTYPE_HTTP 
+        log_type     :(input attribute) valid log type are $::LOGTYPE_RSYSLOG and $::LOGTYPE_HTTP
         original_log :(input attribute) one line log in real log file
 
     Returns:
@@ -465,7 +465,7 @@ sub obtain_valid_log_start_point {
         %log_content
         $log_content{time}   : the timestamp of log, the format is epoch_seconds
         $log_content{sender} : the sender of log
-        $log_content{label}  : the label of log, such as $::LOGLABEL_DHCPD, $::LOGLABEL_TFTP.... refer to "probe_global_constant" for all kinds vaild labels 
+        $log_content{label}  : the label of log, such as $::LOGLABEL_DHCPD, $::LOGLABEL_TFTP.... refer to "probe_global_constant" for all kinds vaild labels
         $log_content{msg}    : the main message of log
 =cut
 
@@ -508,7 +508,7 @@ sub obtain_log_content {
             }
         } else {
             my $timestamp = join(" ", @split_line[ 0 .. 2 ]);
-            $log_content{time_record} = $split_line[2]; 
+            $log_content{time_record} = $split_line[2];
             $log_content{time} = $self->convert_to_epoch_seconds($timestamp);
             if (!xCAT::NetworkUtils->isIpaddr($split_line[3])) {
                 my @sender_tmp = split(/\./, $split_line[3]);
@@ -707,9 +707,9 @@ sub destory {
 
 =head3
     Description:
-        Private function. Used for log debug information to disk. 
+        Private function. Used for log debug information to disk.
     Arguments:
-        $msg : The massage which will be logged into log file. 
+        $msg : The massage which will be logged into log file.
     Returns:
         NULL
 =cut
diff --git a/xCAT-probe/lib/perl/probe_utils.pm b/xCAT-probe/lib/perl/probe_utils.pm
index f8c1b2209..21121c605 100644
--- a/xCAT-probe/lib/perl/probe_utils.pm
+++ b/xCAT-probe/lib/perl/probe_utils.pm
@@ -17,10 +17,10 @@ use List::Util qw/sum/;
         Format is [<flag>] : <message>
         The valid <flag> are debug, warning, failed, info and ok
     Arguments:
-        output: where should the message be output 
+        output: where should the message be output
               The vaild values are:
               stdout : print message to STDOUT
-              a file name: print message to the specified "file name" 
+              a file name: print message to the specified "file name"
         tag:  the type of message, the valid values are:
               d: debug
               w: warning
@@ -29,11 +29,11 @@ use List::Util qw/sum/;
               i: info
 
               If tag is NULL, output message without a tag
-             
+
         msg:  the information need to output
      Returns:
-        1 : Failed 
-        0 : success 
+        1 : Failed
+        0 : success
 =cut
 
 #----------------------------------------
@@ -76,7 +76,7 @@ sub send_msg {
     Description:
         Test if a string is a IP address
     Arguments:
-        addr: the string want to be judged 
+        addr: the string want to be judged
     Returns:
         1 : yes
         0 : no
@@ -162,7 +162,7 @@ sub get_os {
 
 =head3
     Description:
-        Test if a IP address is a static IP address 
+        Test if a IP address is a static IP address
     Arguments:
         ip:   a ip address
         nic:  the network adapter which ip belongs to
@@ -206,7 +206,7 @@ sub is_static_ip {
         my $output2 = `cat /etc/sysconfig/network/ifcfg-$nic 2>&1 |grep -i BOOTPROTO`;
         $rst = 1 if (($output1 =~ /$ip/) && ($output2 =~ /static/i));
     } elsif ($os =~ /ubuntu/) {
-        my $output = `cat /etc/network/interfaces 2>&1|grep -E "iface\s+$nic"`;
+        my $output = `cat /etc/network/interfaces 2>&1|grep -E "iface\\s+$nic"`;
         $rst = 1 if ($output =~ /static/i);
     }
     return $rst;
@@ -216,7 +216,7 @@ sub is_static_ip {
 
 =head3
     Description:
-        Test if SELinux is opened in current operating system 
+        Test if SELinux is opened in current operating system
     Arguments:
          None
     Returns:
@@ -275,7 +275,7 @@ sub is_firewall_open {
     Description:
         Test if http service is ready to use in current operating system
     Arguments:
-        ip:  http server's ip 
+        ip:  http server's ip
         errormsg_ref: (output attribute) if there is something wrong for HTTP service, this attribute save the possible reason.
     Returns:
         1 : yes
@@ -369,7 +369,7 @@ sub is_tftp_ready {
     my $mnip = shift;
     $mnip = shift if (($mnip) && ($mnip =~ /probe_utils/));
     my $tftpdir = shift;
-    
+
     rename("/$tftpdir/tftptestt.tmp", "/$tftpdir/tftptestt.tmp.old") if (-e "/$tftpdir/tftptestt.tmp");
     rename("./tftptestt.tmp", "./tftptestt.tmp.old") if (-e "./tftptestt.tmp");
 
@@ -427,7 +427,7 @@ sub is_dns_ready {
 
 =head3
     Description:
-        Calculate network address from ip and netmask 
+        Calculate network address from ip and netmask
     Arguments:
         ip: ip address
         mask: network mask
@@ -456,14 +456,14 @@ sub get_network {
 
 =head3
     Description:
-        Check if the free space of specific directory is more than expected value 
+        Check if the free space of specific directory is more than expected value
     Arguments:
-        targetdir: The directory needed to be checked 
+        targetdir: The directory needed to be checked
         expect_free_space: the expected free space for above directory
     Returns:
         0: the free space of specific directory is less than expected value
         1: the free space of specific directory is more than expected value
-        2: the specific directory isn't mounted on standalone disk. it is a part of "/" 
+        2: the specific directory isn't mounted on standalone disk. it is a part of "/"
 =cut
 
 #------------------------------------------
@@ -605,7 +605,7 @@ sub is_rsyslog_ready {
         $$errormsg_ref = "rsyslog service is not running! Please check on current node";
         return 0;
     }
-    return 1; 
+    return 1;
 }
 
 #------------------------------------------
@@ -663,7 +663,7 @@ sub convert_second_to_time {
     Arguments:
         content: double dimensional array
         has_title: whether has title in content
-        
+
         eg: @content = ($title,
                         @content1,
                         @content2,
@@ -683,12 +683,12 @@ sub convert_second_to_time {
         --------------------------
         |         xxxxxxx        |
         --------------------------
-        | xxx | xxxx | xx   | xx |  
+        | xxx | xxxx | xx   | xx |
         --------------------------
-        | xx  | xxxx | xxxx | xx | 
+        | xx  | xxxx | xxxx | xx |
         --------------------------
 
-        or 
+        or
 
         --------------------------
         | xxx | xxxx | xx   | xx |
diff --git a/xCAT-probe/subcmds/clusterstatus b/xCAT-probe/subcmds/clusterstatus
index bc3836772..d847ff771 100755
--- a/xCAT-probe/subcmds/clusterstatus
+++ b/xCAT-probe/subcmds/clusterstatus
@@ -27,7 +27,7 @@ my $start_time;
 #-----------------------------
 # To store the node number of a specified type
 # May like this:
-# $type_nodesnum{pdu} = 2; 
+# $type_nodesnum{pdu} = 2;
 #                {switch} = 3;
 #                {node} = 10;
 #-----------------------------
@@ -54,7 +54,7 @@ my %state_node_number = ();
 #----------------------------
 # To store the node based current state
 # May like this:
-#  $node_info{node1}{state} = "install"; 
+#  $node_info{node1}{state} = "install";
 #  $node_info{node1}{type} = "node";
 #----------------------------
 my %node_info = ();
@@ -70,12 +70,12 @@ $::USAGE = "Usage:
     $program_name [-n noderange] [-V|--verbose] [-i|--interval <seconds>] [--timeout <seconds>]
 
 Description:
-    Use this command to get a summary of the cluster. 
+    Use this command to get a summary of the cluster.
 
 Options:
     -h : Get usage information of $program_name
     -n : Range of nodes to check. All node objects will be used if not specified.
-    -i : The interval for screen refreshing, unit is second(s), 5 seconds by default. 
+    -i : The interval for screen refreshing, unit is second(s), 5 seconds by default.
     -V : To print additional debug information.
     --timeout: The timout if not all nodes finish, unit is second(s), no timeout by default.
 ";
@@ -201,7 +201,7 @@ sub check_for_discovered_nodes {
 sub groupcount_nodes {
     my $na = "N/A";
     my $rc = 0;
-  
+
     probe_utils->send_msg("$output", "w", "Group count function is not yet implemented.");
     return $rc;
 }
@@ -326,7 +326,7 @@ sub check_nodes_attributes {
         } else {
             $type_nodesnum{$node_type} += 1;
         }
-        $state_node_hash{$node_type}{$node_info{$_}{state}}{$_} = 1;  
+        $state_node_hash{$node_type}{$node_info{$_}{state}}{$_} = 1;
     }
 }
 exit 0;
diff --git a/xCAT-probe/subcmds/detect_dhcpd b/xCAT-probe/subcmds/detect_dhcpd
index c0580046b..9494bfffe 100755
--- a/xCAT-probe/subcmds/detect_dhcpd
+++ b/xCAT-probe/subcmds/detect_dhcpd
@@ -19,7 +19,7 @@ my $test         = 0;
 my $dumpfile     = "/tmp/dhcpdumpfile.log";
 my $nic;
 
-$::USAGE = "Usage: 
+$::USAGE = "Usage:
     $program_name  -i interface [-m macaddress] [-d duration] [-V]
 
 Description:
@@ -29,7 +29,7 @@ Options:
     -i interface:  Required. The interface facing the target network.
     -m macaddress: The mac that will be used to detect dhcp server. Use the real mac of the node that will be netboot. If not specified, the mac specified by -i will be used.
     -d duration:   The time to wait to detect the dhcp messages. The default value is 10s.
-    -V verbose:    Print additional debug information. 
+    -V verbose:    Print additional debug information.
 ";
 
 #---------------------------
diff --git a/xCAT-probe/subcmds/discovery b/xCAT-probe/subcmds/discovery
index 10c52b10c..b3b9b7993 100755
--- a/xCAT-probe/subcmds/discovery
+++ b/xCAT-probe/subcmds/discovery
@@ -42,7 +42,7 @@ my $program_name = basename("$0");
 $::USAGE = "Usage:
     $program_name -h
     $program_name -n <node_range> -m <discovery_type> -c
-    $program_name -n <node_range> -m <discovery_type> [-t <max_waiting_time>] [-V] [--noprecheck] 
+    $program_name -n <node_range> -m <discovery_type> [-t <max_waiting_time>] [-V] [--noprecheck]
     $program_name -n <node_range> -m <discovery_type> -r <roll_back_duration> [-V] [--noprecheck]
 
 Description:
@@ -200,7 +200,7 @@ sub check_pre_defined_node {
             $nodecheckrst{$currentnode}{$1} = $2;
         }
     }
-    
+
     if ($rst) {
         my $errornode  = join(",", @errornodes);
         probe_utils->send_msg("stdout", "f", "[$errornode] : Could not find node definition");
@@ -220,7 +220,7 @@ sub check_pre_defined_node {
     if (@bmcnodes) {
         my $bmcnode = join(",", @bmcnodes);
         probe_utils->send_msg("stdout", "f", "[$bmcnode] : bmc node(s)");
-        $rst = 1; 
+        $rst = 1;
     }
 
     if (@nochain) {
@@ -229,7 +229,7 @@ sub check_pre_defined_node {
         $rst = 1;
     }
 
-    # if discover type is mtms, check whether mtms is only for per-define node and bmc node 
+    # if discover type is mtms, check whether mtms is only for per-define node and bmc node
     @errornodes = ();
     if ($discovery_type eq "mtms") {
 
@@ -257,7 +257,7 @@ sub check_pre_defined_node {
         my @error_mtms_bmc;
         foreach my $node (keys %nodecheckrst) {
 
-            # check pre-define node whether has mtm and serial 
+            # check pre-define node whether has mtm and serial
             # if nodetype is mp and hwtye is bmc, the node is bmc node, do not check whether exists mtms
             if (!(exists($nodecheckrst{$node}{"mtm"}) && exists($nodecheckrst{$node}{"serial"}))) {
                 next if (($nodecheckrst{$node}{"nodetype"} eq "mp") and ($nodecheckrst{$node}{"hwtype"} eq "bmc"));
@@ -354,7 +354,7 @@ sub check_pre_defined_node {
                 if (!(exists($nodecheckrst{$node}{"switch"})) or $nodecheckrst{$node}{"switch"} !~ /^\w/) {
                     push @error_attribute, "switch";
                 } elsif ($error_switch =~ $nodecheckrst{$node}{"switch"}) {
-                    my $error_switch = $nodecheckrst{$node}{"switch"}; 
+                    my $error_switch = $nodecheckrst{$node}{"switch"};
                     push @{$error_switch_hash{$error_switch}}, $node;
                     next;
                 }
@@ -390,7 +390,7 @@ sub check_pre_defined_node {
                     $errorhash{$keystring} = $node;
                 }
             }
-        } 
+        }
 
         foreach my $key (keys %errorhash) {
             probe_utils->send_msg("stdout", "f", "[$errorhash{$key}] : $key");
@@ -408,7 +408,7 @@ sub check_pre_defined_node {
             $rst = 1;
         }
     }
-                  
+
     return $rst;
 }
 
@@ -463,7 +463,7 @@ sub do_pre_check {
                 }
             }
         }
-        
+
         if (@errors) {
             probe_utils->send_msg("stdout", "f", $msg);
             probe_utils->send_msg("stdout", "d", "$_") foreach (@errors);
@@ -520,7 +520,7 @@ sub do_pre_check {
 
 #------------------------------------------
 sub check_genesis_file {
-    my $msg = "Genesis files are avaliable";
+    my $msg = "Genesis files are available";
     my $rst = 0;
     my @warn_msg;
 
@@ -532,7 +532,7 @@ sub check_genesis_file {
     } elsif ($os =~ "ubuntu") {
         my $genesis_output = `dpkg -l | grep -iE "ii\\s+xcat-genesis"`;
         unless (($genesis_output =~ /base/ and $genesis_output =~ /ppc64/) and
-            ($genesis_output =~ /scripts/ and $genesis_output =~ /ppc64/) and 
+            ($genesis_output =~ /scripts/ and $genesis_output =~ /ppc64/) and
             ($genesis_output =~ /base/ and $genesis_output =~ /amd64/) and
             ($genesis_output =~ /scripts/ and $genesis_output =~ /amd64/)) {
             probe_utils->send_msg("stdout", "f", $msg);
@@ -569,7 +569,7 @@ sub check_genesis_file {
     my @tmp_info = split(",", $dhcpinterface);
     foreach (@tmp_info) {
         if ($_ =~ /(.+):noboot/) {
-            my $noboot_nic = $1; 
+            my $noboot_nic = $1;
             my $ip_string = `ip -4 -o a |awk -F' ' '/$noboot_nic/ {print \$4}'`;
             if ($ip_string) {
                 my ($noboot_ip, $noboot_netmask) = split('\/', $ip_string);
@@ -646,9 +646,9 @@ sub check_genesis_file {
                         push @errors, "kernel cannot be downloaded from $kernel_path.";
                         $rst = 1;
                     }
-                }  
+                }
             }
-        } 
+        }
     }
 
     { # check genesis files for x86_64 arch
@@ -760,13 +760,13 @@ sub check_genesis_file {
                                             $genesis_update_flag_x = 1;
                                         }
                                     }
- 
+
                                 }
                             }
                         }
                     }
                 }
-            } 
+            }
         }
     }
 
@@ -957,7 +957,7 @@ sub get_node_ip {
             $nodeipcheck{$node}{"ip"} = $ip_net;
         } elsif ($nodeipcheck{$node}{"ip"} and !$ip_net) {
             $nodeipcheck{$node}{"error"} = "Unknown host $node, please run 'makehosts' and 'makedns'";
-        } 
+        }
         if ($ip_net and !$isonmynet) {
             $nodeipcheck{$node}{"error"} = "IP for $node is not on any network this server attached.";
         } elsif (!$isonmynet) {
@@ -1150,9 +1150,9 @@ sub do_monitor {
     Arguments:
         start_time_of_replay: the start time point of scaning log
         end_time_of_replay: the end time point of scaning log
-   
+
     Returns:
-        0: success 
+        0: success
         1: failed
 =cut
 
@@ -1187,7 +1187,7 @@ sub do_replay {
         my $rst = $log_parse->obtain_one_second_logs($start_time_of_replay, \@valid_one_second_log_set);
         if ($rst) {
             probe_utils->send_msg("stdout", "d", "Failed to obtain logs from log files");
-            $rc = 1; 
+            $rc = 1;
             last;
         }
 
@@ -1214,14 +1214,14 @@ sub do_replay {
 
 =head3
     Description:
-        Initailize a very important hash "%node_state" which will save the state information of every node 
+        Initailize a very important hash "%node_state" which will save the state information of every node
     Arguments:
         noderange: (input attribute) The range of node
-        node_state_ref: (output attribute) the reference of hash "%node_state" 
+        node_state_ref: (output attribute) the reference of hash "%node_state"
             The strucuture of  hash "%node_state" are :
-                $node_state{<identify>}{statehistory}  Array.  save the latest loop discovery states 
-                $node_state{<identify>}{allstatehistory}   Array. save the history states before the latest loop discovery. Used in debug mode.  
-                $node_state{<identify>}{log}           Array. save all related logs of mac. Used in debug mode. 
+                $node_state{<identify>}{statehistory}  Array.  save the latest loop discovery states
+                $node_state{<identify>}{allstatehistory}   Array. save the history states before the latest loop discovery. Used in debug mode.
+                $node_state{<identify>}{log}           Array. save all related logs of mac. Used in debug mode.
                 $node_state{<identify>}{id}            Scalar. the node related withe the mac.
                 $node_state{<identify>}{type}          Scalar.  the flag of if the node have finished the discovery
     Returns:
@@ -1244,10 +1244,10 @@ sub init_node_state {
 
 =head3
     Description:
-        Dispatch log to related handler 
+        Dispatch log to related handler
     Arguments:
         log_ref: (input attribute) the reference of hash which save one line log comes from computes.log.
-        candidate_mn_hostname_in_log_ref: (input attribute) The reference of array which save the candidate host name of MN 
+        candidate_mn_hostname_in_log_ref: (input attribute) The reference of array which save the candidate host name of MN
         node_state_ref: (output attribute), the reference of hash "%node_state". refer to function "init_node_state" for the structure of "%node_state"
     Returns:
         NULL
@@ -1280,8 +1280,8 @@ sub dispatch_log_to_handler {
     Description:
         Handle one line DHCP log
     Arguments:
-        log_ref: (input attribute) the reference of hash which save one line dhcp log. 
-        node_state_ref: (output attribute), the reference of hash "%node_state". refer to function "init_node_state" for the structure of "%node_state" 
+        log_ref: (input attribute) the reference of hash which save one line dhcp log.
+        node_state_ref: (output attribute), the reference of hash "%node_state". refer to function "init_node_state" for the structure of "%node_state"
     Returns:
         NULL
 =cut
@@ -1290,7 +1290,7 @@ sub dispatch_log_to_handler {
 sub handle_dhcp_msg {
     my $log_ref        = shift;
     my $node_state_ref = shift;
-    
+
     if ($log_ref->{msg} =~ /DHCPDISCOVER\s+from\s+(\w\w:\w\w:\w\w:\w\w:\w\w:\w\w).+via\s+([^:]+)(.*)/i) {
         my $mac = $1;
         my $nic = $2;
@@ -1309,7 +1309,7 @@ sub handle_dhcp_msg {
         my $record = "Sent DHCPOFFER on $ip back to $mac via $nic";
 
         probe_utils->send_msg("stdout", "d", "[$mac] $log_ref->{time_record} $record") if ($monitor);
-        push(@{ $node_state_ref->{$mac}{log} }, $log_ref->{msg}) if ($debug); 
+        push(@{ $node_state_ref->{$mac}{log} }, $log_ref->{msg}) if ($debug);
     } elsif ($log_ref->{msg} =~ /DHCPREQUEST\s+for\s+(.+)\s+[\(\)0-9\.]*\s*from\s+(\w\w:\w\w:\w\w:\w\w:\w\w:\w\w).+via\s+(.+)/) {
         my $ip  = $1;
         my $mac = $2;
@@ -1368,7 +1368,7 @@ sub handle_dhcp_msg {
 #------------------------------------------
 sub handle_tftp_msg {
     my $log_ref        = shift;
-    my $node_state_ref = shift; 
+    my $node_state_ref = shift;
 
     if ($log_ref->{msg} =~ /RRQ\s+from\s+(.+)\s+filename\s+(.+)/i) {
         my $ip     = $1;
@@ -1486,7 +1486,7 @@ sub handle_compute_msg {
     my $log_ref        = shift;
     my $node_state_ref = shift;
     my $ip             = $log_ref->{sender};
-    my $mac            = $ipmacmap{$ip}; 
+    my $mac            = $ipmacmap{$ip};
 
     if (exists $node_state_ref->{$mac}) {
         probe_utils->send_msg("stdout", "d", "[$mac] $log_ref->{time_record} ($ip) $log_ref->{msg}") if ($monitor);
@@ -1527,7 +1527,7 @@ sub handle_compute_msg {
     Arguments:
         node_state_ref: (input/output attribute), the reference of hash "%node_state". refer to function "init_node_state" for the structure of "%node_state"
         node : (input attribute) The node name
-        newstate : (input attribute) The new state of node 
+        newstate : (input attribute) The new state of node
     Returns:
         NULL
 =cut
@@ -1662,7 +1662,7 @@ sub conclusion_report {
         my $failed_node_num = @failed_node;
         my $failed_nodes = join(",", @failed_node);
         probe_utils->send_msg("stdout", "", "Discovered $success_node_num node(s) successfully, $failed_node_num node(s) failed.");
-        
+
         foreach my $type (keys %success_node_other_type) {
             my $other_nodes = join(",", @{ $success_node_other_type{$type} });
             probe_utils->send_msg("stdout", "", "Discovered [$other_nodes] successfully, but discovery type is $type");
@@ -1675,7 +1675,7 @@ sub conclusion_report {
             probe_utils->send_msg("stdout", "", "Unmatched MAC(s):");
         }
         foreach my $mac (keys %failed_mac) {
-            probe_utils->send_msg("stdout", "f", "[$mac] : stop at stage '$::STATE_DISCOVER_DESC{$failed_mac{$mac}{stop_point}}'"); 
+            probe_utils->send_msg("stdout", "f", "[$mac] : stop at stage '$::STATE_DISCOVER_DESC{$failed_mac{$mac}{stop_point}}'");
         }
     } else {
         probe_utils->send_msg("stdout", "o", "All nodes matched successfully");
diff --git a/xCAT-probe/subcmds/image b/xCAT-probe/subcmds/image
index 406668ab6..dd9fea9f0 100755
--- a/xCAT-probe/subcmds/image
+++ b/xCAT-probe/subcmds/image
@@ -26,13 +26,13 @@ $::USAGE = "Usage:
     $program_name {-c|-d|-u uuid} [-n noderange] [-V]
 
 Description:
-    Use this command to check if diskless nodes have the same images installed as defines in xCAT DB. 
-    Use this command to check if all diskless nodes have the identical images installed. 
+    Use this command to check if diskless nodes have the same images installed as defines in xCAT DB.
+    Use this command to check if all diskless nodes have the identical images installed.
 
 Options:
     -h : Get usage information of $program_name
     -n : Range of nodes to check
-    -d : To verify diskless nodes have the same images installed as defines in xCAT DB. 
+    -d : To verify diskless nodes have the same images installed as defines in xCAT DB.
     -c : To verify all diskless nodes have the identical images installed.
     -u : To display a list of diskless nodes running an OS with the specified UUID
     -V : To print additional debug information.
@@ -324,7 +324,7 @@ if ($CONSISTENCY_CHECK) {
     my $image_name_and_uuid;
     my $image_uuid;
     my %unique_image_hash;
-    
+
 
     # Go through the nodes and build a hash of key=image_name+image_uuid and value of nodename
     foreach (@pingable_nodes) {
diff --git a/xCAT-probe/subcmds/nodecheck b/xCAT-probe/subcmds/nodecheck
index 67bdc43a2..537845d7b 100755
--- a/xCAT-probe/subcmds/nodecheck
+++ b/xCAT-probe/subcmds/nodecheck
@@ -30,7 +30,7 @@ $::USAGE = "Usage:
     $program_name [-d|delete_duplicate] [-n noderange] [-V|--verbose]
 
 Description:
-    Use this command to check node defintions in xCAT DB. 
+    Use this command to check node defintions in xCAT DB.
 
 Options:
     -h : Get usage information of $program_name
@@ -120,7 +120,7 @@ sub check_for_duplicate_mtms_sn {
 
                 # Check if mtm and serial are set
                 unless ($value eq " mtm= serial=") {
-                    # Build a hash of key="mtm+serial" and value="nodename". Later, this entry 
+                    # Build a hash of key="mtm+serial" and value="nodename". Later, this entry
                     # will be removed if predefined node found with the same mtm + serial found
                     $waiting_to_be_discovered{$value} = $node_name;
                 }
diff --git a/xCAT-probe/subcmds/osdeploy b/xCAT-probe/subcmds/osdeploy
index bbcbd1914..144f31cea 100755
--- a/xCAT-probe/subcmds/osdeploy
+++ b/xCAT-probe/subcmds/osdeploy
@@ -53,7 +53,7 @@ $::USAGE = "Usage:
     $program_name -n <node_range> -r <roll_back_duration> [-p <level>] [-V]
 
 Description:
-    Probe operating system provision process. Supports two modes - 'Realtime monitor' and 'Replay history'. 
+    Probe operating system provision process. Supports two modes - 'Realtime monitor' and 'Replay history'.
     Realtime monitor: This is a default. This tool with monitor provision state of the node. Trigger 'Realtime monitor' before rebooting target node to do provisioning.
     Replay history: Used after provisioning is finished to probe the previously completed provisioning.
 
@@ -61,7 +61,7 @@ Description:
 
 Options:
     -h : Get usage information of $program_name
-    -V : Output more information 
+    -V : Output more information
     -n : The range of nodes to be monitored or replayed.
     -t : The maximum time to wait when doing monitor, unit is minutes. default is 60.
     -r : Trigger 'Replay history' mode. Follow the duration of rolling back. Units are 'h' (hour) or 'm' (minute)
@@ -231,11 +231,11 @@ sub do_pre_check {
 =head3
     Description:
         Obtain the network interface of provision
-    Arguments: 
+    Arguments:
         installnic_ref: (output attribute) the reference of scalar which save the provision network interface.
         return_error_ref: (output attribute) the reference of array which save the error information.
     Returns:
-        0: success 
+        0: success
         1: failed
 =cut
 
@@ -266,9 +266,9 @@ sub obtain_install_nic {
 =head3
     Description:
         Check if the definition of all nodes are valid
-        If all nodes definition are valid, initialize below global attributes which will be used as a map in "Monitor" or "Replay" 
+        If all nodes definition are valid, initialize below global attributes which will be used as a map in "Monitor" or "Replay"
         %macmap, %ipnodemap
-                
+
     Arguments:
         node_range: node range
     Returns:
@@ -355,15 +355,15 @@ sub check_noderange {
 
 =head3
     Description:
-        Initailize a very important hash "%node_state" which will save the state information of every node 
+        Initailize a very important hash "%node_state" which will save the state information of every node
     Arguments:
         noderange: (input attribute) The range of node
-        node_state_ref: (output attribute) the reference of hash "%node_state" 
+        node_state_ref: (output attribute) the reference of hash "%node_state"
             The strucuture of  hash "%node_state" are :
-                $node_state{<node>}{statehistory}  Array.  save the latest loop provision states 
-                $node_state{<node>}{done}          Scalar.  the flag of if the node have finished the provision                
-                $node_state{<node>}{allstatehistory}   Array. save the history states before the latest loop provision. Used in debug mode.  
-                $node_state{<node>}{log}           Array. save all related logs of node. Used in debug mode. 
+                $node_state{<node>}{statehistory}  Array.  save the latest loop provision states
+                $node_state{<node>}{done}          Scalar.  the flag of if the node have finished the provision
+                $node_state{<node>}{allstatehistory}   Array. save the history states before the latest loop provision. Used in debug mode.
+                $node_state{<node>}{log}           Array. save all related logs of node. Used in debug mode.
     Returns:
         NULL
 =cut
@@ -391,9 +391,9 @@ sub init_node_state {
         noderange : the range of node
         start_time_of_replay: the start time point of scaning log
         end_time_of_replay: the end time point of scaning log
-   
+
     Returns:
-        0: success 
+        0: success
         1: failed
 =cut
 
@@ -429,7 +429,7 @@ sub do_replay {
         my $rst = $log_parse->obtain_one_second_logs($start_time_of_replay, \@valid_one_second_log_set);
         if ($rst) {
             probe_utils->send_msg("stdout", "d", "Failed to obtain logs from log files");
-            $rc = 1; 
+            $rc = 1;
             last;
         }
 
@@ -438,7 +438,7 @@ sub do_replay {
         }
 
         $start_time_of_replay = $log_parse->obtain_next_second();
-    
+
         # receive terminal signal from customer
         if ($terminal) {
             probe_utils->send_msg("stdout", "d", "Get INT or TERM signal!!!");
@@ -518,8 +518,8 @@ sub conclusion_report {
         # Cover limited non-privision error when replay
         # 1 if power on target node successfully and there is 'running postbootscript' in node state history, but without "installing" state,
         #   It is very possible to just do reboot process
-        # 2 if there isn't reboot operation for target node during the rollback time window 
-        #   That means there isn't provision process happened 
+        # 2 if there isn't reboot operation for target node during the rollback time window
+        #   That means there isn't provision process happened
 
         unless ($monitor) {
             if (! $start_rpower) {
@@ -606,14 +606,14 @@ sub performance_calculation {
     my @time_content;
     # print table's first line
     # @status_for_time: the status that needed to calculate time
-   
+
     my @title_lines = (
         [qw/NODE ELAPSED/],
         [qw/NODE SVRBOOT INSTALL POST POSTBOOT ELAPSED/],
         [qw/NODE RPOWER DHCP BOOTLOADER KERNEL INITRD INSTALL POST POSTBOOT COMPLETED/],
         [qw/NODE RPOWER DHCP BOOTLOADER KERNEL INITRD NETBOOTING ROOTIMG POSTBOOT COMPLETED/],
         [qw/NODE DHCP BOOTLOADER KERNEL INITRD NETBOOTING ROOTIMG POSTBOOT ELAPSED/]);
- 
+
     if ($performance eq "compact") {
         push @time_content, "Provision Time";
         push @time_content, $title_lines[0];
@@ -659,9 +659,9 @@ sub performance_calculation {
                         # If there is start time of kernel, but dhcp or bootloader's time value larger than kernel. It means dhcp and bootloader is after kernel, not the value we wanted.
                         } elsif ($node_status_time{$node}{$status}{start_time} > $node_status_time{$node}{$::STATE_KERNEL}{start_time}) {
                             push @timeinfo, "NULL";
-                            $isnull = 1;      
+                            $isnull = 1;
                         } else {
-                            push @timeinfo, $node_status_time{$node}{$status}{time_point}; 
+                            push @timeinfo, $node_status_time{$node}{$status}{time_point};
                         }
                     } elsif ($status >= $::STATE_INSTALLRPM and (!$node_status_time{$node}{$status-1}{start_time} and !$node_status_time{$node}{$status-1}{end_time})) {
                         push @timeinfo, "NULL";
@@ -706,7 +706,7 @@ sub performance_calculation {
                     $isnull = 1;
                 } else {
                     push @timeinfo, probe_utils->convert_second_to_time($tmp_end_time - $tmp_start_time);
-                } 
+                }
             } else {
                 push @timeinfo, "NULL";
                 $isnull = 1;
@@ -745,7 +745,7 @@ sub performance_calculation {
         Implement the monitor feature
     Arguments:
         noderange : the range of node
-        maxwaittime:  the max waiting time for monitor. 
+        maxwaittime:  the max waiting time for monitor.
     Returns:
         0: success
         1: failed
@@ -930,8 +930,8 @@ sub all_monitor_node_done {
     Description:
         Handle one line DHCP log
     Arguments:
-        log_ref: (input attribute) the reference of hash which save one line dhcp log. 
-        node_state_ref: (output attribute), the reference of hash "%node_state". refer to function "init_node_state" for the structure of "%node_state" 
+        log_ref: (input attribute) the reference of hash which save one line dhcp log.
+        node_state_ref: (output attribute), the reference of hash "%node_state". refer to function "init_node_state" for the structure of "%node_state"
     Returns:
         NULL
 =cut
@@ -965,7 +965,7 @@ sub handle_dhcp_msg {
         my $ip  = $1;
         my $mac = $2;
         my $nic = $3;
- 
+
         if (exists $macmap{$mac}) {
             my $node   = $macmap{$mac}{"node"};
             my $record = $log_ref->{msg};
@@ -1225,7 +1225,7 @@ sub handle_cluster_msg {
                     }
                 } elsif ($status eq "failed") {
                     $node_state_ref->{$node}{done} = 1;
-                } 
+                }
             }
         }
     }
@@ -1302,10 +1302,10 @@ sub handle_compute_msg {
 
 =head3
     Description:
-        Dispatch log to related handler 
+        Dispatch log to related handler
     Arguments:
         log_ref: (input attribute) the reference of hash which save one line log comes from computes.log.
-        candidate_mn_hostname_in_log_ref: (input attribute) The reference of array which save the candidate host name of MN 
+        candidate_mn_hostname_in_log_ref: (input attribute) The reference of array which save the candidate host name of MN
         node_state_ref: (output attribute), the reference of hash "%node_state". refer to function "init_node_state" for the structure of "%node_state"
     Returns:
         NULL
@@ -1340,7 +1340,7 @@ sub dispatch_log_to_handler {
     Arguments:
         node_state_ref: (input/output attribute), the reference of hash "%node_state". refer to function "init_node_state" for the structure of "%node_state"
         node : (input attribute) The node name
-        newstate : (input attribute) The new state of node 
+        newstate : (input attribute) The new state of node
     Returns:
         NULL
 =cut
diff --git a/xCAT-probe/subcmds/osimagecheck b/xCAT-probe/subcmds/osimagecheck
index fb894d926..7acfd16a7 100755
--- a/xCAT-probe/subcmds/osimagecheck
+++ b/xCAT-probe/subcmds/osimagecheck
@@ -27,7 +27,7 @@ $::USAGE = "Usage:
     $program_name [-V|--verbose]
 
 Description:
-    Use this command to check osimage defintions in xCAT DB. 
+    Use this command to check osimage defintions in xCAT DB.
 
 Options:
     -h : Get usage information of $program_name
@@ -179,13 +179,13 @@ sub check_for_valid_osimage_attributes {
     return $rc;
 }
 
-sub check_valid_files_defined { 
+sub check_valid_files_defined {
     probe_utils->send_msg("$output", "i", "==> Checking that valid files are specified in osimage attributes ...");
     my $rc = 0;
     my $osimage_list = `lsdef -t osimage $osimagecmd -s 2> /dev/null`;
     chomp($osimage_list);
     my @all_osimage_lists = split("[\n]", $osimage_list);
-    
+
     foreach (@all_osimage_lists) {
         # loop over the osimage name
         my ($osimage_name, $junk) = split " ", $_;
@@ -195,12 +195,12 @@ sub check_valid_files_defined {
         foreach (@attributes) {
             # loop over the attributes to check
             probe_utils->send_msg("$output", "d", "Checking attribute=$_ ...") if ($VERBOSE);
-   
+
             my $osimage_attribute = `lsdef -t osimage -o $osimage_name -i $_ -c 2> /dev/null`;
             chomp($osimage_attribute);
             my ($junk, $file) = split "=", $osimage_attribute;
             if ($file eq "") {
-                # if no file is defined, skip 
+                # if no file is defined, skip
                 next;
             }
 
@@ -212,11 +212,11 @@ sub check_valid_files_defined {
                        probe_utils->send_msg("$output", "f", "In $_, NON-EXISTANT FILE: $f");
                        $rc = 1;
                    }
-                } 
+                }
             }
         }
     }
-    if ($rc == 0) { 
+    if ($rc == 0) {
         probe_utils->send_msg("$output", "o", "Files specified in the osimage attributes seem to be valid.");
     }
 }
@@ -231,9 +231,9 @@ if ($osimage) {
     # verify a valid osimage name was passed in
     my $osimage_output = `lsdef -t osimage $osimagecmd 2>&1`;
     if ($osimage_output =~ /Error: Could not find/) {
-        probe_utils->send_msg("$output", "f", "Invalid osimage name passed in: $osimage"); 
+        probe_utils->send_msg("$output", "f", "Invalid osimage name passed in: $osimage");
         exit 1;
-    } 
+    }
 } else {
     probe_utils->send_msg("$output", "d", "[osimagecheck] No osimage passed in, checking all osimages ...") if ($VERBOSE);
 }
diff --git a/xCAT-probe/subcmds/xcatmn b/xCAT-probe/subcmds/xcatmn
index b4735a5bd..1eb1f4462 100755
--- a/xCAT-probe/subcmds/xcatmn
+++ b/xCAT-probe/subcmds/xcatmn
@@ -305,7 +305,7 @@ sub check_all_xcat_daemons {
         if ($counter > 1) {
             if ($daemon == "SSL listener")  {
                 my $cur_pid = `cat /var/run/xcatd.pid`;
-                my @ssl_pids = `ps aux 2>&1|grep -v grep|grep "xcatd: $daemon"|awk -F' ' '{print \$2}'`; 
+                my @ssl_pids = `ps aux 2>&1|grep -v grep|grep "xcatd: $daemon"|awk -F' ' '{print \$2}'`;
                 foreach my $ssl_pid (@ssl_pids) {
                     next if ($cur_pid == $ssl_pid);
                     my $child_pid = `ps --ppid $ssl_pid 2>&1 | grep "xcatd SSL:" | wc -l`;
@@ -579,7 +579,7 @@ sub check_disk {
     }
     $disk_str=~s/;$/]/g;
     $$checkpoint_ref = "Checking minimum disk space for xCAT $disk_str...";
- 
+
     my $msg = "";
     my %mountpointinfo;
     foreach my $dir (keys %dir_expectedspace_list) {
@@ -639,7 +639,7 @@ sub check_firewall {
     my $checkpoint_ref =  shift;
     my $error_ref = shift;
     my $rst       = 0;
-   
+
     $$checkpoint_ref = "Checking firewall is disabled...";
     @$error_ref = ();
 
@@ -665,13 +665,13 @@ sub check_http_service {
         push @$error_ref, "HTTP check need 'wget' tool, please install 'wget' tool and try again";
     } else {
         {
-            my $installdir = `lsdef -t site -i installdir -c 2>&1 | awk -F'=' '{print \$2}'`; 
+            my $installdir = `lsdef -t site -i installdir -c 2>&1 | awk -F'=' '{print \$2}'`;
             chomp($installdir);
             unless($installdir){
                 push @$error_ref, "HTTP work path(installdir) isn't configured in 'sit' table";
                 last;
             }
-            
+
             unless(-d "$installdir"){
                 push @$error_ref, "There isn't '$installdir' directory on current server";
                 last;
@@ -682,7 +682,7 @@ sub check_http_service {
                 push @$error_ref, "$errormsg";
                 last;
             }
-            
+
             $rst = 0;
         }
     }
@@ -784,7 +784,7 @@ sub check_log_record {
 
     `logger -p local4.info -t xcat $log_msg on MN 2>&1`;
     if ($?) {
-        push @$error_ref, "Failed to run command 'logger' on MN"; 
+        push @$error_ref, "Failed to run command 'logger' on MN";
         $rst = 1;
         return $rst;
     }
@@ -838,7 +838,7 @@ sub check_ntp_service{
 
     $$checkpoint_ref = "Checking NTP service is configured...";
     @$error_ref = ();
-  
+
     `which ntpq > /dev/null 2>&1`;
     if($?){
         push @$error_ref, "ntp service check need 'ntpq' tool, please install 'ntpq' toll and try again";
@@ -850,8 +850,8 @@ sub check_ntp_service{
             $rst = 1;
         }
     }
- 
-    return $rst; 
+
+    return $rst;
 }
 
 sub check_dns_service {
@@ -931,7 +931,7 @@ sub check_dhcp_service {
     my $checkpoint_ref =  shift;
     my $error_ref = shift;
     my $rst = 0;
-    
+
     $$checkpoint_ref = "Checking DHCP service is configured...";
     @$error_ref = ();
 
@@ -1080,7 +1080,7 @@ sub check_ulimits {
     my $rst_type       = "w";
 
     $$checkpoint_ref = "Checking Linux ulimits configuration...";
-    @$error_ref = (); 
+    @$error_ref = ();
 
     my $nofile_num = `sh -c 'ulimit -n' 2>&1`;
     chomp($nofile_num);
@@ -1099,7 +1099,7 @@ sub check_ulimits {
         push @$error_ref, "The number of open files is not enough for xcatd service, increase the limits for it according to xCAT document";
         $rst = 1;
         if ($percent >= 1) {
-            $rst_type = "f"; 
+            $rst_type = "f";
         }
     }
     return ($rst, $rst_type);
@@ -1139,7 +1139,7 @@ sub get_attribute_value  {
     my  $attr = shift;
 
     my $cmd_value = "";
-    my $command_info = `lsdef -t  $table -i $attr -c 2>&1`; 
+    my $command_info = `lsdef -t  $table -i $attr -c 2>&1`;
     if ($command_info =~ /$attr=(\d+)/) {
         $cmd_value = $1
     }
@@ -1168,7 +1168,7 @@ sub check_daemon_attributes {
             push @$error_ref, "Error:  xcatmaxbatchconnections > xcatmaxconnections";
             $rst = 1;
             $rst_type = "f";
-        } elsif ($xcatmaxconnections_site < $xcatmaxconnections or 
+        } elsif ($xcatmaxconnections_site < $xcatmaxconnections or
                  $xcatmaxbatchconnections_site < $xcatmaxbatchconnections and
                  $node_num >= $node_limit) {
             push @$error_ref, "Detected >= $node_limnit nodes, refer to xCAT documentation for xCAT daemon tuning recommendations.";
@@ -1176,7 +1176,7 @@ sub check_daemon_attributes {
         }
     }
     return ($rst, $rst_type);
-} 
+}
 
 sub returncmdoutput {
     my $rst       = shift;
@@ -1283,7 +1283,7 @@ while ($hierarchy_instance->read_reply(\%reply_cache)) {
                 } elsif ($reply_cache{$servers}->[$_] =~ /^(\w+)\s*:\s*(ssh:.+)/){
                     if("$1" eq "$server") {
                         $logmsg = "$2";
-                        $msg    = "[failed] :[$server]: $2"; 
+                        $msg    = "[failed] :[$server]: $2";
                     }
 
                     #For cases like below:
diff --git a/xCAT-probe/xCAT-probe.spec b/xCAT-probe/xCAT-probe.spec
index d2cd0243f..1fa41ccf3 100644
--- a/xCAT-probe/xCAT-probe.spec
+++ b/xCAT-probe/xCAT-probe.spec
@@ -66,7 +66,7 @@ if [ -e %{prefix}/probe/subcmds/bin/switchprobe ]; then
 else
     mkdir -p %{prefix}/probe/subcmds/bin/
 fi
-cd %{prefix}/probe/subcmds/bin/ 
+cd %{prefix}/probe/subcmds/bin/
 if [ -e %{prefix}/bin/xcatclient ]; then
     ln -s %{prefix}/bin/xcatclient switchprobe
 fi
diff --git a/xCAT-probe/xcatprobe b/xCAT-probe/xcatprobe
index ef7d0bef1..a686a3251 100755
--- a/xCAT-probe/xcatprobe
+++ b/xCAT-probe/xcatprobe
@@ -28,10 +28,10 @@ xcatprobe -l
 xcatprobe [-V] <subcommand>  <attrbute_to_subcommand>
 
 Options:
-    -h : get usage information of $program_name 
+    -h : get usage information of $program_name
     -l : list all valid sub commands
     -V : print verbose information of $program_name
-    -w : show each line completely. By default long lines are truncated. 
+    -w : show each line completely. By default long lines are truncated.
 ";
 
 #-----------------------------------
diff --git a/xCAT-rmc/debian/copyright b/xCAT-rmc/debian/copyright
index f61d34dfe..87e60f492 100644
--- a/xCAT-rmc/debian/copyright
+++ b/xCAT-rmc/debian/copyright
@@ -85,4 +85,4 @@ Everyone is permitted to copy and distribute copies of this Agreement, but in or
 
 This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
 
- 
+
diff --git a/xCAT-rmc/debian/postinst b/xCAT-rmc/debian/postinst
index 2fa9d33eb..01078ef32 100644
--- a/xCAT-rmc/debian/postinst
+++ b/xCAT-rmc/debian/postinst
@@ -35,7 +35,7 @@ case "$1" in
 	   needCopyFiles=1;
          fi
       fi
-    
+
       if [ $needCopyFiles -eq 1 ]; then
          echo "Copying files to /install/postscripts directory..."
          mkdir -p /install/postscripts
@@ -43,18 +43,18 @@ case "$1" in
          mkdir -p /install/postscripts/rmcmon/scripts
          cp /opt/xcat/sbin/rmcmon/configrmcnode /install/postscripts
          chmod 755 /install/postscripts/configrmcnode
-    
-         FILES_TO_COPY=`cat /opt/xcat/sbin/rmcmon/scripts_to_node|tr '\n' ' '` 
+
+         FILES_TO_COPY=`cat /opt/xcat/sbin/rmcmon/scripts_to_node|tr '\n' ' '`
          for file in $FILES_TO_COPY
          do
 	    #echo "file=$file"
 	    cp /opt/xcat/sbin/rmcmon/$file /install/postscripts/rmcmon/scripts
          done
          chmod 755 /install/postscripts/rmcmon/scripts/*
-    
+
          cp -r /opt/xcat/lib/perl/xCAT_monitoring/rmc/resources/node/* /install/postscripts/rmcmon/resources/node
-      fi  
-    
+      fi
+
 
       if [[ `uname -s` = "Linux" ]] ; then
          if [ -f "/proc/cmdline" ]; then   # prevent running it during install into chroot image
@@ -70,7 +70,7 @@ case "$1" in
              echo "Do not restartxcatd in not running system"
            else
              XCATROOT=/opt/xcat /opt/xcat/sbin/restartxcatd -r
-           fi     
+           fi
          fi
       fi
       exit 0
diff --git a/xCAT-rmc/plugin/rmcmon.pm b/xCAT-rmc/plugin/rmcmon.pm
index acaf5e85c..e11973b8c 100644
--- a/xCAT-rmc/plugin/rmcmon.pm
+++ b/xCAT-rmc/plugin/rmcmon.pm
@@ -30,7 +30,7 @@ use xCAT::DBobjUtils;
 
 #-------------------------------------------------------------------------------
 
-=head1  xCAT_monitoring:rmcmon  
+=head1  xCAT_monitoring:rmcmon
 =head2    Package Description
   xCAT monitoring plugin package to handle RMC monitoring.
 =cut
@@ -41,7 +41,7 @@ use xCAT::DBobjUtils;
 
 =head3    start
       This function gets called by the monitorctrl module
-      when xcatd starts and when monstart command is issued by the user. 
+      when xcatd starts and when monstart command is issued by the user.
       It starts the daemons and does necessary startup process for the RMC monitoring.
       It also queries the RMC for its currently monitored
       nodes which will, in tern, compared with the nodes
@@ -51,12 +51,12 @@ use xCAT::DBobjUtils;
       in the xCAT cluster.
        p_nodes -- a pointer to an arrays of nodes to be monitored. null means all.
        scope -- the action scope, it indicates the node type the action will take place.
-                0 means localhost only. 
-                2 means both localhost and nodes, 
+                0 means localhost only.
+                2 means both localhost and nodes,
        callback -- the callback pointer for error and status displaying. It can be null.
     Returns:
-      (return code, message) 
-      if the callback is set, use callback to display the status and error. 
+      (return code, message)
+      if the callback is set, use callback to display the status and error.
 =cut
 
 #--------------------------------------------------------------------------------
@@ -225,17 +225,17 @@ sub start {
 #--------------------------------------------------------------------------------
 
 =head3    stop
-      This function gets called when monstop command is issued by the user. 
+      This function gets called when monstop command is issued by the user.
       It stops the monitoring on all nodes, stops the RMC daemons.
     Arguments:
        p_nodes -- a pointer to an arrays of nodes to be stopped for monitoring. null means all.
        scope -- the action scope, it indicates the node type the action will take place.
-                0 means localhost only. 
-                2 means both monservers and nodes, 
+                0 means localhost only.
+                2 means both monservers and nodes,
        callback -- the callback pointer for error and status displaying. It can be null.
     Returns:
-      (return code, message) 
-      if the callback is set, use callback to display the status and error. 
+      (return code, message)
+      if the callback is set, use callback to display the status and error.
 =cut
 
 #--------------------------------------------------------------------------------
@@ -350,15 +350,15 @@ sub stop {
 #--------------------------------------------------------------------------------
 
 =head3    config
-      This function configures the cluster for the given nodes.  
+      This function configures the cluster for the given nodes.
       This function is called when moncfg command is issued or when xcatd starts
       on the service node. It will configure the cluster to include the given nodes within
-      the monitoring doamin. 
+      the monitoring doamin.
     Arguments:
        p_nodes -- a pointer to an arrays of nodes to be added for monitoring. none means all.
        scope -- the action scope, it indicates the node type the action will take place.
-                0 means localhost only. 
-                2 means localhost and nodes, 
+                0 means localhost only.
+                2 means localhost and nodes,
        callback -- the callback pointer for error and status displaying. It can be null.
     Returns:
        (error code, error message)
@@ -485,14 +485,14 @@ sub config {
 #--------------------------------------------------------------------------------
 
 =head3    deconfig
-      This function de-configures the cluster for the given nodes.  
-      This function is called when mondecfg command is issued by the user. 
+      This function de-configures the cluster for the given nodes.
+      This function is called when mondecfg command is issued by the user.
       It should remove the given nodes from the product for monitoring.
     Arguments:
        p_nodes -- a pointer to an arrays of nodes to be removed for monitoring. none means all.
        scope -- the action scope, it indicates the node type the action will take place.
-                0 means local host only. 
-                2 means both local host and nodes, 
+                0 means local host only.
+                2 means both local host and nodes,
        callback -- the callback pointer for error and status displaying. It can be null.
     Returns:
        (error code, error message)
@@ -563,11 +563,11 @@ sub deconfig {
 =head3    supportNodeStatusMon
     This function is called by the monitorctrl module to check
     if RMC can help monitoring and returning the node status.
-    
+
     Arguments:
         none
     Returns:
-         1  
+         1
 =cut
 
 #--------------------------------------------------------------------------------
@@ -584,14 +584,14 @@ sub supportNodeStatusMon {
 =head3   startNodeStatusMon
     This function is called by the monitorctrl module to tell
     RMC to start monitoring the node status and feed them back
-    to xCAT. RMC will start setting up the condition/response 
-    to monitor the node status changes.  
+    to xCAT. RMC will start setting up the condition/response
+    to monitor the node status changes.
 
     Arguments:
        p_nodes -- a pointer to an arrays of nodes for monitoring. none means all.
        scope -- the action scope, it indicates the node type the action will take place.
-                0 means local host only. 
-                2 means both local host and nodes, 
+                0 means local host only.
+                2 means both local host and nodes,
        callback -- the callback pointer for error and status displaying. It can be null.
     Returns:
        (error code, error message)
@@ -708,7 +708,7 @@ sub startNodeStatusMon {
 
     Arguments:
         $oldstatus a pointer to a hash table that has the current node status
-        $node  the name of the service node to run RMC command from. If null, get from local host. 
+        $node  the name of the service node to run RMC command from. If null, get from local host.
     Returns:
         (return code, message)
 =cut
@@ -791,8 +791,8 @@ sub saveRMCNodeStatusToxCAT {
     Arguments:
        p_nodes -- a pointer to an arrays of nodes for monitoring. none means all.
        scope -- the action scope, it indicates the node type the action will take place.
-                0 means local host only. 
-                2 means both local host and nodes, 
+                0 means local host only.
+                2 means both local host and nodes,
        callback -- the callback pointer for error and status displaying. It can be null.
     Returns:
         (return code, message)
@@ -924,10 +924,10 @@ sub getLocalNodeID {
 #--------------------------------------------------------------------------------
 
 =head3    getNodeInfo
-      This function gets the nodeid, node ip addresses for the given node 
+      This function gets the nodeid, node ip addresses for the given node
     Arguments:
        node
-       flag --- if 0 means normal nodes, if 1 means HMC.  
+       flag --- if 0 means normal nodes, if 1 means HMC.
     Returns:
        (nodeid, nodeip) if error, nodeid=-1 and nodeip is the error message
 =cut
@@ -972,10 +972,10 @@ sub getNodeInfo
 #--------------------------------------------------------------------------------
 
 =head3    reportError
-      This function writes the error message to the callback, otherwise to syslog. 
+      This function writes the error message to the callback, otherwise to syslog.
     Arguments:
        error
-       callback 
+       callback
     Returns:
        none
 =cut
@@ -997,13 +997,13 @@ sub reportError
 
 =head3    addNodes
       This function adds the nodes into the RMC cluster, it does not check the OSI type and
-      if the node has already defined. 
+      if the node has already defined.
     Arguments:
-       nodes --an array of nodes to be added. 
+       nodes --an array of nodes to be added.
        master -- the monitoring master of the node.
        scope -- the action scope, it indicates the node type the action will take place.
-                0 means localhost only. 
-                2 means localhost and nodes, 
+                0 means localhost only.
+                2 means localhost and nodes,
        callback -- the callback pointer for error and status displaying. It can be null.
        flag  -- 0 means normal node. 1 means HMC.
     Returns:
@@ -1243,11 +1243,11 @@ sub addNodes {
 =head3    removeNodes
       This function removes the nodes from the RMC cluster.
     Arguments:
-      nodes --a pointer to a array of node names to be removed. 
+      nodes --a pointer to a array of node names to be removed.
       master -- the master of the nodes.
        scope -- the action scope, it indicates the node type the action will take place.
-                0 means localhost only. 
-                2 means localhost and nodes, 
+                0 means localhost only.
+                2 means localhost and nodes,
        callback -- the callback pointer for error and status displaying. It can be null.
        flag  -- 0 means normal node. 1 means HMC.
     Returns:
@@ -1410,7 +1410,7 @@ sub removeNodes {
 #--------------------------------------------------------------------------------
 
 =head3    processSettingChanges
-      This function gets called when the setting for this monitoring plugin 
+      This function gets called when the setting for this monitoring plugin
       has been changed in the monsetting table.
     Arguments:
        none.
@@ -1427,7 +1427,7 @@ sub processSettingChanges {
 
 =head3    getDiscription
       This function returns the detailed description of the plugin inluding the
-     valid values for its settings in the monsetting tabel. 
+     valid values for its settings in the monsetting tabel.
      Arguments:
         none
     Returns:
@@ -1438,31 +1438,31 @@ sub processSettingChanges {
 sub getDescription {
     return
       "  Description:
-    rmcmon uses IBM's Resource Monitoring and Control (RMC) component 
-    of Reliable Scalable Cluster Technology (RSCT) to monitor the 
-    xCAT cluster. RMC has built-in resources such as CPU, memory, 
-    process, network, file system etc for monitoring. RMC can also be 
-    used to provide node liveness status monitoring and performance monitoring for xCAT. 
-    RMC is good for threadhold monitoring. xCAT automatically sets up the 
+    rmcmon uses IBM's Resource Monitoring and Control (RMC) component
+    of Reliable Scalable Cluster Technology (RSCT) to monitor the
+    xCAT cluster. RMC has built-in resources such as CPU, memory,
+    process, network, file system etc for monitoring. RMC can also be
+    used to provide node liveness status monitoring and performance monitoring for xCAT.
+    RMC is good for threadhold monitoring. xCAT automatically sets up the
     monitoring domain for RMC during node deployment time. And if performance
     monitoring is enabled, xCAT monitoring will collect and consolidate performance
-    data based on montype&rmetrics setting, and then store to RRD database. 
+    data based on montype&rmetrics setting, and then store to RRD database.
   Settings:
-    rfanout -- indicating the fanout number for configuring or deconfiguring 
+    rfanout -- indicating the fanout number for configuring or deconfiguring
         remote nodes.
     nodeusebatch -- use RMC event batching function when doing node status monitoring.
-    montype -- indicating type of performance monitoring, the value could be 
+    montype -- indicating type of performance monitoring, the value could be
                \"event\" : event monitoring (default),
 	       \"perf\" : performance monitoring,
                \"event,perf\" or \"perf,event\" : both.
-    rmetrics -- defines resource class,resouce names, attributes and sample interval for 
-                performance monitoring. 
+    rmetrics -- defines resource class,resouce names, attributes and sample interval for
+                performance monitoring.
 		Syntax of key: rmetrics_resource class For example: rmetrics_IBM.Processor
 		Syntax of value: [resource names]attribute names:sample interval
 		The unit of sample interval is minute.
 		For example:
 		  [proc0,proc1]PctTimeIdle,PctTimeWait,PctTimeKernel,PctTimeUser:5
-				  
+				
 ";
 }
 
@@ -1470,10 +1470,10 @@ sub getDescription {
 
 =head3    getNodeConfData
       This function gets a list of configuration data that is needed by setting up
-    node monitoring.  These data-value pairs will be used as environmental variables 
+    node monitoring.  These data-value pairs will be used as environmental variables
     on the given node.
     Arguments:
-        pointet to a arry of nodes 
+        pointet to a arry of nodes
     Returns:
         pointer to a 2-level hash. For format will as following:
         {
@@ -1529,7 +1529,7 @@ sub getNodeConfData {
 
 =head3    getPostscripts
       This function returns the postscripts needed for the nodes and for the servicd
-      nodes. 
+      nodes.
      Arguments:
         none
     Returns:
@@ -1735,15 +1735,15 @@ sub showeventlog
 #--------------------------------------------------------------------------------
 
 =head3    show
-      This function configures the cluster for the given nodes.  
+      This function configures the cluster for the given nodes.
       This function is called when moncfg command is issued or when xcatd starts
       on the service node. It will configure the cluster to include the given nodes within
-      the monitoring doamin. 
+      the monitoring doamin.
     Arguments:
        p_nodes -- a pointer to an arrays of nodes to be added for monitoring. none means all.
        scope -- the action scope, it indicates the node type the action will take place.
-                0 means localhost only. 
-                2 means localhost and nodes, 
+                0 means localhost only.
+                2 means localhost and nodes,
        callback -- the callback pointer for error and status displaying. It can be null.
     Returns:
        (error code, error message)
diff --git a/xCAT-rmc/scripts/configrmcnode b/xCAT-rmc/scripts/configrmcnode
index 14cab26ce..b7827c475 100755
--- a/xCAT-rmc/scripts/configrmcnode
+++ b/xCAT-rmc/scripts/configrmcnode
@@ -8,11 +8,11 @@
 #  To add node to the cluster:
 #    NODE=nodename NODEID=fbb5ec1f64dd299c \
 #    MONMASTER=msname_or_ip MS_NODEID=fbb5ec1f64dd299c \
-#    configrmcnode 1    
-#  To remove node to the cluster 
+#    configrmcnode 1
+#  To remove node to the cluster
 #    NODE=nodename configrmcnode -1
-########################################################################################## 
-if [ -n "$1" ]; then 
+##########################################################################################
+if [ -n "$1" ]; then
   ADD=$1
 else
   ADD=1
@@ -25,7 +25,7 @@ fi
 #logger -t xcat -p local4.info "configrmcnode: ADD=$ADD, NODE=$NODE, NODEID=$NODEID MONMASTER=$MONMASTER,MS_NODEID=$MS_NODEID"
 
 #check if rsct is installed and running
-if [ ! -e /usr/bin/lsrsrc ]; then  
+if [ ! -e /usr/bin/lsrsrc ]; then
    logger -t xcat -p local4.err "RMC setup on node $NODE: RSCT is not is not installed."
   exit 1;
 else
@@ -78,10 +78,10 @@ if [ $ADD -eq 1 ]; then
         if [ -e /usr/sbin/rsct/install/bin/recfgctnid ]; then
           result=`/usr/sbin/rsct/install/bin/recfgctnid $NODEID 2>&1`
           if [ $? -ne 0 ]; then
-            echo "Reset nodeid: $result" 
-            logger -t xcat -p local4.info "Reset nodeid: $result" 
+            echo "Reset nodeid: $result"
+            logger -t xcat -p local4.info "Reset nodeid: $result"
           fi
-        else 
+        else
           #stop all rmc daemons
           /usr/sbin/rsct/bin/rmcctrl -z
 
@@ -91,7 +91,7 @@ if [ $ADD -eq 1 ]; then
           else
             if [ -e /etc/ct_node_id ]; then
               sed s/^[^\#].*$/$NODEID/ /etc/ct_node_id >  /tmp/id.tmp
-            else 
+            else
               echo $NODEID > /tmp/id.tmp
             fi
           fi
@@ -102,13 +102,13 @@ if [ $ADD -eq 1 ]; then
           #reconfig RMC
           result=`/usr/sbin/rsct/install/bin/recfgct -s 2>&1`
           if [ $? -ne 0 ]; then
-            echo "RMC setup on node $NODE: Cannot reconfig RSCT with new node id" 
-            logger -t xcat -p local4.warning "RMC setup on node $NODE: Cannot reconfig RSCT with new node id" 
+            echo "RMC setup on node $NODE: Cannot reconfig RSCT with new node id"
+            logger -t xcat -p local4.warning "RMC setup on node $NODE: Cannot reconfig RSCT with new node id"
           fi
         fi
       fi
     fi
-  
+
     PID=`/bin/ps -ef | /bin/grep rmcd | /bin/grep -v grep | /bin/awk '{print $2}'`
     if [ -z "$PID" ]; then
       #restart rmc daemon
@@ -161,15 +161,15 @@ if [ $ADD -eq 1 ]; then
       length=`expr $length - 1`
       ms_ip=`expr substr "$result" $pos $length`
     else
-      echo "RMC setup on node $NODE:$result" 
+      echo "RMC setup on node $NODE:$result"
       logger -t xcat -p local4.info "RMC setup on node $NODE:$result"
     fi
-  
-    #define resource in IBM.MCP class on node       
+
+    #define resource in IBM.MCP class on node
     result1=`/usr/bin/mkrsrc-api IBM.MCP::MNName::"$NODE"::KeyToken::"$MONMASTER"::IPAddresses::"{\"$ms_ip\"}"::NodeID::0x$MS_NODEID 2>&1`
     if [ $? -gt 0 ]; then
-      echo "Define resource in IBM.MCP class on node $NODE. result=$result1" 
-      logger -t xcat -p local4.err  "Define resource in IBM.MCP class on node $NODE. result=$result1" 
+      echo "Define resource in IBM.MCP class on node $NODE. result=$result1"
+      logger -t xcat -p local4.err  "Define resource in IBM.MCP class on node $NODE. result=$result1"
       exit 1
     fi
   fi
@@ -178,14 +178,14 @@ if [ $ADD -eq 1 ]; then
   if [[ -z "$NFSSERVER" ]]; then
     NFSSERVER=$MASTER
   fi
- 
+
   if [ -f /opt/xcat/xcatinfo ]; then
     INSTALLDIR=`grep 'INSTALLDIR' /opt/xcat/xcatinfo |cut -d= -f2`
   fi
   if [ -z "$INSTALLDIR" ]; then
     INSTALLDIR="/install"
   fi
- 
+
   nodetype="node"
   if [[ $NTYPE = service ]]; then
       nodetype=sn
@@ -197,9 +197,9 @@ if [ $ADD -eq 1 ]; then
       mkdir -p /tmp/postage/
       rm -f -R /tmp/postage/rmcmon/*
       wget -l inf -N -r --waitretry=10 --random-wait --retry-connrefused -t 0 -T 60 -nH --cut-dirs=2 --reject "index.html*" --no-parent http://$NFSSERVER$INSTALLDIR/postscripts/rmcmon/scripts -P /tmp/postage/ 2> /tmp/wget.log
-      wget -l inf -N -r --waitretry=10 --random-wait --retry-connrefused -t 0 -T 60 -nH --cut-dirs=2 --reject "index.html*" --no-parent http://$NFSSERVER$INSTALLDIR/postscripts/rmcmon/resources/$nodetyp -P /tmp/postage/ 2> /tmp/wget.log      
-      mv /tmp/postage/rmcmon/* /var/xcat/rmcmon;      
-      rm -rf /tmp/postage/rmcmon/  
+      wget -l inf -N -r --waitretry=10 --random-wait --retry-connrefused -t 0 -T 60 -nH --cut-dirs=2 --reject "index.html*" --no-parent http://$NFSSERVER$INSTALLDIR/postscripts/rmcmon/resources/$nodetyp -P /tmp/postage/ 2> /tmp/wget.log
+      mv /tmp/postage/rmcmon/* /var/xcat/rmcmon;
+      rm -rf /tmp/postage/rmcmon/
   else
       mkdir -p /xcatmnt
       if [[ $USENFSV4ONAIX = yes ]] || [[ $USENFSV4ONAIX = 1 ]] || [[ $USENFSV4ONAIX = Yes ]] || [[ $USENFSV4ONAIX = YES ]] || [[ $USENFSV4ONAIX = Y ]] || [[ $USENFSV4ONAIX = y ]]; then
@@ -219,7 +219,7 @@ if [ $ADD -eq 1 ]; then
       umount /xcatmnt
       rmdir /xcatmnt
   fi
-  chmod 755 /var/xcat/rmcmon/scripts/* 
+  chmod 755 /var/xcat/rmcmon/scripts/*
   if [ -d /var/xcat/rmcmon/resources/$nodetype ]; then
       /var/xcat/rmcmon/scripts/mkrmcresources /var/xcat/rmcmon/resources/$nodetype
   fi
diff --git a/xCAT-rmc/scripts/errmsgque b/xCAT-rmc/scripts/errmsgque
index eaf8b44d8..8eb459aa9 100755
--- a/xCAT-rmc/scripts/errmsgque
+++ b/xCAT-rmc/scripts/errmsgque
@@ -48,7 +48,7 @@ exit 0;
 =head3    runcmd
     Run the given cmd and return the output in an array (already chopped).  Alternatively,
     if this function is used in a scalar context, the output is joined into a single string
-    with the newlines separating the lines.  
+    with the newlines separating the lines.
     Arguments:
         command, exitcode and reference to output
     Returns:
@@ -65,7 +65,7 @@ exit 0;
                 exit code.
         number > 0:    Display error msg and exit with the given code
     Example:
-        my $outref =  runcmd($cmd, -2, 1);     
+        my $outref =  runcmd($cmd, -2, 1);
     Comments:
         If refoutput is true, then the output will be returned as a reference to
         an array for efficiency.
diff --git a/xCAT-rmc/scripts/mkrmcresources b/xCAT-rmc/scripts/mkrmcresources
index 98466a551..bc7226904 100755
--- a/xCAT-rmc/scripts/mkrmcresources
+++ b/xCAT-rmc/scripts/mkrmcresources
@@ -6,15 +6,15 @@
 =head1  mkrmcresources
 =head2 mkrmcresources is used to predefine RMC conditions, responses, associations,
          sensors (and can be extended to support any RSCT resource
-         class). 
+         class).
          To use the command, create perl modules in a directory. Each resource
-         should have its own perl  module (so that it is easy to update a 
-         resource without interfering with other resources), 
+         should have its own perl  module (so that it is easy to update a
+         resource without interfering with other resources),
          and should be named <Resource Name>.pm.
          After the resource perl modules are installed, they will be created
-         by the next execution of the this command. 
+         by the next execution of the this command.
          This command should be called by the post install scripts
-         of packaging files, script run after install or from the command line.   
+         of packaging files, script run after install or from the command line.
 =cut
 
 #-------------------------------------------------------------------------------
@@ -127,7 +127,7 @@ sub isHMC
 =head3    runcmd
     Run the given cmd and return the output in an array (already chopped).  Alternatively,
     if this function is used in a scalar context, the output is joined into a single string
-    with the newlines separating the lines.  
+    with the newlines separating the lines.
     Arguments:
         command, exitcode and reference to output
     Returns:
@@ -144,7 +144,7 @@ sub isHMC
                 exit code.
         number > 0:    Display error msg and exit with the given code
     Example:
-        my $outref =  runcmd($cmd, -2, 1);     
+        my $outref =  runcmd($cmd, -2, 1);
     Comments:
         If refoutput is true, then the output will be returned as a reference to
         an array for efficiency.
@@ -231,7 +231,7 @@ sub runcmd
          my $outref =runrmccmd('lsrsrc-api', "-i -D ':|:'", $where);
     Comments:
         When $nodelist_ref is not null, break it up into smaller slices
-		and run RMC commands seperately for each slice. 
+		and run RMC commands seperately for each slice.
 		Otherwise just run RMC commands with the arguments passed in.
 =cut
 
@@ -303,7 +303,7 @@ sub runrmccmd
 #--------------------------------------------------------------------------------
 
 =head3    queryResources
-        Queries all resources of a given class or classes. Places 
+        Queries all resources of a given class or classes. Places
         results into a global hash for each resource class.
         Arguments: a list of RSCT resource classes
         Globals: %::EXISTS::{$resource}
@@ -484,7 +484,7 @@ sub compareResources
 =head3    removeQuotes
         removes starting and ending quotes that are in the output of lsrsrc
         Arguments: string
-        Returns: string with no leading or trailing quotes    
+        Returns: string with no leading or trailing quotes
 =cut
 
 #--------------------------------------------------------------------------------
@@ -499,7 +499,7 @@ sub removeQuotes
 #--------------------------------------------------------------------------------
 
 =head3    createResources
-        Calls mkrsrc-api on all resources in the %::CREATE hash   
+        Calls mkrsrc-api on all resources in the %::CREATE hash
         Globals: %::CREATE
 =cut
 
@@ -663,7 +663,7 @@ sub changeResources
 #--------------------------------------------------------------------------------
 
 =head3    writeAllFiles
-        creates all files for the given resources classes     
+        creates all files for the given resources classes
         Arguments: a array ref of class names,  basedir
 =cut
 
@@ -686,7 +686,7 @@ sub writeAllFiles
 #--------------------------------------------------------------------------------
 
 =head3    writeFile
-        creates a file with the resource info in 
+        creates a file with the resource info in
        $basedir/<class>
         Arguments: class::resource_name, basedir
 =cut
@@ -793,7 +793,7 @@ sub writeFile
 #--------------------------------------------------------------------------------
 sub usage
 {
-    print "Usage: 
+    print "Usage:
      mkrmcresources [--install|--mkfile classname::rsrcname|--mkall] \
                     [-V|--verbose] directory\n\
      mkrmcresources -h|--help\n\
diff --git a/xCAT-rmc/scripts/monaixsyslog b/xCAT-rmc/scripts/monaixsyslog
index adb19801b..7ab6f86a4 100755
--- a/xCAT-rmc/scripts/monaixsyslog
+++ b/xCAT-rmc/scripts/monaixsyslog
@@ -3,7 +3,7 @@
 #------------------------------------------------------------------------------
 
 =head1  monaixsyslog
-=head2  
+=head2
 =cut
 
 #------------------------------------------------------------------------------
@@ -121,7 +121,7 @@ exit 0;
 
 	parse the command line and check the values
 
-	paras: 
+	paras:
 	-p  :    <facility>.<priority>, the default value is "*.warn"
 	-f  :    <fifo_name>, the default value is "/var/opt/xcat_aix_syslog/syslog_fifo"
 
@@ -191,7 +191,7 @@ sub getArgs()
     Return:
     $i            - the line number that has been read and refreshed to Sensor.
     $mark_content - the line content related to $i
-    $to_rfile     - the flag that indicates whether we need to read from the 
+    $to_rfile     - the flag that indicates whether we need to read from the
                     rotated file.
 
 =cut
@@ -315,7 +315,7 @@ sub updateRunfile()
 =head3    runcmd
     Run the given cmd and return the output in an array (already chopped).  Alternatively,
     if this function is used in a scalar context, the output is joined into a single string
-    with the newlines separating the lines.  
+    with the newlines separating the lines.
     Arguments:
         command, exitcode and reference to output
     Returns:
@@ -332,7 +332,7 @@ sub updateRunfile()
                 exit code.
         number > 0:    Display error msg and exit with the given code
     Example:
-        my $outref =  runcmd($cmd, -2, 1);     
+        my $outref =  runcmd($cmd, -2, 1);
     Comments:
         If refoutput is true, then the output will be returned as a reference to
         an array for efficiency.
diff --git a/xCAT-rmc/scripts/monerrorlog b/xCAT-rmc/scripts/monerrorlog
index 717e5b78f..cb9c5e720 100755
--- a/xCAT-rmc/scripts/monerrorlog
+++ b/xCAT-rmc/scripts/monerrorlog
@@ -3,7 +3,7 @@
 #------------------------------------------------------------------------------
 
 =head1  monaixsyslog
-=head2  
+=head2
   When first run (by the sensor) this script adds an entry to the AIX ODM
   or Linux syslog.conf file so that it will be notified when an error is
   logged (through a message queue on AIX and a named pipe on Linux). Then
@@ -64,7 +64,7 @@ if (!-d $vardir) { mkdir($vardir); }
 
 #--------------------------------------------------------------------------------
 
-=head3   first_time_run 
+=head3   first_time_run
 
         Notes: check whether this is the first time that monerrlog is run
 	       on Linux, check the marker file /var/opt/xcat_err_mon/.monerrorlog_run
@@ -75,7 +75,7 @@ Arguments:
 
 Returns:
        0 - This is NOT the first time that monerrlog is run
-       1 - This is the first time that monerrlog is run 
+       1 - This is the first time that monerrlog is run
 =cut
 
 #--------------------------------------------------------------------------------
@@ -258,7 +258,7 @@ exit 0;
 
 	parse the command line and check the values
 
-	paras: 
+	paras:
 	-p  :    <facility>.<priority>, the default value is "*.warn"
 	-f  :    <fifo_name>, the default value is "/var/opt/xcat_err_mon/syslog_fifo"
 
@@ -320,7 +320,7 @@ sub getArgs()
 =head3    runcmd
     Run the given cmd and return the output in an array (already chopped).  Alternatively,
     if this function is used in a scalar context, the output is joined into a single string
-    with the newlines separating the lines.  
+    with the newlines separating the lines.
     Arguments:
         command, exitcode and reference to output
     Returns:
@@ -337,7 +337,7 @@ sub getArgs()
                 exit code.
         number > 0:    Display error msg and exit with the given code
     Example:
-        my $outref =  runcmd($cmd, -2, 1);     
+        my $outref =  runcmd($cmd, -2, 1);
     Comments:
         If refoutput is true, then the output will be returned as a reference to
         an array for efficiency.
@@ -527,12 +527,12 @@ sub createRandomName
     Arguments:
         $service  - a service name such as 'inetd','xinetd'
         $svcarg   - arguments for the service such as 'start',
-                    'stop' or 'status'. 
+                    'stop' or 'status'.
     Returns:
         A full cli for the service script.
     Comment:
         this subroutine is deprecated, use service subroutines in xCAT::Utils
-        instead   
+        instead
 =cut
 
 #--------------------------------------------------------------------------------
diff --git a/xCAT-server/bin/replaycons b/xCAT-server/bin/replaycons
index bec0e4057..04ba687f6 100755
--- a/xCAT-server/bin/replaycons
+++ b/xCAT-server/bin/replaycons
@@ -18,11 +18,11 @@ use Getopt::Long;
 my $usage_string =
   "Usage:
   replaycons node [bps] [tail]
-  replaycons -h|--help 
+  replaycons -h|--help
   replaycons -v|--version
-    bps          Specifies the display rate. 
+    bps          Specifies the display rate.
                  The default is 19200.
-    tail         Specifies the number of bytes to be displayed. 
+    tail         Specifies the number of bytes to be displayed.
                  The default displays all.
     -h|--help    Display this usage statement.
     -v|--version Display the version number.";
diff --git a/xCAT-server/debian/copyright b/xCAT-server/debian/copyright
index f61d34dfe..87e60f492 100644
--- a/xCAT-server/debian/copyright
+++ b/xCAT-server/debian/copyright
@@ -85,4 +85,4 @@ Everyone is permitted to copy and distribute copies of this Agreement, but in or
 
 This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
 
- 
+
diff --git a/xCAT-server/debian/postrm b/xCAT-server/debian/postrm
index 959819242..bdbefba81 100644
--- a/xCAT-server/debian/postrm
+++ b/xCAT-server/debian/postrm
@@ -22,7 +22,7 @@ set -e
 case "$1" in
     purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
     ;;
-    
+
     remove)
        rm -f /usr/sbin/xcatd  #remove the symbolic
 
diff --git a/xCAT-server/esx.esx4.tmpl b/xCAT-server/esx.esx4.tmpl
index 8e08a471c..cb9296986 100644
--- a/xCAT-server/esx.esx4.tmpl
+++ b/xCAT-server/esx.esx4.tmpl
@@ -16,8 +16,8 @@ accepteula
 #vmlicense --mode=server --server=27000@192.168.0.25 -edition=esxFull
 #Starter License Type
 #vmlicense --mode=server --server=27000@192.168.0.25 -edition=esxExpress
-#File Based: 
-#Place the content of the lincese file 
+#File Based:
+#Place the content of the lincese file
 #in a single line in the %vmlicense_text section
 #vmlicense --mode=file
 
diff --git a/xCAT-server/etc/init.d/xcatd b/xCAT-server/etc/init.d/xcatd
index 309d29e99..f92bd214d 100755
--- a/xCAT-server/etc/init.d/xcatd
+++ b/xCAT-server/etc/init.d/xcatd
@@ -6,8 +6,8 @@
 
 ### BEGIN INIT INFO
 # Provides: xcatd
-# Required-Start: $network $syslog 
-# Required-Stop: 
+# Required-Start: $network $syslog
+# Required-Stop:
 # Should-Start: mysql
 # Default-Start: 3 4 5
 # Default-stop: 0 1 2 6
@@ -86,7 +86,7 @@ reload)
   if [ -r /etc/profile.d/xcat.sh ]; then
        . /etc/profile.d/xcat.sh
   fi
-  export XCATRELOAD=yes 
+  export XCATRELOAD=yes
   xcatd -p /var/run/xcatd.pid && $LOG_SUCCESS || $LOG_FAILURE
   ;;
 status)
@@ -135,8 +135,8 @@ start)
     exit
   fi
   echo -n "Starting xcatd "
-  #/var/run/ is a symlink on /run and that's just a tmpfs mount created on boot on ubuntu. 
-  #if there is not this directory, create first 
+  #/var/run/ is a symlink on /run and that's just a tmpfs mount created on boot on ubuntu.
+  #if there is not this directory, create first
   if [ ! -d /var/run/xcat ];then
     mkdir -p /var/run/xcat
   fi
diff --git a/xCAT-server/lib/perl/xCAT/AGENT.pm b/xCAT-server/lib/perl/xCAT/AGENT.pm
index f62125615..aee201cbe 100644
--- a/xCAT-server/lib/perl/xCAT/AGENT.pm
+++ b/xCAT-server/lib/perl/xCAT/AGENT.pm
@@ -108,6 +108,8 @@ sub handle_message {
             xCAT::SvrUtils::sendmsg([ 1, $msg->{data} ], $callback, $msg->{node});
         } elsif ($msg->{type} eq 'syslog'){
             xCAT::MsgUtils->message("S", $msg->{data});
+        } elsif ($msg->{type} eq 'info_with_host') {
+            xCAT::MsgUtils->message("I", { data => [$msg->{data}], host => [1] }, $callback);
         }
     } elsif ($data->{type} eq $DB_TYPE) {
         my $attribute = $data->{attribute};
diff --git a/xCAT-server/lib/perl/xCAT/Goconserver.pm b/xCAT-server/lib/perl/xCAT/Goconserver.pm
index 9417cad58..ce095116f 100644
--- a/xCAT-server/lib/perl/xCAT/Goconserver.pm
+++ b/xCAT-server/lib/perl/xCAT/Goconserver.pm
@@ -756,4 +756,4 @@ sub restart_service {
 sub get_api_port {
     return $go_api_port;
 }
-1;
\ No newline at end of file
+1;
diff --git a/xCAT-server/lib/perl/xCAT/IPMI.pm b/xCAT-server/lib/perl/xCAT/IPMI.pm
index 8d197e658..88677810d 100644
--- a/xCAT-server/lib/perl/xCAT/IPMI.pm
+++ b/xCAT-server/lib/perl/xCAT/IPMI.pm
@@ -90,10 +90,10 @@ my %command_info = (
         1 => "Get Device ID",
         2 => "Cold Reset",
         55 => "Get System GUID",
-        64  => "Set Channel Access", 
+        64  => "Set Channel Access",
         76 => "Set User Payload Access",
         10 => "Get Command Support",
-    },	 
+    },	
     4 => {
         18 => "Set PEF Configuration Parameters",
         19 => "Get PEF Configuration Parameters",
@@ -110,7 +110,7 @@ my %command_info = (
         1 => "Set LAN Configuration Parameters",
         2 => "Get LAN Configuration Parameters",
         33 => "Set SOL Configuration Parameters",
-        34 => "Get SOL Configuration Parameters",         
+        34 => "Get SOL Configuration Parameters",
     },
     10 => {
         35 => "Get SDR",
diff --git a/xCAT-server/lib/perl/xCAT/MellanoxIB.pm b/xCAT-server/lib/perl/xCAT/MellanoxIB.pm
index 3d9b395a6..372f39528 100644
--- a/xCAT-server/lib/perl/xCAT/MellanoxIB.pm
+++ b/xCAT-server/lib/perl/xCAT/MellanoxIB.pm
@@ -21,7 +21,7 @@ use strict;
 
 =head1  xCAT::MellanoxIB
 =head2    Package Description
-  It handles Mellanox IB switch related function. It used the CLI interface of 
+  It handles Mellanox IB switch related function. It used the CLI interface of
   Mellanox IB switch
 
 =cut
@@ -31,7 +31,7 @@ use strict;
 #--------------------------------------------------------------------------------
 
 =head3    getConfigure
-      It queries the info from the given swithes.      
+      It queries the info from the given swithes.
     Arguments:
         noderange-- an array ref to switches.
         callback -- pointer for writes response back to the client.
@@ -228,7 +228,7 @@ sub parseOutput {
 #--------------------------------------------------------------------------------
 
 =head3    setConfigure
-      It configures the the given swithes.      
+      It configures the the given swithes.
     Arguments:
         noderange-- an array ref to switches.
         callback -- pointer for writes response back to the client.
@@ -409,7 +409,7 @@ sub setConfig {
 #--------------------------------------------------------------------------------
 
 =head3    querySSHcfg
-      It checks if the current host can ssh to the given switches without password.      
+      It checks if the current host can ssh to the given switches without password.
     Arguments:
         noderange-- an array ref to switches.
         callback -- pointer for writes response back to the client.
@@ -545,7 +545,7 @@ sub getMatchingKeys {
 #--------------------------------------------------------------------------------
 
 =head3    setSSHcfg
-      It enables/diables the current host to ssh to the given switches without password.      
+      It enables/diables the current host to ssh to the given switches without password.
     Arguments:
         noderange-- an array ref to switches.
         callback -- pointer for writes response back to the client.
diff --git a/xCAT-server/lib/perl/xCAT/OPENBMC.pm b/xCAT-server/lib/perl/xCAT/OPENBMC.pm
index 83ceafed2..9a4ab02ec 100644
--- a/xCAT-server/lib/perl/xCAT/OPENBMC.pm
+++ b/xCAT-server/lib/perl/xCAT/OPENBMC.pm
@@ -52,7 +52,7 @@ sub send_request {
 
 #--------------------------------------------------------------------------------
 
-=head3 run_cmd_in_perl 
+=head3 run_cmd_in_perl
       Check if specified command should run in perl
       The policy is:
             Get value from `openbmcperl`, `XCAT_OPENBMC_DEVEL`, agent.py:
diff --git a/xCAT-server/lib/perl/xCAT/Postage.pm b/xCAT-server/lib/perl/xCAT/Postage.pm
index 553892415..81ce6c126 100644
--- a/xCAT-server/lib/perl/xCAT/Postage.pm
+++ b/xCAT-server/lib/perl/xCAT/Postage.pm
@@ -36,9 +36,9 @@ This program module file is a set of utilities to support xCAT post scripts.
 #----------------------------------------------------------------------------
 #----------------------------------------------------------------------------
 
-=head3  create_mypostscript_or_not 
+=head3  create_mypostscript_or_not
+
 
-        
      checks the site table precreatemypostscripts attribute.
      if 1, then
         creates all the /tftpboot/mypostscripts/mypostscript.<nodename> for
@@ -117,10 +117,10 @@ sub create_mypostscript_or_not {
 
 #-----------------------------------------------------------------------------
 
-=head3 makescript 
- 
-	create the  mypostscript file for each node in the noderange, according to 
-   the template file  mypostscript.tmpl. The template file is 
+=head3 makescript
+
+	create the  mypostscript file for each node in the noderange, according to
+   the template file  mypostscript.tmpl. The template file is
    /opt/xcat/share/xcat/templates/mypostscript/mypostscript.tmpl by default.
    user also can copy it to /install/postscripts/, and customize it there.
    The mypostscript.tmpl is for all the images.
@@ -138,20 +138,20 @@ sub create_mypostscript_or_not {
     Returns:
     Globals:
         %::GLOBAL_TAB_HASH: in subvars_for_mypostscript(),
-          it will read mypostscript.tmpl and 
+          it will read mypostscript.tmpl and
            see what db attrs will be needed.
            The  %::GLOBAL_TAB_HASH will store all
            the db attrs needed. And the format of value setting looks like:
            $::GLOBAL_TAB_HASH{$tabname}{$key}{$attrib} = $value;
-           %::GLOBAL_SN_HASH: getservicenode() will 
-           get all the nodes in the servicenode table. And the 
+           %::GLOBAL_SN_HASH: getservicenode() will
+           get all the nodes in the servicenode table. And the
            result will store in the %::GLOBAL_SN_HASH. The format:
            $::GLOBAL_SN_HASH{$servicenod1} = 1;
-                        
+
     Error:
         none
     Example:
-         
+
     Comments:
         none
 
@@ -320,7 +320,7 @@ sub makescript {
 
     #%image_hash is used to store the attributes in linuximage and nimimage tabs
     my %image_hash;
-    getImage(\%image_hash); 
+    getImage(\%image_hash);
 
     # get postscript and postscript from postscripts and osimage tabs
     my $script_hash = xCAT::Postage::getScripts($nodes, \%image_hash);
@@ -519,7 +519,7 @@ sub makescript {
             foreach my $myenv(split(',',$myenvstr)){
                 if($myenv =~ /\s*(\S+)\s*=\s*(\S+)\s*/) {
                     $ENV{$1}=$2;
-                } 
+                }
             }
         }
 
@@ -695,11 +695,11 @@ sub makescript {
 
 #----------------------------------------------------------------------------
 
-=head3  addexports 
+=head3  addexports
+
 
-        
    As we change the default mypostscript.tmpl, this routine will update
-   and existing customized template with the information 
+   and existing customized template with the information
      addexports($tmpl, $callback);
 
 
@@ -961,25 +961,25 @@ sub getsshbetweennodes
 
 #-------------------------------------------------------------------------------
 
-=head3  enableSSHbetweennodes 
+=head3  enableSSHbetweennodes
     Description:
-        The function is same as Template::enablesshbetweennodes() above. 
+        The function is same as Template::enablesshbetweennodes() above.
         The performance of template::enablesshbetweennodes() is bad is scaling environment.
-        We plan to use ""ENABLESSHBETWEENNODES=$""ENABLESSHBETWEENNODES" instead of  the 
+        We plan to use ""ENABLESSHBETWEENNODES=$""ENABLESSHBETWEENNODES" instead of  the
         syntax "ENABLESSHBETWEENNODES=#Subroutine:xCAT::Template::enablesshbetweennodes:$NODE# " in mypostscript.tmpl.
         To compatible to the old mypostscript.tmpl, so the  Template::enablesshbetweennodes() is left there.
     Arguments:
         $node  --  node name
-        $sn_hash -- if the node is one sn, key is the node name, and value is 1. 
+        $sn_hash -- if the node is one sn, key is the node name, and value is 1.
                     if the node is not a sn, the key isn't in this hash
         $groups_hash -- there are two keys:
                      1.  Each group in the value of site.sshbetweennodes could be the key
-                     2.  Each node in the groups from the value of site.sshbetweennodes , if the 
+                     2.  Each node in the groups from the value of site.sshbetweennodes , if the
                          value isn't ALLGROUPS or NOGROUPS.
-          
+
     Returns:
        1 = enable ssh
-       0 = do not enable ssh 
+       0 = do not enable ssh
     Globals:
         none
     Error:
@@ -1013,7 +1013,7 @@ sub enableSSHbetweennodes
 
 #-------------------------------------------------------------------------------
 
-=head3  enableSSHbetweennodeszones 
+=head3  enableSSHbetweennodeszones
     Description:  return how to fill in the ENABLESSHBETWEENNODES  export in the mypostscript file
                   based on the setting in the zone table sshbetweennodes attribute
     Arguments:
@@ -1021,7 +1021,7 @@ sub enableSSHbetweennodes
      $callback
     Returns:
        1 = enable ssh
-       0 = do not enable ssh 
+       0 = do not enable ssh
     Globals:
         none
     Error:
@@ -1483,7 +1483,7 @@ sub getDisklessNet()
 #---------------------------------------------------
 =head3 get_nics_nicips
 
-    Description: If nicips contain regular expression, 
+    Description: If nicips contain regular expression,
                  transform the regular expression attribute to the target ip,
                  then generate new nicips with target ip.
     Arguments:
@@ -1515,7 +1515,7 @@ sub get_nics_nicips
                 ($nicname, $nicip) = split('!', $_);
             } else {
                 ($nicname, $nicip) = split(':', $_);
-            }                                                                 
+            }
             if (!$nicip) {
                 next;
             }
@@ -1523,7 +1523,7 @@ sub get_nics_nicips
             #for example: eth0!|\D+(\d+)\D+|10.80.1.($1*2+103)|
             #Does not support: there is regular expression in multple nicips
             if ($nicip =~ /^\|\S*\|$/) {
-                #transform the regular expression attribute to the target ip 
+                #transform the regular expression attribute to the target ip
                 $nicip = xCAT::Table::transRegexAttrs($node, $nicip);
             }
             #generate new nicips
@@ -1533,7 +1533,7 @@ sub get_nics_nicips
                 $new_nicips=$nicname."!".$nicip;
             }
        }
-      
+
     }
     return $new_nicips;
 }
@@ -1703,7 +1703,7 @@ sub dump_all_attribs_in_tabs
                         # Updated on 2017-03-22 for issue 2634 Quotes in tables' comment field break mypostscript
                         # The original line is : $values .= "comments=$t";
                         # In order to fix issue 2634, change this line to : $values .= "comments=";
-                        # To keep the free-style of comments and avoid the issues caused by special characters in 
+                        # To keep the free-style of comments and avoid the issues caused by special characters in
                         # the comments, the value of comments will not be appending to network related environment
                         # variables in mypostscript
                         $values .= "comments=";
diff --git a/xCAT-server/lib/perl/xCAT/RShellAPI.pm b/xCAT-server/lib/perl/xCAT/RShellAPI.pm
index 3d9aae5ac..bcc6ebd32 100644
--- a/xCAT-server/lib/perl/xCAT/RShellAPI.pm
+++ b/xCAT-server/lib/perl/xCAT/RShellAPI.pm
@@ -69,7 +69,7 @@ sub remote_shell_command {
         run_remote_shell_api
 
         This routine tried ssh then telnet to logon to a node and
-        run a sequence of commands. 
+        run a sequence of commands.
         Arguments:
         	$node - node name
         	$user - user login name
diff --git a/xCAT-server/lib/perl/xCAT/SvrUtils.pm b/xCAT-server/lib/perl/xCAT/SvrUtils.pm
index a82c7d422..9cde6c855 100755
--- a/xCAT-server/lib/perl/xCAT/SvrUtils.pm
+++ b/xCAT-server/lib/perl/xCAT/SvrUtils.pm
@@ -23,12 +23,12 @@ our @EXPORT_OK = qw/sendmsg/;
 
 
 =head3   getNodesetStates
-       get current nodeset stat for the given nodes 
+       get current nodeset stat for the given nodes
     Arguments:
         nodes -- a pointer to an array of nodes
-        hashref -- A pointer to a hash that contains the nodeset status.  
+        hashref -- A pointer to a hash that contains the nodeset status.
     Returns:
-       (ret code, error message) 
+       (ret code, error message)
 
 =cut
 
@@ -174,7 +174,7 @@ sub getNodesetStates
     Arguments:
         nodes -- node name.
     Returns:
-       nodesetstate 
+       nodesetstate
 
 =cut
 
@@ -649,7 +649,7 @@ sub get_imgcapture_exlist_file_name {
 	ospkgdir
 	osdistroname
     Returns:
-        an array (retcode, errmsg). The first one is the return code. If 0, it means succesful. 
+        an array (retcode, errmsg). The first one is the return code. If 0, it means succesful.
 
 =cut
 
@@ -1079,7 +1079,7 @@ sub update_tables_with_mgt_image
         mode
         ospkgdir
     Returns:
-        an array (retcode, errmsg). The first one is the return code. If 0, it means succesful. 
+        an array (retcode, errmsg). The first one is the return code. If 0, it means succesful.
 
 =cut
 
@@ -1684,7 +1684,7 @@ sub sendmsg {
     Arguments:
         nodes: The nodes list in an array reference
     Returns:
-        depset: dependencies hash reference 
+        depset: dependencies hash reference
     Globals:
         none
     Error:
@@ -1908,7 +1908,7 @@ sub handle_deps()
 
 #-------------------------------------------------------------------------------
 
-=head3   parseosver 
+=head3   parseosver
     parse osver to osdistribution base name,majorversion,minorversion
     Returns:
        list (osdistribution base name, majorversion,minorversion)
@@ -1940,13 +1940,13 @@ sub parseosver
 
 =head3 update_osdistro_table
        This function is called after copycds. It will update the osdistro table with
-       given osver and arch 
+       given osver and arch
     Arguments:
         osver
         arch
         ospkgdir
     Returns:
-        an array (retcode, errmsg). The first one is the return code. If 0, it means succesful. 
+        an array (retcode, errmsg). The first one is the return code. If 0, it means succesful.
 
 =cut
 
@@ -2042,7 +2042,7 @@ sub update_osdistro_table
 
 =head3 getpostbootscripts
     Get the  the postbootscript list for the Linux nodes as defined in
-    the osimage table postbootscripts attribute 
+    the osimage table postbootscripts attribute
 
     Arguments:
       $nodes - array of nodes
@@ -2187,7 +2187,7 @@ sub getplatform {
 #        on fail:    undef
 #--------------------------------------------------------------------------------------------------------
 sub searchcompressedrootimg{
-    my $rootimgdir = shift;   
+    my $rootimgdir = shift;
     if (($rootimgdir) && ($rootimgdir =~ /xCAT::SvrUtils/)) {
         $rootimgdir = shift;
     }
diff --git a/xCAT-server/lib/perl/xCAT/Template.pm b/xCAT-server/lib/perl/xCAT/Template.pm
index 3b416cd28..eaa2f84d8 100644
--- a/xCAT-server/lib/perl/xCAT/Template.pm
+++ b/xCAT-server/lib/perl/xCAT/Template.pm
@@ -1118,7 +1118,7 @@ d-i mirror/http/proxy string\n";
     if (scalar @mirrors) {
         my $index = 0;
         foreach (@mirrors) {
-            $line .= " 
+            $line .= "
 d-i apt-setup/local$index/repository string deb $_\n
 d-i apt-setup/local$index/comment string online mirror $index\n";
             $index = $index + 1;
diff --git a/xCAT-server/lib/perl/xCAT/xcatd.pm b/xCAT-server/lib/perl/xCAT/xcatd.pm
index a9885f3cc..bb863e5de 100644
--- a/xCAT-server/lib/perl/xCAT/xcatd.pm
+++ b/xCAT-server/lib/perl/xCAT/xcatd.pm
@@ -22,22 +22,22 @@ use Scalar::Util qw/looks_like_number/;
 
 =head2    Package Description
 
-This program module file, is a set of utilities used by xCAT daemon. 
+This program module file, is a set of utilities used by xCAT daemon.
 
 =cut
 
 
 #------------------------------------------------------------------------------
 
-=head3   validate 
+=head3   validate
 
   Here is where we check if  $peername is allowed to do $request in policy tbl.
    $peername, if set signifies client has a cert that the xCAT CA accepted.
    Logs to syslog and auditlog table all user commands, see site.auditskipcmds
    attribute and auditnosyslog attribute.
-    
+
     Arguments:
-        
+
     Returns:
         returns 1 if policy engine allows the action, 0 if denied.
     Globals:
@@ -144,9 +144,9 @@ sub validate {
                 }
             }
             if ($found == 0) {    # no command match
-                next; 
+                next;
             }
-         } 
+         }
 
          if ($rule->{parameters} and $rule->{parameters} ne '*') {
             my $parms;
@@ -373,7 +373,7 @@ sub validate {
 }
 
 my $one_day = 86400;      # one day in seconds
-my $days = 1;             # default days for token expiration 
+my $days = 1;             # default days for token expiration
 my $never_label = "never";
 
 # this subroutine creates a new token in token table
@@ -407,7 +407,7 @@ sub gettoken {
             } else {
                 # Change non-expired old style token to new human readable format
                 $tokentb->setAttribs({ tokenid => $token->{tokenid}, username => $token->{'username'} }, {expire => xCAT::Utils->time2string($token->{'expire'}, "-")});
-            } 
+            }
         }
     }
 
@@ -430,7 +430,7 @@ sub gettoken {
     }
     my $access_time_string = xCAT::Utils->time2string($current_time, "-");
     # create a new token and set its expiration and creation time
-    $tokentb->setAttribs({ tokenid => $uuid, username => $user }, 
+    $tokentb->setAttribs({ tokenid => $uuid, username => $user },
         { expire => $expire_time_string, created => $access_time_string });
     $tokentb->close();
 
@@ -459,7 +459,7 @@ sub verifytoken {
                 return undef;
             } else {
                 # Change non-expired old style token to new human readable format
-                $tokentb->setAttribs({ tokenid => $tokenid, username => $token->{'username'} }, 
+                $tokentb->setAttribs({ tokenid => $tokenid, username => $token->{'username'} },
                                      {access => xCAT::Utils->time2string($current_time, "-"),
                                       expire => xCAT::Utils->time2string($token->{'expire'}, "-")});
                 return $token->{'username'};
diff --git a/xCAT-server/lib/xcat/dsh/Context/DSH.pm b/xCAT-server/lib/xcat/dsh/Context/DSH.pm
index 2d30f630d..1bd4ce43d 100644
--- a/xCAT-server/lib/xcat/dsh/Context/DSH.pm
+++ b/xCAT-server/lib/xcat/dsh/Context/DSH.pm
@@ -24,13 +24,13 @@ our $nodegroup_path = $ENV{'DSH_NODEGROUP_PATH'};
         Returns:
         	A reference to a hash table with the configured
         	default properties for the DSH context
-                
+
         Globals:
         	None
-    
+
         Error:
         	None
-    
+
         Example:
         	$default_properties = DSH->config_defaults;
 
@@ -84,13 +84,13 @@ sub context_defaults {
         Returns:
         	A reference to a hash table of user-configured properties for
         	the DSH context.
-                
+
         Globals:
         	None
-    
+
         Error:
         	None
-    
+
         Example:
         	$properties = DSH->config_properties
 
@@ -152,13 +152,13 @@ sub context_properties {
 
         Returns:
         	An array of node group names
-                
+
         Globals:
         	$nodegroup_path
-    
+
         Error:
         	None
-    
+
         Example:
         	@nodegroups = DSH->all_nodegroups;
 
@@ -193,13 +193,13 @@ sub all_nodegroups {
 
         Returns:
         	An array of node group members
-                
+
         Globals:
         	$nodegroup_path
-    
+
         Error:
         	None
-    
+
         Example:
         	$members = DSH->nodegroup_members('MyGroup1');
 
@@ -247,13 +247,13 @@ sub nodegroup_members {
 
         Returns:
         	An array of node names
-                
+
         Globals:
         	$nodegroup_path
-    
+
         Error:
         	None
-    
+
         Example:
         	@nodes = DSH->all_nodes;
 
@@ -339,13 +339,13 @@ sub all_nodes {
 
         Returns:
         	A reference to an array of target names
-                
+
         Globals:
         	None
-    
+
         Error:
         	None
-    
+
         Example:
         	DSH->read_target_file('/tmp/target_file');
 
@@ -394,13 +394,13 @@ sub read_target_file {
 
         Returns:
         	None
-                
+
         Globals:
         	None
-    
+
         Error:
         	None
-    
+
         Example:
         	DSH->read_target_file('/tmp/target_file');
 
diff --git a/xCAT-server/lib/xcat/dsh/Context/XCAT.pm b/xCAT-server/lib/xcat/dsh/Context/XCAT.pm
index b86f9c48c..9c04f998b 100644
--- a/xCAT-server/lib/xcat/dsh/Context/XCAT.pm
+++ b/xCAT-server/lib/xcat/dsh/Context/XCAT.pm
@@ -40,13 +40,13 @@ our %xcat_nodegroup_table = ();
         Returns:
         	A reference to a hash table with the configured
         	default properties for the xCAT context
-                
+
         Globals:
         	$XCAT_RSH_CMD
-    
+
         Error:
         	None
-    
+
         Example:
         	$default_properties = XCAT->config_defaults;
 
@@ -82,13 +82,13 @@ sub context_defaults
         Returns:
         	A reference to a hash table of user-configured properties for
         	the xCAT context.
-                
+
         Globals:
         	None
-    
+
         Error:
         	None
-    
+
         Example:
         	$properties = XCAT->config_properties
 
@@ -111,7 +111,7 @@ sub context_properties
 
 =head3
         all_devices
-            
+
         Comments: devices are nodes in the XCAT context.  Use node flags
         and not device flags.
 
@@ -142,13 +142,13 @@ sub all_devices
 
         Returns:
         	An array of node/device names
-                
+
         Globals:
         	@xcat_node_list
-    
+
         Error:
         	None
-    
+
         Example:
         	@nodes = XCAT->get_xcat_node_list;
 
@@ -176,13 +176,13 @@ sub all_nodes
 
         Returns:
         	An array of node/device group names
-                
+
         Globals:
         	%xcat_nodegroup_table
-    
+
         Error:
         	None
-    
+
         Example:
         	@nodegroups = XCAT->all_nodegroups;
 
@@ -210,13 +210,13 @@ sub all_nodegroups
 
         Returns:
         	An array of node group members
-                
+
         Globals:
         	$nodegroup_path
-    
+
         Error:
         	None
-    
+
         Example:
         	$members = XCAT->nodegroup_members('MyGroup1');
 
@@ -250,7 +250,7 @@ sub nodegroup_members
         resolve_node
 
         Within the xCAT context, resolve the name of a given node and
-        augment the supplied property hash table with xCAT node information.        
+        augment the supplied property hash table with xCAT node information.
 
         Arguments:
         	$target_properties - basic properties hash table reference for a node
@@ -258,14 +258,14 @@ sub nodegroup_members
         Returns:
         	1 if resolution was successful
         	undef otherwise
-                
+
         Globals:
         	$XCAT_RSH_CMD
         	$XCAT_RCP_CMD
-    
+
         Error:
         	None
-    
+
         Example:
         	XCAT->resolve_node($target_properties);
 
@@ -289,8 +289,8 @@ sub resolve_node
 =head3
         get_xcat_remote_cmds
 
-        Using xCAT native commands,check the useSSHonAIX attribute for AIX 
-          on Linux use ssh    
+        Using xCAT native commands,check the useSSHonAIX attribute for AIX
+          on Linux use ssh
           on AIX, check for useSSHonAIX,  if says use ssh and
            it is installed and configured, use it
           , otherwise use rsh
@@ -302,14 +302,14 @@ sub resolve_node
 
         Returns:
         	None
-        	                
+        	
         Globals:
         	$XCAT_RSH_CMD
         	$XCAT_RCP_CMD
-    
+
         Error:
         	None
-    
+
         Example:
         	XCAT->get_xcat_remote_cmds
 
@@ -361,13 +361,13 @@ sub get_xcat_remote_cmds
 
         Returns:
         	None
-                
+
         Globals:
         	%xcat_node_list
-    
+
         Error:
         	None
-    
+
         Example:
         	XCAT->get_xcat_node_list
 
@@ -396,13 +396,13 @@ sub get_xcat_node_list
 
         Returns:
         	None
-                
+
         Globals:
         	%xcat_nodegroup_table
-    
+
         Error:
         	None
-    
+
         Example:
            XCAT->get_xcat_nodegroup_table
 
diff --git a/xCAT-server/lib/xcat/monitoring/bootttmon.pm b/xCAT-server/lib/xcat/monitoring/bootttmon.pm
index c333064a3..c7a641afb 100644
--- a/xCAT-server/lib/xcat/monitoring/bootttmon.pm
+++ b/xCAT-server/lib/xcat/monitoring/bootttmon.pm
@@ -21,7 +21,7 @@ package xCAT_monitoring::bootttmon;
     Returns:
       0
     Comment:
-       To use, 
+       To use,
         1. run regnotif bootttmon.pm boottarget,nodetype -o u
         2. Then change the boottarget or nodetype tables (add node, remove node, or change status column).
         3. Watch /var/log/bootttmon for output and updates to pxelinux.cfg files.
diff --git a/xCAT-server/lib/xcat/monitoring/gangliamon.pm b/xCAT-server/lib/xcat/monitoring/gangliamon.pm
index 5756d79e1..fef33ff13 100755
--- a/xCAT-server/lib/xcat/monitoring/gangliamon.pm
+++ b/xCAT-server/lib/xcat/monitoring/gangliamon.pm
@@ -20,7 +20,7 @@ use warnings;
 
 #-------------------------------------------------------------------------------
 
-=head1  xCAT_monitoring:gangliamon  
+=head1  xCAT_monitoring:gangliamon
 =head2  Package Description
   xCAT monitoring plugin to handle Ganglia monitoring.
 =cut
@@ -30,16 +30,16 @@ use warnings;
 #--------------------------------------------------------------------------------
 
 =head3    start
-    This function gets called by the monitorctrl module when xcatd starts and 
-    when monstart command is issued by the user. It starts the daemons and 
-    does necessary startup process for the Ganglia monitoring. 
+    This function gets called by the monitorctrl module when xcatd starts and
+    when monstart command is issued by the user. It starts the daemons and
+    does necessary startup process for the Ganglia monitoring.
 
     p_nodes     -- A pointer to an arrays of nodes to be monitored. null means all.
     scope       -- The action scope, it indicates the node type the action will take place.
                     0 means localhost only.
                     2 means all nodes (except localhost),
     callback    -- The callback pointer for error and status displaying. It can be null.
-    
+
     Returns:
         (return code, message)
         If the callback is set, use callback to display the status and error.
@@ -194,21 +194,21 @@ sub start {
 #--------------------------------------------------------------
 
 =head3    config
-    This function configures the cluster for the given nodes. This function is called 
-    when moncfg command is issued or when xcatd starts on the service node. It will 
-    configure the cluster to include the given nodes within the monitoring domain. This 
+    This function configures the cluster for the given nodes. This function is called
+    when moncfg command is issued or when xcatd starts on the service node. It will
+    configure the cluster to include the given nodes within the monitoring domain. This
     calls two other functions called as confGmond and confGmetad which are used for configuring
     the Gmond and Gmetad configuration files respectively.
-    
+
     Arguments:
         p_nodes     -- A pointer to an arrays of nodes to be added for monitoring. none means all.
         scope       -- The action scope, it indicates the node type the action will take place.
-                        0 means localhost only. 
-                        2 means localhost and nodes, 
+                        0 means localhost only.
+                        2 means localhost and nodes,
         callback    -- The callback pointer for error and status displaying. It can be null.
     Returns:
         (error code, error message)
-=cut 
+=cut
 
 #--------------------------------------------------------------
 sub config {
@@ -228,14 +228,14 @@ sub config {
 #--------------------------------------------------------------
 
 =head3    confGmond
-    This function is called by the config() function. It configures the Gmond 
+    This function is called by the config() function. It configures the Gmond
     configuration files for the given nodes
-    
+
     Arguments:
         p_nodes      -- A pointer to an arrays of nodes to be added for monitoring. none means all.
         scope        -- The action scope, it indicates the node type the action will take place.
-                        0 means localhost only. 
-                        2 means localhost and nodes, 
+                        0 means localhost only.
+                        2 means localhost and nodes,
         callback     -- The callback pointer for error and status displaying. It can be null.
     Returns: none
 =cut
@@ -415,12 +415,12 @@ sub confGmond {
 =head3    confGmetad
     This function is called by the config() function. It configures the Gmetad
     configuration files for the given nodes
-    
+
     Arguments:
         p_nodes     -- A pointer to an arrays of nodes to be added for monitoring. none means all.
         scope       -- The action scope, it indicates the node type the action will take place.
-                        0 means localhost only. 
-                        2 means localhost and nodes, 
+                        0 means localhost only.
+                        2 means localhost and nodes,
         callback    -- The callback pointer for error and status displaying. It can be null.
     Returns : none
 =cut
@@ -535,19 +535,19 @@ sub confGmetad {
 #--------------------------------------------------------------
 
 =head3    deconfig
-    This function de-configures the cluster for the given nodes. This function is called 
+    This function de-configures the cluster for the given nodes. This function is called
     when mondecfg command is issued by the user. This function restores the original Gmond
-    and Gmetad configuration files by calling the deconfGmond and deconfGmetad functions 
+    and Gmetad configuration files by calling the deconfGmond and deconfGmetad functions
     respectively.
-      
+
     Arguments:
         p_nodes     -- A pointer to an arrays of nodes to be removed for monitoring. none means all.
         scope       -- The action scope, it indicates the node type the action will take place.
-                        0 means local host only. 
-                        2 means both local host and nodes, 
+                        0 means local host only.
+                        2 means both local host and nodes,
         callback    -- The callback pointer for error and status displaying. It can be null.
     Returns: none
-=cut 
+=cut
 
 #--------------------------------------------------------------
 sub deconfig {
@@ -569,12 +569,12 @@ sub deconfig {
 =head3    deconfGmond
     This function is called by the deconfig() function. It deconfigures the Gmetad
     configuration files for the given nodes
-    
+
     Arguments:
         p_nodes     -- A pointer to an arrays of nodes to be added for monitoring. none means all.
         scope       -- The action scope, it indicates the node type the action will take place.
-                        0 means localhost only. 
-                        2 means localhost and nodes, 
+                        0 means localhost only.
+                        2 means localhost and nodes,
         callback    -- The callback pointer for error and status displaying. It can be null.
     Returns:none
 =cut
@@ -696,12 +696,12 @@ sub deconfGmond {
 =head3    deconfGmetad
     This function is called by the deconfig() function. It deconfigures the Gmetad
     configuration files for the given nodes
-    
+
     Arguments:
         p_nodes     -- A pointer to an arrays of nodes to be added for monitoring. none means all.
         scope       -- The action scope, it indicates the node type the action will take place.
-                        0 means localhost only. 
-                        2 means localhost and nodes, 
+                        0 means localhost only.
+                        2 means localhost and nodes,
         callback    -- The callback pointer for error and status displaying. It can be null.
     Returns:none
 =cut
@@ -896,9 +896,9 @@ sub stop {
 =head3    supportNodeStatusMon
     This function is called by the monitorctrl module to check
     if Ganglia can help monitoring and returning the node status.
-    
+
     Arguments: None
-    Returns: 1  
+    Returns: 1
 =cut
 
 #--------------------------------------------------------------------------------
@@ -911,8 +911,8 @@ sub supportNodeStatusMon {
 =head3   startNodeStatusMon
     This function is called by the monitorctrl module to tell
     Ganglia to start monitoring the node status and feed them back
-    to xCAT. Ganglia will start setting up the condition/response 
-    to monitor the node status changes.  
+    to xCAT. Ganglia will start setting up the condition/response
+    to monitor the node status changes.
 
     Arguments: None
     Returns:
@@ -946,8 +946,8 @@ sub stopNodeStatusMon {
 
 =head3    getDiscription
     This function returns the detailed description of the plugin inluding the
-    valid values for its settings in the monsetting tabel. 
-    
+    valid values for its settings in the monsetting tabel.
+
     Arguments: None
     Returns: The description
 =cut
diff --git a/xCAT-server/lib/xcat/monitoring/monitorctrl.pm b/xCAT-server/lib/xcat/monitoring/monitorctrl.pm
index 12adfc9e7..afd38801a 100644
--- a/xCAT-server/lib/xcat/monitoring/monitorctrl.pm
+++ b/xCAT-server/lib/xcat/monitoring/monitorctrl.pm
@@ -39,7 +39,7 @@ my $masterpid;
 =head2    Package Description
   xCAT monitoring control  module. This module is the center for the xCAT
   monitoring support. It interacts with xctad and the monitoring plug-in modules
-  for the 3rd party monitoring products. 
+  for the 3rd party monitoring products.
 =cut
 
 #-------------------------------------------------------------------------------
@@ -51,7 +51,7 @@ my $masterpid;
 
 =head3    start
       It is called by the xcatd when xcatd gets started.
-      It gets a list of monitoring plugin module names from the "monitoring" 
+      It gets a list of monitoring plugin module names from the "monitoring"
       table. It gets a list of nodes in the xcat cluster and,
       in tern, calls the start() function of all the monitoring
       plug-in modules. It registers for nodelist
@@ -146,13 +146,13 @@ sub start {
 #--------------------------------------------------------------------------------
 
 =head3    stop
-      It is called by the xcatd when xcatd stops. It 
+      It is called by the xcatd when xcatd stops. It
       in tern calls the stop() function of each monitoring
       plug-in modules, stops all the timers for pulling the
-      node status and unregisters for the nodelist  
-      tables changes. 
+      node status and unregisters for the nodelist
+      tables changes.
     Arguments:
-       configLocal -- 1 means that only the local node get configured. 
+       configLocal -- 1 means that only the local node get configured.
     Returns:
         0 for successful.
         non-0 for not successful.
@@ -214,17 +214,17 @@ sub sendMonSignal {
       It takes a list of monitoring plug-in names as an input and start
       the monitoring process for them.
     Arguments:
-       names -- a pointer to an array of monitoring plug-in module names to be started. 
-                If non is specified, all the plug-in modules registered in the monitoring 
-                table will be used.  
+       names -- a pointer to an array of monitoring plug-in module names to be started.
+                If non is specified, all the plug-in modules registered in the monitoring
+                table will be used.
        p_nodes -- a pointer to an arrays of nodes to be monitored. null means all.
        scope -- the action scope, it indicates the node type the action will take place.
-                0 means local host only. 
-                2 means both local host and nodes, 
+                0 means local host only.
+                2 means both local host and nodes,
        callback -- the callback pointer for error and status displaying. It can be null.
        grands  -- a hash pointer. key: "servicenode,xcatmaset", value: a array pointer of grand children nodes. This one is only set when the current node is mn and handleGrandChildren returns 1 by the monitoring plugin.
     Returns:
-        A hash table keyed by the plug-in names. The value is an array pointer 
+        A hash table keyed by the plug-in names. The value is an array pointer
         pointer to a return code and  message pair. For example:
         {rmcmon=>[0, ""], gangliamin=>[1, "something is wrong"]}
 
@@ -280,7 +280,7 @@ sub startMonitoring {
 #--------------------------------------------------------------------------------
 
 =head3    startNodeStatusMonitoring
-      It starts the given plug-in for node status monitoring. 
+      It starts the given plug-in for node status monitoring.
       If no product is specified, use the one in the monitoring table.
     Arguments:
        name -- name of the mornitoring plug-in module to be started for node status monitoring.
@@ -288,8 +288,8 @@ sub startMonitoring {
         "nodestatmon" column set to be "1", or "Yes".
        p_nodes -- a pointer to an arrays of nodes to be monitored. null means all.
        scope -- the action scope, it indicates the node type the action will take place.
-                0 means local host only. 
-                2 means both local host and nodes, 
+                0 means local host only.
+                2 means both local host and nodes,
        callback -- the callback pointer for error and status displaying. It can be null.
        grands  -- a hash pointer. key: "servicenode,xcatmaset", value: a array pointer of grand children nodes. This one is only set when the current node is mn and handleGrandChildren returns 1 by the monitoring plugin.
     Returns:
@@ -356,8 +356,8 @@ sub startNodeStatusMonitoring {
          all the plug-ins registered in the monitoring table will be stopped.
        p_nodes -- a pointer to an arrays of nodes to be stopped for monitoring. none means all.
        scope -- the action scope, it indicates the node type the action will take place.
-                0 means local host only. 
-                2 means both local host and nodes, 
+                0 means local host only.
+                2 means both local host and nodes,
        callback -- the callback pointer for error and status displaying. It can be null.
        grands  -- a hash pointer. key: "servicenode,xcatmaset", value: a array pointer of grand children nodes. This one is only set when the current node is mn and handleGrandChildren returns 1 by the monitoring plugin.
     Returns:
@@ -434,7 +434,7 @@ sub stopMonitoring {
 #--------------------------------------------------------------------------------
 
 =head3    stopNodeStatusMonitoring
-      It stops the given plug-in for node status monitoring. 
+      It stops the given plug-in for node status monitoring.
       If no plug-in is specified, use the one in the monitoring table.
     Arguments:
        name -- name of the monitoring plu-in module to be stopped for node status monitoring.
@@ -442,8 +442,8 @@ sub stopMonitoring {
         "nodestatmon" column set to be "1", or "Yes".
        p_nodes -- a pointer to an arrays of nodes to be stopped for monitoring. null means all.
        scope -- the action scope, it indicates the node type the action will take place.
-                0 means local host only. 
-                2 means both local host and nodes, 
+                0 means local host only.
+                2 means both local host and nodes,
        callback -- the callback pointer for error and status displaying. It can be null.
        grands  -- a hash pointer. key: "servicenode,xcatmaset", value: a array pointer of grand children nodes. This one is only set when the current node is mn and handleGrandChildren returns 1 by the monitoring plugin.
     Returns:
@@ -500,7 +500,7 @@ sub stopNodeStatusMonitoring {
       It is called when the monitoring table gets changed.
       When a plug-in is added to or removed from the monitoring table, this
       function will start the plug-in to monitor the xCAT cluster or stop the plug-in
-      from monitoring the xCAT cluster accordingly. 
+      from monitoring the xCAT cluster accordingly.
     Arguments:
       See processTableChanges.
     Returns:
@@ -620,12 +620,12 @@ sub getNodeStatusFromNodesetState {
 #--------------------------------------------------------------------------------
 
 =head3    setNodeStatusAttributes
-      This routine will be called by 
+      This routine will be called by
       monitoring plug-in modules to feed the node status back to xcat.
       (callback mode). This function will update the status column of the
       nodelist table with the new node status.
     Arguments:
-       status -- a hash pointer of the node status. A key is a status string. The value is 
+       status -- a hash pointer of the node status. A key is a status string. The value is
                 an array pointer of nodes that have the same status.
                 for example: {alive=>["node1", "node1"], unreachable=>["node5","node100"]}
        force -- 1 force the input values to be set.
@@ -738,7 +738,7 @@ sub setNodeStatusAttributes {
     Arguments:
        none.
     Returns:
-       a hash that has the node status. The format is: 
+       a hash that has the node status. The format is:
           {alive=>[node1, node3,...], unreachable=>[node4, node2...], unknown=>[node8, node101...]}
 =cut
 
@@ -773,11 +773,11 @@ sub getNodeStatus {
 #--------------------------------------------------------------------------------
 
 =head3    refreshProductList
-      This function goes to the monitoring table to get the plug-in names 
+      This function goes to the monitoring table to get the plug-in names
       and stores the value into the PRODUCT_LIST cache. The cache also stores
       the monitoring plugin module name and file name for each plug-in. This function
-      also load the modules in. 
- 
+      also load the modules in.
+
     Arguments:
         none
     Returns:
@@ -841,10 +841,10 @@ sub refreshProductList {
 
 =head3    getPluginSettings
       This function goes to the monsetting table to get the settings for a given
-      monitoring plug-in. 
- 
+      monitoring plug-in.
+
     Arguments:
-        name the name of the monitoring plug-in module. such as snmpmon, rmcmon etc. 
+        name the name of the monitoring plug-in module. such as snmpmon, rmcmon etc.
     Returns:
         A hash table containing the key and values of the settings.
 =cut
@@ -887,8 +887,8 @@ sub getPluginSettings {
 =head3 isMonServer
       Determines if the local host is a monitoring server.
     Arguments:
-      none. 
-   Returns: 
+      none.
+   Returns:
       1 if the local host is a moniterring server.
       0 if the local host is not a monitotering server.
 =cut
@@ -918,21 +918,21 @@ sub isMonServer {
 =head3    getNodeMonServerPair
       It gets the monserver and monmaster for the given nodes.
     Arguments:
-      $nodes a pointer to an array of nodes. If the array is empty, all nodes in the 
+      $nodes a pointer to an array of nodes. If the array is empty, all nodes in the
             nodelist table will be used.
        retfromat 0-- A pointer to a hash table with node as the key and a the monserver pairs
-                     string as the value.  
+                     string as the value.
                      For example: { node1=>"sv1:ma1", node2=>"sv2:ma2", node3=>"sv2:ma2"...}
                  1-- A pointer to a hash table with monserver pairs as the key and an array
-                     pointer of nodes as the value. 
+                     pointer of nodes as the value.
                      For example: { "sv1:ma1"=>[node1,node2], "sv2:ma2"=>node3...}
-                   
-         The pair is in the format of "monserver,monmaser". First one is the monitoring service 
-      node ip/hostname that faces the mn and the second one is the monitoring service 
-      node ip/hostname that faces the cn. 
-      The value of the first one can be "noservicenode" meaning that there is no service node 
-      for that node. In this case the second one is the site master. 
-   Returns: 
+
+         The pair is in the format of "monserver,monmaser". First one is the monitoring service
+      node ip/hostname that faces the mn and the second one is the monitoring service
+      node ip/hostname that faces the cn.
+      The value of the first one can be "noservicenode" meaning that there is no service node
+      for that node. In this case the second one is the site master.
+   Returns:
       An pointer to a hash.
       It retuens a pointer to an array if there is an error. Format is [code, message].
 =cut
@@ -1019,11 +1019,11 @@ sub getNodeMonServerPair {
     Returns:
       A hash reference keyed by the monitoring server nodes and each value is a ref to
       an array of [nodes, nodetype, status] arrays  monitored by the server. So the format is:
-      {monserver1=>[['node1', 'osi', 'alive'], ['node2', 'switch', 'booting']...], ...} 
-      A key is a pair of hostnames with the first one being the service node ip/hostname 
-      that faces the mn and the second one being the service node ip/hostname that faces the cn. 
-      The value of the first one can be "noservicenode" meaning that there is no service node 
-      for that node. In this case the second one is the site master.  
+      {monserver1=>[['node1', 'osi', 'alive'], ['node2', 'switch', 'booting']...], ...}
+      A key is a pair of hostnames with the first one being the service node ip/hostname
+      that faces the mn and the second one being the service node ip/hostname that faces the cn.
+      The value of the first one can be "noservicenode" meaning that there is no service node
+      for that node. In this case the second one is the site master.
       It returns a pointer to an array if there is an error. Format is [code, message].
 =cut
 
@@ -1113,23 +1113,23 @@ sub getMonHierarchy {
 #--------------------------------------------------------------------------------
 
 =head3    getMonServerWithInfo
-      It gets the monnitoring server node for each of the nodes from the input. 
+      It gets the monnitoring server node for each of the nodes from the input.
       The "monserver" attribute is used from the noderes table. If "monserver" is not defined
       for a node, "servicenode" is used. If none is defined, use the local host as the
       the monitoring server. The difference of this function from the getMonServer function
-      is that the input of the nodes have 'node' and 'status' info. 
+      is that the input of the nodes have 'node' and 'status' info.
       The other one just has  'node'. The
-      names. 
+      names.
     Arguments:
       nodes: An array ref. Each element is of the format: [node, status]
     Returns:
       A hash reference keyed by the monitoring server nodes and each value is a ref to
       an array of [nodes, nodetype, status] arrays  monitored by the server. So the format is:
-      {monserver1=>[['node1', 'osi', 'alive'], ['node2', 'switch', 'booting']...], ...} 
-      A key is pair of hostnames with the first one being the service node ip/hostname 
-      that faces the mn and the second one being the service node ip/hostname that faces the cn. 
-      The value of the first one can be "noservicenode" meaning that there is no service node 
-      for that node. In this case the second one is the site master.  
+      {monserver1=>[['node1', 'osi', 'alive'], ['node2', 'switch', 'booting']...], ...}
+      A key is pair of hostnames with the first one being the service node ip/hostname
+      that faces the mn and the second one being the service node ip/hostname that faces the cn.
+      The value of the first one can be "noservicenode" meaning that there is no service node
+      for that node. In this case the second one is the site master.
       It retuens a pointer to an array if there is an error. Format is [code, message].
 
 =cut
@@ -1196,11 +1196,11 @@ sub getMonServerWithInfo {
     Returns:
       A hash reference keyed by the monitoring server nodes and each value is a ref to
       an array of [nodes, nodetype, status] arrays  monitored by the server. So the format is:
-      {monserver1=>[['node1', 'osi', 'alive'], ['node2', 'switch', 'booting']...], ...} 
-      A key is a pair of hostnames with the first one being the service node ip/hostname 
-      that faces the mn and the second one being the service node ip/hostname that faces the cn. 
-      The value of the first one can be "noservicenode" meaning that there is no service node 
-      for that node. In this case the second one is the site master.  
+      {monserver1=>[['node1', 'osi', 'alive'], ['node2', 'switch', 'booting']...], ...}
+      A key is a pair of hostnames with the first one being the service node ip/hostname
+      that faces the mn and the second one being the service node ip/hostname that faces the cn.
+      The value of the first one can be "noservicenode" meaning that there is no service node
+      for that node. In this case the second one is the site master.
       It retuens a pointer to an array if there is an error. Format is [code, message].
 =cut
 
@@ -1267,7 +1267,7 @@ sub getMonServer {
 
 =head3    nodeStatMonName
       This function returns the current monitoring plug-in name that is assigned for monitroing
-      the node status for xCAT cluster.  
+      the node status for xCAT cluster.
      Arguments:
         none
     Returns:
@@ -1283,7 +1283,7 @@ sub nodeStatMonName {
 #--------------------------------------------------------------------------------
 
 =head3    getAllRegs
-      This function gets all the registered monitoring plug-ins.   
+      This function gets all the registered monitoring plug-ins.
      Arguments:
         none
     Returns:
@@ -1325,18 +1325,18 @@ sub getAllRegs
 #--------------------------------------------------------------------------------
 
 =head3    config
-      This function configures the cluster for the given nodes.  
+      This function configures the cluster for the given nodes.
     Arguments:
        names -- a pointer to an  array of monitoring plug-in names. If non is specified,
          all the plug-ins registered in the monitoring table will be notified.
        p_nodes -- a pointer to an arrays of nodes to be added for monitoring. none means all.
        scope -- the action scope, it indicates the node type the action will take place.
-                0 means local host only. 
-                2 means both local host and nodes, 
+                0 means local host only.
+                2 means both local host and nodes,
        callback -- the callback pointer for error and status displaying. It can be null.
        grands  -- a hash pointer. key: "servicenode,xcatmaset", value: a array pointer of grand children nodes. This one is only set when the current node is mn and handleGrandChildren returns 1 by the monitoring plugin.
     Returns:
-        ret a hash with plug-in name as the keys and the an arry of 
+        ret a hash with plug-in name as the keys and the an arry of
         [return code, error message] as the values.
 =cut
 
@@ -1391,20 +1391,20 @@ sub config {
 #--------------------------------------------------------------------------------
 
 =head3    deconfig
-      This function de-configures the cluster for the given nodes.  
-      It function informs all the local active monitoring plug-ins to 
-      remove the given nodes to their monitoring domain.  
+      This function de-configures the cluster for the given nodes.
+      It function informs all the local active monitoring plug-ins to
+      remove the given nodes to their monitoring domain.
     Arguments:
        names -- a pointer to an  array of monitoring plug-in names. If non is specified,
          all the plug-ins registered in the monitoring table will be notified.
        p_nodes -- a pointer to an arrays of nodes to be removed for monitoring. none means all.
        scope -- the action scope, it indicates the node type the action will take place.
-                0 means local host only. 
-                2 means both loca lhost and nodes, 
+                0 means local host only.
+                2 means both loca lhost and nodes,
        callback -- the callback pointer for error and status displaying. It can be null.
        grands  -- a hash pointer. key: "servicenode,xcatmaset", value: a array pointer of grand children nodes. This one is only set when the current node is mn and handleGrandChildren returns 1 by the monitoring plugin.
     Returns:
-        ret a hash with plug-in name as the keys and the an arry of 
+        ret a hash with plug-in name as the keys and the an arry of
         [return code, error message] as the values.
 =cut
 
@@ -1462,11 +1462,11 @@ sub deconfig {
 
 =head3    getNodeConfData
       This function goes to every monitoring plug-in module and returns a list of
-    configuration data that is needed by setting up node monitoring.  
-    These data-value pairs will be used as environmental variables 
+    configuration data that is needed by setting up node monitoring.
+    These data-value pairs will be used as environmental variables
     on the given node.
     Arguments:
-        noderef -- a pointer to an array of nodes. 
+        noderef -- a pointer to an array of nodes.
     Returns:
         ret: pointer to a 2-level hash like this:
         {
@@ -1475,9 +1475,9 @@ sub deconfig {
            'node2'=>{'env1'=>'value3',
                      'env2'=>'value4'}
         }
-     
+
         or a pointer to array if there is an error. [error code, error message]
-        
+
 =cut
 
 #--------------------------------------------------------------------------------
@@ -1556,12 +1556,12 @@ sub getNodeConfData {
 #--------------------------------------------------------------------------------
 
 =head3    show
-      This function show performance for the given nodes.  
+      This function show performance for the given nodes.
     Arguments:
        names -- a pointer to an  array of monitoring plug-in names. If non is specified,
          all the plug-ins registered in the monitoring table will be notified.
        p_nodes -- a pointer to an arrays of nodes to be added for monitoring. none means all.
-       sum -- 
+       sum --
                 0 indicates to show performance of specified node.
 		1 indicates to show sum of performance of one or more management domain which managed by node specified in the noderange.
                 2 means to show performance of specified node and MN.
@@ -1571,7 +1571,7 @@ sub getNodeConfData {
        pe -- TODO;
        callback -- the callback pointer for error and status displaying. It can be null.
     Returns:
-        ret a hash with plug-in name as the keys and the an arry of 
+        ret a hash with plug-in name as the keys and the an arry of
         [return code, error message] as the values.
 =cut
 
diff --git a/xCAT-server/lib/xcat/monitoring/montbhandler.pm b/xCAT-server/lib/xcat/monitoring/montbhandler.pm
index cccf34d24..f639f0bcb 100644
--- a/xCAT-server/lib/xcat/monitoring/montbhandler.pm
+++ b/xCAT-server/lib/xcat/monitoring/montbhandler.pm
@@ -22,7 +22,7 @@ use xCAT_monitoring::monitorctrl;
 =head2    Package Description
   xCAT monitoring table handler module. This is a helper module for monitorctrl module
   becuase the notification infrastructure does not allow a module to register more
-  than one callbacks. This module registers and unregisters notification to watch for 
+  than one callbacks. This module registers and unregisters notification to watch for
   the changes in the monitoring tables. When changes occurrs, it forward the info
   back to monitorctrl module for handling.
 =cut
@@ -35,7 +35,7 @@ use xCAT_monitoring::monitorctrl;
 #--------------------------------------------------------------------------------
 
 =head3    regMonitoringNotif
-      It registers this module in the notification table to watch for changes in 
+      It registers this module in the notification table to watch for changes in
       the monitoring table.
     Arguments:
         none
@@ -98,7 +98,7 @@ sub unregMonitoringNotif {
       It is called by the NotifHander module
       when the monitoring tables get changed.  If a plug-in
       is added or removed from the monitoring table. this function will start
-      or stop the plug-in for monitoing the xCAT cluster.  
+      or stop the plug-in for monitoing the xCAT cluster.
     Arguments:
       action - table action. It can be d for rows deleted, a for rows added
                     or u for rows updated.
diff --git a/xCAT-server/lib/xcat/monitoring/nagiosmon.pm b/xCAT-server/lib/xcat/monitoring/nagiosmon.pm
index d9060eb0d..c43cd05c5 100644
--- a/xCAT-server/lib/xcat/monitoring/nagiosmon.pm
+++ b/xCAT-server/lib/xcat/monitoring/nagiosmon.pm
@@ -24,7 +24,7 @@ use Data::Dumper;
 
 #-------------------------------------------------------------------------------
 
-=head1  xCAT_monitoring:nagiosmon  
+=head1  xCAT_monitoring:nagiosmon
 =head2    Package Description
   xCAT monitoring plugin package to handle Nagios monitoring.
 =cut
@@ -35,16 +35,16 @@ use Data::Dumper;
 
 =head3    start
       This function gets called by the monitorctrl module
-      when xcatd starts and when monstart command is issued by the user. 
+      when xcatd starts and when monstart command is issued by the user.
       It starts the daemons and does necessary startup process for the Nagios monitoring.
        p_nodes -- a pointer to an arrays of nodes to be monitored. null means all.
        scope -- the action scope, it indicates the node type the action will take place.
-                0 means localhost only. 
-                2 means both localhost and nodes, 
+                0 means localhost only.
+                2 means both localhost and nodes,
        callback -- the callback pointer for error and status displaying. It can be null.
     Returns:
-      (return code, message) 
-      if the callback is set, use callback to display the status and error. 
+      (return code, message)
+      if the callback is set, use callback to display the status and error.
 =cut
 
 #--------------------------------------------------------------------------------
@@ -114,17 +114,17 @@ sub start {
 #--------------------------------------------------------------------------------
 
 =head3    stop
-      This function gets called when monstop command is issued by the user. 
+      This function gets called when monstop command is issued by the user.
       It stops the monitoring on all nodes, stops the Nagios daemons.
     Arguments:
        p_nodes -- a pointer to an arrays of nodes to be stopped for monitoring. null means all.
        scope -- the action scope, it indicates the node type the action will take place.
-                0 means localhost only. 
-                2 means both monservers and nodes, 
+                0 means localhost only.
+                2 means both monservers and nodes,
        callback -- the callback pointer for error and status displaying. It can be null.
     Returns:
-      (return code, message) 
-      if the callback is set, use callback to display the status and error. 
+      (return code, message)
+      if the callback is set, use callback to display the status and error.
 =cut
 
 #--------------------------------------------------------------------------------
@@ -173,15 +173,15 @@ sub stop {
 #--------------------------------------------------------------------------------
 
 =head3    config
-      This function configures the cluster for the given nodes.  
+      This function configures the cluster for the given nodes.
       This function is called when moncfg command is issued or when xcatd starts
       on the service node. It will configure the cluster to include the given nodes within
-      the monitoring doamin. 
+      the monitoring doamin.
     Arguments:
        p_nodes -- a pointer to an arrays of nodes to be added for monitoring. none means all.
        scope -- the action scope, it indicates the node type the action will take place.
-                0 means localhost only. 
-                2 means localhost and nodes, 
+                0 means localhost only.
+                2 means localhost and nodes,
        callback -- the callback pointer for error and status displaying. It can be null.
        grands  -- a hash pointer to store the information of the grandchildren. key: "servicenode,xcatmaseter" for the grandchildren, value: a array pointer of grandchildren nodes. This one is only set when the current node is mn and handleGrandChildren returns 1 by the monitoring plugin.
 
@@ -562,11 +562,11 @@ echo \"1=\$1, 2=\$2, 3=\$3, return_code=\$return_code\" >> /tmp/5.txt
 =head3    addNodes
       This function adds the nodes into the nagios cluster.
     Arguments:
-       nodes --an array of nodes to be added. 
+       nodes --an array of nodes to be added.
        master -- the monitoring master of the node.
        scope -- the action scope, it indicates the node type the action will take place.
-                0 means localhost only. 
-                2 means localhost and nodes, 
+                0 means localhost only.
+                2 means localhost and nodes,
        callback -- the callback pointer for error and status displaying. It can be null.
     Returns:
        (error code, error message)
@@ -618,10 +618,10 @@ sub addNodes {
 
         #print "ip=$ip\n";
         `echo "\#BEGIN HOST $node
-define host\{\n    use             linux-server        
-    host_name       $node                
-    alias           $node    
-    address         $ip              
+define host\{\n    use             linux-server
+    host_name       $node
+    alias           $node
+    address         $ip
     max_check_attempts  10
     contact_groups 	admins
 \}
@@ -633,9 +633,9 @@ define host\{\n    use             linux-server
     my $rc = `grep "hostgroup_name" $mychildren_cfg`;
     if (!$rc || ($rc !~ /^(\s)*hostgroup_name(\s)+mychildren/)) {
         `echo "define hostgroup{
-        hostgroup_name  mychildren 
-        alias           mychildren 
-        members 
+        hostgroup_name  mychildren
+        alias           mychildren
+        members
 }
 " >> $mychildren_cfg`;
     }
@@ -764,11 +764,11 @@ cfg_file=/etc/nagios/objects/mychildren.cfg
 =head3    removeNodes
       This function removes the nodes from the nagios cluster.
     Arguments:
-       nodes --an array of nodes to be removed. 
+       nodes --an array of nodes to be removed.
        master -- the monitoring master of the node.
        scope -- the action scope, it indicates the node type the action will take place.
-                0 means localhost only. 
-                2 means localhost and nodes, 
+                0 means localhost only.
+                2 means localhost and nodes,
        callback -- the callback pointer for error and status displaying. It can be null.
     Returns:
        (error code, error message)
@@ -863,12 +863,12 @@ sub removeNodes {
 =head3    addGrandNodes
       This function adds the grand children nodes into the nagios cluster.
     Arguments:
-       grands -- pointer to a hash. key: "servicenode, xcatmaster" for the nodes, 
+       grands -- pointer to a hash. key: "servicenode, xcatmaster" for the nodes,
                  value: an array pointer to the nodes.
        master -- the monitoring master of the node.
        scope -- the action scope, it indicates the node type the action will take place.
-                0 means localhost only. 
-                2 means localhost and nodes, 
+                0 means localhost only.
+                2 means localhost and nodes,
        callback -- the callback pointer for error and status displaying. It can be null.
     Returns:
        (error code, error message)
@@ -975,9 +975,9 @@ define host\{\n    use         xCAT-node
         my $rc = `grep "hostgroup_name" $cn_cfg`;
         if (!$rc || ($rc !~ /^(\s)*hostgroup_name(\s)+cn_$sv/)) {
             `echo "define hostgroup{
-        hostgroup_name  cn_$sv 
-        alias           cn_$sv 
-        members 
+        hostgroup_name  cn_$sv
+        alias           cn_$sv
+        members
 }
 " >> $cn_cfg`;
         }
@@ -1080,12 +1080,12 @@ cfg_file=$cn_template_cfg
 =head3    removeGrandNodes
       This function removes the grand children nodes from the nagios cluster.
     Arguments:
-       grands -- pointer to a hash. key: "servicenode, xcatmaster" for the nodes, 
+       grands -- pointer to a hash. key: "servicenode, xcatmaster" for the nodes,
                  value: an array pointer to the nodes.
        master -- the monitoring master of the node.
        scope -- the action scope, it indicates the node type the action will take place.
-                0 means localhost only. 
-                2 means localhost and nodes, 
+                0 means localhost only.
+                2 means localhost and nodes,
        callback -- the callback pointer for error and status displaying. It can be null.
     Returns:
        (error code, error message)
@@ -1179,14 +1179,14 @@ sub removeGrandNodes {
 #--------------------------------------------------------------------------------
 
 =head3    deconfig
-      This function de-configures the cluster for the given nodes.  
-      This function is called when mondecfg command is issued by the user. 
+      This function de-configures the cluster for the given nodes.
+      This function is called when mondecfg command is issued by the user.
       It should remove the given nodes from the product for monitoring.
     Arguments:
        p_nodes -- a pointer to an arrays of nodes to be removed for monitoring. none means all.
        scope -- the action scope, it indicates the node type the action will take place.
-                0 means local host only. 
-                2 means both local host and nodes, 
+                0 means local host only.
+                2 means both local host and nodes,
        callback -- the callback pointer for error and status displaying. It can be null.
     Returns:
        (error code, error message)
@@ -1268,11 +1268,11 @@ sub deconfig {
 =head3    supportNodeStatusMon
     This function is called by the monitorctrl module to check
     if Nagios can help monitoring and returning the node status.
-    
+
     Arguments:
         none
     Returns:
-         1  
+         1
 =cut
 
 #--------------------------------------------------------------------------------
@@ -1288,14 +1288,14 @@ sub supportNodeStatusMon {
 =head3   startNodeStatusMon
     This function is called by the monitorctrl module to tell
     Nagios to start monitoring the node status and feed them back
-    to xCAT. Nagios will start setting up the notification 
-    to monitor the node status changes.  
+    to xCAT. Nagios will start setting up the notification
+    to monitor the node status changes.
 
     Arguments:
        p_nodes -- a pointer to an arrays of nodes for monitoring. none means all.
        scope -- the action scope, it indicates the node type the action will take place.
-                0 means local host only. 
-                2 means both local host and nodes, 
+                0 means local host only.
+                2 means both local host and nodes,
        callback -- the callback pointer for error and status displaying. It can be null.
     Returns:
        (error code, error message)
@@ -1348,8 +1348,8 @@ sub startNodeStatusMon {
     Arguments:
        p_nodes -- a pointer to an arrays of nodes for monitoring. none means all.
        scope -- the action scope, it indicates the node type the action will take place.
-                0 means local host only. 
-                2 means both local host and nodes, 
+                0 means local host only.
+                2 means both local host and nodes,
        callback -- the callback pointer for error and status displaying. It can be null.
     Returns:
         (return code, message)
@@ -1380,10 +1380,10 @@ sub stopNodeStatusMon {
 #--------------------------------------------------------------------------------
 
 =head3    reportError
-      This function writes the error message to the callback, otherwise to syslog. 
+      This function writes the error message to the callback, otherwise to syslog.
     Arguments:
        error
-       callback 
+       callback
     Returns:
        none
 =cut
@@ -1405,7 +1405,7 @@ sub reportError
 #--------------------------------------------------------------------------------
 
 =head3    processSettingChanges
-      This function gets called when the setting for this monitoring plugin 
+      This function gets called when the setting for this monitoring plugin
       has been changed in the monsetting table.
     Arguments:
        none.
@@ -1422,7 +1422,7 @@ sub processSettingChanges {
 
 =head3    getDiscription
       This function returns the detailed description of the plugin inluding the
-     valid values for its settings in the monsetting tabel. 
+     valid values for its settings in the monsetting tabel.
      Arguments:
         none
     Returns:
@@ -1439,7 +1439,7 @@ sub getDescription {
     moncfg nagiosmon compute -r
     monstart nagiosmon service -r
     monstart nagiosmon compute -r
-    where 'service' is the node group name for the service node, 'compute' is the node group name for the compute node.				  
+    where 'service' is the node group name for the service node, 'compute' is the node group name for the compute node.				
 ";
 
 }
@@ -1449,7 +1449,7 @@ sub getDescription {
 
 =head3    getPostscripts
       This function returns the postscripts needed for the nodes and for the servicd
-      nodes. 
+      nodes.
      Arguments:
         none
     Returns:
@@ -1471,13 +1471,13 @@ sub getPostscripts {
 #--------------------------------------------------------------------------------
 
 =head3    show
-      This function shows the monitoring status.   
+      This function shows the monitoring status.
       This function is called when monshow command is issued.
     Arguments:
        p_nodes -- a pointer to an arrays of nodes to be added for monitoring. none means all.
        scope -- the action scope, it indicates the node type the action will take place.
-                0 means localhost only. 
-                2 means localhost and nodes, 
+                0 means localhost only.
+                2 means localhost and nodes,
        callback -- the callback pointer for error and status displaying. It can be null.
     Returns:
        (error code, error message)
@@ -1497,8 +1497,8 @@ sub show
 #--------------------------------------------------------------------------
 
 =head3    handleGrandChildren
-      This function tells if the mn shall handle the nodes that are managed by the service nodes.    
-      
+      This function tells if the mn shall handle the nodes that are managed by the service nodes.
+
 =cut
 
 #---------------------------------------------------------------------------
diff --git a/xCAT-server/lib/xcat/monitoring/pcpmon.pm b/xCAT-server/lib/xcat/monitoring/pcpmon.pm
index 83b1f549e..c9b30bce0 100644
--- a/xCAT-server/lib/xcat/monitoring/pcpmon.pm
+++ b/xCAT-server/lib/xcat/monitoring/pcpmon.pm
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl 
+#!/usr/bin/env perl
 # IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html
 package xCAT_monitoring::pcpmon;
 
@@ -20,7 +20,7 @@ use warnings;
 
 #-------------------------------------------------------------------------------
 
-=head1  xCAT_monitoring:pcpmon  
+=head1  xCAT_monitoring:pcpmon
 =head2    Package Description
   xCAT monitoring plugin package to handle PCP monitoring.
 =cut
@@ -30,9 +30,9 @@ use warnings;
 #--------------------------------------------------------------------------------
 
 =head3    start
-      This function gets called by the monitorctrl module when xcatd starts and 
-      when monstart command is issued by the user. It starts the daemons and 
-      does necessary startup process for the PCP monitoring. 
+      This function gets called by the monitorctrl module when xcatd starts and
+      when monstart command is issued by the user. It starts the daemons and
+      does necessary startup process for the PCP monitoring.
        p_nodes -- a pointer to an arrays of nodes to be monitored. null means all.
        scope -- the action scope, it indicates the node type the action will take place.
                 0 means localhost only.
@@ -197,10 +197,10 @@ sub start
 #--------------------------------------------------------------
 
 =head3    config
-      This function configures the cluster for the given nodes. This function is called 
-      when moncfg command is issued or when xcatd starts on the service node. 
+      This function configures the cluster for the given nodes. This function is called
+      when moncfg command is issued or when xcatd starts on the service node.
        Returns: 1
-=cut 
+=cut
 
 #--------------------------------------------------------------
 sub config
@@ -212,10 +212,10 @@ sub config
 #--------------------------------------------------------------
 
 =head3    deconfig
-      	This function de-configures the cluster for the given nodes. This function is called 
-	when mondecfg command is issued by the user. 
+      	This function de-configures the cluster for the given nodes. This function is called
+	when mondecfg command is issued by the user.
       Returns: 1
-=cut 
+=cut
 
 #--------------------------------------------------------------
 sub deconfig
@@ -371,11 +371,11 @@ sub stop
 =head3    supportNodeStatusMon
     This function is called by the monitorctrl module to check
     if PCP can help monitoring and returning the node status.
-    
+
     Arguments:
         none
     Returns:
-         1  
+         1
 =cut
 
 #--------------------------------------------------------------------------------
@@ -392,8 +392,8 @@ sub supportNodeStatusMon {
 =head3   startNodeStatusMon
     This function is called by the monitorctrl module to tell
     PCP to start monitoring the node status and feed them back
-    to xCAT. PCP will start setting up the condition/response 
-    to monitor the node status changes.  
+    to xCAT. PCP will start setting up the condition/response
+    to monitor the node status changes.
 
     Arguments:
        None.
@@ -434,7 +434,7 @@ sub stopNodeStatusMon {
 
 =head3    getDiscription
       This function returns the detailed description of the plugin inluding the
-     valid values for its settings in the monsetting tabel. 
+     valid values for its settings in the monsetting tabel.
      Arguments:
         none
     Returns:
@@ -444,7 +444,7 @@ sub stopNodeStatusMon {
 #--------------------------------------------------------------------------------
 sub getDescription
 {
-    return "Description: This plugin will help interface the xCAT cluster with PCP monitoring software 
-       ping-interval:  the number of minutes between  the metric collection operation. 
+    return "Description: This plugin will help interface the xCAT cluster with PCP monitoring software
+       ping-interval:  the number of minutes between  the metric collection operation.
         The default value is 5 \n ";
 }
diff --git a/xCAT-server/lib/xcat/monitoring/samples/mycode.pm b/xCAT-server/lib/xcat/monitoring/samples/mycode.pm
index 8ec72eb09..ffe3148de 100644
--- a/xCAT-server/lib/xcat/monitoring/samples/mycode.pm
+++ b/xCAT-server/lib/xcat/monitoring/samples/mycode.pm
@@ -22,7 +22,7 @@ package xCAT_monitoring::mycode;
     Returns:
       0
     Comment:
-       To test, 
+       To test,
         1. copy this file to /opt/xcat/lib/perl/xCAT_monitoring directory.
         2. run regnotif /opt/xcat/lib/perl/xCAT_monitoring/mycode.pm nodelist -o a,u,d
         3. Then change the nodelist table (add node, remove node, or change status column).
diff --git a/xCAT-server/lib/xcat/monitoring/samples/templatemon.pm b/xCAT-server/lib/xcat/monitoring/samples/templatemon.pm
index 8ae18a5e8..d41fbbe3f 100644
--- a/xCAT-server/lib/xcat/monitoring/samples/templatemon.pm
+++ b/xCAT-server/lib/xcat/monitoring/samples/templatemon.pm
@@ -16,27 +16,27 @@ use xCAT::Utils;
 
 #-------------------------------------------------------------------------------
 
-=head1  xCAT_monitoring:templatemon  
+=head1  xCAT_monitoring:templatemon
 =head2    Package Description
-   This is a xCAT monitoring plugin template. 
-   To use it, copy it to /opt/xcat/lib/perl/xCAT_monitoring/ directory. 
-   Note: 
-     There are two ways to configure a node for monitoring. The preferred way is to  
-     return the postscripts in the getPostScripts() function  and have the node 
-     deployment/install process to call them locally on the nodes. 
+   This is a xCAT monitoring plugin template.
+   To use it, copy it to /opt/xcat/lib/perl/xCAT_monitoring/ directory.
+   Note:
+     There are two ways to configure a node for monitoring. The preferred way is to
+     return the postscripts in the getPostScripts() function  and have the node
+     deployment/install process to call them locally on the nodes.
      The other way is to run command 'moncfg templatemon -r'
      after the nodes are up and running. For the latter case, you need to, in the
      config() function, push the scripts down to the node and use xdsh to run it.
-     We recommend you implement both to give user some freedom. 
+     We recommend you implement both to give user some freedom.
 
    The following are the ways of configure and start monitoring:
    1. The preferred way:
       (define nodes in the xCAT db)
       monadd templatemon [-n]
-      moncfg templatemon servicenode 
+      moncfg templatemon servicenode
       (nodeset servicenode netboot)
       (rpower servicenodde on)
-      moncfg templatemon conputenode 
+      moncfg templatemon conputenode
       (nodeset conputenode netboot)
       (rpower conputenode on)
       monstart templatemon
@@ -49,7 +49,7 @@ use xCAT::Utils;
 
    Use monstop templatemon [noderange] [-r] to stop monitoring.
    Use mondecfg templatemon [noderange] [-r] to clean up.
-   Use monrm templatemon [noderange] [-r] to remove it from the monitoring table. 
+   Use monrm templatemon [noderange] [-r] to remove it from the monitoring table.
 
 =cut
 
@@ -60,19 +60,19 @@ use xCAT::Utils;
 =head3    start
       This function gets called by the monitorctrl module
       when xcatd starts and when monstart command is issued by the user.
-      It should start daemons and do the necessary start-up process 
-      for the third party monitoring software. If the sope is 0, the operations 
+      It should start daemons and do the necessary start-up process
+      for the third party monitoring software. If the sope is 0, the operations
       shoul only be applied on the local host. If it is 2, then it should be applied
       to the children that the local host is monitoring.
     Arguments:
        p_nodes -- a pointer to an arrays of nodes to be monitored. null means all.
        scope -- the action scope, it indicates the node type the action will take place.
-                0 means localhost only. 
-                2 means both localhost and nodes, 
+                0 means localhost only.
+                2 means both localhost and nodes,
        callback -- the callback pointer for error and status displaying. It can be null.
     Returns:
-      (return code, message) 
-      if the callback is set, use callback to display the status and error. 
+      (return code, message)
+      if the callback is set, use callback to display the status and error.
 =cut
 
 #--------------------------------------------------------------------------------
@@ -143,19 +143,19 @@ sub start {
 
 =head3    stop
       This function gets called when monstop command is issued by the user.
-      It should stop the daemons and do the necessary backup process 
-      for the third party monitoring software. If the sope is 0, the operations 
+      It should stop the daemons and do the necessary backup process
+      for the third party monitoring software. If the sope is 0, the operations
       shoul only be applied on the local host. If it is 2, then it should be applied
       to the children that the local host is monitoring.
     Arguments:
        p_nodes -- a pointer to an arrays of nodes to be stopped. null means all.
        scope -- the action scope, it indicates the node type the action will take place.
-                0 means localhost only. 
-                2 means both localhost and nodes, 
+                0 means localhost only.
+                2 means both localhost and nodes,
        callback -- the callback pointer for error and status displaying. It can be null.
     Returns:
-      (return code, message) 
-      if the callback is set, use callback to display the status and error. 
+      (return code, message)
+      if the callback is set, use callback to display the status and error.
 =cut
 
 #--------------------------------------------------------------------------------
@@ -218,11 +218,11 @@ sub stop {
 =head3    supportNodeStatusMon
     This function is called by the monitorctrl module to check
     if this product can help monitoring and returning the node status.
-    
+
     Arguments:
         none
     Returns:
-           0 means not support. 
+           0 means not support.
            1 means yes.
 =cut
 
@@ -240,16 +240,16 @@ sub supportNodeStatusMon {
 =head3   startNodeStatusMon
     This function is called by the monitorctrl module when monstart gets called and
     when xcatd starts. It starts monitoring the node status and feed them back
-    to xCAT.  
+    to xCAT.
     Arguments:
        p_nodes -- a pointer to an arrays of nodes to be monitored. null means all.
        scope -- the action scope, it indicates the node type the action will take place.
-                0 means localhost only.  
-                2 means both monservers and nodes, 
+                0 means localhost only.
+                2 means both monservers and nodes,
        callback -- the callback pointer for error and status displaying. It can be null.
     Returns:
-      (return code, message) 
-      if the callback is set, use callback to display the status and error. 
+      (return code, message)
+      if the callback is set, use callback to display the status and error.
 =cut
 
 #--------------------------------------------------------------------------------
@@ -272,17 +272,17 @@ sub startNodeStatusMon {
 
 =head3   stopNodeStatusMon
     This function is called by the monitorctrl module when monstop command is issued.
-    It stops feeding the node status info back to xCAT. 
+    It stops feeding the node status info back to xCAT.
     Arguments:
        p_nodes -- a pointer to an arrays of nodes to stopped for monitoring. null means all.
        scope -- the action scope, it indicates the node type the action will take place.
-                0 means localhost only. 
-                2 means both monservers and nodes, 
+                0 means localhost only.
+                2 means both monservers and nodes,
        callback -- the callback pointer for error and status displaying. It can be null.
     note: p_nodes and scope are ignored by this plugin.
     Returns:
-      (return code, message) 
-      if the callback is set, use callback to display the status and error.  
+      (return code, message)
+      if the callback is set, use callback to display the status and error.
 =cut
 
 #--------------------------------------------------------------------------------
@@ -303,15 +303,15 @@ sub stopNodeStatusMon {
 #--------------------------------------------------------------------------------
 
 =head3    config
-      This function configures the cluster for the given nodes.  
+      This function configures the cluster for the given nodes.
       This function is called by when monconfig command is issued or when xcatd starts
      on the service node. It will configure the cluster to include the given nodes within
-     the monitoring doamin. 
+     the monitoring doamin.
     Arguments:
        p_nodes -- a pointer to an arrays of nodes to be added for monitoring. none means all.
        scope -- the action scope, it indicates the node type the action will take place.
-                0 means localhost only. 
-                2 means both monservers and nodes, 
+                0 means localhost only.
+                2 means both monservers and nodes,
        callback -- the callback pointer for error and status displaying. It can be null.
     Returns:
        (error code, error message)
@@ -335,12 +335,12 @@ sub config {
 
 =head3    deconfig
       This function is called by when mondeconfig command is issued.
-      It will deconfigure the cluster to remove the given nodes from the monitoring doamin. 
+      It will deconfigure the cluster to remove the given nodes from the monitoring doamin.
     Arguments:
        p_nodes -- a pointer to an arrays of nodes to be removed for monitoring. none means all.
        scope -- the action scope, it indicates the node type the action will take place.
-                0 means localhost only. 
-                2 means both monservers and nodes, 
+                0 means localhost only.
+                2 means both monservers and nodes,
        callback -- the callback pointer for error and status displaying. It can be null.
     Returns:
        (error code, error message)
@@ -363,7 +363,7 @@ sub deconfig {
 #--------------------------------------------------------------------------------
 
 =head3    processSettingChanges
-      This optional function gets called when the setting for this monitoring plugin 
+      This optional function gets called when the setting for this monitoring plugin
       has been changed in the monsetting table.
     Arguments:
        none.
@@ -384,7 +384,7 @@ sub processSettingChanges {
 
 =head3    getDiscription
       This function returns the detailed description of the plugin inluding the
-     valid values for its settings in the monsetting tabel. 
+     valid values for its settings in the monsetting tabel.
      Arguments:
         none
     Returns:
@@ -395,7 +395,7 @@ sub processSettingChanges {
 sub getDescription {
     return
       "  Description:
-    templatemon description goes here. 
+    templatemon description goes here.
   Settings:
     key:  explaination. default value etc.\n";
 }
@@ -407,23 +407,23 @@ sub getDescription {
       When monitoring commands get called, the default process is to dispatch the command
     to all the monserves of the given nodes. The monserver for a node is defined
     in noderes.monserver in the database. The monserver in the db is a comma separated
-    pairs. The first one the monitoring server name/ip seen by the mn, the second one is 
+    pairs. The first one the monitoring server name/ip seen by the mn, the second one is
     the same sever name/ip seen by the node. If it is not defined, noderes.servicenode and
-    noderes.xcatmaster pairs are used. If not defined neither, the 'noservicenode' and 
+    noderes.xcatmaster pairs are used. If not defined neither, the 'noservicenode' and
     site.master pairs are used.
       This optional function overrides the default behavior.
    Arguments:
        p_nodes -- a pointer to an arrays of nodes to be added for monitoring. none means all.
        callback -- the callback pointer for error and status displaying. It can be null.
-   Returns: 
+   Returns:
       A pointer to a hash table with monserver pairs as the key and an array
-                     pointer of nodes as the value. 
+                     pointer of nodes as the value.
                      For example: { "sv1,ma1"=>[node1,node2], "sv2,ma2"=>node3...}
-         The pair is in the format of "monserver,monmaser". First one is the monitoring service 
-      node ip/hostname that faces the mn and the second one is the monitoring service 
-      node ip/hostname that faces the cn. 
-      The value of the first one can be "noservicenode" meaning that there is no service node 
-      for that node. In this case the second one is the site master. 
+         The pair is in the format of "monserver,monmaser". First one is the monitoring service
+      node ip/hostname that faces the mn and the second one is the monitoring service
+      node ip/hostname that faces the cn.
+      The value of the first one can be "noservicenode" meaning that there is no service node
+      for that node. In this case the second one is the site master.
       It returns a pointer to an array if there is an error. Format is [code, message].
 =cut
 
@@ -445,7 +445,7 @@ sub getNodesMonServers
       This optional function returns the postscripts needed for configuring the the nodes
       for monitoring.  The postscripts get downloaded from mn to the nodes and
       called when the nodes are deployed/installed.
-      Please put the postscripts to /install/postscripts directory. 
+      Please put the postscripts to /install/postscripts directory.
      Arguments:
         none
     Returns:
@@ -469,8 +469,8 @@ sub getPostscripts {
 
 =head3    getNodeConfData
      This optional function gets called during the node deployment process before
-     the postscripts are invoked. It gets a list of environmental variables for 
-     the postscripts.  
+     the postscripts are invoked. It gets a list of environmental variables for
+     the postscripts.
     Arguments:
         pointet to a arry of nodes being deployed.
     Returns:
@@ -481,7 +481,7 @@ sub getPostscripts {
            'node2'=>{'env1'=>'value3',
                      'env2'=>'value4'}
         }
-                
+
 =cut
 
 #--------------------------------------------------------------------------------
diff --git a/xCAT-server/lib/xcat/monitoring/snmpmon.pm b/xCAT-server/lib/xcat/monitoring/snmpmon.pm
index 9d7f6d683..a82ab17bf 100644
--- a/xCAT-server/lib/xcat/monitoring/snmpmon.pm
+++ b/xCAT-server/lib/xcat/monitoring/snmpmon.pm
@@ -36,9 +36,9 @@ if (xCAT::Utils->isAIX()) {
 
 #-------------------------------------------------------------------------------
 
-=head1  xCAT_monitoring:snmpmon  
+=head1  xCAT_monitoring:snmpmon
 =head2    Package Description
-  xCAT monitoring plugin package to handle SNMP monitoring. 
+  xCAT monitoring plugin package to handle SNMP monitoring.
 
 =cut
 
@@ -47,17 +47,17 @@ if (xCAT::Utils->isAIX()) {
 #--------------------------------------------------------------------------------
 
 =head3    start
-      This function gets called by the monitorctrl module when monstart command 
-     gets called and when xcatd starts.  
+      This function gets called by the monitorctrl module when monstart command
+     gets called and when xcatd starts.
     Arguments:
        p_nodes -- a pointer to an arrays of nodes to be monitored. null means all.
        scope -- the action scope, it indicates the node type the action will take place.
-                0 means localhost only. 
-                2 means both localhost and nodes, 
+                0 means localhost only.
+                2 means both localhost and nodes,
        callback -- the callback pointer for error and status displaying. It can be null.
     Returns:
-      (return code, message) 
-      if the callback is set, use callback to display the status and error. 
+      (return code, message)
+      if the callback is set, use callback to display the status and error.
 =cut
 
 #--------------------------------------------------------------------------------
@@ -131,16 +131,16 @@ sub start {
 #--------------------------------------------------------------------------------
 
 =head3    stop
-      This function gets called by the monitorctrl module when monstop command gets called. 
+      This function gets called by the monitorctrl module when monstop command gets called.
     Arguments:
        p_nodes -- a pointer to an arrays of nodes to be stopped for monitoring. null means all.
        scope -- the action scope, it indicates the node type the action will take place.
-                0 means localhost only. 
-                2 means both monservers and nodes, 
+                0 means localhost only.
+                2 means both monservers and nodes,
        callback -- the callback pointer for error and status displaying. It can be null.
     Returns:
-      (return code, message) 
-      if the callback is set, use callback to display the status and error. 
+      (return code, message)
+      if the callback is set, use callback to display the status and error.
 =cut
 
 #--------------------------------------------------------------------------------
@@ -199,11 +199,11 @@ sub stop {
     This function is called by the monitorctrl module to check
     if SNMP can help monitoring and returning the node status.
     SNMP does not support this function.
-    
+
     Arguments:
         none
     Returns:
-         0  
+         0
 =cut
 
 #--------------------------------------------------------------------------------
@@ -218,17 +218,17 @@ sub supportNodeStatusMon {
 =head3   startNodeStatusMon
     This function is called by the monitorctrl module when monstart gets called and
     when xcatd starts. It starts monitoring the node status and feed them back
-    to xCAT.  
+    to xCAT.
     Arguments:
        p_nodes -- a pointer to an arrays of nodes to be monitored. null means all.
        scope -- the action scope, it indicates the node type the action will take place.
-                0 means loca lhost only.  
-                2 means both localhost and nodes, 
+                0 means loca lhost only.
+                2 means both localhost and nodes,
        callback -- the callback pointer for error and status displaying. It can be null.
     note: p_nodes and scope are ignored by this plugin.
     Returns:
-      (return code, message) 
-      if the callback is set, use callback to display the status and error. 
+      (return code, message)
+      if the callback is set, use callback to display the status and error.
     This function is called by the monitorctrl module to tell
 =cut
 
@@ -242,17 +242,17 @@ sub startNodeStatusMon {
 
 =head3   stopNodeStatusMon
     This function is called by the monitorctrl module when monstop command is issued.
-    It stops feeding the node status info back to xCAT. 
+    It stops feeding the node status info back to xCAT.
     Arguments:
        p_nodes -- a pointer to an arrays of nodes to stopped for monitoring. null means all.
        scope -- the action scope, it indicates the node type the action will take place.
-                0 means local host only. 
-                2 means both local host and nodes, 
+                0 means local host only.
+                2 means both local host and nodes,
        callback -- the callback pointer for error and status displaying. It can be null.
     note: p_nodes and scope are ignored by this plugin.
     Returns:
-      (return code, message) 
-      if the callback is set, use callback to display the status and error. 
+      (return code, message)
+      if the callback is set, use callback to display the status and error.
 =cut
 
 #--------------------------------------------------------------------------------
@@ -265,15 +265,15 @@ sub stopNodeStatusMon {
 #--------------------------------------------------------------------------------
 
 =head3    config
-      This function configures the cluster for the given nodes.  
+      This function configures the cluster for the given nodes.
       This function is called when moncfg command is issued or when xcatd starts
       on the service node. It will configure the cluster to include the given nodes within
-      the monitoring doamin. 
+      the monitoring doamin.
     Arguments:
        p_nodes -- a pointer to an arrays of nodes to be added for monitoring. none means all.
        scope -- the action scope, it indicates the node type the action will take place.
-                0 means localhost only. 
-                2 means localhost and nodes, 
+                0 means localhost only.
+                2 means localhost and nodes,
        callback -- the callback pointer for error and status displaying. It can be null.
     Returns:
        (error code, error message)
@@ -341,14 +341,14 @@ sub config {
 #--------------------------------------------------------------------------------
 
 =head3    deconfig
-      This function de-configures the cluster for the given nodes.  
-      This function is called when mondecfg command is issued by the user. 
+      This function de-configures the cluster for the given nodes.
+      This function is called when mondecfg command is issued by the user.
       It should remove the given nodes from the product for monitoring.
     Arguments:
        p_nodes -- a pointer to an arrays of nodes to be removed for monitoring. none means all.
        scope -- the action scope, it indicates the node type the action will take place.
-                0 means local host only. 
-                2 means both local host and nodes, 
+                0 means local host only.
+                2 means both local host and nodes,
        callback -- the callback pointer for error and status displaying. It can be null.
     Returns:
        (error code, error message)
@@ -414,25 +414,25 @@ sub deconfig {
     Arguments:
       none.
     Returns:
-      (return code, message)      
+      (return code, message)
 =cut
 
 #--------------------------------------------------------------------------------
 sub deconfigSNMP {
-   return (0, ""); 
+   return (0, "");
 }
 
 #--------------------------------------------------------------------------------
 =head3    configBMC
       This function configures BMC to setup the snmp destination, enable/disable
-    PEF policy table entry number 1. 
+    PEF policy table entry number 1.
     Arguments:
       actioon -- 0 disable alert. 1 enable alert. 2 setup snmp destination
-            
+
       p_nodes -- a pointer to an arrays of nodes to be monitored. null means all.
       callback -- the callback pointer for error and status displaying. It can be null.
     Returns:
-      (return code, message)      
+      (return code, message)
 =cut
 
 #--------------------------------------------------------------------------------
@@ -562,15 +562,15 @@ sub configBMC {
 #--------------------------------------------------------------------------------
 
 =head3    configMPA
-      This function configures Blade Center Management Module to setup the snmp destination, 
-      enable/disable remote alert notification. 
+      This function configures Blade Center Management Module to setup the snmp destination,
+      enable/disable remote alert notification.
     Arguments:
-      actioon -- 1 enable remote alert notification. 0 disable remote alert notification. 
+      actioon -- 1 enable remote alert notification. 0 disable remote alert notification.
                  2 setting up snmp destination.
       p_nodes -- a pointer to an arrays of nodes to be monitored. null means all.
       callback -- the callback pointer for error and status displaying. It can be null.
     Returns:
-      (return code, message)      
+      (return code, message)
 =cut
 
 #--------------------------------------------------------------------------------
@@ -712,16 +712,16 @@ sub configMPA {
 
 =head3    configSwitch
       This function configures switches to setup the snmp destination, enable/disable
-    alerts. 
+    alerts.
     Arguments:
-      actioon -- 0 disable alert (called mon monstop). 
+      actioon -- 0 disable alert (called mon monstop).
                  1 enable alert. (called by monstart)
                  2 setup snmp destination (called by moncfg)
                  3 remove the snmp destination (called by mondecfg)
     p_nodes -- a pointer to an arrays of nodes to be monitored. null means all.
       callback -- the callback pointer for error and status displaying. It can be null.
     Returns:
-      (return code, message)      
+      (return code, message)
 =cut
 
 #--------------------------------------------------------------------------------
@@ -905,7 +905,7 @@ sub configSwitch {
     Arguments:
       none.
     Returns:
-      (return code, message)      
+      (return code, message)
 =cut
 
 #--------------------------------------------------------------------------------
@@ -1147,14 +1147,14 @@ s/authCommunity\s*(.*)\s* public/authCommunity $1,net public/; #modify it to hav
 #--------------------------------------------------------------------------------
 
 =head3    configMail
-      This function adds a "alerts" mail aliase so that the mail notification 
-      from the trap handler can be received. It the alerts already exists, this 
-      function does nothing. 
-      TODO: configure mail servers on MS to forward mails to MS 
+      This function adds a "alerts" mail aliase so that the mail notification
+      from the trap handler can be received. It the alerts already exists, this
+      function does nothing.
+      TODO: configure mail servers on MS to forward mails to MS
     Arguments:
       none
     Returns:
-      (return code, message)      
+      (return code, message)
 =cut
 
 #--------------------------------------------------------------------------------
@@ -1183,7 +1183,7 @@ sub configMail {
 #--------------------------------------------------------------------------------
 
 =head3    processSettingChanges
-      This function gets called when the setting for this monitoring plugin 
+      This function gets called when the setting for this monitoring plugin
       has been changed in the monsetting table.
     Arguments:
        none.
@@ -1201,7 +1201,7 @@ sub processSettingChanges {
 
 =head3    getDiscription
       This function returns the detailed description of the plugin inluding the
-     valid values for its settings in the monsetting tabel. 
+     valid values for its settings in the monsetting tabel.
      Arguments:
         none
     Returns:
@@ -1213,28 +1213,28 @@ sub getDescription {
     return
       "  Description:
     snmpmon sets up the snmptrapd on the management server to receive SNMP
-    traps for different nodes. It also sets the trap destination for Blade 
-    Center Management Module, RSA II, IPMIs that are managed by the xCAT cluster. 
-    xCAT has categorized some events into different event priorities (critical, 
-    warning and informational) based on the MIBs we know such as MM, RSA II and 
-    IPMI. All the unknown events are categorized as 'warning'. By default, 
+    traps for different nodes. It also sets the trap destination for Blade
+    Center Management Module, RSA II, IPMIs that are managed by the xCAT cluster.
+    xCAT has categorized some events into different event priorities (critical,
+    warning and informational) based on the MIBs we know such as MM, RSA II and
+    IPMI. All the unknown events are categorized as 'warning'. By default,
     the xCAT trap handler will log all events into the syslog and only
-    email the critical and the warning events to the mail alias called 'alerts'. 
+    email the critical and the warning events to the mail alias called 'alerts'.
     You can use the settings to override the default behavior.
-    Use command 'monstart snmpmon' to star monitoring and 'monstop snmpmon' 
-    to stop it. 
+    Use command 'monstart snmpmon' to star monitoring and 'monstop snmpmon'
+    to stop it.
   Settings:
-    ignore:  specifies the events that will be ignored. It's a comma separated 
-        pairs of oid=value. For example, 
+    ignore:  specifies the events that will be ignored. It's a comma separated
+        pairs of oid=value. For example,
         spTrapAppType=4,spTrapMsgText=~power,spTrapMsgText=Hello there.
     email:  specifies the events that will get email notification.
     log:    specifies the events that will get logged.
     runcmd#:specifies the events that will be passed to the user defined scripts.
-    cmds#:  specifies the command names that will be invoked for the events 
+    cmds#:  specifies the command names that will be invoked for the events
             specified in the runcmd# row. '#' is a number.
     db:     specifies the events that will be logged into the eventlog table
             in xCAT database.
-    
+
     Special keywords for specifying events:
       All -- all events.
       None -- none of the events.
@@ -1253,19 +1253,19 @@ sub getDescription {
 =head3    getNodesMonServers
       This function checks the given nodes, if they are bmc/ipmi nodes, the monserver pairs of
      the nodes will be returned. If the nodes are managed by MM, the monserver pairs of their
-     mpa will be returned.  
+     mpa will be returned.
      Arguments:
        p_nodes -- a pointer to an arrays of nodes to be added for monitoring. none means all.
        callback -- the callback pointer for error and status displaying. It can be null.
-   Returns: 
+   Returns:
       A pointer to a hash table with monserver pairs as the key and an array
-                     pointer of nodes as the value. 
+                     pointer of nodes as the value.
                      For example: { "sv1,ma1"=>[node1,node2], "sv2,ma2"=>node3...}
-         The pair is in the format of "monserver,monmaser". First one is the monitoring service 
-      node ip/hostname that faces the mn and the second one is the monitoring service 
-      node ip/hostname that faces the cn. 
-      The value of the first one can be "noservicenode" meaning that there is no service node 
-      for that node. In this case the second one is the site master. 
+         The pair is in the format of "monserver,monmaser". First one is the monitoring service
+      node ip/hostname that faces the mn and the second one is the monitoring service
+      node ip/hostname that faces the cn.
+      The value of the first one can be "noservicenode" meaning that there is no service node
+      for that node. In this case the second one is the site master.
       It retuens a pointer to an array if there is an error. Format is [code, message].
 =cut
 
diff --git a/xCAT-server/lib/xcat/monitoring/xcatmon.pm b/xCAT-server/lib/xcat/monitoring/xcatmon.pm
index 8b3469fb0..a3e20a895 100644
--- a/xCAT-server/lib/xcat/monitoring/xcatmon.pm
+++ b/xCAT-server/lib/xcat/monitoring/xcatmon.pm
@@ -19,9 +19,9 @@ use Sys::Hostname;
 
 #-------------------------------------------------------------------------------
 
-=head1  xCAT_monitoring:xcatmon  
+=head1  xCAT_monitoring:xcatmon
 =head2    Package Description
-   This is a xCAT monitoring plugin. The only thing that this plug-in does is 
+   This is a xCAT monitoring plugin. The only thing that this plug-in does is
    the node monitoring. To activate it simply do the following command:
       chtab pname=xCAT monitoring.nodestatmon=Y
 =cut
@@ -31,19 +31,19 @@ use Sys::Hostname;
 #--------------------------------------------------------------------------------
 
 =head3    start
-      This function gets called by the monitorctrl module when monstart command 
-     gets called and when xcatd starts.  
+      This function gets called by the monitorctrl module when monstart command
+     gets called and when xcatd starts.
 
     Arguments:
        p_nodes -- a pointer to an arrays of nodes to be monitored. null means all.
        scope -- the action scope, it indicates the node type the action will take place.
-                0 means localhost only. 
-                2 means both monservers and nodes, 
+                0 means localhost only.
+                2 means both monservers and nodes,
        callback -- the callback pointer for error and status displaying. It can be null.
     Returns:
-      (return code, message) 
-      if the callback is set, use callback to display the status and error. 
-     
+      (return code, message)
+      if the callback is set, use callback to display the status and error.
+
 =cut
 
 #--------------------------------------------------------------------------------
@@ -58,16 +58,16 @@ sub start {
 #--------------------------------------------------------------------------------
 
 =head3    stop
-      This function gets called by the monitorctrl module when monstop command gets called. 
+      This function gets called by the monitorctrl module when monstop command gets called.
     Arguments:
        p_nodes -- a pointer to an arrays of nodes to be stopped for monitoring. null means all.
        scope -- the action scope, it indicates the node type the action will take place.
-                0 means localhost only. 
-                2 means both monservers and nodes, 
+                0 means localhost only.
+                2 means both monservers and nodes,
        callback -- the callback pointer for error and status displaying. It can be null.
     Returns:
-      (return code, message) 
-      if the callback is set, use callback to display the status and error. 
+      (return code, message)
+      if the callback is set, use callback to display the status and error.
 =cut
 
 #--------------------------------------------------------------------------------
@@ -85,7 +85,7 @@ sub stop {
 =head3    supportNodeStatusMon
     This function is called by the monitorctrl module to check
     if this product can help monitoring and returning the node status.
-    
+
     Arguments:
         none
     Returns:
@@ -105,17 +105,17 @@ sub supportNodeStatusMon {
 =head3   startNodeStatusMon
     This function is called by the monitorctrl module when monstart gets called and
     when xcatd starts. It starts monitoring the node status and feed them back
-    to xCAT.  
+    to xCAT.
     Arguments:
        p_nodes -- a pointer to an arrays of nodes to be monitored. null means all.
        scope -- the action scope, it indicates the node type the action will take place.
-                0 means localhost only.  
-                2 means both monservers and nodes, 
+                0 means localhost only.
+                2 means both monservers and nodes,
        callback -- the callback pointer for error and status displaying. It can be null.
     note: p_nodes and scope are ignored by this plugin.
     Returns:
-      (return code, message) 
-      if the callback is set, use callback to display the status and error. 
+      (return code, message)
+      if the callback is set, use callback to display the status and error.
 =cut
 
 #--------------------------------------------------------------------------------
@@ -198,17 +198,17 @@ sub startNodeStatusMon
 
 =head3   stopNodeStatusMon
     This function is called by the monitorctrl module when monstop command is issued.
-    It stops feeding the node status info back to xCAT. 
+    It stops feeding the node status info back to xCAT.
     Arguments:
        p_nodes -- a pointer to an arrays of nodes to stopped for monitoring. null means all.
        scope -- the action scope, it indicates the node type the action will take place.
-                0 means localhost only. 
-                2 means both monservers and nodes, 
+                0 means localhost only.
+                2 means both monservers and nodes,
        callback -- the callback pointer for error and status displaying. It can be null.
     note: p_nodes and scope are ignored by this plugin.
     Returns:
-      (return code, message) 
-      if the callback is set, use callback to display the status and error. 
+      (return code, message)
+      if the callback is set, use callback to display the status and error.
 =cut
 
 #--------------------------------------------------------------------------------
@@ -248,15 +248,15 @@ sub stopNodeStatusMon {
 #--------------------------------------------------------------------------------
 
 =head3    config
-      This function configures the cluster for the given nodes.  
+      This function configures the cluster for the given nodes.
       This function is called by when monconfig command is issued or when xcatd starts
      on the service node. It will configure the cluster to include the given nodes within
-     the monitoring doamin. 
+     the monitoring doamin.
     Arguments:
        p_nodes -- a pointer to an arrays of nodes to be added for monitoring. none means all.
        scope -- the action scope, it indicates the node type the action will take place.
-                0 means localhost only. 
-                2 means both monservers and nodes, 
+                0 means localhost only.
+                2 means both monservers and nodes,
        callback -- the callback pointer for error and status displaying. It can be null.
     Returns:
        (error code, error message)
@@ -273,14 +273,14 @@ sub config {
 #--------------------------------------------------------------------------------
 
 =head3    deconfig
-      This function de-configures the cluster for the given nodes.  
-      This function is called by the monitorctrl module when nodes are removed 
+      This function de-configures the cluster for the given nodes.
+      This function is called by the monitorctrl module when nodes are removed
       from the xCAT cluster. It should remove the nodes from the product for monitoring.
     Arguments:
        p_nodes -- a pointer to an arrays of nodes to be removed for monitoring. none means all.
        scope -- the action scope, it indicates the node type the action will take place.
-                0 means localhost only. 
-                2 means both monservers and nodes, 
+                0 means localhost only.
+                2 means both monservers and nodes,
        callback -- the callback pointer for error and status displaying. It can be null.
     Returns:
        (error code, error message)
@@ -303,7 +303,7 @@ sub deconfig {
     Arguments:
        none.
     Returns:
-       a hash that has the node status. The format is: 
+       a hash that has the node status. The format is:
           {alive=>[node1, node3,...], unreachable=>[node4, node2...], unknown=>[node8, node101...]}
 =cut
 
@@ -384,7 +384,7 @@ sub getMonNodesStatus {
 =head3    setNodeStatusAttributes
       This function will update the status column of the nodelist table with the new node status.
     Arguments:
-       status -- a hash pointer of the node status. A key is a status string. The value is 
+       status -- a hash pointer of the node status. A key is a status string. The value is
                 an array pointer of nodes that have the same status.
                 for example: {alive=>["node1", "node1"], unreachable=>["node5","node100"]}
        force -- 1 force the input values to be set.
@@ -408,7 +408,7 @@ sub setNodeStatusAttributes {
 #--------------------------------------------------------------------------------
 
 =head3    processSettingChanges
-      This function gets called when the setting for this monitoring plugin 
+      This function gets called when the setting for this monitoring plugin
       has been changed in the monsetting table.
     Arguments:
        none.
@@ -429,7 +429,7 @@ sub processSettingChanges {
 
 =head3    getDiscription
       This function returns the detailed description of the plugin inluding the
-     valid values for its settings in the mon setting tabel. 
+     valid values for its settings in the mon setting tabel.
      Arguments:
         none
     Returns:
@@ -440,32 +440,32 @@ sub processSettingChanges {
 sub getDescription {
     return
       "  Description:
-    xcatmon provides node status monitoring using fping on AIX and nmap on Linux. 
-    It also provides application status monitoring. The status and the appstatus 
-    columns of the nodelist table will be  updated periodically  with the latest 
-    status values for the nodes.   Use  command 'monadd xcatmon -n' and then 
-    'monstart xcatmon'  to start monitoring. 
+    xcatmon provides node status monitoring using fping on AIX and nmap on Linux.
+    It also provides application status monitoring. The status and the appstatus
+    columns of the nodelist table will be  updated periodically  with the latest
+    status values for the nodes.   Use  command 'monadd xcatmon -n' and then
+    'monstart xcatmon'  to start monitoring.
   Settings:
-    ping-interval:  the number of minutes between each nmap/fping operation. 
+    ping-interval:  the number of minutes between each nmap/fping operation.
         The default value is 3.
-    apps: a list of comma separated application names whose status will be queried. 
-        For how to get the status of each app, look for app name in the key field 
+    apps: a list of comma separated application names whose status will be queried.
+        For how to get the status of each app, look for app name in the key field
         in a different row.
-    port: the application daemon port number, if not specified, use internal list, 
+    port: the application daemon port number, if not specified, use internal list,
         then /etc/services.
     group:  the name of a node group that needs to get the application status from.
-         If not specified, assume all the nodes in the nodelist table. 
+         If not specified, assume all the nodes in the nodelist table.
          To specify more than one groups, use group=a,group=b format.
     cmd: the command that will be run locally on mn or sn.
     lcmd: the command that will be run locally on the mn only.
     dcmd: the command that will be run distributed on the nodes using xdsh.
 
-       For commands specified by 'cmd' and 'lcmd', the input of is a list of comma 
+       For commands specified by 'cmd' and 'lcmd', the input of is a list of comma
        separated node names, the output must be in the following format:
          node1:string1
          node2:string2
          ...
-       For the command specified by 'dcmd', no input is needed, the output can be a 
+       For the command specified by 'dcmd', no input is needed, the output can be a
        string.";
 
 }
diff --git a/xCAT-server/lib/xcat/plugins/00kitnodebase.pm b/xCAT-server/lib/xcat/plugins/00kitnodebase.pm
index 256ce90a3..682290335 100644
--- a/xCAT-server/lib/xcat/plugins/00kitnodebase.pm
+++ b/xCAT-server/lib/xcat/plugins/00kitnodebase.pm
@@ -14,18 +14,18 @@ require xCAT::ProfiledNodeUtils;
 =head1
 
     xCAT plugin, which is also the default kit plugin.
-    These commands are called by node management commands, 
+    These commands are called by node management commands,
     should not be called directly by external.
 
     The kit plugin framework is creating a common framework for kits' extension. The major feature of this framework is to update kits' related configuration files/services automatically while add/remove/update nodes.
-    
+
     According to design, if a kit wants have such a auto configure feature, it should create a xCAT plugin which implement commands "kitcmd_nodemgmt_add", "kitcmd_nodemgmt_remove"..., just like plugin "00kitnodebase".
 
     For example, we create a kit for LSF, and want to update LSF's configuration file automatically updated while add/remove/update xCAT nodes, then we should create a xCAT plugin. This plugin will update LSF's configuration file and may also reconfigure/restart LSF service while these change happens.
 
     If we have multi kits, and all these kits have such a plugin, then all these plugins will be called while we add/remove/update xCAT nodes. To configure these kits in one go by auto.
 
-    This plugin is a kit plugin, just for configure nodes' related configurations automatically. So that we do not need to run these make* commands manually after creating them.    
+    This plugin is a kit plugin, just for configure nodes' related configurations automatically. So that we do not need to run these make* commands manually after creating them.
 
     About kit plugin naming:  naming this plugin starts with "00" is a way for specifying plugin calling orders, we want to call the default kit plugin in front of other kit plugins.
 
diff --git a/xCAT-server/lib/xcat/plugins/AAsn.pm b/xCAT-server/lib/xcat/plugins/AAsn.pm
index 4656230f3..202fecee1 100755
--- a/xCAT-server/lib/xcat/plugins/AAsn.pm
+++ b/xCAT-server/lib/xcat/plugins/AAsn.pm
@@ -20,11 +20,11 @@ use Getopt::Long;
 =head1  AAsn
 
  This is the Service Node Plugin, although it does perform a few functions on
- the Management Node.   
+ the Management Node.
  It reads the servicenode table for the service node it is running on,
  and run the appropriate
- setup routine for each service that is designated to be setup in the 
- servicenode table for this service node. Some functions are only done for 
+ setup routine for each service that is designated to be setup in the
+ servicenode table for this service node. Some functions are only done for
  Linux.
  A few functions are done not based on the servicenode table. For example:
 
@@ -34,7 +34,7 @@ use Getopt::Long;
       if site.installloc not set
           creates /install if needed
           sets up nfs
-          exports /install 
+          exports /install
 
 #-------------------------------------------------------
 
@@ -226,12 +226,12 @@ sub process_request
     if site.installloc attribute set
           If the installdir directory is exported, unexport it
 	      mount the installdir directory from the installloc location
-    if site.installoc not set and we are on a Stateful install 
-          If installdir mounted, unmount it 
+    if site.installoc not set and we are on a Stateful install
+          If installdir mounted, unmount it
           If installdir directory not created,  create it
           setup NFS
           export the installdir directory
-          
+
 
 =cut
 
@@ -593,9 +593,9 @@ sub setup_GOCONS
 
 #-----------------------------------------------------------------------------
 
-=head3 setup_DHCP 
+=head3 setup_DHCP
 
-    Sets up DHCP services  
+    Sets up DHCP services
     If on the Management node, just check if running and if not start it.
     On Service nodes do full setup based on site.disjointdhcps setting
 =cut
@@ -871,9 +871,9 @@ sub setup_DNS
 
 #-----------------------------------------------------------------------------
 
-=head3 setup_LDAP 
+=head3 setup_LDAP
 
-    Sets up LDAP  
+    Sets up LDAP
 
 =cut
 
@@ -899,9 +899,9 @@ sub setup_LDAP
 
 #-----------------------------------------------------------------------------
 
-=head3 setup_NFS 
+=head3 setup_NFS
 
-    Sets up NFS services on Service Node for AIX and Linux   
+    Sets up NFS services on Service Node for AIX and Linux
 
 =cut
 
@@ -960,9 +960,9 @@ sub setup_NTP
 
 #-----------------------------------------------------------------------------
 
-=head3 start_NTP 
+=head3 start_NTP
 
-    Starts daemon 
+    Starts daemon
 
 =cut
 
@@ -989,9 +989,9 @@ sub start_NTP
 
 #-----------------------------------------------------------------------------
 
-=head3 backup_NTPconf 
+=head3 backup_NTPconf
 
-   backup configuration 
+   backup configuration
 
 =cut
 
@@ -1026,9 +1026,9 @@ sub backup_NTPconf
 
 #-----------------------------------------------------------------------------
 
-=head3 setup_SSH 
+=head3 setup_SSH
 
-    Sets up SSH default configuration for root  
+    Sets up SSH default configuration for root
 	Turns strict host checking off
 
 
@@ -1098,9 +1098,9 @@ sub setup_SSH
 
 #-----------------------------------------------------------------------------
 
-=head3 setup_TFTP 
+=head3 setup_TFTP
 
-    Sets up TFTP services  
+    Sets up TFTP services
 
 =cut
 
@@ -1299,7 +1299,7 @@ sub setup_TFTP
 
 =head3 setup_HTTP
 
-    Sets up HTTP services on Service Node for Linux   
+    Sets up HTTP services on Service Node for Linux
 
 =cut
 
diff --git a/xCAT-server/lib/xcat/plugins/DBobjectdefs.pm b/xCAT-server/lib/xcat/plugins/DBobjectdefs.pm
index 81a0dc98f..aa6b43386 100755
--- a/xCAT-server/lib/xcat/plugins/DBobjectdefs.pm
+++ b/xCAT-server/lib/xcat/plugins/DBobjectdefs.pm
@@ -765,6 +765,14 @@ sub processArgs
                 #    then set noderange
                 if (($::command ne 'mkdef') && ($a =~ m/^\//))
                 {
+                    eval { /$a/ };
+                    if ($@)
+                    {
+                        my $rsp = {};
+                        $rsp->{data}->[0] = "Invalid regular expression $a, check the noderange syntax.";
+                        xCAT::MsgUtils->message("E", $rsp, $::callback);
+                        return 3;
+                    }
                     @::noderange = &noderange($a, 1); # Use the "verify" option to support regular expression
                 }
                 else
@@ -1564,11 +1572,11 @@ sub defmk
             unless(isobjnamevalid($node,$myobjtype)){
                $invalidobjname .= ",$node";
             }
-            if (((!$::opt_t) && (!$::FILEATTRS{$node}{'objtype'})) || ($::FILEATTRS{$node}{'objtype'} eq "node") || ($::opt_t eq "node")) { 
+            if (((!$::opt_t) && (!$::FILEATTRS{$node}{'objtype'})) || ($::FILEATTRS{$node}{'objtype'} eq "node") || ($::opt_t eq "node")) {
                 if($node =~ /[A-Z]/){
                     $invalidnodename .= ",$node";
                 }elsif($node =~ /\./){
-                    $nodewithdomain .= ",$node"; 
+                    $nodewithdomain .= ",$node";
                 }
             }
         }
@@ -2439,10 +2447,10 @@ sub defch
                 # the netname already exists
                 if ($isDefined)
                 {
-                    # when net is empty, chdef command should add net value, $::FINALATTRS{$obj}{net} should have value 
-                    if ((!$nethash{$o}{net}) && (!$::FINALATTRS{$obj}{net}))                
+                    # when net is empty, chdef command should add net value, $::FINALATTRS{$obj}{net} should have value
+                    if ((!$nethash{$o}{net}) && (!$::FINALATTRS{$obj}{net}))
                     {
-                        $isInvalid=1; 
+                        $isInvalid=1;
                         my $rsp;
                         $rsp->{data}->[0] = "Attribute \'net\' is not specified for network entry \'$obj\', skipping.";
                         xCAT::MsgUtils->message("E", $rsp, $::callback);
@@ -2460,10 +2468,10 @@ sub defch
                          last;
                      }
                 }
-                # the netname does not exist 
+                # the netname does not exist
                 else {
                      # there is a network definition already contains the same net and mask, it is duplicate
-                     if (($nethash{$o}{net} eq $::FINALATTRS{$obj}{net}) && ($nethash{$o}{mask} eq $::FINALATTRS{$obj}{mask})) 
+                     if (($nethash{$o}{net} eq $::FINALATTRS{$obj}{net}) && ($nethash{$o}{mask} eq $::FINALATTRS{$obj}{mask}))
                      {
                          $isInvalid=1;
                          my $rsp;
@@ -2472,7 +2480,7 @@ sub defch
                          $error = 1;
                          last;
                      }
- 
+
                 }
 
             }
@@ -3916,6 +3924,16 @@ sub defls
             # the object names are passed in through command line
             if ($::objectsfrom_args || $::opt_o || (($type eq 'node') && ($::opt_o || @::noderange)))
             {
+
+                eval { /$obj/ };
+                if ($@)
+                {
+                    my $rsp = {};
+                    $rsp->{data}->[0] = "Invalid \'$obj\' name, check the object named \'$obj\' of type \'$type\' syntax.";
+                    xCAT::MsgUtils->message("E", $rsp, $::callback);
+                    next;
+                }
+
                 if (!grep(/^$obj$/, @allobjoftype))
                 {
                     my $rsp;
@@ -4438,7 +4456,7 @@ sub defrm
                     push @allnodes, $single_object;
                 }
             }
-            # If cleaning up (issuing nodeset offline) for more than cleanup_msg_trigger node, 
+            # If cleaning up (issuing nodeset offline) for more than cleanup_msg_trigger node,
             # issue info message
             if (@allnodes > $cleanup_msg_trigger) {
                my $rsp;
@@ -4747,7 +4765,7 @@ sub initialize_variables
 #isobjnamevalid:
 #description: check whether the object name is valid
 #argument:
-#          $objname: the object name string 
+#          $objname: the object name string
 #          $objtype: the object type string
 #return:
 #          1: valid
@@ -4761,7 +4779,7 @@ sub isobjnamevalid{
     $options{genericrange}=1;
     $objtype="node" unless(defined $objtype and ($objtype ne ""));
     if($objtype eq "node"){
-        #the ip address as a valid node object name is a hack for p7IH support   
+        #the ip address as a valid node object name is a hack for p7IH support
         if(($objname !~ /^[a-zA-Z0-9-_]+$/) and !xCAT::NetworkUtils->isIpaddr($objname)){
             return 0;
         }
@@ -4769,7 +4787,7 @@ sub isobjnamevalid{
         my @tmpnodes=xCAT::NodeRange::noderange($objname,0,0,%options);
         if(scalar(@tmpnodes)>1 || $tmpnodes[0] ne $objname ){
            return 0;
-        }    
+        }
     }
     return 1;
 }
diff --git a/xCAT-server/lib/xcat/plugins/FIP.pm b/xCAT-server/lib/xcat/plugins/FIP.pm
index 7e52fd6f4..9b4efbe59 100644
--- a/xCAT-server/lib/xcat/plugins/FIP.pm
+++ b/xCAT-server/lib/xcat/plugins/FIP.pm
@@ -481,7 +481,7 @@ sub swapnodes
 
 #----------------------------------------------------------------------------
 
-=head3  swapnodes_usage 
+=head3  swapnodes_usage
 
         Arguments:
         Returns:
diff --git a/xCAT-server/lib/xcat/plugins/aixinstall.pm b/xCAT-server/lib/xcat/plugins/aixinstall.pm
index 4208109fe..99560a863 100644
--- a/xCAT-server/lib/xcat/plugins/aixinstall.pm
+++ b/xCAT-server/lib/xcat/plugins/aixinstall.pm
@@ -580,7 +580,7 @@ sub process_request
 
 #----------------------------------------------------------------------------
 
-=head3   nimnodeset 
+=head3   nimnodeset
 
         Support for the nimnodeset command.
 
@@ -1381,19 +1381,19 @@ sub nimnodeset
 #----------------------------------------------------------------------------
 
 =head3	spot_updates
-			Update a NIM SPOT resource on the NIM primary 
+			Update a NIM SPOT resource on the NIM primary
 
 		Arguments:
 		Returns:
 			0 - OK
 			1 - error
 
-		Error:   
+		Error:
 
 		Example:
 
 		Usage:
-	my $rc = 
+	my $rc =
 		&spot_updates($callback, $imagename, \%osimagehash, \%attrvals, $lpp_source, $subreq);
 
 		Comments:
@@ -2164,7 +2164,7 @@ sub chkosimage
 
 	Arguments:
 	Returns:
-		0 - OK 
+		0 - OK
 		1 - error
 	Globals:
 	Example:
@@ -2230,7 +2230,7 @@ sub clean_lpp
 
 =head3   mknimimage
 
-		Creates an AIX/NIM image 
+		Creates an AIX/NIM image
 
         Arguments:
         Returns:
@@ -2245,7 +2245,7 @@ sub clean_lpp
         Usage:
 
 		mknimimage [-V] [-f | --force] [-l location] [-s image_source]
-		   [-u |--update] [-i current_image] image_name 
+		   [-u |--update] [-i current_image] image_name
 			[attr=val [attr=val ...]]
 
 		Comments:
@@ -6678,14 +6678,14 @@ sub update_rhosts
 
 #-------------------------------------------------------------------------
 
-=head3   update_inittab  
-                                                                         
-   Description:  This function updates the /etc/inittab file. 
-                                                                         
-   Arguments:    None.                                                   
-                                                                         
-   Return Codes: 0 - All was successful.                                 
-                 1 - An error occured.                                   
+=head3   update_inittab
+
+   Description:  This function updates the /etc/inittab file.
+
+   Arguments:    None.
+
+   Return Codes: 0 - All was successful.
+                 1 - An error occured.
 =cut
 
 #------------------------------------------------------------------------
@@ -6796,7 +6796,7 @@ sub get_res_loc
 
 =head3  chkFSspace
 	
-	See if there is enough space in file systems. If not try to increase 
+	See if there is enough space in file systems. If not try to increase
 	the size.
 
         Arguments:
@@ -6939,7 +6939,7 @@ sub chkFS
 
 =head3  enoughspace
 
-        See if the NIM root resource has enough space to initialize 
+        See if the NIM root resource has enough space to initialize
 			another node.  If not try to add space to the FS.
 
         Arguments:
@@ -7078,7 +7078,7 @@ sub enoughspace
         Globals:
 
         Example:
-			$rc = &mkdumpres($res_name, \%attrs, $callback, $location, 
+			$rc = &mkdumpres($res_name, \%attrs, $callback, $location,
 				\%nimres);
 
         Comments:
@@ -7568,16 +7568,16 @@ sub update_dd_boot
 
         my $odmrestore = qq~\n
 	# xCAT basecust support #1
-	#  when using a shared_root we need to see if there is a persistent 
-	#		/etc/basecust file available.  If we have one we need to 
-	#		restore it.  This will restore anything previously 
+	#  when using a shared_root we need to see if there is a persistent
+	#		/etc/basecust file available.  If we have one we need to
+	#		restore it.  This will restore anything previously
 	#		saved in the ODM.
 	if [ -n "\${NIM_SHARED_ROOT}" ]
 	then
-		#  Get the name of the server and the name of the persistent 
+		#  Get the name of the server and the name of the persistent
 		#     directory to mount
 		#  - /mnt is the shared_root dir at this point
-		#  - the statelite.table file has entries like: 
+		#  - the statelite.table file has entries like:
 		#			"compute04|10.2.0.200|/nodedata"
 		if [ -f "/mnt/statelite.table" ]
 		then
@@ -7648,14 +7648,14 @@ qq~\n\t# xCAT support #3\n\tif [ -z "\$(odmget -qattribute=syscons CuAt)" ] \n\t
 
         my $basecustrm = qq~
         # xCAT basecust removal support #5
-        # Check if BASECUST_REMOVAL is specified, 
+        # Check if BASECUST_REMOVAL is specified,
         # if yes, then remove the specified device
         # This change will finally go into AIX NIM support
         [ -n "\${BASECUST_REMOVAL}" ] && {
             cp /SPOT/usr/sbin/rmdev /usr/sbin
             rmdev -l \${BASECUST_REMOVAL} -d
             rm -f /usr/sbin/rmdev
-        }    
+        }
     \n\n~;
 
         if (open(DDBOOT, "<$dd_boot_file_mn"))
@@ -8068,8 +8068,8 @@ sub prenimnodecust
 
         Arguments:
         Returns:
-                0 - OK 
-                1 - error 
+                0 - OK
+                1 - error
         Globals:
         Example:
         Comments:
@@ -8237,7 +8237,7 @@ sub nimnodecust
         Globals:
         Example:
         Comments:
-			- Gather info from the management node and/or the NIM 
+			- Gather info from the management node and/or the NIM
 			 	primary server and pass it along to the requests that
 			 	go to the service nodes.
 			- If needed, copy NIM files to the service nodes
@@ -9195,7 +9195,7 @@ sub tarNIMresources
 
 =head3   copyres
 
-        Copy NIM resource files/dirs to remote service nodes 
+        Copy NIM resource files/dirs to remote service nodes
 
         Arguments:
         Returns:
@@ -9641,7 +9641,7 @@ sub copyres2
         Copy NIM resource files/dirs to remote service nodes so they can be
            defined locally
 
-        Also 
+        Also
 			-copy /etc/hosts to make sure we have name res for nodes
             from SN
 			- copy /install/postscripts so we have the latest
@@ -13015,7 +13015,7 @@ qq~/usr/sbin/nim -Fo change -a routing$rtindex='master_net $nethash{$node}{gatew
 
 #----------------------------------------------------------------------------
 
-=head3   make_SN_resource 
+=head3   make_SN_resource
 
 		See if the required NIM resources are created on the local server.
 		
@@ -14448,7 +14448,7 @@ sub getNodesetStates
     Arguments:
         nodes -- node name.
     Returns:
-       nodesetstate 
+       nodesetstate
 
 =cut
 
@@ -14491,13 +14491,13 @@ sub getNodesetState
 				- on NIM primary only
 				- install the additional software specified in the NIM
 					installp_bundle resources
-				- install the additional software specified by the 
+				- install the additional software specified by the
 					fileset names
 				- use installp flags if specified
 				- uses bnds, filesets and flags from osimage def or
 					command line
    Arguments:
-		   
+		
    Returns:
 			0 - OK
 			1 - error
@@ -15130,7 +15130,7 @@ qq~/usr/sbin/lsnim -a location $spot_name | /usr/bin/grep location 2>/dev/null~;
 
 =head3   parse_installp_bundle
 
-	generate tmp files for installp filesets and RPMs separately 
+	generate tmp files for installp filesets and RPMs separately
 	based on NIM installp_bundles
 	
 	/tmp/tmp_installp, /tmp/tmp_rpm, /tmp/tmp_epkg
@@ -15366,7 +15366,7 @@ sub parse_otherpkgs
 
    Arguments:
    callback, source_dir, listfile, installp_flags, spotname, niprime, subreq
-		   
+		
    Returns:
 			0 - OK
 			1 - error
@@ -15442,7 +15442,7 @@ sub update_spot_installp
 
    Arguments:
    callback, source_dir, ref_rlist, rpm_flags, spotname, niprime, subreq
-		   
+		
    Returns:
 			0 - OK
 			1 - error
@@ -15609,7 +15609,7 @@ sub update_spot_rpm
 
    Arguments:
    callback, source_dir, $listfile, eflags, spotname, niprime, subreq
-		   
+		
    Returns:
 			0 - OK
 			1 - error
diff --git a/xCAT-server/lib/xcat/plugins/anaconda.pm b/xCAT-server/lib/xcat/plugins/anaconda.pm
index cc55830c2..eb19a6c96 100644
--- a/xCAT-server/lib/xcat/plugins/anaconda.pm
+++ b/xCAT-server/lib/xcat/plugins/anaconda.pm
@@ -342,7 +342,7 @@ sub mknetboot
                 if (!defined($::DISABLENODESETWARNING)) {    # set by AAsn.pm
                     xCAT::MsgUtils->report_node_error($callback, $node, "OS image name must be specified in nodetype.provmethod");
                     next;
-		}
+                    }
             }
 
             $osver      = $ent->{os};
@@ -368,7 +368,7 @@ sub mknetboot
                     $rootfstype = $ref1->{'rootfstype'};
                 }
             } else {
-                xCAT::MsgUtils->report_node_error($callback, $node, 
+                xCAT::MsgUtils->report_node_error($callback, $node,
                     qq{Cannot find the linux image called "$osver-$arch-$imgname-$profile", maybe you need to use the "nodeset <nr> osimage=<osimage name>" command to set the boot state}
                     );
                 next;
@@ -407,7 +407,7 @@ sub mknetboot
                     }
                 }
             } else {
-                xCAT::MsgUtils->report_node_error($callback, $node, 
+                xCAT::MsgUtils->report_node_error($callback, $node,
                     qq{Cannot find the linux image called "$osver-$arch-$imgname-$profile", maybe you need to use the "nodeset <nr> osimage=<osimage name>" command to set the boot state}
                     );
                 next;
@@ -423,19 +423,19 @@ sub mknetboot
 
         $platform = xCAT_plugin::anaconda::getplatform($osver);
         my $compressedrootimg=xCAT::SvrUtils->searchcompressedrootimg("$rootimgdir");
-        
-      
+
+
         # statelite images are not packed.
         if ($statelite) {
             unless (-r "$rootimgdir/kernel") {
-                xCAT::MsgUtils->report_node_error($callback, $node, 
+                xCAT::MsgUtils->report_node_error($callback, $node,
                     qq{Did you run "genimage" before running "liteimg"? kernel cannot be found at $rootimgdir/kernel on $myname}
                     );
                 next;
             }
             if (!-r "$rootimgdir/initrd-statelite.gz") {
                 if (!-r "$rootimgdir/initrd.gz") {
-                    xCAT::MsgUtils->report_node_error($callback, $node, 
+                    xCAT::MsgUtils->report_node_error($callback, $node,
                         qq{Did you run "genimage" before running "liteimg"? initrd.gz or initrd-statelite.gz cannot be found at $rootimgdir/initrd.gz on $myname}
                         );
                     next;
@@ -445,21 +445,21 @@ sub mknetboot
                 }
             }
             if ($rootfstype eq "ramdisk" and !-r "$rootimgdir/rootimg-statelite.gz") {
-                xCAT::MsgUtils->report_node_error($callback, $node, 
+                xCAT::MsgUtils->report_node_error($callback, $node,
                     qq{No packed image for platform $osver, architecture $arch and profile $profile, please run "liteimg" to create it.}
                     );
                 next;
             }
         } else {
             unless (-r "$rootimgdir/kernel") {
-                xCAT::MsgUtils->report_node_error($callback, $node, 
+                xCAT::MsgUtils->report_node_error($callback, $node,
                     qq{Did you run "genimage" before running "packimage"? kernel cannot be found at $rootimgdir/kernel on $myname}
                     );
                 next;
             }
             if (!-r "$rootimgdir/initrd-stateless.gz") {
                 if (!-r "$rootimgdir/initrd.gz") {
-                    xCAT::MsgUtils->report_node_error($callback, $node, 
+                    xCAT::MsgUtils->report_node_error($callback, $node,
                         qq{Did you run "genimage" before running "packimage"? kernel cannot be found at $rootimgdir/kernel on $myname}
                         );
                     next;
@@ -468,7 +468,7 @@ sub mknetboot
                 }
             }
             unless ( -f -r "$rootimgdir/$compressedrootimg") {
-                xCAT::MsgUtils->report_node_error($callback, $node, 
+                xCAT::MsgUtils->report_node_error($callback, $node,
                     "No packed image for platform $osver, architecture $arch, and profile $profile found at $rootimgdir/rootimg.gz or $rootimgdir/rootimg.sfs on $myname, please run packimage (e.g.  packimage -o $osver -p $profile -a $arch"
                     );
                 next;
@@ -566,7 +566,7 @@ sub mknetboot
             xCAT::MsgUtils->report_node_error($callback, $node, "Unable to determine or reasonably guess the image server for $node");
             next;
         }
- 
+
         my $imgsrvip;
         unless($imgsrv eq '!myipfn!' or xCAT::NetworkUtils->validate_ip($imgsrv)==0){
             # if imgsrv is hostname, convert it to ip address
@@ -1078,10 +1078,9 @@ sub mkinstall
                 if (!defined($::DISABLENODESETWARNING)) {    # set by AAsn.pm
                     xCAT::MsgUtils->report_node_error($callback, $node, "OS image name must be specified in nodetype.provmethod");
                     next;
-		}
+                    }
             }
 
-
             $os       = $ent->{os};
             $arch     = $ent->{arch};
             $profile  = $ent->{profile};
@@ -1163,7 +1162,7 @@ sub mkinstall
         }
 
         unless (-r "$tmplfile") {
-            xCAT::MsgUtils->report_node_error($callback, $node, 
+            xCAT::MsgUtils->report_node_error($callback, $node,
                 "No $platform kickstart template exists for " . $profile . " in directory $installroot/custom/install/$platform or $::XCATROOT/share/xcat/install/$platform"
                 );
             next;
@@ -1183,7 +1182,7 @@ sub mkinstall
                 if($myenv =~ /\s*(\S+)\s*=\s*(\S+)\s*/) {
                     $ENV{$1}=$2;
                 }
-            }           
+            }
         }
 
         if (-r "$tmplfile")
@@ -1820,7 +1819,7 @@ sub mksysclone
         my $kernpath;
         my $initrdpath;
         my $ramdisk_size = 200000;
-	 
+	
         if (
             -r "$tftpdir/xcat/genesis.kernel.$arch"
             and $kernpath = "$tftpdir/xcat/genesis.kernel.$arch"
@@ -2094,8 +2093,8 @@ sub copycd
             my @rhel_version = split / /, $desc;
             if (scalar @rhel_version > 5) {
                 $distname = "rhels" . $rhel_version[-1] . "-" . lc($rhel_version[4]);
-            } 
-            else { 
+            }
+            else {
                 $distname = "rhels" . $rhel_version[-1];
             }
             open($dinfo, $mntpath . "/.treeinfo");
diff --git a/xCAT-server/lib/xcat/plugins/bmcdiscover.pm b/xCAT-server/lib/xcat/plugins/bmcdiscover.pm
index d4ebeedb6..291ded928 100644
--- a/xCAT-server/lib/xcat/plugins/bmcdiscover.pm
+++ b/xCAT-server/lib/xcat/plugins/bmcdiscover.pm
@@ -103,7 +103,7 @@ sub preprocess_request {
         my @requests = ();
         foreach (split (/,/, $sns)) {
             my $reqcopy = {%$request};
-            $reqcopy->{'_xcatdest'} = $_;   
+            $reqcopy->{'_xcatdest'} = $_;
             $reqcopy->{'sn'} = $_;
             $reqcopy->{'dhcpservers'} = \@dhcpservers;
             $reqcopy->{_xcatpreprocessed}->[0] = 1;
@@ -281,9 +281,9 @@ sub bmcdiscovery_processargs {
     }
 
     ############################################
-    # Option -U and -P for bmc user and password 
+    # Option -U and -P for bmc user and password
     #
-    # Get the default bmc account from passwd table, 
+    # Get the default bmc account from passwd table,
     # this is only done for the discovery process
     ############################################
     ($bmc_user, $bmc_pass, $openbmc_user, $openbmc_pass) = bmcaccount_from_passwd();
@@ -311,7 +311,7 @@ sub bmcdiscovery_processargs {
     ######################################
     if (defined($::opt_R))
     {
-        # Option -c should not be used with -r 
+        # Option -c should not be used with -r
         if (defined($::opt_C)) {
             my $msg = "The 'check' and 'range' option cannot be used together.";
             my $rsp = {};
@@ -609,10 +609,10 @@ sub scan_process {
     my $mac_list;
     if (xCAT::Utils->version_cmp($nmap_version, "5.10") < 0) {
         $ip_list  = `echo -e "$ip_info_list" | grep \"appears to be up\" |cut -d ' ' -f2 |tr -s '\n' ' '`;
-        $mac_list = `echo -e "$ip_info_list" | grep -A1 up | grep "MAC Address" | cut -d ' ' -f3 | tr -s '\n' ' '`;  
+        $mac_list = `echo -e "$ip_info_list" | grep -A1 up | grep "MAC Address" | cut -d ' ' -f3 | tr -s '\n' ' '`;
     } else {
         $ip_list  = `echo -e "$ip_info_list" | grep -B1 up | grep "Nmap scan report" |cut -d ' ' -f5 | tr -s '\n' ' '`;
-        $mac_list = `echo -e "$ip_info_list" | grep -A1 up | grep "MAC Address" | cut -d ' ' -f3 | tr -s '\n' ' '`; 
+        $mac_list = `echo -e "$ip_info_list" | grep -A1 up | grep "MAC Address" | cut -d ' ' -f3 | tr -s '\n' ' '`;
     }
 
     my $live_ip  = split_comma_delim_str($ip_list);
@@ -691,7 +691,7 @@ sub scan_process {
                 my $bmcpassword;
                 $bmcusername = "-U $bmc_user" if ($bmc_user);
                 $bmcpassword = "-P $bmc_pass" if ($bmc_pass);
-                
+
                 my @mc_cmds = ("/opt/xcat/bin/ipmitool-xcat -I lanplus -H ${$live_ip}[$i] -P $openbmc_pass mc info -N 1 -R 1",
                               "/opt/xcat/bin/ipmitool-xcat -I lanplus -H ${$live_ip}[$i] $bmcusername $bmcpassword mc info -N 1 -R 1");
                 my $mc_info;
@@ -706,7 +706,7 @@ sub scan_process {
                         if ($1 eq $::P9_WITHERSPOON_MFG_ID and $2 eq $::P9_WITHERSPOON_PRODUCT_ID) {
                             bmcdiscovery_openbmc(${$live_ip}[$i], $opz, $opw, $request_command,$parent_fd);
                             $is_openbmc = 1;
-                            last; 
+                            last;
                         }
                     }
                 }
@@ -752,7 +752,7 @@ sub scan_process {
 =head3  format_stanza
       list the stanza format for node
     Arguments:
-      bmc ip 
+      bmc ip
     Returns:
       lists as stanza format for nodes
 =cut
@@ -813,10 +813,10 @@ sub write_to_xcatdb {
     my $request_command = shift;
     my $ret;
 
-    $ret = xCAT::Utils->runxcmd({ command => ['chdef'], 
-                                  arg => [ '-t', 'node', '-o', $node, "bmc=$bmcip", "cons=$mgt_type", 
-                                           "mgt=$mgt_type", "mtm=$bmcmtm", "serial=$bmcserial", 
-                                           "bmcusername=$bmcuser", "bmcpassword=$bmcpass", "nodetype=$nodetype", 
+    $ret = xCAT::Utils->runxcmd({ command => ['chdef'],
+                                  arg => [ '-t', 'node', '-o', $node, "bmc=$bmcip", "cons=$mgt_type",
+                                           "mgt=$mgt_type", "mtm=$bmcmtm", "serial=$bmcserial",
+                                           "bmcusername=$bmcuser", "bmcpassword=$bmcpass", "nodetype=$nodetype",
                                            "servicenode=$sn", "conserver=$conserver",
                                            "hwtype=$hwtype", "groups=all" ] },
                                   $request_command, -1, 1);
@@ -1103,7 +1103,7 @@ sub bmcdiscovery_ipmi {
             }
 
             $mtm = '' if ($mtm =~ /^0+$/);
-            $serial = '' if ($serial =~ /^0+$/); 
+            $serial = '' if ($serial =~ /^0+$/);
 
             unless (($mtm or $serial) or $ipmac{$ip}) {
                 xCAT::MsgUtils->message("W", { data => ["BMC Type/Model and/or Serial and MAC Address is unavailable for $ip"] }, $::CALLBACK);
@@ -1189,7 +1189,7 @@ sub bmcdiscovery_openbmc{
     my $url = "$http_protocol://$ip/$login_endpoint";
     my $login_request = HTTP::Request->new( 'POST', $url, $header, $data );
     my $login_response = $brower->request($login_request);
-    
+
     if ($login_response->is_success) {
         # attempt to find the system serial/model
         $url = "$http_protocol://$ip/$openbmc_project_url/$system_endpoint";
@@ -1212,16 +1212,16 @@ sub bmcdiscovery_openbmc{
         if (defined($response->{data})) {
             if (defined($response->{data}->{Model}) and defined($response->{data}->{SerialNumber})) {
                 $mtm = $response->{data}->{Model};
-                $serial = $response->{data}->{SerialNumber}; 
+                $serial = $response->{data}->{SerialNumber};
             }
- 
-        } else { 
+
+        } else {
             xCAT::MsgUtils->message("E", { data => ["Unable to connect to REST server at $ip"] }, $::CALLBACK);
             return;
         }
 
         # delete space before and after
-        $mtm =~ s/^\s+|\s+$|\.+//g; 
+        $mtm =~ s/^\s+|\s+$|\.+//g;
         $serial =~ s/^\s+|\s+$|\.+//g;
 
         $mtm = '' if ($mtm =~ /^0+$/);
diff --git a/xCAT-server/lib/xcat/plugins/conserver.pm b/xCAT-server/lib/xcat/plugins/conserver.pm
index aa4fc1d59..220b1b56d 100644
--- a/xCAT-server/lib/xcat/plugins/conserver.pm
+++ b/xCAT-server/lib/xcat/plugins/conserver.pm
@@ -119,7 +119,7 @@ sub preprocess_request {
         }
         return xCAT::Scope->get_broadcast_scope_with_parallel($request, \@sns);
     }
-   
+
     # get site master
     my $master = xCAT::TableUtils->get_site_Master();
     if (!$master) { $master = hostname(); }
@@ -209,6 +209,9 @@ sub process_request {
                 my $rsp->{data}->[0] = "goconserver is being used as the console service, did you mean: makegocons <noderange>? If not, stop goconserver and retry.";
                 xCAT::MsgUtils->message("E", $rsp, $cb);
                 return;
+            } else {
+                my $rsp->{data}->[0] = "makeconservercf is deprecrated as well as conserver, go to makegocons for more information about enabling goconserver.";
+                xCAT::MsgUtils->message("W", $rsp, $cb);
             }
             xCAT::Goconserver::switch_conserver($cb);
         }
@@ -442,7 +445,7 @@ sub makeconservercf {
         } else{
             $rsp->{data}->[0] = "Remove console entry for the nodes:".join(',', @$rmnodes);
         }
-        xCAT::MsgUtils->message("I", $rsp, $cb); 
+        xCAT::MsgUtils->message("I", $rsp, $cb);
     } else {    #no nodes specified, do em all up
         zapcfg(\@filecontent);    # strip all xCAT configured nodes from config
 
@@ -661,7 +664,7 @@ sub delete_undefined_nodes_entry {
             my $node = $1;
             unless (exists($allnodeshash->{$node})) {
                 $skip  = 1;
-                $skipnext = 1; 
+                $skipnext = 1;
                 push @rmnodes, $node;
                 print __LINE__."===== push node: $node==\n";
             }
diff --git a/xCAT-server/lib/xcat/plugins/copycds.pm b/xCAT-server/lib/xcat/plugins/copycds.pm
index 191334786..9fb75072b 100644
--- a/xCAT-server/lib/xcat/plugins/copycds.pm
+++ b/xCAT-server/lib/xcat/plugins/copycds.pm
@@ -172,12 +172,12 @@ sub process_request {
 
             if ($path)
             {
-                
+
                 if(-e $path) {
                     $path=Cwd::realpath($path);
                 }
                 unless((substr($path,0,length("/install/")) eq "/install/") or ($path eq "/install")){
-                    $callback->({ warning => "copycds: the specified path \"$path\" is not a subdirectory under /install. Make sure this path is configured for httpd/apache, otherwise, the provisioning with this iso will fail!" }); 
+                    $callback->({ warning => "copycds: the specified path \"$path\" is not a subdirectory under /install. Make sure this path is configured for httpd/apache, otherwise, the provisioning with this iso will fail!" });
                 }
                 push @{ $newreq->{arg} }, ("-p", $path);
             }
diff --git a/xCAT-server/lib/xcat/plugins/credentials.pm b/xCAT-server/lib/xcat/plugins/credentials.pm
index f046deaeb..1d266bf47 100644
--- a/xCAT-server/lib/xcat/plugins/credentials.pm
+++ b/xCAT-server/lib/xcat/plugins/credentials.pm
@@ -9,12 +9,12 @@
 
    This sounds horrible and most of the time it would be.  However, when dealing with unattended
    installs, it is better than nothing.  Apache does not appear to be able to give credence to
-   privileged ports vs. non-privileged ports on the client, so simple nfs-style authentication is 
+   privileged ports vs. non-privileged ports on the client, so simple nfs-style authentication is
    not possible.
 
    The problem with more secure methods and unattended installs is that all rely upon the client to
-   have a blessed credential, and giving that credential or blessing a credential I can't think of a 
-   way to feasibly do unattended truly securely, so here we try to mitigate the exposure and 
+   have a blessed credential, and giving that credential or blessing a credential I can't think of a
+   way to feasibly do unattended truly securely, so here we try to mitigate the exposure and
    implement nfs-like security (with the plus of encryption, hopefully)
 
    Supported command:
diff --git a/xCAT-server/lib/xcat/plugins/ddns.pm b/xCAT-server/lib/xcat/plugins/ddns.pm
index f7d575a38..229462157 100644
--- a/xCAT-server/lib/xcat/plugins/ddns.pm
+++ b/xCAT-server/lib/xcat/plugins/ddns.pm
@@ -600,7 +600,7 @@ sub process_request {
             my $rsp;
             push @{ $rsp->{data} }, "emptyzonesenable from xCAT site table should be yes or no.";
             xCAT::MsgUtils->message("E", $rsp, $callback);
-            return; 
+            return;
         }
     }
     my @slave_ips;
diff --git a/xCAT-server/lib/xcat/plugins/debian.pm b/xCAT-server/lib/xcat/plugins/debian.pm
index 370b270ad..7a2c894c3 100644
--- a/xCAT-server/lib/xcat/plugins/debian.pm
+++ b/xCAT-server/lib/xcat/plugins/debian.pm
@@ -770,7 +770,7 @@ sub mkinstall {
 
         if ($arch =~ /ppc64/i and !(-e "$pkgdir/install/netboot/initrd.gz") and
             !(-e "$pkgdir/install/netboot/ubuntu-installer/$darch/initrd.gz")) {
-            xCAT::MsgUtils->report_node_error($callback, $node, 
+            xCAT::MsgUtils->report_node_error($callback, $node,
                 "The network boot initrd.gz is not found in $pkgdir/install/netboot.  This is provided by Ubuntu, please download and retry."
                 );
             next;
diff --git a/xCAT-server/lib/xcat/plugins/destiny.pm b/xCAT-server/lib/xcat/plugins/destiny.pm
index fe83ef3ca..b82cac056 100755
--- a/xCAT-server/lib/xcat/plugins/destiny.pm
+++ b/xCAT-server/lib/xcat/plugins/destiny.pm
@@ -101,7 +101,7 @@ sub process_request {
 
 sub relay_response {
     my $resp = shift;
-    return unless ($resp); 
+    return unless ($resp);
 
     $callback->($resp);
     if ($resp and ($resp->{errorcode} and $resp->{errorcode}->[0]) or ($resp->{error} and $resp->{error}->[0])) {
@@ -148,7 +148,7 @@ sub setdestiny {
 
     if (@{ $req->{node} } == 0) {
         xCAT::MsgUtils->trace($verbose, "d", "destiny->setdestiny: no nodes left to process, we are done");
-        return; 
+        return;
     }
     my @nodes = @{ $req->{node} };
     my $bptab = xCAT::Table->new('bootparams', -create => 1);
@@ -261,7 +261,7 @@ sub setdestiny {
                 $callback->({ error => "invalid argument: \"$rawstate\"", errorcode => [1] });
                 return;
             }
- 
+
             if ($target =~ /:/) {
                 ($target, $action) = split ':', $target, 2;
             }
@@ -309,7 +309,7 @@ sub setdestiny {
                     my $nodearch = $2;
                     foreach (@{ $req->{node} }) {
                         if ($archentries->{$_}->[0]->{supportedarchs} and $archentries->{$_}->[0]->{supportedarchs} !~ /(^|,)$nodearch(\z|,)/) {
-                            xCAT::MsgUtils->report_node_error($callback, $_, 
+                            xCAT::MsgUtils->report_node_error($callback, $_,
                                 "Requested architecture " . $nodearch . " is not one of the architectures supported by $_  (per nodetype.supportedarchs, it supports " . $archentries->{$_}->[0]->{supportedarchs} . ")"
                                 );
                             $failurenodes{$_} = 1;
@@ -346,7 +346,7 @@ sub setdestiny {
                         return;
                     }
                 } else {
-                    $callback->({ errorcode => [1], error => "Cannot find the OS image $target on the osimage table.", errorabort => [1] });
+                    $callback->({ errorcode => [1], error => "Cannot find the OS image $target in the osimage table.", errorabort => [1] });
                     return;
                 }
 
@@ -427,7 +427,7 @@ sub setdestiny {
                                 }
                             } else {
                                 push(@{ $invalidosimghash->{$osimage}->{nodes} }, $tmpnode);
-                                $invalidosimghash->{$osimage}->{error}->[0] = "Cannot find the OS image $osimage on the osimage table";
+                                $invalidosimghash->{$osimage}->{error}->[0] = "Cannot find the OS image $osimage in the osimage table";
                                 next;
                             }
                         }
@@ -560,7 +560,7 @@ sub setdestiny {
                 }
                 if ($ntent and $ntent->{arch}) {
                     $nstates{$_} .= "-" . $ntent->{arch};
-                } else { 
+                } else {
                     xCAT::MsgUtils->report_node_error($callback, $_, "nodetype.arch not defined for $_.");
                     $failurenodes{$_} = 1;
                     next;
@@ -614,7 +614,7 @@ sub setdestiny {
                     my $cmd = "wget --spider --timeout 3 --tries=1 $path";
                     my @output = xCAT::Utils->runcmd("$cmd", -1);
                     unless (grep /^Remote file exists/, @output) {
-                        $callback->({ error => ["Cannot get $path with wget. Could you confirm it's downloadable by wget?"], errorcode => [1], errorabort => [1]});
+                        $callback->({ error => ["Cannot wget $path. Verify it's downloadable."], errorcode => [1], errorabort => [1]});
                         return;
                     }
                 } else {
@@ -659,15 +659,15 @@ sub setdestiny {
             if ($ent and $ent->{xcatmaster}) {
                 $master = $ent->{xcatmaster};
             }
-    
+
             #if node.xcatmaster not specified, take the ip address facing the node
             unless($master){
                 my @nxtsrvd = xCAT::NetworkUtils->my_ip_facing($_);
-                unless ($nxtsrvd[0]) { 
-                    $master = $nxtsrvd[1];                 
+                unless ($nxtsrvd[0]) {
+                    $master = $nxtsrvd[1];
                 }
             }
-            
+
             #the site.master takes the last precedence
             unless($master){
                 if (defined($master_entry)) {
@@ -940,12 +940,12 @@ sub getdestiny {
             if ($stat) {
                 if (exists($node_status{$stat})) {
                     push @{ $node_status{$stat} }, $node;
-                } else { 
+                } else {
                     $node_status{$stat} = [$node];
                 }
                 xCAT_monitoring::monitorctrl::setNodeStatusAttributes(\%node_status, 1);
             }
-            
+
             $callback->({ node => [ { name => [$node], data => ['standby'], destiny => ['standby'] } ] });
             return;
         }
diff --git a/xCAT-server/lib/xcat/plugins/dhcp.pm b/xCAT-server/lib/xcat/plugins/dhcp.pm
index 2084878a5..83c09ab6a 100644
--- a/xCAT-server/lib/xcat/plugins/dhcp.pm
+++ b/xCAT-server/lib/xcat/plugins/dhcp.pm
@@ -532,7 +532,7 @@ sub addnode
                 my $node_server = undef;
                 if ($nrent->{xcatmaster}) {
                     $node_server = $nrent->{xcatmaster};
-                } 
+                }
                 unless ($node_server) {
                     my @nxtsrvd = xCAT::NetworkUtils->my_ip_facing($node);
                     unless ($nxtsrvd[0]) { $nxtsrv = $nxtsrvd[1]; }
@@ -587,6 +587,7 @@ sub addnode
         );
         return;
     }
+
     my @macs = split(/\|/, $ent->{mac});
     my $mace;
     my $deflstaments = $lstatements;
@@ -603,6 +604,16 @@ sub addnode
             $hname = $node;
         }                                #Default to hostname equal to nodename
         unless ($mac) { next; }          #Skip corrupt format
+        if ($mac !~ /^[0-9a-fA-F]{2}(-[0-9a-fA-F]{2}){5}$|^[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}$/)
+        {
+            $callback->(
+                {
+                    error => ["Invalid mac address $mac for $node"],
+                    errorcode => [1]
+                }
+            );
+            next;
+        }
         my $ip = getipaddr($hname, OnlyV4 => 1);
         if ($hname eq '*NOIP*') {
             $hname = $node . "-noip" . $mac;
@@ -706,7 +717,7 @@ sub addnode
                             $lstatements = 'if substring (option vendor-class-identifier,0,11) = \"onie_vendor\" { option www-server = \"http://' . $nxtsrv . $mypkgdir . '\";}' . $lstatements;
                             $validpkgdir = 1;
                             last;
-                        } 
+                        }
                      }
                      unless ($validpkgdir) {
                         $callback->({ warning => ["osimage $provmethod pkgdir doesn't exists"]});
@@ -717,7 +728,7 @@ sub addnode
              } else {
                 $callback->({ warning => ["provmethod is not defined for $node"]});
              }
-         
+
         } elsif ($nrent and $nrent->{netboot} and $nrent->{netboot} eq 'nimol') {
             $lstatements = 'supersede server.filename=\"/vios/nodes/' . $node . '\";' . $lstatements;
         }
@@ -1280,7 +1291,7 @@ sub preprocess_request
         $req->{'node'} = \@nodes;
         $req->{_xcatpreprocessed}->[0] = 1;
         @requests = ({%$req}); #Start with a straight copy to reflect local instance
-        
+
         # if not localonly - get list of service nodes and create requests
         unless ($localonly || $hasHierarchy == 0) {
 
@@ -1709,7 +1720,7 @@ sub process_request
 
             #TODO: filter out multicast?  Don't know if multicast groups *can* appear in ip -6 route...
             #ignore link-local, global-local, junk, and routed networks
-            if (/^default/ or /^fe80::\/64/ or /^2002::\/64/ or /^unreachable/ or /^[^ ]+ via/) { 
+            if (/^default/ or /^fe80::\/64/ or /^2002::\/64/ or /^unreachable/ or /^[^ ]+ via/) {
                 next;
             }
             my @parts = split /\s+/;
@@ -2015,7 +2026,7 @@ sub process_request
          $callback->({ error => [ "above error fail to generate new dhcp configuration file, restore dhcp configuration file $dhcpconffile" ], errorcode => [1] });
          my $backupfile = $dhcpconffile.".xcatbak";
          rename("$backupfile", $dhcpconffile);
-         xCAT::MsgUtils->trace($verbose_on_off, "d", "dhcp: Restore dhcp configuration file to  $dhcpconffile"); 
+         xCAT::MsgUtils->trace($verbose_on_off, "d", "dhcp: Restore dhcp configuration file to  $dhcpconffile");
          exit 1;
     }
     foreach (@nrn6) {    #do the ipv6 networks
@@ -2386,7 +2397,7 @@ sub addnet6
             push @netent, "    option domain-search  $domainstring;\n";
         }
     }
-    
+
 
     my $nameservers = $netcfgs{$net}->{nameservers};
     if ($nameservers and $nameservers =~ /:/) {
@@ -2615,7 +2626,7 @@ sub addnet
                 );
             }
             if ($ent and $ent->{mtu})
-            {   
+            {
                 $mtu = $ent->{mtu};
             }
         }
diff --git a/xCAT-server/lib/xcat/plugins/docker.pm b/xCAT-server/lib/xcat/plugins/docker.pm
index 3118da70c..3c6d30cb9 100755
--- a/xCAT-server/lib/xcat/plugins/docker.pm
+++ b/xCAT-server/lib/xcat/plugins/docker.pm
@@ -48,7 +48,7 @@ my $async;
 
 #-------------------------------------------------------
 
-=head3  The hash variable to store node related http request id 
+=head3  The hash variable to store node related http request id
 
  The structure is like this
  %http_session_variable = (
@@ -70,7 +70,7 @@ my %http_session_variable = ();
      $node => {
          image=>$nodetype.provmethod,
          cmd=>$nodetype.provmethod,
-         ip=>$host.ip,    
+         ip=>$host.ip,
          nics=>$vm.vmnics,
          mac=>$mac.mac,
          cpu=>$vm.cpus
@@ -239,7 +239,7 @@ my %command_states = (
 
 #-------------------------------------------------------
 
-=head3 http_state_code_info 
+=head3 http_state_code_info
   The function to deal with http response code
   Input:
         $state_code: the http response code
@@ -250,7 +250,7 @@ my %command_states = (
   Usage example:
         http_state_code_info('304', "INIT_TO_WAIT_FOR_START_DONE") -> "Already started"
         http_state_code_info('304', "INIT_TO_WAIT_FOR_STOP_DONE") -> "Already stopped"
-=cut  
+=cut
 
 #-------------------------------------------------------
 
@@ -349,14 +349,14 @@ sub change_node_state {
   The state_machine_engine to deal with http response
   Input:
         $id: The http session id when adding HTTP request into HTTP::Async object
-        $data: The http response 
+        $data: The http response
   Return:
         If there are any errors or msg, they will be outputed directly.
         Else, nothing returned.
   Usage example:
         default_state_engine($id, HTTP Response data);
 
-=cut  
+=cut
 
 #-------------------------------------------------------
 
@@ -494,11 +494,11 @@ sub default_state_engine {
   Input:
         $array: The string array whose entires may have spaces
   Return:
-        A string that join the entries in input $array with space, 
+        A string that join the entries in input $array with space,
         for entries have spaces, they will be put in "'"
   Usage example:
 
-=cut  
+=cut
 
 #-------------------------------------------------------
 
@@ -530,7 +530,7 @@ sub deal_with_space_in_array_entry {
         docker_info_string in the format: $id $image $command $created $status $names;
   Usage example:
 
-=cut  
+=cut
 
 #-------------------------------------------------------
 
@@ -580,7 +580,7 @@ sub parse_docker_list_info {
         The number of response have received
   Usage example:
 
-=cut  
+=cut
 
 #-------------------------------------------------------
 
diff --git a/xCAT-server/lib/xcat/plugins/energy.pm b/xCAT-server/lib/xcat/plugins/energy.pm
index 9cacb4db0..6e170b9fb 100644
--- a/xCAT-server/lib/xcat/plugins/energy.pm
+++ b/xCAT-server/lib/xcat/plugins/energy.pm
@@ -4,7 +4,7 @@
 =head3  xCAT_plugin::energy
 
     This plugin module is used to handle the renergy command for:
-        FSP based Power 8 machine. 
+        FSP based Power 8 machine.
             1. mgt=fsp, mtm=(p8); 2. mgt=ipmi, arch=ppc64le;
 
 =cut
@@ -92,10 +92,10 @@ my %SET_ATTRS = (
         The request hash from preprocess_request or process_request
     RETURN
         First element: rc: 0 -success; 1 - fail
-        Second element: 
-            1. a string: a message for display; 
+        Second element:
+            1. a string: a message for display;
             2. a reference to a hash: {verbose}, {query_list} and {set_pair}.
-            
+
 =cut
 
 sub parse_args {
@@ -504,7 +504,7 @@ sub process_request {
     while (forward_data($callback, $sub_fds)) { }
 }
 
-=head3 send_rep 
+=head3 send_rep
 
     DESCRIPTION:
         Send date from forked child process to parent process.
@@ -522,7 +522,7 @@ sub send_rep {
     store_fd($resp, $parent_fd);
 }
 
-=head3 forward_data 
+=head3 forward_data
 
     DESCRIPTION:
         Receive data from forked child process and call the original $callback to forward data to xcat client
@@ -554,7 +554,7 @@ sub forward_data {
 }
 
 
-=head3 query_pum 
+=head3 query_pum
 
     DESCRIPTION:
         Query the attribute for instance of FipS_PUMService class
@@ -591,7 +591,7 @@ sub query_pum
     return ($ret, $pum, $namepath);
 }
 
-=head3 query_cec_drawer 
+=head3 query_cec_drawer
 
     DESCRIPTION:
         Query the attribute for instance of FipS_CECDrawer class
@@ -697,7 +697,7 @@ sub query_metric
 =head3 query_tmp
     DESCRIPTION:
         Require the input and output temperature
-=cut 
+=cut
 
 sub query_tmp
 {
@@ -707,7 +707,7 @@ sub query_tmp
 =head3 query_cpuspeed
     DESCRIPTION:
         Require the cpuspeed history
-=cut 
+=cut
 
 sub query_cpuspeed
 {
@@ -717,7 +717,7 @@ sub query_cpuspeed
 =head3 query_fanspeed
     DESCRIPTION:
         Require the fanspeed history
-=cut 
+=cut
 
 sub query_fanspeed
 {
@@ -727,7 +727,7 @@ sub query_fanspeed
 =head3 query_powermetric
     DESCRIPTION:
         Require the AC and DC power comsume history
-=cut 
+=cut
 
 sub query_powermetric
 {
@@ -760,15 +760,15 @@ sub query_powermetric
 
     DESCRIPTION:
         Handle the Query and Setting of Energy via CIM
-        
+
     ARGUMENTS:
         $request
         $callback
         $http_params - refer to the HTTP_PARAMS in xCAT::CIMUtils.pm
-        
+
     RETURN
         First element: rc: 0 -success; 1 - cim error; 10 - ip is not pingable; 11 - this ip is a standby fsp
-        
+
 =cut
 
 sub run_cim
diff --git a/xCAT-server/lib/xcat/plugins/genimage.pm b/xCAT-server/lib/xcat/plugins/genimage.pm
index 69d0c4c6d..0b97fec64 100644
--- a/xCAT-server/lib/xcat/plugins/genimage.pm
+++ b/xCAT-server/lib/xcat/plugins/genimage.pm
@@ -195,7 +195,8 @@ sub process_request {
         }
         $postinstall_filename = $ref_linuximage_tab->{'postinstall'};
         if ($postinstall_filename ne "") {
-            foreach my $file (split ',', $postinstall_filename) {
+            foreach my $rawfile (split ',', $postinstall_filename) {
+                my ($file,@args)=split(" ",$rawfile);
                 if (!-r $file) {
                     $callback->({ error => ["The postinstall_filename specified \'$file\' does not exist!"], errorcode => [1] });
                     return 1;
@@ -325,7 +326,7 @@ sub process_request {
     if ($pkglist)          { $cmd .= " --pkglist $pkglist"; }
     if ($srcdir_otherpkgs) { $cmd .= " --otherpkgdir \"$srcdir_otherpkgs\""; }
     if ($otherpkglist)     { $cmd .= " --otherpkglist $otherpkglist"; }
-    if ($postinstall_filename) { $cmd .= " --postinstall $postinstall_filename"; }
+    if ($postinstall_filename) { $cmd .= " --postinstall \"$postinstall_filename\""; }
     if ($destdir) { $cmd .= " --rootimgdir $destdir"; }
     if ($tempfile) {
         if (!$dryrun) { $cmd .= " --tempfile $tempfile"; }
diff --git a/xCAT-server/lib/xcat/plugins/geninitrd.pm b/xCAT-server/lib/xcat/plugins/geninitrd.pm
index 65059626d..14008dfe9 100644
--- a/xCAT-server/lib/xcat/plugins/geninitrd.pm
+++ b/xCAT-server/lib/xcat/plugins/geninitrd.pm
@@ -180,7 +180,7 @@ sub geninitrd {
     my $initrdpath;
     my $kernelpath;
     my $tftpdir = "/tftpboot";
-    my @entries = xCAT::TableUtils->get_site_attribute("$tftpdir");
+    my @entries = xCAT::TableUtils->get_site_attribute("tftpdir");
     my $t_entry = $entries[0];
     if (defined($t_entry)) {
         $tftpdir = $t_entry;
diff --git a/xCAT-server/lib/xcat/plugins/getpartition.pm b/xCAT-server/lib/xcat/plugins/getpartition.pm
index de136693e..42a651c54 100644
--- a/xCAT-server/lib/xcat/plugins/getpartition.pm
+++ b/xCAT-server/lib/xcat/plugins/getpartition.pm
@@ -5,7 +5,7 @@
   xCAT plugin package to handle getpartition command
   Generally, the getpartition command is called from the stateless
     node during the booting period to get the partition configureation
-    infomation to part the hard disk on the stateless node and to 
+    infomation to part the hard disk on the stateless node and to
     manage the local disk space for statelite and swap space.
 =cut
 
@@ -64,11 +64,11 @@ sub process_request
 
 #----------------------------------------------------------------------------
 
-=head3  
+=head3
 
     parseparition
-    
-        Description: Read the partition configuration file from 
+
+        Description: Read the partition configuration file from
           linuximage.partitionfile, parse the file and send back the partition
           parameters to the node.
         Arguments:
diff --git a/xCAT-server/lib/xcat/plugins/goconserver.pm b/xCAT-server/lib/xcat/plugins/goconserver.pm
index 226d819f9..283f2ffa7 100644
--- a/xCAT-server/lib/xcat/plugins/goconserver.pm
+++ b/xCAT-server/lib/xcat/plugins/goconserver.pm
@@ -252,4 +252,4 @@ sub makegocons {
     return 0;
 }
 
-1;
\ No newline at end of file
+1;
diff --git a/xCAT-server/lib/xcat/plugins/grub2.pm b/xCAT-server/lib/xcat/plugins/grub2.pm
index 828b1b031..b6692d07f 100644
--- a/xCAT-server/lib/xcat/plugins/grub2.pm
+++ b/xCAT-server/lib/xcat/plugins/grub2.pm
@@ -196,8 +196,8 @@ sub setstate {
 
         if($tftpserver eq "<xcatmaster>"){
             my @nxtsrvd = xCAT::NetworkUtils->my_ip_facing($node);
-            unless ($nxtsrvd[0]) { 
-                $serverip = $nxtsrvd[1]; 
+            unless ($nxtsrvd[0]) {
+                $serverip = $nxtsrvd[1];
             } else {
                 return (1, $nxtsrvd[1]);
             }
@@ -311,8 +311,8 @@ sub setstate {
         unlink("$bootloader_root/" . $pname);
         link("$bootloader_root/" . $node, "$bootloader_root/" . $pname) if ($cref->{currstate} ne "offline");
     }
- 
-    my $nodemac;   
+
+    my $nodemac;
     my $nrent=$nrhash{$node}->[0];
     if($nrent and $nrent->{installnic}){
         my $myinstallnic=$nrent->{installnic};
@@ -340,7 +340,7 @@ my $errored = 0;
 
 sub pass_along {
     my $resp = shift;
-    return unless ($resp); 
+    return unless ($resp);
 
     my $failure = 0;
     if ($resp->{errorabort}) { # Global error, it normally means to stop the parent execution. For example, DB operation error.
@@ -672,7 +672,7 @@ sub process_request {
                 arg      => \@args,
                 bootparams => \%bphash
                 }, \&pass_along);
-        if ($errored) { 
+        if ($errored) {
             xCAT::MsgUtils->trace($verbose_on_off, "d", "grub2: Failed in processing setdestiny.");
             return if ($errored > 1);
         }
@@ -793,7 +793,7 @@ sub process_request {
         nodes  --- a pointer to an array of nodes
         states -- a pointer to a hash table. This hash will be filled by this
              function.The key is the nodeset status and the value is a pointer
-             to an array of nodes.  
+             to an array of nodes.
     Returns:
        (return code, error message)
 =cut
diff --git a/xCAT-server/lib/xcat/plugins/hosts.pm b/xCAT-server/lib/xcat/plugins/hosts.pm
index 6853146bd..1eb234ab6 100755
--- a/xCAT-server/lib/xcat/plugins/hosts.pm
+++ b/xCAT-server/lib/xcat/plugins/hosts.pm
@@ -165,7 +165,7 @@ sub build_line
         $longname  = "$node.$domain";
     }
 
-    # if shortname contains a dot then we have a bad syntax for name 
+    # if shortname contains a dot then we have a bad syntax for name
     if ($shortname =~ /\./) {
         my $rsp;
         push @{ $rsp->{data} }, "Invalid short node name \'$shortname\'. The short node name may not contain a dot. The short node name is considered to be anything preceeding the network domain name in the fully qualified node name \'$longname\'.\n";
@@ -201,7 +201,7 @@ sub addotherinterfaces
             {
                 $itf = $node . $itf;
             }
-            
+
             #lookup the domain for the ip address
             #if failed, use the domain passed in
             my ($mydomain,$mynet)=getIPdomain($ip);
@@ -573,7 +573,7 @@ sub writeout
 
 =head3    donics
 
-           Add the additional network interfaces for a list of nodes as 
+           Add the additional network interfaces for a list of nodes as
            indicated in the nics table
 
         Arguments:
diff --git a/xCAT-server/lib/xcat/plugins/imgport.pm b/xCAT-server/lib/xcat/plugins/imgport.pm
index 74a969904..8a8a9057e 100644
--- a/xCAT-server/lib/xcat/plugins/imgport.pm
+++ b/xCAT-server/lib/xcat/plugins/imgport.pm
@@ -793,7 +793,7 @@ sub look_for_file {
                   Current working directory
     Returns     : None
     Example     : make_bundle( $img_name, $dest, $remoteHost, $attrs, $callback, $cwd );
-    
+
 =cut
 
 #-------------------------------------------------------
@@ -1105,7 +1105,7 @@ sub make_bundle {
                   Remote host parameter from the command line
     Returns     : None
     Example     : extract_bundle( $request, $callback, $nodes, $new_profile, $remoteHost );
-    
+
 =cut
 
 #-------------------------------------------------------
diff --git a/xCAT-server/lib/xcat/plugins/ipmi.pm b/xCAT-server/lib/xcat/plugins/ipmi.pm
index 8f24926a4..05077b9df 100644
--- a/xCAT-server/lib/xcat/plugins/ipmi.pm
+++ b/xCAT-server/lib/xcat/plugins/ipmi.pm
@@ -51,6 +51,8 @@ my $xcatdebugmode = 0;
 my $IPMIXCAT  = "/opt/xcat/bin/ipmitool-xcat";
 my $NON_BLOCK = 1;
 my $BIG_DATA_MACHINE_MODELS = "8001-22C|9006-22C|5104-22C|8001-12C|9006-12C";
+my $PUPDATE_UPDATE_BMC=1;
+my $PUPDATE_UPDATE_PNOR=1;
 use constant RFLASH_LOG_DIR => "/var/log/xcat/rflash";
 if (-d RFLASH_LOG_DIR) {
     chmod 0700, RFLASH_LOG_DIR;
@@ -1733,7 +1735,7 @@ sub calc_ipmitool_version {
 #        verbose:  verbose output
 #        use_rc:   Some machines, like IBM Power S822LC for Big Data (Supermicro), do not return
 #                  a "00" ready string from calling ipmi raw command. Instead they return RC=0. This
-#                  flag if 1, tells the check_bmc_status_with_ipmitool() to check the RC 
+#                  flag if 1, tells the check_bmc_status_with_ipmitool() to check the RC
 #                  instead of "00" string. If set to 0, the "00" ready string is checked.
 #    Returns:
 #        1 when bmc is up
@@ -1867,6 +1869,20 @@ sub do_firmware_update {
     $ret = get_ipmitool_version(\$ipmitool_ver);
     exit $ret if $ret < 0;
 
+    # Update node status to indicate firmware update started
+    my $set_fw_update_status_func = sub {
+        my ($node, $callback) = @_;
+        my $status = "updating firmware";
+        my $nodelist_table = xCAT::Table->new('nodelist');
+        if (!$nodelist_table) {
+            xCAT::MsgUtils->message("S", "Unable to open nodelist table, denying");
+        } else {
+            $nodelist_table->setNodeAttribs($node, { status => $status });
+            $nodelist_table->close();
+        }
+        return;
+    };
+
     my $exit_with_error_func = sub {
         my ($node, $callback, $message) = @_;
         my $status = "failed to update firmware";
@@ -1926,7 +1942,10 @@ sub do_firmware_update {
     if ($bmc_password) {
         $pre_cmd = $pre_cmd . " -P $bmc_password";
     }
-    
+
+    #Update node status
+    $set_fw_update_status_func->($sessdata->{node}, $callback);
+
     # check for 8335-GTB Model Type to adjust buffer size
     my $buffer_size = "30000";
     my $cmd = $pre_cmd . " fru print 3";
@@ -1945,7 +1964,7 @@ sub do_firmware_update {
         use Getopt::Long;
         GetOptions('d:s' => \$directory_name);
     }
-    
+
     # check verbose, buffersize, and retry options
     for my $opt (@{$sessdata->{'extraargs'}}) {
         if ($opt =~ /-V{1,4}/) {
@@ -1980,9 +1999,9 @@ sub do_firmware_update {
         }
     }
 
-    # For IBM Power S822LC for Big Data (Supermicro) machines such as 
-    # P9 Boston (9006-22C, 9006-12C, 5104-22C) or P8 Briggs (8001-22C) 
-    # firmware update is done using pUpdate utility expected to be in the 
+    # For IBM Power S822LC for Big Data (Supermicro) machines such as
+    # P9 Boston (9006-22C, 9006-12C, 5104-22C) or P8 Briggs (8001-22C)
+    # firmware update is done using pUpdate utility expected to be in the
     # specified data directory along with the update files .bin for BMC or .pnor for Host
     if ($output =~ /$BIG_DATA_MACHINE_MODELS/) {
         # Verify valid data directory was specified
@@ -2046,8 +2065,8 @@ sub do_firmware_update {
             $exit_with_error_func->($sessdata->{node}, $callback,
                 "At least one update file (.bin or .pnor) needs to be in data directory $pUpdate_directory.");
         }
-
-        # All checks are done, run pUpdate utility on each of the update files found in 
+        xCAT::MsgUtils->message("S", "The PUPDATE options: UPDATE_BMC=$PUPDATE_UPDATE_BMC and UPDATE_PNOR=$PUPDATE_UPDATE_PNOR");
+        # All checks are done, run pUpdate utility on each of the update files found in
         # the specified data directory
         xCAT::SvrUtils::sendmsg("rflash started, Please wait...", $callback, $sessdata->{node});
 
@@ -2067,7 +2086,7 @@ sub do_firmware_update {
         }
 
         # step 2 update BMC file or Host file, or both
-        if ($bmc_file) {
+        if ($bmc_file and $PUPDATE_UPDATE_BMC) {
             # BMC file was found in data directory, run update with it
             my $pUpdate_bmc_cmd = "$pUpdate_directory/pUpdate -f $bmc_file -i lan -h $bmc_addr -u $bmc_userid -p $bmc_password >".$rflash_log_file." 2>&1";
             if ($verbose) {
@@ -2081,7 +2100,7 @@ sub do_firmware_update {
                     "Error running command $pUpdate_bmc_cmd");
             }
             # Wait for BMC to reboot before continuing to next step.
-            # Since this is a IBM Power S822LC for Big Data (Supermicro) machine, use RC to check if ready 
+            # Since this is a IBM Power S822LC for Big Data (Supermicro) machine, use RC to check if ready
             unless (check_bmc_status_with_ipmitool($pre_cmd, 5, 60, 10, $sessdata, $verbose, 1)) {
                 $exit_with_error_func->($sessdata->{node}, $callback,
                 "Timeout to check the bmc status");
@@ -2089,7 +2108,7 @@ sub do_firmware_update {
         }
 
 
-        if ($pnor_file) {
+        if ($pnor_file and $PUPDATE_UPDATE_PNOR) {
             # Host file was found in data directory, run update with it
             my $pUpdate_pnor_cmd = "$pUpdate_directory/pUpdate -pnor $pnor_file -i lan -h $bmc_addr -u $bmc_userid -p $bmc_password >>".$rflash_log_file." 2>&1";
             if ($verbose) {
@@ -2208,8 +2227,8 @@ sub do_firmware_update {
     }
 
     if ($is_firestone and $firestone_update_version and
-        (($firestone_update_version eq "820" and $htm_update_version eq "810") or 
-         ($firestone_update_version eq "810" and $htm_update_version eq "820")) 
+        (($firestone_update_version eq "820" and $htm_update_version eq "810") or
+         ($firestone_update_version eq "810" and $htm_update_version eq "820"))
        ) {
         xCAT::SvrUtils::sendmsg("rflash started, Please wait...", $callback, $sessdata->{node}, %allerrornodes);
         $retry = 0; # No retry support for 3 step update process
@@ -2257,9 +2276,9 @@ RETRY_UPGRADE:
     # step 4 upgrade firmware
     # For firestone machines if updating from 810 to 820 version or from 820 to 810,
     # extra steps are needed. Hanled in "if" block, "else" block is normal update in a single step.
-    if ($is_firestone and 
-        (($firestone_update_version eq "820" and $htm_update_version eq "810") or 
-         ($firestone_update_version eq "810" and $htm_update_version eq "820")) 
+    if ($is_firestone and
+        (($firestone_update_version eq "820" and $htm_update_version eq "810") or
+         ($firestone_update_version eq "810" and $htm_update_version eq "820"))
        ) {
 
         # Step 4.1
@@ -2346,7 +2365,7 @@ RETRY_UPGRADE:
         }
 
         $output = xCAT::Utils->runcmd($cmd, -1);
-        # if upgrade command failed and we exausted number of retries 
+        # if upgrade command failed and we exausted number of retries
         # report an error, exit to the caller and leave node in powered off state
         # otherwise report an error, power on the node  and try upgrade again
         if ($::RUNCMD_RC != 0) {
@@ -2364,8 +2383,8 @@ RETRY_UPGRADE:
                 # Error upgrading, set a flag to attempt a retry
                 xCAT::SvrUtils::sendmsg("Running attempt $retry of ipmitool command $cmd failed with rc=$::RUNCMD_RC and the following error messages:\n$output\nSee the $rflash_log_file for details.", $callback, $sessdata->{node}, %allerrornodes);
                 $failed_upgrade = 1;
-            
-            } 
+
+            }
         }
     }
 
@@ -2399,14 +2418,14 @@ RETRY_UPGRADE:
             $retry--;   # decrement number of retries left
             # Yes, it is a goto statement here. Ugly, but removes the need to restructure
             # the above block of code.
-            goto RETRY_UPGRADE; 
+            goto RETRY_UPGRADE;
         }
         else {
             # After 10 min of waiting node has not rebooted. Give up retrying.
             $exit_with_error_func->($sessdata->{node}, $callback,
                 "Giving up waiting for the node to reboot. No further retries will be attempted.");
         }
-        
+
     }
     else {
         $exit_with_success_func->($sessdata->{node}, $callback,
@@ -2595,16 +2614,6 @@ sub start_rflash_processes {
     foreach (@donargs) {
         do_rflash_process($_->[0], $_->[1], $_->[2], $_->[3], $_->[4],
             $ipmitimeout, $ipmitrys, $command, -args => \@exargs);
-        $rflash_status->{$_->[0]}->{status} = "updating firmware";
-    }
-    if (!grep(/^(-c|--check)$/i, @exargs)) {
-        my $nodelist_table = xCAT::Table->new('nodelist');
-        if (!$nodelist_table) {
-            xCAT::MsgUtils->message("S", "Unable to open nodelist table, denying");
-        } else {
-            $nodelist_table->setNodesAttribs($rflash_status);
-            $nodelist_table->close();
-        }
     }
 
     # Wait for all processes to end
@@ -2749,7 +2758,7 @@ sub reseat_node {
         my $nodepass = $authdata->{$fpc}->{password};
         $sessdata->{slotnumber} = $mpent->{id};
 	if (exists $fpcsessions{$mpent->{mpa}}) {
-            $sessdata->{fpcipmisession} = $fpcsessions{$mpent->{mpa}}; 
+            $sessdata->{fpcipmisession} = $fpcsessions{$mpent->{mpa}};
 	    until ($sessdata->{fpcipmisession}->{logged}) {
                 $sessdata->{fpcipmisession}->waitforrsp(timeout=>1);
             }
@@ -3908,7 +3917,7 @@ sub initfru_zero {
         if ($_->{encoding} == 3) {
             $fru->value($_->{value});
         } else {
-            next; 
+            next;
 
             #print Dumper($_);
             #print $_->{encoding};
@@ -3932,11 +3941,11 @@ sub initfru_zero {
                 }
                 my $fru_id = $sdr->sensor_number;
                 if (defined($fruids_hash{$fru_id})) {
-                    $sessdata->{sdr_info_for_openpower}->{$fru_id} = $sdr; 
+                    $sessdata->{sdr_info_for_openpower}->{$fru_id} = $sdr;
                 }
             }
             $sessdata->{currfruid} = shift @{$sessdata->{frus_for_openpower}};
-            $sessdata->{currfrusdr} = $sessdata->{sdr_info_for_openpower}->{$sessdata->{currfruid}}; 
+            $sessdata->{currfrusdr} = $sessdata->{sdr_info_for_openpower}->{$sessdata->{currfruid}};
             $sessdata->{ipmisession}->subcmd(netfn => 0xa, command => 0x10, data => [ $sessdata->{currfruid} ], callback => \&process_currfruid, callback_args => $sessdata);
             return;
         }
@@ -4259,12 +4268,12 @@ sub add_fruhash {
     if ($sessdata->{skipotherfru}) {
         if (scalar @{$sessdata->{frus_for_openpower}}) {
             $sessdata->{currfruid} = shift @{$sessdata->{frus_for_openpower}};
-            $sessdata->{currfrusdr} = $sessdata->{sdr_info_for_openpower}->{$sessdata->{currfruid}}; 
+            $sessdata->{currfrusdr} = $sessdata->{sdr_info_for_openpower}->{$sessdata->{currfruid}};
             $sessdata->{ipmisession}->subcmd(netfn => 0xa, command => 0x10, data => [ $sessdata->{currfruid} ], callback => \&process_currfruid, callback_args => $sessdata);
             return;
         }
         fru_initted($sessdata);
-        return; 
+        return;
     }
 
     if (scalar @{ $sessdata->{dimmfru} }) {
@@ -8840,7 +8849,26 @@ sub process_request {
     my $extrargs  = $request->{arg};
     my @exargs    = ($request->{arg});
     $::cwd = $request->{cwd}->[0];
-
+    my $env_xcat_pupdate_bmc = 0;
+    my $env_xcat_pupdate_pnor = 0;
+    my $env = $request->{environment};
+    if (ref($env) eq 'ARRAY') {
+        if (ref($env->[0]->{XCAT_PUPDATE_BMC}) eq 'ARRAY') {
+            $env_xcat_pupdate_bmc = 1;
+        }
+        if (ref($env->[0]->{XCAT_PUPDATE_PNOR}) eq 'ARRAY') {
+            $env_xcat_pupdate_pnor = 1;
+        }
+    }
+    # update PNOR only, when XCAT_PUPDATE_PNOR specified and XCAT_PUPDATE_BMC not specified
+    if ($env_xcat_pupdate_pnor and !$env_xcat_pupdate_bmc) {
+        $PUPDATE_UPDATE_BMC = 0;
+    }
+    # update BMC only, when XCAT_PUPDATE_BMC specified and XCAT_PUPDATE_PNOR not specified
+    if ($env_xcat_pupdate_bmc and !$env_xcat_pupdate_pnor) {
+        $PUPDATE_UPDATE_PNOR = 0;
+    }
+    # for both XCAT_PUPDATE_BMC and XCAT_PUPDATE_PNOR are specified or not specified, shall update both
     if (ref($extrargs)) {
         @exargs = @$extrargs;
     }
diff --git a/xCAT-server/lib/xcat/plugins/kit.pm b/xCAT-server/lib/xcat/plugins/kit.pm
index 649d67d81..2b1a0d6c4 100644
--- a/xCAT-server/lib/xcat/plugins/kit.pm
+++ b/xCAT-server/lib/xcat/plugins/kit.pm
@@ -136,7 +136,7 @@ sub process_request
 
 =head3  get_highest_version
 
-  Return the highest version and release for a list of 
+  Return the highest version and release for a list of
   kit, kitrepo, or kitcomponent names.
 
   Input: @entries: the arrary contains all the data
@@ -174,7 +174,7 @@ sub get_highest_version
 
   Compare the version and release between two kit/kitrepo/kitcomp
 
-  Input: $highest: the current highest version or release 
+  Input: $highest: the current highest version or release
          $entry: the new entry
          $key: the key name in entries hash.
          $version: compare version nums.
@@ -359,7 +359,7 @@ sub check_newinstall
 =head3 get local otherpkgdir
 
   otherpkgdir can be mixed http source and local dir
-  Split otherpkgdir 
+  Split otherpkgdir
   get local otherpkgdir
 
 =cut
@@ -1137,7 +1137,7 @@ sub read_kit_config
 
 #-------------------------------------------------------
 
-=head3 addkit 
+=head3 addkit
 
   Add Kits into xCAT
 
@@ -1918,7 +1918,7 @@ sub validate_os {
 
 =head3 addkitcomp
 
-  Assign Kit component to osimage 
+  Assign Kit component to osimage
 
 =cut
 
@@ -2472,7 +2472,7 @@ sub addkitcomp
 
 =head3 rmkitcomp
 
-  Remove Kit component from osimage 
+  Remove Kit component from osimage
 
 =cut
 
@@ -3396,7 +3396,7 @@ sub rmkitcomp
 
 #-------------------------------------------------------
 
-=head3  chkkitcomp 
+=head3  chkkitcomp
 
     Check if the kit components fits to osimage
 
@@ -4126,7 +4126,7 @@ sub ensure_kitname_attr_in_list {
 
 =head3  check_attr_names_exist
 
-        Check if list of DB attribute names exist in a table 
+        Check if list of DB attribute names exist in a table
         Arguments:  a table name
                     a list of attribute names to check (ref)
         Returns:
@@ -4165,7 +4165,7 @@ sub check_attr_names_exist {
 =head3  check_attr_values_exist
 
         Check if a list of DB attribute values exist
-        Arguments:  
+        Arguments:
                 table name
                 table attribute
                 table attribute desc (e.g. kit names), this string is added to error message
@@ -4860,7 +4860,7 @@ sub lskitdeployparam {
 =head3  get_kit_hash
 
         Returns a hash table containing kit entries indexed by kit name.
-        Arguments: 
+        Arguments:
             list of kit names (ref)
             list of kit attribute names (ref)
         Returns: hash table (ref)
@@ -4897,9 +4897,9 @@ sub get_kit_hash {
 
 =head3  get_kitrepo_hash
 
-        Returns a hash table containing lists of kit repository entries 
+        Returns a hash table containing lists of kit repository entries
         indexed by kit name.
-        Arguments: 
+        Arguments:
             list of kit names (ref)
             list of kit repo attribute names (ref)
         Returns: hash table (ref)
@@ -4936,13 +4936,13 @@ sub get_kitrepo_hash {
 
 =head3  get_kitcomp_hash
 
-        Returns a hash table containing lists of kit component entries 
+        Returns a hash table containing lists of kit component entries
         indexed by kit name.
-        Arguments: 
+        Arguments:
             list of kit names (ref)
             list of kit component attribute names (ref)
         Returns: hash table (ref)
-           { kitname1 => [{kitcomp11,...},{kitcomp12,...}], 
+           { kitname1 => [{kitcomp11,...},{kitcomp12,...}],
              kitname2 => [{kitcomp21,...},{kitcomp22,...}],
              ...
            }
@@ -5129,8 +5129,8 @@ sub get_compat_kitreponames {
 
         Returns a SQL 'where' statement which is used to filter the
         result of a kit, kit repository or kit component query.
-        
-        Arguments: 
+
+        Arguments:
              hash table
                  - each entry represents a filter
                  - each entry has a key <keyN>, and a list of values <valuesN>.
@@ -5168,7 +5168,7 @@ sub db_build_filter_stmt {
 
         Returns a list of table rows.  Each table row is a hash table.
 
-        Arguments: 
+        Arguments:
                table name
                attribute list
                where statement
@@ -5213,7 +5213,7 @@ sub db_get_table_rows {
 
         Returns a hash table containing table rows indexed by specified
         table attribute.
-        Arguments: 
+        Arguments:
                list of table rows (each row is a hash table)
                table attribute
         Returns: hash table (ref)
@@ -5247,7 +5247,7 @@ sub create_hash_from_table_rows {
 
 =head3  create_lskit_xml_response
 
-        Prepare a response that returns the kit, kit repository, and 
+        Prepare a response that returns the kit, kit repository, and
         kit component info in XML format.
 
         Arguments:
@@ -5456,7 +5456,7 @@ sub create_lskitcomp_C_xml_response {
 
 =head3  create_lskit_stanza_response
 
-        Prepare a response that returns the kit, kit repository, and 
+        Prepare a response that returns the kit, kit repository, and
         kit component info in stanza-like format.
 
         Arguments:
diff --git a/xCAT-server/lib/xcat/plugins/kmodules.pm b/xCAT-server/lib/xcat/plugins/kmodules.pm
index d9344262a..2f5d49170 100644
--- a/xCAT-server/lib/xcat/plugins/kmodules.pm
+++ b/xCAT-server/lib/xcat/plugins/kmodules.pm
@@ -34,7 +34,7 @@ use warnings;
 
 #------------------------------------------------------------------------------
 
-=head1    kmodules   
+=head1    kmodules
 
 This program module file performs kernel module functions
 
@@ -173,7 +173,7 @@ sub lskmodules_usage {
 
 =head3   processArgs
 
-        Process the command line 
+        Process the command line
 
         Arguments:
 
@@ -660,7 +660,7 @@ sub mods_in_rpm {
 
 =head3  mods_in_img
 
-        return hash of module names/descriptions found in 
+        return hash of module names/descriptions found in
            driver update image
 
         Arguments:
diff --git a/xCAT-server/lib/xcat/plugins/kvm.pm b/xCAT-server/lib/xcat/plugins/kvm.pm
index c8bc03a1f..c46d0553a 100755
--- a/xCAT-server/lib/xcat/plugins/kvm.pm
+++ b/xCAT-server/lib/xcat/plugins/kvm.pm
@@ -1791,15 +1791,15 @@ sub rmvm {
             my @driver = $disk->parentNode()->findnodes("driver");
             unless ($driver[0]) { next; }
             my $drivertype = $driver[0]->getAttribute("type");
-            if (($drivertype eq "raw") || ($disktype eq "block")) { 
+            if (($drivertype eq "raw") || ($disktype eq "block")) {
                 #For raw or block devices, do not remove, even if purge was specified. Log info message.
                 xCAT::MsgUtils->trace(0, "i", "Not purging raw or block storage device: $disk");
-                next; 
+                next;
             }
             my $file = $disk->getAttribute("file");
-            unless ($file) { 
+            unless ($file) {
                 xCAT::MsgUtils->trace(0, "w", "Not able to find 'file' attribute value for: $disk");
-                next; 
+                next;
             }
 
             # try to check the existence first, if cannot find, do nothing.
@@ -1927,11 +1927,11 @@ sub chvm {
         }
     }
 
-    # The function get_multiple_paths_by_url() is used to polulate useddisks hash, 
+    # The function get_multiple_paths_by_url() is used to polulate useddisks hash,
     # but it only returns disk volumes from kvm host.
     # cdrom is not returned by get_multiple_paths_by_url() but is defined as a disk device
     # in xml definition of the VM.
-    # We add cdrom entry to useddisks hash to make sure the device name used by cdrom is not 
+    # We add cdrom entry to useddisks hash to make sure the device name used by cdrom is not
     # selected for the new disk about to be added (chvm -a)
     my @cdrom_names = get_cdrom_device_names($vmxml);
     foreach my $cdrom_name (@cdrom_names) {
@@ -2625,24 +2625,24 @@ sub chvm {
 
 #######################################################################
 # get_disks_by_userspecs
-# Description: get the storage device info ( xml and source file ) of 
-#              the user specified disk devices 
-# Arguments:   
-#              $specs : ref to the user specified disk name list           
+# Description: get the storage device info ( xml and source file ) of
+#              the user specified disk devices
+# Arguments:
+#              $specs : ref to the user specified disk name list
 #              $xml   : the xml string of the domain
 #              $returnmoddedxml : switch on whether to prepend
 #              the domain xml with the user specified disk removed
-#              to the beginning of the return array  
+#              to the beginning of the return array
 # Return   :
-#              An array with the structure 
+#              An array with the structure
 #             [
-#              <domain xml>(optional: with the user specified disk removed, 
+#              <domain xml>(optional: with the user specified disk removed,
 #                           exist only if $returnmoddedxml specified),
 #              [<the disk device xml>, <the source file of the disk device>],
 #              [<the disk device xml>, <the source file of the disk device>],
 #              ...
 #             ]
-# Example  :   
+# Example  :
 #             1. my @disklist = get_disks_by_userspecs(\@diskname, $vmxml, 'returnmoddedxml');
 #                my $moddedxml = shift @disklist;
 #             2. my @disklist = get_disks_by_userspecs(\@diskname, $vmxml)
@@ -3184,7 +3184,7 @@ sub power {
                 };
                 if($@){
                     return (1, "Error: $@");
-                }               
+                }
                 $allnodestatus{$node} = $::STATUS_POWERING_OFF;
             }
             undef $dom;
@@ -3562,21 +3562,21 @@ sub lsvm {
                     my $state =  $domain_info->{"state"};
                     my $state_string;
                     given($state) {
-                        when ($state == &Sys::Virt::Domain::STATE_NOSTATE) 
+                        when ($state == &Sys::Virt::Domain::STATE_NOSTATE)
                             {$state_string = "The domain is active, but is not running / blocked (eg idle)";}
-                        when ($state == &Sys::Virt::Domain::STATE_RUNNING) 
+                        when ($state == &Sys::Virt::Domain::STATE_RUNNING)
                             {$state_string = "The domain is active and running";}
-                        when ($state == &Sys::Virt::Domain::STATE_BLOCKED) 
+                        when ($state == &Sys::Virt::Domain::STATE_BLOCKED)
                             {$state_string = "The domain is active, but execution is blocked";}
-                        when ($state == &Sys::Virt::Domain::STATE_PAUSED) 
+                        when ($state == &Sys::Virt::Domain::STATE_PAUSED)
                             {$state_string = "The domain is active, but execution has been paused";}
-                        when ($state == &Sys::Virt::Domain::STATE_SHUTDOWN) 
+                        when ($state == &Sys::Virt::Domain::STATE_SHUTDOWN)
                             {$state_string = "The domain is active, but in the shutdown phase";}
-                        when ($state == &Sys::Virt::Domain::STATE_SHUTOFF) 
+                        when ($state == &Sys::Virt::Domain::STATE_SHUTOFF)
                             {$state_string = "The domain is inactive, and shut down";}
-                        when ($state == &Sys::Virt::Domain::STATE_CRUSHED) 
+                        when ($state == &Sys::Virt::Domain::STATE_CRUSHED)
                             {$state_string = "The domain is inactive, and crashed";}
-                        when ($state == &Sys::Virt::Domain::STATE_PMSUSPENDED) 
+                        when ($state == &Sys::Virt::Domain::STATE_PMSUSPENDED)
                             {$state_string = "The domain is active, but in power management suspend state";}
                         default {$state_string = "Unknown"};
                     }
@@ -3614,7 +3614,7 @@ sub lsvm {
             push @vms, $_->get_name();
         }
     }
-    # Check if we were able to get any data 
+    # Check if we were able to get any data
     unless (@vms) {
         push @vms, "Could not get any information about specified object";
     }
diff --git a/xCAT-server/lib/xcat/plugins/makeknownhosts.pm b/xCAT-server/lib/xcat/plugins/makeknownhosts.pm
index f5efe5390..f3a1281fe 100644
--- a/xCAT-server/lib/xcat/plugins/makeknownhosts.pm
+++ b/xCAT-server/lib/xcat/plugins/makeknownhosts.pm
@@ -2,10 +2,10 @@
 #-------------------------------------------------------
 
 =head1
-  xCAT plugin package to handle makeknownhosts 
+  xCAT plugin package to handle makeknownhosts
 
    Supported command:
-         makenownhosts-> makeknownhosts 
+         makenownhosts-> makeknownhosts
 
 =cut
 
@@ -43,7 +43,7 @@ sub handled_commands
 =head3  process_request
 
   Process the command
-  Get list of nodes and for each node, find all possible 
+  Get list of nodes and for each node, find all possible
   names and ipaddresses and add an entry into the users
   /.ssh knownhost file.
 
@@ -141,10 +141,10 @@ sub process_request
 
 #-------------------------------------------------------
 
-=head3  backup_known_hosts file 
+=head3  backup_known_hosts file
 
   Backs up the old known_hosts file in roots  .ssh directory,
-  if it exists. 
+  if it exists.
 
 =cut
 
@@ -189,9 +189,9 @@ sub backup_known_hosts_file
 
 #-------------------------------------------------------
 
-=head3  add_known_host 
+=head3  add_known_host
 
-  Adds entires to $ROOTHOME/.ssh/known_hosts file 
+  Adds entires to $ROOTHOME/.ssh/known_hosts file
 
 
 
diff --git a/xCAT-server/lib/xcat/plugins/makentp.pm b/xCAT-server/lib/xcat/plugins/makentp.pm
index 4e6f19a40..c05ef697c 100755
--- a/xCAT-server/lib/xcat/plugins/makentp.pm
+++ b/xCAT-server/lib/xcat/plugins/makentp.pm
@@ -149,7 +149,7 @@ sub parse_args {
 #--------------------------------------------------------------------------------
 
 =head3   preprocess_request
-      Parse the arguments and display the usage or the version string. 
+      Parse the arguments and display the usage or the version string.
 
 =cut
 
@@ -204,7 +204,7 @@ sub preprocess_request {
 
 =head3   process_request
     Pasrse the arguments and call the correspondent functions
-    to do switch discovery. 
+    to do switch discovery.
 
 =cut
 
@@ -234,6 +234,44 @@ sub process_request {
         send_msg(\%request, 0, "configuring service node: $nodename.");
     }
 
+    # get site.extntpservers for mn, for sn use mn as the server
+    my $ntp_servers;
+    my $ntp_master;
+    my $ntp_attrib;
+    if (xCAT::Utils->isMN()) {
+        $ntp_attrib = "extntpservers";
+    } else {
+        $ntp_attrib = "ntpservers";
+    }
+    my @entries     = xCAT::TableUtils->get_site_attribute($ntp_attrib);
+    my $ntp_servers = $entries[0];
+
+    if (!xCAT::Utils->isMN() && ((!$ntp_servers) ||
+        (($ntp_servers) && ($ntp_servers =~ /<xcatmaster>/)))) {
+        my $retdata = xCAT::ServiceNodeUtils->readSNInfo($nodename);
+        $ntp_servers = $retdata->{'master'};
+    }
+
+    # Handle chronyd here,
+    if (-f "/usr/sbin/chronyd") {
+        send_msg(\%request, 0, "Will configure chronyd instead.");
+
+        my $cmd = "/install/postscripts/setupntp " .
+            join(' ', split(',', $ntp_servers));
+        send_msg(\%request, 0, "Calling ... " . $cmd);
+
+        my $result = xCAT::Utils->runcmd($cmd, 0);
+        if ($::RUNCMD_RC != 0) {
+            send_msg(\%request, 1, "Error from command: $cmd\n    $result");
+            return 1;
+        }
+
+        send_msg(\%request, 0, "Daemon chronyd configured.");
+
+	# Cannot find a better way other than use goto statement :-/
+        goto HANDLE_MAKENTP_A;
+    }
+
     #check if ntp is installed or not
     if ($verbose) {
         send_msg(\%request, 0, " ...checking if nptd is installed.");
@@ -272,23 +310,6 @@ sub process_request {
         }
     }
 
-    # get site.extntpservers for mn, for sn use mn as the server
-    my $ntp_servers;
-    my $ntp_master;
-    my $ntp_attrib;
-    if (xCAT::Utils->isMN()) {
-        $ntp_attrib = "extntpservers";
-    } else {
-        $ntp_attrib = "ntpservers";
-    }
-    my @entries     = xCAT::TableUtils->get_site_attribute($ntp_attrib);
-    my $ntp_servers = $entries[0];
-
-    if (!xCAT::Utils->isMN() && ((!$ntp_servers) || (($ntp_servers) && ($ntp_servers =~ /<xcatmaster>/)))) {
-        my $retdata = xCAT::ServiceNodeUtils->readSNInfo($nodename);
-        $ntp_servers = $retdata->{'master'};
-    }
-
     if ($verbose) {
         send_msg(\%request, 0, " ...changing the ntp configuration file /etc/ntp.conf.\n    ntp servers are: $ntp_servers");
     }
@@ -455,6 +476,8 @@ sub process_request {
     }
     xCAT::Utils->enableservice($ntp_service);
 
+HANDLE_MAKENTP_A:
+
     #now handle sn that has ntpserver=1 set in servicenode table.
     # this part is called by makentp -a.
     if ($req->{_all}->[0] == 1) {
@@ -479,10 +502,7 @@ sub process_request {
         }
     }
 
-
     return;
 }
 
-
 1;
-
diff --git a/xCAT-server/lib/xcat/plugins/mknb.pm b/xCAT-server/lib/xcat/plugins/mknb.pm
index e1aef83c3..ae6ce4e53 100644
--- a/xCAT-server/lib/xcat/plugins/mknb.pm
+++ b/xCAT-server/lib/xcat/plugins/mknb.pm
@@ -45,7 +45,7 @@ sub process_request {
     if (defined($t_entry)) {
         $xcatdport = $t_entry;
     }
-    
+
     @entries = xCAT::TableUtils->get_site_attribute("dhcpinterfaces");
     $t_entry = $entries[0];
     if (defined($t_entry)) {
@@ -69,13 +69,13 @@ sub process_request {
             foreach (split /[,\s]+/, $dhcpif) {
                 my ($nicname, $flag) = split /:/;
                 if ($flag and $flag =~ /noboot/i) {
-                    $nobootnics{$nicname} = 1; 
+                    $nobootnics{$nicname} = 1;
                 }
             }
         }
         my $nicips = xCAT::NetworkUtils->get_nic_ip();
         foreach (keys %$nicips) {
-            # To support tagged vlan, create entries in the hash for the 
+            # To support tagged vlan, create entries in the hash for the
             # interface name removing the physical interface ending:
             # 'enP1p12s0f0.2@enP1p12s0f0' => 'enP1p12s0f0.2'
             if ($_ =~ "@") {
diff --git a/xCAT-server/lib/xcat/plugins/monctrlcmds.pm b/xCAT-server/lib/xcat/plugins/monctrlcmds.pm
index d0ce19910..29a7a18d9 100644
--- a/xCAT-server/lib/xcat/plugins/monctrlcmds.pm
+++ b/xCAT-server/lib/xcat/plugins/monctrlcmds.pm
@@ -61,7 +61,7 @@ sub handled_commands {
 
 =head3  preprocess_request
 
-  Check and setup for hierarchy 
+  Check and setup for hierarchy
 
 =cut
 
@@ -300,9 +300,9 @@ sub process_request {
       callback - the pointer to the callback function.
       args - The format of the args is:
         [-h|--help|-v|--version] or
-        name [noderange] [-r|--remote]        
+        name [noderange] [-r|--remote]
         where
-          name is the monitoring plug-in name. For example: rmcmon. 
+          name is the monitoring plug-in name. For example: rmcmon.
               The specified plug-in will be invoked for monitoring the xCAT cluster.
           noderange a range of nodes to be monitored. Default is all.
           -r|--remote indicates that both monservers and the nodes need to be called to start
@@ -457,7 +457,7 @@ sub preprocess_monstart
 
 =head3   monstart
         This function calls moniutoring control to start the monitoring and node
-    status monitoring for the given plug-in module. 
+    status monitoring for the given plug-in module.
     Arguments:
       request -- pointer to a hash with keys are command, module and nodestatmon.
       callback - the pointer to the callback function.
@@ -519,7 +519,7 @@ sub monstart {
         name [noderange] [-r|--remote]
         name
         where
-          name is the monitoring plug-in name. For example: rmcmon. 
+          name is the monitoring plug-in name. For example: rmcmon.
               The specified plug-in will be stopped for monitoring the xCAT cluster.
           noderange a range of nodes. Default is all.
           -r|--remote indicates that both monservers and the nodes need to be called to stop
@@ -668,7 +668,7 @@ sub preprocess_monstop
 
 =head3   monstop
         This function calls moniutoring control to stop the monitoring and node
-    status monitoring for the given plug-in module. 
+    status monitoring for the given plug-in module.
     Arguments:
       request -- pointer to a hash with keys are command, module and nodestatmon.
       callback - the pointer to the callback function.
@@ -725,12 +725,12 @@ sub monstop {
 #--------------------------------------------------------------------------------
 
 =head3   monls
-        This function list the monitoring plug-in module names, status and description. 
+        This function list the monitoring plug-in module names, status and description.
     Arguments:
       callback - the pointer to the callback function.
       args - The format of the args is:
         [-h|--help|-v|--version] or
-        [name] [-a|all] [-d|--description]         
+        [name] [-a|all] [-d|--description]
     Returns:
         0 for success. The output is returned through the callback pointer.
         1. for unsuccess. The error messages are returns through the callback pointer.
@@ -893,7 +893,7 @@ sub monls {
 
 =head3   getModuleDescription
         This function gets description, postscripts and other info from the
-     the given monitoring plug_in and stored it in the given hash. 
+     the given monitoring plug_in and stored it in the given hash.
     Arguments:
     Returns:
         0 for success.
@@ -942,20 +942,20 @@ sub getModuleDescription {
 =head3   monadd
         This function adds the given module name into the monitoring table and
      sets the postsctipts in the postsctipts table. It also sets the given
-     settings into the monsetting table. 
+     settings into the monsetting table.
     Arguments:
       request -- a hash table which contains the command name and the arguments.
       callback - the pointer to the callback function.
       args - The format of the args is:
         [-h|--help|-v|--version] or
-        name [-n|--nodestatmon] [-s|--settings ...]        
+        name [-n|--nodestatmon] [-s|--settings ...]
         where
-          name is the monitoring plug-in name. For example: rmcmon. 
-              The specified plug-in will be registered and invoked 
+          name is the monitoring plug-in name. For example: rmcmon.
+              The specified plug-in will be registered and invoked
               for monitoring the xCAT cluster.
           -n|--nodestatmon  indicates that this plug-in will be used for feeding the node liveness
-              status to the xCAT nodelist table.  If not specified, the plug-in will not be used 
-              for feeding node status to xCAT. 
+              status to the xCAT nodelist table.  If not specified, the plug-in will not be used
+              for feeding node status to xCAT.
           -s|--settings settings are used by the plug-in to customize it behavor.
     Returns:
         0 for success. The output is returned through the callback pointer.
@@ -1187,9 +1187,9 @@ sub monadd {
         [-h|--help|-v|--version] or
         name
         where
-          name is the monitoring plug-in name. For example: rmcmon. 
-              The specified plug-in will be stopped for monitoring the xCAT 
-              cluster if it is running and then removed from the monitoring table. 
+          name is the monitoring plug-in name. For example: rmcmon.
+              The specified plug-in will be stopped for monitoring the xCAT
+              cluster if it is running and then removed from the monitoring table.
     Returns:
         0 for success.
         1 for unsuccess. The error messages are returns through the callback pointer.
@@ -1372,9 +1372,9 @@ sub monrm {
       callback - the pointer to the callback function.
       args - The format of the args is:
         [-h|--help|-v|--version] or
-        name [noderange] [-r|--remote]        
+        name [noderange] [-r|--remote]
         where
-          name is the monitoring plug-in name. For example: rmcmon. 
+          name is the monitoring plug-in name. For example: rmcmon.
               The specified plug-in will be invoked for configuring the cluster to monitor the nodes.
           noderange a range of nodes to be configured for. Default is all.
           -r|--remote indicates that both monservers and the nodes need to configured.
@@ -1517,8 +1517,8 @@ sub preprocess_moncfg
 #--------------------------------------------------------------------------------
 
 =head3   moncfg
-      This function configures the cluster for the given nodes. It includes configuring 
-      and setting up the 3rd party monitoring software for monitoring the given nodes.  
+      This function configures the cluster for the given nodes. It includes configuring
+      and setting up the 3rd party monitoring software for monitoring the given nodes.
     Arguments:
       request -- a hash table which contains the command name and the arguments.
        callback -- the callback pointer for error and status displaying. It can be null.
@@ -1576,9 +1576,9 @@ sub moncfg
       callback - the pointer to the callback function.
       args - The format of the args is:
         [-h|--help|-v|--version] or
-        name [noderange] [-r|--remote]        
+        name [noderange] [-r|--remote]
         where
-          name is the monitoring plug-in name. For example: rmcmon. 
+          name is the monitoring plug-in name. For example: rmcmon.
               The specified plug-in will be invoked for deconfiguring the cluster to monitor the nodes.
           noderange a range of nodes to be deconfigured for. Default is all.
           -r|--remote indicates that both monservers and the nodes need to be deconfigured.
@@ -1721,17 +1721,17 @@ sub preprocess_mondecfg
 #--------------------------------------------------------------------------------
 
 =head3   mondecfg
-      This function deconfigures the cluster for the given nodes. It includes deconfiguring 
-      and clearning up the 3rd party monitoring software for monitoring the given nodes.  
+      This function deconfigures the cluster for the given nodes. It includes deconfiguring
+      and clearning up the 3rd party monitoring software for monitoring the given nodes.
     Arguments:
        names -- a pointer to an  array of monitoring plug-in names. If non is specified,
          all the plug-ins registered in the monitoring table will be notified.
-       p_nodes -- a pointer to an arrays of nodes to be removed from the monitoring domain. 
+       p_nodes -- a pointer to an arrays of nodes to be removed from the monitoring domain.
                   none means all.
        scope -- the action scope, it indicates the node type the action will take place.
-                0 means localhost only. 
-                1 means monserver only, 
-                2 means both monservers and nodes, 
+                0 means localhost only.
+                1 means monserver only,
+                2 means both monservers and nodes,
        callback -- the callback pointer for error and status displaying. It can be null.
     Returns:
         0 for success. The output is returned through the callback pointer.
@@ -1785,7 +1785,7 @@ sub mondecfg
       callback - the pointer to the callback function.
       args - The format of the args is:
         [-h|--help|-v|--version] or
-        name [noderange] [-s] [-t time] [-a attributes] [-w attr<operator>val [-w attr<operator>val] ...] [-o pe]        
+        name [noderange] [-s] [-t time] [-a attributes] [-w attr<operator>val [-w attr<operator>val] ...] [-o pe]
         where
           name is the monitoring plug-in name. For example: rmcmon. Only for rmcmon currently.
           noderange a range of nodes to be showed for. If omitted, the data for all the nodes will be displayed.
@@ -1973,7 +1973,7 @@ sub preprocess_monshow
 #--------------------------------------------------------------------------------
 
 =head3   monshow
-      This function configures the cluster performance for the given nodes.  
+      This function configures the cluster performance for the given nodes.
     Arguments:
       request -- a hash table which contains the command name and the arguments.
       callback -- the callback pointer for error and status displaying. It can be null.
diff --git a/xCAT-server/lib/xcat/plugins/networks.pm b/xCAT-server/lib/xcat/plugins/networks.pm
index 0c04b7cb1..f5018a8d6 100644
--- a/xCAT-server/lib/xcat/plugins/networks.pm
+++ b/xCAT-server/lib/xcat/plugins/networks.pm
@@ -120,7 +120,7 @@ sub process_request
 #----------------------------------------------------------------------------
 
 =head3  donets
-			Get network information and display or create xCAT network defs 
+			Get network information and display or create xCAT network defs
 
         Returns:
             0 - OK
@@ -358,7 +358,7 @@ sub donets
                         if ($foundmatch) {
                             next;
                         }
-                        
+
                         # add new network def
                         $nettab->setAttribs({ 'net' => $net, 'mask' => $netmask }, { 'netname' => $netname, 'gateway' => $gateway, 'mgtifname' => $i });
                     }
@@ -543,7 +543,7 @@ sub donets
                     push @{ $rsp->{data} }, "    mgtifname=$mgtifname";
                     if ($mtu)
                     {
-                        push @{ $rsp->{data} }, "    mtu=$mtu";                      
+                        push @{ $rsp->{data} }, "    mtu=$mtu";
                     }
                 } else {
                     # if this net entry exists, go to next line in networks table
diff --git a/xCAT-server/lib/xcat/plugins/nodediscover.pm b/xCAT-server/lib/xcat/plugins/nodediscover.pm
index 5b226da91..1ba0b1a16 100644
--- a/xCAT-server/lib/xcat/plugins/nodediscover.pm
+++ b/xCAT-server/lib/xcat/plugins/nodediscover.pm
@@ -236,9 +236,9 @@ sub process_request {
             $nrtab->setNodeAttribs($node, { netboot => 'petitboot' });
         } elsif ($request->{arch}->[0] =~ /ppc/ and $currboot !~ /yaboot/) {
             $nrtab->setNodeAttribs($node, { netboot => 'yaboot' });
-        } elsif($request->{arch}->[0] =~ /armv7l/ and $currboot !~ /onie/) { 
+        } elsif($request->{arch}->[0] =~ /armv7l/ and $currboot !~ /onie/) {
             #for onie switch, the netboot should be "onie"
-            $nrtab->setNodeAttribs($node, { netboot => 'onie' });  
+            $nrtab->setNodeAttribs($node, { netboot => 'onie' });
         }
     }
 
@@ -254,14 +254,14 @@ sub process_request {
                     $switchtype=$xCAT::data::switchinfo::global_switch_type{$1};
                 }
             }
-             
+
             if($switchtype){
                 $switchestab->setNodeAttribs($node,{ switchtype => $switchtype });
             }
             $switchestab->close();
         }
     }
-  
+
 
     my $macstring = "";
     if (defined($request->{mac})) {
@@ -319,7 +319,7 @@ sub process_request {
                     my $hosttag = gethosttag($node, $netn, @ifinfo[1], \%usednames);
                     unless ($hosttag) {
                         my $nettagname = $usednames_for_net{$netn};
-                        # For nics not in the install network, don't deal with them if not an avaliable hostname get 
+                        # For nics not in the install network, don't deal with them if not an available hostname get
                         # In case another nic in install network get a hosttag other than nodename, need to compare the IP address they can convert to
                         if ($nettagname and (inet_aton($nettagname) eq inet_aton($node))) {
                             $hosttag = "$node-$ifinfo[1]";
@@ -461,7 +461,7 @@ sub process_request {
     if (defined($request->{bmc_node}) and defined($request->{bmc_node}->[0])) {
         $bmc_node = $request->{bmc_node}->[0];
     }
-    
+
     if (-x "/usr/bin/goconserver") {
         xCAT::MsgUtils->message("S", "xcat.discovery.nodediscover: remove gocons session for $bmc_node");
         require xCAT::Goconserver;
@@ -496,7 +496,7 @@ sub process_request {
             }
         }
     }
-    
+
 
     my $restartstring = "restart";
     if (scalar @forcenics > 0) {
@@ -510,7 +510,7 @@ sub process_request {
         Timeout  => '1',
         Proto    => 'tcp'
     );
-    unless ($sock) { xCAT::MsgUtils->message("S", "xcat.discovery.nodediscover: Failed to notify $clientip that it's actually $node. $node has not been discovered."); return; }
+    unless ($sock) { xCAT::MsgUtils->message("S", "xcat.discovery.nodediscover: Failed to notify $clientip that it's actually $node. $node has not been discovered: $!"); return; }
     print $sock $restartstring;
     close($sock);
 
diff --git a/xCAT-server/lib/xcat/plugins/nodestat.pm b/xCAT-server/lib/xcat/plugins/nodestat.pm
index f50729423..e342109ec 100644
--- a/xCAT-server/lib/xcat/plugins/nodestat.pm
+++ b/xCAT-server/lib/xcat/plugins/nodestat.pm
@@ -111,7 +111,7 @@ sub getstat {
 
 =head3  preprocess_request
 
-  Check and setup for hierarchy 
+  Check and setup for hierarchy
 
 =cut
 
@@ -1241,7 +1241,7 @@ sub usage
     Arguments:
        none.
     Returns:
-       a hash that has settings from the monsetting table for node status and 
+       a hash that has settings from the monsetting table for node status and
        app status monitoring. For example:
        (  'APPS'=>[ll,gpfs],
           'll' =>
@@ -1304,15 +1304,15 @@ sub getStatusMonsettings {
     Arguments:
        nodelist--- an array of nodes
     Returns:
-       a hash pointer that has the node status and appstatus. The format is: 
+       a hash pointer that has the node status and appstatus. The format is:
           { node1=> {
                      status=>'active',appstatus=>'sshd=up,ll=up,gpfs=down'
-                   } , 
+                   } ,
             node2=> {
                      status=>'active',appstatus=>'sshd=up,ll=down,gpfs=down'
-                   } 
+                   }
            }
-           
+
 =cut
 
 #--------------------------------------------------------------------------------
diff --git a/xCAT-server/lib/xcat/plugins/notification.pm b/xCAT-server/lib/xcat/plugins/notification.pm
index ebe652a8f..75329eae5 100644
--- a/xCAT-server/lib/xcat/plugins/notification.pm
+++ b/xCAT-server/lib/xcat/plugins/notification.pm
@@ -16,7 +16,7 @@ use xCAT::NotifHandler;
 =head1  xCAT_plugin:notification
 =head2    Package Description
   xCAT notification plugini module. This mondule allows users to register and
-  unregister for the xCAT database table changes. 
+  unregister for the xCAT database table changes.
 =cut
 
 #-------------------------------------------------------------------------------
@@ -220,7 +220,7 @@ sub regNotification {
 
 #--------------------------------------------------------------------------------
 
-=head3   unregNotification 
+=head3   unregNotification
       It unregisters a notification routine or a command.
     Arguments:
       args - the format of the ares is:
diff --git a/xCAT-server/lib/xcat/plugins/onie.pm b/xCAT-server/lib/xcat/plugins/onie.pm
index 01ed8edd5..817c4d8eb 100644
--- a/xCAT-server/lib/xcat/plugins/onie.pm
+++ b/xCAT-server/lib/xcat/plugins/onie.pm
@@ -15,6 +15,7 @@ use lib "$::XCATROOT/lib/perl";
 
 use strict;
 use Getopt::Long;
+use Expect;
 use File::Path;
 use File::Basename;
 
@@ -28,8 +29,9 @@ $::VERBOSE        = 0;
 
 sub handled_commands {
     return {
-        nodeset => 'nodehm:mgt=switch',    
+        nodeset => 'nodehm:mgt=switch',
         copydata => 'onie',
+        rspconfig => 'switches:switchtype',
       }
 }
 
@@ -89,6 +91,11 @@ sub process_request {
     my $nodes   = $request->{node};
     my $command = $request->{command}->[0];
     my $args    = $request->{arg};
+    my @exargs    = ($request->{arg});
+    if (ref($args)) {
+        @exargs = @$args;
+    }
+
 
     if ($::XCATSITEVALS{xcatdebugmode} != 0) { $::VERBOSE = 1}
 
@@ -96,11 +103,18 @@ sub process_request {
         copydata($request, $callback);
     } elsif ($command eq "nodeset") {
         nodeset($request, $callback, $subreq);
+    } elsif ($command eq "rspconfig") {
+        my $subcmd = $exargs[0];
+        if ($subcmd eq 'sshcfg') {
+            process_sshcfg($nodes, $callback);
+        } else {
+            xCAT::MsgUtils->message("I", { data => ["The rspconfig command $subcmd is not supported"] }, $callback);
+        }
     }
 
 }
 
-# build cumulus OS image 
+# build cumulus OS image
 sub copydata {
     my $request  = shift;
     my $callback = shift;
@@ -108,7 +122,7 @@ sub copydata {
     my $inspection   = undef;
     my $noosimage    = undef;
     my $nooverwrite = undef;
-    
+
     # get arguments
     my $args = $request->{arg};
     if ($args) {
@@ -226,7 +240,7 @@ sub copydata {
 }
 
 
-# run the nodeset to updatenode provmethod 
+# run the nodeset to updatenode provmethod
 sub nodeset {
     my $request  = shift;
     my $callback = shift;
@@ -234,7 +248,7 @@ sub nodeset {
 
     my $switches = $request->{'node'};
     my $args  = $request->{arg};
-    my $provmethod; 
+    my $provmethod;
     my $image_pkgdir;
 
     my $setosimg;
@@ -260,7 +274,7 @@ sub nodeset {
         if ($setosimg) {
             $provmethod = $setosimg;
         } else {
-            $provmethod = $nodehash->{$switch}->[0]->{provmethod}; 
+            $provmethod = $nodehash->{$switch}->[0]->{provmethod};
         }
         if ($::VERBOSE) {
             xCAT::MsgUtils->message("I", { data => ["$switch has provmethod=$provmethod"] }, $callback);
@@ -273,15 +287,15 @@ sub nodeset {
         my $osimghash = $osimagetab->getAttribs({ imagename => $provmethod },'osvers','osarch');
         unless($imagetab and $osimghash){
             xCAT::MsgUtils->message("E", { error => ["cannot find osimage \"$provmethod\" for $switch, please make sure the osimage specified in command line or node.provmethod exists!"], errorcode => ["1"] }, $callback);
-            next;            
+            next;
         }
 
 
         my %attribs=('provmethod' => $provmethod,'os'=>$osimghash->{'osvers'},'arch'=>$osimghash->{'osarch'} );
         $nodetab->setAttribs({ 'node' => $switch }, \%attribs);
         $image_pkgdir = $imagetab->{'pkgdir'};
-       
-        #validate the image pkgdir 
+
+        #validate the image pkgdir
         my $flag=0;
         if (-r $image_pkgdir) {
             my @filestat = `file $image_pkgdir`;
@@ -307,4 +321,103 @@ sub nodeset {
     }
     return;
 }
+
+
+sub process_sshcfg {
+    my $noderange = shift;
+    my $callback = shift;
+
+    my $password = "CumulusLinux!";
+    my $userid = "cumulus";
+    my $timeout = 30;
+    my $keyfile = "/root/.ssh/id_rsa.pub";
+    my $rootkey = `cat /root/.ssh/id_rsa.pub`;
+
+    foreach my $switch (@$noderange) {
+        my $ip = xCAT::NetworkUtils->getipaddr($switch);
+
+        #remove old host key from /root/.ssh/known_hosts
+        my $cmd = "ssh-keygen -R $switch";
+        xCAT::Utils->runcmd($cmd, 0);
+        $cmd = "ssh-keygen -R $ip";
+        xCAT::Utils->runcmd($cmd, 0);
+
+        my ($exp, $errstr) = cumulus_connect($ip, $userid, $password, $timeout);
+        if (!defined $exp) {
+            xCAT::MsgUtils->message("E", { data => ["Failed to connect to $switch"] }, $callback);
+            next;
+        }
+
+        my $ret;
+        my $err;
+
+        ($ret, $err) = cumulus_exec($exp, "mkdir -p /root/.ssh");
+        ($ret, $err) = cumulus_exec($exp, "chmod 700 /root/.ssh");
+        ($ret, $err) = cumulus_exec($exp, "echo \"$rootkey\" >/root/.ssh/authorized_keys");
+        ($ret, $err) = cumulus_exec($exp, "chmod 644 /root/.ssh/authorized_keys");
+        if (!defined $ret) {
+            xCAT::MsgUtils->message("E", { data => ["Failed to run command on $switch"] }, $callback);
+            next;
+        }
+        xCAT::MsgUtils->message("I", { data => ["$switch: SSH enabled"] }, $callback);
+    }
+}
+
+sub cumulus_connect {
+     my $server   = shift;
+     my $userid   = shift;
+     my $password = shift;
+     my $timeout  = shift;
+
+     my $ssh      = Expect->new;
+     my $command     = 'ssh';
+     my @parameters  = ($userid . "@" . $server);
+
+     $ssh->debug(0);
+     $ssh->log_stdout(0);    # suppress stdout output..
+     $ssh->slave->stty(qw(sane -echo));
+
+     unless ($ssh->spawn($command, @parameters))
+     {
+         my $err = $!;
+         $ssh->soft_close();
+         my $rsp;
+         return(undef, "unable to run command $command $err\n");
+     }
+
+     $ssh->expect($timeout,
+                   [ "-re", qr/WARNING: REMOTE HOST IDENTIFICATION HAS CHANGED/, sub {die "WARNING: REMOTE HOST IDENTIFICATION HAS CHANGED!\n"; } ],
+                   [ "-re", qr/\(yes\/no\)\?\s*$/, sub { $ssh->send("yes\n");  exp_continue; } ],
+                   [ "-re", qr/ password:/,        sub {$ssh->send("$password\n"); exp_continue; } ],
+                   [ "-re", qr/:~\$/,              sub { $ssh->send("sudo su\n"); exp_continue; } ],
+                   [ "-re", qr/ password for cumulus:/, sub { $ssh->send("$password\n"); exp_continue; } ],
+                   [ "-re", qr/.*\/home\/cumulus#/, sub { $ssh->clear_accum(); } ],
+                   [ timeout => sub { die "No login.\n"; } ]
+                  );
+     $ssh->clear_accum();
+     return ($ssh);
+}
+
+sub cumulus_exec {
+     my $exp = shift;
+     my $cmd = shift;
+     my $timeout    = shift;
+     my $prompt =  shift;
+
+     $timeout = 10 unless defined $timeout;
+     $prompt = qr/.*\/home\/cumulus#/ unless defined $prompt;
+
+
+     $exp->clear_accum();
+     $exp->send("$cmd\n");
+     my ($mpos, $merr, $mstr, $mbmatch, $mamatch) = $exp->expect(6,  "-re", $prompt);
+
+     if (defined $merr) {
+         return(undef,$merr);
+     }
+     return($mbmatch);
+}
+
+
+
 1;
diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
index 1a20bf10f..10b11257c 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -61,13 +61,19 @@ $::UPLOAD_AND_ACTIVATE      = 0;
 $::UPLOAD_ACTIVATE_STREAM   = 0;
 $::RFLASH_STREAM_NO_HOST_REBOOT = 0;
 $::NO_ATTRIBUTES_RETURNED   = "No attributes returned from the BMC.";
+$::FAILED_UPLOAD_MSG        = "Failed to upload update file";
+$::FAILED_LOGIN_MSG         = "BMC did not respond. Validate BMC configuration and retry the command.";
 
 $::UPLOAD_WAIT_ATTEMPT      = 6;
 $::UPLOAD_WAIT_INTERVAL     = 10;
 $::UPLOAD_WAIT_TOTALTIME    = int($::UPLOAD_WAIT_ATTEMPT*$::UPLOAD_WAIT_INTERVAL);
 
 $::RPOWER_CHECK_INTERVAL    = 2;
+$::RPOWER_CHECK_ON_INTERVAL = 12;
+$::RPOWER_ON_MAX_RETRY      = 5;
 $::RPOWER_MAX_RETRY         = 30;
+$::RPOWER_CHECK_ON_TIME     = 1;
+$::RPOWER_RESET_SLEEP_INTERVAL = 13;
 
 $::BMC_MAX_RETRY = 20;
 $::BMC_CHECK_INTERVAL = 15;
@@ -93,7 +99,7 @@ unless (-d $::XCAT_LOG_DUMP_DIR) {
     mkpath($::XCAT_LOG_DUMP_DIR);
 }
 
-# Common logging messages: 
+# Common logging messages:
 my $usage_errormsg = "Usage error.";
 my $reventlog_no_id_resolved_errormsg = "Provide a comma separated list of IDs to be resolved. Example: 'resolved=x,y,z'";
 
@@ -152,8 +158,8 @@ $::SOFTWARE_URL = "$openbmc_project_url/software";
 $::LOGGING_URL  = "$openbmc_project_url/logging/entry/#ENTRY_ID#/attr/Resolved";
 #-------------------------------------------------------
 
-# The hash table to store method and url for request, 
-# process function for response 
+# The hash table to store method and url for request,
+# process function for response
 
 #-------------------------------------------------------
 my %status_info = (
@@ -173,7 +179,7 @@ my %status_info = (
     },
     RBEACON_ON_REQUEST  => {
         method         => "PUT",
-        init_url       => "$openbmc_project_url/led/groups/enclosure_identify/attr/Asserted", 
+        init_url       => "$openbmc_project_url/led/groups/enclosure_identify/attr/Asserted",
         data           => "true",
     },
     RBEACON_ON_RESPONSE => {
@@ -308,6 +314,9 @@ my %status_info = (
     RPOWER_ON_RESPONSE => {
         process        => \&rpower_response,
     },
+    RPOWER_CHECK_ON_RESPONSE => {
+        process        => \&rpower_response,
+    },
     RPOWER_OFF_REQUEST  => {
         method         => "PUT",
         init_url       => "$openbmc_project_url/state/chassis0/attr/RequestedPowerTransition",
@@ -338,6 +347,10 @@ my %status_info = (
         method         => "GET",
         init_url       => "$openbmc_project_url/state/enumerate",
     },
+    RPOWER_CHECK_ON_REQUEST  => {
+        method         => "GET",
+        init_url       => "$openbmc_project_url/state/enumerate",
+    },
     RPOWER_BMC_STATUS_REQUEST  => {
         method         => "GET",
         init_url       => "$openbmc_project_url/state/enumerate",
@@ -348,7 +361,7 @@ my %status_info = (
     },
     RPOWER_BMC_STATUS_RESPONSE => {
         process        => \&rpower_response,
-    }, 
+    },
     RPOWER_BMC_CHECK_RESPONSE => {
         process        => \&rpower_response,
     },
@@ -473,8 +486,8 @@ my %status_info = (
     RSPCONFIG_CLEAR_GARD_REQUEST => {
         method         => "POST",
         init_url       => "/org/open_power/control/gard/action/Reset",
-        data           => "[]", 
-    }, 
+        data           => "[]",
+    },
     RSPCONFIG_CLEAR_GARD_RESPONSE => {
         process        => \&rspconfig_response,
     },
@@ -535,7 +548,7 @@ my %status_info = (
     },
     RSPCONFIG_API_CONFIG_ON_REQUEST  => {
         method         => "PUT",
-        init_url       => "$openbmc_project_url", 
+        init_url       => "$openbmc_project_url",
         data           => "true",
     },
     RSPCONFIG_API_CONFIG_ON_RESPONSE => {
@@ -576,7 +589,7 @@ my %status_info = (
     },
 );
 
-# Setup configured subcommand. 
+# Setup configured subcommand.
 # Currently only rspconfig is supported and only for boolean commands or attribute settings.
 #
 # Usage can also be autogenerated for these commands. However, changes to the xCAT::Usage->usage
@@ -723,6 +736,8 @@ my $event_mapping = "";
 #-------------------------------------------------------
 sub preprocess_request {
     my $request = shift;
+    $callback  = shift;
+
     if (defined $request->{_xcat_ignore_flag}->[0] and $request->{_xcat_ignore_flag}->[0] eq 'openbmc') {
         return [];#workaround the bug 3026, to ignore it for openbmc
     }
@@ -759,8 +774,17 @@ sub preprocess_request {
     }
     ##############################################
 
-    $callback  = shift;
     my $command   = $request->{command}->[0];
+    if ($request->{command}->[0] eq "getopenbmccons") {
+        my $nodes = $request->{node};
+        my $check = parse_node_info($nodes);
+        foreach my $node (keys %node_info) {
+            my $donargs = [ $node,$node_info{$node}{bmc},$node_info{$node}{username}, $node_info{$node}{password}];
+            getopenbmccons($donargs, $callback);
+        }
+        return;
+    }
+
     my ($rc, $msg) = xCAT::OPENBMC->run_cmd_in_perl($command, $request->{environment});
     if ($rc == 0) { $request = {}; return;}
     if ($rc < 0) {
@@ -831,7 +855,7 @@ sub preprocess_request {
         $reqcopy->{_xcatpreprocessed}->[0] = 1;
         push @requests, $reqcopy;
     }
-    
+
     return \@requests;
 }
 
@@ -872,6 +896,10 @@ sub retry_check_times {
         }
         my $retry_msg = "Retry BMC state, wait for $wait_time seconds ...";
         xCAT::MsgUtils->message("I", { data => ["$node: $retry_msg"] }, $callback);
+        my $rflash_log_file = xCAT::Utils->full_path($node.".log", $::XCAT_LOG_RFLASH_DIR);
+        open (RFLASH_LOG_FILE_HANDLE, ">> $rflash_log_file");
+        print RFLASH_LOG_FILE_HANDLE "$retry_msg\n";
+        close(RFLASH_LOG_FILE_HANDLE);
         if ($response_status ne $::RESPONSE_SERVICE_UNAVAILABLE) {
             my $login_url = "$http_protocol://$node_info{$node}{bmc}/login";
             my $content = '[ "' . $node_info{$node}{username} .'", "' . $node_info{$node}{password} . '" ]';
@@ -880,7 +908,7 @@ sub retry_check_times {
             $node_wait{$node} = time() + $wait_time;
             return;
         }
- 
+
         $node_info{$node}{cur_status} = $request_status;
         $node_wait{$node} = time() + $wait_time;
         return;
@@ -919,21 +947,30 @@ sub process_request {
     my $rst = parse_command_status($command, \@exargs);
     return if ($rst);
 
+    if ($request->{command}->[0] eq "getopenbmccons") {
+        # This may not be run as "getopenbmccons" is handled in preprocess now
+        # Leave the code here in case some codes just call `process_request`
+        foreach my $node (keys %node_info) {
+            my $donargs = [ $node,$node_info{$node}{bmc},$node_info{$node}{username}, $node_info{$node}{password}];
+            getopenbmccons($donargs, $callback);
+        }
+        return;
+    }
+
     if ($::VERBOSE) {
         xCAT::SvrUtils::sendmsg("Running command in Perl", $callback);
     }
-    if ($request->{command}->[0] ne "getopenbmccons") {
-        $cookie_jar = HTTP::Cookies->new({});
-        $async = HTTP::Async->new(
-            slots => 500,
-            cookie_jar => $cookie_jar,
-            timeout => 60,
-            max_request_time => 60,
-            ssl_options => {
-                SSL_verify_mode => 0,
-            },
-        );    
-    }
+
+    $cookie_jar = HTTP::Cookies->new({});
+    $async = HTTP::Async->new(
+        slots => 500,
+        cookie_jar => $cookie_jar,
+        timeout => 60,
+        max_request_time => 60,
+        ssl_options => {
+            SSL_verify_mode => 0,
+        },
+    );
 
     my $login_url;
     my $handle_id;
@@ -943,14 +980,6 @@ sub process_request {
     my $child_num;
     my %valid_nodes = ();
 
-    if ($request->{command}->[0] eq "getopenbmccons") {
-        foreach my $node (keys %node_info) {
-            my $donargs = [ $node,$node_info{$node}{bmc},$node_info{$node}{username}, $node_info{$node}{password}];
-            getopenbmccons($donargs, $callback);
-        }
-        return;
-    }
-
     my $max_child_num = 64;
     my $for_num = ($wait_node_num < $max_child_num) ? $wait_node_num : $max_child_num;
     for (my $i = 0; $i < $for_num; $i++) {
@@ -989,7 +1018,8 @@ sub process_request {
 
     foreach my $node (keys %node_info) {
         if (!$valid_nodes{$node}) {
-            xCAT::SvrUtils::sendmsg([1, "BMC did not respond. Validate BMC configuration and retry the command."], $callback, $node);
+            xCAT::SvrUtils::sendmsg([1, $::FAILED_LOGIN_MSG], $callback, $node);
+            $node_info{$node}{rst} = $::FAILED_LOGIN_MSG;
             $wait_node_num--;
             next;
         }
@@ -998,10 +1028,31 @@ sub process_request {
                 my $info_msg = "Invalid OpenBMC Hostname $node_info{$node}{bmc}, can't set to OpenBMC";
                 xCAT::SvrUtils::sendmsg([1, $info_msg], $callback, $node);
                 $wait_node_num--;
-                next; 
+                next;
             }
         }
-      
+
+        # All options parsed and validated. Now lock upload and activate processing, so that only one
+        # can continue in case multiples are issued for the same node
+        #
+        if (($next_status{LOGIN_RESPONSE} eq "RFLASH_FILE_UPLOAD_REQUEST") or
+            ($next_status{LOGIN_RESPONSE} eq "RFLASH_UPDATE_ACTIVATE_REQUEST") or
+            ($next_status{LOGIN_RESPONSE} eq "RFLASH_UPDATE_HOST_ACTIVATE_REQUEST")) {
+
+            my $lock = xCAT::Utils->acquire_lock("rflash_$node", 1);
+            unless ($lock) {
+                my $lock_msg = "Unable to rflash $node. Another process is already flashing this node.";
+                xCAT::SvrUtils::sendmsg([ 1, $lock_msg ], $callback, $node);
+                $node_info{$node}{rst} = $lock_msg;
+                $wait_node_num--;
+                next;
+            }
+            if ($::VERBOSE) {
+                xCAT::SvrUtils::sendmsg("Acquired the lock for upload and activate process", $callback, $node);
+            }
+            $node_info{$node}{rflash_lock} = $lock;
+        }
+
         $login_url = "$http_protocol://$node_info{$node}{bmc}/login";
         $content = '{ "data": [ "' . $node_info{$node}{username} .'", "' . $node_info{$node}{password} . '" ] }';
         if ($xcatdebugmode) {
@@ -1044,7 +1095,7 @@ rmdir \"/tmp/\$userid\" \n";
         }
     }
 
-    while (1) { 
+    while (1) {
         unless ($wait_node_num) {
             if ($event_mapping and (ref($event_mapping) ne "HASH")) {
                 xCAT::SvrUtils::sendmsg("$event_mapping, install the OpenBMC RAS package to obtain more details logging messages.", $callback);
@@ -1060,26 +1111,42 @@ rmdir \"/tmp/\$userid\" \n";
                     if ($node_info{$node}{rst} =~ /successful/) {
                         push @{ $rflash_result{success} }, $node;
                     } else {
-                        $node_info{$node}{rst} = "BMC is not ready" unless ($node_info{$node}{rst});
+                        # If there is no error in $node_info{$node}{rst} it is probably because fw file
+                        # upload is done in a forked process and data can not be saved in $node_info{$node}{rst}
+                        # In that case check the rflash log file for this node and extract error from there
+                        unless ($node_info{$node}{rst}) {
+                            my $rflash_log_file = xCAT::Utils->full_path($node.".log", $::XCAT_LOG_RFLASH_DIR);
+                            # Extract the upload error from last line in log file
+                            my $upload_error = `tail $rflash_log_file -n1 | grep "$::FAILED_UPLOAD_MSG"`;
+                            if ($upload_error) {
+                                chomp $upload_error;
+                                $node_info{$node}{rst} = $upload_error;
+                            } else {
+                                $node_info{$node}{rst} = "BMC is not ready";
+                            }
+                        }
                         push @{ $rflash_result{fail} }, "$node: $node_info{$node}{rst}";
                     }
                 }
-                xCAT::MsgUtils->message("I", { data => ["-------------------------------------------------------"] }, $callback);
-                my $summary = "Firmware update complete: ";
                 my $total = keys %node_info;
-                my $success = 0;
-                my $fail = 0;
-                $success = @{ $rflash_result{success} } if (defined $rflash_result{success} and @{ $rflash_result{success} });
-                $fail = @{ $rflash_result{fail} } if (defined $rflash_result{fail} and @{ $rflash_result{fail} });
-                $summary .= "Total=$total Success=$success Failed=$fail";
-                xCAT::MsgUtils->message("I", { data => ["$summary"] }, $callback);
+                # Display summary information but only if there were any nodes to process
+                if ($total > 0) {
+                    xCAT::MsgUtils->message("I", { data => ["-------------------------------------------------------"], host => [1] }, $callback);
+                    my $summary = "Firmware update complete: ";
+                    my $success = 0;
+                    my $fail = 0;
+                    $success = @{ $rflash_result{success} } if (defined $rflash_result{success} and @{ $rflash_result{success} });
+                    $fail = @{ $rflash_result{fail} } if (defined $rflash_result{fail} and @{ $rflash_result{fail} });
+                    $summary .= "Total=$total Success=$success Failed=$fail";
+                    xCAT::MsgUtils->message("I", { data => ["$summary"], host => [1] }, $callback);
 
-                if ($rflash_result{fail}) {
-                    foreach (@{ $rflash_result{fail} }) {
-                        xCAT::MsgUtils->message("I", { data => ["$_"] }, $callback);
+                    if ($rflash_result{fail}) {
+                        foreach (@{ $rflash_result{fail} }) {
+                            xCAT::MsgUtils->message("I", { data => ["$_"], host => [1] }, $callback);
+                        }
                     }
+                    xCAT::MsgUtils->message("I", { data => ["-------------------------------------------------------"], host => [1] }, $callback);
                 }
-                xCAT::MsgUtils->message("I", { data => ["-------------------------------------------------------"] }, $callback);
             }
             last;
         }
@@ -1129,7 +1196,7 @@ rmdir \"/tmp/\$userid\" \n";
         foreach my $d (@del) {
             delete $node_wait{$d};
         }
-    } 
+    }
 
     $callback->({ errorcode => [$check] }) if ($check);
     return;
@@ -1167,20 +1234,20 @@ sub parse_args {
         return ([ 1, "Only one option is supported at the same time for $command" ]);
     } elsif (scalar(@ARGV) >= 2 and $command eq "reventlog") {
         my $option_s;
-        GetOptions( 's' => \$option_s ); 
+        GetOptions( 's' => \$option_s );
         return ([ 1, "The -s option is not supported for OpenBMC." ]) if ($option_s);
         if ( "resolved" ~~ @ARGV) {
             return ([ 1, "$usage_errormsg $reventlog_no_id_resolved_errormsg" ]);
         }
         return ([ 1, "Only one option is supported at the same time for $command" ]);
-        
+
     } elsif (scalar(@ARGV) == 0 and $command =~ /rpower|rspconfig|rflash/) {
         return ([ 1, "No option specified for $command" ]);
-    } else { 
+    } else {
         $subcommand = $ARGV[0];
     }
 
-    if ($command eq "rbeacon") { 
+    if ($command eq "rbeacon") {
         unless ($subcommand =~ /^on$|^off$|^stat$/) {
 	    return ([ 1, "Only 'on', 'off' or 'stat' are supported for OpenBMC managed nodes."]);
         }
@@ -1205,12 +1272,12 @@ sub parse_args {
         if ($subcommand =~ /^(\w+)=(.*)/) {
             my $key = $1;
             my $value = $2;
-            if (not $value) { 
+            if (not $value) {
                 return ([ 1, "$usage_errormsg $reventlog_no_id_resolved_errormsg" ]);
             }
 
             my $nodes_num = @$noderange;
-            if (@$noderange > 1) { 
+            if (@$noderange > 1) {
                 return ([ 1, "Resolving faults over a xCAT noderange is not recommended." ]);
             }
 
@@ -1324,13 +1391,13 @@ sub parse_args {
             # Only files ending on .tar are allowed
             if ($opt =~ /.*\.tar$/i) {
                 $filename_passed = 1;
-                push (@flash_arguments, $opt); 
+                push (@flash_arguments, $opt);
                 next;
             }
             # Check if hex number for the updateid is passed
             elsif ($opt =~ /^[[:xdigit:]]+$/i) {
                 $updateid_passed = 1;
-                push (@flash_arguments, $opt); 
+                push (@flash_arguments, $opt);
                 next;
             }
             # check if option starting with - was passed
@@ -1363,16 +1430,16 @@ sub parse_args {
         # show options parsed in bypass mode
         print "DEBUG filename=$filename_passed, updateid=$updateid_passed, options=$option_flag, tar_file_path=@tarball_path, invalid=$invalid_options rflash_arguments=@flash_arguments\n";
 
-        if ($option_flag =~ tr{ }{ } > 0) { 
+        if ($option_flag =~ tr{ }{ } > 0) {
             unless ($verbose or $option_flag =~/^-d --no-host-reboot$/) {
                 return ([ 1, "Multiple options are not supported. Options specified: $option_flag"]);
             }
         }
-        
+
         if (scalar @flash_arguments > 1) {
-            if (($option_flag =~ /^-a$|^--activate$|^--delete$/) or ($filename_passed and $option_flag !~ /^-d$/)) { 
-                # Handles: 
-                #   - Multiple options not supported to activate/delete at the same time 
+            if (($option_flag =~ /^-a$|^--activate$|^--delete$/) or ($filename_passed and $option_flag !~ /^-d$/)) {
+                # Handles:
+                #   - Multiple options not supported to activate/delete at the same time
                 #   - Filename passed in and option is not -d for directory
                 return ([1, "More than one firmware specified is not supported."]);
             } elsif ($option_flag =~ /^-d$/) {
@@ -1416,13 +1483,13 @@ sub parse_args {
                     return ([ 1, "Invalid firmware specified with $option_flag" ]);
                 } else {
                     return ([ 1, "Invalid option specified" ]);
-                }        
+                }
             } else {
                 # Neither Filename nor updateid was not passed, check flags allowed without file or updateid
                 if ($option_flag !~ /^-c$|^--check$|^-l$|^--list$/) {
                     return ([ 1, "Invalid option specified with $option_flag: $invalid_options" ]);
                 }
-            }  
+            }
         }
     } else {
         return ([ 1, "Command is not supported." ]);
@@ -1454,7 +1521,7 @@ sub parse_command_status {
 
     $next_status{LOGIN_REQUEST} = "LOGIN_RESPONSE";
 
-    if ($command eq "rbeacon") { 
+    if ($command eq "rbeacon") {
         $subcommand = $$subcommands[0];
 
         if ($subcommand eq "on") {
@@ -1515,9 +1582,9 @@ sub parse_command_status {
             $next_status{RINV_FIRM_RESPONSE}{NO_PENDING} = "RPOWER_BMCREBOOT_REQUEST";
             $next_status{RPOWER_BMCREBOOT_REQUEST} = "RPOWER_RESET_RESPONSE";
             $status_info{RPOWER_RESET_RESPONSE}{argv} = "$subcommand";
-            $status_info{RINV_FIRM_RESPONSE}{check} = 1;    
+            $status_info{RINV_FIRM_RESPONSE}{check} = 1;
         }
-    } 
+    }
 
     if ($command eq "rinv") {
         if (defined($$subcommands[0])) {
@@ -1558,7 +1625,7 @@ sub parse_command_status {
             if (defined($::OPENBMC_FW) && ($::OPENBMC_FW < 1738)) {
                 #
                 # In 1738, the endpount URL changed.  In order to support the older URL as a work around, allow for a environment
-                # variable to change this value. 
+                # variable to change this value.
                 #
                 $::RSETBOOT_URL_PATH = "boot_source";
                 $status_info{RSETBOOT_SET_REQUEST}{init_url} = "$openbmc_project_url/control/host0/$::RSETBOOT_URL_PATH/attr/BootSource";
@@ -1682,8 +1749,8 @@ sub parse_command_status {
                 # Setup chain for query subcommand
                 if ($api_config_info{$::RSPCONFIG_CONFIGURED_API_KEY}{type} eq "action_attribute") {
                     $next_status{LOGIN_RESPONSE} = "RSPCONFIG_API_CONFIG_ACTION_ATTR_QUERY_REQUEST";
-                    $status_info{RSPCONFIG_API_CONFIG_ACTION_ATTR_QUERY_REQUEST}{init_url} = 
-                             $status_info{RSPCONFIG_API_CONFIG_ACTION_ATTR_QUERY_REQUEST}{init_url} . 
+                    $status_info{RSPCONFIG_API_CONFIG_ACTION_ATTR_QUERY_REQUEST}{init_url} =
+                             $status_info{RSPCONFIG_API_CONFIG_ACTION_ATTR_QUERY_REQUEST}{init_url} .
                              $api_config_info{$::RSPCONFIG_CONFIGURED_API_KEY}{url} .
                              $api_config_info{$::RSPCONFIG_CONFIGURED_API_KEY}{query_url};
                     $next_status{RSPCONFIG_API_CONFIG_ACTION_ATTR_QUERY_REQUEST} = "RSPCONFIG_API_CONFIG_QUERY_RESPONSE";
@@ -1775,11 +1842,11 @@ sub parse_command_status {
                 } else {
                     $next_status{LOGIN_RESPONSE} = "RSPCONFIG_DUMP_DOWNLOAD_REQUEST";
                     $next_status{RSPCONFIG_DUMP_DOWNLOAD_REQUEST} = "RSPCONFIG_DUMP_DOWNLOAD_RESPONSE";
-                    $status_info{RSPCONFIG_DUMP_DOWNLOAD_REQUEST}{init_url} =~ s/#ID#/$$subcommands[2]/g; 
+                    $status_info{RSPCONFIG_DUMP_DOWNLOAD_REQUEST}{init_url} =~ s/#ID#/$$subcommands[2]/g;
                     $status_info{RSPCONFIG_DUMP_DOWNLOAD_REQUEST}{argv} = $$subcommands[2];
                 }
             } else {
-                # this section handles the dump support where no options are given and xCAT will 
+                # this section handles the dump support where no options are given and xCAT will
                 # # handle the creation, waiting, and download of the dump across a given noderange
                 # Verify directory for download is there
                 unless (-d  $::XCAT_LOG_DUMP_DIR) {
@@ -1938,7 +2005,7 @@ sub parse_command_status {
                     $tarfile_path =xCAT::Utils->full_path($update_file, $::cwd);
                 }
             }
-            # Filename or file id was specified 
+            # Filename or file id was specified
             if ($update_file =~ /.*\.tar$/) {
                 # Filename ending on .tar was specified
                 if (File::Spec->file_name_is_absolute($update_file)) {
@@ -1966,11 +2033,11 @@ sub parse_command_status {
                     my $purpose_version_in_file = `$grep_cmd $purpose_tag $::UPLOAD_FILE`;
                     chomp($firmware_version_in_file);
                     chomp($purpose_version_in_file);
-                    (my $purpose_string,$purpose_value) = split("=", $purpose_version_in_file); 
-                    (my $version_string,$version_value) = split("=", $firmware_version_in_file); 
+                    (my $purpose_string,$purpose_value) = split("=", $purpose_version_in_file);
+                    (my $version_string,$version_value) = split("=", $firmware_version_in_file);
                     if ($purpose_value =~ /host/) {
                         $purpose_value = "Host";
-                    } 
+                    }
                     $::UPLOAD_FILE_VERSION = $version_value;
                     if (-x $sha512sum_cmd && -x $tr_cmd) {
                         # Save hash id this firmware version should resolve to:
@@ -2034,7 +2101,7 @@ sub parse_command_status {
                 if ($streamline) {
                     $::UPLOAD_ACTIVATE_STREAM = 1;
                     if ($nohost_reboot) {
-                        $::RFLASH_STREAM_NO_HOST_REBOOT = 1; 
+                        $::RFLASH_STREAM_NO_HOST_REBOOT = 1;
                         $nohost_reboot = 0;
                     }
                     $streamline = 0;
@@ -2062,10 +2129,13 @@ sub parse_command_status {
                 }
             }
         }
-        if ($upload or $::UPLOAD_AND_ACTIVATE) {
-            xCAT::SvrUtils::sendmsg("Attempting to upload $::UPLOAD_FILE, please wait...", $callback);
-        } elsif ($::UPLOAD_ACTIVATE_STREAM) {
-            xCAT::SvrUtils::sendmsg("Attempting to upload $::UPLOAD_FILE and $::UPLOAD_PNOR, please wait...", $callback);
+        # Check if there are any valid nodes to work on. If none, do not issue these messages
+        if (keys %node_info > 0) {
+            if ($upload or $::UPLOAD_AND_ACTIVATE) {
+                xCAT::SvrUtils::sendmsg("Attempting to upload $::UPLOAD_FILE, please wait...", $callback);
+            } elsif ($::UPLOAD_ACTIVATE_STREAM) {
+                xCAT::SvrUtils::sendmsg("Attempting to upload $::UPLOAD_FILE and $::UPLOAD_PNOR, please wait...", $callback);
+            }
         }
         if ($check_version) {
             # Display firmware version on BMC
@@ -2145,8 +2215,11 @@ sub parse_command_status {
                $next_status{RPOWER_CHECK_RESPONSE}{OFF} = "RPOWER_ON_REQUEST";
                $next_status{RPOWER_ON_REQUEST} = "RPOWER_ON_RESPONSE";
                $status_info{RPOWER_ON_RESPONSE}{argv} = "boot";
+               $next_status{RPOWER_ON_RESPONSE} = "RPOWER_CHECK_ON_REQUEST";
+               $next_status{RPOWER_CHECK_ON_REQUEST} = "RPOWER_CHECK_ON_RESPONSE";
+               $next_status{RPOWER_CHECK_ON_RESPONSE}{OFF} = "RPOWER_ON_REQUEST";
             }
-        } 
+        }
     }
     return;
 }
@@ -2184,9 +2257,9 @@ sub fork_process_login {
 #
 #=head3  get_functional_software_ids
 #
-#  Checks if the FW response data contains "functional" which 
-#  indicates the actual software version currently running on 
-#  the Server.  
+#  Checks if the FW response data contains "functional" which
+#  indicates the actual software version currently running on
+#  the Server.
 #
 #  Returns: reference to hash
 #
@@ -2200,7 +2273,7 @@ sub get_functional_software_ids {
     #
     # Get the functional IDs to accurately mark the active running FW
     #
-    if (${ $response->{data} }{'/xyz/openbmc_project/software/functional'} ) { 
+    if (${ $response->{data} }{'/xyz/openbmc_project/software/functional'} ) {
         my %func_data = %{ ${ $response->{data} }{'/xyz/openbmc_project/software/functional'} };
         foreach ( @{$func_data{endpoints}} ) {
             my $fw_id = (split '/', $_)[-1];
@@ -2271,6 +2344,7 @@ sub parse_node_info {
 
             $node_info{$node}{cur_status} = "LOGIN_REQUEST";
             $node_info{$node}{rpower_check_times} = $::RPOWER_MAX_RETRY;
+            $node_info{$node}{rpower_check_on_times} = $::RPOWER_ON_MAX_RETRY;
             $node_info{$node}{bmc_conn_check_times} = $::BMC_MAX_RETRY;
             $node_info{$node}{bmcstate_check_times} = $::BMC_MAX_RETRY;
         } else {
@@ -2290,7 +2364,7 @@ sub parse_node_info {
   Generate request's information
       If the node has method itself, use it as request's method.
       If not, use method %status_info defined.
-      If the node has cur_url, check whether also has sub_urls. 
+      If the node has cur_url, check whether also has sub_urls.
       If has, request's url is join cur_url and one in sub_urls(use one at once to check which is needed).
       If not, use method %status_info defined.
       use xCAT::OPENBMC->send_request send request
@@ -2366,7 +2440,7 @@ sub gen_send_request {
 
 =head3  deal_with_response
 
-  Check response's status_line and 
+  Check response's status_line and
   Input:
         $handle_id: Async return ID with response
         $response: Async return response
@@ -2381,6 +2455,11 @@ sub deal_with_response {
 
     delete $handle_id_node{$handle_id};
 
+    if ($::UPLOAD_ACTIVATE_STREAM) {
+        my $rflash_log_file = xCAT::Utils->full_path($node.".log", $::XCAT_LOG_RFLASH_DIR);
+        open (RFLASH_LOG_FILE_HANDLE, ">> $rflash_log_file");
+    }
+
     if ($xcatdebugmode) {
         my $debug_info = lc ($node_info{$node}{cur_status}) . " " . $response->status_line;
         process_debug_info($node, $debug_info);
@@ -2394,13 +2473,13 @@ sub deal_with_response {
             $error = "BMC NotReady";
             xCAT::SvrUtils::sendmsg($error, $callback, $node);
             $wait_node_num--;
-            return;    
+            return;
         }
         if ($node_info{$node}{cur_status} eq "RPOWER_BMC_STATUS_RESPONSE" and defined $status_info{RPOWER_BMC_STATUS_RESPONSE}{argv} and $status_info{RPOWER_BMC_STATUS_RESPONSE}{argv} =~ /bmcstate$/) {
             retry_check_times($node, "RPOWER_BMC_STATUS_REQUEST", "bmc_conn_check_times", $::BMC_CHECK_INTERVAL, $response->status_line);
             return;
         }
-     
+
         if ($response->status_line eq $::RESPONSE_SERVICE_UNAVAILABLE) {
             $error = $::RESPONSE_SERVICE_UNAVAILABLE;
         } elsif ($response->status_line eq $::RESPONSE_METHOD_NOT_ALLOWED) {
@@ -2409,25 +2488,34 @@ sub deal_with_response {
             } else {
                 # Special processing for file upload. At this point we do not know how to
                 # form a proper file upload request. It always fails with "Method not allowed" error.
-                # If that happens, just assume it worked. 
+                # If that happens, just assume it worked.
                 # TODO remove this block when proper request can be generated
-                $status_info{ $node_info{$node}{cur_status} }->{process}->($node, $response); 
+                $status_info{ $node_info{$node}{cur_status} }->{process}->($node, $response);
                 return;
             }
         } elsif ($response->status_line eq $::RESPONSE_SERVICE_TIMEOUT) {
-            if ($node_info{$node}{cur_status} eq "RPOWER_RESET_RESPONSE" and defined $status_info{RPOWER_RESET_RESPONSE}{argv} and $status_info{RPOWER_RESET_RESPONSE}{argv} =~ /bmcreboot$/) { 
+            if ($node_info{$node}{cur_status} eq "RPOWER_RESET_RESPONSE" and defined $status_info{RPOWER_RESET_RESPONSE}{argv} and $status_info{RPOWER_RESET_RESPONSE}{argv} =~ /bmcreboot$/) {
                 my $infomsg = "BMC $::POWER_STATE_REBOOT";
                 xCAT::SvrUtils::sendmsg($infomsg, $callback, $node);
-                $wait_node_num--;
-                return;    
+                if ($::UPLOAD_ACTIVATE_STREAM) {
+                    my $timestamp = localtime();
+                    print RFLASH_LOG_FILE_HANDLE "$timestamp ===================Rebooting BMC to apply new BMC firmware===================\n";
+                    print RFLASH_LOG_FILE_HANDLE "BMC $::POWER_STATE_REBOOT\n";
+                    close (RFLASH_LOG_FILE_HANDLE);
+                    retry_after($node, "RPOWER_BMC_CHECK_REQUEST", 15);
+                    return;
+                }else{
+                    $wait_node_num--;
+                    return;
+                }
             }
             $error = $::RESPONSE_SERVICE_TIMEOUT;
         } else {
             my $response_info = decode_json $response->content;
-            # Handle 500  
+            # Handle 500
             if ($response->status_line eq $::RESPONSE_SERVER_ERROR) {
                 $error = "[" . $response->code . "] " . $response_info->{'data'}->{'exception'};
-            # Handle 403 
+            # Handle 403
             } elsif ($response->status_line eq $::RESPONSE_FORBIDDEN) {
                 #
                 # For any invalid data that we can detect, provide a better response message
@@ -2450,20 +2538,20 @@ sub deal_with_response {
                 } else{
                     $error = "$::RESPONSE_FORBIDDEN - Requested endpoint does not exist or may indicate function is not yet supported by OpenBMC firmware.";
                 }
-            # Handle 404 
+            # Handle 404
             } elsif ($response->status_line eq $::RESPONSE_NOT_FOUND) {
                 #
                 # For any invalid data that we can detect, provide a better response message
                 #
-                if ($node_info{$node}{cur_status} eq "RFLASH_DELETE_IMAGE_RESPONSE") { 
+                if ($node_info{$node}{cur_status} eq "RFLASH_DELETE_IMAGE_RESPONSE") {
                     $error = "Invalid ID provided to delete.  Use the -l option to view valid firmware IDs.";
-                } elsif (($node_info{$node}{cur_status} eq "RSPCONFIG_API_CONFIG_QUERY_RESPONSE") || 
-                         ($node_info{$node}{cur_status} eq "RSPCONFIG_API_CONFIG_ATTR_RESPONSE")) { 
+                } elsif (($node_info{$node}{cur_status} eq "RSPCONFIG_API_CONFIG_QUERY_RESPONSE") ||
+                         ($node_info{$node}{cur_status} eq "RSPCONFIG_API_CONFIG_ATTR_RESPONSE")) {
                     $error = "$::RESPONSE_NOT_FOUND - Requested endpoint does not exist or may indicate function is not supported on this OpenBMC firmware.";
                 } else {
                     $error = "[" . $response->code . "] " . $response_info->{'data'}->{'description'};
                 }
-                
+
             } else {
                 $error = "[" . $response->code . "] " . $response_info->{'data'}->{'description'};
             }
@@ -2513,7 +2601,7 @@ sub process_debug_info {
     }
 
     xCAT::SvrUtils::sendmsg("$flag_debug $debug_msg", $callback, $ts_node);
-    xCAT::MsgUtils->trace(0, "D", "$flag_debug $node $debug_msg"); 
+    xCAT::MsgUtils->trace(0, "D", "$flag_debug $node $debug_msg");
 }
 
 #-------------------------------------------------------
@@ -2542,7 +2630,7 @@ sub login_request {
     my $login_response = $brower->request($login_request);
 
     # Check the return code
-    if ($login_response->code eq 500 or $login_response->code eq 404) { 
+    if ($login_response->code eq 500 or $login_response->code eq 404) {
         # handle only 404 and 504 in this code, defer to deal_with_response for the rest
         xCAT::SvrUtils::sendmsg([1 ,"[" . $login_response->code . "] Login to BMC failed: " . $login_response->status_line . "."], $callback, $node);
         return 1;
@@ -2595,12 +2683,22 @@ sub rpower_response {
     my %new_status = ();
 
     my $response_info = decode_json $response->content;
-
-
+    if ($::UPLOAD_ACTIVATE_STREAM) {
+        my $rflash_log_file = xCAT::Utils->full_path($node.".log", $::XCAT_LOG_RFLASH_DIR);
+        open (RFLASH_LOG_FILE_HANDLE, ">> $rflash_log_file"); 
+    }
     if ($node_info{$node}{cur_status} eq "RPOWER_ON_RESPONSE") {
         if ($response_info->{'message'} eq $::RESPONSE_OK) {
             if ($status_info{RPOWER_ON_RESPONSE}{argv}) {
-                xCAT::SvrUtils::sendmsg("$::POWER_STATE_RESET", $callback, $node);
+                if (defined($node_info{$node}{power_state_rest}) and ($node_info{$node}{power_state_rest} == 1)) {
+                    xCAT::SvrUtils::sendmsg("$::POWER_STATE_ON", $callback, $node);
+                } else {
+                    $node_info{$node}{power_state_rest} = 1;
+                    xCAT::SvrUtils::sendmsg("$::POWER_STATE_RESET", $callback, $node);
+                    if ($::UPLOAD_ACTIVATE_STREAM) {
+                        print RFLASH_LOG_FILE_HANDLE "Power on host : RPOWER_ON_RESPONSE $::POWER_STATE_RESET\n";
+                    }
+                }
             } else {
                 if (defined($::OPENBMC_PWR) and ($::OPENBMC_PWR eq "YES")) {
                     xCAT::SvrUtils::sendmsg("$::STATUS_POWERING_ON", $callback, $node);
@@ -2618,6 +2716,14 @@ sub rpower_response {
             if ($node_info{$node}{cur_status} eq "RPOWER_SOFTOFF_RESPONSE") {
                 $power_state = "$::POWER_STATE_POWERING_OFF";
             }
+            if ($::UPLOAD_ACTIVATE_STREAM) {
+                my $timestamp = localtime();
+                print RFLASH_LOG_FILE_HANDLE "$timestamp ===================Start reset host to apply new PNOR===================\n";
+                print RFLASH_LOG_FILE_HANDLE "$timestamp Power reset host ...\n";
+                print RFLASH_LOG_FILE_HANDLE "Power off host : RPOWER_OFF_RESPONSE power_state $power_state\n";
+                print RFLASH_LOG_FILE_HANDLE "Wait for $::RPOWER_RESET_SLEEP_INTERVAL seconds ...\n"; 
+                sleep($::RPOWER_RESET_SLEEP_INTERVAL);
+            }
             xCAT::SvrUtils::sendmsg("$power_state", $callback, $node) if (!$next_status{ $node_info{$node}{cur_status} });
             $new_status{$::STATUS_POWERING_OFF} = [$node];
         }
@@ -2628,6 +2734,9 @@ sub rpower_response {
             if (defined $status_info{RPOWER_RESET_RESPONSE}{argv} and $status_info{RPOWER_RESET_RESPONSE}{argv} =~ /bmcreboot$/) {
                 xCAT::SvrUtils::sendmsg("BMC $::POWER_STATE_REBOOT", $callback, $node);
                 if ($::UPLOAD_ACTIVATE_STREAM) {
+                    print RFLASH_LOG_FILE_HANDLE "BMC $::POWER_STATE_REBOOT\n";
+                    my $timestamp = localtime();
+                    print RFLASH_LOG_FILE_HANDLE "$timestamp ===================Reboot BMC to apply new BMC===================\n";
                     retry_after($node, "RPOWER_BMC_CHECK_REQUEST", 15);
                     return;
                 }
@@ -2639,7 +2748,13 @@ sub rpower_response {
     xCAT_monitoring::monitorctrl::setNodeStatusAttributes(\%new_status, 1) if (%new_status);
 
     my $all_status;
-    if ($node_info{$node}{cur_status} eq "RPOWER_STATUS_RESPONSE" or $node_info{$node}{cur_status} eq "RPOWER_CHECK_RESPONSE" or $node_info{$node}{cur_status} eq "RPOWER_BMC_STATUS_RESPONSE") {
+    #get host $all_status for RPOWER_CHECK_ON_RESPONSE
+    if ($node_info{$node}{cur_status} eq "RPOWER_STATUS_RESPONSE" or $node_info{$node}{cur_status} eq "RPOWER_CHECK_RESPONSE" or $node_info{$node}{cur_status} eq "RPOWER_BMC_STATUS_RESPONSE" or $node_info{$node}{cur_status} eq "RPOWER_CHECK_ON_RESPONSE") {
+        if ($::UPLOAD_ACTIVATE_STREAM and $node_info{$node}{cur_status} eq "RPOWER_CHECK_ON_RESPONSE" and $::RPOWER_CHECK_ON_TIME == 1 ) {
+            print RFLASH_LOG_FILE_HANDLE "After power on in reset, wait for $::RPOWER_RESET_SLEEP_INTERVAL seconds ...\n";
+            sleep($::RPOWER_RESET_SLEEP_INTERVAL);
+            $::RPOWER_CHECK_ON_TIME = 0;
+        }
         my $bmc_state = "";
         my $bmc_transition_state = "";
         my $chassis_state = "";
@@ -2670,6 +2785,15 @@ sub rpower_response {
             print "$node: DEBUG State CurrentHostState=$host_state\n";
             print "$node: DEBUG State RequestedHostTransition=$host_transition_state\n";
         }
+        if ($::UPLOAD_ACTIVATE_STREAM and $node_info{$node}{cur_status} eq "RPOWER_CHECK_RESPONSE") {
+                print RFLASH_LOG_FILE_HANDLE "check power state: RPOWER_CHECK_RESPONSE\n";
+                print RFLASH_LOG_FILE_HANDLE "DEBUG State CurrentBMCState=$bmc_state\n";
+                print RFLASH_LOG_FILE_HANDLE "DEBUG State RequestedBMCTransition=$bmc_transition_state\n";
+                print RFLASH_LOG_FILE_HANDLE "DEBUG State CurrentPowerState=$chassis_state\n";
+                print RFLASH_LOG_FILE_HANDLE "DEBUG State RequestedPowerTransition=$chassis_transition_state\n";
+                print RFLASH_LOG_FILE_HANDLE "DEBUG State CurrentHostState=$host_state\n";
+                print RFLASH_LOG_FILE_HANDLE "DEBUG State RequestedHostTransition=$host_transition_state\n";
+        }
         if (defined $status_info{RPOWER_STATUS_RESPONSE}{argv} and $status_info{RPOWER_STATUS_RESPONSE}{argv} =~ /bmcstate$/) {
             my $bmc_short_state = (split(/\./, $bmc_state))[-1];
             xCAT::SvrUtils::sendmsg("BMC $bmc_short_state", $callback, $node);
@@ -2694,6 +2818,11 @@ sub rpower_response {
                     }
                 }
                 xCAT::SvrUtils::sendmsg("BMC $bmc_short_state", $callback, $node);
+                if ($::UPLOAD_ACTIVATE_STREAM) {
+                    print RFLASH_LOG_FILE_HANDLE "BMC $bmc_short_state\n";
+                    my $timestamp = localtime();
+                    print RFLASH_LOG_FILE_HANDLE "$timestamp ===================Finished applying BMC firmware===================\n"; 
+                }
 
         } else {
             if ($chassis_state =~ /Off$/) {
@@ -2749,6 +2878,9 @@ sub rpower_response {
 
     if ($next_status{ $node_info{$node}{cur_status} }) {
         if ($node_info{$node}{cur_status} eq "RPOWER_CHECK_RESPONSE") {
+            if ($::UPLOAD_ACTIVATE_STREAM) {
+                print RFLASH_LOG_FILE_HANDLE "RPOWER_CHECK_RESPONSE,all_status $all_status\n";
+            }
             if ($all_status eq "$::POWER_STATE_OFF") {
                 $node_info{$node}{cur_status} = $next_status{ $node_info{$node}{cur_status} }{OFF};
             } else {
@@ -2778,6 +2910,40 @@ sub rpower_response {
             } else {
                 $node_info{$node}{cur_status} = $next_status{ $node_info{$node}{cur_status} }{ON};
             }
+        } elsif ($node_info{$node}{cur_status} eq "RPOWER_CHECK_ON_RESPONSE") {
+            #RPOWER_CHECK_ON_REQUEST and RPOWER_CHECK_ON_RESPONSE are for rflash -d function
+            #in order to make sure host is reboot successfully
+            #if rpower reset host and host state is always off, retry to set RPOWER_CHECK_ON_REQUEST to run rpower on the host
+            #1. if host power state is on, do nothing, and return
+            print RFLASH_LOG_FILE_HANDLE "Check power state in RPOWER_CHECK_ON_RESPONSE:all_status $all_status.\n";
+            if ($all_status eq "$::POWER_STATE_ON") {
+                $node_info{$node}{cur_status} = "";
+                my $timestamp = localtime();
+                print RFLASH_LOG_FILE_HANDLE "$timestamp ===================Finished applying Host firmware and resetting Host===================\n";
+                $wait_node_num--;
+                return;
+            }else{
+                #2. if host state is always off, retry to set RPOWER_CHECK_ON_REQUEST to run rpower on the host
+                if ($node_info{$node}{rpower_check_on_times} > 0) {
+                    $node_info{$node}{rpower_check_on_times}--;
+                    if ($node_info{$node}{wait_on_start}) {
+                        $node_info{$node}{wait_on_end} = time();
+                    } else {
+                        $node_info{$node}{wait_on_start} = time();
+                    }
+                    #retry to set RPOWER_CHECK_ON_REQUEST after wait for $::RPOWER_CHECK_ON_INTERVAL
+                    print RFLASH_LOG_FILE_HANDLE "Retrying to set RPOWER_CHECK_ON_REQUEST after waiting for $::RPOWER_CHECK_ON_INTERVAL seconds.\n";
+                    retry_after($node, $next_status{ $node_info{$node}{cur_status} }{OFF}, $::RPOWER_CHECK_ON_INTERVAL);
+                    return;
+                } else {
+                    #after retry 5 times, the host is still off, print error and return
+                    my $wait_time_X = $node_info{$node}{wait_on_end} - $node_info{$node}{wait_on_start};
+                    xCAT::SvrUtils::sendmsg([1, "Sent power-on command but state did not change to $::POWER_STATE_ON after waiting $wait_time_X seconds. (State=$all_status)."], $callback, $node);
+                    $node_info{$node}{cur_status} = "";
+                    $wait_node_num--;
+                    return;
+                }
+            }
         } else {
             $node_info{$node}{cur_status} = $next_status{ $node_info{$node}{cur_status} };
         }
@@ -2785,7 +2951,9 @@ sub rpower_response {
     } else {
         $wait_node_num--;
     }
-
+    if ($::UPLOAD_ACTIVATE_STREAM) {
+        close (RFLASH_LOG_FILE_HANDLE);
+    }
     return;
 }
 
@@ -2852,12 +3020,12 @@ sub rinv_response {
                 #
                 # For 'rinv firm', only print Active software, unless verbose is specified
                 #
-                if ( (%{$functional} and exists($functional->{$sw_id}) ) or 
-                     (!%{$functional} and $activation_value =~ "Active" and $priority_value == 0) or 
+                if ( (%{$functional} and exists($functional->{$sw_id}) ) or
+                     (!%{$functional} and $activation_value =~ "Active" and $priority_value == 0) or
                       $::VERBOSE ) {
                     #
                     # The space below between "Firmware Product Version:" and $content{Version} is intentional
-                    # to cause the sorting of this line before any additional info lines 
+                    # to cause the sorting of this line before any additional info lines
                     #
                     $content_info = "$purpose_value Firmware Product:   $content{Version} ($activation_value)";
                     my $indicator = "";
@@ -2868,12 +3036,12 @@ sub rinv_response {
                         $indicator = "*";
                     }
                     $content_info .= $indicator;
-                    push (@sorted_output, $content_info); 
-    
-                    if (defined($content{ExtendedVersion}) and $content{ExtendedVersion} ne "") { 
+                    push (@sorted_output, $content_info);
+
+                    if (defined($content{ExtendedVersion}) and $content{ExtendedVersion} ne "") {
                         # ExtendedVersion is going to be a comma separated list of additional software
                         my @versions = split(',', $content{ExtendedVersion});
-                        foreach my $ver (@versions) { 
+                        foreach my $ver (@versions) {
                             $content_info = "$purpose_value Firmware Product: -- additional info: $ver";
                             push (@sorted_output, $content_info);
                         }
@@ -2885,7 +3053,7 @@ sub rinv_response {
             if (! defined $content{Present}) {
                 # If the Present field is not part of the attribute, then it's most likely a callout
                 # Do not print as part of the inventory response
-                next; 
+                next;
             }
 
             # SPECIAL CASE: If 'serial' or 'model' is specified, only return the system level information
@@ -2915,7 +3083,7 @@ sub rinv_response {
     @sorted_output = () if ($status_info{RINV_FIRM_RESPONSE}{check});
     # If sorted array has any contents, sort it naturally and print it
     if (scalar @sorted_output > 0) {
-        # sort alpha, then numeric 
+        # sort alpha, then numeric
         foreach (sort natural_sort_cmp @sorted_output) {
             #
             # The firmware output requires the ID to be part of the string to sort correctly.
@@ -2965,19 +3133,19 @@ sub getopenbmccons {
     my $argr = shift;
 
     #$argr is [$node,$bmcip,$nodeuser,$nodepass];
-    my $callback = shift;
+    my $cb = shift;
 
     my $rsp;
-    my $node=$argr->[0];
-    my $output = "openbmc, getopenbmccoms";
-    xCAT::SvrUtils::sendmsg($output, $callback, $argr->[0], %allerrornodes);
+    #my $node=$argr->[0];
+    #my $output = "openbmc, getopenbmccons";
+    #xCAT::SvrUtils::sendmsg($output, $cb, $argr->[0], %allerrornodes);
 
     $rsp = { node => [ { name => [ $argr->[0] ] } ] };
     $rsp->{node}->[0]->{bmcip}->[0]    = $argr->[1];
     $rsp->{node}->[0]->{username}->[0]    = $argr->[2];
     $rsp->{node}->[0]->{passwd}->[0]  = $argr->[3];
-    $callback->($rsp);
-    return $rsp;
+    $cb->($rsp);
+    #return $rsp;
 }
 
 #-------------------------------------------------------
@@ -2996,7 +3164,7 @@ sub rsetboot_response {
     my $node = shift;
     my $response = shift;
 
-    my $response_info = decode_json $response->content;    
+    my $response_info = decode_json $response->content;
 
     if ($node_info{$node}{cur_status} eq "RSETBOOT_STATUS_RESPONSE") {
         my $one_time_enabled;
@@ -3061,7 +3229,7 @@ sub rbeacon_response {
         if ($response_info->{'message'} eq $::RESPONSE_OK) {
             xCAT::SvrUtils::sendmsg("$::BEACON_STATE_ON", $callback, $node);
         }
-    } 
+    }
 
     if ($node_info{$node}{cur_status} eq "RBEACON_OFF_RESPONSE") {
         if ($response_info->{'message'} eq $::RESPONSE_OK) {
@@ -3131,7 +3299,7 @@ sub reventlog_response {
         if ($node_info{$node}{cur_url}) {
             $next_status{"REVENTLOG_RESOLVED_RESPONSE"} = "REVENTLOG_RESOLVED_REQUEST";
         } else {
-            # Break out of this loop if there are no more IDs to resolve 
+            # Break out of this loop if there are no more IDs to resolve
             $wait_node_num--;
             return;
         }
@@ -3155,14 +3323,14 @@ sub reventlog_response {
             push @{ $status_info{REVENTLOG_RESOLVED_RESPONSE}{remain_entries} }, @entries;
         }
         else {
-            # Return if there are no entries with callout data 
+            # Return if there are no entries with callout data
             xCAT::SvrUtils::sendmsg("There are no event log entries contributing to LED fault", $callback, $node);
             $wait_node_num--;
             return;
         }
     } else {
         my $entry_string = $status_info{REVENTLOG_RESPONSE}{argv};
-        my $content_info; 
+        my $content_info;
         my %output = ();
         my $entry_num = 0;
         $entry_string = "all" if ($entry_string eq "0");
@@ -3337,12 +3505,12 @@ sub rspconfig_response {
             }
 
             my ($path, $adapter_id) = (split(/\/ipv4\//, $key_url));
-            
+
             if ($adapter_id) {
-                if ( (defined($content{Origin}) and $content{Origin} =~ /LinkLocal/) or 
+                if ( (defined($content{Origin}) and $content{Origin} =~ /LinkLocal/) or
                      (defined($content{Address}) and $content{Address} =~ /^169.254/) ) {
                     # OpenBMC driver has a interim bug where ZeroConfigIP comes up as DHCP instead of LinkLocal.
-                    # To protect xCAT while the drivers change, check the 169.254 IP also 
+                    # To protect xCAT while the drivers change, check the 169.254 IP also
                     if ($xcatdebugmode) {
                         my $debugmsg = "Found LocalLink " . $content{Address} . " for interface " . $key_url . " Ignoring...";
                         process_debug_info($node, $debugmsg);
@@ -3400,13 +3568,13 @@ sub rspconfig_response {
         if (scalar (keys %nicinfo) == 0) {
             my $error = "No valid BMC network information";
             xCAT::SvrUtils::sendmsg([1, "$error"], $callback, $node);
-            $node_info{$node}{cur_status} = "";  
+            $node_info{$node}{cur_status} = "";
         } else {
             my @address = ();
             my @ipsrc = ();
             my @netmask = ();
             my @gateway = ();
-            my @vlan = (); 
+            my @vlan = ();
             my @ntpservers = ();
             my $real_ntp_server = 0;
             my @nics = keys %nicinfo;
@@ -3453,25 +3621,25 @@ sub rspconfig_response {
                     next;
                 }
                 if ($opt eq "ip") {
-                    push @output, @address; 
+                    push @output, @address;
                 } elsif ($opt eq "ipsrc") {
                     push @output, @ipsrc;
                 } elsif ($opt eq "netmask") {
                     push @output, @netmask;
                 } elsif ($opt eq "gateway") {
-                    push @output, @gateway; 
+                    push @output, @gateway;
                 } elsif ($opt eq "vlan") {
                     push @output, @vlan;
                 }
             }
-            
+
             xCAT::SvrUtils::sendmsg("$_", $callback, $node) foreach (@output);
             if ($multiple_error and $mul_out) {
                 xCAT::SvrUtils::sendmsg([1, "$multiple_error"], $callback, $node);
                 $wait_node_num--;
                 return;
             }
-            
+
             if ($grep_string eq "all") {
                 # If all current values equal the input, just print out message
                 my @checks = split("-", $status_info{RSPCONFIG_CHECK_RESPONSE}{argv});
@@ -3516,7 +3684,7 @@ sub rspconfig_response {
             }
         }
     }
- 
+
     my $origin_type;
     if ($node_info{$node}{cur_status} eq "RSPCONFIG_CHECK_RESPONSE") {
         my @checks = split("-", $status_info{RSPCONFIG_CHECK_RESPONSE}{argv});
@@ -3627,7 +3795,7 @@ sub rspconfig_response {
         }
     } else {
         $wait_node_num--;
-    } 
+    }
 }
 
 #-------------------------------------------------------
@@ -3672,9 +3840,9 @@ sub rspconfig_api_config_response {
         }
         elsif ($node_info{$node}{cur_status} eq "RSPCONFIG_API_CONFIG_ATTR_RESPONSE") {
             if ($response_info->{'message'} eq $::RESPONSE_OK) {
-                xCAT::SvrUtils::sendmsg("BMC Setting ". 
-                                        $api_config_info{$::RSPCONFIG_CONFIGURED_API_KEY}{display_name} . 
-                                        "... " .  
+                xCAT::SvrUtils::sendmsg("BMC Setting ".
+                                        $api_config_info{$::RSPCONFIG_CONFIGURED_API_KEY}{display_name} .
+                                        "... " .
                                         $api_config_info{$::RSPCONFIG_CONFIGURED_API_KEY}{instruct_msg}, $callback, $node);
             }
             else {
@@ -3694,7 +3862,7 @@ sub rspconfig_api_config_response {
                         }
                     }
                 } else {
-                    # "data" is not a hash, field contains the value 
+                    # "data" is not a hash, field contains the value
                     $value = $response_info->{data};
                 }
                 if (($value eq "0") || ($value eq "1")) {
@@ -3711,7 +3879,7 @@ sub rspconfig_api_config_response {
                     if ($value) {
                         xCAT::SvrUtils::sendmsg($api_config_info{$::RSPCONFIG_CONFIGURED_API_KEY}{display_name} . " : $last_component", $callback, $node);
                         my $found = grep(/$value/, @valid_values);
-                        if ($found eq 0) { 
+                        if ($found eq 0) {
                             # Received data value not expected
                             xCAT::SvrUtils::sendmsg("WARNING: Unexpected value set: $value", $callback, $node);
                             xCAT::SvrUtils::sendmsg("WARNING: Valid values: " . join(",", @valid_values), $callback, $node);
@@ -3853,7 +4021,7 @@ sub rspconfig_dump_response {
             my $id;
             if (defined $content{Elapsed}) {
                 $id = $key_url;
-                $id =~ s/.*\///g; 
+                $id =~ s/.*\///g;
 
                 if ($node_info{$node}{cur_status} eq "RSPCONFIG_DUMP_CHECK_RESPONSE") {
                     if ($id eq $node_info{$node}{dump_id}) {
@@ -3867,8 +4035,8 @@ sub rspconfig_dump_response {
                 $mon += 1;
                 $year += 1900;
                 my $UTC_time = sprintf ("%02d/%02d/%04d %02d:%02d:%02d", $mon, $mday, $year, $hour, $min, $sec);
-                $dump_info{$id} = "[$id] Generated: $UTC_time, Size: $content{Size}"; 
-                
+                $dump_info{$id} = "[$id] Generated: $UTC_time, Size: $content{Size}";
+
                 if ($::RSPCONFIG_DUMP_DOWNLOAD_ALL_REQUESTED) {
                     # Save dump info for later, when dump download all
                     $node_info{$node}{dump_info}{$id} = "[$id] Generated: $UTC_time, Size: $content{Size}";
@@ -3877,7 +4045,7 @@ sub rspconfig_dump_response {
         }
 
         xCAT::SvrUtils::sendmsg("$::NO_ATTRIBUTES_RETURNED", $callback, $node) if (!%dump_info and $node_info{$node}{cur_status} eq "RSPCONFIG_DUMP_LIST_RESPONSE");
-        # If processing the "download all" request, do not print anything now. 
+        # If processing the "download all" request, do not print anything now.
         # Download function dump_download_process() will be
         # printing the output for each downloaded dump
         unless ($::RSPCONFIG_DUMP_DOWNLOAD_ALL_REQUESTED) {
@@ -3891,7 +4059,7 @@ sub rspconfig_dump_response {
                 $node_info{$node}{dump_wait_attemp} = $::RSPCONFIG_DUMP_MAX_RETRY;
             }
             if ( $node_info{$node}{dump_wait_attemp} > 0) {
-                $node_info{$node}{dump_wait_attemp} --; 
+                $node_info{$node}{dump_wait_attemp} --;
                 retry_after($node, "RSPCONFIG_DUMP_LIST_REQUEST", $::RSPCONFIG_DUMP_INTERVAL);
                 unless ($node_info{$node}{dump_wait_attemp} % int(8)) { # display message every 8 iterations of the interval
                     xCAT::SvrUtils::sendmsg("Still waiting for dump $node_info{$node}{dump_id} to be generated...", $callback, $node);
@@ -3903,7 +4071,7 @@ sub rspconfig_dump_response {
                 return;
             }
         }
-    } 
+    }
     if ($node_info{$node}{cur_status} eq "RSPCONFIG_DUMP_DOWNLOAD_ALL_RESPONSE") {
        &dump_download_all_process($node);
     }
@@ -3938,7 +4106,7 @@ sub rspconfig_dump_response {
                 $wait_node_num--;
                 return;
             }
-        } 
+        }
     }
 
     if ($node_info{$node}{cur_status} eq "RSPCONFIG_DUMP_CLEAR_RESPONSE") {
@@ -3949,7 +4117,7 @@ sub rspconfig_dump_response {
             my $error_msg = "Could not clear BMC diagnostics successfully (". $response_info->{'message'} . ")";
             xCAT::MsgUtils->message("W", { data => ["$node: $error_msg"] }, $callback) if ($next_status{ $node_info{$node}{cur_status} });
         }
-    } 
+    }
 
     if ($next_status{ $node_info{$node}{cur_status} }) {
         $node_info{$node}{cur_status} = $next_status{ $node_info{$node}{cur_status} };
@@ -4088,7 +4256,7 @@ sub rvitals_response {
     my $grep_string;
     if ($node_info{$node}{cur_status} =~ "RVITALS_LEDS_RESPONSE") {
         $grep_string = $status_info{RVITALS_LEDS_RESPONSE}{argv};
-    } else { 
+    } else {
         $grep_string = $status_info{RVITALS_RESPONSE}{argv};
     }
     my $src;
@@ -4101,7 +4269,7 @@ sub rvitals_response {
         my %content = %{ ${ $response_info->{data} }{$key_url} };
 
         my $label = (split(/\//, $key_url))[ -1 ];
-        # replace underscore with space, uppercase the first letter 
+        # replace underscore with space, uppercase the first letter
         $label =~ s/_/ /g;
         $label =~ s/\b(\w)/\U$1/g;
 
@@ -4112,16 +4280,16 @@ sub rvitals_response {
             $calc_value = (split(/\./, $content{State}))[-1];
             $content_info = $label . ": " . $calc_value ;
 
-            if ($key_url =~ "fan0") { $leds{fan0} = $calc_value; } 
-            if ($key_url =~ "fan1") { $leds{fan1} = $calc_value; } 
-            if ($key_url =~ "fan2") { $leds{fan2} = $calc_value; } 
-            if ($key_url =~ "fan3") { $leds{fan3} = $calc_value; } 
-            if ($key_url =~ "front_id") { $leds{front_id} = $calc_value; } 
-            if ($key_url =~ "front_fault") { $leds{front_fault} = $calc_value; } 
-            if ($key_url =~ "front_power") { $leds{front_power} = $calc_value; } 
-            if ($key_url =~ "rear_id") { $leds{rear_id} = $calc_value; } 
-            if ($key_url =~ "rear_fault") { $leds{rear_fault} = $calc_value; } 
-            if ($key_url =~ "rear_power") { $leds{rear_power} = $calc_value; } 
+            if ($key_url =~ "fan0") { $leds{fan0} = $calc_value; }
+            if ($key_url =~ "fan1") { $leds{fan1} = $calc_value; }
+            if ($key_url =~ "fan2") { $leds{fan2} = $calc_value; }
+            if ($key_url =~ "fan3") { $leds{fan3} = $calc_value; }
+            if ($key_url =~ "front_id") { $leds{front_id} = $calc_value; }
+            if ($key_url =~ "front_fault") { $leds{front_fault} = $calc_value; }
+            if ($key_url =~ "front_power") { $leds{front_power} = $calc_value; }
+            if ($key_url =~ "rear_id") { $leds{rear_id} = $calc_value; }
+            if ($key_url =~ "rear_fault") { $leds{rear_fault} = $calc_value; }
+            if ($key_url =~ "rear_power") { $leds{rear_power} = $calc_value; }
 
         } else {
             # print out Sensor info
@@ -4129,43 +4297,43 @@ sub rvitals_response {
             # Skip over attributes that are not asked to be printed
             #
             if ($grep_string =~ "temp") {
-                unless ( $content{Unit} =~ "DegreesC") { next; } 
-            } 
+                unless ( $content{Unit} =~ "DegreesC") { next; }
+            }
             if ($grep_string =~ "voltage") {
-                unless ( $content{Unit} =~ "Volts") { next; } 
-            } 
+                unless ( $content{Unit} =~ "Volts") { next; }
+            }
             if ($grep_string =~ "wattage") {
-                unless ( $content{Unit} =~ "Watts") { next; } 
-            } 
+                unless ( $content{Unit} =~ "Watts") { next; }
+            }
             if ($grep_string =~ "fanspeed") {
-                unless ( $content{Unit} =~ "RPMS") { next; } 
-            } 
+                unless ( $content{Unit} =~ "RPMS") { next; }
+            }
             if ($grep_string =~ "power") {
-                unless ( $content{Unit} =~ "Amperes" || $content{Unit} =~ "Joules" || $content{Unit} =~ "Watts" ) { next; } 
-            } 
+                unless ( $content{Unit} =~ "Amperes" || $content{Unit} =~ "Joules" || $content{Unit} =~ "Watts" ) { next; }
+            }
             if ($grep_string =~ "altitude") {
                 unless ( $content{Unit} =~ "Meters" ) { next; }
-            } 
+            }
 
             #
             # Calculate the adjusted value based on the scale attribute
-            #  
+            #
             $calc_value = $content{Value};
             if (!defined($calc_value)) {
-                # Handle the bug where the keyword in the API is lower case value 
+                # Handle the bug where the keyword in the API is lower case value
                 $calc_value = $content{value};
             }
 
-            if (defined $content{Scale} and $content{Scale} != 0) { 
+            if (defined $content{Scale} and $content{Scale} != 0) {
                 $calc_value = ($content{Value} * (10 ** $content{Scale}));
-            } 
+            }
 
             $content_info = $label . ": " . $calc_value;
-            if (defined($content{Unit})) { 
+            if (defined($content{Unit})) {
 	        $content_info = $content_info . " " . $sensor_units{ $content{Unit} };
             }
             push (@sorted_output, $content_info); #Save output in array
-        } 
+        }
     }
 
     if ($node_info{$node}{cur_status} =~ "RVITALS_LEDS_RESPONSE") {
@@ -4295,7 +4463,7 @@ sub rflash_response {
                 #
                 $update_activation = $update_activation . "(*)";
             } elsif ($update_priority == 0) {
-                # Priority attribute of 0 indicates the firmware to be activated on next boot 
+                # Priority attribute of 0 indicates the firmware to be activated on next boot
                 my $indicator = "(+)";
                 if (!%{$functional}) {
                     # cannot detect, so mark firmware as Active
@@ -4381,7 +4549,7 @@ sub rflash_response {
         # Special processing for file upload
         #
         # Unable to form a proper file upload request to the BMC, it fails with: 405 Method Not Allowed
-        # For now, always upload using curl commands.  
+        # For now, always upload using curl commands.
         #
         # TODO: Remove this block when proper request can be generated
         #
@@ -4398,7 +4566,7 @@ sub rflash_response {
                 sleep(1)
             } elsif ($child == 0) {
                 $async->remove_all;
-                exit(rflash_upload($node, $callback))
+                exit(rflash_upload($node, $callback));
             } else {
                 $child_node_map{$child} = $node;
             }
@@ -4436,7 +4604,7 @@ sub rflash_response {
                     if ($version ne $::UPLOAD_FILE_VERSION and $version ne $::UPLOAD_PNOR_VERSION) {
                         next;
                     }
-                    # Get values of some attributes to determine activation status 
+                    # Get values of some attributes to determine activation status
                     $activation_state{$version} = $content{Activation};
                     $progress_state{$version} = $content{Progress};
                     $priority_state{$version} = $content{Priority};
@@ -4472,17 +4640,16 @@ sub rflash_response {
                 xCAT::SvrUtils::sendmsg([1,"$flash_failed_msg"], $callback, $node);
                 $update_res = 1;
                 print RFLASH_LOG_FILE_HANDLE "$flash_failed_msg\n";
-                close (RFLASH_LOG_FILE_HANDLE);
                 $node_info{$node}{rst} = "$flash_failed_msg";
             } elsif ($activation_state{$firm_version} =~ /Software.Activation.Activations.Active/) {
                 if (scalar($priority_state{$firm_version}) == 0) {
                     $version_num ++;
-                    my $flash_success_msg = "$node: $firm_msg activation successful.";    
+                    my $flash_success_msg = "$node: $firm_msg activation successful.";
                     push @{ $rsp->{data} },$flash_success_msg;
+                    print RFLASH_LOG_FILE_HANDLE "$flash_success_msg\n";
                     # Activation state of active and priority of 0 indicates the activation has been completed
-                    if ( $length == $version_num ) { 
-                        xCAT::MsgUtils->message("I", $rsp, $callback) if ($rsp); 
-                        print RFLASH_LOG_FILE_HANDLE "$flash_success_msg\n";
+                    if ( $length == $version_num ) {
+                        xCAT::MsgUtils->message("I", $rsp, $callback) if ($rsp);
                         $node_info{$node}{rst} = "$flash_success_msg";
                         if (!$::UPLOAD_ACTIVATE_STREAM) {
                             $wait_node_num--;
@@ -4497,7 +4664,7 @@ sub rflash_response {
                     print "$firm_version update is already active, just need to set priority to 0\n";
                     if ($::UPLOAD_ACTIVATE_STREAM) {
                          $status_info{RFLASH_SET_PRIORITY_REQUEST}{init_url} =
-                             $::SOFTWARE_URL . "/$update_ids{$firm_version}/attr/Priority";   
+                             $::SOFTWARE_URL . "/$update_ids{$firm_version}/attr/Priority";
                     }
                     $next_status{ $node_info{$node}{cur_status} } = "RFLASH_SET_PRIORITY_REQUEST";
                 }
@@ -4507,7 +4674,6 @@ sub rflash_response {
                     xCAT::SvrUtils::sendmsg("$activating_progress_msg", $callback, $node);
                 }
                 print RFLASH_LOG_FILE_HANDLE "$activating_progress_msg\n";
-                close (RFLASH_LOG_FILE_HANDLE);
                 # Activation still going, sleep for a bit, then print the progress value
                 # Set next state to come back here to chect the activation status again.
                 retry_after($node, "RFLASH_UPDATE_CHECK_STATE_REQUEST", 15);
@@ -4550,7 +4716,7 @@ sub rflash_response {
                     $found_match = 1;
                     # Found a match of uploaded file version with the image in software/enumerate
 
-                    # If we have a saved expected hash ID, compare it to the one just found 
+                    # If we have a saved expected hash ID, compare it to the one just found
                     if ($::UPLOAD_FILE_HASH_ID && ($::UPLOAD_FILE_HASH_ID ne $update_id)) {
                         xCAT::SvrUtils::sendmsg([1,"Firmware uploaded but activation cancelled due to hash ID mismatch. $update_id does not match expected $::UPLOAD_FILE_HASH_ID. Verify BMC firmware is at the latest level."], $callback, $node);
                         $wait_node_num--;
@@ -4567,6 +4733,8 @@ sub rflash_response {
                     my $upload_success_msg = "Firmware upload successful. Attempting to activate firmware: $::UPLOAD_FILE_VERSION (ID: $update_id)";
                     xCAT::SvrUtils::sendmsg("$upload_success_msg", $callback, $node);
                     print RFLASH_LOG_FILE_HANDLE "$upload_success_msg\n";
+                    my $timestamp = localtime();
+                    print RFLASH_LOG_FILE_HANDLE "$timestamp ===================$upload_success_msg===================\n";
                 } elsif ($update_version eq $::UPLOAD_PNOR_VERSION) {
                     $found_pnor_match = 1;
                     if ($::UPLOAD_PNOR_HASH_ID && ($::UPLOAD_PNOR_HASH_ID ne $update_id)) {
@@ -4583,6 +4751,8 @@ sub rflash_response {
                     my $upload_success_msg = "Firmware upload successful. Attempting to activate firmware: $::UPLOAD_PNOR_VERSION (ID: $update_id)";
                     xCAT::SvrUtils::sendmsg("$upload_success_msg", $callback, $node);
                     print RFLASH_LOG_FILE_HANDLE "$upload_success_msg\n";
+                    my $timestamp = localtime();
+                    print RFLASH_LOG_FILE_HANDLE "$timestamp ===================$upload_success_msg===================\n";
                 }
 
             }
@@ -4662,16 +4832,18 @@ sub rflash_upload {
     my $curl_login_result = `$curl_login_cmd -s`;
     my $h;
     if (!$curl_login_result) {
-        my $curl_error = "Did not receive response from OpenBMC after running command '$curl_login_cmd'";
+        my $curl_error = "$::FAILED_UPLOAD_MSG. Did not receive response from OpenBMC after running command '$curl_login_cmd'";
         xCAT::SvrUtils::sendmsg([1, "$curl_error"], $callback, $node);
         print RFLASH_LOG_FILE_HANDLE "$curl_error\n";
-        $node_info{$node}{rst} = "$curl_error"; 
+        $node_info{$node}{rst} = "$curl_error";
         return 1;
-    } 
+    }
     eval { $h = from_json($curl_login_result) }; # convert command output to hash
     if ($@) {
-        my $curl_error = "Received wrong format response for command '$curl_login_cmd': $curl_login_result";
+        my $curl_error = "$::FAILED_UPLOAD_MSG. Received wrong format response for command '$curl_login_cmd': $curl_login_result";
         xCAT::SvrUtils::sendmsg([1, "$curl_error"], $callback, $node);
+        # Before writing error to log, make it a single line
+        $curl_error =~ tr{\n}{ };
         print RFLASH_LOG_FILE_HANDLE "$curl_error\n";
         $node_info{$node}{rst} = "$curl_error";
         return 1;
@@ -4701,10 +4873,10 @@ sub rflash_upload {
                 if ($xcatdebugmode) {
                     my $debugmsg = "RFLASH_FILE_UPLOAD_RESPONSE: CMD: $upload_cmd";
                     process_debug_info($node, $debugmsg);
-                }    
+                }
                 my $curl_upload_result = `$upload_cmd`;
                 if (!$curl_upload_result) {
-                    my $curl_error = "Did not receive response from OpenBMC after running command '$upload_cmd'";
+                    my $curl_error = "$::FAILED_UPLOAD_MSG. Did not receive response from OpenBMC after running command '$upload_cmd'";
                     xCAT::SvrUtils::sendmsg([1, "$curl_error"], $callback, $node);
                     print RFLASH_LOG_FILE_HANDLE "$curl_error\n";
                     $node_info{$node}{rst} = "$curl_error";
@@ -4712,8 +4884,10 @@ sub rflash_upload {
                 }
                 eval { $h = from_json($curl_upload_result) }; # convert command output to hash
                 if ($@) {
-                    my $curl_error = "Received wrong format response from command '$upload_cmd': $curl_upload_result";
+                    my $curl_error = "$::FAILED_UPLOAD_MSG. Received wrong format response from command '$upload_cmd': $curl_upload_result";
                     xCAT::SvrUtils::sendmsg([1, "$curl_error"], $callback, $node);
+                    # Before writing error to log, make it a single line
+                    $curl_error =~ tr{\n}{ };
                     print RFLASH_LOG_FILE_HANDLE "$curl_error\n";
                     $node_info{$node}{rst} = "$curl_error";
                     return 1;
@@ -4724,10 +4898,14 @@ sub rflash_upload {
                     unless ($::UPLOAD_AND_ACTIVATE or $::UPLOAD_ACTIVATE_STREAM) {
                         xCAT::SvrUtils::sendmsg("$upload_success_msg", $callback, $node);
                     }
+                    #Put a delay of 3 seconds to allow time for the BMC to untar the file we just uploaded
+                    if (defined($::UPLOAD_ACTIVATE_STREAM)){
+                        sleep 3;
+                    }
                     print RFLASH_LOG_FILE_HANDLE "$upload_success_msg\n";
                     # Try to logoff, no need to check result, as there is nothing else to do if failure
                 } else {
-                    my $upload_fail_msg = "Failed to upload update file $file :" . $h->{message} . " - " . $h->{data}->{description};
+                    my $upload_fail_msg = $::FAILED_UPLOAD_MSG . " $file :" . $h->{message} . " - " . $h->{data}->{description};
                     xCAT::SvrUtils::sendmsg("$upload_fail_msg", $callback, $node);
                     print RFLASH_LOG_FILE_HANDLE "$upload_fail_msg\n";
                     close (RFLASH_LOG_FILE_HANDLE);
diff --git a/xCAT-server/lib/xcat/plugins/openbmc2.pm b/xCAT-server/lib/xcat/plugins/openbmc2.pm
index 66d955d6b..9ccfac90a 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc2.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc2.pm
@@ -76,7 +76,7 @@ sub preprocess_request {
     }
     # Request usage for openbmc sections only
     my $usage_string = xCAT::Usage->parseCommand($command . ".openbmc", @exargs);
- 
+
     if ($usage_string) {
         if ($usage_string =~ /cannot be found/) {
             # Could not find usage for openbmc section, try getting usage for all sections
@@ -241,7 +241,7 @@ sub parse_args {
                 }
                 return ([ 1, "Invalid firmware specified with '$option'"]) if (!@ARGV);
                 my $param = $ARGV[0];
-                return ([ 1, "Invalid firmware specified with '$option': $param"]) if (($delete and $param !~ /^[[:xdigit:]]+$/i) 
+                return ([ 1, "Invalid firmware specified with '$option': $param"]) if (($delete and $param !~ /^[[:xdigit:]]+$/i)
                     or ($activate and $param !~ /^[[:xdigit:]]+$/i and $param !~ /.*\.tar$/i) or ($upload and $param !~ /.*\.tar$/i));
             }
         }
@@ -497,8 +497,8 @@ sub parse_node_info {
 sub refactor_args {
     my $request = shift;
     my $command   = $request->{command}->[0];
-    my $extrargs  = $request->{arg};    
-    my $subcommand; 
+    my $extrargs  = $request->{arg};
+    my $subcommand;
     if ($command eq "rspconfig") {
         $subcommand = $extrargs->[0];
         if ($subcommand !~ /^dump$|^sshcfg$|^ip=dhcp$|^gard$/) {
@@ -548,7 +548,7 @@ sub refactor_args {
             }
         }
         @$extrargs = grep(/.+/, @new_args);
-    } 
+    }
     return 0;
 }
 
diff --git a/xCAT-server/lib/xcat/plugins/osdistro.pm b/xCAT-server/lib/xcat/plugins/osdistro.pm
index 04e359b9f..d6b573a57 100644
--- a/xCAT-server/lib/xcat/plugins/osdistro.pm
+++ b/xCAT-server/lib/xcat/plugins/osdistro.pm
@@ -77,9 +77,9 @@ sub process_request
 
 =head3  getOSdistroref
 
-  check whether the specified osdistro is referenced 
-  by any osimage. if yes, return the string of 
-  osimage names, return undef otherwise 
+  check whether the specified osdistro is referenced
+  by any osimage. if yes, return the string of
+  osimage names, return undef otherwise
 
 =cut
 
@@ -125,7 +125,7 @@ sub getOSdistroref
 
 =head3  rmosdistro
 
-  remove osdistro,including remove osdistro directory 
+  remove osdistro,including remove osdistro directory
   and entry in osdistro table
 
 =cut
diff --git a/xCAT-server/lib/xcat/plugins/packimage.pm b/xCAT-server/lib/xcat/plugins/packimage.pm
index 99303bcbb..02adbf975 100755
--- a/xCAT-server/lib/xcat/plugins/packimage.pm
+++ b/xCAT-server/lib/xcat/plugins/packimage.pm
@@ -102,8 +102,8 @@ sub process_request {
     my $envars;
     my $help;
     my $version;
-    my $lock;  
- 
+    my $lock;
+
     GetOptions(
         "profile|p=s" => \$profile,
         "arch|a=s"    => \$arch,
@@ -212,7 +212,7 @@ sub process_request {
     }
     $rootimg_dir = "$destdir/rootimg";
 
-    
+
     my $retcode;
     ($retcode,$lock)=xCAT::Utils->acquire_lock_imageop($rootimg_dir);
     if($retcode){
@@ -428,13 +428,19 @@ sub process_request {
     if (not $nosyncfiles) {
         # sync fils configured in the synclist to the rootimage
         $syncfile = xCAT::SvrUtils->getsynclistfile(undef, $osver, $arch, $profile, "netboot", $imagename);
-        if ( defined($syncfile) && -f $syncfile && -d $rootimg_dir) {
+        if ( defined($syncfile) && -d $rootimg_dir) {
             my $myenv='';
             if($envars){
                 $myenv.=" XCAT_OSIMAGE_ENV=$envars";
             }
-            print "Syncing files from $syncfile to root image dir: $rootimg_dir\n";
-            system("$myenv $::XCATROOT/bin/xdcp -i $rootimg_dir -F $syncfile");
+            my @filelist = split ',', $syncfile;
+            foreach my $synclistfile (@filelist) {
+                if ( -f $synclistfile) {
+                    print "Syncing files from $synclistfile to root image dir: $rootimg_dir\n";
+                    my $cmd = "$myenv $::XCATROOT/bin/xdcp -i $rootimg_dir -F $synclistfile";
+                    xCAT::Utils->runcmd($cmd, 0, 1);
+                }
+            }
         }
     } else {
         print "Bypass of syncfiles requested, will not sync files to root image directory.\n";
@@ -501,8 +507,8 @@ sub process_request {
     }
 
     $suffix = $method.".".$suffix;
-    unlink glob("$destdir/rootimg.*");   
- 
+    unlink glob("$destdir/rootimg.*");
+
     if ($method =~ /cpio/) {
         if (!$excludestr) {
             $excludestr = "find . -xdev -print0 | cpio -H newc -o -0 | $compress -c - > ../rootimg.$suffix";
@@ -552,7 +558,7 @@ sub process_request {
         $callback->({ info => ["$outputmsg"] });
     }else{
         $callback->({ info => ["$outputmsg"] });
-        $callback->({ error => ["packimage failed while running: \n $excludestr"], errorcode => [1] }); 
+        $callback->({ error => ["packimage failed while running: \n $excludestr"], errorcode => [1] });
         system("rm -rf $xcat_packimg_tmpfile");
         return 1;
     }
diff --git a/xCAT-server/lib/xcat/plugins/pdu.pm b/xCAT-server/lib/xcat/plugins/pdu.pm
index e732b8064..9e528ca5c 100644
--- a/xCAT-server/lib/xcat/plugins/pdu.pm
+++ b/xCAT-server/lib/xcat/plugins/pdu.pm
@@ -2,10 +2,10 @@
 #-------------------------------------------------------
 
 =head1
-  xCAT plugin package to handle pdu 
+  xCAT plugin package to handle pdu
 
    Supported command:
-        rpower 
+        rpower
         rinv
         rvitals
 
@@ -72,8 +72,8 @@ sub handled_commands
 sub pdu_usage
 {
     my ($callback, $command) = @_;
-    my $usagemsg = 
-    "Usage: 
+    my $usagemsg =
+    "Usage:
      The following commands support both type of PDUs :
         pdudiscover [<noderange>|--range ipranges] [-r|-x|-z] [-w] [-V|--verbose] [--setup]
         rpower pdunodes [off|on|stat|reset]
@@ -81,7 +81,7 @@ sub pdu_usage
         rvitals   pdunodes
 
      The following commands support IR PDU with pdutype=irpdu :
-        rpower computenodes [pduoff|pduon|pdustat|pdustatus|pdureset] 
+        rpower computenodes [pduoff|pduon|pdustat|pdustatus|pdureset]
         rspconfig irpdunode [hostname=<NAME>|ip=<IP>|gateway=<GATEWAY>|mask=<MASK>]
 
      The following commands support CR PDU with pdutype=crpdu :
@@ -90,7 +90,7 @@ sub pdu_usage
         rspconfig pdunodes snmpcfg
         rspconfig pdunode [hostname=<NAME>|ip=<IP>|mask=<MASK>]
         \n";
-                    
+
     if ($callback)
     {
         my $rsp = {};
@@ -197,13 +197,13 @@ sub process_request
             #there are 2 cases will enter this block
             #one is if node's mgt is pdu
             #another is if node has pdu attribute but mgt isn't pdu
-            #if the node has pdu attribute but mgt isn't pdu, 
-            #should do nothing for this node, let other plugin to hanle this node 
+            #if the node has pdu attribute but mgt isn't pdu,
+            #should do nothing for this node, let other plugin to hanle this node
             #-------------------------------------------
             my @allpdunodes=();
             my $nodehm = xCAT::Table->new('nodehm');
             my $nodehmhash = $nodehm->getNodesAttribs($noderange, ['mgt']);
-            foreach my $node (@$noderange) { 
+            foreach my $node (@$noderange) {
                 if($nodehmhash->{$node}->[0]->{mgt} eq 'pdu'){
                     push @allpdunodes, $node;
                 }
@@ -246,7 +246,7 @@ sub process_request
 
 #-------------------------------------------------------
 
-=head3  fill_outletcount 
+=head3  fill_outletcount
 
   Get outlet count for IR PDU.
 
@@ -274,7 +274,7 @@ sub fill_outletCount {
 
 #-------------------------------------------------------
 
-=head3  powerpdu 
+=head3  powerpdu
 
     Process power command (stat/off/on) for pdu/pdus
 
@@ -322,10 +322,10 @@ sub powerpdu {
         for (my $outlet =1; $outlet <= $count; $outlet++)
         {
             outletpower($session, $outlet, $value);
-            if ($session->{ErrorStr}) { 
+            if ($session->{ErrorStr}) {
                 $callback->({ errorcode => [1],error => "Failed to get outlet status for $node"});
             } else {
-                my $output = " outlet $outlet is $statstr"; 
+                my $output = " outlet $outlet is $statstr";
                 xCAT::SvrUtils::sendmsg($output, $callback, $node, %allerrornodes);
             }
         }
@@ -334,10 +334,10 @@ sub powerpdu {
 
 #-------------------------------------------------------
 
-=head3  powerpduoutlet 
+=head3  powerpduoutlet
 
     Process power command (pdustat/pduoff/pduon) for compute nodes,
-    the pdu attribute needs to be set 
+    the pdu attribute needs to be set
 
 =cut
 
@@ -399,12 +399,12 @@ sub powerpduoutlet {
                 outletpower($session, $outlet, $value);
             } else {
                 $callback->({ error => "$subcmd is not support"});
-            } 
-    
-            if ($session->{ErrorStr}) { 
+            }
+
+            if ($session->{ErrorStr}) {
                 $callback->({ errorcode => [1],error => "$node: $pdu outlet $outlet has error = $session->{ErrorStr}"});
             } else {
-                $output = "$pdu operational state for outlet $outlet is $statstr"; 
+                $output = "$pdu operational state for outlet $outlet is $statstr";
                 xCAT::SvrUtils::sendmsg($output, $callback, $node, %allerrornodes);
             }
         }
@@ -413,7 +413,7 @@ sub powerpduoutlet {
 
 #-------------------------------------------------------
 
-=head3  outletpower 
+=head3  outletpower
 
     Process power command for one pdu outlet,
 
@@ -437,7 +437,7 @@ sub outletpower {
 
 #-------------------------------------------------------
 
-=head3  powerstat 
+=head3  powerstat
 
     Process command to query status of pdu
 
@@ -473,11 +473,11 @@ sub powerstat {
                         }
                     }
                     if ($seclevel eq "authNoPriv") {
-                        $snmpcmd = "snmpwalk -v3 -u $snmpuser -a $authtype -A $authkey -l $seclevel"; 
+                        $snmpcmd = "snmpwalk -v3 -u $snmpuser -a $authtype -A $authkey -l $seclevel";
                     } elsif ($seclevel eq "authPriv") {
-                        $snmpcmd = "snmpwalk -v3 -u $snmpuser -a $authtype -A $authkey -l $seclevel -x $privtype -X $privkey"; 
+                        $snmpcmd = "snmpwalk -v3 -u $snmpuser -a $authtype -A $authkey -l $seclevel -x $privtype -X $privkey";
                     } else {   #default to notAuthNoPriv
-                        $snmpcmd = "snmpwalk -v3 -u $snmpuser -l $seclevel"; 
+                        $snmpcmd = "snmpwalk -v3 -u $snmpuser -l $seclevel";
                     }
                 } else {
                     xCAT::SvrUtils::sendmsg("ERROR: No snmpuser or Security level defined for snmpV3 configuration", $callback,$pdu);
@@ -486,10 +486,10 @@ sub powerstat {
                     xCAT::SvrUtils::sendmsg("    then run 'rspconfig $pdu snmpcfg' command ", $callback,$pdu);
                     next;
                 }
-            } else { 
+            } else {
                 # use default value
                 $snmpcmd = "snmpwalk -v3 -u admin -a MD5 -A password1 -l authPriv -x DES -X password2";
-            } 
+            }
             for (my $relay = 1; $relay <= 3; $relay++) {
                 relaystat($pdu, $relay, $snmpcmd, $callback);
             }
@@ -515,11 +515,11 @@ sub powerstat {
 
 #-------------------------------------------------------
 
-=head3  outletstat 
+=head3  outletstat
 
     Process command to query status of one pdu outlet
     ibmPduOutletState defined from mib file
-         off(0) 
+         off(0)
          on(1)
          cycling(2)
          delaySwitch10(3)
@@ -532,7 +532,7 @@ sub powerstat {
 sub outletstat {
     my $session = shift;
     my $outlet = shift;
- 
+
     my $oid = ".1.3.6.1.4.1.2.6.223.8.2.2.1.11";
     my $output;
     my $statstr;
@@ -561,9 +561,9 @@ sub outletstat {
 
 #-------------------------------------------------------
 
-=head3  connectTopdu 
+=head3  connectTopdu
 
-   connect pdu via snmp session 
+   connect pdu via snmp session
 
 =cut
 
@@ -623,10 +623,10 @@ sub connectTopdu {
 
 #-------------------------------------------------------
 
-=head3  process_netcfg 
-   
+=head3  process_netcfg
+
     Config hostname of PDU
-    Config ip/netmask of PDU via PduManager command 
+    Config ip/netmask of PDU via PduManager command
       PduManager is a tool for CoralPdu to manager the PDU.
       * /dev/shm/bin/PduManager -h
           '-i' set PDU system IP
@@ -672,7 +672,7 @@ sub process_netcfg {
     my $discover_ip = $nodehash->{$pdu}->[0]->{otherinterfaces};
 
     unless ($pduhash->{$pdu}->[0]->{pdutype} eq "crpdu") {
-        netcfg_for_irpdu($pdu, $static_ip, $discover_ip, $request, $subreq, $callback); 
+        netcfg_for_irpdu($pdu, $static_ip, $discover_ip, $request, $subreq, $callback);
         return;
     }
 
@@ -722,7 +722,7 @@ sub process_netcfg {
                 xCAT::SvrUtils::sendmsg("Failed to run $dshcmd, error=$err", $callback);
                 return;
             }
-        } 
+        }
         xCAT::SvrUtils::sendmsg("$dshcmd ran successfully", $callback);
         xCAT::Utils->runxcmd({ command => ['chdef'], arg => ['-t','node','-o',$pdu,"ip=$ip","otherinterfaces="] }, $subreq, 0, 1);
         xCAT::Utils->runxcmd({ command => ['makehosts'], node => [$pdu] },  $subreq, 0, 1);
@@ -734,16 +734,16 @@ sub process_netcfg {
 
 #-------------------------------------------------------
 
-=head3  process_sshcfg 
-   
-    Config passwordless for coralpdu 
+=head3  process_sshcfg
 
-    example:  rspconfig coralpdu sshcfg 
+    Config passwordless for coralpdu
+
+    example:  rspconfig coralpdu sshcfg
 
 =cut
 
 #-------------------------------------------------------
-sub process_sshcfg { 
+sub process_sshcfg {
     my $noderange = shift;
     my $subcmd = shift;
     my $callback = shift;
@@ -796,7 +796,7 @@ sub process_sshcfg {
 
 #-------------------------------------------------------
 
-=head3  session_connect 
+=head3  session_connect
 
   open a expect session and connect to CR PDU.
 
@@ -859,7 +859,7 @@ sub session_connect {
 
 #-------------------------------------------------------
 
-=head3  session_exec 
+=head3  session_exec
 
   execute command to CR PDU.
 
@@ -889,9 +889,9 @@ sub session_exec {
 #-----------------------------------------------------------------
 
 =head3  process_pdudiscover
-   
+
     Discover the pdu for a given range of DHCP ip address
-    it will call switchdiscover command with -s snmp --pdu options 
+    it will call switchdiscover command with -s snmp --pdu options
 
     example: pdudiscover --range iprange -w
 
@@ -932,12 +932,12 @@ sub process_pdudiscover {
 
 #-------------------------------------------------------
 
-=head3  showMFR 
+=head3  showMFR
 
-    show MFR information of PDU via PduManager command 
+    show MFR information of PDU via PduManager command
       PduManager is a tool for CoralPdu to manager the PDU.
       * /dev/shm/bin/PduManager -h
-          '-m' show MFR info 
+          '-m' show MFR info
 
     example:  rinv coralpdu
 
@@ -1039,15 +1039,15 @@ sub rinv_for_irpdu
 
 #-------------------------------------------------------
 
-=head3  showMonitorData 
+=head3  showMonitorData
 
-    Show realtime monitor data(input voltage, current, power) 
-        of PDU via PduManager command 
+    Show realtime monitor data(input voltage, current, power)
+        of PDU via PduManager command
     PduManager is a tool for CoralPdu to manager the PDU.
       * /dev/shm/bin/PduManager -h
-          '-d' show realtime monitor data(input voltage, current, power) 
+          '-d' show realtime monitor data(input voltage, current, power)
 
-    example:  rvitals coralpdu 
+    example:  rvitals coralpdu
 
 =cut
 
@@ -1148,7 +1148,7 @@ sub rvitals_for_irpdu
 
 #-------------------------------------------------------
 
-=head3  relaystat 
+=head3  relaystat
 
   process individual relay stat for CR PDU.
   The OID for 3 relay:
@@ -1167,9 +1167,9 @@ sub relaystat {
 
     my $relayoid = $relay + 12;
 
-    #default pdu snmpv3, won't show up for snmpv1 
+    #default pdu snmpv3, won't show up for snmpv1
     my $cmd = "$snmpcmd $pdu 1.3.6.1.4.1.2.6.262.15.2.$relayoid";
-        
+
     my $result = xCAT::Utils->runcmd($cmd, 0);
     my ($msg,$stat) = split /: /, $result;
     if ($stat eq "1" ) {
@@ -1185,7 +1185,7 @@ sub relaystat {
 
 #-------------------------------------------------------
 
-=head3  process_powerrelay 
+=head3  process_powerrelay
 
   process relay action for CR PDU.
 
@@ -1230,7 +1230,7 @@ sub process_powerrelay {
 
 #-------------------------------------------------------
 
-=head3  process_relay 
+=head3  process_relay
 
   process relay action for CR PDU.
 
@@ -1262,7 +1262,7 @@ sub process_relay {
     my $ret;
     my $err;
     my $statestr;
-    
+
 
     for (my $i = 0; $i < $relay_count; $i++) {
         my $relay = $relay_num;
@@ -1285,7 +1285,7 @@ sub process_relay {
 
 #-------------------------------------------------------
 
-=head3  realy_action 
+=head3  realy_action
 
   process individual relay action for CR PDU.
 
@@ -1310,7 +1310,7 @@ sub relay_action {
 
 #-------------------------------------------------------
 
-=head3  process_snmpcfg 
+=head3  process_snmpcfg
 
   config snmp and snmpv3 for CR PDU.
 
@@ -1446,9 +1446,9 @@ sub netcfg_for_irpdu {
 
     my $timeout = 10;
     my $send_change = "N";
-  
+
     my $login_ip;
-   
+
     # somehow, only system command works for checking if irpdu is pingable
     # Net::Ping Module and xCAT::NetworkUtils::isPingable both are not working
     if (system("ping -c 2 $static_ip") == 0 ) {
@@ -1459,7 +1459,7 @@ sub netcfg_for_irpdu {
         xCAT::SvrUtils::sendmsg(" is not reachable", $callback,$pdu);
         return;
     }
-    
+
     foreach my $cmd (@exargs) {
         my ($key, $value) = split(/=/, $cmd);
         if ($key =~ /hostname/) {
@@ -1547,7 +1547,7 @@ sub netcfg_for_irpdu {
         ],
     );
 
-    if (defined($result[1])) 
+    if (defined($result[1]))
     {
         my $errmsg = $result[1];
         $mypdu->soft_close();
diff --git a/xCAT-server/lib/xcat/plugins/petitboot.pm b/xCAT-server/lib/xcat/plugins/petitboot.pm
index ec53c84b0..d9af33974 100644
--- a/xCAT-server/lib/xcat/plugins/petitboot.pm
+++ b/xCAT-server/lib/xcat/plugins/petitboot.pm
@@ -89,7 +89,7 @@ sub setstate {
     my $tftpdir      = shift;
     my %nrhash       = %{ shift() };
     my $linuximghash = shift();
-    my $kern = $bphash{$node}->[0]; 
+    my $kern = $bphash{$node}->[0];
 
     if ($kern->{kernel} !~ /^$tftpdir/) {
         my $nodereshash = $nrhash{$node}->[0];
@@ -209,7 +209,7 @@ my $errored = 0;
 
 sub pass_along {
     my $resp = shift;
-    return unless ($resp); 
+    return unless ($resp);
 
     my $failure = 0;
     if ($resp->{errorabort}) { # Global error, it normally means to stop the parent execution. For example, DB operation error.
@@ -550,7 +550,7 @@ sub process_request {
                 arg      => \@args,
                 bootparams => \%bphash},
                 \&pass_along);
-        if ($errored) { 
+        if ($errored) {
             xCAT::MsgUtils->trace($verbose_on_off, "d", "petitboot: Failed in processing setdestiny.");
             return if ($errored > 1);
         }
diff --git a/xCAT-server/lib/xcat/plugins/prescripts.pm b/xCAT-server/lib/xcat/plugins/prescripts.pm
index 4693dba2b..36fbf64b7 100644
--- a/xCAT-server/lib/xcat/plugins/prescripts.pm
+++ b/xCAT-server/lib/xcat/plugins/prescripts.pm
@@ -39,7 +39,7 @@ sub handled_commands
 #-------------------------------------------------------
 
 =head3  preprocess_request
-  Check and setup for hierarchy 
+  Check and setup for hierarchy
 =cut
 
 #-------------------------------------------------------
@@ -448,7 +448,7 @@ sub parseprescripts
 #-------------------------------------------------------
 
 =head3  run_script_single_node
-   
+
 =cut
 
 #-------------------------------------------------------
diff --git a/xCAT-server/lib/xcat/plugins/profilednodes.pm b/xCAT-server/lib/xcat/plugins/profilednodes.pm
index d44beca15..b3708cf9f 100644
--- a/xCAT-server/lib/xcat/plugins/profilednodes.pm
+++ b/xCAT-server/lib/xcat/plugins/profilednodes.pm
@@ -4,7 +4,7 @@
 =head1
 
     xCAT plugin to support Profiled nodes management
-    
+
 =cut
 
 #-------------------------------------------------------
@@ -327,14 +327,14 @@ sub validate_args {
 
 #-------------------------------------------------------
 
-=head3 nodeimport 
+=head3 nodeimport
 
-    Description : 
+    Description :
     Create profiled nodes by importing hostinfo file.
     This sub maps to request "nodeimport", we need to call this command from CLI like following steps:
     # ln -s /opt/xcat/bin/xcatclientnnr /opt/xcat/bin/nodeimport
-    # nodeimport file=/root/hostinfo.file networkprofile=network_cn imageprofile=rhel63_cn hardwareprofile=ipmi groups=group1,group2 
-    
+    # nodeimport file=/root/hostinfo.file networkprofile=network_cn imageprofile=rhel63_cn hardwareprofile=ipmi groups=group1,group2
+
     The hostinfo file should be written like: (MAC address is mandatory attribute)
     # Auto generate hostname for this node entry.
     __hostname__:
@@ -354,9 +354,9 @@ sub nodeimport {
     xCAT::MsgUtils->message('S', "Import profiled nodes through hostinfo file.");
 
     my $helpmsg = "nodeimport: create profiled nodes by importing hostinfo file.
-Usage: 
+Usage:
 \tnodeimport file=<hostinfo file> networkprofile=<networkprofile> imageprofile=<imageprofile> hostnameformat=<hostnameformat> [hardwareprofile=<hardwareprofile>] [groups=<groups>]
-\tnodeimport [-h|--help] 
+\tnodeimport [-h|--help]
 \tnodeimport {-v|--version}";
 
     my @enabledparams = ('file', 'groups', 'networkprofile', 'hardwareprofile', 'imageprofile', 'hostnameformat');
@@ -684,9 +684,9 @@ Usage:
 sub nodepurge {
     my $nodes = $request->{node};
     my $helpmsg = "nodepurge: Removes nodes from database and system configuration.
-Usage: 
+Usage:
 \tnodepurge <noderange>
-\tnodepurge [-h|--help] 
+\tnodepurge [-h|--help]
 \tnodepurge {-v|--version}";
 
     my $ret = validate_args($helpmsg);
@@ -753,9 +753,9 @@ sub noderefresh
 {
     my $nodes   = $request->{node};
     my $helpmsg = "noderefresh: Calls kit plugins for the nodes in the profile.
-Usage: 
+Usage:
 \tnoderefresh <noderange>
-\tnoderefresh [-h|--help] 
+\tnoderefresh [-h|--help]
 \tnoderefresh {-v|--version}";
 
     if (!$nodes) {
@@ -790,9 +790,9 @@ Usage:
 sub nodechprofile {
     my $nodes   = $request->{node};
     my $helpmsg = "nodechprofile: Update node profiles for profiled nodes.
-Usage: 
+Usage:
 \tnodechprofile <noderange> [networkprofile=<networkprofile>] [imageprofile=<imageprofile>] [hardwareprofile=<hardwareprofile>]
-\tnodechprofile [-h|--help] 
+\tnodechprofile [-h|--help]
 \tnodechprofile {-v|--version}";
     if (!$nodes) {
         setrsp_infostr($helpmsg);
@@ -1106,7 +1106,7 @@ sub noderegenips
     my $nodes   = $request->{node};
     my $helpmsg = "noderegenips: Regenerate nodes IP addresses.
 Usage:
-\tnoderegenips <noderange> [nics=<eth0,eth1...>] 
+\tnoderegenips <noderange> [nics=<eth0,eth1...>]
 \tnoderegenips [-h|--help]
 \tnoderegenips {-v|--version}";
     if (!$nodes) {
@@ -1316,9 +1316,9 @@ sub nodeaddunmged
 {
     xCAT::MsgUtils->message("Adding a unmanaged node.");
     my $helpmsg = "nodeaddunmged: Creates an unmanaged node specifying the node name and IP address
-Usage: 
+Usage:
 \tnodeaddunmged hostname<hostname> ip=<ip>
-\tnodeaddunmged [-h|--help] 
+\tnodeaddunmged [-h|--help]
 \tnodeaddunmged {-v|--version}";
 
     my @enabledparams = ('hostname', 'ip');
@@ -1400,9 +1400,9 @@ sub nodechmac
 {
     xCAT::MsgUtils->message("Replacing node's mac address.");
     my $helpmsg = "nodechmac: updates the MAC address for a provisioning network interface.
-Usage: 
+Usage:
 \tnodechmac <node> mac=<mac>
-\tnodechmac [-h|--help] 
+\tnodechmac [-h|--help]
 \tnodechmac  {-v|--version}";
 
     my @enabledparams = ('mac');
@@ -1546,16 +1546,16 @@ Usage:
 
 #-------------------------------------------------------
 
-=head3 nodediscoverstart 
+=head3 nodediscoverstart
 
     Description : Start profiled nodes discovery. If already started, return a failure.
-                  User should specify networkprofile, hardwareprofile, 
+                  User should specify networkprofile, hardwareprofile,
                   imageprofile, hostnameformat, rack, chassis, height and u so
-                  that node's IP address will be generated automatcially 
+                  that node's IP address will be generated automatcially
                   according to networkprofile, node's hardware settings will
                   be set according to hardware profile, node's os settings will
-                  be set according to image profile, node's hostname will be 
-                  set according to hostnameformat and rank. And other node's 
+                  be set according to image profile, node's hostname will be
+                  set according to hostnameformat and rank. And other node's
                   attribs will also be set according to rack, chassis, height and u.
     Arguments   : N/A
 
@@ -1566,9 +1566,9 @@ sub nodediscoverstart {
     xCAT::MsgUtils->message("Profiled nodes discovery started.");
 
     my $helpmsg = "nodediscoverstart: Start profiled nodes discovery.
-Usage: 
+Usage:
 \tnodediscoverstart networkprofile=<networkprofile> imageprofile=<imageprofile> hostnameformat=<hostnameformat> [hardwareprofile=<hardwareprofile>] [groups=<groups>] [rack=<rack>] [chassis=<chassis>] [height=<height>] [unit=<unit>] [rank=rank]
-\tnodediscoverstart [-h|--help] 
+\tnodediscoverstart [-h|--help]
 \tnodediscoverstart {-v|--version}
 ";
 
@@ -1708,7 +1708,7 @@ Usage:
 
 =head3  nodediscoverstop
 
-    Description : Stop profiled nodes auto discover. This action will remove the 
+    Description : Stop profiled nodes auto discover. This action will remove the
                   dababase flags.
     Arguments   : N/A
 
@@ -1718,9 +1718,9 @@ Usage:
 sub nodediscoverstop {
 
     my $helpmsg = "nodediscoverstop: stops node auto-discovery.
-Usage: 
+Usage:
 \tnodediscoverstop
-\tnodediscoverstop [-h|--help] 
+\tnodediscoverstop [-h|--help]
 \tnodediscoverstop {-v|--version}";
 
     my $ret = validate_args($helpmsg);
@@ -1771,9 +1771,9 @@ Usage:
 sub nodediscoverstatus {
 
     my $helpmsg = "nodediscoverstatus: detects if node discovery is running.
-Usage: 
+Usage:
 \tnodediscoverstatus
-\tnodediscoverstatus [-h|--help] 
+\tnodediscoverstatus [-h|--help]
 \tnodediscoverstatus {-v|--version}";
 
     my $ret = validate_args($helpmsg);
@@ -1803,9 +1803,9 @@ Usage:
 #-------------------------------------------------------
 sub nodediscoverls {
     my $helpmsg = "nodediscoverls: lists all discovered nodes using profiles.
-Usage: 
+Usage:
 \tnodediscoverls
-\tnodediscoverls [-h|--help] 
+\tnodediscoverls [-h|--help]
 \tnodediscoverls {-v|--version}";
 
     my $ret = validate_args($helpmsg);
@@ -1865,9 +1865,9 @@ Usage:
 
 =head3  findme
 
-    Description : The default interface for node discovery. 
-                  We must implement this method so that 
-                  profiled nodes's findme request can be answered 
+    Description : The default interface for node discovery.
+                  We must implement this method so that
+                  profiled nodes's findme request can be answered
                   while profiled nodes discovery is running.
     Arguments   : N/A
 
@@ -2074,7 +2074,7 @@ sub findme {
 
 =head3  gen_new_hostinfo_dict
 
-    Description : Generate full hostinfo dict 
+    Description : Generate full hostinfo dict
     Arguments   : hostinfo_dict_ref - The reference of hostinfo dict.
     Returns     : (returnvalue, returnmsg)
                   returnvalue - 0, stands for generate new hostinfo dict failed.
@@ -2352,13 +2352,13 @@ sub read_and_generate_hostnames {
 #-------------------------------------------------------
 
 =head3  validate_node_entries
-    
+
     Description : Validate the node entrie and generate proper attributes.
     Arguments   : N/A
     Returns     : (hostinfo_dict, invalid_records)
                   hostinfo_dict -  Reference of hostinfo dict. Key are hostnames and values is an attributes dict.
                   invalid_records - Reference of invalid records list.
-=cut    
+=cut
 
 #-------------------------------------------------------
 sub validate_node_entries {
@@ -2523,13 +2523,13 @@ sub validate_node_entries {
 #-------------------------------------------------------
 
 =head3  validate_node_entry
-    
+
     Description : Validate a node info hash.
     Arguments   : node_name - node hostname.
                   node_entry_ref - Reference of the node info hash.
     Returns     : errormsg
                       - undef: stands for no errror.
-                      - valid string: stands for the error message of validation.    
+                      - valid string: stands for the error message of validation.
 =cut
 
 #-------------------------------------------------------
@@ -2768,7 +2768,7 @@ sub validate_node_entry {
 #-------------------------------------------------------
 
 =head3  setrsp_invalidrecords
-    
+
     Description : Set response for processing invalid host records.
     Arguments   : recordsref - Refrence of invalid nodes list.
 
@@ -2805,7 +2805,7 @@ sub setrsp_invalidrecords
 #-------------------------------------------------------
 
 =head3  setrsp_errormsg
-    
+
     Description : Set response for error messages.
     Arguments   : errormsg - Error messages.
 
@@ -2825,7 +2825,7 @@ sub setrsp_errormsg
 #-------------------------------------------------------
 
 =head3  setrsp_infostr
-    
+
     Description : Set response for a info string.
     Arguments   : infostr - The info string..
 
@@ -2844,7 +2844,7 @@ sub setrsp_infostr
 #-------------------------------------------------------
 
 =head3  setrsp_progress
-    
+
     Description : Set response for running progress
     Arguments   : progress: the progress string.
 
@@ -2865,7 +2865,7 @@ sub setrsp_progress
 #-------------------------------------------------------
 
 =head3  setrsp_success
-    
+
     Description : Set response for successfully processed nodes.
     Arguments   : recordsref - Refrence of nodes list.
 
diff --git a/xCAT-server/lib/xcat/plugins/pxe.pm b/xCAT-server/lib/xcat/plugins/pxe.pm
index f35afae12..0031d9bdf 100644
--- a/xCAT-server/lib/xcat/plugins/pxe.pm
+++ b/xCAT-server/lib/xcat/plugins/pxe.pm
@@ -665,7 +665,7 @@ sub process_request {
         nodes  --- a pointer to an array of nodes
         states -- a pointer to a hash table. This hash will be filled by this
              function. The key is the nodeset status and the value is a pointer
-             to an array of nodes. 
+             to an array of nodes.
     Returns:
        (return code, error message)
 =cut
diff --git a/xCAT-server/lib/xcat/plugins/rinstall.pm b/xCAT-server/lib/xcat/plugins/rinstall.pm
index 735ed9bca..7bc13461a 100644
--- a/xCAT-server/lib/xcat/plugins/rinstall.pm
+++ b/xCAT-server/lib/xcat/plugins/rinstall.pm
@@ -69,8 +69,8 @@ sub rinstall {
     my $CONSOLE;
     my $OSIMAGE;
     my $STATES;
-    my $RESTSTATES;
     my $ignorekernelchk;
+    my $noupdateinitrd;
     my $VERBOSE;
     my $HELP;
     my $VERSION;
@@ -82,6 +82,7 @@ sub rinstall {
     my $nodes;
     my @nodes;
     my %nodes;
+    my $rsp = {};
 
     # There are nodes
     if (defined($req->{node})) {
@@ -100,7 +101,6 @@ sub rinstall {
     if (($command =~ /rinstall/) or ($command =~ /winstall/)) {
         my $ret=xCAT::Usage->validateArgs($command,@ARGV);
         if ($ret->[0]!=0) {
-             my $rsp={};
              $rsp->{error}->[0] = $ret->[1];
              $rsp->{errorcode}->[0] = $ret->[0];
              xCAT::MsgUtils->message("E", $rsp, $callback);
@@ -109,37 +109,34 @@ sub rinstall {
         }
 
         my $state = $ARGV[0];
-        ($state, $RESTSTATES) = split(/,/, $state, 2);
         chomp($state);
-        if ($state eq "image" or $state eq "winshell" or $state =~ /^osimage/) {
-            my $target;
-            my $action;
-            if ($state =~ /=/) {
-                ($state, $target) = split '=', $state, 2;
-                if ($target =~ /:/) {
-                    ($target, $action) = split ':', $target, 2;
-                }
-            }
-            else {
-                if ($state =~ /:/) {
-                    ($state, $action) = split ':', $state, 2;
-                }
-            }
-            if ($state eq 'osimage') {
-                $OSIMAGE = $target;
-            }
+        if ($state =~ /^osimage=(\S+)/) {
+           $OSIMAGE = $1; # osimage was specified
+           xCAT::MsgUtils->message("I", $rsp, $callback);
+        }
+        elsif ($state =~ /^boot$|^shell$|^osimage$|^runcmd=|^runimage=/) {
+           # the rest are valid actions, just pass to nodeset
+           $STATES=$state;
+        }
+        elsif ($state =~ /^-/) {
+           # if starts with dash, let GetOptions below to process
         }
         else {
-            unless ($state =~ /-/) {
-                $STATES = $state;
-            }
+           if ($state) {
+               $rsp->{errorcode}->[0]=1;
+               $rsp->{error}->[0]="Invalid option $state";
+               xCAT::MsgUtils->message("E",$rsp,$callback);
+               &usage($command, $callback);
+               return 1;
+           }
         }
 
         Getopt::Long::Configure("bundling");
         Getopt::Long::Configure("no_pass_through");
         unless (
-            GetOptions('O|osimage=s' => \$OSIMAGE,
+            GetOptions(
                 'ignorekernelchk' => \$ignorekernelchk,
+                'noupdateinitrd'  => \$noupdateinitrd,
                 'V|verbose'       => \$VERBOSE,
                 'h|help'          => \$HELP,
                 'v|version'       => \$VERSION,
@@ -156,7 +153,6 @@ sub rinstall {
     }
     if ($VERSION) {
         my $version = xCAT::Utils->Version();
-        my $rsp     = {};
         $rsp->{data}->[0] = "$version";
         xCAT::MsgUtils->message("I", $rsp, $callback);
         return 0;
@@ -167,7 +163,6 @@ sub rinstall {
     }
 
     if($command eq "rinstall" and scalar(@nodes) > 1 and $CONSOLE){
-       my $rsp;
        $rsp->{errorcode}->[0]=1;
        $rsp->{error}->[0]="rinstall -c/--console can only be run against one node! Please use winstall -c/--console for multiple nodes.";
        xCAT::MsgUtils->message("E",$rsp,$callback);
@@ -183,7 +178,7 @@ sub rinstall {
 
     if ($OSIMAGE) {
 
-        # if -O|--osimage or osimage=<imagename> is specified,
+        # if osimage=<imagename> is specified,
         # call "nodeset ... osimage= ..." to set the boot state of the noderange to the specified osimage,
         # "nodeset" will handle the updating of node attributes such as os,arch,profile,provmethod.
 
@@ -197,8 +192,13 @@ sub rinstall {
         (my $ref) = $osimagetable->getAttribs({ imagename => $OSIMAGE }, 'osvers', 'osarch', 'imagetype');
         $osimagetable->close();
 
+        unless ($ref) {
+            # Nothing was returned from getAttrbs for the specified image
+            $rsp->{data}->[0] = "Cannot find the OS image $OSIMAGE in the osimage table.";
+            xCAT::MsgUtils->message("E", $rsp, $callback);
+            return 1;
+        }
         unless (defined($ref->{osarch})) {
-            my $rsp = {};
             $rsp->{error}->[0] = "$OSIMAGE 'osarch' attribute not defined in 'osimage' table.";
             $rsp->{errorcode}->[0] = 1;
             xCAT::MsgUtils->message("E", $rsp, $callback);
@@ -215,7 +215,6 @@ sub rinstall {
             my $nodetypeattribs = $nodetypecache->{$node}->[0];
             my $nodehmattribs   = $nodehmcache->{$node}->[0];
             unless (defined($noderesattribs) and defined($noderesattribs->{'netboot'})) {
-                my $rsp = {};
                 $rsp->{error}->[0] = "$node: Missing the 'netboot' attribute.";
                 $rsp->{errorcode}->[0] = 1;
                 xCAT::MsgUtils->message("E", $rsp, $callback);
@@ -229,7 +228,6 @@ sub rinstall {
             }
 
             unless (defined($nodetypeattribs) and defined($nodetypeattribs->{'arch'})) {
-                my $rsp = {};
                 $rsp->{error}->[0] = "$node: 'arch' attribute not defined in 'nodetype' table.";
                 $rsp->{errorcode}->[0] = 1;
                 xCAT::MsgUtils->message("E", $rsp, $callback);
@@ -238,7 +236,6 @@ sub rinstall {
             my $nodetypearch = $nodetypeattribs->{'arch'};
             if ($nodetypearch ne $osimagearch) {
 	        unless(($nodetypearch =~ /^ppc64(le|el)?$/i) and ($osimagearch =~ /^ppc64(le|el)?$/i)){
-                    my $rsp = {};
                     $rsp->{error}->[0] = "$node: The value of 'arch' attribute of node does not match the 'osarch' attribute of osimage.";
                     $rsp->{errorcode}->[0] = 1;
                     xCAT::MsgUtils->message("E", $rsp, $callback);
@@ -247,7 +244,6 @@ sub rinstall {
             }
 
             unless (defined($nodehmattribs) and defined($nodehmattribs->{'mgt'})) {
-                my $rsp = {};
                 $rsp->{error}->[0] = "$node: 'mgt' attribute not defined in 'nodehm' table.";
                 $rsp->{errorcode}->[0] = 1;
                 xCAT::MsgUtils->message("E", $rsp, $callback);
@@ -259,20 +255,17 @@ sub rinstall {
         #only provision the normal nodes
         @nodes = @validnodes;
 
-        if ($RESTSTATES) {
-            push @parameter, "osimage=$OSIMAGE,$RESTSTATES";
-        } else {
-            push @parameter, "osimage=$OSIMAGE";
-        }
+        push @parameter, "osimage=$OSIMAGE";
+
         if ($ignorekernelchk) {
-            push @parameter, " --ignorekernelchk";
+            push @parameter, "--ignorekernelchk";
+        }
+        if ($noupdateinitrd) {
+            push @parameter, "--noupdateinitrd";
         }
     }
     elsif ($STATES) {
         push @parameter, "$STATES";
-        if ($RESTSTATES) {
-            $parameter[-1] .= ",$RESTSTATES";
-        }
     }
     else {
 
@@ -291,7 +284,6 @@ sub rinstall {
             unless ($nodetypecache) { next; }
             my $nodetypeattribs = $nodetypecache->{$node}->[0];
             unless (defined($nodetypeattribs) and defined($nodetypeattribs->{'provmethod'})) {
-                my $rsp = {};
                 $rsp->{error}->[0] = "$node: 'provmethod' attribute not defined in 'nodetype' table.";
                 $rsp->{errorcode}->[0] = 1;
                 xCAT::MsgUtils->message("E", $rsp, $callback);
@@ -326,20 +318,15 @@ sub rinstall {
         #only provision the normal nodes
         @nodes = @validnodes;
         push @parameter, "osimage";
-        if ($RESTSTATES) {
-            $parameter[-1] .= ",$RESTSTATES";
-        }
     }
 
     if (scalar(@nodes) == 0) {
-        my $rsp = {};
         $rsp->{error}->[0]     = "No available nodes for provision.";
         $rsp->{errorcode}->[0] = 1;
         xCAT::MsgUtils->message("E", $rsp, $callback);
         return 1;
     }
     else {
-        my $rsp = {};
         $rsp->{data}->[0] = "Provision node(s): @nodes";
         xCAT::MsgUtils->message("I", $rsp, $callback);
     }
@@ -383,6 +370,14 @@ sub rinstall {
                 xCAT::MsgUtils->message("E", $rsp, $callback);
                 return 1;
             }
+            if ($line =~ /Cannot wget/) {
+                # If nodeset returns error that runimage can not be downloaded by wget,
+                # display the error from nodeset (if not alredy displayed by VERBOSE above), stop processing and return.
+                unless ($VERBOSE) {
+                    xCAT::MsgUtils->message("I", $rsp, $callback);
+                }
+                return 1;
+            }
             xCAT::MsgUtils->message("I", $rsp, $callback);
         }
 
@@ -390,8 +385,7 @@ sub rinstall {
             delete $nodes{$node};
         }
 
-        my $rsp = {};
-        if (0+@failurenodes > 0) { 
+        if (0+@failurenodes > 0) {
             $rsp->{error}->[0] = "Failed to run 'nodeset' against the following nodes: @failurenodes";
             $rsp->{errorcode}->[0] = 1;
             xCAT::MsgUtils->message("E", $rsp, $callback);
@@ -412,7 +406,6 @@ sub rinstall {
         $::RUNCMD_RC = 0;
         my @nodes = @{ $hmhash{$hmkey} };
         unless ($hmkey =~ /^(ipmi|blade|hmc|ivm|fsp|kvm|esx|rhevm|openbmc)$/)  {
-            my $rsp = {};
             $rsp->{error}->[0] = "@nodes: rinstall only support nodehm.mgt type 'ipmi', 'blade', 'hmc', 'ivm', 'fsp', 'kvm', 'esx', 'rhevm'.";
             $rsp->{errorcode}->[0] = 1;
             xCAT::MsgUtils->message("E", $rsp, $callback);
@@ -431,7 +424,6 @@ sub rinstall {
                 $subreq, -1, 1);
 
             $rc = $::RUNCMD_RC;
-            my $rsp = {};
             if ($VERBOSE) {
                 my @cmd = "Run command: rnetboot @nodes";
                 push @{ $rsp->{data} }, @cmd;
@@ -459,8 +451,7 @@ sub rinstall {
                         push @failurenodes, $node;
                     }
                 }
-                my $rsp = {};
-                if (0+@failurenodes > 0) { 
+                if (0+@failurenodes > 0) {
                     $rsp->{error}->[0] = "Failed to run 'rnetboot' against the following nodes: @failurenodes";
                     $rsp->{errorcode}->[0] = 1;
                     xCAT::MsgUtils->message("E", $rsp, $callback);
@@ -485,9 +476,9 @@ sub rinstall {
                         arg     => \@rsetbootarg
                     );
 
-                #TODO: When OPENBMC support is finished, this line should be removed     
+                #TODO: When OPENBMC support is finished, this line should be removed
                 if($hmkey =~ /^openbmc$/){
-                    $req{environment}{XCAT_OPENBMC_DEVEL}= "YES";    
+                    $req{environment}{XCAT_OPENBMC_DEVEL}= "YES";
                 }
 
                 my $res =
@@ -527,7 +518,7 @@ sub rinstall {
                         }
                     }
                     my $rsp = {};
-                    if (0+@failurenodes > 0) { 
+                    if (0+@failurenodes > 0) {
                         $rsp->{error}->[0] = "Failed to run 'rsetboot' against the following nodes: @failurenodes";
                         $rsp->{errorcode}->[0] = 1;
                         xCAT::MsgUtils->message("E", $rsp, $callback);
@@ -547,14 +538,13 @@ sub rinstall {
                     node    => \@nodes,
                     arg     => \@rpowerarg
             );
-              
+
             my $res =
               xCAT::Utils->runxcmd(
                 \%req,
                 $subreq, -1, 1);
 
             $rc = $::RUNCMD_RC;
-            my $rsp = {};
             if ($VERBOSE) {
                 my @cmd = "Run command: rpower @nodes @rpowerarg";
                 push @{ $rsp->{data} }, @cmd;
@@ -582,7 +572,7 @@ sub rinstall {
                     }
                 }
                 my $rsp = {};
-                if (0+@failurenodes > 0) { 
+                if (0+@failurenodes > 0) {
                     $rsp->{error}->[0] = "Failed to run 'rpower' against the following nodes: @failurenodes";
                     $rsp->{errorcode}->[0] = 1;
                     xCAT::MsgUtils->message("E", $rsp, $callback);
@@ -596,7 +586,7 @@ sub rinstall {
 
 #-------------------------------------------------------
 
-=head3  Usage 
+=head3  Usage
 
 
 =cut
@@ -607,9 +597,10 @@ sub usage {
     my $callback = shift;
     my $rsp      = {};
     $rsp->{data}->[0] = "Usage:";
-    $rsp->{data}->[1] = "   $command <noderange> [boot | shell | runcmd=bmcsetup] [runimage=<task>] [-c|--console] [-u|--uefimode] [-V|--verbose]";
-    $rsp->{data}->[2] = "   $command <noderange> [osimage=<imagename> | <imagename>] [--ignorekernelchk] [-c|--console] [-u|--uefimode] [-V|--verbose]";
-    $rsp->{data}->[3] = "   $command [-h|--help|-v|--version]";
+    $rsp->{data}->[1] = "   $command <noderange> [boot | shell | runcmd=<command>] [-c|--console] [-u|--uefimode] [-V|--verbose]";
+    $rsp->{data}->[2] = "   $command <noderange> osimage[=<imagename>] [--noupdateinitrd] [--ignorekernelchk] [-c|--console] [-u|--uefimode] [-V|--verbose]";
+    $rsp->{data}->[3] = "   $command <noderange> runimage=<task>";
+    $rsp->{data}->[4] = "   $command [-h|--help|-v|--version]";
     xCAT::MsgUtils->message("I", $rsp, $callback);
 }
 
diff --git a/xCAT-server/lib/xcat/plugins/rmimage.pm b/xCAT-server/lib/xcat/plugins/rmimage.pm
index b6df56cd9..3c485169a 100644
--- a/xCAT-server/lib/xcat/plugins/rmimage.pm
+++ b/xCAT-server/lib/xcat/plugins/rmimage.pm
@@ -44,7 +44,7 @@ sub process_request {
     my $imagename;
     my $imagedir;
     my $lock;
-    
+
     if (!xCAT::Utils->isLinux()) {
         $callback->({ error => ["The rmimage command is only supported on Linux."], errorcode => [1] });
         return;
@@ -178,7 +178,7 @@ sub process_request {
         $callback->({ error => ["Image directory $imagedir does not exist"], errorcode => [1] });
         return;
     }
-    
+
 
     my $retcode;
     ($retcode,$lock)=xCAT::Utils->acquire_lock_imageop("$imagedir/rootimg");
@@ -197,10 +197,10 @@ sub process_request {
     }
 
     my @filestoremove = ("$imagedir/kernel", "$imagedir/initrd-stateless.gz", "$imagedir/initrd-statelite.gz");
-    my @rootimgtars=glob "$imagedir/rootimg.*"; 
+    my @rootimgtars=glob "$imagedir/rootimg.*";
     push @filestoremove,@rootimgtars;
-    #unmount all the mount points under rootimg directory 
-    #to avoid removing the directory/files on management node by mistake  
+    #unmount all the mount points under rootimg directory
+    #to avoid removing the directory/files on management node by mistake
     $realimagedir=realpath("$imagedir/rootimg");
     my @mntptlist;
     my $FILEHD=undef;
diff --git a/xCAT-server/lib/xcat/plugins/rollupdate.pm b/xCAT-server/lib/xcat/plugins/rollupdate.pm
index b8956939f..88fc48bbd 100644
--- a/xCAT-server/lib/xcat/plugins/rollupdate.pm
+++ b/xCAT-server/lib/xcat/plugins/rollupdate.pm
@@ -36,13 +36,13 @@ $::LOGFILE = "rollupdate.log";
 
 #------------------------------------------------------------------------------
 
-=head1    rollupdate   
+=head1    rollupdate
 
 This program module file supports the cluster rolling update functions.
 
 Supported commands:
    rollupdate - Create scheduler job command files and submit the jobs
-   runrollupdate - Reboot the updategroup in response to request from scheduler 
+   runrollupdate - Reboot the updategroup in response to request from scheduler
                   job
 
 If adding to this file, please take a moment to ensure that:
@@ -1304,9 +1304,9 @@ sub check_policy {
                       <xcat_noderange>:/<pattern>/<replacement>/
                     OR
                       <xcat_noderange>:|<pattern>|<replacement>|
-        Returns: 
+        Returns:
         Globals:
-                hash:  $::XLATED{$node}=$xlated_name                
+                hash:  $::XLATED{$node}=$xlated_name
                 AND    $::XLATED{$xlated_name}=$node
                 to allow easy lookup in either direction
         Error:
@@ -1679,7 +1679,7 @@ sub get_bringuporder {
 
 =head3   get_mutex
 
-        Generate the list of LL mutual exclusion resources for this 
+        Generate the list of LL mutual exclusion resources for this
         update group
 
         Arguments:
@@ -2828,7 +2828,7 @@ sub change_LL_feature {
 
 =head3   remove_LL_updatefeature_only
 
-        Changes the LL feature for the node to remove only the updatefeature 
+        Changes the LL feature for the node to remove only the updatefeature
         Will NOT remove oldfeature or set newfeature
 
         Arguments:
diff --git a/xCAT-server/lib/xcat/plugins/seqdiscovery.pm b/xCAT-server/lib/xcat/plugins/seqdiscovery.pm
index c8aad37e2..a40960209 100755
--- a/xCAT-server/lib/xcat/plugins/seqdiscovery.pm
+++ b/xCAT-server/lib/xcat/plugins/seqdiscovery.pm
@@ -44,7 +44,7 @@ sub handled_commands {
       }
 }
 
-=head3 findme 
+=head3 findme
     Handle the request form node to map and define the request to a node
 =cut
 
@@ -418,7 +418,7 @@ sub findme {
     xCAT::MsgUtils->message("S", "Sequential Discovery: Done");
 }
 
-=head3 displayver 
+=head3 displayver
     Display the version information
 =cut
 
@@ -432,7 +432,7 @@ sub displayver {
     xCAT::MsgUtils->message("I", $rsp, $callback);
 }
 
-=head3 nodediscoverstart 
+=head3 nodediscoverstart
  Initiate the sequencial discovery process
 =cut
 
@@ -451,9 +451,9 @@ sub nodediscoverstart {
         }
 
         my $usageinfo = "nodediscoverstart: Start a discovery process: Sequential, Profile or z/VM.
-Usage: 
+Usage:
     Common:
-        nodediscoverstart [-h|--help|-v|--version|-V|--verbose] 
+        nodediscoverstart [-h|--help|-v|--version|-V|--verbose]
     Sequential Discovery:
         nodediscoverstart noderange=<noderange> [hostiprange=<hostiprange>] [bmciprange=<bmciprange>] [groups=<groups>] [rack=<rack>] [chassis=<chassis>] [height=<height>] [unit=<unit>] [osimage=<osimagename>] [-n|--dns] [-s|--skipbmcsetup] [-V|--verbose]
     Profile Discovery:
@@ -696,7 +696,7 @@ Usage:
 }
 
 
-=head3 nodediscoverstop 
+=head3 nodediscoverstop
  Stop the sequencial discovery process
 =cut
 
@@ -716,7 +716,7 @@ sub nodediscoverstop {
         }
 
         my $usageinfo = "nodediscoverstop: Stop the running discovery: Profile, Sequential and z/VM.
-Usage: 
+Usage:
     Common:
         nodediscoverstop [-h|--help|-v|--version]
     z/VM discovery:
@@ -809,7 +809,7 @@ Usage:
     $sitetab->commit();
 }
 
-=head3 nodediscoverls 
+=head3 nodediscoverls
  Display the discovered nodes.  This supports sequential and z/VM and partially Profile discovery.
 =cut
 
@@ -829,10 +829,10 @@ sub nodediscoverls {
 
         my $usageinfo = "nodediscoverls: list the discovered nodes.
 Usage:
-    Common: 
+    Common:
     nodediscoverls
-    nodediscoverls [-h|--help|-v|--version] 
-    nodediscoverls [-t seq|profile|switch|blade|manual|mtms|undef|zvm|all] [-l] 
+    nodediscoverls [-h|--help|-v|--version]
+    nodediscoverls [-t seq|profile|switch|blade|manual|mtms|undef|zvm|all] [-l]
     nodediscoverls [-u uuid] [-l]
     z/VM:
         nodediscoverls [-t zvm][-z|--zvmhost <noderange>] [-l]";
@@ -900,7 +900,7 @@ Usage:
         # zvmdiscovery handles request specific to z/VM.
         return;
     }
-    
+
     my $DBname = xCAT::Utils->get_DBName;    # support for DB2
     # Go through discoverydata table and display the discovery entries
     my $distab = xCAT::Table->new('discoverydata');
@@ -972,7 +972,7 @@ Usage:
 }
 
 
-=head3 nodediscoverstatus 
+=head3 nodediscoverstatus
  Display the discovery status
 =cut
 
@@ -1072,7 +1072,7 @@ sub nodediscoverdef {
         }
 
         my $usageinfo = "nodediscoverdef: Define the undefined discovery request, or clean the discovery entries in the discoverydata table (Which can be displayed by nodediscoverls command).
-Usage: 
+Usage:
     Common:
     nodediscoverdef -u uuid -n node
     nodediscoverdef -r -u uuid
@@ -1125,7 +1125,7 @@ Usage:
             my @hosts = split( /,/, $zvmHost );
             foreach $zvmHost ( @hosts ) {
                 if ( !$zvmHost ) {
-                    # Tolerate zvmhost value beginning with a comma.  
+                    # Tolerate zvmhost value beginning with a comma.
                     # It is wrong but not worth an error message.
                     next;
                 }
@@ -1134,7 +1134,7 @@ Usage:
         } else {
             push( @inputZvmHosts, $zvmHost );
         }
-    } 
+    }
 
          # open the discoverydata table for the subsequent using
     my $distab = xCAT::Table->new("discoverydata");
@@ -1361,7 +1361,7 @@ sub process_request {
     }
 }
 
-=head3 getfreenodes 
+=head3 getfreenodes
  Get the free nodes base on the user specified noderange and defined nodes
  arg1 - the noderange
  arg2 - "all': return all the free nodes; otherwise just return one.
@@ -1417,7 +1417,7 @@ sub getfreenodes () {
 
 =head3 getpredefips
  Get the ips which have been predefined to host or bmc
- arg1 - a refenrece to the array of nodes 
+ arg1 - a refenrece to the array of nodes
  arg2 - type: host, bmc
 
  return: hash {ip} = node
@@ -1503,7 +1503,7 @@ sub getpredefips {
     return \%predefips;
 }
 
-=head3 getfreeips 
+=head3 getfreeips
  Get the free ips base on the user specified ip range
  arg1 - the ip range. Two format are suported: 192.168.1.1-192.168.2.50; 192.168.[1-2].[10-100]
  arg2 - all the free nodes
@@ -1650,7 +1650,7 @@ sub getfreeips {
     }
 }
 
-=head3 getbmcip_otherinterfaces 
+=head3 getbmcip_otherinterfaces
  Parse the value in the hosts.otherinterfaces
  arg1 - node
  arg2 - bmc name
diff --git a/xCAT-server/lib/xcat/plugins/sinv.pm b/xCAT-server/lib/xcat/plugins/sinv.pm
index e6001f21a..0136d785d 100644
--- a/xCAT-server/lib/xcat/plugins/sinv.pm
+++ b/xCAT-server/lib/xcat/plugins/sinv.pm
@@ -2,7 +2,7 @@
 #-------------------------------------------------------
 
 =head1
-  xCAT plugin package to handle sinv 
+  xCAT plugin package to handle sinv
 
    Supported command:
          sinv - software/firmware inventory program
@@ -132,9 +132,9 @@ sub process_request
 
 #-------------------------------------------------------
 
-=head3  sinv 
+=head3  sinv
 
-   Parses Builds and runs the sinv 
+   Parses Builds and runs the sinv
 
 
 =cut
diff --git a/xCAT-server/lib/xcat/plugins/snmove.pm b/xCAT-server/lib/xcat/plugins/snmove.pm
index 90665f453..28b9d7ed0 100644
--- a/xCAT-server/lib/xcat/plugins/snmove.pm
+++ b/xCAT-server/lib/xcat/plugins/snmove.pm
@@ -2024,7 +2024,7 @@ n";
 
 	Returns:
                 undef - error
-                hash ref - 
+                hash ref -
 
 =cut
 
@@ -2096,7 +2096,7 @@ sub getnimattr
             Does statelite setup when using a shared file system
 
 			The snmove cmd changes the xcatmaster value for the nodes
-			This means, that since we won't be running mkdsklsnode again, 
+			This means, that since we won't be running mkdsklsnode again,
 			we need to take care of the ststelite file changes here
 				- update statelite tables in DB
 				- run dolitesetup to re-create the statelite files stored
@@ -2111,7 +2111,7 @@ sub getnimattr
             0 - OK
             1 - error
 
-        Usage:  $ret = &sfsSLconfig(\@nodelist, \%nhash, \%sn_hash, $nimprime, 
+        Usage:  $ret = &sfsSLconfig(\@nodelist, \%nhash, \%sn_hash, $nimprime,
 							$callback, $sub_req);
 
 =cut
diff --git a/xCAT-server/lib/xcat/plugins/statelite.pm b/xCAT-server/lib/xcat/plugins/statelite.pm
index 42b1715c3..1fbdbc734 100644
--- a/xCAT-server/lib/xcat/plugins/statelite.pm
+++ b/xCAT-server/lib/xcat/plugins/statelite.pm
@@ -171,8 +171,9 @@ sub process_request {
     # - osver
     # - arch
     # - profile
-    $callback->({ info => ["going to modify $rootimg_dir"] });
-
+    my $rsp;
+    push @{ $rsp->{data} }, "Modifying $rootimg_dir ...";
+    xCAT::MsgUtils->message("I", $rsp, $callback);
     #copy $installroot/postscripts into the image at /xcatpost
     if (-e "$rootimg_dir/xcatpost") {
         system("rm -rf $rootimg_dir/xcatpost");
@@ -232,10 +233,14 @@ sub process_request {
 
     #sync fils configured in the synclist to the rootimage
     $syncfile = xCAT::SvrUtils->getsynclistfile(undef, $osver, $arch, $profile, "netboot", $imagename);
-    if (defined($syncfile) && -f $syncfile
-        && -d $rootimg_dir) {
-        print "sync files from $syncfile to the $rootimg_dir\n";
-        `$::XCATROOT/bin/xdcp -i $rootimg_dir -F $syncfile`;
+    if (defined($syncfile) && -d $rootimg_dir) {
+        my @filelist = split ',', $syncfile;
+        foreach my $synclistfile (@filelist) {
+            if ( -f $synclistfile) {
+                print "sync files from $synclistfile to the $rootimg_dir\n";
+                `$::XCATROOT/bin/xdcp -i $rootimg_dir -F $synclistfile`;
+            }
+        }
     }
 
     # check if the file "litefile.save" exists or not
@@ -358,8 +363,8 @@ sub process_request {
     #delete useless rootimg/tmp/dracut.* files
     #fix copy many dracut.* files cost too much time in liteimg
     $verbose && $callback->({ info => ["removing \"$rootimg_dir/tmp/dracut.*\""] });
-    unlink glob "$rootimg_dir/tmp/dracut.*"; 
-        
+    unlink glob "$rootimg_dir/tmp/dracut.*";
+
     # recovery the files in litefile.save if necessary
     foreach my $line (keys %hashSaved) {
         my @oldentry = split(/\s+/, $line);
@@ -532,7 +537,7 @@ sub process_request {
         system("umount $rootimg_dir/proc");
 
         #put the image name, uuid and timestamp into diskless image when it is packed.
-        $callback->({ data => ["add image info to xcatinfo file"] });
+        $verbose && $callback->({ data => ["add image info to xcatinfo file"] });
         `echo IMAGENAME="'$imagename'" > $rootimg_dir/opt/xcat/xcatinfo`;
 
         my $uuid = `uuidgen`;
@@ -547,7 +552,7 @@ sub process_request {
 
         my $temppath;
         my $oldmask;
-        $callback->({ data => ["$verb contents of $rootimg_dir"] });
+        $callback->({ data => ["$verb contents of $rootimg_dir ..."] });
         unlink("$destdir/rootimg-statelite.gz");
 
         my $compress = "gzip";
@@ -585,6 +590,7 @@ sub process_request {
         umask $oldmask;
 
         system("rm -f $xcat_packimg_tmpfile");
+        $callback->({ data => ["$verb contents of $rootimg_dir done."] });
     }
     chdir($oldpath);
 
@@ -624,7 +630,7 @@ sub liteMe {
         }
     }
 
-    $callback->({ info => ["done."] });
+    $callback->({ info => ["Modifying $rootimg_dir done."] });
 
     # end loop, synclist should now all be in place.
 }
@@ -759,7 +765,7 @@ sub parseLiteFiles {
 
 
 =head3
-    recoverFiles 
+    recoverFiles
 =cut
 
 sub recoverFiles {
diff --git a/xCAT-server/lib/xcat/plugins/switch.pm b/xCAT-server/lib/xcat/plugins/switch.pm
index 8823ec029..94b1ba96a 100644
--- a/xCAT-server/lib/xcat/plugins/switch.pm
+++ b/xCAT-server/lib/xcat/plugins/switch.pm
@@ -275,7 +275,7 @@ sub process_request {
                             if (!$mac) {
                                 $mac_vlan="N/A";
                             } elsif ($vlanid) {
-                                $mac_vlan = "$mac($vlanid)"; 
+                                $mac_vlan = "$mac($vlanid)";
                             } else {
                                 $mac_vlan = $mac;
                             }
@@ -420,9 +420,12 @@ sub process_switch_config {
                     xCAT::MellanoxIB::setConfig($nodes, $callback, $subreq, $subcommand, $argument);
                 }
             } else {
-                my $rsp = {};
-                $rsp->{error}->[0] = "The following '$t' switches are unsuppored:\n@$nodes";
-                $callback->($rsp);
+                #onie switch will processed in the onie plug in
+                unless ($t =~ /onie/i) {
+                    my $rsp = {};
+                    $rsp->{error}->[0] = "The following '$t' switches are not supported:\n@$nodes";
+                    $callback->($rsp);
+                }
             }
         }
     }
@@ -431,7 +434,7 @@ sub process_switch_config {
 #--------------------------------------------------------------------------------
 
 =head3    getSwitchType
-      It determins the swtich vendor and model for the given swith.      
+      It determins the swtich vendor and model for the given swith.
     Arguments:
         noderange-- an array ref to switches.
     Returns:
diff --git a/xCAT-server/lib/xcat/plugins/switchdiscover.pm b/xCAT-server/lib/xcat/plugins/switchdiscover.pm
index 35c792a52..04aee5670 100644
--- a/xCAT-server/lib/xcat/plugins/switchdiscover.pm
+++ b/xCAT-server/lib/xcat/plugins/switchdiscover.pm
@@ -192,13 +192,13 @@ sub parse_args {
         my $error;
         foreach my $st (@stypes) {
             if (! exists($global_scan_type{$st})) {
-                $error = $error . "Invalide scan type: $st\n";    
+                $error = $error . "Invalide scan type: $st\n";
             }
         }
         if ($error) {
             return usage($error);
         }
-        $globalopt{scan_types} = \@stypes; 
+        $globalopt{scan_types} = \@stypes;
     }
 
     #############################################
@@ -208,7 +208,7 @@ sub parse_args {
         $globalopt{range} = $opt{range};
         my @ips = split /,/, $opt{range};
         foreach my $ip (@ips)  {
-            if (($ip =~ /^(\d{1,3})(-\d{1,3})?\.(\d{1,3})(-\d{1,3})?\.(\d{1,3})(-\d{1,3})?\.(\d{1,3})(-\d{1,3})?$/) || 
+            if (($ip =~ /^(\d{1,3})(-\d{1,3})?\.(\d{1,3})(-\d{1,3})?\.(\d{1,3})(-\d{1,3})?\.(\d{1,3})(-\d{1,3})?$/) ||
                 ($ip =~ /^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})\/(\d+)$/)) {
                 push @iprange, $ip;
             } else {
@@ -280,7 +280,7 @@ sub parse_args {
 
 #--------------------------------------------------------------------------------
 =head3   preprocess_request
-      Parse the arguments and display the usage or the version string. 
+      Parse the arguments and display the usage or the version string.
 
 =cut
 #--------------------------------------------------------------------------------
@@ -310,7 +310,7 @@ sub preprocess_request {
 #--------------------------------------------------------------------------------
 =head3   process_request
     Pasrse the arguments and call the correspondent functions
-    to do switch discovery. 
+    to do switch discovery.
 
 =cut
 #--------------------------------------------------------------------------------
@@ -331,7 +331,7 @@ sub process_request {
     # Process command-specific options
     ####################################
     my $result = parse_args( \%request );
-    
+
 
     ####################################
     # Return error
@@ -341,12 +341,12 @@ sub process_request {
         return(1);
     }
 
-    # call the relavant functions to start the scan 
+    # call the relavant functions to start the scan
     my @scan_types = ("nmap");
     if (exists($globalopt{scan_types})) {
         @scan_types = @{$globalopt{scan_types}};
     }
-    
+
     my %username_hash = ();
     $result = undef;
     foreach my $st (@scan_types) {
@@ -368,29 +368,29 @@ sub process_request {
                 } else {
                     $username_hash{$name} = 1;
                 }
-            } 
+            }
         }
     }
-    
+
     if (!($result)) {
         send_msg( \%request, 0, " No $device found ");
         return;
     }
 
-        
+
     my $display_done = 0;
-    if (exists($globalopt{r}))  { 
-        #do nothing since is done by the scan functions. 
+    if (exists($globalopt{r}))  {
+        #do nothing since is done by the scan functions.
         $display_done = 1;
     }
-    
+
     if (exists($globalopt{x}))  {
             send_msg( \%request, 0, format_xml( $result ));
             $display_done = 1;
     }
 
-    if (exists($globalopt{z}))  { 
-            
+    if (exists($globalopt{z}))  {
+
             my $stanza_output = format_stanza( $result );
             send_msg( \%request, 0, $stanza_output );
         $display_done = 1;
@@ -403,7 +403,7 @@ sub process_request {
         send_msg(\%request, 0, $header);
         my $sep = "------------";
         send_msg(\%request, 0, sprintf($format, $sep, $sep, $sep, $sep ));
-        
+
         #display switches one by one
         foreach my $key (keys(%$result)) {
             my $ip = "   ";
@@ -422,7 +422,7 @@ sub process_request {
             my $msg = sprintf $format, $ip, $name, $vendor, $mac;
             send_msg(\%request, 0, $msg);
         }
-        send_msg(\%request, 0,"\n");        
+        send_msg(\%request, 0,"\n");
     }
 
     my ($discoverswitch, $predefineswitch) = matchPredefineSwitch($result, \%request, $sub_req);
@@ -447,12 +447,12 @@ sub process_request {
     Arguments:
        request: request structure with callback pointer.
     Returns:
-        A hash containing the swithes discovered. 
+        A hash containing the swithes discovered.
         Each element is a hash of switch attributes. For examples:
         {
            "AABBCCDDEEFA" =>{name=>"switch1", vendor=>"ibm", ip=>"10.1.2.3"},
            "112233445566" =>{name=>"switch2", vendor=>"cisco", ip=>"11.4.5.6"}
-       } 
+       }
        returns 1 if there are errors occurred.
 =cut
 #--------------------------------------------------------------------------------
@@ -464,7 +464,7 @@ sub lldp_scan {
     # get the PID of the currently running lldpd if it is running.
     if (exists($globalopt{verbose}))    {
         send_msg($request, 0, "...Checking if lldpd is up and running:\n  ps -ef | grep lldpd | grep -v grep | awk '{print \$2}'\n");
-    }    
+    }
     my $pid;
     chomp($pid= `ps -ef | grep lldpd | grep -v grep | awk '{print \$2}'`);
     unless($pid){
@@ -511,7 +511,7 @@ sub lldp_scan {
         send_msg($request, 0, "...Converting XML output to hash.\n");
     }
     my $result_ref = XMLin($result, KeyAttr => 'interface', ForceArray => 1);
-    my $switches; 
+    my $switches;
     my $counter=0;
     if ($result_ref) {
         if (exists($result_ref->{interface})) {
@@ -589,12 +589,12 @@ sub lldp_scan {
     Arguments:
        request: request structure with callback pointer.
     Returns:
-        A hash containing the swithes discovered. 
+        A hash containing the swithes discovered.
         Each element is a hash of switch attributes. For examples:
         {
            "AABBCCDDEEFA" =>{name=>"switch1", vendor=>"ibm", ip=>"10.1.2.3"},
            "112233445566" =>{name=>"switch2", vendor=>"cisco", ip=>"11.4.5.6"}
-       } 
+       }
        returns 1 if there are errors occurred.
 =cut
 #--------------------------------------------------------------------------------
@@ -657,7 +657,7 @@ sub nmap_scan {
     }
 
     #################################################
-    #compose the switch hash 
+    #compose the switch hash
     #################################################
     my $result_ref = XMLin($result, ForceArray => 1);
     my $switches;
@@ -691,7 +691,7 @@ sub nmap_scan {
                             if ($vendor =~ /($search_string)/) {
                                 $found = 1;
                             }
-                        } 
+                        }
                         if ( ($found == 0) && ($type eq "mac") ) {
                             my $search_string = join '|', keys(%xCAT::data::switchinfo::global_mac_identity);
                             if ($mac =~ /($search_string)/i) {
@@ -704,7 +704,7 @@ sub nmap_scan {
                             if ( $found == 0) {
                                 push(@$osguess_ips, $ip);
                             }
-                        } 
+                        }
                         if ($found == 1) {
                             $switches->{$mac}->{ip} = $ip;
                             $switches->{$mac}->{vendor} = $vendor;
@@ -788,7 +788,7 @@ sub nmap_osguess {
                         $isswitch=1;
                     } else {
                         last;
-                    }  
+                    }
                 }
                 my $search_string = join '|', keys(%xCAT::data::switchinfo::global_switch_type);
                 if ($line =~ /Running/) {
@@ -803,7 +803,7 @@ sub nmap_osguess {
                         $isswitch=1;
                     }
                 }
-                
+
             }
             if ($isswitch == 1) {
                 $switches->{$mac}->{ip} = $ip;
@@ -816,8 +816,8 @@ sub nmap_osguess {
 
     }
 
-    return $switches; 
-   
+    return $switches;
+
 }
 
 
@@ -829,12 +829,12 @@ sub nmap_osguess {
     Arguments:
        request: request structure with callback pointer.
     Returns:
-        A hash containing the swithes discovered. 
+        A hash containing the swithes discovered.
         Each element is a hash of switch attributes. For examples:
         {
            "AABBCCDDEEFA" =>{name=>"switch1", vendor=>"ibm", ip=>"10.1.2.3"},
            "112233445566" =>{name=>"switch2", vendor=>"cisco", ip=>"11.4.5.6"}
-       } 
+       }
        returns 1 if there are errors occurred.
 =cut
 #--------------------------------------------------------------------------------
@@ -874,7 +874,7 @@ sub snmp_scan {
     #use nmap to parse the ip range and possible output from the command:
     # Nmap scan report for switch-10-5-22-1 (10.5.22.1) 161/udp open  snmp
     # Nmap scan report for 10.5.23.1 161/udp open  snmp
-    # Nmap scan report for 10.5.24.1 161/udp closed snmp  
+    # Nmap scan report for 10.5.24.1 161/udp closed snmp
     ##########################################################
     my $nmap_version = xCAT::Utils->get_nmapversion();
     if (xCAT::Utils->version_cmp($nmap_version,"5.10") < 0) {
@@ -900,7 +900,7 @@ sub snmp_scan {
         send_msg($request, 0, "$result\n" );
     }
     my @lines = split /\n/, $result;
-  
+
     foreach my $line (@lines) {
         my @array = split / /, $line;
         if ($line =~ /\b(\d{1,3}(?:\.\d{1,3}){3})\b/)
@@ -944,8 +944,8 @@ sub snmp_scan {
 }
 
 #--------------------------------------------------------------------------------
-=head3  get_snmpvendorinfo   
-      return vendor info from snmpwalk command 
+=head3  get_snmpvendorinfo
+      return vendor info from snmpwalk command
     Arguments:
       ip  :  IP address passed by the switch after scan
     Returns:
@@ -982,7 +982,7 @@ sub get_snmpvendorinfo {
 
     foreach $comms(@comm_list) {
         #for pdu: get vendor info from sysDescr
-        #for switches: get vendor info from entPhysicalDescr 
+        #for switches: get vendor info from entPhysicalDescr
         my $ccmd;
         if (exists($globalopt{pdu})) {
             $ccmd = "snmpwalk -Os -v1 -c $comms $ip 1.3.6.1.2.1.1.1";
@@ -1006,7 +1006,7 @@ sub get_snmpvendorinfo {
         }
         return $snmpwalk_vendor;
     }
-   
+
     my ($desc,$model) = split /: /, $result;
 
     if (exists($globalopt{pdu})) {
@@ -1038,9 +1038,9 @@ sub get_snmpmac {
     my $mac;
 
     #Ubuntu only takes OID
-    #get ipNetToMediaPhysAddress; 
-    my $ccmd = "snmpwalk -Os -v1 -c $community $ip 1.3.6.1.2.1.4.22.1.2 | grep $ip"; 
-    
+    #get ipNetToMediaPhysAddress;
+    my $ccmd = "snmpwalk -Os -v1 -c $community $ip 1.3.6.1.2.1.4.22.1.2 | grep $ip";
+
     if (exists($globalopt{verbose}))    {
        send_msg($request, 0, "Process command: $ccmd\n");
     }
@@ -1109,14 +1109,14 @@ sub get_snmphostname {
 
 
 #--------------------------------------------------------------------------------
-=head3   get_hostname 
+=head3   get_hostname
       return hostname for the switch discovered
     Arguments:
       host:  hostname passed by the switch after scan
       ip  :  IP address passed by the switch after scan
     Returns:
       host:  hostname of the switch
-      if host is empty, try to lookup use ip address, otherwise format hostname 
+      if host is empty, try to lookup use ip address, otherwise format hostname
       as switch and ip combination. ex:  switch-9-114-5-6
 =cut
 #--------------------------------------------------------------------------------
@@ -1143,15 +1143,15 @@ sub get_hostname {
 =head3   get_switchtype
       determine the switch type based on the switch vendor
     Arguments:
-      vendor: switch vendor 
+      vendor: switch vendor
     Returns:
-      stype: type of switch, supports Juniper, Cisco, BNT and Mellanox 
+      stype: type of switch, supports Juniper, Cisco, BNT and Mellanox
 =cut
 #--------------------------------------------------------------------------------
 sub get_switchtype {
     my $vendor = shift;
     my $key = "Not support";
-    
+
     my $search_string = join '|', keys(%xCAT::data::switchinfo::global_switch_type);
     if ($vendor =~ /($search_string)/) {
         $key = $1;
@@ -1196,8 +1196,8 @@ sub xCATdB {
         }
 
         #################################################
-        # use chdef command to make new device or update 
-        # it's attribute 
+        # use chdef command to make new device or update
+        # it's attribute
         ##################################################
         if (exists($globalopt{pdu})) {
             $ret = xCAT::Utils->runxcmd({ command => ['chdef'], arg => ['-t','node','-o',$host,"groups=$device","ip=$ip","mac=$mac","nodetype=$device","mgt=$device","usercomment=$vendor","pdutype=$stype","community=$community"] }, $sub_req, 0, 1);
@@ -1210,8 +1210,8 @@ sub xCATdB {
 #--------------------------------------------------------------------------------
 =head3  get_ip_ranges
       Return the an array of ip ranges. If --range is specified, use it. If
-      noderange is specified, use the ip address of the nodes. Otherwise, use 
-      the subnets for all the live nics on the xCAT mn. 
+      noderange is specified, use the ip address of the nodes. Otherwise, use
+      the subnets for all the live nics on the xCAT mn.
     Arguments:
        request: request structure with callback pointer.
     Returns:
@@ -1251,23 +1251,23 @@ sub get_ip_ranges {
 
         }
     }
- 
+
     if (!@$ranges) {
         send_msg($request, 1, "ip range is empty, nothing to discover" );
         exit 0;
     }
 
     return $ranges;
-    
+
 }
 
 #-------------------------------------------------------------------------------
-=head3  format_stanza 
+=head3  format_stanza
       list the stanza format for swithes
     Arguments:
-      outhash: a hash containing the switches discovered 
+      outhash: a hash containing the switches discovered
     Returns:
-      result: return lists as stanza format for swithes 
+      result: return lists as stanza format for swithes
 =cut
 #--------------------------------------------------------------------------------
 sub format_stanza {
@@ -1287,7 +1287,7 @@ sub format_stanza {
         if ($mac =~ /nomac/) {
             $mac = " ";
         }
-      
+
         $result .= "$host:\n\tobjtype=node\n";
         $result .= "\tgroups=$device\n";
         $result .= "\tip=$ip\n";
@@ -1300,16 +1300,16 @@ sub format_stanza {
             $result .= "\tpdutype=$stype\n";
         }
     }
-    return ($result); 
+    return ($result);
 }
 
 #--------------------------------------------------------------------------------
-=head3  format_xml 
+=head3  format_xml
       list the xml format for swithes
     Arguments:
-      outhash: a hash containing the switches discovered 
+      outhash: a hash containing the switches discovered
     Returns:
-      result: return lists as xml format for swithes 
+      result: return lists as xml format for swithes
 =cut
 #--------------------------------------------------------------------------------
 sub format_xml {
@@ -1323,7 +1323,7 @@ sub format_xml {
         my $result;
         my $ip = $outhash->{$mac}->{ip};
         my $vendor = $outhash->{$mac}->{vendor};
-        
+
         #Get hostname and switch type
         my $host = get_hostname($outhash->{$mac}->{name}, $ip);
         my $stype = get_switchtype($vendor);
@@ -1358,11 +1358,11 @@ sub format_xml {
                      KeyAttr  => [],
                      RootName => undef );
     }
-    return ($xml);    
+    return ($xml);
 }
 
 #-------------------------------------------------------------------------------
-=head3 matchPredefineSwitch 
+=head3 matchPredefineSwitch
       find discovered switches with predefine switches
       for each discovered switches:
     Arguments:
@@ -1386,7 +1386,7 @@ sub matchPredefineSwitch {
     # call find_mac to match pre-defined switch and
     # discovery switch
     ##################################################
-   
+
      foreach my $mac ( keys %$outhash ) {
         my $ip = $outhash->{$mac}->{ip};
         my $vendor = $outhash->{$mac}->{vendor};
@@ -1426,8 +1426,8 @@ sub matchPredefineSwitch {
 }
 
 #--------------------------------------------------------------------------------
-=head3 switchsetup 
-      configure the switch 
+=head3 switchsetup
+      configure the switch
     Arguments:
       outhash: a hash containing the switches need to configure
     Returns:
@@ -1468,7 +1468,7 @@ sub switchsetup {
                 my $cmd;
                 my $rc = 0;
                 if ( $mytype eq "crpdu" ) {
-                    $cmd = "rspconfig $pdu sshcfg"; 
+                    $cmd = "rspconfig $pdu sshcfg";
                     send_msg($request, 0, "process command: $cmd\n");
                     $rc = xCAT::Utils->runcmd($cmd, 0);
                     $cmd = "rspconfig $pdu hostname=$pdu ip=$ip netmask=$mask";
diff --git a/xCAT-server/lib/xcat/plugins/syncfiles.pm b/xCAT-server/lib/xcat/plugins/syncfiles.pm
index 9114fbbde..ff31ca2c5 100644
--- a/xCAT-server/lib/xcat/plugins/syncfiles.pm
+++ b/xCAT-server/lib/xcat/plugins/syncfiles.pm
@@ -66,7 +66,7 @@ sub process_request
       )
     {
         xCAT::MsgUtils->message("S", "Received syncfiles from $client, with invalid options @ARGV");
-        return;    
+        return;
     }
 
     if ($options{'node-rcp'}){
@@ -125,7 +125,7 @@ sub syncfiles {
         # call the xdcp plugin to handle the syncfile operation
         my $args = [ "-F", "$synclistfile"];
         if($::RCP){
-            push @$args,"-r"; 
+            push @$args,"-r";
             push @$args, "$::RCP";
         }
         my $env = ["DSH_RSYNC_FILE=$synclistfile"];
diff --git a/xCAT-server/lib/xcat/plugins/toolscenter.pm b/xCAT-server/lib/xcat/plugins/toolscenter.pm
index 3d77a48cd..81c4b072d 100644
--- a/xCAT-server/lib/xcat/plugins/toolscenter.pm
+++ b/xCAT-server/lib/xcat/plugins/toolscenter.pm
@@ -255,7 +255,7 @@ BEGIN {
     xcatdhost = ARGV[1]
     xcatdport = ARGV[2]
     flag = ARGV[3]
-    
+
         if (!flag) flag = "next"
 
         ns = "/inet/tcp/0/" ARGV[1] "/" xcatdport
diff --git a/xCAT-server/lib/xcat/plugins/updatehwinv.pm b/xCAT-server/lib/xcat/plugins/updatehwinv.pm
index d91460804..1ba8688df 100644
--- a/xCAT-server/lib/xcat/plugins/updatehwinv.pm
+++ b/xCAT-server/lib/xcat/plugins/updatehwinv.pm
@@ -65,7 +65,7 @@ sub update_hw_inv {
 
     if ($basicdata) {
         my $hwinv_tab = xCAT::Table->new("hwinv", -create => 1);
-        xCAT::MsgUtils->message("S", "xcat.hwinv: Update hwinv for $node"); 
+        xCAT::MsgUtils->message("S", "xcat.hwinv: Update hwinv for $node");
         $hwinv_tab->setNodeAttribs($node, $basicdata);
     }
     if (@nodefs) {
diff --git a/xCAT-server/lib/xcat/plugins/updatenode.pm b/xCAT-server/lib/xcat/plugins/updatenode.pm
index 7df23f482..e53e7aec7 100644
--- a/xCAT-server/lib/xcat/plugins/updatenode.pm
+++ b/xCAT-server/lib/xcat/plugins/updatenode.pm
@@ -69,7 +69,7 @@ sub handled_commands
 #-------------------------------------------------------
 
 =head3  preprocess_request
-  Check and setup for hierarchy 
+  Check and setup for hierarchy
 =cut
 
 #-------------------------------------------------------
@@ -121,7 +121,7 @@ sub preprocess_request
       callback -- a callback pointer to return the response to.
     Returns:
         0 - for success. The output is returned through the callback pointer.
-        1 -  for error. The error messages are returns through the 
+        1 -  for error. The error messages are returns through the
 							callback pointer.
 =cut
 
@@ -170,9 +170,9 @@ sub process_request
 
 =head3   preprocess_updatenode
         This function checks for the syntax of the updatenode command
-     		and distributes the command to the right server. 
+     		and distributes the command to the right server.
     Arguments:
-      request - the request. 
+      request - the request.
       callback - the pointer to the callback function.
 	  subreq - the sub request
     Returns:
@@ -439,9 +439,9 @@ sub preprocess_updatenode
         $rsp->{data}->[0] = "-r|--node-rcp option is valid when option -f or -F is specified";
         $rsp->{errorcode}->[0] = 1;
         $callback->($rsp);
-        return;        
+        return;
     }
-    
+
 
     # -f must not be with any other flag, this updates service nodes syncfiles
     if ($SNFILESYNC && ($SWMAINTENANCE || $RERUNPS || defined($RERUNPS) || $SECURITY || $FILESYNC))
@@ -673,11 +673,11 @@ sub preprocess_updatenode
     {
         $request->{SNFileSyncing}->[0] = "yes";
     }
-   
+
     if ($RCP){
         $request->{rcp}->[0]=$RCP;
     }
-   
+
     # If -F  or -f then,  call CFMUtils  to check if any PCM CFM data is to be
     # built for the node.   This will also create the synclists attribute in
     # the osimage for each node in the noderange
@@ -873,11 +873,11 @@ sub preprocess_updatenode
 
 #-------------------------------------------------------------------------------
 
-=head3  update_SN_security 
+=head3  update_SN_security
 
-    process updatenode -k command 
+    process updatenode -k command
     determine all the service nodes that must be processed from the
-    input noderange and then update the ssh keys and credentials 
+    input noderange and then update the ssh keys and credentials
 
 =cut
 
@@ -977,9 +977,9 @@ sub update_SN_security
 
 #-------------------------------------------------------------------------------
 
-=head3  security_update_sshkeys 
+=head3  security_update_sshkeys
 
-    process updatenode -k command 
+    process updatenode -k command
     the ssh keys on  the service nodes  and nodes
     by calling xdsh -K
 
@@ -1080,14 +1080,14 @@ sub security_update_sshkeys
 #--------------------------------------------------------------------------------
 
 =head3   updatenode
-        This function implements the updatenode command. 
+        This function implements the updatenode command.
     Arguments:
-      request - the request.        
+      request - the request.
       callback - the pointer to the callback function.
 	  subreq - the sub request
     Returns:
         0 - for success. The output is returned through the callback pointer.
-        1 - for error. The error messages are returned through the 
+        1 - for error. The error messages are returned through the
 				callback pointer.
 =cut
 
@@ -1526,7 +1526,7 @@ sub updatenode
 
 #-------------------------------------------------------------------------------
 
-=head3  updatenoderunps  - run postscripts or the updatenode -P option 
+=head3  updatenoderunps  - run postscripts or the updatenode -P option
 
     Arguments: request
     Returns:
@@ -1930,7 +1930,7 @@ sub updatenodesyncfiles
         and then outputs the remaining user info
 
     Arguments: output,callback
-    Globals @::SUCCESSFULLNODES,  @::FAILEDNODE  
+    Globals @::SUCCESSFULLNODES,  @::FAILEDNODE
     $::REPORTSTATUS  if "Y" then imediately return status in $::CALLERCALLBACK (PCM)
 
 =cut
@@ -2214,7 +2214,7 @@ sub updatenodesoftware
 =head3  getdata  - This is the local callback that handles the response from
         the xdsh streaming calls when running postscripts(-P) and software updates (-S)
         $::TYPECALL = P  from postscripts runs or S from Software updates
-        $::CALLERCALLBACK  = saved callback from calling routine  
+        $::CALLERCALLBACK  = saved callback from calling routine
         $::REPORTSTATUS, if Y,  return the good/bad status right away from this
                          routine  to the $::CALLERCALLBACK ( PCM)
 
@@ -2444,7 +2444,7 @@ sub updatenodestat
 			- node update information
 
     Example
-	 my ($rc, $imagedef, $updateinfo) = &doAIXcopy($callback, \%attrvals, 
+	 my ($rc, $imagedef, $updateinfo) = &doAIXcopy($callback, \%attrvals,
 			$nodes, $subreq);
 
     Comments:
@@ -2886,7 +2886,7 @@ qq~$::XCATROOT/bin/prsync -o "rlHpEAogDz" $srcdir $snkey:$dir 2>/dev/null~;
 
 =head3   updateAIXsoftware
 
-    Update the software on an xCAT AIX cluster node. 
+    Update the software on an xCAT AIX cluster node.
 
     Arguments:
 
@@ -2895,7 +2895,7 @@ qq~$::XCATROOT/bin/prsync -o "rlHpEAogDz" $srcdir $snkey:$dir 2>/dev/null~;
       1 - error
 
 	Example
-		if (&updateAIXsoftware($callback, \%attrres, $imgdefs, $updates, $nodes, $subreq)!= 0) 
+		if (&updateAIXsoftware($callback, \%attrres, $imgdefs, $updates, $nodes, $subreq)!= 0)
 
     Comments:
 
@@ -3284,10 +3284,10 @@ sub updateAIXsoftware
 =head3   updateOS
 
 	Description	: Update the node operating system
-    Arguments	: 
+    Arguments	:
     Returns		: Nothing
     Example		: updateOS($callback, $nodes, $os);
-    
+
 =cut
 
 #-------------------------------------------------------
@@ -3498,7 +3498,7 @@ sub updateOS
 #-------------------------------------------------------------------------------
 
 =head3   updatenodeappstat
-    This subroutine is used to handle the messages reported by 
+    This subroutine is used to handle the messages reported by
     HPCbootstatus postscript. Update appstatus node attribute.
 
     Arguments:
diff --git a/xCAT-server/lib/xcat/plugins/vbox.pm b/xCAT-server/lib/xcat/plugins/vbox.pm
index be6578034..a4d05e79c 100644
--- a/xCAT-server/lib/xcat/plugins/vbox.pm
+++ b/xCAT-server/lib/xcat/plugins/vbox.pm
@@ -46,7 +46,7 @@ sub handled_commands
 
 =head3	preprocess_request
 
-  Check and setup for hierarchy 
+  Check and setup for hierarchy
 
 =cut
 
diff --git a/xCAT-server/lib/xcat/plugins/vsmppxe.pm b/xCAT-server/lib/xcat/plugins/vsmppxe.pm
index aa22a24ed..d05fb2243 100644
--- a/xCAT-server/lib/xcat/plugins/vsmppxe.pm
+++ b/xCAT-server/lib/xcat/plugins/vsmppxe.pm
@@ -500,7 +500,7 @@ sub process_request {
         nodes  --- a pointer to an array of nodes
         states -- a pointer to a hash table. This hash will be filled by this
              function. The key is the nodeset status and the value is a pointer
-             to an array of nodes. 
+             to an array of nodes.
     Returns:
        (return code, error message)
 =cut
diff --git a/xCAT-server/lib/xcat/plugins/xCATWorld.pm b/xCAT-server/lib/xcat/plugins/xCATWorld.pm
index 57bee6e9b..bb90b99ce 100644
--- a/xCAT-server/lib/xcat/plugins/xCATWorld.pm
+++ b/xCAT-server/lib/xcat/plugins/xCATWorld.pm
@@ -43,7 +43,7 @@ sub handled_commands
 =head3  preprocess_request
 
   Check and setup for hierarchy , if your command must run
-  on service nodes. Otherwise preprocess_request not necessary   
+  on service nodes. Otherwise preprocess_request not necessary
 
 =cut
 
diff --git a/xCAT-server/lib/xcat/plugins/xcat2nim.pm b/xCAT-server/lib/xcat/plugins/xcat2nim.pm
index 83abf6781..9647c5744 100644
--- a/xCAT-server/lib/xcat/plugins/xcat2nim.pm
+++ b/xCAT-server/lib/xcat/plugins/xcat2nim.pm
@@ -349,7 +349,7 @@ sub prexcat2nim
                 1 - just print usage
 				2 - error
         Globals:
-                
+
         Error:
 
         Example:
@@ -874,7 +874,7 @@ sub x2n
 
 =head3   mkclientdef
 
-		Create a NIM client definition.        
+		Create a NIM client definition.
         Arguments:
         Returns:
                 0 - OK
@@ -1316,7 +1316,7 @@ sub rm_or_list_nim_object
 
         Arguments:
         Returns:
-                name  
+                name
                 undef - error
         Globals:
 
@@ -1434,13 +1434,13 @@ sub xcat2nim_usage
 #-------------------------------------------------------------------------------
 
 =head3 mkNIMnetwork
-		Create NIM network definitions corresponding to xCAT network 
+		Create NIM network definitions corresponding to xCAT network
 		definitions. This routine runs on the NIMprime and AIX SNs
 
     Arguments:
 
     Returns:
-        
+
 
     Comments:
 
diff --git a/xCAT-server/lib/xcat/plugins/xdsh.pm b/xCAT-server/lib/xcat/plugins/xdsh.pm
index 2b295d144..187e206a1 100644
--- a/xCAT-server/lib/xcat/plugins/xdsh.pm
+++ b/xCAT-server/lib/xcat/plugins/xdsh.pm
@@ -15,6 +15,7 @@ use strict;
 use Storable qw(dclone);
 use File::Basename;
 use File::Path;
+use File::Temp;
 use POSIX;
 require xCAT::Table;
 use Data::Dumper;
@@ -51,7 +52,7 @@ sub handled_commands
 
 =head3  preprocess_request
 
-  Check and setup for hierarchy 
+  Check and setup for hierarchy
 
 =cut
 
@@ -278,9 +279,9 @@ sub preprocess_request
 
 #-------------------------------------------------------
 
-=head3 parse_xdcp_cmd 
+=head3 parse_xdcp_cmd
   Check to see if full path on file(s) input to the command
-  If not add currentpath to the file in the argument 
+  If not add currentpath to the file in the argument
   Check to see if on a servicenode, if so then add the SNsynfiledir
   to the path
 =cut
@@ -435,9 +436,9 @@ sub parse_xdcp_cmd
 
 #-------------------------------------------------------
 
-=head3 parse_xdsh_cmd 
+=head3 parse_xdsh_cmd
   Check to see if full path on file(s) input to the command
-  If not add currentpath to the file in the argument 
+  If not add currentpath to the file in the argument
 =cut
 
 #-------------------------------------------------------
@@ -579,8 +580,8 @@ sub parse_xdsh_cmd
 #-------------------------------------------------------
 
 =head3  process_servicenodes_xdcp
-  Build the xdcp command to send to the service nodes first 
-  Return an array of servicenodes that do not have errors 
+  Build the xdcp command to send to the service nodes first
+  Return an array of servicenodes that do not have errors
   Returns error code:
   if  = 0,  good return continue to process the
 	  nodes.
@@ -820,13 +821,13 @@ sub process_servicenodes_xdcp
 #-------------------------------------------------------
 
 =head3  process_servicenodes_xdsh
-  Build the xdsh command to sync the -e file or the -E file 
+  Build the xdsh command to sync the -e file or the -E file
   to the servicenodes.
-  The executable (-e) or the environment file (-E) 
+  The executable (-e) or the environment file (-E)
   must be copied into /var/xcat/syncfiles (SNsyncfiledir attribute), and then
   the command modified so that the xdsh running on the SN will use the file
   from /var/xcat/syncfiles (default) for the compute nodes.
-  Return an array of servicenodes that do not have errors 
+  Return an array of servicenodes that do not have errors
   Returns error code:
   if  = 0,  good return continue to process the
 	  nodes.
@@ -882,7 +883,7 @@ sub process_servicenodes_xdsh
         # build a tmp syncfile with
         # $::dshexecute -> $synfiledir . $::dshexecute
         # $::dshenvfile -> $synfiledir . $::dshenvfile
-        my $tmpsyncfile = POSIX::tmpnam . ".dsh";
+        my $tmpsyncfile = File::Temp::tmpnam . ".dsh";
 
         # if -E option
         my $envfile;
@@ -983,8 +984,8 @@ sub process_servicenodes_xdsh
 
 =head3  process_nodes
 
-  Build the  request to send to the nodes, serviced by SN 
-  Return the request 
+  Build the  request to send to the nodes, serviced by SN
+  Return the request
 
 =cut
 
diff --git a/xCAT-server/lib/xcat/plugins/xen.pm b/xCAT-server/lib/xcat/plugins/xen.pm
index 6629f9b9f..ece4a0a08 100644
--- a/xCAT-server/lib/xcat/plugins/xen.pm
+++ b/xCAT-server/lib/xcat/plugins/xen.pm
@@ -709,7 +709,7 @@ sub process_request {
      if ($command eq "rpower" and grep(/^pduon|pduoff|pdureset|pdustat$/, @exargs)) {
          return;
      }
-     
+
     if ($command eq 'revacuate') {
         my $newnoderange;
         foreach (@$noderange) {
diff --git a/xCAT-server/lib/xcat/plugins/xnba.pm b/xCAT-server/lib/xcat/plugins/xnba.pm
index bd9f1dc4c..db8aa5dc8 100644
--- a/xCAT-server/lib/xcat/plugins/xnba.pm
+++ b/xCAT-server/lib/xcat/plugins/xnba.pm
@@ -688,7 +688,7 @@ sub process_request {
                 arg      => \@args ,
                 bootparams => \%bphash},
                 \&pass_along);
-        if ($errored) { 
+        if ($errored) {
             xCAT::MsgUtils->trace($verbose_on_off, "d", "xnba: Failed in processing setdestiny.");
             return if ($errored > 1);
         }
@@ -807,7 +807,7 @@ sub process_request {
         nodes  --- a pointer to an array of nodes
         states -- a pointer to a hash table. This hash will be filled by this
              function. The key is the nodeset status and the value is a pointer
-             to an array of nodes. 
+             to an array of nodes.
     Returns:
        (return code, error message)
 =cut
diff --git a/xCAT-server/lib/xcat/plugins/yaboot.pm b/xCAT-server/lib/xcat/plugins/yaboot.pm
index 1b3c3ab7e..cbfabbb29 100644
--- a/xCAT-server/lib/xcat/plugins/yaboot.pm
+++ b/xCAT-server/lib/xcat/plugins/yaboot.pm
@@ -434,7 +434,7 @@ sub preprocess_request {
              $callback1->(\%rsp);
         }
         return;
-    }    
+    }
 
     #Assume shared tftp directory for boring people, but for cool people, help sync up tftpdirectory contents when
     #if they specify no sharedtftp in site table
@@ -876,7 +876,7 @@ sub process_request {
         nodes  --- a pointer to an array of nodes
         states -- a pointer to a hash table. This hash will be filled by this
              function.The key is the nodeset status and the value is a pointer
-             to an array of nodes.  
+             to an array of nodes.
     Returns:
        (return code, error message)
 =cut
diff --git a/xCAT-server/lib/xcat/plugins/zone.pm b/xCAT-server/lib/xcat/plugins/zone.pm
index fa75791d4..7e5803cdb 100644
--- a/xCAT-server/lib/xcat/plugins/zone.pm
+++ b/xCAT-server/lib/xcat/plugins/zone.pm
@@ -2,10 +2,10 @@
 #-------------------------------------------------------
 
 =head1
-  xCAT plugin package to handle mkzone,chzone,Input rmzone commands 
+  xCAT plugin package to handle mkzone,chzone,Input rmzone commands
 
    Supported command:
-         mkzone,chzone,rmzone - manage xcat cluster zones 
+         mkzone,chzone,rmzone - manage xcat cluster zones
 
 =cut
 
@@ -287,10 +287,10 @@ sub process_request
 
 #-------------------------------------------------------
 
-=head3   
+=head3
 
-   Parses and runs  mkzone 
-   Input 
+   Parses and runs  mkzone
+   Input
      request
      callback
      Input  arguments from the GetOpts
@@ -370,10 +370,10 @@ sub mkzone
 
 #-------------------------------------------------------
 
-=head3   
+=head3
 
-   Parses and runs chzone 
-   Input 
+   Parses and runs chzone
+   Input
      request
      callback
      Input  arguments from the GetOpts
@@ -489,14 +489,14 @@ sub chzone
 
 #-------------------------------------------------------
 
-=head3   
+=head3
 
-   Parses and runs rmzone 
-   Input 
+   Parses and runs rmzone
+   Input
      request
      callback
      Input  arguments from the GetOpts
-      
+
 
 =cut
 
@@ -676,9 +676,9 @@ sub usage
 
 #-------------------------------------------------------
 
-=head3   
+=head3
 
-   generate the ssh keys and store them in /etc/xcat/sshkeys/<zonename>/.ssh 
+   generate the ssh keys and store them in /etc/xcat/sshkeys/<zonename>/.ssh
 
 
 =cut
@@ -721,10 +721,10 @@ sub gensshkeys
 
 #-------------------------------------------------------
 
-=head3   
+=head3
     addtozonetable
-    Add the new zone to the zone table, check if already there and 
-    error - use either chzone or -f to override default 
+    Add the new zone to the zone table, check if already there and
+    error - use either chzone or -f to override default
 
 
 
@@ -810,7 +810,7 @@ sub addtozonetable
 
 #-------------------------------------------------------
 
-=head3   
+=head3
     updatezonetable
     change either the sshbetweennodes or defaultzone  attribute
     or generate new keys ( -k -K)
@@ -894,10 +894,10 @@ sub updatezonetable
 
 #-------------------------------------------------------
 
-=head3   
-    addnodestozone 
-    Add the new zonename attribute to any nodes in the noderange ( if a noderange specified) 
-    Add zonename group to nodes in the noderange if -g flag. 
+=head3
+    addnodestozone
+    Add the new zonename attribute to any nodes in the noderange ( if a noderange specified)
+    Add zonename group to nodes in the noderange if -g flag.
 
 
 
@@ -948,12 +948,12 @@ sub addnodestozone
 
 #-------------------------------------------------------
 
-=head3   
-    rmnodesfromzone 
+=head3
+    rmnodesfromzone
     removes the zonename from all nodes with their zonename the input zone or
     the noderange supplied on the -r flag
-    if -g, removes zonename group from all nodes defined with their zonename the input zone. 
-    Note if $ALL is input it removes all nodes from the zone, 
+    if -g, removes zonename group from all nodes defined with their zonename the input zone.
+    Note if $ALL is input it removes all nodes from the zone,
      otherwise  $request->{noderange} points to the noderange
 
 
diff --git a/xCAT-server/lib/xcat/plugins/zvm.pm b/xCAT-server/lib/xcat/plugins/zvm.pm
index c7caf524d..dfa45bf01 100644
--- a/xCAT-server/lib/xcat/plugins/zvm.pm
+++ b/xCAT-server/lib/xcat/plugins/zvm.pm
@@ -3404,7 +3404,7 @@ sub powerVM {
 
     # Output string
     my $out;
-    
+
     # Power on virtual server
     if ( $args->[0] eq 'on' ) {
         # Check the node flag, if it contain XCATCONF4Z=0, it indicate that this node will be deployed by using non-xcatconf4z type
diff --git a/xCAT-server/lib/xcat/plugins/zvmdiagnostics.pm b/xCAT-server/lib/xcat/plugins/zvmdiagnostics.pm
index a390dce39..3e48006f4 100644
--- a/xCAT-server/lib/xcat/plugins/zvmdiagnostics.pm
+++ b/xCAT-server/lib/xcat/plugins/zvmdiagnostics.pm
@@ -293,7 +293,7 @@ sub collectDiags {
     xCAT::zvmUtils->printSyslog("$ROUTINE $SUBROUTINE $msg");
     system($msg);
     #TODO check system()'s rc
-    
+
     #TODO Capture diagnostic files
 
     xCAT::zvmUtils->printSyslog("$ROUTINE $SUBROUTINE ... rest of implementation stubbed out ");
diff --git a/xCAT-server/lib/xcat/plugins/zvmdiscovery.pm b/xCAT-server/lib/xcat/plugins/zvmdiscovery.pm
index a243963cf..f59f01fc0 100644
--- a/xCAT-server/lib/xcat/plugins/zvmdiscovery.pm
+++ b/xCAT-server/lib/xcat/plugins/zvmdiscovery.pm
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 ## IBM(c) 2015 EPL license http://www.eclipse.org/legal/epl-v10.html
 #
-# This plugin is used to handle the z/VM discovery. 
+# This plugin is used to handle the z/VM discovery.
 # z/VM discovery will discover the z/VM virtual machines running
 # on a specified z/VM host and define them to xCAT DB.
 # In addition, it will optionally define the systems to OpenStack.
@@ -33,7 +33,7 @@ my $request_command;
 my $ZHCP_BIN = '/opt/zhcp/bin';
 
 # Hash of host name resolution commands to be issued in a virtual OS.
-my @hostnameCmds = ( 'hostname --fqdn', 
+my @hostnameCmds = ( 'hostname --fqdn',
                      'hostname --long',
                      'hostname',
                    );
@@ -446,7 +446,7 @@ sub changeNode {
     my $nodeName = shift;
     my $changeType = shift;
     my $newNode = shift;
-    
+
     my $rc = 0;           # Assume everything works
     my $retStrRef;
 
@@ -510,7 +510,7 @@ sub changeNode {
 =head3   createNode
 
     Description : Find an available xCAT nodename and create a node
-                  for the virtual machine and indicate it is a 
+                  for the virtual machine and indicate it is a
                   discovered node.  Also, do a MAKEHOSTS so xCAT MN
                   can access it by the node name.
     Arguments   : Callback handle
@@ -524,7 +524,7 @@ sub changeNode {
                       can check for already known node names.
     Returns     : Node name if created or empty string if an error occurred.
                   Current numeric value
-    Example     : ( $node, $numeric ) = createNode($callback, $discoverable{$activeSystem}{'hostname'}, 
+    Example     : ( $node, $numeric ) = createNode($callback, $discoverable{$activeSystem}{'hostname'},
                                         $args{'nodenameformat'}, $numeric, $retstr_gen, \%xcatNodes);
 
 =cut
@@ -552,7 +552,7 @@ sub createNode {
         if ( $nameFormat =~ /#NNN/ ) {
             # Old Style xCAT template e.g. node#NNN -> node001
             $templateType = 1;
-            
+
             # Deconstruct the name format template into its component parts.
             my @fmtParts = split ( '#NNN', $nameFormat );
             $prefix = $fmtParts[0];
@@ -611,7 +611,7 @@ sub createNode {
             if ( $::RUNCMD_RC == 0 ) {
                 # Node created.  All done.
                 $xcatNodesRef->{$nodeName} = 1;
-                
+
                 # Update the zvm table for the node to indicate that it is a discovered system.
                 my %zvmProps = ( "discovered" => "1" );
                 my $zvmTab = xCAT::Table->new('zvm');
@@ -635,15 +635,15 @@ sub createNode {
                     $nodeName = '';
                     last;
                 } else {
-                    # Assume xCAT daemon is unavailable.  Give it 15 seconds to come back 
+                    # Assume xCAT daemon is unavailable.  Give it 15 seconds to come back
                     # before next attempt.
                     sleep(15);
                 }
-            } 
+            }
         }
 
         # Did not find an available node name on this pass.
-        # Wipe out the nodename in case we exit the loop.  Also, ensure a numeric 
+        # Wipe out the nodename in case we exit the loop.  Also, ensure a numeric
         # is used next time around.
         $nodeName = '';
         if ( $numeric eq '' ){
@@ -674,7 +674,7 @@ FINISH_createNode:
 
 =head3   findme
 
-    Description : Handle the request form node to map and 
+    Description : Handle the request form node to map and
                   define the request to a node.
     Arguments   : request handle
                   callback
@@ -682,7 +682,7 @@ FINISH_createNode:
     Returns     : 0 - No error
                   non-zero - Error detected.
     Example     : findme( $request, $callback, $request_command );
-    
+
 =cut
 
 #-------------------------------------------------------
@@ -696,7 +696,7 @@ sub findme {
     my $ZVMdiscover = getSiteVal("__ZVMDiscover");
     unless ( $ZVMdiscover ) {
         if ( $SEQdiscover or $PCMdiscover ) {
-            # profile or sequential discovery is running, then just return 
+            # profile or sequential discovery is running, then just return
             # to make the other discovery handle it
             return;
         }
@@ -776,7 +776,7 @@ FINISH_getOpenStackTemplate:
                   discovery from the site table variable.
     Arguments   : Callback handle
                   z/VM host node
-    Returns     : Timestamp for the run that was specified or 
+    Returns     : Timestamp for the run that was specified or
                     empty string if a run was not found.
     Example     : $ts = getRunningDiscTimestamp( 'zvm1' );
 
@@ -933,7 +933,7 @@ sub nodediscoverls {
             my @hosts = split( /,/, $origArgs{'zvmHost'} );
             foreach my $host ( @hosts ) {
                 if ( !$host ) {
-                    # Tolerate zvmhost value beginning with a comma.  
+                    # Tolerate zvmhost value beginning with a comma.
                     # It is wrong but not worth an error message.
                     next;
                 }
@@ -1076,7 +1076,7 @@ FINISH_nodediscoverls:
                   arguments for nodediscoverstart
     Returns     : None.
     Example     : nodediscoverstart( $callback, $args );
-    
+
 =cut
 
 #-------------------------------------------------------
@@ -1108,7 +1108,7 @@ sub nodediscoverstart {
     }
 
     $origArgs{'verbose'} = 0;     # Assume we are not doing verbose
-    my ($help, $ver); 
+    my ($help, $ver);
     if (!GetOptions(
         'h|help' => \$help,
         'V|verbose' => \$origArgs{'verbose'},
@@ -1117,7 +1117,7 @@ sub nodediscoverstart {
         # We don't need another
         return;
     }
-    
+
     if ( $help | $ver ) {
         # Sequential discovery will have handled these options.
         return;
@@ -1259,7 +1259,7 @@ sub nodediscoverstart {
         }
 
         # Invoke the OpenStack plugin to validate OpenStack related variables.
-        if (( $name eq 'openstackoperands' ) and 
+        if (( $name eq 'openstackoperands' ) and
             (( $origArgs{'defineto'} eq 'both' ) || ( $origArgs{'defineto'} eq 'openstackonly' )) &&
              defined( $origArgs{$name} )) {
             $origArgs{$name} =~ s/^\'+|\'+$//g;
@@ -1390,7 +1390,7 @@ FINISH_NODEDISCOVERSTART:
                   arguments for nodediscoverstatus
     Returns     : None.
     Example     : nodediscoverstatus( $callback, $args );
-    
+
 =cut
 
 #-------------------------------------------------------
@@ -1434,7 +1434,7 @@ sub nodediscoverstatus {
             my @hosts = split( /,/, $zvmHost );
             foreach $zvmHost ( @hosts ) {
                 if ( !$zvmHost ) {
-                    # Tolerate zvmhost value beginning with a comma.  
+                    # Tolerate zvmhost value beginning with a comma.
                     # It is wrong but not worth an error message.
                     next;
                 }
@@ -1443,7 +1443,7 @@ sub nodediscoverstatus {
         } else {
             push( @inputZvmHosts, $zvmHost );
         }
-    } 
+    }
     my %inputZvmHostsHash = map { $_ => 1 } @inputZvmHosts;
 
     # Get the list of z/VM hosts.
@@ -1469,7 +1469,7 @@ sub nodediscoverstatus {
             # Not an expected format, Drop it when we push out the new saved parameters.
             push @{$rsp->{data}}, "__ZVMDiscover property in the xCAT site table is corrupted.  It has been cleared so that all z/VM discovery stops.  You may restart z/VM discovery.";
             xCAT::MsgUtils->message( "E", $rsp, $callback, 1 );
-            
+
             # Remove the site.__ZVMDiscover property
             # We don't need a lock because we are whipping out the value and not trying to keep it around.
             my $siteTab = xCAT::Table->new( "site", -autocommit=>1 );
@@ -1538,7 +1538,7 @@ FINISH_NODEDISCOVERSTATUS:
                   $auto option (not used by z/VM)
     Returns     : None.
     Example     : nodediscoverstop( $callback, $args, $auto );
-    
+
 =cut
 
 #-------------------------------------------------------
@@ -1581,7 +1581,7 @@ sub nodediscoverstop {
             my @hosts = split( /,/, $zvmHost );
             foreach $zvmHost ( @hosts ) {
                 if ( !$zvmHost ) {
-                    # Tolerate zvmhost value beginning with a comma.  
+                    # Tolerate zvmhost value beginning with a comma.
                     # It is wrong but not worth an error message.
                     next;
                 }
@@ -1623,7 +1623,7 @@ sub nodediscoverstop {
             # Not an expected format, Drop it when we push out the new saved parameters.
             push @{$rsp->{data}}, "__ZVMDiscover property in the xCAT site table is corrupted.  It has been cleared so that all z/VM discovery stops.  You may restart z/VM discovery.";
             xCAT::MsgUtils->message( "E", $rsp, $callback, 1 );
-            
+
             # Remove the site.__ZVMDiscover property
             my $siteTab = xCAT::Table->new( "site", -autocommit=>1 );
             $siteTab->delEntries({key => '__ZVMDiscover'});
@@ -1658,7 +1658,7 @@ FINISH_NODEDISCOVERSTOP:
 
     Description : Get return of runxcmd and convert it into strings.
     Arguments   : The return reference of runxcmd
-    Returns     : [$outstr, $errstr], A reference of list, placing 
+    Returns     : [$outstr, $errstr], A reference of list, placing
                   standard output and standard error message.
     Example     : my $retStrRef = parse_runxcmd_ret($retRef);
 
@@ -1697,7 +1697,7 @@ sub parse_runxcmd_ret {
                   Command that is requested
     Returns     : None
     Example     : process_request( $request, $callback, $request_command );
-    
+
 =cut
 
 #-------------------------------------------------------
@@ -1738,7 +1738,7 @@ sub process_request {
                   z/VM host node name
     Returns     : None.
     Example     : $rc = removeHostInfo( $callback, $zvmHost );
-    
+
 =cut
 
 #-------------------------------------------------------
@@ -1828,11 +1828,11 @@ FINISH_removeHostInfo:
                   z/VM host node name
                   ZHCP
                   Start time of the discovery
-                  Hash of arguments specified on the nodediscoverstart 
+                  Hash of arguments specified on the nodediscoverstart
                     command and their values
     Returns     : None
     Example     : startDiscovery( $callback, $zvmHost, $hcp, $startTime, \%args );
-    
+
 =cut
 
 #-------------------------------------------------------
@@ -1862,16 +1862,16 @@ sub startDiscovery{
         xCAT::MsgUtils->message( "E", $rsp, $callback );
         goto FINISH_startDiscovery;
     }
-    
+
     my %keyhash;
     $keyhash{'method'} = 'zvm';
     $keyhash{'otherdata'} = "zvmhost." . $zvmHost;
     $disTab->delEntries( \%keyhash );
     $disTab->commit();
-    
+
     # Handle 'openstackonly' discovery or get the template for 'both' discovery.
     if ( $args{'defineto'} eq 'openstackonly' ) {
-        # Verify that OpenStack has a valid template to use when it is called 
+        # Verify that OpenStack has a valid template to use when it is called
         # to handle the node.
         my ( $osTemplate, $osNumeric ) = getOpenStackTemplate( $callback, $zvmHost );
         if ( $osTemplate eq '' ) {
@@ -1891,7 +1891,7 @@ sub startDiscovery{
             # An error was detected in the template and message produced leave now.
             goto FINISH_startDiscovery;
         }
-        
+
         $startOpenStack = 1;
     }
 
@@ -1925,7 +1925,7 @@ sub startDiscovery{
                               "the zhcp server $hcp for an smcli Image_Status_Query " .
                               "request.  SMAPI servers may be unavailable.  " .
                               "Received response: $out";
-            
+
         xCAT::MsgUtils->message("E", $rsp, $callback);
         goto FINISH_startDiscovery;
     }
@@ -1933,9 +1933,9 @@ sub startDiscovery{
     # Build the hash of running systems.
     my @runningSystems = split( "\n", lc( $out ) );
 
-    # Create a hash of discoverable systems by starting with the 
+    # Create a hash of discoverable systems by starting with the
     # list of running systems and removing any systems in the
-    # list of non-discoverable (known to be z/VM servers or 
+    # list of non-discoverable (known to be z/VM servers or
     # non-Linux systems).
     my @nonDiscoverable = (
         'auditor',  'autolog1', 'autolog2', 'avsvm',
@@ -2033,7 +2033,7 @@ sub startDiscovery{
         my $nodeHCP;
         if ( $nodeRef->{'hcp'} && $nodeRef->{'userid'} ) {
             $nodeHCP = lc( $nodeRef->{'hcp'} );
-            if ((( defined $longName) && ( $longName eq $nodeHCP )) || 
+            if ((( defined $longName) && ( $longName eq $nodeHCP )) ||
                 (( defined $shortName) && ( $shortName eq $nodeHCP ))) {
                 push @knownUserids, lc( $nodeRef->{'userid'} );
             }
@@ -2055,7 +2055,7 @@ sub startDiscovery{
     my $numSystems = scalar( keys %discoverable );
     xCAT::MsgUtils->message( "S", "Discovery for $zvmHost found $numSystems virtual machines." );
 
-    # Perform a set of potentially long running functions.  We do this one 
+    # Perform a set of potentially long running functions.  We do this one
     # server at a time so that we can stop if we are told to do so.
     # Loop through the list performing the following:
     #   - See if discovery has been stopped early.
@@ -2196,11 +2196,11 @@ FINISH_startDiscovery:
     Description : Stop z/VM discovery for a particular z/VM host.
     Arguments   : Callback handle
                   z/VM host node name
-                  Array of arguments specified on nodediscoverstop or 
+                  Array of arguments specified on nodediscoverstop or
                     an empty array if this is an internal call.
     Returns     : None.
     Example     : stopDiscovery( $callback, $zvmHost, \@args );
-    
+
 =cut
 
 #-------------------------------------------------------
@@ -2247,12 +2247,12 @@ sub stopDiscovery{
     if ( @disData ) {
         push @{$rsp->{data}}, sprintf("    %-20s%-8s", 'NODE', 'z/VM USERID');
         foreach ( @disData ) {
-             push @{$rsp->{data}}, sprintf("    %-20s%-8s", $_->{'node'}, $discoveredNodes{$_->{'node'}} ); 
+             push @{$rsp->{data}}, sprintf("    %-20s%-8s", $_->{'node'}, $discoveredNodes{$_->{'node'}} );
         }
     }
 
     removeHostInfo( $callback, $zvmHost );
-    
+
     xCAT::MsgUtils->message( "I", $rsp, $callback );
     xCAT::MsgUtils->message( "I", "z/VM discovery stopped for z/VM host: $zvmHost" );
 
@@ -2275,7 +2275,7 @@ sub stopDiscovery{
     Returns     : None.
     Example     : updateDiscoverydata( $callback, 'add', $verbose, $zvmHost,
                                        $activeSystem, \%discoverable ):
-    
+
 =cut
 
 #-------------------------------------------------------
diff --git a/xCAT-server/lib/xcat/plugins/zzzdiscovery.pm b/xCAT-server/lib/xcat/plugins/zzzdiscovery.pm
index fb11381ff..5ccb4efda 100644
--- a/xCAT-server/lib/xcat/plugins/zzzdiscovery.pm
+++ b/xCAT-server/lib/xcat/plugins/zzzdiscovery.pm
@@ -38,7 +38,7 @@ sub process_request {
             #notify the client that its request is been processing
             my $ret=xCAT::NetworkUtils->send_tcp_msg($client_ip,3001,"processed");
             if($ret){
-                xCAT::MsgUtils->message("S", "xcat.discovery.zzzdiscovery: Failed to notify $client_ip that its findme request has been processed"); 
+                xCAT::MsgUtils->message("S", "xcat.discovery.zzzdiscovery: Failed to notify $client_ip that its findme request has been processed");
             }
         }else{
             xCAT::MsgUtils->message("S", "xcat.discovery.zzzdiscovery: ($req->{_xcat_clientmac}->[0]) Successfully discovered the node using $req->{discoverymethod}->[0] discovery method.");
diff --git a/xCAT-server/sbin/chtab b/xCAT-server/sbin/chtab
index 9a2bff905..18287fd35 100755
--- a/xCAT-server/sbin/chtab
+++ b/xCAT-server/sbin/chtab
@@ -25,7 +25,7 @@ sub usage {
    chtab [-h|--help|-v|--Version]\n\n";
     print "   -d|--delete  Delete the rows from a list of tables.
    -v|--version Display the version of this command.
-   -h|--help    Display this usage information. 
+   -h|--help    Display this usage information.
    keycolname=keyvalue   a column name-and-value pair that identifies the rows in a table to be changed.
    tablename.colname=newvalue    the new value for the specified row and column of the table.\n";
 }
diff --git a/xCAT-server/sbin/makenamed.conf b/xCAT-server/sbin/makenamed.conf
index 6264facb2..22e1fbbc6 100755
--- a/xCAT-server/sbin/makenamed.conf
+++ b/xCAT-server/sbin/makenamed.conf
@@ -28,10 +28,10 @@ is_lsb_ubuntu ()
 }
 
 
-DIRECTORY=/var/named 
+DIRECTORY=/var/named
 
 if [ -f /etc/SuSE-release ]; then
-  DIRECTORY=/var/lib/named 
+  DIRECTORY=/var/lib/named
 fi
 FILE=/etc/named.conf
 
@@ -44,7 +44,7 @@ if [ -f $FILE ]; then
   cp -f $FILE ${FILE}.ORIG
 fi
 if [ ! -d $DIRECTORY ]; then
-  mkdir $DIRECTORY 
+  mkdir $DIRECTORY
 fi
 echo "options {
 	directory \"$DIRECTORY\";
diff --git a/xCAT-server/sbin/restartxcatd b/xCAT-server/sbin/restartxcatd
index bef2defe2..4df45b3a9 100755
--- a/xCAT-server/sbin/restartxcatd
+++ b/xCAT-server/sbin/restartxcatd
@@ -4,28 +4,28 @@
 
 #-----------------------------------------------------------------------------
 
-=head1 restartxcatd 
+=head1 restartxcatd
 
  restartxcatd  - this routine is used to restart the xcatd process group.
 
      Linux: It will perform the xcatd fast restart. The 'xcatd fast restart'
-         has two advantages compares to the 'service stop and then start'. 
+         has two advantages compares to the 'service stop and then start'.
              1. The interval of xcatd out of service is very short.
              2. The in processing request which initiated by old xcatd will
                 not be stopped by force. The old xcatd will hand over the sockets
-                to new xcatd, but old xcat will still be waiting for the in processing 
+                to new xcatd, but old xcat will still be waiting for the in processing
                 request to finish before the exit.
 
          It does the same thing as 'service xcatd restart' on NON-systemd OS like
-             rh6.x and sles11.x. But for the systemd enabled OS like rh7 and sles12, 
-             the 'service xcatd restart' just do the 'stop and start' instead of 
+             rh6.x and sles11.x. But for the systemd enabled OS like rh7 and sles12,
+             the 'service xcatd restart' just do the 'stop and start' instead of
              'xcatd fast restart'.
-         
-         SO, it's recommended to use 'restartxcatd' command to restart xcatd on 
-             systemd enable system like rh7 and sles12 instead of 'service xcatd restart' or 
+
+         SO, it's recommended to use 'restartxcatd' command to restart xcatd on
+             systemd enable system like rh7 and sles12 instead of 'service xcatd restart' or
              'systemctl restart xcatd'.
 
-     AIX: It runs 'stopsrc -s xcatd' to stop xcatd first if xcatd is active, 
+     AIX: It runs 'stopsrc -s xcatd' to stop xcatd first if xcatd is active,
          then runs 'startsrc -s xcatd' to start xcatd.
 
 =cut
diff --git a/xCAT-server/sbin/runcmdinstaller b/xCAT-server/sbin/runcmdinstaller
index 695acc765..b9e2bf28b 100755
--- a/xCAT-server/sbin/runcmdinstaller
+++ b/xCAT-server/sbin/runcmdinstaller
@@ -10,10 +10,10 @@ cmd=$*
 function print_usage {
     echo "Usage:"
     echo "       runcmdinstaller <node> <commands>"
-    echo "       runcmdinstaller [-h] [--help]"        
+    echo "       runcmdinstaller [-h] [--help]"
     echo "Description:"
     echo "       A debug tool to run commands inside the os installer of a node"
-    echo "Notice:" 
+    echo "Notice:"
     echo "       1. runcmdinstaller is only available against the node provisioned with xcatdebugmode turned on(1 or 2)"
     echo "       2. <node> can not be multiple nodes or node group"
     echo "       3. <node> must be the node in 'installing' status"
@@ -28,27 +28,27 @@ if [ "$node" = "-h" ] || [ "$node" = "--help" ]; then
 fi
 
 if [ -z "$node" ] || [ -z "$cmd" ];then
-   print_usage 
+   print_usage
    exit 1
 fi
 
 
-XCATDEBUGMODE=$(lsdef -t site -o clustersite -i xcatdebugmode 2>/dev/null | grep "xcatdebugmode="|cut -d= -f2) 
+XCATDEBUGMODE=$(lsdef -t site -o clustersite -i xcatdebugmode 2>/dev/null | grep "xcatdebugmode="|cut -d= -f2)
 if [[ -z "$XCATDEBUGMODE" || "$XCATDEBUGMODE" == "0" ]];then
     echo "Warning:"
     echo "      The xcatdebugmode is disabled"
     echo "      runcmdinstaller is only available against the node provisioned with xcatdebugmode enabled(
-1 or 2)" 
+1 or 2)"
 else
-    NSupdate=$(lsdef -t site -o clustersite -i nodestatus 2>/dev/null | grep "nodestatus="|cut -d= -f2) 
+    NSupdate=$(lsdef -t site -o clustersite -i nodestatus 2>/dev/null | grep "nodestatus="|cut -d= -f2)
     nodestatus=$(lsdef $node -i status 2>/dev/null | grep "status="|cut -d= -f2)
-    
+
     if [[ "$NSupdate" != "n" && "$NSupdate" != "N" &&  "$NSupdate" != "0" && "$nodestatus" != "installing" ]];then
         echo "Warning:"
         echo "      The node status update is enabled and the 'nodestatus' of $node is $nodestatus"
         echo "      runcmdinstaller can only be run against the node in 'installing' status!"
     fi
-fi 
+fi
 
 type -p nc >/dev/null 2>&1
 retcode=$?
@@ -58,5 +58,5 @@ if [ "$retcode" != "0" ];then
     exit $retcode
 fi
 
-echo "sh $cmd 2>&1" | nc -w 20 $node 3054 
+echo "sh $cmd 2>&1" | nc -w 20 $node 3054
 
diff --git a/xCAT-server/sbin/runsqlcmd b/xCAT-server/sbin/runsqlcmd
index 7b9137f24..5c895a332 100755
--- a/xCAT-server/sbin/runsqlcmd
+++ b/xCAT-server/sbin/runsqlcmd
@@ -4,7 +4,7 @@
 
 #-----------------------------------------------------------------------------
 
-=head1   runsqlcmd 
+=head1   runsqlcmd
 
 
 
@@ -175,7 +175,7 @@ exit 0;
 
 #-----------------------------------------------------------------------------
 
-=head3    usage 
+=head3    usage
 	
 	Displays message for -h option
 
@@ -197,11 +197,11 @@ sub usage
 
 #-----------------------------------------------------------------------------
 
-=head3   rundb2cmd  
+=head3   rundb2cmd
 
 	
-  Run a commmand as the xcatdb instance id 
-  Input: command 
+  Run a commmand as the xcatdb instance id
+  Input: command
 
 =cut
 
@@ -263,11 +263,11 @@ sub rundb2cmd
 
 #-----------------------------------------------------------------------------
 
-=head3   runmysqlcmd  
+=head3   runmysqlcmd
 
 	
-  Run a sql commmand  
-  Input: command 
+  Run a sql commmand
+  Input: command
 
 =cut
 
@@ -315,11 +315,11 @@ sub runmysqlcmd
 
 #-----------------------------------------------------------------------------
 
-=head3   runpgsqlcmd  
+=head3   runpgsqlcmd
 
 	
-  Run a sql commmand  
-  Input: command 
+  Run a sql commmand
+  Input: command
 
 =cut
 
@@ -365,11 +365,11 @@ sub runpgsqlcmd
 
 #-----------------------------------------------------------------------------
 
-=head3   runsqlitecmd  
+=head3   runsqlitecmd
 
 	
-  Run a sql commmand  
-  Input: command 
+  Run a sql commmand
+  Input: command
 
 =cut
 
@@ -384,11 +384,11 @@ sub runsqlitecmd
 
 #-----------------------------------------------------------------------------
 
-=head3   process_file_list  
+=head3   process_file_list
 
 	
-  Expands all wildcards in file list and builds an array 
-  Input: filelist 
+  Expands all wildcards in file list and builds an array
+  Input: filelist
 
 =cut
 
diff --git a/xCAT-server/sbin/stopstartxcatd b/xCAT-server/sbin/stopstartxcatd
index 69c260d1b..c84aa9a3d 100755
--- a/xCAT-server/sbin/stopstartxcatd
+++ b/xCAT-server/sbin/stopstartxcatd
@@ -19,13 +19,13 @@ use xCAT::Utils;
 
 #-----------------------------------------------------------------------------
 
-=head1  startstopxcatd 
+=head1  startstopxcatd
+
 
 
- 
  stopstartxcatd  - this routine is linked to by startxCAT and stopxCAT.
- It runs on AIX.  If the admin runs startxCAT, it will start 
- or restart the xcatd, if it is already running.   
+ It runs on AIX.  If the admin runs startxCAT, it will start
+ or restart the xcatd, if it is already running.
  If the admin runs stopxCAT, it will stop the xcatd.
 
 
@@ -49,7 +49,7 @@ exit $rc;
 #-----------------------------------------------------------------------------
 
 =head3 parse_args
-  
+
   Parses for  input
 
 =cut
diff --git a/xCAT-server/sbin/updateSNimage b/xCAT-server/sbin/updateSNimage
index 67794d447..065bfb39b 100644
--- a/xCAT-server/sbin/updateSNimage
+++ b/xCAT-server/sbin/updateSNimage
@@ -20,7 +20,7 @@ use File::Copy;
 
 #-----------------------------------------------------------------------------
 
-=head1   updateSNimage 
+=head1   updateSNimage
 
    This routine updates the service node diskless install image with
    the extra files it needs to support running the postgresql and xcatd
@@ -244,9 +244,9 @@ exit $rc;
 
 #-----------------------------------------------------------------------------
 
-=head2   getarg 
+=head2   getarg
 
-  parses input 
+  parses input
 
 =cut
 
@@ -307,9 +307,9 @@ sub getarg
 
 #-----------------------------------------------------------------------------
 
-=head2   usage 
+=head2   usage
 
-  displays usages message 
+  displays usages message
 
 =cut
 
@@ -331,9 +331,9 @@ sub usage
 
 #-----------------------------------------------------------------------------
 
-=head2   create_fstab 
+=head2   create_fstab
 
- Saves old fstab and creates a new one, if not already done 
+ Saves old fstab and creates a new one, if not already done
 
 =cut
 
diff --git a/xCAT-server/sbin/xcat_traphandler b/xCAT-server/sbin/xcat_traphandler
index de041be67..0ff69c7f3 100755
--- a/xCAT-server/sbin/xcat_traphandler
+++ b/xCAT-server/sbin/xcat_traphandler
@@ -20,9 +20,9 @@ use Data::Dumper;
 
 #-------------------------------------------------------------------------------
 
-=head1  xcat_traphandler  
+=head1  xcat_traphandler
 =head2   Description
-  Script for SNMP trap handling. 
+  Script for SNMP trap handling.
 
 =cut
 
@@ -365,7 +365,7 @@ foreach my $k (keys %hashRUN) {
 #--------------------------------------------------------------------------------
 
 =head3    getMoreInfo
-      This function returns the node module/type, serial number, position etc. 
+      This function returns the node module/type, serial number, position etc.
     Arguments:
        node-- name of the node.
     Returns:
@@ -438,13 +438,13 @@ sub getMoreInfo {
 
 #--------------------------------------------------------------------------------
 
-=head3   parseSettings 
+=head3   parseSettings
       This function takes a setting string which looks like "key1=value1,key2=value2..."
-      and returns a hash (key1=>value1, key2=>value2...). 
+      and returns a hash (key1=>value1, key2=>value2...).
     Arguments:
-       setting  the setting string. 
+       setting  the setting string.
     Returns:
-       A hash. 
+       A hash.
 =cut
 
 #--------------------------------------------------------------------------------
@@ -473,9 +473,9 @@ sub parseSettings {
 
 #--------------------------------------------------------------------------------
 
-=head3   checkWithOid 
+=head3   checkWithOid
       This function checks the input strings with the setting to see what
-      actions need to be done for this event.  
+      actions need to be done for this event.
     Arguments:
        oid       the oid string
        value     the value string
diff --git a/xCAT-server/sbin/xcatconfig b/xCAT-server/sbin/xcatconfig
index a21d2bdd5..6ea038241 100755
--- a/xCAT-server/sbin/xcatconfig
+++ b/xCAT-server/sbin/xcatconfig
@@ -425,7 +425,7 @@ if ($::INITIALINSTALL || $::FORCE || $::UPDATEINSTALL)
 # The systemd only has LANG and PATH as default environmental variables,
 # TERM is needed for KVM consoles(actually screen command needs TERM)
 # import the TERM into systemd
-if (-d "/usr/lib/systemd/system") {
+if (-x "/usr/lib/systemd/systemd" || -x "/lib/systemd/systemd") {
     my $term = $ENV{'TERM'};
     if (!$term) {
         $term = "vt100";
@@ -622,7 +622,7 @@ exit;
 
 #-----------------------------------------------------------------------------
 
-=head3    usage 
+=head3    usage
 	
 	Displays message for -h option
 
@@ -651,7 +651,7 @@ sub verbose
 
 #-----------------------------------------------------------------------------
 
-=head3    genSSHRootKeys 
+=head3    genSSHRootKeys
 	
      Will generate a new ssh rsa key for the root user, if it does not exist or if requested by the input -k flag.
 
@@ -832,9 +832,9 @@ sub genSSHRootKeys
 
 #-----------------------------------------------------------------------------
 
-=head3   settunables 
+=head3   settunables
 	
-    Will set the default suggested tunables on the Management Node or service node for Linux 
+    Will set the default suggested tunables on the Management Node or service node for Linux
 
 =cut
 
@@ -889,16 +889,16 @@ sub settunables
 
 #-----------------------------------------------------------------------------
 
-=head3    genSSHNodeHostKey 
+=head3    genSSHNodeHostKey
 	
   If node private node hostkeys do not exist in either directory or force option
    or generate host key option, we need to generate them
    These keys are installed on the nodes in /etc/ssh directory and allow the
    node to ssh to the other nodes and the MN or SN to be able to ssh to the node
-   Without known_hosts warning messages.   
+   Without known_hosts warning messages.
    They are store in /etc/xcat/hostkeys on the MN.
    The public key is also installed in  /install/postscripts/hostkeys
-   for the install process 
+   for the install process
    The private key  is downloaded by remoteshell postscript using the credentials.pm interface
 
 =cut
@@ -1052,7 +1052,7 @@ sub is_redhat6sp4
 
 #-----------------------------------------------------------------------------
 
-=head3    initDB 
+=head3    initDB
 	
     Will initialize the DB if it does not already exist,  also updates with
 	new data needed or database changes during xCAT  install.
@@ -1495,7 +1495,7 @@ sub initDB
 
 #-----------------------------------------------------------------------------
 
-=head3    check for otherpkgs 
+=head3    check for otherpkgs
 	
     Check to see if other pkgs exists in postscripts table.
 	If it does not we will be putting it in postbootscripts
@@ -1546,9 +1546,9 @@ sub checkotherpkgs
 
 #-----------------------------------------------------------------------------
 
-=head3    genCredentials 
+=head3    genCredentials
 	
-    Will generate the xCAT credential,  if new install or requested to 
+    Will generate the xCAT credential,  if new install or requested to
 	regenerate.
 
 =cut
@@ -1736,10 +1736,10 @@ sub genCredentials
 
 #-----------------------------------------------------------------------------
 
-=head3    setupAIXIPMITool 
-       
-     Set AIX IPMI Tool 
- 
+=head3    setupAIXIPMITool
+
+     Set AIX IPMI Tool
+
 =cut
 
 #-----------------------------------------------------------------------------
@@ -1769,9 +1769,9 @@ sub setupAIXIPMITool
 
 #-----------------------------------------------------------------------------
 
-=head3    setupAIXexports 
+=head3    setupAIXexports
 	
-    Set AIX exports 
+    Set AIX exports
 
 =cut
 
@@ -1805,9 +1805,9 @@ sub setupAIXexports
 
 #-----------------------------------------------------------------------------
 
-=head3    setupLinuxexports 
+=head3    setupLinuxexports
 	
-    Set Linux exports 
+    Set Linux exports
 
 =cut
 
@@ -1928,9 +1928,9 @@ sub setupLinuxexports
 
 #-----------------------------------------------------------------------------
 
-=head3    mknb 
+=head3    mknb
 	
-   Creates a network boot root image on Linux 
+   Creates a network boot root image on Linux
    Run mknb to put xCAT-genesis-scripts-x86_64 and xCAT-genesis-base-x86_64 together and in /tftpboot
    From 2.12.2, both xCAT-genesis-scripts-x86_64 and xCAT-genesis-scripts-ppc64 will be installed.
    So, will run mknb twice, one for ppc64 and another for x86_64
@@ -1972,9 +1972,9 @@ sub mknb
 
 #-----------------------------------------------------------------------------
 
-=head3    makenetworks 
+=head3    makenetworks
 	
-     Runs makenetworks on AIX and Linux 
+     Runs makenetworks on AIX and Linux
 
 =cut
 
@@ -1999,7 +1999,7 @@ sub makenetworks
 
 #-----------------------------------------------------------------------------
 
-=head3    setuphttp 
+=head3    setuphttp
 	
      initializes http  on Linux
 
@@ -2071,25 +2071,25 @@ sub setuphttp
 
 #-----------------------------------------------------------------------------
 
-=head3   cleanupPSTable 
+=head3   cleanupPSTable
 	
    Any line in the postscripts table that has the following
    entry will have xcatserver,xcatclient remove because they
    are not called by servicenode
 
-   ..."servicenode,xcatserver,xcatclient.."... 
+   ..."servicenode,xcatserver,xcatclient.."...
     becomes
-   ..."servicenode,.."... 
- 
+   ..."servicenode,.."...
 
-   Any line in the postscripts table that has aixremoteshell, 
+
+   Any line in the postscripts table that has aixremoteshell,
    aixremoteshell will be replaced by remoteshell unless it is
    already on the line.  remoteshell now calls aixremoteshell, if on an
-   AIX node.  
+   AIX node.
 
-   ...,"syslog,aixremoteshell,syncfiles",,, 
+   ...,"syslog,aixremoteshell,syncfiles",,,
    becomes
-   ...,"syslog,remoteshell,syncfiles",,, 
+   ...,"syslog,remoteshell,syncfiles",,,
 
 =cut
 
@@ -2183,10 +2183,10 @@ sub cleanupPSTable
 
 #-----------------------------------------------------------------------------
 
-=head3   setupMNinDB 
+=head3   setupMNinDB
 	
- Will add the management node to the noderes table with group=__mgmtnode  
- Will add the management node to the servicenode tble with group=__mgmtnode  
+ Will add the management node to the noderes table with group=__mgmtnode
+ Will add the management node to the servicenode tble with group=__mgmtnode
 
 
 =cut
@@ -2284,7 +2284,7 @@ sub setupMNinDB
 
 #-----------------------------------------------------------------------------
 
-=head3    startnamedonboot 
+=head3    startnamedonboot
 	
      Configure named to start on boot
 
diff --git a/xCAT-server/sbin/xcatd b/xCAT-server/sbin/xcatd
index f5d6f4dac..f98aa25cc 100755
--- a/xCAT-server/sbin/xcatd
+++ b/xCAT-server/sbin/xcatd
@@ -838,7 +838,7 @@ sub do_udp_service {    # This function opens up a UDP port
                     } else {
                         ($sport, $clientn) = sockaddr_in($saddr);
                         $clientip = inet_ntoa($clientn);
-                    }                     
+                    }
                     if ($data =~ /^\037\213/) { # per rfc 1952, these two bytes are gzip, and they are invalid for
                         store_fd({ data => $data, sockaddr => $clientip, sport => $sport }, $discoctl); # for now, punt the gunzip to the worker process
                         #notify the client that its request is been processing
@@ -970,6 +970,10 @@ if (defined $pid_init) {
         %cmd_handlers = %{ fd_retrieve($readpipe) };
     } else {
         $$progname = "xcatd: plugin initialization";
+        if (xCAT::Utils->isServiceNode()) {
+            # Cache the site hash to accelerate the speed of init_plugins on SN
+            populate_site_hash();
+        }
         scan_plugins($writepipe);
         exit(0);
     }
@@ -2914,7 +2918,7 @@ sub service_connection {
                     }
                 }
 
-    
+
                 # we have a full request..
                 $request = "";
                 if (xCAT::xcatd->validate($peername, $peerhost, $req, $peerhostorg, \@deferredmsgargs)) {
@@ -3368,26 +3372,27 @@ sub cmdlog_collectlog() {
         $rsp = $tmprsp;
 
         # handle response
+        my $msgsource = "";
+        $msgsource = $rsp->{xcatdsource}->[0] if ($rsp->{xcatdsource});
+        #Only show response source when it is from different service node
+        $msgsource = "" if ($MYXCATSERVER eq $msgsource);
+
         # Handle errors
         if ($rsp->{error}) {
             if (ref($rsp->{error}) eq 'ARRAY') {
                 foreach my $text (@{ $rsp->{error} }) {
-                    if (defined($text)) {
-                        if ($rsp->{NoErrorPrefix}) {
-                            $rsp_log .= $text;
-                        } else {
-                            $rsp_log .= "Error: $text\n";
-                        }
-                    }
+                    my $desc = "$text";
+                    $desc = "[$msgsource]: $desc" if ($desc && $msgsource);
+                    $desc = "Error: $desc" unless ($rsp->{NoErrorPrefix});
+                    $rsp_log .= "$desc\n";
                 }
             }
             else {
                 if (defined($rsp->{error})) {
-                    if ($rsp->{NoErrorPrefix}) {
-                        $rsp_log .= $rsp->{error} . "\n";
-                    } else {
-                        $rsp_log .= "Error: " . $rsp->{error} . "\n";
-                    }
+                    my $desc = $rsp->{error};
+                    $desc = "[$msgsource]: $desc" if ($desc && $msgsource);
+                    $desc = "Error: $desc" unless ($rsp->{NoErrorPrefix});
+                    $rsp_log .= "$desc\n";
                 }
             }
         }
@@ -3395,22 +3400,18 @@ sub cmdlog_collectlog() {
         if ($rsp->{warning}) {
             if (ref($rsp->{warning}) eq 'ARRAY') {
                 foreach my $text (@{ $rsp->{warning} }) {
-                    if (defined($text)) {
-                        if ($rsp->{NoWarnPrefix}) {
-                            $rsp_log .= "$text\n";
-                        } else {
-                            $rsp_log .= "Warning: $text\n";
-                        }
-                    }
+                    my $desc = "$text";
+                    $desc = "[$msgsource]: $desc" if ($desc && $msgsource);
+                    $desc = "Warning: $desc" unless ($rsp->{NoWarnPrefix});
+                    $rsp_log .= "$desc\n";
                 }
             }
             else {
                 if (defined($rsp->{warning})) {
-                    if ($rsp->{NoWarnPrefix}) {
-                        $rsp_log .= $rsp->{warning} . "\n";
-                    } else {
-                        $rsp_log .= "Warning: " . $rsp->{warning} . "\n";
-                    }
+                    my $desc = $rsp->{warning};
+                    $desc = "[$msgsource]: $desc" if ($desc && $msgsource);
+                    $desc = "Warning: $desc" unless ($rsp->{NoWarnPrefix});
+                    $rsp_log .= "$desc\n";
                 }
             }
         }
@@ -3418,14 +3419,14 @@ sub cmdlog_collectlog() {
         if ($rsp->{info}) {
             if (ref($rsp->{info}) eq 'ARRAY') {
                 foreach my $text (@{ $rsp->{info} }) {
-                    if (defined($text)) {
-                        $rsp_log .= "$text\n";
-                    }
+                    my $desc = "$text";
+                    $desc = "[$msgsource]: $desc" if ($desc && $msgsource);
+                    $rsp_log .= "$desc\n";
                 }
             } else {
-                if (defined($rsp->{info})) {
-                    $rsp_log .= $rsp->{info} . "\n";
-                }
+                my $desc = $rsp->{info};
+                $desc = "[$msgsource]: $desc" if ($desc && $msgsource);
+                $rsp_log .= "$desc\n";
             }
         }
 
@@ -3458,19 +3459,30 @@ sub cmdlog_collectlog() {
                 } else {
                     $desc = $node->{name};
                 }
-                if ($node->{error}) {
-                    if (defined($node->{error}->[0])) {
-                        $desc .= ": Error: " . $node->{error}->[0];
-                        $errflg = 1;
+                if (($node->{error}) && defined($node->{error}->[0])) {
+                    if ($desc) {
+                        $desc = "$desc: [$msgsource]" if ($msgsource);
+                    } else {
+                        $desc = "[$msgsource]" if ($msgsource);
                     }
+                    $desc .= ": Error: " . $node->{error}->[0];
+                    $errflg = 1;
                 }
-                if ($node->{warning}) {
-                    if (defined($node->{warning}->[0])) {
-                        $desc .= ": Warning: " . $node->{warning}->[0];
-                        $errflg = 1;
+                if (($node->{warning}) && defined($node->{warning}->[0])){
+                    if ($desc) {
+                        $desc = "$desc: [$msgsource]" if ($msgsource);
+                    } else {
+                        $desc = "[$msgsource]" if ($msgsource);
                     }
+                    $desc .= ": Warning: " . $node->{warning}->[0];
+                    $errflg = 1;
                 }
                 if ($node->{data}) {
+                    if ($desc) {
+                        $desc = "$desc: [$msgsource]" if ($msgsource);
+                    } else {
+                        $desc = "[$msgsource]" if ($msgsource);
+                    }
                     if (ref(\($node->{data})) eq 'SCALAR') {
                         if (defined($node->{data})) {
                             $desc = $desc . ": " . $node->{data};
diff --git a/xCAT-server/share/xcat/ca/openssl.cnf.tmpl b/xCAT-server/share/xcat/ca/openssl.cnf.tmpl
index e3647635c..50386cb80 100644
--- a/xCAT-server/share/xcat/ca/openssl.cnf.tmpl
+++ b/xCAT-server/share/xcat/ca/openssl.cnf.tmpl
@@ -15,7 +15,7 @@ oid_section		= new_oids
 # To use this configuration file with the "-extfile" option of the
 # "openssl x509" utility, name here the section containing the
 # X.509v3 extensions to use:
-# extensions		= 
+# extensions		=
 # (Alternatively, use a configuration file that has only
 # X.509v3 extensions in its main [= default] section.)
 
@@ -108,7 +108,7 @@ x509_extensions	= v3_ca	# The extentions to add to the self signed cert
 # input_password = secret
 # output_password = secret
 
-# This sets a mask for permitted string types. There are several options. 
+# This sets a mask for permitted string types. There are several options.
 # default: PrintableString, T61String, BMPString.
 # pkix	 : PrintableString, BMPString.
 # utf8only: only UTF8Strings.
diff --git a/xCAT-server/share/xcat/conf/goconslogrotate b/xCAT-server/share/xcat/conf/goconslogrotate
index afcbd7fe7..2e5fd42ff 100644
--- a/xCAT-server/share/xcat/conf/goconslogrotate
+++ b/xCAT-server/share/xcat/conf/goconslogrotate
@@ -6,4 +6,4 @@
     postrotate
         kill -HUP `systemctl show -p MainPID goconserver.service 2> /dev/null |awk -F= '{print $2}'` 2> /dev/null || true
     endscript
-}
\ No newline at end of file
+}
diff --git a/xCAT-server/share/xcat/cons/openbmc b/xCAT-server/share/xcat/cons/openbmc
index 91854150c..964c25154 100755
--- a/xCAT-server/share/xcat/cons/openbmc
+++ b/xCAT-server/share/xcat/cons/openbmc
@@ -64,7 +64,7 @@ sub getans {
 my $cmdref = {
     command   => ["getopenbmccons"],
     arg       => ["text"],
-    noderange => [ $ARGV[0] ]
+    node => [ $ARGV[0] ]
 };
 acquire_lock();
 # avoid of congestion
@@ -86,13 +86,13 @@ until (($username or $password) and $bmcip ) {
 my $isintel = 0;
 my $sleepint;
 my $rc;
- 
+
 my $sshport = 2200;
 if ($ENV{SSHCONSOLEPORT}) {
     $sshport= $ENV{SSHCONSOLEPORT};
 }
 
-#check if sshport is up 
+#check if sshport is up
 my $sock = IO::Socket::INET->new(
     PeerAddr => $bmcip,
     PeerPort => $sshport,
@@ -116,7 +116,7 @@ while (!defined($sock)) {
 $sock->close();
 
 
-# To automatically connect to the console without the need to send over the ssh keys, 
+# To automatically connect to the console without the need to send over the ssh keys,
 # ensure sshpass is installed on the Management and/or Service Nodes.
 print "Unable to open console.  If BMC pings, ensure sshpass is installed or ssh keys have been configured on the BMC.\n";
 if (-x '/usr/bin/sshpass') {
diff --git a/xCAT-server/share/xcat/devicetype/EthSwitch/config b/xCAT-server/share/xcat/devicetype/EthSwitch/config
index 503a742b5..fb7319e49 100644
--- a/xCAT-server/share/xcat/devicetype/EthSwitch/config
+++ b/xCAT-server/share/xcat/devicetype/EthSwitch/config
@@ -1,7 +1,7 @@
 #This is a configuration file for running xdsh again ethernet switches.
 #If the switch type is not defined, you can create a subdirctory for that
 #type of switch. For example, for cisco swith, create a subdirectory
-# called "Cisco" under EthSwitch. copy this config file there. And 
+# called "Cisco" under EthSwitch. copy this config file there. And
 #put the command that disables the paging in pre-command
 #pre-command=terminal lenth 0;
 [main]
diff --git a/xCAT-server/share/xcat/hamn/activate-mn b/xCAT-server/share/xcat/hamn/activate-mn
index ef072a597..ee67d74e7 100755
--- a/xCAT-server/share/xcat/hamn/activate-mn
+++ b/xCAT-server/share/xcat/hamn/activate-mn
@@ -3,7 +3,7 @@
 #
 # CHANGE HISTORY:
 #
-# NAME:        active-mn 
+# NAME:        active-mn
 #
 # SYNTAX:       active-mn -i <nic> -v <virtual ip> [-m <netmask>]
 #
@@ -25,7 +25,7 @@
 # -----------------------------------------------------------------------------
 # 2011-12-08   JDW     1.0     Original
 # 2013-06-06   xCAT    1.1     Updated version to ship with xCAT
-# 2017-10-17   xCAT    2.13.8  Enhance 
+# 2017-10-17   xCAT    2.13.8  Enhance
 SHAREDVG=sharedvg # For AIX, shared volumn group name
 DBDIR=/var/lib/pgsql # database directory
 SHAREDFS="/install /etc/xcat /root/.xcat" # Shared file systems
@@ -37,12 +37,12 @@ USEMOUNT=yes # mounted  filesystems in the file /etc/fstab
 CHANGEHOSTNAME=yes # set the hostname to the virtual ip address hostname
 RESTARTDNS=yes # if yes, will execute "makedns -n"
 exit_code=0
-xcatdb=postgresql # support postgrel,DB2,mysql 
+xcatdb=postgresql # support postgrel,DB2,mysql
 
 usage()
 {
 	cat << EOF
-Usage: $PROGNAME -i <nic> -v <virtual ip> [-m <netmask>] 
+Usage: $PROGNAME -i <nic> -v <virtual ip> [-m <netmask>]
 
 EOF
 }
@@ -122,7 +122,7 @@ fi
 
 # Changing IP addresses/aliases for the active mn
 
-# Use ping to check if Virtual IP is already up and running on another mn 
+# Use ping to check if Virtual IP is already up and running on another mn
 # Important to avoid configuring virtual ip on both Primary and Standby concurrently
 
 ping -c 1 -w 10 $VIP 2>&1 1>/dev/null
@@ -140,7 +140,7 @@ else # Linux
     runcmd "ifconfig $NIC $VIP netmask $MASK"
 fi
 
-# Optional, Set hostname to virtual ip hostname 
+# Optional, Set hostname to virtual ip hostname
 if [ $CHANGEHOSTNAME = "yes" ]
 then
     if [ `uname` = "AIX" ]
@@ -174,11 +174,11 @@ if [ `uname` = "Linux" ]; then
     if [ -s /etc/xcat/cfgloc ]
     then
         xcatcfg=`cat /etc/xcat/cfgloc|cut -f 1 -d : 2>/dev/null`
-    else  
-        # SQLsite 
+    else
+        # SQLsite
         xcatcfg=`XCATBYPASS=1 /opt/xcat/bin/lsxcatd -d | cut -f 2 -d "=" 2>/dev/null`
-        # filter Error message from lsxcatd 
-        echo "$xcatcfg" | grep "Error" && xcatcfg="" 
+        # filter Error message from lsxcatd
+        echo "$xcatcfg" | grep "Error" && xcatcfg=""
     fi
     if [ -n "$xcatcfg" ]; then
         current_db=$xcatcfg
@@ -197,7 +197,7 @@ if [ `uname` = "Linux" ]; then
         fi
     else
         echo "Error: can not get current DB. [Failed]"
-        clear_env $NIC 
+        clear_env $NIC
         exit 1
     fi
 fi
@@ -250,12 +250,12 @@ else # Linux
             fi
         else
             echo "Error: service $xcatdb start [Failed], exit...."
-            clear_env $NIC 
+            clear_env $NIC
             exit 1
         fi
     fi
 fi
-    
+
 echo "Starting xCAT...."
 if [ `uname` = "AIX" ]
 then
diff --git a/xCAT-server/share/xcat/hamn/deactivate-mn b/xCAT-server/share/xcat/hamn/deactivate-mn
index a5d380d2f..e4b61d265 100755
--- a/xCAT-server/share/xcat/hamn/deactivate-mn
+++ b/xCAT-server/share/xcat/hamn/deactivate-mn
@@ -1,12 +1,12 @@
 #!/bin/sh
-# Make this the non-active xCAT management node, 
+# Make this the non-active xCAT management node,
 # i.e. standby management node.
 #
 # CHANGE HISTORY:
 #
 # NAME:        deactive-mn
 #
-# SYNTAX:       deactive-mn -i <nic> -v <virtual ip> 
+# SYNTAX:       deactive-mn -i <nic> -v <virtual ip>
 #
 # DESCRIPTION:  Make this node be the standby xCAT MN.
 #
@@ -24,7 +24,7 @@
 # -----------------------------------------------------------------------------
 # 2011-12-08   JDW     1.0     Original
 # 2013-06-06   xCAT    1.1     Updated version to ship with xCAT
-# 2017-10-12   xCAT    2.13.8  Enhance 
+# 2017-10-12   xCAT    2.13.8  Enhance
 SHAREDVG=sharedvg # For AIX, shared volumn group name
 DBDIR=/var/lib/pgsql # database directory
 SHAREDFS="/install /etc/xcat /root/.xcat /tftpboot" # Shared file systems
@@ -49,8 +49,8 @@ runcmd()
 {
     echo "Running command: $@"
     a=0
-    while true 
-    do 
+    while true
+    do
         if [ $a -eq 5 ]; then
             echo "$@ [Failed]"
             exit_code=1
@@ -61,9 +61,9 @@ runcmd()
         fi
         $@
         if [ $? -eq 0 ]; then
-            echo "$@ [Passed]" 
+            echo "$@ [Passed]"
             return 0
-        else 
+        else
            a=$[$a+1]
         fi
     done
@@ -117,7 +117,7 @@ then
 	runcmd "/usr/lpp/bos.sysmgt/nim/methods/m_backup_db $backupFile"
 
 	echo "Stopping NIM...."
-	runcmd "stopsrc -s nimesis" 
+	runcmd "stopsrc -s nimesis"
 fi
 
 echo "Stopping Console Server...."
@@ -214,7 +214,7 @@ fi
 # AIX only, Linux has the -l flag could hanldle everything
 if [ `uname` = "AIX" ]
 then
-    sleep 20 
+    sleep 20
     #  ....then kill nastily i.e. kill -9
     for fs in $SHAREDFS
     do
@@ -298,7 +298,7 @@ else # Linux
          echo "IP Aliase $NIC $VIP is removed.[Passed]"
     else
          echo "Fail to remove IP Aliase $NIC $VIP. [Failed]"
-    fi 
+    fi
 fi
 
 echo ""
diff --git a/xCAT-server/share/xcat/ib/netboot/rh/ib.rhels7.ppc64le.pkglist b/xCAT-server/share/xcat/ib/netboot/rh/ib.rhels7.ppc64le.pkglist
index 3b4b98fbc..bd34d8d09 100644
--- a/xCAT-server/share/xcat/ib/netboot/rh/ib.rhels7.ppc64le.pkglist
+++ b/xCAT-server/share/xcat/ib/netboot/rh/ib.rhels7.ppc64le.pkglist
@@ -4,7 +4,7 @@ tcl
 tk
 tcsh
 gcc-gfortran
-lsof  
+lsof
 libnl
 libnl3
 libxml2-python
diff --git a/xCAT-server/share/xcat/ib/netboot/sles/ib.postinstall b/xCAT-server/share/xcat/ib/netboot/sles/ib.postinstall
index eb945efba..28e25dcb5 100755
--- a/xCAT-server/share/xcat/ib/netboot/sles/ib.postinstall
+++ b/xCAT-server/share/xcat/ib/netboot/sles/ib.postinstall
@@ -1,5 +1,5 @@
 # Sample script for diskless image changes for IB support
-#  Invoke this script from your 
+#  Invoke this script from your
 #  /install/custom/netboot/<os>/<arch>/<profile>.postinstall script as:
 #   /opt/xcat/share/xcat/ib/sles/ib.postinstall $1
 #
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 8c0dc8fbe..d0f63e5a4 100755
--- a/xCAT-server/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install
+++ b/xCAT-server/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install
@@ -13,30 +13,30 @@
 #
 #
 # 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: 
+#      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: 
+#          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. 
+#      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
 #   2. install the ofed driver for diskless images:
-#      2.1 Copy the pkglist to the custom directory: 
+#      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: 
+#          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: 
+#          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 
+#      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
@@ -85,9 +85,9 @@ 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 
+fi
 
-if [[ $NODESETSTATE != "genimage" ]]; then   
+if [[ $NODESETSTATE != "genimage" ]]; then
    # running as a postscript in a full-disk install or AIX diskless install
    installroot=""
 fi
@@ -108,40 +108,40 @@ if [ $OS != "AIX" ]; then
         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
 
 
-        if [ -f /etc/os-release ] && 
+        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 
+            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 
+
+        #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
@@ -176,15 +176,15 @@ deb http://ports.ubuntu.com/ubuntu-ports/ trusty-updates universe" >> /etc/apt/s
             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 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 ] &&        
+        elif [ -f /etc/os-release ] &&
              cat /etc/os-release |grep NAME|grep Ubuntu>/dev/null; then
 
             #mkdir $installroot/tmp/ofed_install
@@ -196,7 +196,7 @@ deb http://ports.ubuntu.com/ubuntu-ports/ trusty-updates universe" >> /etc/apt/s
             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 
+            if ping -c 3 www.ports.ubuntu.com > /dev/null;then
                 echo "[OK]"
             else
                 echo "[Failed]"
@@ -205,36 +205,36 @@ deb http://ports.ubuntu.com/ubuntu-ports/ trusty-updates universe" >> /etc/apt/s
             fi
 
             sourceslist="$installroot/etc/apt/sources.list"
-            cp  $sourceslist $sourceslist.bak 
+            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
 
-            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 
-                
+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  /proc  $installroot/proc/
             mount --bind  /sys   $installroot/sys/
 
             mv "${installroot}/bin/uname" "${installroot}/bin/uname.nouse"
 #            cat <<-EOF >"${installroot}/bin/uname"
-#		#!/bin/sh 
+#		#!/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" = "-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"
-		#!/bin/sh 
+		#!/bin/sh
 		case "\$1" in
 		"-m")
 			ARCH="\$(dpkg --print-architecture || rpm -q kernel-\$("\$0" -r) --qf '%{arch}')"
@@ -260,24 +260,24 @@ deb http://ports.ubuntu.com/ubuntu-ports/ trusty-updates universe" >> $sourcesli
 
 #            head -n 999 "${installroot}/bin/uname"
             chmod 0755 "${installroot}/bin/uname"
-             
+
             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 
+            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/ 
+            #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 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
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
index cc1970044..2ce203c78 100755
--- a/xCAT-server/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install.v2
+++ b/xCAT-server/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install.v2
@@ -218,11 +218,11 @@ function cleanup()
         i=0
         if mount | grep -q "$IMGROOTPATH/sys"; then
             while ! umount "$IMGROOTPATH/sys"
-            do 
+            do
                 (( ++i > max_retry )) && echo "Umount $IMGROOTPATH/sys failed" >&2 && break
                 sleep 1
             done
-        fi 
+        fi
         i=0
         if mount | grep -q "$IMGROOTPATH/proc"; then
             while ! umount "$IMGROOTPATH/proc"
@@ -230,7 +230,7 @@ function cleanup()
                 (( ++i > max_retry )) && echo "Umount $IMGROOTPATH/proc failed" >&2 && break
                 sleep 1
             done
-        fi 
+        fi
         i=0
         if mount | grep -q "$IMGROOTPATH/dev"; then
             while ! umount "$IMGROOTPATH/dev"
@@ -260,10 +260,10 @@ if [ "$OS" = "Linux" ]; then
                 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 
+            source /etc/lsb-release >/dev/null 2>&1
             if [ -z "$DISTRIB_CODENAME" ]; then
                 echo "[Error] can't get DISTRIB_CODENAME " >&2
                 exit 1
@@ -357,7 +357,7 @@ EOF
         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
@@ -377,9 +377,9 @@ EOF
 
             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 
+            source $IMGROOTPATH/etc/lsb-release  >/dev/null 2>&1
             if [ -z "$DISTRIB_CODENAME" ]; then
                 echo "[Error] can't get DISTRIB_CODENAME " >&2
                 exit 1
diff --git a/xCAT-server/share/xcat/ib/scripts/annotatelog b/xCAT-server/share/xcat/ib/scripts/annotatelog
index f25212fea..d09439d84 100644
--- a/xCAT-server/share/xcat/ib/scripts/annotatelog
+++ b/xCAT-server/share/xcat/ib/scripts/annotatelog
@@ -694,7 +694,7 @@ SOUT
 #--------------------------------------------------------------------------------
 
 =head3  outputEntries
-        Output logs sorted by one method 
+        Output logs sorted by one method
         Notes:
 =cut
 
@@ -837,17 +837,17 @@ Usage: annotatelog -f log_file [-s start_time] [-e end_time]
                  Must be xCAT consolidated log got from Qlogic HSM or ESM.
         -s start_time
                  Specifies the start time for analysis, where the start_time
-                 variable has the format ddmmyyhh:mm:ss (day, month, year, 
+                 variable has the format ddmmyyhh:mm:ss (day, month, year,
                  hour, minute, and second), 00:00:00 is valid.
         -e end_time
-                 Specifies the end time for analysis, where the end_time 
-                 variable has the format ddmmyyhh:mm:ss (day, month, year, 
+                 Specifies the end time for analysis, where the end_time
+                 variable has the format ddmmyyhh:mm:ss (day, month, year,
                  hour, minute, and second), 00:00:00 is valid.
         -l link_file
                  Specifies a link file fullpath name, which concatenates all
                  '/var/opt/iba/analysis/baseline/fabric*links' files from all fabric management nodes.
         -g guid_file
-                 Specifies a guid file fullpath name, which has a list of 
+                 Specifies a guid file fullpath name, which has a list of
                  GUIDs as obtained from the "getGuids" script.
         -E       Annotate with node ERRLOG_ON and ERRLOG_OFF information. This
                  can help determine if a disappearance was caused by a node
@@ -994,7 +994,7 @@ sub getGUIDs
 #--------------------------------------------------------------------------------
 
 =head3  getHCALinks
-        Get links between HCA and Switch and links between Switch and Swtich 
+        Get links between HCA and Switch and links between Switch and Swtich
         Notes:
 Arguments:
         $hcalfile - A link file fullpath name, which concatenates all '/var/opt/iba/analysis/baseline/fabric*links' files from all fabric management nodes.
diff --git a/xCAT-server/share/xcat/ib/scripts/annotatelog.README b/xCAT-server/share/xcat/ib/scripts/annotatelog.README
index 09045ec67..9cb9e0ac7 100644
--- a/xCAT-server/share/xcat/ib/scripts/annotatelog.README
+++ b/xCAT-server/share/xcat/ib/scripts/annotatelog.README
@@ -17,17 +17,17 @@ annotatelog -f log_file [-s start_time] [-e end_time]
                  Must be xCAT consolidated log got from Qlogic HSM or ESM.
         -s start_time
                  Specifies the start time for analysis, where the start_time
-                 variable has the format ddmmyyhh:mm:ss (day, month, year, 
+                 variable has the format ddmmyyhh:mm:ss (day, month, year,
                  hour, minute, and second), 00:00:00 is valid.
         -e end_time
-                 Specifies the end time for analysis, where the end_time 
-                 variable has the format ddmmyyhh:mm:ss (day, month, year, 
+                 Specifies the end time for analysis, where the end_time
+                 variable has the format ddmmyyhh:mm:ss (day, month, year,
                  hour, minute, and second), 00:00:00 is valid.
         -l link_file
                  Specifies a link file fullpath name, which concatenates all
                  '/var/opt/iba/analysis/baseline/fabric*links' files from all fabric management servers.
         -g guid_file
-                 Specifies a guid file fullpath name, which has a list of 
+                 Specifies a guid file fullpath name, which has a list of
                  GUIDs as obtained from the "getGuids" script.
         -E       Annotate with node ERRLOG_ON and ERRLOG_OFF information. This
                  can help determine if a disappearance was caused by a node
@@ -39,31 +39,31 @@ annotatelog -f log_file [-s start_time] [-e end_time]
         -n node_list
                  Specifies a comma-separated list of node host names, IP addresses to look up in log entries.
         -h       Display usage information.
-        
-In xCAT cluster with IB QLogic switches, the switch logs and subnet 
-manager (ESM/HSM) logs will use the syslog protocol for log redirection; 
-they are redirected to the xCAT Management Node. The xCAT Management Node syslogd recognizes the facility (local6) and priority (NOTICE and above) and put the log 
-entries into a file/FIFO that is being monitored by AIXSyslogSensor on 
-AIX system or ErrorLogSensor on Linux system. The condition-response 
-setup on xCAT Management Node local will move the log entries to file 
-/var/log/xcat/errorlog/[xCAT Management Node]. So there are a lot of 
+
+In xCAT cluster with IB QLogic switches, the switch logs and subnet
+manager (ESM/HSM) logs will use the syslog protocol for log redirection;
+they are redirected to the xCAT Management Node. The xCAT Management Node syslogd recognizes the facility (local6) and priority (NOTICE and above) and put the log
+entries into a file/FIFO that is being monitored by AIXSyslogSensor on
+AIX system or ErrorLogSensor on Linux system. The condition-response
+setup on xCAT Management Node local will move the log entries to file
+/var/log/xcat/errorlog/[xCAT Management Node]. So there are a lot of
 entries in this log file and it is difficult for the administrator to look through.
 
-annotatelog is a sample script to parse the QLogic log entries in file 
-/var/log/xcat/errorlog/[xCAT Management Node] on xCAT Management Node 
-by subnet manager, IB node, chassis, FRU(Field-Replaceable Unit) or a 
-particular node. This script is supported by both AIX and Linux Management 
-Node. From xCAT's point of view, the log to analyze must be xCAT 
-consolidated log, which means this log file must come from xCAT 
-syslog/errorlog monitoring mechanism, such as /var/log/xcat/errorlog/[xCAT 
-Management Node] file. Since the log format is various, xCAT do not 
+annotatelog is a sample script to parse the QLogic log entries in file
+/var/log/xcat/errorlog/[xCAT Management Node] on xCAT Management Node
+by subnet manager, IB node, chassis, FRU(Field-Replaceable Unit) or a
+particular node. This script is supported by both AIX and Linux Management
+Node. From xCAT's point of view, the log to analyze must be xCAT
+consolidated log, which means this log file must come from xCAT
+syslog/errorlog monitoring mechanism, such as /var/log/xcat/errorlog/[xCAT
+Management Node] file. Since the log format is various, xCAT do not
 support other log files.
 
-This script provides several flags to specify the category critera, 
+This script provides several flags to specify the category critera,
 they are -S, -i, -c, -u, -n and -A.
-If -S flag is set, the output will be sorted by Subnet Manager, since 
-the SM may have multi-port, so the output is classified by 
-<subnet_manager_name: port number>, please see the details in the 
+If -S flag is set, the output will be sorted by Subnet Manager, since
+the SM may have multi-port, so the output is classified by
+<subnet_manager_name: port number>, please see the details in the
 example below:
 
 ############################################
@@ -71,43 +71,43 @@ Logs by Subnet Manager
 ############################################
 
 ----------------------------------------------
-Report by subnet manager: 'c890f12ec07:port 2' 
+Report by subnet manager: 'c890f12ec07:port 2'
 ----------------------------------------------
-May  5 09:06:33 c890f12ec07 local6:notice c890f12ec07 iview_sm[5445]: 
-c890f12ec07; MSG:NOTICE|SM:c890f12ec07:port 2|COND:#4 Disappearance 
+May  5 09:06:33 c890f12ec07 local6:notice c890f12ec07 iview_sm[5445]:
+c890f12ec07; MSG:NOTICE|SM:c890f12ec07:port 2|COND:#4 Disappearance
 from fabric|NODE:IBM G1 Logical HCA :port 2:0x000255007002651f|DETAIL:
 Node type: hca
-May  5 08:23:55 c890f12ec07 local6:notice c890f12ec07 iview_sm[5128]: 
-c890f12ec07; MSG:NOTICE|SM:c890f12ec07:port 2|COND:#3 Appearance in 
-fabric|NODE:IBM G1 Logical HCA :port 2:0x0002550070027f1f|DETAIL:Node 
+May  5 08:23:55 c890f12ec07 local6:notice c890f12ec07 iview_sm[5128]:
+c890f12ec07; MSG:NOTICE|SM:c890f12ec07:port 2|COND:#3 Appearance in
+fabric|NODE:IBM G1 Logical HCA :port 2:0x0002550070027f1f|DETAIL:Node
 type: hca
 
 ----------------------------------------------
 Report by subnet manager: 'c890f12ec07:port 1'
 ----------------------------------------------
 
-May  5 09:06:33 c890f12ec07 local6:notice c890f12ec07 iview_sm[5442]: 
-c890f12ec07; MSG:NOTICE|SM:c890f12ec07:port 1|COND:#4 Disappearance 
+May  5 09:06:33 c890f12ec07 local6:notice c890f12ec07 iview_sm[5442]:
+c890f12ec07; MSG:NOTICE|SM:c890f12ec07:port 1|COND:#4 Disappearance
 from fabric|NODE:IBM G1 Logical HCA :port 1:0x000255007002650f|DETAIL:
 Node type: hca
-May  5 09:06:33 c890f12ec07 local6:notice c890f12ec07 iview_sm[5442]: 
-c890f12ec07; MSG:NOTICE|SM:c890f12ec07:port 1|COND:#4 Disappearance 
+May  5 09:06:33 c890f12ec07 local6:notice c890f12ec07 iview_sm[5442]:
+c890f12ec07; MSG:NOTICE|SM:c890f12ec07:port 1|COND:#4 Disappearance
 from fabric|NODE:IBM G1 Logical HCA :port 1:0x0002550070027f0f|DETAIL:
 Node type: hca
 
 
-If -i flag is set, the output will be sorted by IB node, it is 
-classified by < node_name: port number : GUID number>, furthermore, 
-if the log entry includes keyword of "IBM *Logical", then we will 
-display the link relationships between the IBM G1 Logic HCA and 
-IBM G1 Logic Switch, IBM G1 Logic Switch and Qlogic Switch. We will 
-use the result file of getGuids script to get the node name 
-corresponding to HCA port number and GUIDs; and use the fabric link 
-files  from Fabric Management Server(HSM/ESM) to get the Qlogic swith 
-connection information, so -i flag must be used with -g and -l flags.; 
-and if the log entry does not include keyword of "IBM *Logical", we 
-could not get the corresponding nodename and connection relationship 
-for it, so this entry will be displayed directly and set the string 
+If -i flag is set, the output will be sorted by IB node, it is
+classified by < node_name: port number : GUID number>, furthermore,
+if the log entry includes keyword of "IBM *Logical", then we will
+display the link relationships between the IBM G1 Logic HCA and
+IBM G1 Logic Switch, IBM G1 Logic Switch and Qlogic Switch. We will
+use the result file of getGuids script to get the node name
+corresponding to HCA port number and GUIDs; and use the fabric link
+files  from Fabric Management Server(HSM/ESM) to get the Qlogic swith
+connection information, so -i flag must be used with -g and -l flags.;
+and if the log entry does not include keyword of "IBM *Logical", we
+could not get the corresponding nodename and connection relationship
+for it, so this entry will be displayed directly and set the string
 after "NODE:" as the IB node. Please see the details in the examples below:
 
 ############################################
@@ -121,8 +121,8 @@ Reported by IB node: 'c890f11ec06.ppd.pok.ibm.com: port 1: GUID 0x0002550070027f
 - IBM G1 Logical Switch 1 <-> SilverStorm 9024 DDR port 16 (GUID 0x00066a00d900042d)
 ----------------------------------------------
 
-May  5 09:06:33 c890f12ec07 local6:notice c890f12ec07 iview_sm[5442]: 
-c890f12ec07; MSG:NOTICE|SM:c890f12ec07:port 1|COND:#4 Disappearance 
+May  5 09:06:33 c890f12ec07 local6:notice c890f12ec07 iview_sm[5442]:
+c890f12ec07; MSG:NOTICE|SM:c890f12ec07:port 1|COND:#4 Disappearance
 from fabric|NODE:IBM G1 Logical HCA :port 1:0x0002550070027f0f|DETAIL:
 Node type: hca
 
@@ -130,13 +130,13 @@ Node type: hca
 Reported by IB node: 'SilverStorm 9120 GUID=0x00066a0002000225 Leaf 8, Chip A:port 0:0x00066a0007001311'
 ----------------------------------------------
 Mar 25 16:21:54 c890f12ec07 iview_sm[3725]: c890f12ec07; MSG:NOTICE|
-SM:c890f12ec07:port 1|COND:#4 Disappearance from fabric|NODE:SilverStorm 
+SM:c890f12ec07:port 1|COND:#4 Disappearance from fabric|NODE:SilverStorm
 9120 GUID=0x00066a0002000225 Leaf 8, Chip A:port 0:0x00066a0007001311|
 DETAIL:Node type: switch
 
 
-If -c flag is set, the output will be sorted by chassis, it is classified 
-by <chassis: model type: GUID number>, please see the details in the example 
+If -c flag is set, the output will be sorted by chassis, it is classified
+by <chassis: model type: GUID number>, please see the details in the example
 below:
 
 ############################################################
@@ -144,15 +144,15 @@ Logs by CHASSIS
 ############################################################
 
 ----------------------------------------------
-Reported by chassis: 'SilverStorm: model 9120: GUID 0x00066a0002000225' 
+Reported by chassis: 'SilverStorm: model 9120: GUID 0x00066a0002000225'
 ----------------------------------------------
 
-Apr 23 09:16:56 qswitch slot101:9.114.80.179;MSG:WARNING|CHASSIS:SilverStorm 
-9120 GUID=0x00066a0002000225|COND:#17 FRU state changed from online 
+Apr 23 09:16:56 qswitch slot101:9.114.80.179;MSG:WARNING|CHASSIS:SilverStorm
+9120 GUID=0x00066a0002000225|COND:#17 FRU state changed from online
 to offline|FRU:Power Supply 1|PN:200805-101
 
 
-If -u flag is set, the output will be sorted by FRU, please see the details in 
+If -u flag is set, the output will be sorted by FRU, please see the details in
 the example below:
 
 ############################################################
@@ -160,15 +160,15 @@ Logs by FRUS from CHASSIS
 ############################################################
 
 ------------------------------------------------------------
-Associated with FRU: 'Power Supply 1' 
+Associated with FRU: 'Power Supply 1'
 ------------------------------------------------------------
 
-Apr 23 09:19:12 qswitch slot101:9.114.80.179;MSG:NOTICE|CHASSIS:SilverStorm 
-9120 GUID=0x00066a0002000225|COND:#18 FRU state changed from offline 
+Apr 23 09:19:12 qswitch slot101:9.114.80.179;MSG:NOTICE|CHASSIS:SilverStorm
+9120 GUID=0x00066a0002000225|COND:#18 FRU state changed from offline
 to online|FRU:Power Supply 1|PN:200805-101
 
 
-If -n flag is set, the output will be sorted by a certain nodename, please see 
+If -n flag is set, the output will be sorted by a certain nodename, please see
 the details in the example below:
 
 ############################################################
@@ -178,26 +178,26 @@ Logs for special nodes
 Reported by node: 'c890f11ec06.ppd.pok.ibm.com'
 ------------------------------------------------------------
 
-May  5 08:23:55 c890f12ec07 local6:notice c890f12ec07 iview_sm[5128]: 
+May  5 08:23:55 c890f12ec07 local6:notice c890f12ec07 iview_sm[5128]:
 c890f12ec07; MSG:NOTICE|SM:c890f12ec07:port 2|COND:#3 Appearance in fabric|
 NODE:IBM G1 Logical HCA :port 2:0x0002550070027f1f|DETAIL:Node type: hca
-May  5 09:06:33 c890f12ec07 local6:notice c890f12ec07 iview_sm[5442]: 
-c890f12ec07; MSG:NOTICE|SM:c890f12ec07:port 1|COND:#4 Disappearance from 
-fabric|NODE:IBM G1 Logical HCA :port 1:0x0002550070027f0f|DETAIL:Node 
+May  5 09:06:33 c890f12ec07 local6:notice c890f12ec07 iview_sm[5442]:
+c890f12ec07; MSG:NOTICE|SM:c890f12ec07:port 1|COND:#4 Disappearance from
+fabric|NODE:IBM G1 Logical HCA :port 1:0x0002550070027f0f|DETAIL:Node
 type: hca
 
 ------------------------------------------------------------
 Reported by node: 'c890f11ec05.ppd.pok.ibm.com'
 ------------------------------------------------------------
-May  5 09:06:33 c890f12ec07 local6:notice c890f12ec07 iview_sm[5445]: 
-c890f12ec07; MSG:NOTICE|SM:c890f12ec07:port 2|COND:#4 Disappearance from 
-fabric|NODE:IBM G1 Logical HCA :port 2:0x000255007002651f|DETAIL:Node 
+May  5 09:06:33 c890f12ec07 local6:notice c890f12ec07 iview_sm[5445]:
+c890f12ec07; MSG:NOTICE|SM:c890f12ec07:port 2|COND:#4 Disappearance from
+fabric|NODE:IBM G1 Logical HCA :port 2:0x000255007002651f|DETAIL:Node
 type: hca
 
 
-If -E flag is set with -n or -i flag, annotatelog script will use dsh to access 
-the IB nodes or node list specified by -n flag, and use "errpt -J ERRLOG_ON 
-ERRLOG_OFF" command to get the corresponding timestamps, and added these 
+If -E flag is set with -n or -i flag, annotatelog script will use dsh to access
+the IB nodes or node list specified by -n flag, and use "errpt -J ERRLOG_ON
+ERRLOG_OFF" command to get the corresponding timestamps, and added these
 timestamps into annotatelog output. Please see the detail below:
 
 ----------------------------------------------
@@ -211,22 +211,22 @@ Reported by IB node: 'c890f11ec06.ppd.pok.ibm.com: port 1: GUID 0x0002550070027f
 # ERRLOG_OFF: 04/05/08 09:23
 ----------------------------------------------
 
-May  5 09:06:33 c890f12ec07 local6:notice c890f12ec07 iview_sm[5442]: 
-c890f12ec07; MSG:NOTICE|SM:c890f12ec07:port 1|COND:#4 Disappearance from 
-fabric|NODE:IBM G1 Logical HCA :port 1:0x0002550070027f0f|DETAIL:Node 
+May  5 09:06:33 c890f12ec07 local6:notice c890f12ec07 iview_sm[5442]:
+c890f12ec07; MSG:NOTICE|SM:c890f12ec07:port 1|COND:#4 Disappearance from
+fabric|NODE:IBM G1 Logical HCA :port 1:0x0002550070027f0f|DETAIL:Node
 type: hca
 
 
 If -A flag is set, the output will be the combination of -i, -S, -c and -u.
 
-If a log entry that can not be parsed into any types above, it will be displayed 
-in "Logs by others". And these logs can only be displayed when -A flag is used, 
+If a log entry that can not be parsed into any types above, it will be displayed
+in "Logs by others". And these logs can only be displayed when -A flag is used,
 please see the details in the example below:
 
 ############################################################
 Logs by others
 ############################################################
-May 14 11:44:22 qswitch slot101:9.114.80.179 FEtask[86f38fb8]: ESM: Embedded SM 
+May 14 11:44:22 qswitch slot101:9.114.80.179 FEtask[86f38fb8]: ESM: Embedded SM
 Error: rmsg_recv: output buffer[2016] too small for incoming data[2035] : 0
-May 14 11:44:22 qswitch slot101:9.114.80.179 PM_task[86f08298]: ESM: Embedded SM 
+May 14 11:44:22 qswitch slot101:9.114.80.179 PM_task[86f08298]: ESM: Embedded SM
 Error: DoSendFeAsync  - message send failed  : 128
diff --git a/xCAT-server/share/xcat/ib/scripts/configCECs b/xCAT-server/share/xcat/ib/scripts/configCECs
index b5b16417b..2303db23e 100644
--- a/xCAT-server/share/xcat/ib/scripts/configCECs
+++ b/xCAT-server/share/xcat/ib/scripts/configCECs
@@ -2,15 +2,15 @@
 
 ###########################################################################
 #
-# The configCECs script is written in ksh, and used to create a full  
-# system partition for each CECs Managed by the HMC. It will use ssh to 
-# login the HMC with the hscroot userid in order to rename the CECs based 
-# on a certain pattern specified through command line and create full 
-# partition for all the CECs. 
+# The configCECs script is written in ksh, and used to create a full
+# system partition for each CECs Managed by the HMC. It will use ssh to
+# login the HMC with the hscroot userid in order to rename the CECs based
+# on a certain pattern specified through command line and create full
+# partition for all the CECs.
 # Command Syntax:
-#      configCECs -H hmc_list [-c cec_format] [-l lpar_format] [-p profile_format] 
+#      configCECs -H hmc_list [-c cec_format] [-l lpar_format] [-p profile_format]
 #                   [--frame_pad_len len_number] [--node_pad_len len_number]
-#                   [--cage_pad_len len_number] 
+#                   [--cage_pad_len len_number]
 #                   [--allocate_type always_all | always_list | conditional]
 #                   [--exclude_hw ]
 #                   [-h]
@@ -33,15 +33,15 @@
 #                   Specifies the number of digits used for the cage numbers, it will be zero filled if
 #                   needed. The default value is no padding.
 #        --allocate_type
-#                   Specifies the allocation method that is used to allocate resources to full system 
+#                   Specifies the allocation method that is used to allocate resources to full system
 #                   partition. The supported allocation methods are always_all, always_list and conditional.
 #                   The default method is always_all. always_all indicates to always use the 'all resources'
 #                   LPAR flag; always_list indicates to always explicitly list the devices in the LPAR; and
 #                   conditional indicates to use the 'all resources' LPAR flag if not --exclude_hw is found,
-#                   otherwise use an explicit list for the hardware. 
+#                   otherwise use an explicit list for the hardware.
 #        --exclude_hw
-#                   Specifies a comma-separated list of hardware names or 'device id's that do not need to 
-#                   assign. The supported hardware names are RIO and 10G, RIO indicates Galaxy 1 HCA used 
+#                   Specifies a comma-separated list of hardware names or 'device id's that do not need to
+#                   assign. The supported hardware names are RIO and 10G, RIO indicates Galaxy 1 HCA used
 #                   for RIO connection in IH nodes; 10G indicates 2-port 10G integrated adapter in IH nodes.
 #                   It can only be used with --allocate_type is always_list or conditional.
 #        -h         Display usage information.
@@ -78,9 +78,9 @@ HAVE_PROCESSED_CAGE=""
 ###########################################################################
 usage()
 {
-echo "Usage: configCECs -H hmc_list [-c cec_format] [-l lpar_format] [-p profile_format] 
+echo "Usage: configCECs -H hmc_list [-c cec_format] [-l lpar_format] [-p profile_format]
                    [--frame_pad_len len_number] [--node_pad_len len_number]
-                   [--cage_pad_len len_number] 
+                   [--cage_pad_len len_number]
                    [--allocate_type always_all | always_list | conditional]
                    [--exclude_hw ]
                    [-h]
@@ -103,15 +103,15 @@ echo "Usage: configCECs -H hmc_list [-c cec_format] [-l lpar_format] [-p profile
                    Specifies the number of digits used for the cage numbers, it will be zero filled if
                    needed. The default value is no padding.
         --allocate_type
-                   Specifies the allocation method that is used to allocate resources to full system 
+                   Specifies the allocation method that is used to allocate resources to full system
                    partition. The supported allocation methods are always_all, always_list and conditional.
                    The default method is always_all. always_all indicates to always use the 'all resources'
                    LPAR flag; always_list indicates to always explicitly list the devices in the LPAR; and
                    conditional indicates to use the 'all resources' LPAR flag if not --exclude_hw is found,
-                   otherwise use an explicit list for the hardware. 
+                   otherwise use an explicit list for the hardware.
         --exclude_hw
-                   Specifies a comma-separated list of hardware names or 'device id's that do not need to 
-                   assign. The supported hardware names are RIO and 10G, RIO indicates Galaxy 1 HCA used 
+                   Specifies a comma-separated list of hardware names or 'device id's that do not need to
+                   assign. The supported hardware names are RIO and 10G, RIO indicates Galaxy 1 HCA used
                    for RIO connection in IH nodes; 10G indicates 2-port 10G integrated adapter in IH nodes.
                    It can only be used with --allocate_type is always_list or conditional.
         -h         Display usage information."
@@ -292,7 +292,7 @@ for i in $args; do
         shift;
         CECFORMAT=$1;
         shift;;
-    -l) 
+    -l)
         shift;
         LPARFORMAT=$1;
         shift;;
@@ -569,7 +569,7 @@ for HMC in $HMC_LIST; do
                         #                                                 #
                         # If the current CEC name needs to be changed then#
                         # build the 'chsyscfg' command and append it to   #
-                        # the file. 
+                        # the file.
                         #                                                 #
                         ###################################################
                         if [[ "$CEC_NAME" == "$CEC_NEW_NAME" ]]; then
diff --git a/xCAT-server/share/xcat/ib/scripts/configCECs.README b/xCAT-server/share/xcat/ib/scripts/configCECs.README
index c76e1aa7b..861d6c8e6 100644
--- a/xCAT-server/share/xcat/ib/scripts/configCECs.README
+++ b/xCAT-server/share/xcat/ib/scripts/configCECs.README
@@ -7,115 +7,115 @@ This README describes how to use the configCECs script.
 
 The syntax of the configCECs command is:
 
-configCECs -H hmc_list [-c cec_format] [-l lpar_format] [-p profile_format] 
+configCECs -H hmc_list [-c cec_format] [-l lpar_format] [-p profile_format]
            [--frame_pad_len len_number] [--node_pad_len len_number]
-           [--cage_pad_len len_number] 
+           [--cage_pad_len len_number]
            [--allocate_type always_all | always_list | conditional]
            [--exclude_hw ]
            [-h]
 
         -H hmc_list
-                   Specifies a comma-separated list of HMC host names, IP 
+                   Specifies a comma-separated list of HMC host names, IP
                    addresses to configure CECs on.
         -c cec_format
-                   Specifies the naming format for CEC, the default format 
+                   Specifies the naming format for CEC, the default format
                    is f%Fn%N_SN%S.
         -l lpar_format
-                   Specifies the naming format for LPAR, the default 
+                   Specifies the naming format for LPAR, the default
                    format is f%Fn%N.
         -p profile_format
-                   Specifies the naming format for profile, the default 
+                   Specifies the naming format for profile, the default
                    format is the same with lpar_format.
         --frame_pad_len len_number
-                   Specifies the number of digits used for the frame 
-                   numbers, it will be zero filled if needed. The default 
+                   Specifies the number of digits used for the frame
+                   numbers, it will be zero filled if needed. The default
                    value is no padding.
         --node_pad_len len_number
-                   Specifies the number of digits used for the node numbers, 
-                   it will be zero filled if needed. The default value 
+                   Specifies the number of digits used for the node numbers,
+                   it will be zero filled if needed. The default value
                    is no padding.
         --cage_pad_len len_number
-                   Specifies the number of digits used for the cage numbers, 
-                   it will be zero filled if needed. The default value is 
+                   Specifies the number of digits used for the cage numbers,
+                   it will be zero filled if needed. The default value is
                    no padding.
         --allocate_type
-                   Specifies the allocation method that is used to allocate 
-                   resources to full system partition. The supported 
-                   allocation methods are always_all, always_list and 
-                   conditional. The default method is always_all. always_all 
-                   indicates to always use the 'all resources' LPAR flag; 
-                   always_list indicates to always explicitly list the 
-                   devices in the LPAR; and conditional indicates to use 
+                   Specifies the allocation method that is used to allocate
+                   resources to full system partition. The supported
+                   allocation methods are always_all, always_list and
+                   conditional. The default method is always_all. always_all
+                   indicates to always use the 'all resources' LPAR flag;
+                   always_list indicates to always explicitly list the
+                   devices in the LPAR; and conditional indicates to use
                    the 'all resources' LPAR flag if not --exclude_hw is found,
-                   otherwise use an explicit list for the hardware. 
+                   otherwise use an explicit list for the hardware.
         --exclude_hw
-                   Specifies a comma-separated list of hardware names or 
-                   'device id's that do not need to assign. The supported 
-                   hardware names are RIO and 10G, RIO indicates Galaxy 1 HCA 
-                   used for RIO connection in IH nodes; 10G indicates 2-port 
-                   10G integrated adapter in IH nodes. It can only be used 
+                   Specifies a comma-separated list of hardware names or
+                   'device id's that do not need to assign. The supported
+                   hardware names are RIO and 10G, RIO indicates Galaxy 1 HCA
+                   used for RIO connection in IH nodes; 10G indicates 2-port
+                   10G integrated adapter in IH nodes. It can only be used
                    with --allocate_type is always_list or conditional.
         -h         Display usage information.
-        
-The configCECs script is written in ksh, and used to create a full 
-system partition for each CECs Managed by the HMC. It will use ssh to 
-login the HMC with the hscroot userid in order to rename the CECs based 
-on a certain pattern specified through command line and create full 
+
+The configCECs script is written in ksh, and used to create a full
+system partition for each CECs Managed by the HMC. It will use ssh to
+login the HMC with the hscroot userid in order to rename the CECs based
+on a certain pattern specified through command line and create full
 partition for all the CECs.
 
-Since for the large HPC environment the user usually does not use many 
-nodes that are not IH nodes, so we only support Power6 IH servers in 
-this script. If the user wants to do LPAR setup for HV or HE servers, 
-he needs to modify this sample script manually. 
+Since for the large HPC environment the user usually does not use many
+nodes that are not IH nodes, so we only support Power6 IH servers in
+this script. If the user wants to do LPAR setup for HV or HE servers,
+he needs to modify this sample script manually.
 
-To specify the name format to be used for the CEC/LPAR/Profile, this 
-script uses the same logic that the 'date' command uses for specifying 
-how to output the date. There are 4 field descriptors that the script 
+To specify the name format to be used for the CEC/LPAR/Profile, this
+script uses the same logic that the 'date' command uses for specifying
+how to output the date. There are 4 field descriptors that the script
 will recognize:
             %F = the frame number of the frame that the CEC is in
             %N = the relative node number of the CEC in the frame
             %C = the cage number of the CEC in the frame
             %S = the serial number of the CEC
-For example if you want the CEC name to be 
-'airbus_f<frame#>n<node#>_SN<serial#>', then the format to use would be 
+For example if you want the CEC name to be
+'airbus_f<frame#>n<node#>_SN<serial#>', then the format to use would be
 'airbus_f%Fn%N_SN%S'
 
-The way the script finds the CECs on the HMC is to issue the 
-'lssyscfg -r frame' command to find all the frames and then issues the 
-'lssyscfg -r cage' command for each frame to list the contents of each 
-cage position in a given frame. It then starts looking for CECs starting 
-at cage 1 and going through to the last cage. The first CEC found in a 
-frame is assumed to be node 1, the second node found is node two and so on. 
-The script then will assign each CEC a frame number, a node number, a cage 
-number and the Serial number of the CEC which can be used in naming the 
-CEC/LPAR/Profile. If no frames/cages/CECs are found on this HMC, an error 
+The way the script finds the CECs on the HMC is to issue the
+'lssyscfg -r frame' command to find all the frames and then issues the
+'lssyscfg -r cage' command for each frame to list the contents of each
+cage position in a given frame. It then starts looking for CECs starting
+at cage 1 and going through to the last cage. The first CEC found in a
+frame is assumed to be node 1, the second node found is node two and so on.
+The script then will assign each CEC a frame number, a node number, a cage
+number and the Serial number of the CEC which can be used in naming the
+CEC/LPAR/Profile. If no frames/cages/CECs are found on this HMC, an error
 message will be displayed.
 
-xCAT command rspconfig could be used to setup ssh remote shell from the 
-xCAT Management Node to the HMCs without prompting for the hscroot password; 
-otherwise the user has to type in the password manually for many times. 
-And if the user wants to use the frame number in the name of the CEC or 
-LPAR then the frame number must be set on the frames through HMC Web GUI 
+xCAT command rspconfig could be used to setup ssh remote shell from the
+xCAT Management Node to the HMCs without prompting for the hscroot password;
+otherwise the user has to type in the password manually for many times.
+And if the user wants to use the frame number in the name of the CEC or
+LPAR then the frame number must be set on the frames through HMC Web GUI
 or HMC command line before issuing this script.
 
-This script supports three resource allocate_types to create the full system 
-partition; they are always_all, always_list and conditional. The default 
-method is always_all. always_all indicates to always use the 'all resources' 
-LPAR flag; always_list indicates to always explicitly list the devices in the 
-LPAR; and conditional indicates to use the 'all resources' LPAR flag if not 
+This script supports three resource allocate_types to create the full system
+partition; they are always_all, always_list and conditional. The default
+method is always_all. always_all indicates to always use the 'all resources'
+LPAR flag; always_list indicates to always explicitly list the devices in the
+LPAR; and conditional indicates to use the 'all resources' LPAR flag if not
 --exclude_hw is found, otherwise use an explicit list for the hardware.
 
-As default, this script will assign all the resources to the full system 
-partition, but if the allocate_type is always_list or conditional, then the 
-user could use --exclude_hw flag to exclude those devices that can not be 
-assigned or not supported by the operating system from assignment. The 
-supported hardware names or 'device_id's to exclude are RIO and 10G, RIO 
-indicates Galaxy 1 HCA used for RIO connection in IH nodes; 10G indicates 
+As default, this script will assign all the resources to the full system
+partition, but if the allocate_type is always_list or conditional, then the
+user could use --exclude_hw flag to exclude those devices that can not be
+assigned or not supported by the operating system from assignment. The
+supported hardware names or 'device_id's to exclude are RIO and 10G, RIO
+indicates Galaxy 1 HCA used for RIO connection in IH nodes; 10G indicates
 2-port 10G integrated adapter in IH nodes.
 
-Actually, this script will not change the CECs/LPARs directly but creates 
-one or two scripts (Rename_cecs, Build_lpars) in /tmp directory on xCAT MN 
-that will do the changes once the user executes them. The /tmp/Rename_cecs 
-should be run first and then the /tmp/Build_lpars. The reason why we do it 
-this way is to have the user see exactly what HMC commands would be executed 
+Actually, this script will not change the CECs/LPARs directly but creates
+one or two scripts (Rename_cecs, Build_lpars) in /tmp directory on xCAT MN
+that will do the changes once the user executes them. The /tmp/Rename_cecs
+should be run first and then the /tmp/Build_lpars. The reason why we do it
+this way is to have the user see exactly what HMC commands would be executed
 and also have a better chance to fine tune the commands if it is needed.
diff --git a/xCAT-server/share/xcat/ib/scripts/configiba.1port b/xCAT-server/share/xcat/ib/scripts/configiba.1port
index 17663d2ab..108e4e5eb 100755
--- a/xCAT-server/share/xcat/ib/scripts/configiba.1port
+++ b/xCAT-server/share/xcat/ib/scripts/configiba.1port
@@ -1,4 +1,4 @@
-#!/bin/sh  
+#!/bin/sh
 # IBM(c) 2008 EPL license http://www.eclipse.org/legal/epl-v10.html
 
 # Sample xCAT post script for configuring secondary adatper based on eth0
@@ -22,7 +22,7 @@ then
             echo "Not found the driver dameon: rdma or openibd"
             exit
         fi
-    fi   
+    fi
 
 else
     ib_driver="openibd"
@@ -45,7 +45,7 @@ then
         sed -i "/options ib_ehca nr_ports/d" /etc/modprobe.conf
         sed -i "/options ib_ehca lock_hcalls/d" /etc/modprobe.conf
         echo 'options ib_ehca nr_ports=1' >> /etc/modprobe.conf
-        echo 'options ib_ehca lock_hcalls=0' >> /etc/modprobe.conf 
+        echo 'options ib_ehca lock_hcalls=0' >> /etc/modprobe.conf
     fi
     /sbin/chkconfig --level 2345 $ib_driver on  > /dev/null 2>&1
     /sbin/service $ib_driver restart
@@ -57,8 +57,8 @@ fi
 if [ $PLTFRM == "Linux" ]
 then
 
-    ib_number=`lspci | grep -iE "(InfiniBand|Mellanox)" | wc -l` 
-    #loop_number=$[ $ib_number * 2 ] 
+    ib_number=`lspci | grep -iE "(InfiniBand|Mellanox)" | wc -l`
+    #loop_number=$[ $ib_number * 2 ]
     loop_number=$ib_number
 
     if [ -f /etc/redhat-release ]
@@ -71,7 +71,7 @@ then
         echo "Unsupported to config IB on this OS!"
         exit
      fi
- 
+
     if [ $OS_name == 'suse' ]
     then
          dir="/etc/sysconfig/network"
@@ -97,7 +97,7 @@ else
           fi
           num=`expr $num + 1`
     done
-    `rmdev -dl icm >/dev/null 2>&1`  
+    `rmdev -dl icm >/dev/null 2>&1`
     mkdev -c management -s infiniband -t icm
     cfgmgr
     loop_number=`lsdev -Cc adapter |grep iba |wc -l`
@@ -113,8 +113,8 @@ num=0
 while [ $num -lt $loop_number ]
 do
     # Take primary node name, add -ib$num and then reverse resolve to get what ip should be
-    nic="ib$num"   
-    
+    nic="ib$num"
+
     # Get hostname from system in case postscript environment is not ready
     if [ $NODE ]
     then
@@ -145,7 +145,7 @@ do
         if [ $PLTFRM == "Linux" ]
         then
             # Issue openibd for Linux at boot time
-           
+
             if [ -f /etc/sysctl.conf ]
             then
                 sed -i "/net.ipv4.conf.$nic.arp_filter=1/d" /etc/sysctl.conf
@@ -161,7 +161,7 @@ IPADDR=$ip
 NETMASK=$netmask
 GATEWAY=$gateway" > $dir/ifcfg-$nic
             if [[ "$OSVER" == rhels6* ]]
-            then 
+            then
                 echo "DEVICE=$nic
 BOOTPROTO=static
 IPADDR=$ip
@@ -172,7 +172,7 @@ GATEWAY=$gateway" > $dir/ifcfg-$nic
             if [ $OS_name == 'redhat' ]
             then
                 echo "ONBOOT=yes" >> $dir/ifcfg-$nic
-            else 
+            else
                 echo "STARTMODE=auto" >> $dir/ifcfg-$nic
             fi
         elif [ $PLTFRM == "AIX" ]
@@ -199,7 +199,7 @@ GATEWAY=$gateway" > $dir/ifcfg-$nic
             mkiba -a $ip -i $nic -A $ib_adapter -p $port -P -1 -S up -m $netmask
         fi
     fi
-         
+
     num=`expr $num + 1`
 done
 
@@ -219,7 +219,7 @@ then
 #        sed -i "/options ib_ehca nr_ports/d" /etc/modprobe.conf
 #        sed -i "/options ib_ehca lock_hcalls/d" /etc/modprobe.conf
 #        echo 'options ib_ehca nr_ports=1' >> /etc/modprobe.conf
-#        echo 'options ib_ehca lock_hcalls=0' >> /etc/modprobe.conf 
+#        echo 'options ib_ehca lock_hcalls=0' >> /etc/modprobe.conf
 #    fi
 #    /sbin/chkconfig --level 2345 $ib_driver on
     /sbin/service $ib_driver restart
@@ -235,8 +235,8 @@ then
         if [[ "$OSVER" == rhels6* ]]
         then
             ip link set dev ib$num up
-        else 
-            ifup ib$num      
+        else
+            ifup ib$num
         fi
 
         num=`expr $num + 1`
diff --git a/xCAT-server/share/xcat/ib/scripts/configiba.2ports b/xCAT-server/share/xcat/ib/scripts/configiba.2ports
index 499f8419d..91b44f024 100755
--- a/xCAT-server/share/xcat/ib/scripts/configiba.2ports
+++ b/xCAT-server/share/xcat/ib/scripts/configiba.2ports
@@ -1,4 +1,4 @@
-#!/bin/sh  
+#!/bin/sh
 # IBM(c) 2008 EPL license http://www.eclipse.org/legal/epl-v10.html
 
 # Sample xCAT post script for configuring secondary adatper based on eth0
@@ -21,7 +21,7 @@ then
             echo "Not found the driver dameon: rdma or openibd"
             exit
         fi
-    fi   
+    fi
 else
     ib_driver="openibd"
 fi
@@ -51,8 +51,8 @@ fi
 if [ $PLTFRM == "Linux" ]
 then
 
-    ib_number=`lspci | grep -iE "(InfiniBand|Mellanox)" | wc -l` 
-    loop_number=`expr $ib_number \* 2` 
+    ib_number=`lspci | grep -iE "(InfiniBand|Mellanox)" | wc -l`
+    loop_number=`expr $ib_number \* 2`
 
     if [ -f /etc/redhat-release ]
     then
@@ -64,7 +64,7 @@ then
         echo "Unsupported to config IB on this OS!"
         exit
      fi
- 
+
     if [ $OS_name == 'suse' ]
     then
          dir="/etc/sysconfig/network"
@@ -75,7 +75,7 @@ then
 
 
 else
- 
+
     loop_number=`lsdev | grep "IP over Infiniband Network Interface" | wc -l`
 
     num=0
@@ -91,11 +91,11 @@ else
           `rmdev -d -l ml$num >/dev/null 2>&1`
           num=`expr $num + 1`
     done
-    `rmdev -dl icm >/dev/null 2>&1`  
+    `rmdev -dl icm >/dev/null 2>&1`
     mkdev -c management -s infiniband -t icm
     cfgmgr
     ib_number=`lsdev -Cc adapter |grep iba |wc -l`
-    loop_number=`expr $ib_number \* 2` 
+    loop_number=`expr $ib_number \* 2`
 
 fi
 
@@ -108,7 +108,7 @@ num=0
 while [ $num -lt $loop_number ]
 do
     # Take primary node name, add -ib$num and then reverse resolve to get what ip should be
-    nic="ib$num"   
+    nic="ib$num"
     # Get hostname from system in case postscript environment is not ready
     if [ $NODE ]
     then
@@ -149,7 +149,7 @@ do
                 echo "Unsupported to config IB on this OS!"
                 exit
             fi
-            
+
             if [ -f /etc/sysctl.conf ]
             then
                 sed -i "/net.ipv4.conf.$nic.arp_filter=1/d" /etc/sysctl.conf
@@ -171,7 +171,7 @@ IPADDR=$ip
 NETMASK=$netmask
 GATEWAY=$gateway" > $dir/ifcfg-$nic
             if [[ "$OSVER" == rhels6* ]]
-            then 
+            then
                 echo "DEVICE=$nic
 BOOTPROTO=static
 IPADDR=$ip
@@ -181,7 +181,7 @@ GATEWAY=$gateway" > $dir/ifcfg-$nic
             if [ $OS_name == 'redhat' ]
             then
                 echo "ONBOOT=yes" >> $dir/ifcfg-$nic
-            else 
+            else
                 echo "STARTMODE=auto" >> $dir/ifcfg-$nic
             fi
         elif [ $PLTFRM == "AIX" ]
@@ -228,12 +228,12 @@ then
     while [ $num -lt $loop_number ]
     do
         sleep 5
-             
+
         if [[ "$OSVER" == rhels6* ]]
         then
             ip link set dev ib$num up
-        else 
-            ifup ib$num      
+        else
+            ifup ib$num
         fi
         num=`expr $num + 1`
     done
diff --git a/xCAT-server/share/xcat/ib/scripts/configiba.README b/xCAT-server/share/xcat/ib/scripts/configiba.README
index 939cc8333..f4d98d0b2 100644
--- a/xCAT-server/share/xcat/ib/scripts/configiba.README
+++ b/xCAT-server/share/xcat/ib/scripts/configiba.README
@@ -8,9 +8,9 @@ This configiba postscript is used to do secondary adapter configuration for Infi
 
 IB configuration with xCAT needs nameserver support to provide IP addresses for computes nodes.  We assume nameserver is setup on Management node.  Please follow similiar steps on the system that provide nameserver service if nameserver is not on management node.
 
-There are two times to configure IB adapters, during node installation or with command updatenode after node installation.  These two IB configuration ways are similar and finally they will trigger this sample postscript to configure IB adapters.  
+There are two times to configure IB adapters, during node installation or with command updatenode after node installation.  These two IB configuration ways are similar and finally they will trigger this sample postscript to configure IB adapters.
 
-To use this script, users need to firstly setup DNS for the new adapters before node installation or before triggering command updatenode depending on when to start IB configuration, either time is supported: 
+To use this script, users need to firstly setup DNS for the new adapters before node installation or before triggering command updatenode depending on when to start IB configuration, either time is supported:
 
 1.The IP address entries for IB interfaces in /etc/hosts on xCAT management nodes should have the node short hostname and the unique IB interface name in them.  The format should be <ip_address_for_this_ib_interface node_short_hostname-ib_interfacename>.
 For example:
@@ -27,9 +27,9 @@ makedns
 service named restart
 For AIX Managed Nodes:
 makedns
-stopsrc -s named 
+stopsrc -s named
 startsrc -s named
-lssrc -s named 
+lssrc -s named
 Note: Only if the state of named is active, we can continue to test DNS.
 
 4.Check if DNS for the IB network has been setup successfully
@@ -46,7 +46,7 @@ IP addresses for IB interfaces on compute nodes.
 
 6.Add this script to postscripts
 chtab node=c890f11ec01 postscripts.postscripts=configiba.1port
-or 
+or
 chtab node=c890f11ec01 postscripts.postscripts=configiba.2ports
 Note: The postscripts name depends on the script copied to /install/postscripts/
 
@@ -59,9 +59,9 @@ updatenode c890f11ec01 configiba.2ports
 
 As a sample postscript, the netmask is set to default value: 255.255.255.0 and gateway is set to "X.X.255.254".  If the IB interface name is not a simple combination of short hostname and ibX or netmask and gateway cannot meet user's requirement, user can modify this scripts by himself, like the example below:
 
-The node short hostname is 890f11ec01-en, and the IB interface name is 890f11ec01-ib0, c890f11ec01-ib1, etc. The user needs to modify 
+The node short hostname is 890f11ec01-en, and the IB interface name is 890f11ec01-ib0, c890f11ec01-ib1, etc. The user needs to modify
 my $hostname = "$ENV{NODE}-$nic";
-to 
+to
 my $fullname = `echo $ENV{NODE} | cut -c 1-11`;
 chomp($fullname);
 my $hostname = "$fullname-$nic";
diff --git a/xCAT-server/share/xcat/ib/scripts/getGuids b/xCAT-server/share/xcat/ib/scripts/getGuids
index d37c4fb9f..80ab3efe3 100644
--- a/xCAT-server/share/xcat/ib/scripts/getGuids
+++ b/xCAT-server/share/xcat/ib/scripts/getGuids
@@ -290,7 +290,7 @@ sub usage()
 
 =head3   checkxDshReachability
 
-        Notes: Check the xdsh reachability between the Management Nodes 
+        Notes: Check the xdsh reachability between the Management Nodes
                and node.
 
 Arguments:
diff --git a/xCAT-server/share/xcat/ib/scripts/getGuids.README b/xCAT-server/share/xcat/ib/scripts/getGuids.README
index 822f3175d..71462e5e4 100644
--- a/xCAT-server/share/xcat/ib/scripts/getGuids.README
+++ b/xCAT-server/share/xcat/ib/scripts/getGuids.README
@@ -8,27 +8,27 @@ The syntax of the getGuids command is:
 
 getGuids [-h] [-f output_file]
          -f output_file
-            Specifies a file full path name that is used to save the 
+            Specifies a file full path name that is used to save the
             GUIDs output.
-         -h 
+         -h
             Display usage information.
 
 The getGuids is a sample script to get GUIDs for Infiniband Galaxy HCAs
-(Host Channel Adapter) and their ports from xCAT Management Nodes. It 
-needs to be run from xCAT Management Node, and will use dsh to all 
-the xCAT Managed Nodes so that it could use ibstat command on AIX system 
-or ibv_devinfo command on Linux system to get the information about the 
-IB devices. 
+(Host Channel Adapter) and their ports from xCAT Management Nodes. It
+needs to be run from xCAT Management Node, and will use dsh to all
+the xCAT Managed Nodes so that it could use ibstat command on AIX system
+or ibv_devinfo command on Linux system to get the information about the
+IB devices.
 
-If dsh is unreachable for certain nodes, getGuids will give a warning 
-message to the user and recommend configuring dsh for these nodes. If 
-ibstat or ibv_devinfo command is not available on the target nodes, 
-getGuids will give a warning message to indicate that could not get 
+If dsh is unreachable for certain nodes, getGuids will give a warning
+message to the user and recommend configuring dsh for these nodes. If
+ibstat or ibv_devinfo command is not available on the target nodes,
+getGuids will give a warning message to indicate that could not get
 GUIDs on these nodes.
 
-The output of this script will be printed to the screen and also saved 
-into output file, which could be specified by -f flag; otherwise, xCAT 
-will use the default output file /var/opt/xcat/ib/Guids.xcat. 
+The output of this script will be printed to the screen and also saved
+into output file, which could be specified by -f flag; otherwise, xCAT
+will use the default output file /var/opt/xcat/ib/Guids.xcat.
 
 The format for the output file is <Node: Device: Type: GUID>, for example:
 --------------------------------------------------
@@ -40,17 +40,17 @@ c890f11ec05.ppd.pok.ibm.com: ehca0: portGID_1: 000255007002650f
 c890f11ec05.ppd.pok.ibm.com: ehca0: portGID_2: 000255007002651f
 --------------------------------------------------
 
-This output file will be used by annotatelog script to organize the log 
-entries gathered onto the xCAT MN through remote logging. This script is 
-not necessary for non-Galaxy adapters because users can give the adapter 
+This output file will be used by annotatelog script to organize the log
+entries gathered onto the xCAT MN through remote logging. This script is
+not necessary for non-Galaxy adapters because users can give the adapter
 names directly and do not need the GUID map.
 
-getGuids will get IB GUIDs from all the AIX nodes and Linux nodes that 
-are defined on the xCAT Management Node (MN); for the nodes that are 
-not defined on xCAT MN, if user wants to get GUIDs for these nodes too, 
-please define them as xCAT Management Node first and configure dsh before 
+getGuids will get IB GUIDs from all the AIX nodes and Linux nodes that
+are defined on the xCAT Management Node (MN); for the nodes that are
+not defined on xCAT MN, if user wants to get GUIDs for these nodes too,
+please define them as xCAT Management Node first and configure dsh before
 using getGuides script.
 
 The log file for the script getGuids is /var/log/xcat/getGuids.log.
-The supported hardware types of the nodes gathered GUIDs from are POWER6 
+The supported hardware types of the nodes gathered GUIDs from are POWER6
 HV4/HV4+, POWER6 HV8/HV8+ and POWER6 IH.
diff --git a/xCAT-server/share/xcat/ib/scripts/healthCheck b/xCAT-server/share/xcat/ib/scripts/healthCheck
index fb3dd451e..b4700899d 100644
--- a/xCAT-server/share/xcat/ib/scripts/healthCheck
+++ b/xCAT-server/share/xcat/ib/scripts/healthCheck
@@ -281,7 +281,7 @@ sub usage()
     print
       "Usage: healthCheck { [-n node_list] [-M]}
                     {[-p min_clock_speed] [-i method] [-m min_memory]
-                    [-l min_freelp] [ -H [--speed speed --ignore interface_list --width width]]} 
+                    [-l min_freelp] [ -H [--speed speed --ignore interface_list --width width]]}
                     [ -h ]
 
         -M          Check status for all the Managed Nodes that are defined on this MS.
@@ -290,7 +290,7 @@ sub usage()
         -p min_clock_speed
                     Specifies the minimal processor clock speed in MHz for processor monitor.
         -i method
-                    Specifies the method to do Infiniband interface status check, the supported 
+                    Specifies the method to do Infiniband interface status check, the supported
                     check methods are LL and RSCT.
         -m min_memory
                     Specifies the minimal total memory in MB.
@@ -300,7 +300,7 @@ sub usage()
         --speed speed
                     Specifies the physical port speed in G bps, it should be used with -H flag.
         --ignore interface_list
-                    Specifies a comma-separated list of interface name to ignore from HCA status check, 
+                    Specifies a comma-separated list of interface name to ignore from HCA status check,
                     such as ib0,ib1. It should be used with -H flag.
         --width width
                     Specifies the physical port width, such as 4X or 12X. It should be used with -H flag.
diff --git a/xCAT-server/share/xcat/ib/scripts/healthCheck.README b/xCAT-server/share/xcat/ib/scripts/healthCheck.README
index 2c59dbf57..798f15782 100644
--- a/xCAT-server/share/xcat/ib/scripts/healthCheck.README
+++ b/xCAT-server/share/xcat/ib/scripts/healthCheck.README
@@ -8,7 +8,7 @@ The syntax of the healthCheck command is:
 
 healthCheck { [-n node_list] [-M]}
             {[-p min_clock_speed] [-i method] [-m min_memory]
-            [-l min_freelp] [ -H [--speed speed --ignore interface_list --width width]]} 
+            [-l min_freelp] [ -H [--speed speed --ignore interface_list --width width]]}
             [ -h ]
 
         -M          Check status for all the Managed Nodes that are defined on this MN.
@@ -17,7 +17,7 @@ healthCheck { [-n node_list] [-M]}
         -p min_clock_speed
                     Specifies the minimal processor clock speed in MHz for processor monitor.
         -i method
-                    Specifies the method to do Infiniband interface status check, the supported 
+                    Specifies the method to do Infiniband interface status check, the supported
                     check methods are LL and RSCT.
         -m min_memory
                     Specifies the minimal total memory in MB.
@@ -27,68 +27,68 @@ healthCheck { [-n node_list] [-M]}
         --speed speed
                     Specifies the physical port speed in G bps, it should be used with -H flag.
         --ignore interface_list
-                    Specifies a comma-separated list of interface name to ignore from HCA status check, 
+                    Specifies a comma-separated list of interface name to ignore from HCA status check,
                     such as ib0,ib1. It should be used with -H flag.
         --width width
                     Specifies the physical port width, such as 4X or 12X. It should be used with -H flag.
         -h          Display usage information.
-        
-This script is used to check the system health for both AIX and Linux 
-Managed Nodes on Power6 platforms. It will use xdsh to access the target 
-nodes, and check the status for processor clock speed, IB interfaces, 
-memory and large page configuration. If xdsh is unreachable, an error 
+
+This script is used to check the system health for both AIX and Linux
+Managed Nodes on Power6 platforms. It will use xdsh to access the target
+nodes, and check the status for processor clock speed, IB interfaces,
+memory and large page configuration. If xdsh is unreachable, an error
 message will be given.
 
 1. Processor clock speed check
-This script will use xdsh command to access the target nodes, and run 
-"/usr/pmapi/tools/pmcycles -M" command on the AIX MNs or "cat 
-/proc/cpuinfo" command on Linux MNs to list the actual processor clock 
-speed in MHz. Compare this actual speed with the minimal value that user 
-specified in command line with -p flag, if it is smaller than the minimal 
-value, a warning message will be given out to indicate the unexpected low 
+This script will use xdsh command to access the target nodes, and run
+"/usr/pmapi/tools/pmcycles -M" command on the AIX MNs or "cat
+/proc/cpuinfo" command on Linux MNs to list the actual processor clock
+speed in MHz. Compare this actual speed with the minimal value that user
+specified in command line with -p flag, if it is smaller than the minimal
+value, a warning message will be given out to indicate the unexpected low
 frequency.
 
 2. IB interface status check by llstatus
-In LoadLeveler cluster environment, all the nodes are sharing the same 
-cluster information. So we only need to xdsh to one of these nodes, and 
-run LoadLeveler command "/usr/lpp/LoadL/full/bin/llstatus -a" on AIX or 
-"/opt/ibmll/LoadL/full/bin/llstatus -a" on Linux nodes to list the IB 
-interface status. If the status is not "READY", a warning message related 
-to its nodename and IB port will be given out. This check process needs 
-the "llstatus" command existed on the MNs, if it does not exist, an error 
+In LoadLeveler cluster environment, all the nodes are sharing the same
+cluster information. So we only need to xdsh to one of these nodes, and
+run LoadLeveler command "/usr/lpp/LoadL/full/bin/llstatus -a" on AIX or
+"/opt/ibmll/LoadL/full/bin/llstatus -a" on Linux nodes to list the IB
+interface status. If the status is not "READY", a warning message related
+to its nodename and IB port will be given out. This check process needs
+the "llstatus" command existed on the MNs, if it does not exist, an error
 message will be output.
 
 3. IB interface status check by lsrsrc
-This script will use xdsh command to access the target nodes, and run 
-"/usr/bin/lsrsrc IBM.NetworkInterface Name OpState" command on AIX or 
-Linux MNs to list the IB interface status for each node. If the "OpState" 
-value is not "1", a warning message related to its nodename and IB port 
+This script will use xdsh command to access the target nodes, and run
+"/usr/bin/lsrsrc IBM.NetworkInterface Name OpState" command on AIX or
+Linux MNs to list the IB interface status for each node. If the "OpState"
+value is not "1", a warning message related to its nodename and IB port
 will be given out.
 
 4. Memory check
-This script will use xdsh command to access the target nodes, and run 
-"/usr/bin/vmstat" command on AIX MNs or "cat /proc/meminfo" commands on 
-Linux MNs to list the total memory information. If the total memory is 
-smaller than the minimal value specified by the user in GB, a warning 
-message will be given out with the node name and its real total memory 
-account. 
+This script will use xdsh command to access the target nodes, and run
+"/usr/bin/vmstat" command on AIX MNs or "cat /proc/meminfo" commands on
+Linux MNs to list the total memory information. If the total memory is
+smaller than the minimal value specified by the user in GB, a warning
+message will be given out with the node name and its real total memory
+account.
 
 5. Free large page check
-This script will use xdsh command to access the target nodes, and run 
-"/usr/bin/vmstat -l" command on AIX MNs or "cat /proc/meminfo" commands 
-on Linux MNs to list the free large page information. If the free large 
-page number is smaller than the minimal value specified by the user, a 
-warning message will be given out with the node name and its real free 
-large page number. 
+This script will use xdsh command to access the target nodes, and run
+"/usr/bin/vmstat -l" command on AIX MNs or "cat /proc/meminfo" commands
+on Linux MNs to list the free large page information. If the free large
+page number is smaller than the minimal value specified by the user, a
+warning message will be given out with the node name and its real free
+large page number.
 
 6. Check HCA status
-This script will use xdsh command to access the target nodes. 
+This script will use xdsh command to access the target nodes.
 For AIX nodes, we use command ibstat -v | egrep "IB PORT.*INFO|Port State
-:|Physical Port" to get the HCA status of Logical Port State, Physical 
-Port State, Physical Port Physical State, Physical Port Speed and Physical 
-Port Width. The expected values are "Logical Port State: Active", "Physical 
-Port State: Active", "Physical Port Physical State: Link Up", "Physical 
-Port Width: 4X". If the actual value is not the same as expected one, a 
+:|Physical Port" to get the HCA status of Logical Port State, Physical
+Port State, Physical Port Physical State, Physical Port Speed and Physical
+Port Width. The expected values are "Logical Port State: Active", "Physical
+Port State: Active", "Physical Port Physical State: Link Up", "Physical
+Port Width: 4X". If the actual value is not the same as expected one, a
 warning message will be given out.
 This is an example of the output of ibstat command:
 c890f11ec01:/ # ibstat -v | egrep "IB PORT.*INFO|Port State:|Physical Port"
@@ -106,9 +106,9 @@ Physical Port Speed:                    2.5G
 Physical Port Width:                    4X
 
 For Linux nodes, we use command ibv_devinfo -v | egrep "ehca|port:|state:
-|width:|speed:" to get the HCA status of port state, active_width, active_speed 
-and phys_state. The expected values are "port state: PORT_ACTIVE", 
-"active_width: 4X", "phys_state: LINK_UP". If the actual value is not the 
+|width:|speed:" to get the HCA status of port state, active_width, active_speed
+and phys_state. The expected values are "port state: PORT_ACTIVE",
+"active_width: 4X", "phys_state: LINK_UP". If the actual value is not the
 same as expected one, a warning message will be given out.
 This is an example of the output of ibv_devinfo command:
 c890f11ec05:~ # ibv_devinfo -v | egrep "ehca|port:|state:|width:|speed:"
@@ -124,16 +124,16 @@ hca_id: ehca0
                         active_speed:           2.5 Gbps (1)
                         phys_state:             LINK_UP (5)
 
-But for "Physical Port Speed" on AIX nodes or "active_speed" on Linux nodes, 
-since SDR and DDR adapters will use the different speeds, SDR is 2.5G and DDR 
-is 5.0G, so the user needs to specify this "Speed" by flag "--speed", for 
+But for "Physical Port Speed" on AIX nodes or "active_speed" on Linux nodes,
+since SDR and DDR adapters will use the different speeds, SDR is 2.5G and DDR
+is 5.0G, so the user needs to specify this "Speed" by flag "--speed", for
 example:
 
 healthCheck -N AIXNodes -H --speed 2.5
 
-If "--speed" is not specified with "-H" flag, healthCheck script will list the 
-actual value of "Physical Port Speed" gotten from ibstat command for each HCAs, 
-so that it is easy for the user to use "grep" command to find the speed value 
+If "--speed" is not specified with "-H" flag, healthCheck script will list the
+actual value of "Physical Port Speed" gotten from ibstat command for each HCAs,
+so that it is easy for the user to use "grep" command to find the speed value
 he/she wants.
 The output format is <node_name>:<interface_name>:< Physical Port Speed >:
 <speed_value>, for example:
@@ -142,8 +142,8 @@ c890f11ec01.ppd.pok.ibm.com: ib0: Physical Port Speed: 2.5G
 c890f11ec01.ppd.pok.ibm.com: ib1: Physical Port Speed: 2.5G
 c890f11ec02.ppd.pok.ibm.com: ib0: Physical Port Speed: 5.0G
 c890f11ec02.ppd.pok.ibm.com: ib1: Physical Port Speed: 5.0G
-Since the output of ibstat or ibv_devinfo is identified by HCA name and port 
-number, so we will use the mapping table below to map the HCA name and port 
+Since the output of ibstat or ibv_devinfo is identified by HCA name and port
+number, so we will use the mapping table below to map the HCA name and port
 number to its interface name. Please see the table below:
 
 Interface Name	Adapter Name	Port Number
@@ -153,14 +153,14 @@ ib2	            iba1/ehca1	    1
 ib3	            iba1/ehca1	    2
 ......	
 
-For "Physical Port Width" on AIX nodes or "active_width" on Linux nodes, since 
-it could be 4X or 12X, so the user needs to specify this "width" by flag 
+For "Physical Port Width" on AIX nodes or "active_width" on Linux nodes, since
+it could be 4X or 12X, so the user needs to specify this "width" by flag
 "--width", for example:
 
 healthCheck -N LinuxNodes -H --width 4X
 
-If "--width" is not specified, healthCheck script will list the actual value 
-of "Physical Port Width" gotten from ibstat command for each HCAs, so that it 
+If "--width" is not specified, healthCheck script will list the actual value
+of "Physical Port Width" gotten from ibstat command for each HCAs, so that it
 is easy for the user to use "grep" command to find the speed value he/she wants.
 The output format is <node_name>:<interface_name>:< Physical Port Width >:
 <width_value>, for example:
@@ -169,8 +169,8 @@ c890f11ec01.ppd.pok.ibm.com: ib0: Physical Port Width: 4X
 c890f11ec01.ppd.pok.ibm.com: ib1: Physical Port Width: 4X
 c890f11ec02.ppd.pok.ibm.com: ib0: Physical Port Width: 4X
 
-For the ports that are not used by the target nodes, the user could use --ignore 
-flag to exclude them from HCA status check. If the user does not specify these 
-"unused port" with --ignore flag, healthCheck script will check all HCA check 
-items for all interfaces, and return the warning message to for the failed ones. 
+For the ports that are not used by the target nodes, the user could use --ignore
+flag to exclude them from HCA status check. If the user does not specify these
+"unused port" with --ignore flag, healthCheck script will check all HCA check
+items for all interfaces, and return the warning message to for the failed ones.
 The user could use grep piped into wc -l to get the total number of "unused port".
diff --git a/xCAT-server/share/xcat/image_data/xCATsnData b/xCAT-server/share/xcat/image_data/xCATsnData
index 64de2a2cb..dde58103e 100644
--- a/xCAT-server/share/xcat/image_data/xCATsnData
+++ b/xCAT-server/share/xcat/image_data/xCATsnData
@@ -1,18 +1,18 @@
-# IBM_PROLOG_BEGIN_TAG 
-# This is an automatically generated prolog. 
-#  
-# bos61J src/bos/usr/lpp/bosinst/image.template/image.template 1.23.1.39 
-#  
-# Licensed Materials - Property of IBM 
-#  
-# COPYRIGHT International Business Machines Corp. 1993,2009 
-# All Rights Reserved 
-#  
-# US Government Users Restricted Rights - Use, duplication or 
-# disclosure restricted by GSA ADP Schedule Contract with IBM Corp. 
-#  
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# bos61J src/bos/usr/lpp/bosinst/image.template/image.template 1.23.1.39
+#
+# Licensed Materials - Property of IBM
+#
+# COPYRIGHT International Business Machines Corp. 1993,2009
+# All Rights Reserved
+#
+# US Government Users Restricted Rights - Use, duplication or
+# disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+#
 # @(#) 41 1.23.1.39 src/bos/usr/lpp/bosinst/image.template/image.template, bosinst, bos61J, 0935A_61J 8/12/09 12:53:55
-# IBM_PROLOG_END_TAG 
+# IBM_PROLOG_END_TAG
 #
 #   COMPONENT_NAME: BOSINST
 #
diff --git a/xCAT-server/share/xcat/install/SL/compute.tmpl b/xCAT-server/share/xcat/install/SL/compute.tmpl
index f0e88e6b3..e21976494 100644
--- a/xCAT-server/share/xcat/install/SL/compute.tmpl
+++ b/xCAT-server/share/xcat/install/SL/compute.tmpl
@@ -35,7 +35,7 @@ key --skip
 #No RAID
 #/boot really significant for this sort of setup nowadays?
 #part /boot --size 50 --fstype ext3
-part swap --size 1024 
+part swap --size 1024
 part / --size 1 --grow --fstype ext3
 #XCAT_PARTITION_END#
 
@@ -120,7 +120,7 @@ skipx
 #
 # perl -e 'print crypt("blah","Xa") . "\n";'p
 # openssl passwd -apr1 -salt xxxxxxxx password
-# 
+#
 # where "blah" is your root password.
 #
 #rootpw --iscrypted XaLGAVe1C41x2
@@ -128,7 +128,7 @@ skipx
 rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
 
 #
-# NIS setup: auth --enablenis --nisdomain sensenet 
+# NIS setup: auth --enablenis --nisdomain sensenet
 # --nisserver neptune --useshadow --enablemd5
 #
 # OR
diff --git a/xCAT-server/share/xcat/install/centos/all.tmpl b/xCAT-server/share/xcat/install/centos/all.tmpl
index aad9e396b..68453ddfa 100644
--- a/xCAT-server/share/xcat/install/centos/all.tmpl
+++ b/xCAT-server/share/xcat/install/centos/all.tmpl
@@ -124,7 +124,7 @@ key --skip
 #
 # perl -e 'print crypt("blah","Xa") . "\n";'p
 # openssl passwd -apr1 -salt xxxxxxxx password
-# 
+#
 # where "blah" is your root password.
 #
 #rootpw --iscrypted XaLGAVe1C41x2
@@ -132,7 +132,7 @@ key --skip
 rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
 
 #
-# NIS setup: auth --enablenis --nisdomain sensenet 
+# NIS setup: auth --enablenis --nisdomain sensenet
 # --nisserver neptune --useshadow --enablemd5
 #
 # OR
diff --git a/xCAT-server/share/xcat/install/centos/compute.centos6.tmpl b/xCAT-server/share/xcat/install/centos/compute.centos6.tmpl
index ae594f700..42699d05f 100644
--- a/xCAT-server/share/xcat/install/centos/compute.centos6.tmpl
+++ b/xCAT-server/share/xcat/install/centos/compute.centos6.tmpl
@@ -108,7 +108,7 @@ skipx
 #
 # perl -e 'print crypt("blah","Xa") . "\n";'p
 # openssl passwd -apr1 -salt xxxxxxxx password
-# 
+#
 # where "blah" is your root password.
 #
 #rootpw --iscrypted XaLGAVe1C41x2
@@ -116,7 +116,7 @@ skipx
 rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
 
 #
-# NIS setup: auth --enablenis --nisdomain sensenet 
+# NIS setup: auth --enablenis --nisdomain sensenet
 # --nisserver neptune --useshadow --enablemd5
 #
 # OR
diff --git a/xCAT-server/share/xcat/install/centos/compute.tmpl b/xCAT-server/share/xcat/install/centos/compute.tmpl
index 96b7b7040..70ae2d93d 100644
--- a/xCAT-server/share/xcat/install/centos/compute.tmpl
+++ b/xCAT-server/share/xcat/install/centos/compute.tmpl
@@ -37,7 +37,7 @@ clearpart --all --initlabel
 #No RAID
 #/boot really significant for this sort of setup nowadays?
 #part /boot --size 50 --fstype ext3
-part swap --size 1024 
+part swap --size 1024
 part / --size 1 --grow --fstype ext3
 #XCAT_PARTITION_END#
 
@@ -122,7 +122,7 @@ skipx
 #
 # perl -e 'print crypt("blah","Xa") . "\n";'p
 # openssl passwd -apr1 -salt xxxxxxxx password
-# 
+#
 # where "blah" is your root password.
 #
 #rootpw --iscrypted XaLGAVe1C41x2
@@ -130,7 +130,7 @@ skipx
 rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
 
 #
-# NIS setup: auth --enablenis --nisdomain sensenet 
+# NIS setup: auth --enablenis --nisdomain sensenet
 # --nisserver neptune --useshadow --enablemd5
 #
 # OR
diff --git a/xCAT-server/share/xcat/install/centos/iscsi.centos6.tmpl b/xCAT-server/share/xcat/install/centos/iscsi.centos6.tmpl
index d8da59e03..9497d3c0a 100644
--- a/xCAT-server/share/xcat/install/centos/iscsi.centos6.tmpl
+++ b/xCAT-server/share/xcat/install/centos/iscsi.centos6.tmpl
@@ -123,7 +123,7 @@ skipx
 #
 # perl -e 'print crypt("blah","Xa") . "\n";'p
 # openssl passwd -apr1 -salt xxxxxxxx password
-# 
+#
 # where "blah" is your root password.
 #
 #rootpw --iscrypted XaLGAVe1C41x2
@@ -131,7 +131,7 @@ skipx
 rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
 
 #
-# NIS setup: auth --enablenis --nisdomain sensenet 
+# NIS setup: auth --enablenis --nisdomain sensenet
 # --nisserver neptune --useshadow --enablemd5
 #
 # OR
diff --git a/xCAT-server/share/xcat/install/centos/iscsi.tmpl b/xCAT-server/share/xcat/install/centos/iscsi.tmpl
index eca0d3203..0fdae7dcb 100644
--- a/xCAT-server/share/xcat/install/centos/iscsi.tmpl
+++ b/xCAT-server/share/xcat/install/centos/iscsi.tmpl
@@ -123,7 +123,7 @@ skipx
 #
 # perl -e 'print crypt("blah","Xa") . "\n";'p
 # openssl passwd -apr1 -salt xxxxxxxx password
-# 
+#
 # where "blah" is your root password.
 #
 #rootpw --iscrypted XaLGAVe1C41x2
@@ -131,7 +131,7 @@ skipx
 rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
 
 #
-# NIS setup: auth --enablenis --nisdomain sensenet 
+# NIS setup: auth --enablenis --nisdomain sensenet
 # --nisserver neptune --useshadow --enablemd5
 #
 # OR
diff --git a/xCAT-server/share/xcat/install/centos/kvm.centos6.tmpl b/xCAT-server/share/xcat/install/centos/kvm.centos6.tmpl
index bba1f46b0..14594c80b 100644
--- a/xCAT-server/share/xcat/install/centos/kvm.centos6.tmpl
+++ b/xCAT-server/share/xcat/install/centos/kvm.centos6.tmpl
@@ -105,7 +105,7 @@ skipx
 #
 # perl -e 'print crypt("blah","Xa") . "\n";'p
 # openssl passwd -apr1 -salt xxxxxxxx password
-# 
+#
 # where "blah" is your root password.
 #
 #rootpw --iscrypted XaLGAVe1C41x2
@@ -113,7 +113,7 @@ skipx
 rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
 
 #
-# NIS setup: auth --enablenis --nisdomain sensenet 
+# NIS setup: auth --enablenis --nisdomain sensenet
 # --nisserver neptune --useshadow --enablemd5
 #
 # OR
diff --git a/xCAT-server/share/xcat/install/centos/kvm.centos7.tmpl b/xCAT-server/share/xcat/install/centos/kvm.centos7.tmpl
index 24d0af830..17e6078c4 100644
--- a/xCAT-server/share/xcat/install/centos/kvm.centos7.tmpl
+++ b/xCAT-server/share/xcat/install/centos/kvm.centos7.tmpl
@@ -40,7 +40,7 @@ zerombr
 #No RAID
 #/boot really significant for this sort of setup nowadays?
 #part /boot --size 50 --fstype ext3
-#part swap --size 1024 
+#part swap --size 1024
 #part / --size 1 --grow --fstype ext4
 
 #RAID 0 /scr for performance
diff --git a/xCAT-server/share/xcat/install/centos/storage.centos6.tmpl b/xCAT-server/share/xcat/install/centos/storage.centos6.tmpl
index 00cef0561..a8b803e02 100644
--- a/xCAT-server/share/xcat/install/centos/storage.centos6.tmpl
+++ b/xCAT-server/share/xcat/install/centos/storage.centos6.tmpl
@@ -126,7 +126,7 @@ key --skip
 #
 # perl -e 'print crypt("blah","Xa") . "\n";'p
 # openssl passwd -apr1 -salt xxxxxxxx password
-# 
+#
 # where "blah" is your root password.
 #
 #rootpw --iscrypted XaLGAVe1C41x2
@@ -134,7 +134,7 @@ key --skip
 rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
 
 #
-# NIS setup: auth --enablenis --nisdomain sensenet 
+# NIS setup: auth --enablenis --nisdomain sensenet
 # --nisserver neptune --useshadow --enablemd5
 #
 # OR
diff --git a/xCAT-server/share/xcat/install/centos/storage.tmpl b/xCAT-server/share/xcat/install/centos/storage.tmpl
index f869c19c8..eb16fa341 100644
--- a/xCAT-server/share/xcat/install/centos/storage.tmpl
+++ b/xCAT-server/share/xcat/install/centos/storage.tmpl
@@ -126,7 +126,7 @@ key --skip
 #
 # perl -e 'print crypt("blah","Xa") . "\n";'p
 # openssl passwd -apr1 -salt xxxxxxxx password
-# 
+#
 # where "blah" is your root password.
 #
 #rootpw --iscrypted XaLGAVe1C41x2
@@ -134,7 +134,7 @@ key --skip
 rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
 
 #
-# NIS setup: auth --enablenis --nisdomain sensenet 
+# NIS setup: auth --enablenis --nisdomain sensenet
 # --nisserver neptune --useshadow --enablemd5
 #
 # OR
diff --git a/xCAT-server/share/xcat/install/centos/xen.centos6.tmpl b/xCAT-server/share/xcat/install/centos/xen.centos6.tmpl
index cdbf5dd61..e9e3e5daa 100644
--- a/xCAT-server/share/xcat/install/centos/xen.centos6.tmpl
+++ b/xCAT-server/share/xcat/install/centos/xen.centos6.tmpl
@@ -35,7 +35,7 @@ clearpart --all --initlabel
 #No RAID
 #/boot really significant for this sort of setup nowadays?
 #part /boot --size 50 --fstype ext3
-part swap --size 1024 
+part swap --size 1024
 part / --size 1 --grow --fstype ext3
 #XCAT_PARTITION_END#
 
@@ -120,7 +120,7 @@ skipx
 #
 # perl -e 'print crypt("blah","Xa") . "\n";'p
 # openssl passwd -apr1 -salt xxxxxxxx password
-# 
+#
 # where "blah" is your root password.
 #
 #rootpw --iscrypted XaLGAVe1C41x2
@@ -128,7 +128,7 @@ skipx
 rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
 
 #
-# NIS setup: auth --enablenis --nisdomain sensenet 
+# NIS setup: auth --enablenis --nisdomain sensenet
 # --nisserver neptune --useshadow --enablemd5
 #
 # OR
diff --git a/xCAT-server/share/xcat/install/centos/xen.tmpl b/xCAT-server/share/xcat/install/centos/xen.tmpl
index 773a35a85..f2042c88f 100644
--- a/xCAT-server/share/xcat/install/centos/xen.tmpl
+++ b/xCAT-server/share/xcat/install/centos/xen.tmpl
@@ -35,7 +35,7 @@ clearpart --all --initlabel
 #No RAID
 #/boot really significant for this sort of setup nowadays?
 #part /boot --size 50 --fstype ext3
-part swap --size 1024 
+part swap --size 1024
 part / --size 1 --grow --fstype ext3
 #XCAT_PARTITION_END#
 
@@ -120,7 +120,7 @@ skipx
 #
 # perl -e 'print crypt("blah","Xa") . "\n";'p
 # openssl passwd -apr1 -salt xxxxxxxx password
-# 
+#
 # where "blah" is your root password.
 #
 #rootpw --iscrypted XaLGAVe1C41x2
@@ -128,7 +128,7 @@ skipx
 rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
 
 #
-# NIS setup: auth --enablenis --nisdomain sensenet 
+# NIS setup: auth --enablenis --nisdomain sensenet
 # --nisserver neptune --useshadow --enablemd5
 #
 # OR
diff --git a/xCAT-server/share/xcat/install/debian/compute.tmpl b/xCAT-server/share/xcat/install/debian/compute.tmpl
index 1528a5e80..38c26403d 100644
--- a/xCAT-server/share/xcat/install/debian/compute.tmpl
+++ b/xCAT-server/share/xcat/install/debian/compute.tmpl
@@ -32,7 +32,7 @@ d-i mirror/http/proxy string
 # Suite to use for loading installer components (optional).
 #d-i mirror/udeb/suite string testing
 #d-i mirror/suite string feisty
- 
+
 
 ### Partitioning
 # This creates a small /boot partition, suitable
@@ -68,7 +68,7 @@ d-i partman/confirm boolean true
 d-i partman/confirm_nooverwrite boolean true
 
 
-### Account setup 
+### Account setup
 
 d-i passwd/root-login boolean true
 d-i passwd/make-user boolean false
@@ -120,7 +120,7 @@ xserver-xorg xserver-xorg/config/monitor/mode-list \
 
 d-i preseed/early_command string wget http://#TABLE:noderes:$NODE:nfsserver#/install/autoinst/#TABLE:nodelist:THISNODE:node#.pre; \
      chmod u+x #TABLE:nodelist:THISNODE:node#.pre; \
-     ./#TABLE:nodelist:THISNODE:node#.pre 
+     ./#TABLE:nodelist:THISNODE:node#.pre
 
 d-i preseed/late_command string wget http://#TABLE:noderes:$NODE:nfsserver#/install/autoinst/#TABLE:nodelist:THISNODE:node#.post; \
      chmod u+x #TABLE:nodelist:THISNODE:node#.post; \
diff --git a/xCAT-server/share/xcat/install/esx/base.esxi4.1.tmpl b/xCAT-server/share/xcat/install/esx/base.esxi4.1.tmpl
index ee2bb0cd1..5b5513a7c 100644
--- a/xCAT-server/share/xcat/install/esx/base.esxi4.1.tmpl
+++ b/xCAT-server/share/xcat/install/esx/base.esxi4.1.tmpl
@@ -8,7 +8,7 @@ vmaccepteula
 rootpw --iscrypted #CRYPT:passwd:key=vmware,username=root:password#
 
 # clear all partitions.
-clearpart --alldrives --overwritevmfs 
+clearpart --alldrives --overwritevmfs
 # Choose the first disk (in channel/target/lun order) to install onto
 autopart --firstdisk --overwritevmfs
 
@@ -18,7 +18,7 @@ install url http://#TABLE:noderes:$NODE:nfsserver#/install/#TABLE:nodetype:$NODE
 
 # Set the network to DHCP on the first network adapter
 #network --bootproto=dhcp --device=vmnic0
-network --bootproto=dhcp 
+network --bootproto=dhcp
 
 # reboot automatically when we're done.
 reboot
diff --git a/xCAT-server/share/xcat/install/esx/esx.tmpl b/xCAT-server/share/xcat/install/esx/esx.tmpl
index 39b6959ea..3003bd7fd 100644
--- a/xCAT-server/share/xcat/install/esx/esx.tmpl
+++ b/xCAT-server/share/xcat/install/esx/esx.tmpl
@@ -28,8 +28,8 @@ vmaccepteula
 #vmlicense --mode=server --server=27000@192.168.0.25 -edition=esxFull
 #Starter License Type
 #vmlicense --mode=server --server=27000@192.168.0.25 -edition=esxExpress
-#File Based: 
-#Place the content of the lincese file 
+#File Based:
+#Place the content of the lincese file
 #in a single line in the %vmlicense_text section
 #vmlicense --mode=file
 
diff --git a/xCAT-server/share/xcat/install/esxi/hypervisor.tmpl b/xCAT-server/share/xcat/install/esxi/hypervisor.tmpl
index 238ed2b51..a6572a6fc 100644
--- a/xCAT-server/share/xcat/install/esxi/hypervisor.tmpl
+++ b/xCAT-server/share/xcat/install/esxi/hypervisor.tmpl
@@ -5,7 +5,7 @@ vmaccepteula
 rootpw --iscrypted #CRYPT:passwd:key=vmware,username=root:password#
 
 # clear all partitions.
-#clearpart --alldrives --overwritevmfs 
+#clearpart --alldrives --overwritevmfs
 # Choose the first disk (in channel/target/lun order) to install onto
 install --firstdisk --overwritevmfs
 
diff --git a/xCAT-server/share/xcat/install/fedora/compute.fedora13.tmpl b/xCAT-server/share/xcat/install/fedora/compute.fedora13.tmpl
index 79eedbac9..4e98e9366 100644
--- a/xCAT-server/share/xcat/install/fedora/compute.fedora13.tmpl
+++ b/xCAT-server/share/xcat/install/fedora/compute.fedora13.tmpl
@@ -35,7 +35,7 @@ key --skip
 #No RAID
 #/boot really significant for this sort of setup nowadays?
 #part /boot --size 50 --fstype ext3
-part swap --size 1024 
+part swap --size 1024
 part / --size 1 --grow --fstype ext4
 #XCAT_PARTITION_END#
 
@@ -114,7 +114,7 @@ skipx
 #
 # perl -e 'print crypt("blah","Xa") . "\n";'p
 # openssl passwd -apr1 -salt xxxxxxxx password
-# 
+#
 # where "blah" is your root password.
 #
 #rootpw --iscrypted XaLGAVe1C41x2
@@ -122,7 +122,7 @@ skipx
 rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
 
 #
-# NIS setup: auth --enablenis --nisdomain sensenet 
+# NIS setup: auth --enablenis --nisdomain sensenet
 # --nisserver neptune --useshadow --enablemd5
 #
 # OR
diff --git a/xCAT-server/share/xcat/install/fedora/compute.fedora14.tmpl b/xCAT-server/share/xcat/install/fedora/compute.fedora14.tmpl
index 932dd932f..08edab9f3 100644
--- a/xCAT-server/share/xcat/install/fedora/compute.fedora14.tmpl
+++ b/xCAT-server/share/xcat/install/fedora/compute.fedora14.tmpl
@@ -34,7 +34,7 @@ clearpart --all --initlabel
 #No RAID
 #/boot really significant for this sort of setup nowadays?
 #part /boot --size 50 --fstype ext3
-part swap --size 1024 
+part swap --size 1024
 part / --size 1 --grow --fstype ext4
 #XCAT_PARTITION_END#
 
@@ -113,7 +113,7 @@ skipx
 #
 # perl -e 'print crypt("blah","Xa") . "\n";'p
 # openssl passwd -apr1 -salt xxxxxxxx password
-# 
+#
 # where "blah" is your root password.
 #
 #rootpw --iscrypted XaLGAVe1C41x2
@@ -121,7 +121,7 @@ skipx
 rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
 
 #
-# NIS setup: auth --enablenis --nisdomain sensenet 
+# NIS setup: auth --enablenis --nisdomain sensenet
 # --nisserver neptune --useshadow --enablemd5
 #
 # OR
diff --git a/xCAT-server/share/xcat/install/fedora/compute.fedora19.tmpl b/xCAT-server/share/xcat/install/fedora/compute.fedora19.tmpl
index d023171a4..b142236c0 100644
--- a/xCAT-server/share/xcat/install/fedora/compute.fedora19.tmpl
+++ b/xCAT-server/share/xcat/install/fedora/compute.fedora19.tmpl
@@ -118,7 +118,7 @@ skipx
 #
 # perl -e 'print crypt("blah","Xa") . "\n";'p
 # openssl passwd -apr1 -salt xxxxxxxx password
-# 
+#
 # where "blah" is your root password.
 #
 #rootpw --iscrypted XaLGAVe1C41x2
@@ -126,7 +126,7 @@ skipx
 rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
 
 #
-# NIS setup: auth --enablenis --nisdomain sensenet 
+# NIS setup: auth --enablenis --nisdomain sensenet
 # --nisserver neptune --useshadow --enablemd5
 #
 # OR
diff --git a/xCAT-server/share/xcat/install/fedora/compute.fedora20.tmpl b/xCAT-server/share/xcat/install/fedora/compute.fedora20.tmpl
index d023171a4..b142236c0 100644
--- a/xCAT-server/share/xcat/install/fedora/compute.fedora20.tmpl
+++ b/xCAT-server/share/xcat/install/fedora/compute.fedora20.tmpl
@@ -118,7 +118,7 @@ skipx
 #
 # perl -e 'print crypt("blah","Xa") . "\n";'p
 # openssl passwd -apr1 -salt xxxxxxxx password
-# 
+#
 # where "blah" is your root password.
 #
 #rootpw --iscrypted XaLGAVe1C41x2
@@ -126,7 +126,7 @@ skipx
 rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
 
 #
-# NIS setup: auth --enablenis --nisdomain sensenet 
+# NIS setup: auth --enablenis --nisdomain sensenet
 # --nisserver neptune --useshadow --enablemd5
 #
 # OR
diff --git a/xCAT-server/share/xcat/install/fedora/compute.fedora21.tmpl b/xCAT-server/share/xcat/install/fedora/compute.fedora21.tmpl
index 5462e1304..e07250173 100644
--- a/xCAT-server/share/xcat/install/fedora/compute.fedora21.tmpl
+++ b/xCAT-server/share/xcat/install/fedora/compute.fedora21.tmpl
@@ -118,7 +118,7 @@ skipx
 #
 # perl -e 'print crypt("blah","Xa") . "\n";'p
 # openssl passwd -apr1 -salt xxxxxxxx password
-# 
+#
 # where "blah" is your root password.
 #
 #rootpw --iscrypted XaLGAVe1C41x2
@@ -126,7 +126,7 @@ skipx
 rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
 
 #
-# NIS setup: auth --enablenis --nisdomain sensenet 
+# NIS setup: auth --enablenis --nisdomain sensenet
 # --nisserver neptune --useshadow --enablemd5
 #
 # OR
diff --git a/xCAT-server/share/xcat/install/fedora/compute.fedora8.tmpl b/xCAT-server/share/xcat/install/fedora/compute.fedora8.tmpl
index 1ac761608..9d777c923 100644
--- a/xCAT-server/share/xcat/install/fedora/compute.fedora8.tmpl
+++ b/xCAT-server/share/xcat/install/fedora/compute.fedora8.tmpl
@@ -36,7 +36,7 @@ clearpart --all --initlabel
 #No RAID
 #/boot really significant for this sort of setup nowadays?
 #part /boot --size 50 --fstype ext3
-part swap --size 1024 
+part swap --size 1024
 part / --size 1 --grow --fstype ext3
 #XCAT_PARTITION_END#
 
@@ -121,7 +121,7 @@ skipx
 #
 # perl -e 'print crypt("blah","Xa") . "\n";'p
 # openssl passwd -apr1 -salt xxxxxxxx password
-# 
+#
 # where "blah" is your root password.
 #
 #rootpw --iscrypted XaLGAVe1C41x2
@@ -129,7 +129,7 @@ skipx
 rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
 
 #
-# NIS setup: auth --enablenis --nisdomain sensenet 
+# NIS setup: auth --enablenis --nisdomain sensenet
 # --nisserver neptune --useshadow --enablemd5
 #
 # OR
@@ -148,7 +148,7 @@ reboot
 #
 #end of section
 #
-%packages 
+%packages
 #INCLUDE_DEFAULT_PKGLIST#
 %pre
 #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh#
diff --git a/xCAT-server/share/xcat/install/fedora/compute.fedora9.ppc64.tmpl b/xCAT-server/share/xcat/install/fedora/compute.fedora9.ppc64.tmpl
index b0cedaeea..474aa4a04 100644
--- a/xCAT-server/share/xcat/install/fedora/compute.fedora9.ppc64.tmpl
+++ b/xCAT-server/share/xcat/install/fedora/compute.fedora9.ppc64.tmpl
@@ -37,7 +37,7 @@ clearpart --all --initlabel
 #/boot really significant for this sort of setup nowadays?
 part None --fstype "PPC PReP Boot" --size 8
 part /boot --size 50 --fstype ext3
-part swap --size 1024 
+part swap --size 1024
 part / --size 1 --grow --fstype ext3
 #XCAT_PARTITION_END#
 
@@ -122,7 +122,7 @@ skipx
 #
 # perl -e 'print crypt("blah","Xa") . "\n";'p
 # openssl passwd -apr1 -salt xxxxxxxx password
-# 
+#
 # where "blah" is your root password.
 #
 #rootpw --iscrypted XaLGAVe1C41x2
@@ -131,7 +131,7 @@ rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
 #rootpw --iscrypted #COMMAND:perl -e 'print crypt("#TABLE:passwd.tab:rootpw:1#","Xa") . "\n";'p#
 
 #
-# NIS setup: auth --enablenis --nisdomain sensenet 
+# NIS setup: auth --enablenis --nisdomain sensenet
 # --nisserver neptune --useshadow --enablemd5
 #
 # OR
diff --git a/xCAT-server/share/xcat/install/fedora/compute.fedora9.tmpl b/xCAT-server/share/xcat/install/fedora/compute.fedora9.tmpl
index 45e988010..9d777c923 100644
--- a/xCAT-server/share/xcat/install/fedora/compute.fedora9.tmpl
+++ b/xCAT-server/share/xcat/install/fedora/compute.fedora9.tmpl
@@ -36,7 +36,7 @@ clearpart --all --initlabel
 #No RAID
 #/boot really significant for this sort of setup nowadays?
 #part /boot --size 50 --fstype ext3
-part swap --size 1024 
+part swap --size 1024
 part / --size 1 --grow --fstype ext3
 #XCAT_PARTITION_END#
 
@@ -121,7 +121,7 @@ skipx
 #
 # perl -e 'print crypt("blah","Xa") . "\n";'p
 # openssl passwd -apr1 -salt xxxxxxxx password
-# 
+#
 # where "blah" is your root password.
 #
 #rootpw --iscrypted XaLGAVe1C41x2
@@ -129,7 +129,7 @@ skipx
 rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
 
 #
-# NIS setup: auth --enablenis --nisdomain sensenet 
+# NIS setup: auth --enablenis --nisdomain sensenet
 # --nisserver neptune --useshadow --enablemd5
 #
 # OR
diff --git a/xCAT-server/share/xcat/install/fedora/compute.ppc64.tmpl b/xCAT-server/share/xcat/install/fedora/compute.ppc64.tmpl
index 8d5e3a71d..b652d29c9 100644
--- a/xCAT-server/share/xcat/install/fedora/compute.ppc64.tmpl
+++ b/xCAT-server/share/xcat/install/fedora/compute.ppc64.tmpl
@@ -37,7 +37,7 @@ clearpart --all --initlabel
 #/boot really significant for this sort of setup nowadays?
 part None --fstype "PPC PReP Boot" --size 8
 part /boot --size 50 --fstype ext3
-part swap --size 1024 
+part swap --size 1024
 part / --size 1 --grow --fstype ext3
 #XCAT_PARTITION_END#
 
@@ -122,7 +122,7 @@ skipx
 #
 # perl -e 'print crypt("blah","Xa") . "\n";'p
 # openssl passwd -apr1 -salt xxxxxxxx password
-# 
+#
 # where "blah" is your root password.
 #
 #rootpw --iscrypted XaLGAVe1C41x2
@@ -130,7 +130,7 @@ skipx
 rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
 
 #
-# NIS setup: auth --enablenis --nisdomain sensenet 
+# NIS setup: auth --enablenis --nisdomain sensenet
 # --nisserver neptune --useshadow --enablemd5
 #
 # OR
@@ -149,7 +149,7 @@ reboot
 #
 #end of section
 #
-%packages 
+%packages
 #INCLUDE_DEFAULT_PKGLIST#
 %pre
 #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh#
diff --git a/xCAT-server/share/xcat/install/fedora/compute.tmpl b/xCAT-server/share/xcat/install/fedora/compute.tmpl
index 45e988010..9d777c923 100644
--- a/xCAT-server/share/xcat/install/fedora/compute.tmpl
+++ b/xCAT-server/share/xcat/install/fedora/compute.tmpl
@@ -36,7 +36,7 @@ clearpart --all --initlabel
 #No RAID
 #/boot really significant for this sort of setup nowadays?
 #part /boot --size 50 --fstype ext3
-part swap --size 1024 
+part swap --size 1024
 part / --size 1 --grow --fstype ext3
 #XCAT_PARTITION_END#
 
@@ -121,7 +121,7 @@ skipx
 #
 # perl -e 'print crypt("blah","Xa") . "\n";'p
 # openssl passwd -apr1 -salt xxxxxxxx password
-# 
+#
 # where "blah" is your root password.
 #
 #rootpw --iscrypted XaLGAVe1C41x2
@@ -129,7 +129,7 @@ skipx
 rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
 
 #
-# NIS setup: auth --enablenis --nisdomain sensenet 
+# NIS setup: auth --enablenis --nisdomain sensenet
 # --nisserver neptune --useshadow --enablemd5
 #
 # OR
diff --git a/xCAT-server/share/xcat/install/fedora/iscsi.fedora9.ppc64.tmpl b/xCAT-server/share/xcat/install/fedora/iscsi.fedora9.ppc64.tmpl
index acd8431f1..61b8fec06 100644
--- a/xCAT-server/share/xcat/install/fedora/iscsi.fedora9.ppc64.tmpl
+++ b/xCAT-server/share/xcat/install/fedora/iscsi.fedora9.ppc64.tmpl
@@ -124,7 +124,7 @@ skipx
 #
 # perl -e 'print crypt("blah","Xa") . "\n";'p
 # openssl passwd -apr1 -salt xxxxxxxx password
-# 
+#
 # where "blah" is your root password.
 #
 #rootpw --iscrypted XaLGAVe1C41x2
@@ -132,7 +132,7 @@ skipx
 rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
 
 #
-# NIS setup: auth --enablenis --nisdomain sensenet 
+# NIS setup: auth --enablenis --nisdomain sensenet
 # --nisserver neptune --useshadow --enablemd5
 #
 # OR
diff --git a/xCAT-server/share/xcat/install/fedora/iscsi.fedora9.tmpl b/xCAT-server/share/xcat/install/fedora/iscsi.fedora9.tmpl
index 94bc501d7..2a6604cc8 100644
--- a/xCAT-server/share/xcat/install/fedora/iscsi.fedora9.tmpl
+++ b/xCAT-server/share/xcat/install/fedora/iscsi.fedora9.tmpl
@@ -123,7 +123,7 @@ skipx
 #
 # perl -e 'print crypt("blah","Xa") . "\n";'p
 # openssl passwd -apr1 -salt xxxxxxxx password
-# 
+#
 # where "blah" is your root password.
 #
 #rootpw --iscrypted XaLGAVe1C41x2
@@ -131,7 +131,7 @@ skipx
 rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
 
 #
-# NIS setup: auth --enablenis --nisdomain sensenet 
+# NIS setup: auth --enablenis --nisdomain sensenet
 # --nisserver neptune --useshadow --enablemd5
 #
 # OR
diff --git a/xCAT-server/share/xcat/install/fedora/iscsi.ppc64.tmpl b/xCAT-server/share/xcat/install/fedora/iscsi.ppc64.tmpl
index 57ff95363..61b8fec06 100644
--- a/xCAT-server/share/xcat/install/fedora/iscsi.ppc64.tmpl
+++ b/xCAT-server/share/xcat/install/fedora/iscsi.ppc64.tmpl
@@ -124,7 +124,7 @@ skipx
 #
 # perl -e 'print crypt("blah","Xa") . "\n";'p
 # openssl passwd -apr1 -salt xxxxxxxx password
-# 
+#
 # where "blah" is your root password.
 #
 #rootpw --iscrypted XaLGAVe1C41x2
@@ -132,7 +132,7 @@ skipx
 rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
 
 #
-# NIS setup: auth --enablenis --nisdomain sensenet 
+# NIS setup: auth --enablenis --nisdomain sensenet
 # --nisserver neptune --useshadow --enablemd5
 #
 # OR
@@ -151,7 +151,7 @@ reboot
 #
 #end of section
 #
-%packages 
+%packages
 #INCLUDE_DEFAULT_PKGLIST#
 %pre
 #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh#
diff --git a/xCAT-server/share/xcat/install/fedora/iscsi.tmpl b/xCAT-server/share/xcat/install/fedora/iscsi.tmpl
index f684964d8..2a6604cc8 100644
--- a/xCAT-server/share/xcat/install/fedora/iscsi.tmpl
+++ b/xCAT-server/share/xcat/install/fedora/iscsi.tmpl
@@ -123,7 +123,7 @@ skipx
 #
 # perl -e 'print crypt("blah","Xa") . "\n";'p
 # openssl passwd -apr1 -salt xxxxxxxx password
-# 
+#
 # where "blah" is your root password.
 #
 #rootpw --iscrypted XaLGAVe1C41x2
@@ -131,7 +131,7 @@ skipx
 rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
 
 #
-# NIS setup: auth --enablenis --nisdomain sensenet 
+# NIS setup: auth --enablenis --nisdomain sensenet
 # --nisserver neptune --useshadow --enablemd5
 #
 # OR
@@ -150,7 +150,7 @@ reboot
 #
 #end of section
 #
-%packages 
+%packages
 #INCLUDE_DEFAULT_PKGLIST#
 %pre
 #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh#
diff --git a/xCAT-server/share/xcat/install/fedora/service.ppc64.tmpl b/xCAT-server/share/xcat/install/fedora/service.ppc64.tmpl
index e09a0f876..b8eae65b8 100644
--- a/xCAT-server/share/xcat/install/fedora/service.ppc64.tmpl
+++ b/xCAT-server/share/xcat/install/fedora/service.ppc64.tmpl
@@ -150,7 +150,7 @@ reboot
 #
 #end of section
 #
-%packages 
+%packages
 #INCLUDE_DEFAULT_PKGLIST#
 %pre
 #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh#
diff --git a/xCAT-server/share/xcat/install/fedora/service.tmpl b/xCAT-server/share/xcat/install/fedora/service.tmpl
index 07b109c0a..9d777c923 100644
--- a/xCAT-server/share/xcat/install/fedora/service.tmpl
+++ b/xCAT-server/share/xcat/install/fedora/service.tmpl
@@ -148,7 +148,7 @@ reboot
 #
 #end of section
 #
-%packages 
+%packages
 #INCLUDE_DEFAULT_PKGLIST#
 %pre
 #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh#
diff --git a/xCAT-server/share/xcat/install/rh/compute.ppc64.tmpl b/xCAT-server/share/xcat/install/rh/compute.ppc64.tmpl
index bdee539f0..ea3996a68 100644
--- a/xCAT-server/share/xcat/install/rh/compute.ppc64.tmpl
+++ b/xCAT-server/share/xcat/install/rh/compute.ppc64.tmpl
@@ -39,7 +39,7 @@ key --skip
 #/boot really significant for this sort of setup nowadays?
 part None --fstype "PPC PReP Boot" --size 8
 #part /boot --size 50 --fstype ext3
-part swap --size 1024 
+part swap --size 1024
 part / --size 1 --grow --fstype ext3
 #XCAT_PARTITION_END#
 
@@ -124,7 +124,7 @@ skipx
 #
 # perl -e 'print crypt("blah","Xa") . "\n";'p
 # openssl passwd -apr1 -salt xxxxxxxx password
-# 
+#
 # where "blah" is your root password.
 #
 #rootpw --iscrypted XaLGAVe1C41x2
@@ -132,7 +132,7 @@ skipx
 rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
 
 #
-# NIS setup: auth --enablenis --nisdomain sensenet 
+# NIS setup: auth --enablenis --nisdomain sensenet
 # --nisserver neptune --useshadow --enablemd5
 #
 # OR
diff --git a/xCAT-server/share/xcat/install/rh/compute.rhel4.tmpl b/xCAT-server/share/xcat/install/rh/compute.rhel4.tmpl
index ba3c64a6a..3ffc40e34 100644
--- a/xCAT-server/share/xcat/install/rh/compute.rhel4.tmpl
+++ b/xCAT-server/share/xcat/install/rh/compute.rhel4.tmpl
@@ -35,7 +35,7 @@ clearpart --all --initlabel
 #No RAID
 #/boot really significant for this sort of setup nowadays?
 #part /boot --size 50 --fstype ext3
-part swap --size 1024 
+part swap --size 1024
 part / --size 1 --grow --fstype ext3
 #XCAT_PARTITION_END#
 
@@ -120,7 +120,7 @@ skipx
 #
 # perl -e 'print crypt("blah","Xa") . "\n";'p
 # openssl passwd -apr1 -salt xxxxxxxx password
-# 
+#
 # where "blah" is your root password.
 #
 #rootpw --iscrypted XaLGAVe1C41x2
@@ -128,7 +128,7 @@ skipx
 rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
 
 #
-# NIS setup: auth --enablenis --nisdomain sensenet 
+# NIS setup: auth --enablenis --nisdomain sensenet
 # --nisserver neptune --useshadow --enablemd5
 #
 # OR
diff --git a/xCAT-server/share/xcat/install/rh/compute.rhel5.ppc64.tmpl b/xCAT-server/share/xcat/install/rh/compute.rhel5.ppc64.tmpl
index 2fc672430..da0de3cf5 100644
--- a/xCAT-server/share/xcat/install/rh/compute.rhel5.ppc64.tmpl
+++ b/xCAT-server/share/xcat/install/rh/compute.rhel5.ppc64.tmpl
@@ -37,8 +37,8 @@ key --skip
 #/boot really significant for this sort of setup nowadays?
 part None --fstype "PPC PReP Boot" --size 8
 part /boot --size 50 --fstype ext3
-part swap --size 1024  
-part / --size 1 --grow --fstype ext3 
+part swap --size 1024
+part / --size 1 --grow --fstype ext3
 #XCAT_PARTITION_END#
 
 #RAID 0 /scr for performance
@@ -122,7 +122,7 @@ skipx
 #
 # perl -e 'print crypt("blah","Xa") . "\n";'p
 # openssl passwd -apr1 -salt xxxxxxxx password
-# 
+#
 # where "blah" is your root password.
 #
 #rootpw --iscrypted XaLGAVe1C41x2
@@ -130,7 +130,7 @@ skipx
 rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
 
 #
-# NIS setup: auth --enablenis --nisdomain sensenet 
+# NIS setup: auth --enablenis --nisdomain sensenet
 # --nisserver neptune --useshadow --enablemd5
 #
 # OR
diff --git a/xCAT-server/share/xcat/install/rh/compute.rhel5.s390x.pkglist b/xCAT-server/share/xcat/install/rh/compute.rhel5.s390x.pkglist
index 13e471b33..80be1e563 100644
--- a/xCAT-server/share/xcat/install/rh/compute.rhel5.s390x.pkglist
+++ b/xCAT-server/share/xcat/install/rh/compute.rhel5.s390x.pkglist
@@ -4,4 +4,4 @@
 fipscheck
 device-mapper-multipath
 sgpio
-apr
\ No newline at end of file
+apr
diff --git a/xCAT-server/share/xcat/install/rh/compute.rhel5.s390x.tmpl b/xCAT-server/share/xcat/install/rh/compute.rhel5.s390x.tmpl
index 11db26e25..7157db7b2 100644
--- a/xCAT-server/share/xcat/install/rh/compute.rhel5.s390x.tmpl
+++ b/xCAT-server/share/xcat/install/rh/compute.rhel5.s390x.tmpl
@@ -6,7 +6,7 @@ key --skip
 lang en_US.UTF-8
 network --bootproto=static --ip=replace_ip --netmask=replace_netmask --gateway=replace_gateway --nameserver=replace_nameserver --hostname=replace_hostname
 rootpw replace_rootpw
-firewall --disabled 
+firewall --disabled
 authconfig --enableshadow --enablemd5
 selinux --disabled
 timezone --utc America/New_York
@@ -25,4 +25,4 @@ part swap --size=512 --ondisk=dasda
 %packages
 replace_software_packages
 
-%post
\ No newline at end of file
+%post
diff --git a/xCAT-server/share/xcat/install/rh/compute.rhelhpc6.tmpl b/xCAT-server/share/xcat/install/rh/compute.rhelhpc6.tmpl
index 8d2ab086d..1eef56bef 100644
--- a/xCAT-server/share/xcat/install/rh/compute.rhelhpc6.tmpl
+++ b/xCAT-server/share/xcat/install/rh/compute.rhelhpc6.tmpl
@@ -34,7 +34,7 @@ key --skip
 #/boot really significant for this sort of setup nowadays?
 #part /boot --size 50 --fstype ext3
 %include /tmp/partitionfile
-#part swap --size 1024 
+#part swap --size 1024
 #part / --size 1 --grow --fstype ext4
 #XCAT_PARTITION_END#
 
@@ -113,7 +113,7 @@ skipx
 #
 # perl -e 'print crypt("blah","Xa") . "\n";'p
 # openssl passwd -apr1 -salt xxxxxxxx password
-# 
+#
 # where "blah" is your root password.
 #
 #rootpw --iscrypted XaLGAVe1C41x2
@@ -121,7 +121,7 @@ skipx
 rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
 
 #
-# NIS setup: auth --enablenis --nisdomain sensenet 
+# NIS setup: auth --enablenis --nisdomain sensenet
 # --nisserver neptune --useshadow --enablemd5
 #
 # OR
diff --git a/xCAT-server/share/xcat/install/rh/compute.rhels6.ppc64.tmpl b/xCAT-server/share/xcat/install/rh/compute.rhels6.ppc64.tmpl
index 2633c2ace..29da64645 100644
--- a/xCAT-server/share/xcat/install/rh/compute.rhels6.ppc64.tmpl
+++ b/xCAT-server/share/xcat/install/rh/compute.rhels6.ppc64.tmpl
@@ -36,7 +36,7 @@ key --skip
 #No RAID
 #/boot really significant for this sort of setup nowadays?
 part None --fstype "PPC PReP Boot" --size 8 --ondisk sda
-#part /boot --size 200 --fstype ext4 
+#part /boot --size 200 --fstype ext4
 part swap --size 1024 --ondisk sda
 part / --size 1 --grow --fstype ext4 --ondisk sda
 #XCAT_PARTITION_END#
@@ -116,7 +116,7 @@ skipx
 #
 # perl -e 'print crypt("blah","Xa") . "\n";'p
 # openssl passwd -apr1 -salt xxxxxxxx password
-# 
+#
 # where "blah" is your root password.
 #
 #rootpw --iscrypted XaLGAVe1C41x2
@@ -124,7 +124,7 @@ skipx
 rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
 
 #
-# NIS setup: auth --enablenis --nisdomain sensenet 
+# NIS setup: auth --enablenis --nisdomain sensenet
 # --nisserver neptune --useshadow --enablemd5
 #
 # OR
diff --git a/xCAT-server/share/xcat/install/rh/compute.rhels6.s390x.tmpl b/xCAT-server/share/xcat/install/rh/compute.rhels6.s390x.tmpl
index 6b84a5701..0c71a17aa 100644
--- a/xCAT-server/share/xcat/install/rh/compute.rhels6.s390x.tmpl
+++ b/xCAT-server/share/xcat/install/rh/compute.rhels6.s390x.tmpl
@@ -6,7 +6,7 @@ key --skip
 lang en_US.UTF-8
 network --bootproto=static --ip=replace_ip --netmask=replace_netmask --gateway=replace_gateway --nameserver=replace_nameserver --hostname=replace_hostname
 rootpw replace_rootpw
-firewall --disabled 
+firewall --disabled
 authconfig --enableshadow --enablemd5
 selinux --disabled
 timezone --utc America/New_York
diff --git a/xCAT-server/share/xcat/install/rh/compute.rhels6.tmpl b/xCAT-server/share/xcat/install/rh/compute.rhels6.tmpl
index a466a2cc3..a29c9d0e1 100644
--- a/xCAT-server/share/xcat/install/rh/compute.rhels6.tmpl
+++ b/xCAT-server/share/xcat/install/rh/compute.rhels6.tmpl
@@ -35,7 +35,7 @@ key --skip
 #/boot really significant for this sort of setup nowadays?
 #part /boot --size 50 --fstype ext3
 %include /tmp/partitionfile
-#part swap --size 1024 
+#part swap --size 1024
 #part / --size 1 --grow --fstype ext4
 #XCAT_PARTITION_END#
 
@@ -114,7 +114,7 @@ skipx
 #
 # perl -e 'print crypt("blah","Xa") . "\n";'p
 # openssl passwd -apr1 -salt xxxxxxxx password
-# 
+#
 # where "blah" is your root password.
 #
 #rootpw --iscrypted XaLGAVe1C41x2
@@ -122,7 +122,7 @@ skipx
 rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
 
 #
-# NIS setup: auth --enablenis --nisdomain sensenet 
+# NIS setup: auth --enablenis --nisdomain sensenet
 # --nisserver neptune --useshadow --enablemd5
 #
 # OR
diff --git a/xCAT-server/share/xcat/install/rh/compute.rhels6.x86_64.tmpl b/xCAT-server/share/xcat/install/rh/compute.rhels6.x86_64.tmpl
index 32f356a45..9d5a20a8e 100644
--- a/xCAT-server/share/xcat/install/rh/compute.rhels6.x86_64.tmpl
+++ b/xCAT-server/share/xcat/install/rh/compute.rhels6.x86_64.tmpl
@@ -119,7 +119,7 @@ skipx
 #
 # perl -e 'print crypt("blah","Xa") . "\n";'p
 # openssl passwd -apr1 -salt xxxxxxxx password
-# 
+#
 # where "blah" is your root password.
 #
 #rootpw --iscrypted XaLGAVe1C41x2
@@ -127,7 +127,7 @@ skipx
 rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
 
 #
-# NIS setup: auth --enablenis --nisdomain sensenet 
+# NIS setup: auth --enablenis --nisdomain sensenet
 # --nisserver neptune --useshadow --enablemd5
 #
 # OR
diff --git a/xCAT-server/share/xcat/install/rh/compute.rhels8.pkglist b/xCAT-server/share/xcat/install/rh/compute.rhels8.pkglist
new file mode 100644
index 000000000..527ec9825
--- /dev/null
+++ b/xCAT-server/share/xcat/install/rh/compute.rhels8.pkglist
@@ -0,0 +1,7 @@
+@^minimal-environment
+chrony
+net-tools
+nfs-utils
+openssh-server
+rsync
+util-linux
diff --git a/xCAT-server/share/xcat/install/rh/compute.rhels8.tmpl b/xCAT-server/share/xcat/install/rh/compute.rhels8.tmpl
new file mode 100644
index 000000000..55edc48e6
--- /dev/null
+++ b/xCAT-server/share/xcat/install/rh/compute.rhels8.tmpl
@@ -0,0 +1,61 @@
+#version=DEVEL
+# System authorization information
+auth --enableshadow --passalgo=sha512
+# Use text install
+text
+# Use network installation
+%include /tmp/repos
+# Not run the Setup Agent on first boot
+firstboot --disable
+# Keyboard layouts
+keyboard --vckeymap=us --xlayouts='us'
+# System language
+lang en_US.UTF-8
+
+# Network information
+#KICKSTARTNET#
+# Root password
+rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
+# System services
+services --disabled="NetworkManager"
+# System timezone
+timezone #TABLE:site:key=timezone:value# --isUtc
+# Partition clearing information
+zerombr
+clearpart --all --initlabel
+#XCAT_PARTITION_START#
+%include /tmp/partitionfile
+#XCAT_PARTITION_END#
+
+install
+skipx
+# Do not configure any iptables rules
+firewall --disable
+selinux --disable
+reboot
+
+%packages
+#INCLUDE_DEFAULT_PKGLIST#
+
+%end
+
+%anaconda
+pwpolicy root --minlen=6 --minquality=1 --notstrict --nochanges --emptyok
+pwpolicy user --minlen=6 --minquality=1 --notstrict --nochanges --emptyok
+pwpolicy luks --minlen=6 --minquality=1 --notstrict --nochanges --emptyok
+%end
+%pre
+{
+echo "Running Kickstart Pre-installation script..."
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rhels8#
+} &>>/tmp/pre-install.log
+%end
+%post --interpreter=/bin/bash
+mkdir -p /var/log/xcat/
+cat /tmp/pre-install.log >>/var/log/xcat/xcat.log
+{
+echo "Running Kickstart Post-installation script..."
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.xcat.ng#
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.rhels8#
+} &>>/var/log/xcat/xcat.log
+%end
diff --git a/xCAT-server/share/xcat/install/rh/compute.tmpl b/xCAT-server/share/xcat/install/rh/compute.tmpl
index 69499018c..5ec90dd22 100644
--- a/xCAT-server/share/xcat/install/rh/compute.tmpl
+++ b/xCAT-server/share/xcat/install/rh/compute.tmpl
@@ -38,7 +38,7 @@ key --skip
 #No RAID
 #/boot really significant for this sort of setup nowadays?
 #part /boot --size 50 --fstype ext3
-part swap --size 1024 
+part swap --size 1024
 part / --size 1 --grow --fstype ext3
 #XCAT_PARTITION_END#
 
@@ -123,7 +123,7 @@ skipx
 #
 # perl -e 'print crypt("blah","Xa") . "\n";'p
 # openssl passwd -apr1 -salt xxxxxxxx password
-# 
+#
 # where "blah" is your root password.
 #
 #rootpw --iscrypted XaLGAVe1C41x2
@@ -131,7 +131,7 @@ skipx
 rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
 
 #
-# NIS setup: auth --enablenis --nisdomain sensenet 
+# NIS setup: auth --enablenis --nisdomain sensenet
 # --nisserver neptune --useshadow --enablemd5
 #
 # OR
diff --git a/xCAT-server/share/xcat/install/rh/compute_ad.rhels6.tmpl b/xCAT-server/share/xcat/install/rh/compute_ad.rhels6.tmpl
index 4b89b4c77..9e0aa4781 100644
--- a/xCAT-server/share/xcat/install/rh/compute_ad.rhels6.tmpl
+++ b/xCAT-server/share/xcat/install/rh/compute_ad.rhels6.tmpl
@@ -34,7 +34,7 @@ key --skip
 #/boot really significant for this sort of setup nowadays?
 #part /boot --size 50 --fstype ext3
 %include /tmp/partitionfile
-#part swap --size 1024 
+#part swap --size 1024
 #part / --size 1 --grow --fstype ext4
 #XCAT_PARTITION_END#
 
@@ -108,7 +108,7 @@ skipx
 #
 # perl -e 'print crypt("blah","Xa") . "\n";'p
 # openssl passwd -apr1 -salt xxxxxxxx password
-# 
+#
 # where "blah" is your root password.
 #
 #rootpw --iscrypted XaLGAVe1C41x2
@@ -116,7 +116,7 @@ skipx
 rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
 
 #
-# NIS setup: auth --enablenis --nisdomain sensenet 
+# NIS setup: auth --enablenis --nisdomain sensenet
 # --nisserver neptune --useshadow --enablemd5
 #
 # OR
diff --git a/xCAT-server/share/xcat/install/rh/cudafull.rhels7.ppc64le.pkglist b/xCAT-server/share/xcat/install/rh/cudafull.rhels7.ppc64le.pkglist
index c7f35565a..4cb86814f 100644
--- a/xCAT-server/share/xcat/install/rh/cudafull.rhels7.ppc64le.pkglist
+++ b/xCAT-server/share/xcat/install/rh/cudafull.rhels7.ppc64le.pkglist
@@ -1,6 +1,6 @@
 #INCLUDE:compute.rhels7.pkglist#
 
-#For Cuda 
+#For Cuda
 kernel-devel
 gcc
 pciutils
diff --git a/xCAT-server/share/xcat/install/rh/hpc.rhels6.tmpl b/xCAT-server/share/xcat/install/rh/hpc.rhels6.tmpl
index 8d2ab086d..1eef56bef 100644
--- a/xCAT-server/share/xcat/install/rh/hpc.rhels6.tmpl
+++ b/xCAT-server/share/xcat/install/rh/hpc.rhels6.tmpl
@@ -34,7 +34,7 @@ key --skip
 #/boot really significant for this sort of setup nowadays?
 #part /boot --size 50 --fstype ext3
 %include /tmp/partitionfile
-#part swap --size 1024 
+#part swap --size 1024
 #part / --size 1 --grow --fstype ext4
 #XCAT_PARTITION_END#
 
@@ -113,7 +113,7 @@ skipx
 #
 # perl -e 'print crypt("blah","Xa") . "\n";'p
 # openssl passwd -apr1 -salt xxxxxxxx password
-# 
+#
 # where "blah" is your root password.
 #
 #rootpw --iscrypted XaLGAVe1C41x2
@@ -121,7 +121,7 @@ skipx
 rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
 
 #
-# NIS setup: auth --enablenis --nisdomain sensenet 
+# NIS setup: auth --enablenis --nisdomain sensenet
 # --nisserver neptune --useshadow --enablemd5
 #
 # OR
diff --git a/xCAT-server/share/xcat/install/rh/iscsi.ppc64.tmpl b/xCAT-server/share/xcat/install/rh/iscsi.ppc64.tmpl
index 314a505a7..1880da620 100644
--- a/xCAT-server/share/xcat/install/rh/iscsi.ppc64.tmpl
+++ b/xCAT-server/share/xcat/install/rh/iscsi.ppc64.tmpl
@@ -124,7 +124,7 @@ skipx
 #
 # perl -e 'print crypt("blah","Xa") . "\n";'p
 # openssl passwd -apr1 -salt xxxxxxxx password
-# 
+#
 # where "blah" is your root password.
 #
 #rootpw --iscrypted XaLGAVe1C41x2
@@ -132,7 +132,7 @@ skipx
 rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
 
 #
-# NIS setup: auth --enablenis --nisdomain sensenet 
+# NIS setup: auth --enablenis --nisdomain sensenet
 # --nisserver neptune --useshadow --enablemd5
 #
 # OR
diff --git a/xCAT-server/share/xcat/install/rh/iscsi.rhels6.tmpl b/xCAT-server/share/xcat/install/rh/iscsi.rhels6.tmpl
index d8da59e03..9497d3c0a 100644
--- a/xCAT-server/share/xcat/install/rh/iscsi.rhels6.tmpl
+++ b/xCAT-server/share/xcat/install/rh/iscsi.rhels6.tmpl
@@ -123,7 +123,7 @@ skipx
 #
 # perl -e 'print crypt("blah","Xa") . "\n";'p
 # openssl passwd -apr1 -salt xxxxxxxx password
-# 
+#
 # where "blah" is your root password.
 #
 #rootpw --iscrypted XaLGAVe1C41x2
@@ -131,7 +131,7 @@ skipx
 rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
 
 #
-# NIS setup: auth --enablenis --nisdomain sensenet 
+# NIS setup: auth --enablenis --nisdomain sensenet
 # --nisserver neptune --useshadow --enablemd5
 #
 # OR
diff --git a/xCAT-server/share/xcat/install/rh/iscsi.tmpl b/xCAT-server/share/xcat/install/rh/iscsi.tmpl
index eca0d3203..0fdae7dcb 100644
--- a/xCAT-server/share/xcat/install/rh/iscsi.tmpl
+++ b/xCAT-server/share/xcat/install/rh/iscsi.tmpl
@@ -123,7 +123,7 @@ skipx
 #
 # perl -e 'print crypt("blah","Xa") . "\n";'p
 # openssl passwd -apr1 -salt xxxxxxxx password
-# 
+#
 # where "blah" is your root password.
 #
 #rootpw --iscrypted XaLGAVe1C41x2
@@ -131,7 +131,7 @@ skipx
 rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
 
 #
-# NIS setup: auth --enablenis --nisdomain sensenet 
+# NIS setup: auth --enablenis --nisdomain sensenet
 # --nisserver neptune --useshadow --enablemd5
 #
 # OR
diff --git a/xCAT-server/share/xcat/install/rh/kvm.rhel6.tmpl b/xCAT-server/share/xcat/install/rh/kvm.rhel6.tmpl
index 8cf74ccdf..702c14d81 100644
--- a/xCAT-server/share/xcat/install/rh/kvm.rhel6.tmpl
+++ b/xCAT-server/share/xcat/install/rh/kvm.rhel6.tmpl
@@ -34,7 +34,7 @@ key --skip
 #No RAID
 #/boot really significant for this sort of setup nowadays?
 #part /boot --size 50 --fstype ext3
-part swap --size 1024 
+part swap --size 1024
 part / --size 1 --grow --fstype ext4
 #XCAT_PARTITION_END#
 
@@ -113,7 +113,7 @@ skipx
 #
 # perl -e 'print crypt("blah","Xa") . "\n";'p
 # openssl passwd -apr1 -salt xxxxxxxx password
-# 
+#
 # where "blah" is your root password.
 #
 #rootpw --iscrypted XaLGAVe1C41x2
@@ -121,7 +121,7 @@ skipx
 rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
 
 #
-# NIS setup: auth --enablenis --nisdomain sensenet 
+# NIS setup: auth --enablenis --nisdomain sensenet
 # --nisserver neptune --useshadow --enablemd5
 #
 # OR
diff --git a/xCAT-server/share/xcat/install/rh/kvm.rhels5.tmpl b/xCAT-server/share/xcat/install/rh/kvm.rhels5.tmpl
index 8438662ea..ca581cdc2 100644
--- a/xCAT-server/share/xcat/install/rh/kvm.rhels5.tmpl
+++ b/xCAT-server/share/xcat/install/rh/kvm.rhels5.tmpl
@@ -13,7 +13,7 @@ network --bootproto dhcp
 #nfs --server #XCATVAR:INSTALL_NFS# --dir #XCATVAR:INSTALL_SRC_DIR#
 url --url http://#TABLE:noderes:$NODE:nfsserver#/install/#TABLE:nodetype:$NODE:os#/#TABLE:nodetype:$NODE:arch#
 
-# For KVM to install properly you need to install other packages from 
+# For KVM to install properly you need to install other packages from
 # another installation repository.  Usually we create a directory:
 # /install/xcat with all of the xCAT rpms in there.  Then after doing
 # mklocalrep your machine that is installing can get these.  An example:
@@ -43,7 +43,7 @@ key --skip
 #No RAID
 #/boot really significant for this sort of setup nowadays?
 #part /boot --size 50 --fstype ext3
-part swap --size 1024 
+part swap --size 1024
 part / --size 1 --grow --fstype ext3
 #XCAT_PARTITION_END#
 
@@ -128,7 +128,7 @@ skipx
 #
 # perl -e 'print crypt("blah","Xa") . "\n";'p
 # openssl passwd -apr1 -salt xxxxxxxx password
-# 
+#
 # where "blah" is your root password.
 #
 #rootpw --iscrypted XaLGAVe1C41x2
@@ -136,7 +136,7 @@ skipx
 rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
 
 #
-# NIS setup: auth --enablenis --nisdomain sensenet 
+# NIS setup: auth --enablenis --nisdomain sensenet
 # --nisserver neptune --useshadow --enablemd5
 #
 # OR
diff --git a/xCAT-server/share/xcat/install/rh/kvm.rhels6.tmpl b/xCAT-server/share/xcat/install/rh/kvm.rhels6.tmpl
index cdf799122..178919930 100644
--- a/xCAT-server/share/xcat/install/rh/kvm.rhels6.tmpl
+++ b/xCAT-server/share/xcat/install/rh/kvm.rhels6.tmpl
@@ -36,7 +36,7 @@ key --skip
 #/boot really significant for this sort of setup nowadays?
 #part /boot --size 50 --fstype ext3
 %include /tmp/partitionfile
-#part swap --size 1024 
+#part swap --size 1024
 #part / --size 1 --grow --fstype ext4
 #XCAT_PARTITION_END#
 
@@ -115,7 +115,7 @@ skipx
 #
 # perl -e 'print crypt("blah","Xa") . "\n";'p
 # openssl passwd -apr1 -salt xxxxxxxx password
-# 
+#
 # where "blah" is your root password.
 #
 #rootpw --iscrypted XaLGAVe1C41x2
@@ -123,7 +123,7 @@ skipx
 rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
 
 #
-# NIS setup: auth --enablenis --nisdomain sensenet 
+# NIS setup: auth --enablenis --nisdomain sensenet
 # --nisserver neptune --useshadow --enablemd5
 #
 # OR
diff --git a/xCAT-server/share/xcat/install/rh/kvm.rhels7.tmpl b/xCAT-server/share/xcat/install/rh/kvm.rhels7.tmpl
index 338cdc5da..9bc3b7250 100644
--- a/xCAT-server/share/xcat/install/rh/kvm.rhels7.tmpl
+++ b/xCAT-server/share/xcat/install/rh/kvm.rhels7.tmpl
@@ -35,7 +35,7 @@ clearpart --all --initlabel
 #/boot really significant for this sort of setup nowadays?
 #part /boot --size 50 --fstype ext3
 %include /tmp/partitionfile
-#part swap --size 1024 
+#part swap --size 1024
 #part / --size 1 --grow --fstype ext4
 #XCAT_PARTITION_END#
 
@@ -114,7 +114,7 @@ skipx
 #
 # perl -e 'print crypt("blah","Xa") . "\n";'p
 # openssl passwd -apr1 -salt xxxxxxxx password
-# 
+#
 # where "blah" is your root password.
 #
 #rootpw --iscrypted XaLGAVe1C41x2
@@ -122,7 +122,7 @@ skipx
 rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
 
 #
-# NIS setup: auth --enablenis --nisdomain sensenet 
+# NIS setup: auth --enablenis --nisdomain sensenet
 # --nisserver neptune --useshadow --enablemd5
 #
 # OR
diff --git a/xCAT-server/share/xcat/install/rh/kvm.tmpl b/xCAT-server/share/xcat/install/rh/kvm.tmpl
index 39d7f2870..f18d88c54 100644
--- a/xCAT-server/share/xcat/install/rh/kvm.tmpl
+++ b/xCAT-server/share/xcat/install/rh/kvm.tmpl
@@ -13,7 +13,7 @@ network --bootproto dhcp
 #nfs --server #XCATVAR:INSTALL_NFS# --dir #XCATVAR:INSTALL_SRC_DIR#
 url --url http://#TABLE:noderes:$NODE:nfsserver#/install/#TABLE:nodetype:$NODE:os#/#TABLE:nodetype:$NODE:arch#
 
-# For KVM to install properly you need to install other packages from 
+# For KVM to install properly you need to install other packages from
 # another installation repository.  Usually we create a directory:
 # /install/xcat with all of the xCAT rpms in there.  Then after doing
 # mklocalrep your machine that is installing can get these.  An example:
@@ -43,7 +43,7 @@ key --skip
 #No RAID
 #/boot really significant for this sort of setup nowadays?
 #part /boot --size 50 --fstype ext3
-part swap --size 1024 
+part swap --size 1024
 part / --size 1 --grow --fstype ext3
 #XCAT_PARTITION_END#
 
@@ -128,7 +128,7 @@ skipx
 #
 # perl -e 'print crypt("blah","Xa") . "\n";'p
 # openssl passwd -apr1 -salt xxxxxxxx password
-# 
+#
 # where "blah" is your root password.
 #
 #rootpw --iscrypted XaLGAVe1C41x2
@@ -136,7 +136,7 @@ skipx
 rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
 
 #
-# NIS setup: auth --enablenis --nisdomain sensenet 
+# NIS setup: auth --enablenis --nisdomain sensenet
 # --nisserver neptune --useshadow --enablemd5
 #
 # OR
diff --git a/xCAT-server/share/xcat/install/rh/service.pkglist b/xCAT-server/share/xcat/install/rh/service.pkglist
index 6260b9485..46b09aa0f 100644
--- a/xCAT-server/share/xcat/install/rh/service.pkglist
+++ b/xCAT-server/share/xcat/install/rh/service.pkglist
@@ -1,5 +1,5 @@
 #Please make sure there is a space between @ and group name
-@ Everything 
+@ Everything
 @ Network Servers
 @ System Tools
 @ X Window System
diff --git a/xCAT-server/share/xcat/install/rh/service.ppc64.pkglist b/xCAT-server/share/xcat/install/rh/service.ppc64.pkglist
index 6260b9485..46b09aa0f 100644
--- a/xCAT-server/share/xcat/install/rh/service.ppc64.pkglist
+++ b/xCAT-server/share/xcat/install/rh/service.ppc64.pkglist
@@ -1,5 +1,5 @@
 #Please make sure there is a space between @ and group name
-@ Everything 
+@ Everything
 @ Network Servers
 @ System Tools
 @ X Window System
diff --git a/xCAT-server/share/xcat/install/rh/service.ppc64.tmpl b/xCAT-server/share/xcat/install/rh/service.ppc64.tmpl
index 6b4e05e2d..19f5bc545 100644
--- a/xCAT-server/share/xcat/install/rh/service.ppc64.tmpl
+++ b/xCAT-server/share/xcat/install/rh/service.ppc64.tmpl
@@ -38,7 +38,7 @@ key --skip
 part None --fstype "PPC PReP Boot" --size 8
 #part /boot --size 50 --fstype ext3
 
-part swap --size 1024 
+part swap --size 1024
 part / --size 1 --grow --fstype ext3
 #XCAT_PARTITION_END#
 
@@ -123,7 +123,7 @@ skipx
 #
 # perl -e 'print crypt("blah","Xa") . "\n";'p
 # openssl passwd -apr1 -salt xxxxxxxx password
-# 
+#
 # where "blah" is your root password.
 #
 #rootpw --iscrypted XaLGAVe1C41x2
@@ -131,7 +131,7 @@ skipx
 rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
 
 #
-# NIS setup: auth --enablenis --nisdomain sensenet 
+# NIS setup: auth --enablenis --nisdomain sensenet
 # --nisserver neptune --useshadow --enablemd5
 #
 # OR
diff --git a/xCAT-server/share/xcat/install/rh/service.raid1.multipath.rhel6.ppc64.tmpl b/xCAT-server/share/xcat/install/rh/service.raid1.multipath.rhel6.ppc64.tmpl
index 13c9c1161..838815d91 100644
--- a/xCAT-server/share/xcat/install/rh/service.raid1.multipath.rhel6.ppc64.tmpl
+++ b/xCAT-server/share/xcat/install/rh/service.raid1.multipath.rhel6.ppc64.tmpl
@@ -37,7 +37,7 @@ key --skip
 #part None --fstype "PPC PReP Boot" --size 8
 #part /boot --size 50 --fstype ext4
 
-#part swap --size 1024 
+#part swap --size 1024
 #part / --size 1 --grow --fstype ext4
 
 #RAID 0 /scr for performance
@@ -112,7 +112,7 @@ skipx
 #
 # perl -e 'print crypt("blah","Xa") . "\n";'p
 # openssl passwd -apr1 -salt xxxxxxxx password
-# 
+#
 # where "blah" is your root password.
 #
 #rootpw --iscrypted XaLGAVe1C41x2
@@ -120,7 +120,7 @@ skipx
 rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
 
 #
-# NIS setup: auth --enablenis --nisdomain sensenet 
+# NIS setup: auth --enablenis --nisdomain sensenet
 # --nisserver neptune --useshadow --enablemd5
 #
 # OR
diff --git a/xCAT-server/share/xcat/install/rh/service.raid1.rhel6.ppc64.tmpl b/xCAT-server/share/xcat/install/rh/service.raid1.rhel6.ppc64.tmpl
index 5e0168cc5..a6ebb6295 100644
--- a/xCAT-server/share/xcat/install/rh/service.raid1.rhel6.ppc64.tmpl
+++ b/xCAT-server/share/xcat/install/rh/service.raid1.rhel6.ppc64.tmpl
@@ -36,7 +36,7 @@ key --skip
 #part None --fstype "PPC PReP Boot" --size 8
 #part /boot --size 50 --fstype ext4
 
-#part swap --size 1024 
+#part swap --size 1024
 #part / --size 1 --grow --fstype ext4
 
 #XCAT_PARTITION_START#
@@ -112,7 +112,7 @@ skipx
 #
 # perl -e 'print crypt("blah","Xa") . "\n";'p
 # openssl passwd -apr1 -salt xxxxxxxx password
-# 
+#
 # where "blah" is your root password.
 #
 #rootpw --iscrypted XaLGAVe1C41x2
@@ -120,7 +120,7 @@ skipx
 rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
 
 #
-# NIS setup: auth --enablenis --nisdomain sensenet 
+# NIS setup: auth --enablenis --nisdomain sensenet
 # --nisserver neptune --useshadow --enablemd5
 #
 # OR
diff --git a/xCAT-server/share/xcat/install/rh/service.rhels6.ppc64.tmpl b/xCAT-server/share/xcat/install/rh/service.rhels6.ppc64.tmpl
index 7fa82fbeb..0e65cd5a1 100644
--- a/xCAT-server/share/xcat/install/rh/service.rhels6.ppc64.tmpl
+++ b/xCAT-server/share/xcat/install/rh/service.rhels6.ppc64.tmpl
@@ -116,7 +116,7 @@ skipx
 #
 # perl -e 'print crypt("blah","Xa") . "\n";'p
 # openssl passwd -apr1 -salt xxxxxxxx password
-# 
+#
 # where "blah" is your root password.
 #
 #rootpw --iscrypted XaLGAVe1C41x2
@@ -124,7 +124,7 @@ skipx
 rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
 
 #
-# NIS setup: auth --enablenis --nisdomain sensenet 
+# NIS setup: auth --enablenis --nisdomain sensenet
 # --nisserver neptune --useshadow --enablemd5
 #
 # OR
diff --git a/xCAT-server/share/xcat/install/rh/service.rhels6.x86_64.tmpl b/xCAT-server/share/xcat/install/rh/service.rhels6.x86_64.tmpl
index 5b8b12d25..6954cac15 100644
--- a/xCAT-server/share/xcat/install/rh/service.rhels6.x86_64.tmpl
+++ b/xCAT-server/share/xcat/install/rh/service.rhels6.x86_64.tmpl
@@ -116,7 +116,7 @@ skipx
 #
 # perl -e 'print crypt("blah","Xa") . "\n";'p
 # openssl passwd -apr1 -salt xxxxxxxx password
-# 
+#
 # where "blah" is your root password.
 #
 #rootpw --iscrypted XaLGAVe1C41x2
@@ -124,7 +124,7 @@ skipx
 rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
 
 #
-# NIS setup: auth --enablenis --nisdomain sensenet 
+# NIS setup: auth --enablenis --nisdomain sensenet
 # --nisserver neptune --useshadow --enablemd5
 #
 # OR
diff --git a/xCAT-server/share/xcat/install/rh/service.tmpl b/xCAT-server/share/xcat/install/rh/service.tmpl
index 89a63d4a8..87757ab8e 100644
--- a/xCAT-server/share/xcat/install/rh/service.tmpl
+++ b/xCAT-server/share/xcat/install/rh/service.tmpl
@@ -36,7 +36,7 @@ key --skip
 #No RAID
 #/boot really significant for this sort of setup nowadays?
 #part /boot --size 50 --fstype ext3
-part swap --size 1024 
+part swap --size 1024
 part / --size 1 --grow --fstype ext3
 #XCAT_PARTITION_END#
 
@@ -121,7 +121,7 @@ skipx
 #
 # perl -e 'print crypt("blah","Xa") . "\n";'p
 # openssl passwd -apr1 -salt xxxxxxxx password
-# 
+#
 # where "blah" is your root password.
 #
 #rootpw --iscrypted XaLGAVe1C41x2
@@ -129,7 +129,7 @@ skipx
 rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
 
 #
-# NIS setup: auth --enablenis --nisdomain sensenet 
+# NIS setup: auth --enablenis --nisdomain sensenet
 # --nisserver neptune --useshadow --enablemd5
 #
 # OR
diff --git a/xCAT-server/share/xcat/install/rh/storage.rhels6.tmpl b/xCAT-server/share/xcat/install/rh/storage.rhels6.tmpl
index e1242fc81..30c0496fc 100644
--- a/xCAT-server/share/xcat/install/rh/storage.rhels6.tmpl
+++ b/xCAT-server/share/xcat/install/rh/storage.rhels6.tmpl
@@ -121,7 +121,7 @@ key --skip
 #
 # perl -e 'print crypt("blah","Xa") . "\n";'p
 # openssl passwd -apr1 -salt xxxxxxxx password
-# 
+#
 # where "blah" is your root password.
 #
 #rootpw --iscrypted XaLGAVe1C41x2
@@ -129,7 +129,7 @@ key --skip
 rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
 
 #
-# NIS setup: auth --enablenis --nisdomain sensenet 
+# NIS setup: auth --enablenis --nisdomain sensenet
 # --nisserver neptune --useshadow --enablemd5
 #
 # OR
diff --git a/xCAT-server/share/xcat/install/rh/storage.tmpl b/xCAT-server/share/xcat/install/rh/storage.tmpl
index f869c19c8..eb16fa341 100644
--- a/xCAT-server/share/xcat/install/rh/storage.tmpl
+++ b/xCAT-server/share/xcat/install/rh/storage.tmpl
@@ -126,7 +126,7 @@ key --skip
 #
 # perl -e 'print crypt("blah","Xa") . "\n";'p
 # openssl passwd -apr1 -salt xxxxxxxx password
-# 
+#
 # where "blah" is your root password.
 #
 #rootpw --iscrypted XaLGAVe1C41x2
@@ -134,7 +134,7 @@ key --skip
 rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
 
 #
-# NIS setup: auth --enablenis --nisdomain sensenet 
+# NIS setup: auth --enablenis --nisdomain sensenet
 # --nisserver neptune --useshadow --enablemd5
 #
 # OR
diff --git a/xCAT-server/share/xcat/install/rh/xen.rhels6.tmpl b/xCAT-server/share/xcat/install/rh/xen.rhels6.tmpl
index cdbf5dd61..e9e3e5daa 100644
--- a/xCAT-server/share/xcat/install/rh/xen.rhels6.tmpl
+++ b/xCAT-server/share/xcat/install/rh/xen.rhels6.tmpl
@@ -35,7 +35,7 @@ clearpart --all --initlabel
 #No RAID
 #/boot really significant for this sort of setup nowadays?
 #part /boot --size 50 --fstype ext3
-part swap --size 1024 
+part swap --size 1024
 part / --size 1 --grow --fstype ext3
 #XCAT_PARTITION_END#
 
@@ -120,7 +120,7 @@ skipx
 #
 # perl -e 'print crypt("blah","Xa") . "\n";'p
 # openssl passwd -apr1 -salt xxxxxxxx password
-# 
+#
 # where "blah" is your root password.
 #
 #rootpw --iscrypted XaLGAVe1C41x2
@@ -128,7 +128,7 @@ skipx
 rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
 
 #
-# NIS setup: auth --enablenis --nisdomain sensenet 
+# NIS setup: auth --enablenis --nisdomain sensenet
 # --nisserver neptune --useshadow --enablemd5
 #
 # OR
diff --git a/xCAT-server/share/xcat/install/rh/xen.tmpl b/xCAT-server/share/xcat/install/rh/xen.tmpl
index 773a35a85..f2042c88f 100644
--- a/xCAT-server/share/xcat/install/rh/xen.tmpl
+++ b/xCAT-server/share/xcat/install/rh/xen.tmpl
@@ -35,7 +35,7 @@ clearpart --all --initlabel
 #No RAID
 #/boot really significant for this sort of setup nowadays?
 #part /boot --size 50 --fstype ext3
-part swap --size 1024 
+part swap --size 1024
 part / --size 1 --grow --fstype ext3
 #XCAT_PARTITION_END#
 
@@ -120,7 +120,7 @@ skipx
 #
 # perl -e 'print crypt("blah","Xa") . "\n";'p
 # openssl passwd -apr1 -salt xxxxxxxx password
-# 
+#
 # where "blah" is your root password.
 #
 #rootpw --iscrypted XaLGAVe1C41x2
@@ -128,7 +128,7 @@ skipx
 rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
 
 #
-# NIS setup: auth --enablenis --nisdomain sensenet 
+# NIS setup: auth --enablenis --nisdomain sensenet
 # --nisserver neptune --useshadow --enablemd5
 #
 # OR
diff --git a/xCAT-server/share/xcat/install/rh/zfcp.rhel5.s390x.pkglist b/xCAT-server/share/xcat/install/rh/zfcp.rhel5.s390x.pkglist
index 13e471b33..80be1e563 100644
--- a/xCAT-server/share/xcat/install/rh/zfcp.rhel5.s390x.pkglist
+++ b/xCAT-server/share/xcat/install/rh/zfcp.rhel5.s390x.pkglist
@@ -4,4 +4,4 @@
 fipscheck
 device-mapper-multipath
 sgpio
-apr
\ No newline at end of file
+apr
diff --git a/xCAT-server/share/xcat/install/rh/zfcp.rhel5.s390x.tmpl b/xCAT-server/share/xcat/install/rh/zfcp.rhel5.s390x.tmpl
index 8d1e29749..491c60752 100644
--- a/xCAT-server/share/xcat/install/rh/zfcp.rhel5.s390x.tmpl
+++ b/xCAT-server/share/xcat/install/rh/zfcp.rhel5.s390x.tmpl
@@ -6,7 +6,7 @@ key --skip
 lang en_US.UTF-8
 network --bootproto=static --ip=replace_ip --netmask=replace_netmask --gateway=replace_gateway --nameserver=replace_nameserver --hostname=replace_hostname
 rootpw replace_rootpw
-firewall --disabled 
+firewall --disabled
 authconfig --enableshadow --enablemd5
 selinux --enforcing
 timezone --utc America/New_York
diff --git a/xCAT-server/share/xcat/install/rh/zfcp.rhels6.s390x.tmpl b/xCAT-server/share/xcat/install/rh/zfcp.rhels6.s390x.tmpl
index 8d1e29749..491c60752 100644
--- a/xCAT-server/share/xcat/install/rh/zfcp.rhels6.s390x.tmpl
+++ b/xCAT-server/share/xcat/install/rh/zfcp.rhels6.s390x.tmpl
@@ -6,7 +6,7 @@ key --skip
 lang en_US.UTF-8
 network --bootproto=static --ip=replace_ip --netmask=replace_netmask --gateway=replace_gateway --nameserver=replace_nameserver --hostname=replace_hostname
 rootpw replace_rootpw
-firewall --disabled 
+firewall --disabled
 authconfig --enableshadow --enablemd5
 selinux --enforcing
 timezone --utc America/New_York
diff --git a/xCAT-server/share/xcat/install/scripts/chroot.sles b/xCAT-server/share/xcat/install/scripts/chroot.sles
index b8f4ce36a..3fd97323b 100644
--- a/xCAT-server/share/xcat/install/scripts/chroot.sles
+++ b/xCAT-server/share/xcat/install/scripts/chroot.sles
@@ -32,7 +32,7 @@ XCATDHOST="#XCATVAR:XCATMASTER#"
 (cat >/tmp/updateflag << 'EOF'
 #INCLUDE:#TABLE:site:key=installdir:value#/postscripts/updateflag.awk#
 EOF
-) >/tmp/updateflag 
+) >/tmp/updateflag
 
 chmod 755 /tmp/updateflag
 
diff --git a/xCAT-server/share/xcat/install/scripts/getinstdisk b/xCAT-server/share/xcat/install/scripts/getinstdisk
index 2e3ab1061..a7e630237 100644
--- a/xCAT-server/share/xcat/install/scripts/getinstdisk
+++ b/xCAT-server/share/xcat/install/scripts/getinstdisk
@@ -4,14 +4,14 @@
 #
 # Get proper disk to install OS
 #
-# 1. Check all partitions list in /proc/partitions, whether 
+# 1. Check all partitions list in /proc/partitions, whether
 #    there is disk had OS installed. If there is, add it to
 #    the disk array.
-# 2. If there is disk had OS installed, check disks list 
-#    generated in Step 1. Else, check all disks get from 
-#    /proc/partitions file. Sort them by WWN/PATH and driver 
+# 2. If there is disk had OS installed, check disks list
+#    generated in Step 1. Else, check all disks get from
+#    /proc/partitions file. Sort them by WWN/PATH and driver
 #    type, select the first one.
-# 3. Select the default one: /dev/sda.   
+# 3. Select the default one: /dev/sda.
 #
 # Output: /tmp/xcat.install_disk
 #
@@ -40,7 +40,7 @@ if [ -z "$install_disk" ]; then
         entries=$(cat /proc/partitions | sed 's/  */ /g' | cut -d " " -f5 | grep -v "name" | grep -E '^[s|h|v]d|nvme')
     else
         entries=$(awk -F ' '  '{print $4}' /proc/partitions | grep -v "name" | grep -E '^[s|h|v]d|nvme')
-    fi    
+    fi
 
     # Classify entries by DEVTYPE
     for entry in $entries; do
@@ -54,8 +54,8 @@ if [ -z "$install_disk" ]; then
             dev_type=$(udevadm info --query=property --name=/dev/$entry | grep -i "DEVTYPE" | cut -d "=" -f2 | $utolcmd)
         else
             dev_type=$(udevadm info --query=property --name=/dev/$entry | grep -i "DEVTYPE" | awk -F = '{print $2}' | $utolcmd)
-        fi        
- 
+        fi
+
         if [ "$dev_type" == "disk" ]; then
             disks=$disks"$entry "
         elif [ "$dev_type" == "partition" ]; then
@@ -98,7 +98,7 @@ if [ -z "$install_disk" ]; then
         if [ $rc -eq 0 ]; then
             echo "[get_install_disk]    Partition $partition mount success."
 
-            ker_dir=$mount_dir            
+            ker_dir=$mount_dir
             if [ -d "$mount_dir/boot" ]; then
                 ker_dir="$mount_dir/boot"
             fi
@@ -113,7 +113,7 @@ if [ -z "$install_disk" ]; then
                 echo "[get_install_disk]    The partition $partition has kernel file."
                 break
             done
-             
+
             umount -l $mount_dir || echo "[get_install_disk]    $partition umount failed."
         else
             echo "[get_install_disk]    Partition $partition mount failed or the partition is swap."
@@ -122,18 +122,18 @@ if [ -z "$install_disk" ]; then
 
     # If disk_array is not empty, make disks equal disk_array for next step to sort
     if [ "$disk_array" ]; then
-        disks=$disk_array    
+        disks=$disk_array
         echo "[get_install_disk]The disks which have kernel:"
         echo "[get_install_disk]    $disks"
         echo ""
     fi
 
     rmdir $mount_dir;
-    
+
     for file in $tmpfile*; do
         rm $file;
     done
-    
+
     has_wwn=0
     has_path=0
     file_pre=""
@@ -176,7 +176,7 @@ if [ -z "$install_disk" ]; then
             has_path=1
             file_pre="path"
             disk_data=$disk_path
-        elif [ $has_path -eq 1 ]; then        
+        elif [ $has_path -eq 1 ]; then
             echo "[get_install_disk]    The disk $disk has no wwn or path info."
             echo "[get_install_disk]    There is other disk has path info, so don't record this disk."
             continue;
@@ -217,7 +217,7 @@ if [ -z "$install_disk" ]; then
         install_disk=/dev/$(cat $install_file | grep -v "^$" | sort -k 2 -b | cut -d " " -f1 | head -n 1)
         echo "[get_install_disk]The install_disk is $install_disk by sorting $file_pre and DRIVER."
     fi
-    
+
     for file in $tmpfile*; do
         rm $file;
     done
diff --git a/xCAT-server/share/xcat/install/scripts/post.debian b/xCAT-server/share/xcat/install/scripts/post.debian
index 42ae2388e..83a84e413 100644
--- a/xCAT-server/share/xcat/install/scripts/post.debian
+++ b/xCAT-server/share/xcat/install/scripts/post.debian
@@ -76,7 +76,7 @@ do
             MYCONT=`grep MASTER /xcatpost/mypostscript`
          done
 
-            
+
          chmod 700 /xcatpost/mypostscript
 			GOTIT=1
 			break
@@ -127,8 +127,8 @@ run_ps () {
  if [ -z \"\$scriptype\" ]; then
   scriptype=\"postscript\"
  fi
- 
- if [ -f \$1 ]; then 
+
+ if [ -f \$1 ]; then
   echo "\"\`date\` Running \$scriptype: \$1\"" | tee -a \$logfile
   #./\$@ 2>&1 1> /tmp/tmp4xcatlog
   #cat /tmp/tmp4xcatlog | tee -a \$logfile
@@ -142,7 +142,7 @@ run_ps () {
 " > /xcatpost/mypostscript
 echo "$TMP" >> /xcatpost/mypostscript
 TMP=`sed "/postbootscripts-start-here/,/postbootscripts-end-here/ s/\(.*\)/run_ps postbootscript \1/;s/run_ps postbootscript\s*#/#/;s/run_ps postbootscript\s*$//" /xcatpost/mypostscript`
-echo "$TMP" > /xcatpost/mypostscript 
+echo "$TMP" > /xcatpost/mypostscript
 
 
 
@@ -150,7 +150,7 @@ TMP=`sed "/postscripts-start-here/,/postscripts-end-here/ d" /xcatpost/mypostscr
 echo "$TMP" > /xcatpost/mypostscript.post
 chmod 755 /xcatpost/mypostscript.post
 
-#create the post init 
+#create the post init
 cat >/etc/init.d/xcatpostinit1 << 'EOF'
 #INCLUDE:#TABLE:site:key=installdir:value#/postscripts/xcatpostinit1#
 EOF
@@ -171,7 +171,7 @@ chmod 755 /opt/xcat/xcatinstallpost
 
 chkconfig --add xcatpostinit1
 
-#create the dskls post 
+#create the dskls post
 cat >/opt/xcat/xcatdsklspost << 'EOF'
 #INCLUDE:#TABLE:site:key=installdir:value#/postscripts/xcatdsklspost#
 EOF
diff --git a/xCAT-server/share/xcat/install/scripts/post.rh.common b/xCAT-server/share/xcat/install/scripts/post.rh.common
index d9cd19a5a..f5b5092c5 100644
--- a/xCAT-server/share/xcat/install/scripts/post.rh.common
+++ b/xCAT-server/share/xcat/install/scripts/post.rh.common
@@ -21,7 +21,7 @@ then
             #such as BOOTIF=01-40-f2-e9-68-de-90
             if [ "${#MACADDR}" == "20" ]; then
                MACADDR=${MACADDR:3:21}
-            fi 
+            fi
             #export PRINIC=`ifconfig -a|grep -i "hwaddr ${karg#*=01:}"|awk '{print $1}'`
             export PRINIC=`ip -o link|grep -i "$MACADDR"|awk  '{print $2}'|sed s/://`
         fi
diff --git a/xCAT-server/share/xcat/install/scripts/post.rhel5.s390x b/xCAT-server/share/xcat/install/scripts/post.rhel5.s390x
index 9d8d09b6b..75fac1d46 100644
--- a/xCAT-server/share/xcat/install/scripts/post.rhel5.s390x
+++ b/xCAT-server/share/xcat/install/scripts/post.rhel5.s390x
@@ -29,19 +29,19 @@ do
             if [ ! -x /usr/bin/openssl ]; then
                 exit 1
             fi
-            
+
             USEOPENSSLFORXCAT=1
             export USEOPENSSLFORXCAT
-            
+
             # Get xcat server
             XCATSERVER=$i:3001
             export XCATSERVER
-         
+
             # Move postscripts into /xcatpost
             mv $i/postscripts /xcatpost
             # Remove postscritps
             rm -rf $i
-            
+
             # Make postscripts executable
             chmod +x /xcatpost/*
 
@@ -60,7 +60,7 @@ do
                 # Sleep a couple of seconds before trying again
                 let SLI=$RANDOM%10+10
                 sleep $SLI
-            
+
                 # Get postscript to run on this node from xcat server
                 /xcatpost/getpostscript.awk |egrep '<data>'|sed -e 's/<[^>]*>//g'|egrep -v '^ *$'|sed -e 's/^ *//' > /xcatpost/mypostscript
                 MYCONT=`grep MASTER /xcatpost/mypostscript`
@@ -72,7 +72,7 @@ do
             break
         fi
     done
-    
+
     # If postscripts for this node are found
     if [ "$GOTIT" = "1" ]; then
         # Save the master/service node to /opt/xcat/xcatinfo file
@@ -81,7 +81,7 @@ do
             touch /opt/xcat/xcatinfo
         fi
         echo "XCATSERVER=$i" > /opt/xcat/xcatinfo
-        echo "REBOOT=TRUE" >> /opt/xcat/xcatinfo   
+        echo "REBOOT=TRUE" >> /opt/xcat/xcatinfo
         break
     fi
     RAND=$(perl -e 'print int(rand(5)). "\n"')
@@ -99,8 +99,8 @@ run_ps () {
     logdir=\"/var/log/xcat\"
     mkdir -p \$logdir
     logfile=\"/var/log/xcat/xcat.log\"
- 
-    if [ -f \$1 ]; then 
+
+    if [ -f \$1 ]; then
         echo \"Running postscript: \$@\" | tee -a \$logfile
         ./\$@ 2>&1 | tee -a $logfile
     else
@@ -112,7 +112,7 @@ run_ps () {
 " > /xcatpost/mypostscript
 echo "$TMP" >> /xcatpost/mypostscript
 TMP=`sed "/postbootscripts-start-here/,/postbootscripts-end-here/ s/\(.*\)/run_ps \1/;s/run_ps\s*#/#/;s/run_ps\s*$//" /xcatpost/mypostscript`
-echo "$TMP" > /xcatpost/mypostscript 
+echo "$TMP" > /xcatpost/mypostscript
 
 
 # Save post boot scripts to /xcatpost/mypostscript.post
diff --git a/xCAT-server/share/xcat/install/scripts/post.rhel6.s390x b/xCAT-server/share/xcat/install/scripts/post.rhel6.s390x
index 0094eb924..e1ed1f169 100644
--- a/xCAT-server/share/xcat/install/scripts/post.rhel6.s390x
+++ b/xCAT-server/share/xcat/install/scripts/post.rhel6.s390x
@@ -29,19 +29,19 @@ do
             if [ ! -x /usr/bin/openssl ]; then
                 exit 1
             fi
-            
+
             USEOPENSSLFORXCAT=1
             export USEOPENSSLFORXCAT
-            
+
             # Get xcat server
             XCATSERVER=$i:3001
             export XCATSERVER
-         
+
             # Move postscripts into /xcatpost
             mv $i/postscripts /xcatpost
             # Remove postscritps
             rm -rf $i
-            
+
             # Make postscripts executable
             chmod +x /xcatpost/*
 
@@ -60,7 +60,7 @@ do
                 # Sleep a couple of seconds before trying again
                 let SLI=$RANDOM%10+10
                 sleep $SLI
-            
+
                 # Get postscript to run on this node from xcat server
                 /xcatpost/getpostscript.awk |egrep '<data>'|sed -e 's/<[^>]*>//g'|egrep -v '^ *$'|sed -e 's/^ *//' > /xcatpost/mypostscript
                 MYCONT=`grep MASTER /xcatpost/mypostscript`
@@ -72,7 +72,7 @@ do
             break
         fi
     done
-    
+
     # If postscripts for this node are found
     if [ "$GOTIT" = "1" ]; then
         # Save the master/service node to /opt/xcat/xcatinfo file
@@ -98,8 +98,8 @@ run_ps () {
     logdir=\"/var/log/xcat\"
     mkdir -p \$logdir
     logfile=\"/var/log/xcat/xcat.log\"
- 
-    if [ -f \$1 ]; then 
+
+    if [ -f \$1 ]; then
         echo \"Running postscript: \$@\" | tee -a \$logfile
         ./\$@ 2>&1 | tee -a $logfile
     else
@@ -111,7 +111,7 @@ run_ps () {
 " > /xcatpost/mypostscript
 echo "$TMP" >> /xcatpost/mypostscript
 TMP=`sed "/postbootscripts-start-here/,/postbootscripts-end-here/ s/\(.*\)/run_ps \1/;s/run_ps\s*#/#/;s/run_ps\s*$//" /xcatpost/mypostscript`
-echo "$TMP" > /xcatpost/mypostscript 
+echo "$TMP" > /xcatpost/mypostscript
 
 
 # Save post boot scripts to /xcatpost/mypostscript.post
diff --git a/xCAT-server/share/xcat/install/scripts/post.rhels7 b/xCAT-server/share/xcat/install/scripts/post.rhels7
index f5c9de34e..f4960e2be 100644
--- a/xCAT-server/share/xcat/install/scripts/post.rhels7
+++ b/xCAT-server/share/xcat/install/scripts/post.rhels7
@@ -7,21 +7,21 @@
 #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/scriptlib#
 
 for i in $(find /etc/sysconfig/network-scripts/ifcfg-*|egrep -v ifcfg-lo )
-do 
+do
   nicname=$(echo $i|awk -F 'ifcfg-' '{print $2}')
   if ethtool $nicname|grep -E -i "Link detected.*yes" >/dev/null 2>&1; then
      if [ "$XCATDEBUGMODE" = "1" ] || [ "$XCATDEBUGMODE" = "2" ]; then
         msgutil_r "$MASTER_IP" "info" "set NIC $nicname to be activated on system boot" "/var/log/xcat/xcat.log"
      fi
-     sed -i 's/ONBOOT=no/ONBOOT=yes/' $i 
+     sed -i 's/ONBOOT=no/ONBOOT=yes/' $i
   fi
 
-  #remove the entry 'HWADDR' from ifcfg-ethx, this is used to skip the 
+  #remove the entry 'HWADDR' from ifcfg-ethx, this is used to skip the
   #nic name change during the install and first_reboot
   sed -i '/HWADDR/d' $i
 done
 
-# NetworkManager will conflict with the configuring xcat do later in postboot script, so disable it in postscript 
+# NetworkManager will conflict with the configuring xcat do later in postboot script, so disable it in postscript
 
 # There are 2 other service related to NetworkManager: NetworkManager-dispatcher and NetworkManager-wait-online
 # Both of them are triggered by NetworkManager, so just disable NetworkManager here
diff --git a/xCAT-server/share/xcat/install/scripts/post.rhels8 b/xCAT-server/share/xcat/install/scripts/post.rhels8
new file mode 100644
index 000000000..d875efbaa
--- /dev/null
+++ b/xCAT-server/share/xcat/install/scripts/post.rhels8
@@ -0,0 +1,20 @@
+# The nic name might change between the installation and 1st boot
+# Active all the nics with network link during system boot
+
+[ "$XCATDEBUGMODE" ] || export XCATDEBUGMODE="#TABLEBLANKOKAY:site:key=xcatdebugmode:value#"
+[ "$MASTER_IP" ] || export MASTER_IP="#ENV:MASTER_IP#"
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/scriptlib#
+
+for i in $(ls /etc/sysconfig/network-scripts/ifcfg-* | grep -v ifcfg-lo)
+do
+    nicname="${i##*-}"
+    if ethtool $nicname | grep -E -i -q "Link detected.*yes" >/dev/null 2>&1
+    then
+        case "$XCATDEBUGMODE" in
+	"1"|"2")
+            msgutil_r "$MASTER_IP" "info" "set NIC $nicname to be activated on system boot" "/var/log/xcat/xcat.log"
+            ;;
+	esac
+        sed -i 's/ONBOOT=no/ONBOOT=yes/' "$i"
+    fi
+done
diff --git a/xCAT-server/share/xcat/install/scripts/post.sles10.s390x b/xCAT-server/share/xcat/install/scripts/post.sles10.s390x
index 605ad9a7e..b27c07698 100644
--- a/xCAT-server/share/xcat/install/scripts/post.sles10.s390x
+++ b/xCAT-server/share/xcat/install/scripts/post.sles10.s390x
@@ -26,7 +26,7 @@ fi
 for t in $(seq 1 20)
 do
     GOTIT=0
-    
+
     # Loop through the master/service nodes
     for i in $MASTER_IPS
     do
@@ -34,14 +34,14 @@ do
         wget -l inf -N -r --waitretry=10 --random-wait --retry-connrefused  -e robots=off -nH --cut-dirs=2 --reject "index.html*" --no-parent -t 0 -T 60 http://$i$INSTALLDIR/postscripts/ -P /xcatpost
         if [ "$?" = "0" ]; then
             # Exit if openssl is not executable
-            if [ ! -x /usr/bin/openssl ]; then 
+            if [ ! -x /usr/bin/openssl ]; then
                         exit 1
             fi
-        
+
             # Get xcat server
             XCATSERVER=$i:3001
             export XCATSERVER
-            USEOPENSSLFORXCAT=1 
+            USEOPENSSLFORXCAT=1
             export USEOPENSSLFORXCAT
 
             # Move postscritps into /xcatpost
@@ -62,7 +62,7 @@ do
                     break
                 fi
 
-                # Sleep a couple of seconds before trying again            
+                # Sleep a couple of seconds before trying again
                 let SLI=$RANDOM%10+10
                 sleep $SLI
 
@@ -70,14 +70,14 @@ do
                 /xcatpost/getpostscript.awk |egrep '<data>'|sed -e 's/<[^>]*>//g'|egrep -v '^ *$'|sed -e 's/^ *//' > /tmp/mypostscript
                 MYCONT=`grep MASTER /tmp/mypostscript`
             done
-         
+
             # Make executable
             chmod 700 /tmp/mypostscript
             GOTIT=1
             break
         fi
     done
-    
+
     # If postscripts for this node are found
     if [ "$GOTIT" = "1" ]; then
         # Save the master/service node to /opt/xcat/xcatinfo file
@@ -107,8 +107,8 @@ run_ps () {
  logdir=\"/var/log/xcat\"
  mkdir -p \$logdir
  logfile=\"/var/log/xcat/xcat.log\"
- 
- if [ -f \$1 ]; then 
+
+ if [ -f \$1 ]; then
   echo \"Running postscript: \$@\" | tee -a \$logfile
   ./\$@ 2>&1 1> /tmp/tmp4xcatlog
   cat /tmp/tmp4xcatlog | tee -a \$logfile
@@ -122,7 +122,7 @@ run_ps () {
 echo "cd /xcatpost" >> /tmp/mypostscript
 echo "$TMP" >> /tmp/mypostscript
 TMP=`sed "/postbootscripts-start-here/,/postbootscripts-end-here/ s/\(.*\)/run_ps \1/;s/run_ps\s*#/#/;s/run_ps\s*$//" /tmp/mypostscript`
-echo "$TMP" > /tmp/mypostscript 
+echo "$TMP" > /tmp/mypostscript
 
 
 # Save post boot scripts to /tmp/mypostscript.post
@@ -141,7 +141,7 @@ ln -s /etc/init.d/xcatpostinit1 /etc/init.d/rc3.d/S84xcatpostinit1
 ln -s /etc/init.d/xcatpostinit1 /etc/init.d/rc4.d/S84xcatpostinit1
 ln -s /etc/init.d/xcatpostinit1 /etc/init.d/rc5.d/S84xcatpostinit1
 
-# Create post install 
+# Create post install
 mkdir -p /opt/xcat
 cat >/opt/xcat/xcatinstallpost << 'EOF'
 # Copy the contents of /install/postscripts/xcatinstallpost here
@@ -160,7 +160,7 @@ chmod 755 /opt/xcat/xcatinstallpost
 
 chkconfig --add xcatpostinit1
 
-#create the dskls post 
+#create the dskls post
 cat >/opt/xcat/xcatdsklspost << 'EOF'
 #INCLUDE:#TABLE:site:key=installdir:value#/postscripts/xcatdsklspost#
 EOF
diff --git a/xCAT-server/share/xcat/install/scripts/post.sles11.s390x b/xCAT-server/share/xcat/install/scripts/post.sles11.s390x
index f5cf474ed..f4175a410 100644
--- a/xCAT-server/share/xcat/install/scripts/post.sles11.s390x
+++ b/xCAT-server/share/xcat/install/scripts/post.sles11.s390x
@@ -11,7 +11,7 @@ cat /etc/sysconfig/network/ifcfg-replace_device | grep -v "LLADDR" | grep -v "UN
 echo "LLADDR='replace_lladdr'" >> /tmp/ifcfg-replace_device
 echo "UNIQUE=''" >> /tmp/ifcfg-replace_device
 echo "NAME='OSA Express Network card (replace_nic_addr)'" >> /tmp/ifcfg-replace_device
-cat /tmp/ifcfg-replace_device > /etc/sysconfig/network/ifcfg-replace_device                    
+cat /tmp/ifcfg-replace_device > /etc/sysconfig/network/ifcfg-replace_device
 
 # Get node hostname
 HOSTNAME=$(hostname -s)
@@ -27,7 +27,7 @@ fi
 for t in $(seq 1 20)
 do
     GOTIT=0
-    
+
     # Loop through the master/service nodes
     for i in $MASTER_IPS
     do
@@ -35,14 +35,14 @@ do
         wget -l inf -N -r --waitretry=10 --random-wait --retry-connrefused  -e robots=off -nH --cut-dirs=2 --reject "index.html*" --no-parent -t 0 -T 60 http://$i$INSTALLDIR/postscripts/ -P /xcatpost
         if [ "$?" = "0" ]; then
             # Exit if openssl is not executable
-            if [ ! -x /usr/bin/openssl ]; then 
+            if [ ! -x /usr/bin/openssl ]; then
                         exit 1
             fi
-        
+
             # Get xcat server
             XCATSERVER=$i:3001
             export XCATSERVER
-            USEOPENSSLFORXCAT=1 
+            USEOPENSSLFORXCAT=1
             export USEOPENSSLFORXCAT
 
             # Move postscritps into /xcatpost
@@ -63,7 +63,7 @@ do
                     break
                 fi
 
-                # Sleep a couple of seconds before trying again            
+                # Sleep a couple of seconds before trying again
                 let SLI=$RANDOM%10+10
                 sleep $SLI
 
@@ -71,14 +71,14 @@ do
                 /xcatpost/getpostscript.awk |egrep '<data>'|sed -e 's/<[^>]*>//g'|egrep -v '^ *$'|sed -e 's/^ *//' > /tmp/mypostscript
                 MYCONT=`grep MASTER /tmp/mypostscript`
             done
-         
+
             # Make executable
             chmod 700 /tmp/mypostscript
             GOTIT=1
             break
         fi
     done
-    
+
     # If postscripts for this node are found
     if [ "$GOTIT" = "1" ]; then
         # Save the master/service node to /opt/xcat/xcatinfo file
@@ -108,8 +108,8 @@ run_ps () {
  logdir=\"/var/log/xcat\"
  mkdir -p \$logdir
  logfile=\"/var/log/xcat/xcat.log\"
- 
- if [ -f \$1 ]; then 
+
+ if [ -f \$1 ]; then
   echo \"Running postscript: \$@\" | tee -a \$logfile
   ./\$@ 2>&1 1> /tmp/tmp4xcatlog
   cat /tmp/tmp4xcatlog | tee -a \$logfile
@@ -123,7 +123,7 @@ run_ps () {
 echo "cd /xcatpost" >> /tmp/mypostscript
 echo "$TMP" >> /tmp/mypostscript
 TMP=`sed "/postbootscripts-start-here/,/postbootscripts-end-here/ s/\(.*\)/run_ps \1/;s/run_ps\s*#/#/;s/run_ps\s*$//" /tmp/mypostscript`
-echo "$TMP" > /tmp/mypostscript 
+echo "$TMP" > /tmp/mypostscript
 
 
 # Save post boot scripts to /tmp/mypostscript.post
@@ -142,7 +142,7 @@ ln -s /etc/init.d/xcatpostinit1 /etc/init.d/rc3.d/S84xcatpostinit1
 ln -s /etc/init.d/xcatpostinit1 /etc/init.d/rc4.d/S84xcatpostinit1
 ln -s /etc/init.d/xcatpostinit1 /etc/init.d/rc5.d/S84xcatpostinit1
 
-# Create post install 
+# Create post install
 mkdir -p /opt/xcat
 cat >/opt/xcat/xcatinstallpost << 'EOF'
 # Copy the contents of /install/postscripts/xcatinstallpost here
@@ -161,7 +161,7 @@ chmod 755 /opt/xcat/xcatinstallpost
 
 chkconfig --add xcatpostinit1
 
-#create the dskls post 
+#create the dskls post
 cat >/opt/xcat/xcatdsklspost << 'EOF'
 #INCLUDE:#TABLE:site:key=installdir:value#/postscripts/xcatdsklspost#
 EOF
diff --git a/xCAT-server/share/xcat/install/scripts/post.ubuntu.common b/xCAT-server/share/xcat/install/scripts/post.ubuntu.common
index cd592757e..77db7d6e4 100755
--- a/xCAT-server/share/xcat/install/scripts/post.ubuntu.common
+++ b/xCAT-server/share/xcat/install/scripts/post.ubuntu.common
@@ -12,7 +12,7 @@ echo "post scripts" >/root/post.log
 export PRINIC="#TABLEBLANKOKAY:noderes:THISNODE:primarynic#"
 if [ "$PRINIC" == "mac" ] || [ -z "$PRINIC" ]
 then
-    export PRINIC='#GETPRINICMAC:THISNODE#'    
+    export PRINIC='#GETPRINICMAC:THISNODE#'
 fi
 if [ -n "$PRINIC" ] && [[ "$(echo "$PRINIC" | grep -sqE ^[A-Fa-f0-9]+:[A-Fa-f0-9]+:[A-Fa-f0-9]+:[A-Fa-f0-9]+:[A-Fa-f0-9]+:[A-Fa-f0-9]+$ ;echo $?)" == "0" ]]
 then
diff --git a/xCAT-server/share/xcat/install/scripts/post.xcat b/xCAT-server/share/xcat/install/scripts/post.xcat
index 202c01a85..bc2ff79e6 100755
--- a/xCAT-server/share/xcat/install/scripts/post.xcat
+++ b/xCAT-server/share/xcat/install/scripts/post.xcat
@@ -270,14 +270,23 @@ if [ $? -eq 0 ]; then
 fi
 
 if [ $hassystemd -eq 1 ] ; then
-    cat >/etc/systemd/system/xcatpostinit1.service <<'EOF'
+    if [[ $OSVER == sles12* ]]; then
+        cat >/etc/systemd/system/xcatpostinit1.service <<'EOF'
+#INCLUDE:/install/postscripts/xcatpostinit1.service.yast2#
+EOF
+        cat >/opt/xcat/xcatpostinit1.service.sles <<'EOF'
 #INCLUDE:/install/postscripts/xcatpostinit1.service#
 EOF
+    else
+        cat >/etc/systemd/system/xcatpostinit1.service <<'EOF'
+#INCLUDE:/install/postscripts/xcatpostinit1.service#
+EOF
+    fi
     if [ "$XCATDEBUGMODE" = "1" ] || [ "$XCATDEBUGMODE" = "2" ]; then
         msgutil_r "$MASTER_IP" "debug" "/etc/systemd/system/xcatpostinit1.service generated" "/var/log/xcat/xcat.log" "$log_label"
     fi
 
-    ln -s /etc/systemd/system/xcatpostinit1.service /etc/systemd/system/multi-user.target.wants/xcatpostinit1.service 
+    ln -s /etc/systemd/system/xcatpostinit1.service /etc/systemd/system/multi-user.target.wants/xcatpostinit1.service
 
     if [ "$XCATDEBUGMODE" = "1" ] || [ "$XCATDEBUGMODE" = "2" ]; then
         msgutil_r "$MASTER_IP" "debug" "xcatpostinit1.service enabled" "/var/log/xcat/xcat.log" "$log_label"
@@ -299,7 +308,7 @@ EOF
             msgutil_r "$MASTER_IP" "debug" "/etc/init.d/xcatpostinit1 generated" "/var/log/xcat/xcat.log" "$log_label"
         fi
     fi
-    
+
     if [[ $OSVER == ubuntu* ]]; then
         ln -s /etc/init.d/xcatpostinit1 /etc/rc2.d/S84xcatpostinit1
     else
@@ -307,7 +316,7 @@ EOF
         ln -s /etc/init.d/xcatpostinit1 /etc/rc.d/rc4.d/S84xcatpostinit1
         ln -s /etc/init.d/xcatpostinit1 /etc/rc.d/rc5.d/S84xcatpostinit1
     fi
-    
+
     if [[ $OSVER == ubuntu* ]]; then
         update-rc.d xcatpostinit1 defaults
     else
@@ -365,7 +374,7 @@ else
 fi
 
 
-#create the dskls post 
+#create the dskls post
 cat >/opt/xcat/xcatdsklspost << 'EOF'
 #INCLUDE:#TABLE:site:key=installdir:value#/postscripts/xcatdsklspost#
 EOF
@@ -422,16 +431,16 @@ if [[ $OSVER == ubuntu* ]]; then
     elif [[ -r /boot/grub/grub.cfg ]] ; then
         update-grub
     fi
-    
+
     #print the kernel messages and service start messages with systemd on the console during system bootup
     [ -f /etc/default/grub ] && sed -i -e '/GRUB_CMDLINE_LINUX_DEFAULT=/s/quiet//;s/splash//' -e '/#GRUB_TERMINAL=/s/#//' -e 's/#GRUB_GFXMODE=.*/GRUB_GFXMODE=text/' /etc/default/grub && update-grub
 
     if echo "$ARCH" | grep -i 'x86_64'; then
         #grab the install-time console configuration from /proc/cmdline inside os installer
         CONSOLECFG=$(awk 'BEGIN{RS="[ \n]" ;ORS=" "} $0 ~ /^console=/{print $0}' /proc/cmdline)
-        #if the console configuration is not applied to the grub configuration,apply it 
+        #if the console configuration is not applied to the grub configuration,apply it
         cat /boot/grub/grub.cfg |grep "$CONSOLECFG" >/dev/null 2>&1 || ([ -f /etc/default/grub ] && sed -i -e "/GRUB_CMDLINE_LINUX_DEFAULT=/s/=\"/=\" $CONSOLECFG /" /etc/default/grub && update-grub)
-    fi 
+    fi
     if echo "$ARCH" | grep -i 'ppc64'; then
         if [ -z "$CONSOLEPORT" ] ; then
             export CONSOLEPORT=0
@@ -446,8 +455,8 @@ if [[ $OSVER == ubuntu* ]]; then
 
 cat >/etc/init/$CONSOLE\.conf << 'EOF'
 start on stopped rc RUNLEVEL=[2345] and (
-         not-container or 
-         container CONTAINER=lxc or 
+         not-container or
+         container CONTAINER=lxc or
          container CONTAINER=lxc-libvirt)
 
 stop on runlevel [!2345]
@@ -485,11 +494,11 @@ updateflag.awk $MASTER 3002
 
 cd /
 
-# fix the issue#929@github, the "service network restart" in <sles post scripts>  
+# fix the issue#929@github, the "service network restart" in <sles post scripts>
 # makes the 'network' service in start status, then it causes the
 # services YaST2-Second-Stage.service and xcatpostinit1 services to be run in parallel.
 # But the YaST2-Second-Stage.service calls the Yast2 which conflics with the zypper
-# which is called in xcatpostinit1->otherpkgs. 
+# which is called in xcatpostinit1->otherpkgs.
 # The correct services start order is 'YaST2-Second-Stage.service'->'network'->'xcatpostinit1' in serial.
 # To skip the conflict, the network service should be stoped in the yast first stage. Then base on the service
 # dependency, the service start order will be 'YaST2-Second-Stage.service'->'network'->'xcatpostinit1' in serial.
diff --git a/xCAT-server/share/xcat/install/scripts/post.xcat.ng b/xCAT-server/share/xcat/install/scripts/post.xcat.ng
new file mode 100644
index 000000000..83deac2fc
--- /dev/null
+++ b/xCAT-server/share/xcat/install/scripts/post.xcat.ng
@@ -0,0 +1,438 @@
+#
+# Run xCAT post install
+#
+export MASTER_IP="#ENV:MASTER_IP#"
+export MASTER="#XCATVAR:XCATMASTER#"
+export NODESTATUS="#XCATVAR:NODESTATUS#"
+export XCATIPORT="#TABLE:site:key=xcatiport:value#"
+export INSTALLDIR="#TABLE:site:key=installdir:value#"
+export TFTPDIR="#TABLE:site:key=tftpdir:value#"
+export XCATDEBUGMODE="#TABLEBLANKOKAY:site:key=xcatdebugmode:value#"
+
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/scriptlib#
+
+umask 0022
+
+case "$XCATDEBUGMODE" in
+"1"|"2")
+    set -x
+    ;;
+esac
+
+if [ -z "$XCATIPORT" ]; then
+    XCATIPORT="3002"
+fi
+if [ -z "$INSTALLDIR" ]; then
+    INSTALLDIR="/install"
+fi
+if [ -z "$TFTPDIR" ]; then
+    TFTPDIR="/tftpboot"
+fi
+if [[ "${TFTPDIR:0:1}" != "/" ]]; then
+    TFTPDIR="/$TFTPDIR"
+fi
+
+NODESTATUS="$(echo "$NODESTATUS"| tr -d \'\" | tr A-Z a-z)"
+
+(
+cat <<'EOF'
+#INCLUDE:#TABLE:site:key=installdir:value#/postscripts/updateflag.awk#
+EOF
+) >/tmp/updateflag
+
+chmod 0755 /tmp/updateflag
+
+cd /tmp
+log_label="xcat.deployment"
+msgutil_r "$MASTER_IP" "info" "Executing post.xcat to prepare for firstbooting ..." "/var/log/xcat/xcat.log" "$log_label"
+
+RAND="$(perl -e 'print int(rand(50)). "\n"')"
+case "$XCATDEBUGMODE" in
+"1"|"2")
+    msgutil_r "$MASTER_IP" "debug" "sleep $RAND" "/var/log/xcat/xcat.log" "$log_label"
+    ;;
+esac
+sleep "$RAND"
+
+# Stop if no openssl to help the next bit
+if ! type openssl >/dev/null 2>&1
+then
+    msgutil_r "$MASTER_IP" "error" "/usr/bin/openssl does not exist, halt ..." "/var/log/xcat/xcat.log" "$log_label"
+    /tmp/updateflag $MASTER $XCATIPORT "installstatus failed"
+    sleep infinity
+fi
+
+# Save to /opt/xcat/xcatinfo file
+mkdir -p /opt/xcat
+touch /opt/xcat/xcatinfo
+
+grep -q 'XCATSERVER=' /opt/xcat/xcatinfo >/dev/null 2>&1
+if [ "$?" -eq "0" ]
+then
+    sed -i "s/XCATSERVER=.*/XCATSERVER=$MASTER_IP/" /opt/xcat/xcatinfo
+else
+    echo "XCATSERVER=$MASTER_IP" >>/opt/xcat/xcatinfo
+fi
+
+grep -q 'INSTALLDIR' /opt/xcat/xcatinfo >/dev/null 2>&1
+if [ "$?" -eq "0" ]
+then
+    sed -i "s/INSTALLDIR=.*/INSTALLDIR=$INSTALLDIR/" /opt/xcat/xcatinfo
+else
+    echo "INSTALLDIR=$INSTALLDIR" >>/opt/xcat/xcatinfo
+fi
+
+case "$XCATDEBUGMODE" in
+"1"|"2")
+    msgutil_r "$MASTER_IP" "debug" "/opt/xcat/xcatinfo generated" "/var/log/xcat/xcat.log" "$log_label"
+    ;;
+esac
+
+# Download the postscripts
+msgutil_r "$MASTER_IP" "info" "trying to download postscripts from $MASTER_IP..." "/var/log/xcat/xcat.log" "$log_label"
+
+# Stop if no curl to help the next bit
+if ! type curl >/dev/null 2>&1
+then
+    msgutil_r "$MASTER_IP" "error" "Command curl not found, halt ..." "/var/log/xcat/xcat.log" "$log_label"
+    /tmp/updateflag "$MASTER" "$XCATIPORT" "installstatus failed"
+    sleep infinity
+fi
+
+# $1 URL
+# $2 Destination directory
+function download_recursive()
+{
+    local url="$1"
+    local dest_dir="$2"
+    local f
+
+    [ "${url: -1}" = "/" ] && url="${url:0:-1}"
+    [ "${dest_dir: -1}" = "/" ] && dest_dir="${dest_dir:0:-1}"
+    mkdir -p "${dest_dir}"
+
+    while read -r f
+    do
+        case "$f" in
+        *"/")
+            download_recursive "${url}/${f}" "${dest_dir}/${f:0:-1}"
+            [ "$?" -ne "0" ] && return 1
+            ;;
+        *)
+            curl --retry 20 --max-time 60 "${url}/${f}" -o "${dest_dir}/${f}"
+            [ "$?" -ne "0" ] && return 1
+            ;;
+        esac
+    done < <(curl --retry 20 --max-time 60 "${url}/" | grep -o '<a href="\([^"]*\)">\1</a>' | cut -d '"' -f 2)
+    return 0
+}
+
+download_recursive "http://$MASTER_IP$INSTALLDIR/postscripts/" "/xcatpost" 2>/tmp/download.log
+if [ "$?" -ne "0" ]
+then
+    msgutil_r "$MASTER_IP" "error" "failed to download postscripts from http://$MASTER_IP$INSTALLDIR/postscripts/, check /tmp/download.log on the node,  halt ..." "/var/log/xcat/xcat.log" "$log_label"
+    /tmp/updateflag "$MASTER" "$XCATIPORT" "installstatus failed"
+    sleep infinity
+fi
+find /xcatpost -type f -maxdepth 1 -exec chmod 0755 {} +
+msgutil_r "$MASTER_IP" "info" "postscripts downloaded successfully" "/var/log/xcat/xcat.log" "$log_label"
+
+# Get the precreated mypostscript file
+rm -rf /xcatpost/mypostscript
+export NODE="#TABLE:nodelist:THISNODE:node#"
+
+msgutil_r "$MASTER_IP" "info" "trying to get mypostscript from $MASTER_IP..." "/var/log/xcat/xcat.log" "$log_label"
+
+curl --retry 20 --max-time 60 "http://$MASTER_IP$TFTPDIR/mypostscripts/mypostscript.$NODE" -o "/xcatpost/mypostscript.$NODE" 2> /tmp/download.log
+if [ "$?" = "0" ]
+then
+    case "$XCATDEBUGMODE" in
+    "1"|"2")
+        msgutil_r "$MASTER_IP" "debug" "precreated mypostscript downloaded successfully" "/var/log/xcat/xcat.log" "$log_label"
+        ;;
+    esac
+    mv /xcatpost/mypostscript.$NODE /xcatpost/mypostscript
+    chmod 700 /xcatpost/mypostscript
+fi
+
+# Though this is the only method going forward, flag to allow backward compatibility with 2.2 generated netboot images
+USEOPENSSLFORXCAT=1
+export USEOPENSSLFORXCAT
+XCATSERVER=$MASTER_IP:3001
+export XCATSERVER
+
+# If mypostscript doesn't exist, we will get it through getpostscript.awk
+if [ ! -x /xcatpost/mypostscript ]; then
+    case "$XCATDEBUGMODE" in
+    "1"|"2")
+        msgutil_r "$MASTER_IP" "debug" "no pre-generated mypostscript.<nodename>, trying to get it with getpostscript.awk..." "/var/log/xcat/xcat.log" "$log_label"
+        ;;
+    esac
+
+    # To support the postscripts in the subdirectories under /install/postscripts
+    # chmod +x /xcatpost/*
+    # Stop if no getpostscript.awk to help the next bit
+    if [ ! -x /xcatpost/getpostscript.awk ]; then
+        msgutil_r "$MASTER_IP" "error" "/xcatpost/getpostscript.awk does not exist, halt ..." "/var/log/xcat/xcat.log" "$log_label"
+        /tmp/updateflag "$MASTER" "$XCATIPORT" "installstatus failed"
+        sleep infinity
+    fi
+    /xcatpost/getpostscript.awk | egrep '<data>' | sed -e 's/<[^>]*>//g' | egrep -v '^ *$' | sed -e 's/^ *//' | sed -e 's/&lt;/</g' -e 's/&gt;/>/g' -e 's/&amp;/\&/g' -e 's/&quot;/"/g' -e "s/&apos;/'/g" >/xcatpost/mypostscript
+
+    MYCONT="$(grep '^MASTER=' /xcatpost/mypostscript)"
+    RETRY=0
+    while [ -z "$MYCONT" ]; do
+        RETRY=$(($RETRY + 1))
+        if [ "$RETRY" -eq "10" ]; then
+            break
+        fi
+
+        let SLI=$RANDOM%10+10
+        sleep $SLI
+        /xcatpost/getpostscript.awk |egrep '<data>'|sed -e 's/<[^>]*>//g'|egrep -v '^ *$'|sed -e 's/^ *//' | sed -e 's/&lt;/</g' -e 's/&gt;/>/g' -e 's/&amp;/\&/g' -e 's/&quot;/"/g' -e "s/&apos;/'/g" > /xcatpost/mypostscript
+
+        MYCONT="$(grep '^MASTER=' /xcatpost/mypostscript)"
+    done
+fi
+
+TMP="$(sed "/^#\s*postscripts-start-here/,/^#\s*postscripts-end-here/ s/\(.*\)/run_ps postscript \1/;s/run_ps postscript\s*#/#/;s/run_ps postscript\s*$//" /xcatpost/mypostscript)"
+echo "$TMP" >/xcatpost/mypostscript
+TMP="$(sed "/^#\s*postbootscripts-start-here/,/^#\s*postbootscripts-end-here/ s/\(.*\)/run_ps postbootscript \1/;s/run_ps postbootscript\s*#/#/;s/run_ps postbootscript\s*$//" /xcatpost/mypostscript)"
+
+cd /xcatpost
+# gunzip xcatpost.tar.gz
+# tar -xvf xcatpost.tar
+# /xcatpost/#TABLE:nodelist:THISNODE:node#
+export PATH="$PATH:/xcatpost"
+
+# use the run_ps subroutine to run the postscripts
+
+case "$XCATDEBUGMODE" in
+"1"|"2")
+    echo "set -x" >/xcatpost/mypostscript
+    ;;
+*)
+    >/xcatpost/mypostscript
+    ;;
+esac
+
+echo "
+. /xcatpost/xcatlib.sh
+
+# global value to store the running status of the postbootscripts,the value is non-zero if one postbootscript failed
+return_value=0
+
+# subroutine used to run postscripts
+# \$1 argument is the script type
+# rest argument is the script name and arguments
+run_ps () {
+    local ret_local=0
+    mkdir -p "\"/var/log/xcat\""
+    # On some Linux distro, the rsyslogd daemon write log files with permision
+    # other than root:root. And in some case, the directory /var/log/xcat was
+    # created by xCAT, and had root:root ownership. In this way, rsyslogd
+    # did not have enough permission to write to log files under this directory.
+    # As a dirty hack, change the ownership of directory /var/log/xcat to the
+    # same ownership of directory /var/log.
+    chown `ls -ld /var/log | awk '{ print \$3\":\"\$4 }'` "\"/var/log/xcat\""
+    local logfile=\"/var/log/xcat/xcat.log\"
+    local scriptype=\$1
+    shift;
+
+    if [ -z \"\$scriptype\" ]; then
+        scriptype=\"postscript\"
+    fi
+
+    if [ -f \$1 ]; then
+        msgutil_r \"\$MASTER_IP\" \"info\" "\"Running \$scriptype: \$1\"" \"\$logfile\" \"xcat.mypostscript\"
+        if [ \"\$XCATDEBUGMODE\" = \"1\" ] || [ \"\$XCATDEBUGMODE\" = \"2\" ]; then
+            local compt=\$(file \$1)
+            local reg=\"shell script\"
+            if [[ \"\$compt\" =~ \$reg ]]; then
+                bash -x ./\$@ 2>&1
+                ret_local=\$?
+            else
+                ./\$@ 2>&1 | logger -t xcat -p debug
+                ret_local=\${PIPESTATUS[0]}
+            fi
+        else
+            ./\$@ 2>&1
+            ret_local=\${PIPESTATUS[0]}
+        fi
+
+        if [ \"\$ret_local\" -ne \"0\" ]; then
+            return_value=\$ret_local
+        fi
+        msgutil_r \"\$MASTER_IP\" \"info\" "\"\$scriptype \$1 return with \$ret_local\"" \"\$logfile\" \"xcat.mypostscript\"
+    else
+        msgutil_r \"\$MASTER_IP\" \"error\" "\"\$scriptype \$1 does NOT exist.\"" \"\$logfile\" \"xcat.mypostscript\"
+        return_value=-1
+    fi
+
+
+    return 0
+}
+# subroutine end
+
+" >>/xcatpost/mypostscript
+echo "$TMP" >>/xcatpost/mypostscript
+
+case "$XCATDEBUGMODE" in
+"1"|"2")
+    echo "set +x" >>/xcatpost/mypostscript
+    ;;
+esac
+
+chmod 0755 /xcatpost/mypostscript
+if [ ! -x /xcatpost/mypostscript ]; then
+    msgutil_r "$MASTER_IP" "error" "failed to generate mypostscript file, halt ..." "/var/log/xcat/xcat.log" "$log_label"
+    /tmp/updateflag "$MASTER" "$XCATIPORT" "installstatus failed"
+    sleep infinity
+else
+    case "$XCATDEBUGMODE" in
+    "1"|"2")
+        msgutil_r "$MASTER_IP" "debug" "generate mypostscript file successfully" "/var/log/xcat/xcat.log" "$log_label"
+        ;;
+    esac
+fi
+
+# Save the postboot scripts to /xcatpost/mypostscript.post
+TMP=`sed "/^#\s*postscripts-start-here/,/^#\s*postscripts-end-here/ d" /xcatpost/mypostscript`
+echo "$TMP" >/xcatpost/mypostscript.post
+chmod 0755 /xcatpost/mypostscript.post
+
+if [ ! -x /xcatpost/mypostscript.post ]
+then
+    msgutil_r "$MASTER_IP" "error" "failed to generate /xcatpost/mypostscript.post" "/var/log/xcat/xcat.log" "$log_label"
+else
+    case "$XCATDEBUGMODE" in
+    "1"|"2")
+        msgutil_r "$MASTER_IP" "debug" "generate mypostscript.post file successfully" "/var/log/xcat/xcat.log" "$log_label"
+        ;;
+    esac
+fi
+
+export OSVER="#TABLE:nodetype:THISNODE:os#"
+# Create the post init service as a hook to run PS and PBS, as well as status updating
+cat >/etc/systemd/system/xcatpostinit1.service <<'EOF'
+#INCLUDE:/install/postscripts/xcatpostinit1.service#
+EOF
+
+case "$XCATDEBUGMODE" in
+"1"|"2")
+    msgutil_r "$MASTER_IP" "debug" "/etc/systemd/system/xcatpostinit1.service generated" "/var/log/xcat/xcat.log" "$log_label"
+    ;;
+esac
+
+ln -s /etc/systemd/system/xcatpostinit1.service /etc/systemd/system/multi-user.target.wants/xcatpostinit1.service
+
+case "$XCATDEBUGMODE" in
+"1"|"2")
+    msgutil_r "$MASTER_IP" "debug" "xcatpostinit1.service enabled" "/var/log/xcat/xcat.log" "$log_label"
+    ;;
+esac
+
+cat >/opt/xcat/xcatpostinit1 <<'EOF'
+#INCLUDE:/install/postscripts/xcatpostinit1.install#
+EOF
+chmod 0755 /opt/xcat/xcatpostinit1
+
+# Create the xcatinstallpost
+mkdir -p /opt/xcat
+cat >/opt/xcat/xcatinstallpost <<'EOF'
+#INCLUDE:#TABLE:site:key=installdir:value#/postscripts/xcatinstallpost#
+
+if [ -f /xcatpost/mypostscript.post ]
+then
+    RUNBOOTSCRIPTS=`grep 'RUNBOOTSCRIPTS=' /xcatpost/mypostscript.post | cut -d= -f2 | tr -d \'\" | tr A-Z a-z`
+fi
+
+if [[ ! "$RUNBOOTSCRIPTS" =~ ^(1|yes|y)$ ]] && [[ ! "$NODESTATUS" =~ ^(1|yes|y)$ ]]; then
+    systemctl disable xcatpostinit1.service
+    case "$XCATDEBUGMODE" in
+    "1"|"2")
+        msgutil_r "$MASTER_IP" "debug" "systemctl disable xcatpostinit1.service" "/var/log/xcat/xcat.log" "xcat.xcatinstallpost"
+        ;;
+    esac
+fi
+
+EOF
+
+chmod 0755 /opt/xcat/xcatinstallpost
+
+if [ ! -x /opt/xcat/xcatinstallpost ]
+then
+    msgutil_r "$MASTER_IP" "error" "failed to generate /opt/xcat/xcatinstallpost" "/var/log/xcat/xcat.log" "$log_label"
+else
+    case "$XCATDEBUGMODE" in
+    "1"|"2")
+        msgutil_r "$MASTER_IP" "debug" "/opt/xcat/xcatinstallpost generated" "/var/log/xcat/xcat.log" "$log_label"
+        ;;
+    esac
+fi
+
+# Create the dskls post
+cat >/opt/xcat/xcatdsklspost <<'EOF'
+#INCLUDE:#TABLE:site:key=installdir:value#/postscripts/xcatdsklspost#
+EOF
+chmod 755 /opt/xcat/xcatdsklspost
+
+if [ ! -x /opt/xcat/xcatdsklspost ]; then
+    msgutil_r "$MASTER_IP" "error" "failed to generate /opt/xcat/xcatdsklspost" "/var/log/xcat/xcat.log" "$log_label"
+else
+    case "$XCATDEBUGMODE" in
+    "1"|"2")
+        msgutil_r "$MASTER_IP" "debug" "/opt/xcat/xcatdsklspost generated" "/var/log/xcat/xcat.log" "$log_label"
+        ;;
+    esac
+fi
+
+#create the preboot script and run here
+TMP="$(sed '/^#\s*postbootscripts-start-here/,/^#\s*postbootscripts-end-here/ d' /xcatpost/mypostscript)"
+echo "$TMP" >/xcatpost/mypostscript
+
+echo "
+# Save bad return code to /opt/xcat/xcatinfo
+if [ \"\$return_value\" -ne \"0\" ]; then
+    grep 'POSTSCRIPTS_RC' /opt/xcat/xcatinfo > /dev/null 2>&1
+    if [ \$? -eq 0 ]; then
+        sed -i \"s/POSTSCRIPTS_RC=.*/POSTSCRIPTS_RC=1/\" /opt/xcat/xcatinfo
+    else
+        echo \"POSTSCRIPTS_RC=1\" >>/opt/xcat/xcatinfo
+    fi
+fi
+" >>/xcatpost/mypostscript
+
+chmod 0700 /xcatpost/mypostscript
+
+export ARCH="#TABLE:nodetype:THISNODE:arch#"
+export CONSOLEPORT="#TABLEBLANKOKAY:nodehm:THISNODE:serialport#"
+
+# For redhat:
+# place-holder for the code to save the repo info on compute node,pointing to the "pkgdir" of the osimage
+# so that the provisioned node has the repo pointed to the distro path on MN
+#WRITEREPO#
+
+case "$XCATDEBUGMODE" in
+"1"|"2")
+    msgutil_r "$MASTER_IP" "info" "running mypostscript" "/var/log/xcat/xcat.log" "$log_label"
+    ;;
+esac
+/xcatpost/mypostscript
+case "$XCATDEBUGMODE" in
+"1"|"2")
+    msgutil_r "$MASTER_IP" "info" "mypostscript returned" "/var/log/xcat/xcat.log" "$log_label"
+    ;;
+esac
+
+msgutil_r "$MASTER_IP" "info" "finished firstboot preparation, sending request to $MASTER:3002 for changing status..." "/var/log/xcat/xcat.log" "$log_label"
+# The following command should always be run to prevent infinite installation loops
+updateflag.awk "$MASTER" 3002
+
+cd /
+
+case "$XCATDEBUGMODE" in
+"1"|"2")
+    set +x
+    ;;
+esac
diff --git a/xCAT-server/share/xcat/install/scripts/pre.pkvm3 b/xCAT-server/share/xcat/install/scripts/pre.pkvm3
index 1b5ccd45c..66ae40551 100755
--- a/xCAT-server/share/xcat/install/scripts/pre.pkvm3
+++ b/xCAT-server/share/xcat/install/scripts/pre.pkvm3
@@ -13,7 +13,7 @@ fi
 shopt -s nullglob
 
 #
-# The getinstdisk script is common for RHEL/SLES/PowerKVM/Ubuntu. 
+# The getinstdisk script is common for RHEL/SLES/PowerKVM/Ubuntu.
 # It will attempt to select the install disk and write the selection to /tmp/xcat.install_disk
 #
 #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/getinstdisk#
diff --git a/xCAT-server/share/xcat/install/scripts/pre.rh b/xCAT-server/share/xcat/install/scripts/pre.rh
index 6fde12414..eedaab849 100644
--- a/xCAT-server/share/xcat/install/scripts/pre.rh
+++ b/xCAT-server/share/xcat/install/scripts/pre.rh
@@ -206,9 +206,9 @@ BOOTFSTYPE=ext3
 EFIFSTYPE=vfat
 
 if [ `uname -m` = "ppc64" ]; then
-	echo 'part None --fstype "PPC PReP Boot" --ondisk '$instdisk' --size 8' >> /tmp/partitionfile 
+	echo 'part None --fstype "PPC PReP Boot" --ondisk '$instdisk' --size 8' >> /tmp/partitionfile
 fi
-if [ -d /sys/firmware/efi ]; then 
+if [ -d /sys/firmware/efi ]; then
     echo 'bootloader --driveorder='$instdisk >> /tmp/partitionfile
     echo 'part /boot/efi --size 50 --ondisk '$instdisk' --fstype '$EFIFSTYPE >> /tmp/partitionfile
 else
diff --git a/xCAT-server/share/xcat/install/scripts/pre.rh.rhels7 b/xCAT-server/share/xcat/install/scripts/pre.rh.rhels7
index 38b560deb..7bea14300 100755
--- a/xCAT-server/share/xcat/install/scripts/pre.rh.rhels7
+++ b/xCAT-server/share/xcat/install/scripts/pre.rh.rhels7
@@ -177,9 +177,9 @@ fi
 
 echo "ignoredisk --only-use=$instdisk" >> /tmp/partitionfile
 if [ `uname -m` = "ppc64" -o `uname -m` = "ppc64le" ]; then
-	echo 'part None --fstype "PPC PReP Boot" --ondisk '$instdisk' --size 8' >> /tmp/partitionfile 
+	echo 'part None --fstype "PPC PReP Boot" --ondisk '$instdisk' --size 8' >> /tmp/partitionfile
 fi
-if [ -d /sys/firmware/efi ]; then 
+if [ -d /sys/firmware/efi ]; then
     echo 'part /boot/efi --size 50 --ondisk '$instdisk' --fstype '$EFIFSTYPE >> /tmp/partitionfile
 fi
 
diff --git a/xCAT-server/share/xcat/install/scripts/pre.rhels8 b/xCAT-server/share/xcat/install/scripts/pre.rhels8
new file mode 100644
index 000000000..4ea92263b
--- /dev/null
+++ b/xCAT-server/share/xcat/install/scripts/pre.rhels8
@@ -0,0 +1,225 @@
+export XCATDEBUGMODE="#TABLEBLANKOKAY:site:key=xcatdebugmode:value#"
+
+case "$XCATDEBUGMODE" in
+"1"|"2")
+    set -x
+    ;;
+esac
+
+if grep -q n8r /proc/cmdline >/dev/null 2>&1
+then
+    stty crtscts
+fi
+for x in 0 1 2 3 4 5 6 7 8
+do
+    mknod /dev/vcs$x c 7 $x
+    mknod /dev/vcsa$x c 7 $[$x+128]
+done
+chmod 0644 /dev/vcs*
+chown root.tty /dev/vcs*
+
+if [ -r /tmp/updates/etc/pki/tls/certs/ca-bundle.crt ]
+then
+    cp -f /tmp/updates/etc/pki/tls/certs/ca-bundle.crt /etc/pki/tls/certs/
+fi
+
+cat >/tmp/baz.py <<'EOF'
+#!/usr/bin/python3
+import socket
+import sys
+
+sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+sock.connect(('#XCATVAR:XCATMASTER#',#TABLE:site:key=xcatiport:value#))
+
+print sys.argv[1]
+response = sock.recv(100)
+if(response == "ready\n"):
+        sock.send(sys.argv[1]+"\n")
+        response = sock.recv(100)
+
+sock.close()
+EOF
+
+cat >/tmp/foo.py <<'EOF'
+#!/usr/bin/python3
+
+import socket
+import os
+import linecache
+import re
+
+sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+sock.connect(('#XCATVAR:XCATMASTER#',#TABLE:site:key=xcatiport:value#))
+
+response = sock.recv(100)
+if(response == "ready\n"):
+	sock.send("installmonitor\n")
+	response = sock.recv(100)
+
+sock.close()
+
+sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+
+port = 3054
+sock.bind(('', port))
+
+sock.listen(5)
+
+try:
+	while 1:
+		newSocket, address = sock.accept()
+		while 1:
+			received = newSocket.recv(200)
+			if not received:
+				break
+			command = re.split('\s+',received)
+			if(command[0] == "stat"):
+				ilog = ""
+				line = ""
+				post = 0
+				percent = 0
+				count = 0
+				numpack = 0
+				pre = 0
+				if(os.path.isfile('/tmp/xcatpre.log')):
+					ilog = '/tmp/xcatpre.log'
+					pre = 1
+				if(os.path.isfile('/tmp/packaging.log')):
+					ilog = '/tmp/packaging.log'
+				if(os.path.isfile('/mnt/sysimage/tmp/post.log')):
+					ilog = '/mnt/sysimage/tmp/post.log'
+					post = True
+				if(ilog):
+					count = len(open(ilog).readlines())
+					line = linecache.getline(ilog,count)
+					linecache.clearcache()
+				if(line and not post and not pre):
+					r2 = re.compile("Installing ([^ ]*) \((\d+)/(\d+)\)")
+					m2 = r2.search(line)
+					if m2:
+						newline = "%s (%.2f%%)" % (m2.group(1), 100 * float(m2.group(2)) / float(m2.group(3)))
+					else:
+						newline = "post"
+					line = "installing " + newline
+				if(line and post and not pre):
+					line = "installing " + line
+				if(not line):
+					line = "installing prep"
+				newSocket.send(line)
+				break
+#UNCOMMENTOENABLEDEBUGPORT#			if(command[0] == "sh"): #DEBUG purposes only, wide open root priv command here.
+#UNCOMMENTOENABLEDEBUGPORT#				newcommand = ""
+#UNCOMMENTOENABLEDEBUGPORT#				for i in command[1:]:
+#UNCOMMENTOENABLEDEBUGPORT#					newcommand = newcommand + i + " "
+#UNCOMMENTOENABLEDEBUGPORT#				output = os.popen(newcommand).read()
+#UNCOMMENTOENABLEDEBUGPORT#				newSocket.send(output)
+#UNCOMMENTOENABLEDEBUGPORT#				break
+			if(command[0] == "screendump"):
+				newcommand = "cat /dev/vcs"
+				for i in command[1:]:
+					newcommand = newcommand + i
+				output = os.popen(newcommand).read()
+				newSocket.send(output)
+				break
+				
+		newSocket.close()
+
+finally:
+	sock.close()
+EOF
+
+chmod 0755 /tmp/foo.py
+chmod 0755 /tmp/baz.py
+
+NODESTATUS="#TABLEBLANKOKAY:site:key=nodestatus:value#"
+
+case "$NODESTATUS" in
+"0"|"N"|"n")
+    ;;
+*)
+    /tmp/baz.py "installstatus installing" &
+    ;;
+esac
+
+/tmp/foo.py >/foo.log 2>&1 &
+
+# time to ascertain fstype and PReP/UEFI/legacy
+# also, find first available block device (sda or vda likely)
+# TODO: pick a likely non-SAN target if possible
+shopt -s nullglob
+
+#
+# The getinstdisk script is common for RHEL/SLES/PowerKVM/Ubuntu.
+# It will attempt to select the install disk and write the selection to /tmp/xcat.install_disk
+#
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/getinstdisk#
+if [ -f "/tmp/xcat.install_disk" ]
+then
+    instdisk="$(cat /tmp/xcat.install_disk)"
+fi
+
+BOOTFSTYPE=ext4
+FSTYPE=ext4
+EFIFSTYPE=efi
+
+echo "ignoredisk --only-use=$instdisk" >>/tmp/partitionfile
+case "$(uname -m)" in
+"ppc64"|"ppc64le")
+    echo "part prepboot --fstype=prepboot --asprimary --ondisk=$instdisk --size=8" >>/tmp/partitionfile
+    ;;
+esac
+if [ -d /sys/firmware/efi ]
+then
+    echo "part /boot/efi --fstype=$EFIFSTYPE --ondisk=$instdisk --size=250" >>/tmp/partitionfile
+fi
+
+# TODO: Ondisk detection, /dev/disk/by-id/edd-int13_dev80 for legacy maybe, and no idea about efi. At least maybe blacklist SAN if mptsas/mpt2sas/megaraid_sas seen...
+echo "part /boot --fstype=$BOOTFSTYPE --asprimary --ondisk=$instdisk --size=512" >>/tmp/partitionfile
+echo "part pv.000997 --grow --asprimary --ondisk=$instdisk --size=8192" >>/tmp/partitionfile
+echo "volgroup system --pesize=4096 pv.000997" >>/tmp/partitionfile
+echo "logvol / --fstype=$FSTYPE --name=root --vgname=system --grow --size=1024" >>/tmp/partitionfile
+echo "logvol swap --name=swap --vgname=system --recommended" >>/tmp/partitionfile
+
+# Specify "bootloader" configuration in "/tmp/partitionfile" if there is no user customized partition file
+BOOTLOADER="bootloader"
+
+# Specifies which drive the boot loader should be written to
+# and therefore which drive the computer will boot from.
+[ -n "$instdisk" ] && BOOTLOADER="$BOOTLOADER --boot-drive=$(basename $instdisk)"
+
+echo "$BOOTLOADER" >>/tmp/partitionfile
+
+#XCA_PARTITION_SCRIPT#
+
+#specify the kernel options which will be persistent after installation
+if [ -n "#ENV:PERSKCMDLINE#" ];then
+    #append the persistent kernel options to the lines including "bootloader --append"
+    sed -i -e /bootloader/s#\'#\"#g -e '/bootloader/s/--append=\([^"]\S*[^"]\)/--append="\1"/g' -e '/bootloader/s/--append="\(.*\)"/--append="\1 #ENV:PERSKCMDLINE#"/g' /tmp/partitionfile
+    #append the persistent kernel options to the lines including "bootloader" without "--append"
+    sed -i -e '/bootloader/{/append=/!s/$/& --append="#ENV:PERSKCMDLINE#" /}' /tmp/partitionfile
+    #append the persistent kernel options to /tmp/partitionfile if it does not include "bootloader"
+    grep -q bootloader /tmp/partitionfile >/dev/null 2>&1 || echo -e "bootloader --append=\"#ENV:PERSKCMDLINE#\"" >>/tmp/partitionfile
+fi
+
+# save the content of /tmp/partitionfile in /var/log/xcat/xcat.log
+# so that we can inspect the partition scheme after installation
+echo "================ The Partition Scheme ==============="
+cat /tmp/partitionfile
+echo "====================================================="
+
+# The following code is to generate the repository for the installation
+cat /proc/cmdline
+
+NEXTSERVER="$(grep -m 1 http /proc/cmdline)"
+NEXTSERVER="${NEXTSERVER#*http://}"
+NEXTSERVER="${NEXTSERVER%%:*}"
+
+export nextserver="$NEXTSERVER"
+#INSTALL_SOURCES_IN_PRE#
+
+case "$XCATDEBUGMODE" in
+"1"|"2")
+    set +x
+    ;;
+esac
diff --git a/xCAT-server/share/xcat/install/scripts/pre.sles b/xCAT-server/share/xcat/install/scripts/pre.sles
index 8fc6cbf60..94c414560 100644
--- a/xCAT-server/share/xcat/install/scripts/pre.sles
+++ b/xCAT-server/share/xcat/install/scripts/pre.sles
@@ -121,7 +121,7 @@ fi
 shopt -s nullglob
 
 #
-# The getinstdisk script is common for RHEL/SLES/PowerKVM/Ubuntu. 
+# The getinstdisk script is common for RHEL/SLES/PowerKVM/Ubuntu.
 # It will attempt to select the install disk and write the selection to /tmp/xcat.install_disk
 #
 #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/getinstdisk#
@@ -133,7 +133,7 @@ fi
 if [ -d /sys/firmware/efi ]; then
 	sed -e 's!<device>XCATPARTITIONHOOK</device>!<device>'$instdisk'</device><partitions config:type="list"><partition><filesystem config:type="symbol">vfat</filesystem><mount>/boot/efi</mount><size>128mb</size></partition><partition><mount>swap</mount><size>auto</size></partition><partition><mount>/</mount><size>auto</size></partition></partitions>!' /tmp/profile/autoinst.xml > /tmp/profile/modified.xml
 else
-	sed -e 's!<device>XCATPARTITIONHOOK</device>!<device>'$instdisk'</device>!' /tmp/profile/autoinst.xml > /tmp/profile/modified.xml
+	sed -e 's!<device>XCATPARTITIONHOOK</device>!<device>'$instdisk'</device><partitions config:type="list"><partition><filesystem  config:type="symbol">xfs</filesystem><mount>/</mount><size>auto</size></partition><partition><mount>swap</mount><size>auto</size></partition></partitions>!' /tmp/profile/autoinst.xml > /tmp/profile/modified.xml
 fi
 #XCA_PARTITION_SCRIPT#
 #add the following part for replace the partition definition in /tmp/profile/autoinst.xml
diff --git a/xCAT-server/share/xcat/install/scripts/pre.ubuntu b/xCAT-server/share/xcat/install/scripts/pre.ubuntu
index 96e26d7cf..2a64b2ae8 100644
--- a/xCAT-server/share/xcat/install/scripts/pre.ubuntu
+++ b/xCAT-server/share/xcat/install/scripts/pre.ubuntu
@@ -62,7 +62,7 @@ if [ "\$1" = "install_monitor" ]; then
     cmd=""
     while [ "\$cmd" != "done" ]; do
         read cmd remainder
-    
+
         if [ "\$cmd" == "ready" ]; then
             echo "installmonitor"
         fi
@@ -73,13 +73,13 @@ fi
 
 #
 #  If the script was called with the "installstatus" argument, stdin and stdout are
-#  connected to an xCAT daemon on the master.  
+#  connected to an xCAT daemon on the master.
 #  Write the "installstatus xx" request to the daemon to update thenode installation status.
 if [ "\$1" = "installstatus" ]; then
     cmd=""
     while [ "\$cmd" != "done" ]; do
         read cmd remainder
-    
+
         if [ "\$cmd" == "ready" ]; then
             echo "installstatus \$2"
         fi
@@ -195,7 +195,7 @@ if [ -d /sys/firmware/efi ]; then
     echo "    ." >> /tmp/partitionfile
 else
     echo "ubuntu-boot ::" > /tmp/partitionfile
-    echo "100 50 100 ext3" >> /tmp/partitionfile
+    echo "256 256 512 ext3" >> /tmp/partitionfile
     echo '    $primary{ } $bootable{ } method{ format } format{ } use_filesystem{ } filesystem{ ext3 } mountpoint{ /boot }' >> /tmp/partitionfile
     echo "    ." >> /tmp/partitionfile
 fi
diff --git a/xCAT-server/share/xcat/install/scripts/pre.ubuntu.ppc64 b/xCAT-server/share/xcat/install/scripts/pre.ubuntu.ppc64
index f85210325..b410b181f 100644
--- a/xCAT-server/share/xcat/install/scripts/pre.ubuntu.ppc64
+++ b/xCAT-server/share/xcat/install/scripts/pre.ubuntu.ppc64
@@ -62,7 +62,7 @@ if [ "\$1" = "install_monitor" ]; then
     cmd=""
     while [ "\$cmd" != "done" ]; do
         read cmd remainder
-    
+
         if [ "\$cmd" == "ready" ]; then
             echo "installmonitor"
         fi
@@ -73,13 +73,13 @@ fi
 
 #
 #  If the script was called with the "installstatus" argument, stdin and stdout are
-#  connected to an xCAT daemon on the master.  
+#  connected to an xCAT daemon on the master.
 #  Write the "installstatus xx" request to the daemon to update thenode installation status.
 if [ "\$1" = "installstatus" ]; then
     cmd=""
     while [ "\$cmd" != "done" ]; do
         read cmd remainder
-    
+
         if [ "\$cmd" == "ready" ]; then
             echo "installstatus \$2"
         fi
@@ -214,7 +214,7 @@ else
     echo '    $primary{ } $bootable{ } method{ prep }' >> /tmp/partitionfile
     echo "    ." >> /tmp/partitionfile
 
-    #echo "100 50 100 ext4" >> /tmp/partitionfile
+    #echo "256 256 512 ext4" >> /tmp/partitionfile
     #echo '    $primary{ } $bootable{ } method{ format } format{ } use_filesystem{ } filesystem{ ext4 } mountpoint{ /boot }' >> /tmp/partitionfile
     #echo "    ." >> /tmp/partitionfile
 fi
diff --git a/xCAT-server/share/xcat/install/sles/compute.sle15.pkglist b/xCAT-server/share/xcat/install/sles/compute.sle15.pkglist
new file mode 100644
index 000000000..2933f493c
--- /dev/null
+++ b/xCAT-server/share/xcat/install/sles/compute.sle15.pkglist
@@ -0,0 +1,2 @@
+openssl
+rsync
diff --git a/xCAT-server/share/xcat/install/sles/compute.sle15.tmpl b/xCAT-server/share/xcat/install/sles/compute.sle15.tmpl
new file mode 100644
index 000000000..733c59eaf
--- /dev/null
+++ b/xCAT-server/share/xcat/install/sles/compute.sle15.tmpl
@@ -0,0 +1,102 @@
+<?xml version="1.0"?>
+<!DOCTYPE profile SYSTEM "/usr/share/YaST2/include/autoinstall/profile.dtd">
+<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns">
+  <install>
+    <bootloader>
+      <write_bootloader config:type="boolean">true</write_bootloader>
+      <activate config:type="boolean">true</activate>
+      <kernel_parameters></kernel_parameters>
+      <lba_support config:type="boolean">false</lba_support>
+      <linear config:type="boolean">false</linear>
+      <location>mbr</location>
+    </bootloader>
+    <general>
+      <clock>
+        <hwclock>GMT</hwclock>
+        <timezone>#TABLE:site:key=timezone:value#</timezone>
+      </clock>
+      <keyboard>
+        <keymap>english-us</keymap>
+      </keyboard>
+      <language>en_US</language>
+      <mode>
+        <confirm config:type="boolean">false</confirm>
+        <forceboot config:type="boolean">false</forceboot>
+        <interactive_boot config:type="boolean">false</interactive_boot>
+        <reboot config:type="boolean">true</reboot>
+      </mode>
+      <mouse>
+        <id>non</id>
+      </mouse>
+      <signature-handling>
+         <accept_non_trusted_gpg_key config:type="boolean">true</accept_non_trusted_gpg_key>
+         <accept_unknown_gpg_key config:type="boolean">true</accept_unknown_gpg_key>
+         <accept_unsigned_file config:type="boolean">true</accept_unsigned_file>
+      </signature-handling>
+    </general>
+    <partitioning config:type="list">
+      <!-- XCAT-PARTITION-START -->
+      <drive>
+        <device>XCATPARTITIONHOOK</device>
+        <initialize config:type="boolean">true</initialize>
+        <use>all</use>
+      </drive>
+      <!-- XCAT-PARTITION-END -->
+    </partitioning>
+    <add-on>
+        <add_on_products config:type="list">
+            <listentry><media_url>http://XCATNEXTSERVERHOOK/install/sles15/x86_64/2</media_url><product>sle-module-basesystem</product><product_dir>/Module-Basesystem</product_dir></listentry>
+            <listentry><media_url>http://XCATNEXTSERVERHOOK/install/sles15/x86_64/2</media_url><product>sle-module-hpc</product><product_dir>/Module-HPC</product_dir></listentry>
+            <listentry><media_url>http://XCATNEXTSERVERHOOK/install/sles15/x86_64/2</media_url><product>sle-module-server-applications</product><product_dir>/Module-Server-Applications</product_dir></listentry>
+            <listentry><media_url>http://XCATNEXTSERVERHOOK/install/sles15/x86_64/2</media_url><product>sle-module-server-applications</product><product_dir>/Module-Server-Applications</product_dir></listentry>
+            <listentry><media_url>http://XCATNEXTSERVERHOOK/install/sles15/x86_64/2</media_url><product>SLE_HPC</product><product_dir>/Product-HPC</product_dir></listentry>
+        </add_on_products>
+    </add-on>
+    <software>
+      <products config:type="list">
+          <product>SLE_HPC</product>
+      </products>
+      <patterns config:type="list">
+        #INCLUDE_DEFAULT_PTRNLIST_S#
+      </patterns>
+      <packages config:type="list">
+    	#INCLUDE_DEFAULT_PKGLIST_S#
+      </packages>
+    </software>
+  </install>
+  <configure>
+    <users config:type="list">
+      <user>
+        <username>root</username>
+        <user_password>#CRYPT:passwd:key=system,username=root:password#</user_password>
+        <encrypted config:type="boolean">true</encrypted>
+        <forename/>
+        <surname/>
+      </user>
+    </users>
+    <networking>
+      <dns>
+        <dhcp_hostname config:type="boolean">true</dhcp_hostname>
+        <dhcp_resolv config:type="boolean">true</dhcp_resolv>
+        <domain>local</domain>
+        <hostname>linux</hostname>
+      </dns>
+      <interfaces config:type="list">
+        <interface>
+          <bootproto>dhcp</bootproto>
+          <device>eth0</device>
+          <startmode>onboot</startmode>
+        </interface>
+      </interfaces>
+      <routing>
+        <ip_forward config:type="boolean">false</ip_forward>
+        <routes config:type="list"/>
+      </routing>
+    </networking>
+    <scripts>
+   #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.sle15#
+   #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/chroot.sles#
+   #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.sles11#
+    </scripts>
+  </configure>
+</profile>
diff --git a/xCAT-server/share/xcat/install/sles/compute.sles10.s390x.pkglist b/xCAT-server/share/xcat/install/sles/compute.sles10.s390x.pkglist
index 8e21feb02..4a30aac76 100644
--- a/xCAT-server/share/xcat/install/sles/compute.sles10.s390x.pkglist
+++ b/xCAT-server/share/xcat/install/sles/compute.sles10.s390x.pkglist
@@ -1,3 +1,3 @@
 @base
 libapr1
-ntp 
+ntp
diff --git a/xCAT-server/share/xcat/install/sles/compute.sles10.s390x.tmpl b/xCAT-server/share/xcat/install/sles/compute.sles10.s390x.tmpl
index d6ce4225d..72f969393 100644
--- a/xCAT-server/share/xcat/install/sles/compute.sles10.s390x.tmpl
+++ b/xCAT-server/share/xcat/install/sles/compute.sles10.s390x.tmpl
@@ -2,11 +2,11 @@
 <!DOCTYPE profile>
 <profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns">
 
-  <!-- The dasd attached to the virtual server -->  
+  <!-- The dasd attached to the virtual server -->
   <dasd>
     <devices config:type="list">
 
-      <!-- Dasd attached at 0100 --> 
+      <!-- Dasd attached at 0100 -->
       <listentry>
         <bus>None</bus>
         <bus_hwcfg>none</bus_hwcfg>
@@ -46,8 +46,8 @@
       </listentry>
     </devices>
   </dasd>
-  
-  
+
+
   <general>
     <mode>
       <confirm config:type="boolean">false</confirm>
@@ -57,8 +57,8 @@
     </mouse>
     <signature-handling/>
   </general>
-  
-  
+
+
   <!-- Groups to create on Linux -->
   <groups config:type="list">
     <group>
@@ -241,8 +241,8 @@
       <userlist></userlist>
     </group>
   </groups>
-  
-  
+
+
   <!-- Contents of /etc/hosts -->
   <host>
     <hosts config:type="list">
@@ -260,21 +260,21 @@
       </hosts_entry>
     </hosts>
   </host>
-    
+
 
   <iscsi-client>
     <initiatorname></initiatorname>
     <targets config:type="list"/>
     <version>1.0</version>
   </iscsi-client>
-  
+
 
   <!-- Language setup (english) -->
   <language>
     <language>en_US</language>
     <languages></languages>
   </language>
-  
+
 
   <!-- Networking setup (DHCP) -->
   <networking>
@@ -334,8 +334,8 @@
       </routes>
     </routing>
   </networking>
-  
-  
+
+
   <nis>
     <nis_broadcast config:type="boolean">false</nis_broadcast>
     <nis_broken_server config:type="boolean">false</nis_broken_server>
@@ -349,11 +349,11 @@
     <start_autofs config:type="boolean">false</start_autofs>
     <start_nis config:type="boolean">false</start_nis>
   </nis>
-  
-  
+
+
   <!-- File system partitioning -->
   <partitioning config:type="list">
-  
+
     <!-- Root partition -->
     <drive>
       <device>/dev/dasda</device>
@@ -384,8 +384,8 @@
       <use>all</use>
     </drive>
   </partitioning>
-    
-  
+
+
   <proxy>
     <enabled config:type="boolean">false</enabled>
     <ftp_proxy></ftp_proxy>
@@ -395,8 +395,8 @@
     <proxy_password></proxy_password>
     <proxy_user></proxy_user>
   </proxy>
-  
-  
+
+
   <report>
     <errors>
       <log config:type="boolean">true</log>
@@ -419,13 +419,13 @@
       <timeout config:type="integer">0</timeout>
     </yesno_messages>
   </report>
-  
-  
+
+
   <runlevel>
     <default>5</default>
   </runlevel>
-  
-  
+
+
   <!-- Software to install on Linux -->
   <software>
     <patterns config:type="list">
@@ -435,15 +435,15 @@
       replace_software_packages
     </packages>
   </software>
-  
-  
+
+
   <!-- Time zone -->
   <timezone>
     <hwclock>UTC</hwclock>
     <timezone>US/Eastern</timezone>
   </timezone>
-  
-  
+
+
   <user_defaults>
     <expire></expire>
     <group>100</group>
@@ -453,8 +453,8 @@
     <shell>/bin/bash</shell>
     <skel>/etc/skel</skel>
   </user_defaults>
-  
-  
+
+
   <!-- Users on Linux -->
   <users config:type="list">
     <user>
@@ -760,13 +760,13 @@
       <username>sshd</username>
     </user>
   </users>
-  
-  
+
+
   <zfcp>
     <devices config:type="list"/>
   </zfcp>
-  
-  
+
+
   <!-- Scripts (post-script) -->
   <configure>
     <scripts>
diff --git a/xCAT-server/share/xcat/install/sles/compute.sles11.s390x.pkglist b/xCAT-server/share/xcat/install/sles/compute.sles11.s390x.pkglist
index 8e21feb02..4a30aac76 100644
--- a/xCAT-server/share/xcat/install/sles/compute.sles11.s390x.pkglist
+++ b/xCAT-server/share/xcat/install/sles/compute.sles11.s390x.pkglist
@@ -1,3 +1,3 @@
 @base
 libapr1
-ntp 
+ntp
diff --git a/xCAT-server/share/xcat/install/sles/compute.sles11.s390x.tmpl b/xCAT-server/share/xcat/install/sles/compute.sles11.s390x.tmpl
index d6ce4225d..72f969393 100644
--- a/xCAT-server/share/xcat/install/sles/compute.sles11.s390x.tmpl
+++ b/xCAT-server/share/xcat/install/sles/compute.sles11.s390x.tmpl
@@ -2,11 +2,11 @@
 <!DOCTYPE profile>
 <profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns">
 
-  <!-- The dasd attached to the virtual server -->  
+  <!-- The dasd attached to the virtual server -->
   <dasd>
     <devices config:type="list">
 
-      <!-- Dasd attached at 0100 --> 
+      <!-- Dasd attached at 0100 -->
       <listentry>
         <bus>None</bus>
         <bus_hwcfg>none</bus_hwcfg>
@@ -46,8 +46,8 @@
       </listentry>
     </devices>
   </dasd>
-  
-  
+
+
   <general>
     <mode>
       <confirm config:type="boolean">false</confirm>
@@ -57,8 +57,8 @@
     </mouse>
     <signature-handling/>
   </general>
-  
-  
+
+
   <!-- Groups to create on Linux -->
   <groups config:type="list">
     <group>
@@ -241,8 +241,8 @@
       <userlist></userlist>
     </group>
   </groups>
-  
-  
+
+
   <!-- Contents of /etc/hosts -->
   <host>
     <hosts config:type="list">
@@ -260,21 +260,21 @@
       </hosts_entry>
     </hosts>
   </host>
-    
+
 
   <iscsi-client>
     <initiatorname></initiatorname>
     <targets config:type="list"/>
     <version>1.0</version>
   </iscsi-client>
-  
+
 
   <!-- Language setup (english) -->
   <language>
     <language>en_US</language>
     <languages></languages>
   </language>
-  
+
 
   <!-- Networking setup (DHCP) -->
   <networking>
@@ -334,8 +334,8 @@
       </routes>
     </routing>
   </networking>
-  
-  
+
+
   <nis>
     <nis_broadcast config:type="boolean">false</nis_broadcast>
     <nis_broken_server config:type="boolean">false</nis_broken_server>
@@ -349,11 +349,11 @@
     <start_autofs config:type="boolean">false</start_autofs>
     <start_nis config:type="boolean">false</start_nis>
   </nis>
-  
-  
+
+
   <!-- File system partitioning -->
   <partitioning config:type="list">
-  
+
     <!-- Root partition -->
     <drive>
       <device>/dev/dasda</device>
@@ -384,8 +384,8 @@
       <use>all</use>
     </drive>
   </partitioning>
-    
-  
+
+
   <proxy>
     <enabled config:type="boolean">false</enabled>
     <ftp_proxy></ftp_proxy>
@@ -395,8 +395,8 @@
     <proxy_password></proxy_password>
     <proxy_user></proxy_user>
   </proxy>
-  
-  
+
+
   <report>
     <errors>
       <log config:type="boolean">true</log>
@@ -419,13 +419,13 @@
       <timeout config:type="integer">0</timeout>
     </yesno_messages>
   </report>
-  
-  
+
+
   <runlevel>
     <default>5</default>
   </runlevel>
-  
-  
+
+
   <!-- Software to install on Linux -->
   <software>
     <patterns config:type="list">
@@ -435,15 +435,15 @@
       replace_software_packages
     </packages>
   </software>
-  
-  
+
+
   <!-- Time zone -->
   <timezone>
     <hwclock>UTC</hwclock>
     <timezone>US/Eastern</timezone>
   </timezone>
-  
-  
+
+
   <user_defaults>
     <expire></expire>
     <group>100</group>
@@ -453,8 +453,8 @@
     <shell>/bin/bash</shell>
     <skel>/etc/skel</skel>
   </user_defaults>
-  
-  
+
+
   <!-- Users on Linux -->
   <users config:type="list">
     <user>
@@ -760,13 +760,13 @@
       <username>sshd</username>
     </user>
   </users>
-  
-  
+
+
   <zfcp>
     <devices config:type="list"/>
   </zfcp>
-  
-  
+
+
   <!-- Scripts (post-script) -->
   <configure>
     <scripts>
diff --git a/xCAT-server/share/xcat/install/sles/compute.sles12.tmpl b/xCAT-server/share/xcat/install/sles/compute.sles12.tmpl
index e499336aa..bf5a3764a 100644
--- a/xCAT-server/share/xcat/install/sles/compute.sles12.tmpl
+++ b/xCAT-server/share/xcat/install/sles/compute.sles12.tmpl
@@ -76,6 +76,7 @@
           <startmode>onboot</startmode>
         </interface>
       </interfaces>
+      <keep_install_network config:type="boolean">true</keep_install_network>
       <routing>
         <ip_forward config:type="boolean">false</ip_forward>
         <routes config:type="list"/>
diff --git a/xCAT-server/share/xcat/install/sles/service.raid1.sles11.tmpl b/xCAT-server/share/xcat/install/sles/service.raid1.sles11.tmpl
index 0c184019a..2b4543783 100644
--- a/xCAT-server/share/xcat/install/sles/service.raid1.sles11.tmpl
+++ b/xCAT-server/share/xcat/install/sles/service.raid1.sles11.tmpl
@@ -96,11 +96,11 @@
 	  <filesystem config:type="symbol">reiser</filesystem>
 	  <format config:type="boolean">true</format>
 	  <mount>swap</mount>
-	  <partition_id config:type="integer">131</partition_id>	 
+	  <partition_id config:type="integer">131</partition_id>	
 	  <partition_nr config:type="integer">0</partition_nr>
 	  <raid_options>
 	    <chunk_size>4</chunk_size>
-	    <parity_algorithm>left-asymmetric</parity_algorithm>	   
+	    <parity_algorithm>left-asymmetric</parity_algorithm>	
 	    <raid_type>raid1</raid_type>
 	  </raid_options>
 	</partition>
diff --git a/xCAT-server/share/xcat/install/sles/service.sles12.tmpl b/xCAT-server/share/xcat/install/sles/service.sles12.tmpl
index f7cc1ecff..f3f8be272 100644
--- a/xCAT-server/share/xcat/install/sles/service.sles12.tmpl
+++ b/xCAT-server/share/xcat/install/sles/service.sles12.tmpl
@@ -112,6 +112,7 @@
           <startmode>onboot</startmode>
         </interface>
       </interfaces>
+      <keep_install_network config:type="boolean">true</keep_install_network>
       <routing>
         <ip_forward config:type="boolean">false</ip_forward>
         <routes config:type="list"/>
diff --git a/xCAT-server/share/xcat/install/sles/xen.tmpl b/xCAT-server/share/xcat/install/sles/xen.tmpl
index f86cdfa53..f62543bf2 100644
--- a/xCAT-server/share/xcat/install/sles/xen.tmpl
+++ b/xCAT-server/share/xcat/install/sles/xen.tmpl
@@ -13,7 +13,7 @@
       <activate>true</activate>
       <boot_root>true</boot_root>
       <default>XEN</default>
-      <timeout config:type="integer">8</timeout> 
+      <timeout config:type="integer">8</timeout>
     </global>
     <loader_type>grub</loader_type>
     <sections config:type="list">
diff --git a/xCAT-server/share/xcat/install/sles/zfcp.sles10.s390x.pkglist b/xCAT-server/share/xcat/install/sles/zfcp.sles10.s390x.pkglist
index 894b7d0b6..90fad3934 100644
--- a/xCAT-server/share/xcat/install/sles/zfcp.sles10.s390x.pkglist
+++ b/xCAT-server/share/xcat/install/sles/zfcp.sles10.s390x.pkglist
@@ -1,3 +1,3 @@
 @base
 libapr1
- 
\ No newline at end of file
+
diff --git a/xCAT-server/share/xcat/install/sles/zfcp.sles10.s390x.tmpl b/xCAT-server/share/xcat/install/sles/zfcp.sles10.s390x.tmpl
index 293b11610..e2a6a514d 100644
--- a/xCAT-server/share/xcat/install/sles/zfcp.sles10.s390x.tmpl
+++ b/xCAT-server/share/xcat/install/sles/zfcp.sles10.s390x.tmpl
@@ -11,8 +11,8 @@
     </mouse>
     <signature-handling/>
   </general>
-  
-  
+
+
   <!-- Groups to create on Linux -->
   <groups config:type="list">
     <group>
@@ -195,8 +195,8 @@
       <userlist></userlist>
     </group>
   </groups>
-  
-  
+
+
   <!-- Contents of /etc/hosts -->
   <host>
     <hosts config:type="list">
@@ -214,21 +214,21 @@
       </hosts_entry>
     </hosts>
   </host>
-    
+
 
   <iscsi-client>
     <initiatorname></initiatorname>
     <targets config:type="list"/>
     <version>1.0</version>
   </iscsi-client>
-  
+
 
   <!-- Language setup (english) -->
   <language>
     <language>en_US</language>
     <languages></languages>
   </language>
-  
+
 
   <!-- Networking setup (DHCP) -->
   <networking>
@@ -273,8 +273,8 @@
       </routes>
     </routing>
   </networking>
-  
-  
+
+
   <nis>
     <nis_broadcast config:type="boolean">false</nis_broadcast>
     <nis_broken_server config:type="boolean">false</nis_broken_server>
@@ -288,11 +288,11 @@
     <start_autofs config:type="boolean">false</start_autofs>
     <start_nis config:type="boolean">false</start_nis>
   </nis>
-  
-  
+
+
   <!-- File system partitioning -->
   <partitioning config:type="list">
-  
+
     <!-- Root partition and swap space -->
     <drive>
       <device>replace_root_device</device>
@@ -323,7 +323,7 @@
     </drive>
   </partitioning>
 
-  
+
   <proxy>
     <enabled config:type="boolean">false</enabled>
     <ftp_proxy></ftp_proxy>
@@ -333,8 +333,8 @@
     <proxy_password></proxy_password>
     <proxy_user></proxy_user>
   </proxy>
-  
-  
+
+
   <report>
     <errors>
       <log config:type="boolean">true</log>
@@ -357,13 +357,13 @@
       <timeout config:type="integer">0</timeout>
     </yesno_messages>
   </report>
-  
-  
+
+
   <runlevel>
     <default>5</default>
   </runlevel>
-  
-  
+
+
   <!-- Software to install on Linux -->
   <software>
     <patterns config:type="list">
@@ -373,15 +373,15 @@
       replace_software_packages
     </packages>
   </software>
-  
-  
+
+
   <!-- Time zone -->
   <timezone>
     <hwclock>UTC</hwclock>
     <timezone>US/Eastern</timezone>
   </timezone>
-  
-  
+
+
   <user_defaults>
     <expire></expire>
     <group>100</group>
@@ -391,8 +391,8 @@
     <shell>/bin/bash</shell>
     <skel>/etc/skel</skel>
   </user_defaults>
-  
-  
+
+
   <!-- Users on Linux -->
   <users config:type="list">
     <user>
@@ -698,13 +698,13 @@
       <username>sshd</username>
     </user>
   </users>
-  
-  
+
+
   <zfcp>
     replace_zfcp
   </zfcp>
-  
-  
+
+
   <!-- Scripts (post-script) -->
   <configure>
     <scripts>
diff --git a/xCAT-server/share/xcat/install/sles/zfcp.sles11.s390x.pkglist b/xCAT-server/share/xcat/install/sles/zfcp.sles11.s390x.pkglist
index 894b7d0b6..90fad3934 100644
--- a/xCAT-server/share/xcat/install/sles/zfcp.sles11.s390x.pkglist
+++ b/xCAT-server/share/xcat/install/sles/zfcp.sles11.s390x.pkglist
@@ -1,3 +1,3 @@
 @base
 libapr1
- 
\ No newline at end of file
+
diff --git a/xCAT-server/share/xcat/install/sles/zfcp.sles11.s390x.tmpl b/xCAT-server/share/xcat/install/sles/zfcp.sles11.s390x.tmpl
index 293b11610..e2a6a514d 100644
--- a/xCAT-server/share/xcat/install/sles/zfcp.sles11.s390x.tmpl
+++ b/xCAT-server/share/xcat/install/sles/zfcp.sles11.s390x.tmpl
@@ -11,8 +11,8 @@
     </mouse>
     <signature-handling/>
   </general>
-  
-  
+
+
   <!-- Groups to create on Linux -->
   <groups config:type="list">
     <group>
@@ -195,8 +195,8 @@
       <userlist></userlist>
     </group>
   </groups>
-  
-  
+
+
   <!-- Contents of /etc/hosts -->
   <host>
     <hosts config:type="list">
@@ -214,21 +214,21 @@
       </hosts_entry>
     </hosts>
   </host>
-    
+
 
   <iscsi-client>
     <initiatorname></initiatorname>
     <targets config:type="list"/>
     <version>1.0</version>
   </iscsi-client>
-  
+
 
   <!-- Language setup (english) -->
   <language>
     <language>en_US</language>
     <languages></languages>
   </language>
-  
+
 
   <!-- Networking setup (DHCP) -->
   <networking>
@@ -273,8 +273,8 @@
       </routes>
     </routing>
   </networking>
-  
-  
+
+
   <nis>
     <nis_broadcast config:type="boolean">false</nis_broadcast>
     <nis_broken_server config:type="boolean">false</nis_broken_server>
@@ -288,11 +288,11 @@
     <start_autofs config:type="boolean">false</start_autofs>
     <start_nis config:type="boolean">false</start_nis>
   </nis>
-  
-  
+
+
   <!-- File system partitioning -->
   <partitioning config:type="list">
-  
+
     <!-- Root partition and swap space -->
     <drive>
       <device>replace_root_device</device>
@@ -323,7 +323,7 @@
     </drive>
   </partitioning>
 
-  
+
   <proxy>
     <enabled config:type="boolean">false</enabled>
     <ftp_proxy></ftp_proxy>
@@ -333,8 +333,8 @@
     <proxy_password></proxy_password>
     <proxy_user></proxy_user>
   </proxy>
-  
-  
+
+
   <report>
     <errors>
       <log config:type="boolean">true</log>
@@ -357,13 +357,13 @@
       <timeout config:type="integer">0</timeout>
     </yesno_messages>
   </report>
-  
-  
+
+
   <runlevel>
     <default>5</default>
   </runlevel>
-  
-  
+
+
   <!-- Software to install on Linux -->
   <software>
     <patterns config:type="list">
@@ -373,15 +373,15 @@
       replace_software_packages
     </packages>
   </software>
-  
-  
+
+
   <!-- Time zone -->
   <timezone>
     <hwclock>UTC</hwclock>
     <timezone>US/Eastern</timezone>
   </timezone>
-  
-  
+
+
   <user_defaults>
     <expire></expire>
     <group>100</group>
@@ -391,8 +391,8 @@
     <shell>/bin/bash</shell>
     <skel>/etc/skel</skel>
   </user_defaults>
-  
-  
+
+
   <!-- Users on Linux -->
   <users config:type="list">
     <user>
@@ -698,13 +698,13 @@
       <username>sshd</username>
     </user>
   </users>
-  
-  
+
+
   <zfcp>
     replace_zfcp
   </zfcp>
-  
-  
+
+
   <!-- Scripts (post-script) -->
   <configure>
     <scripts>
diff --git a/xCAT-server/share/xcat/install/ubuntu/compute.tmpl b/xCAT-server/share/xcat/install/ubuntu/compute.tmpl
index 15b9d7056..8bc2f7538 100644
--- a/xCAT-server/share/xcat/install/ubuntu/compute.tmpl
+++ b/xCAT-server/share/xcat/install/ubuntu/compute.tmpl
@@ -34,7 +34,7 @@ d-i netcfg/dhcp_timeout string 120
 #d-i mirror/suite string testing
 # Suite to use for loading installer components (optional).
 #d-i mirror/udeb/suite string testing
- 
+
 
 # Use the following option to add additional boot parameters for the
 # installed system (if supported by the bootloader installer).
@@ -49,7 +49,7 @@ d-i partman-auto/method string regular
 d-i partman-lvm/device_remove_lvm boolean true
 d-i partman-md/device_remove_md boolean true
 
-#create the /tmp/partitionfile based on the uefi or legacy bios 
+#create the /tmp/partitionfile based on the uefi or legacy bios
 d-i partman/early_command string \
 { \
 #INCLUDE_GET_INSTALL_DISK_SCRIPT#  \
@@ -67,7 +67,7 @@ d-i partman/confirm_nooverwrite boolean true
 
 #XCA_PARTMAN_ADDITIONAL_CFG#
 
-### Account setup 
+### Account setup
 
 d-i passwd/root-login boolean true
 d-i passwd/make-user boolean false
diff --git a/xCAT-server/share/xcat/install/ubuntu/compute.ubuntu18.04.ppc64el.pkglist b/xCAT-server/share/xcat/install/ubuntu/compute.ubuntu18.04.ppc64el.pkglist
index 80a145e6a..7a080055c 100644
--- a/xCAT-server/share/xcat/install/ubuntu/compute.ubuntu18.04.ppc64el.pkglist
+++ b/xCAT-server/share/xcat/install/ubuntu/compute.ubuntu18.04.ppc64el.pkglist
@@ -12,3 +12,4 @@ rsync
 busybox-static
 gawk
 dnsutils
+chrony
diff --git a/xCAT-server/share/xcat/install/ubuntu/compute.ubuntu18.04.x86_64.pkglist b/xCAT-server/share/xcat/install/ubuntu/compute.ubuntu18.04.x86_64.pkglist
index 80a145e6a..7a080055c 100644
--- a/xCAT-server/share/xcat/install/ubuntu/compute.ubuntu18.04.x86_64.pkglist
+++ b/xCAT-server/share/xcat/install/ubuntu/compute.ubuntu18.04.x86_64.pkglist
@@ -12,3 +12,4 @@ rsync
 busybox-static
 gawk
 dnsutils
+chrony
diff --git a/xCAT-server/share/xcat/install/ubuntu/service.pkglist b/xCAT-server/share/xcat/install/ubuntu/service.pkglist
index 2bf710c9b..5eb90997c 100644
--- a/xCAT-server/share/xcat/install/ubuntu/service.pkglist
+++ b/xCAT-server/share/xcat/install/ubuntu/service.pkglist
@@ -4,5 +4,5 @@ gawk
 nfs-common
 snmpd
 libdbd-mysql-perl
-libodbc1 
+libodbc1
 
diff --git a/xCAT-server/share/xcat/mypostscript/mypostscript.tmpl b/xCAT-server/share/xcat/mypostscript/mypostscript.tmpl
index 51c0df210..c8953b2cd 100755
--- a/xCAT-server/share/xcat/mypostscript/mypostscript.tmpl
+++ b/xCAT-server/share/xcat/mypostscript/mypostscript.tmpl
@@ -12,8 +12,8 @@ export ENABLESSHBETWEENNODES
 ZONENAME=$ZONENAME
 export ZONENAME
 
-## tabdump(<TABLENAME>) is used to get all the information 
-## in the <TABLENAME> table 
+## tabdump(<TABLENAME>) is used to get all the information
+## in the <TABLENAME> table
 ## The <TABLENAME> should only be non-"node key" table
 ## and two keys table, such as networks, passwd.
 ## <TABLENAME> should not be site, auditlog or eventlog.
@@ -31,7 +31,7 @@ export IPADDR
 
 # get GROUP list
 GROUP=#TABLE:nodelist:$NODE:groups#
-export GROUP 
+export GROUP
 
 ## This is the syntax to get the value of one attribute from the
 ## <tablename> and its key is $NODE.
@@ -96,11 +96,11 @@ export MACMAC
 MACADDRESS=$MACADDRESS
 export MACADDRESS
 
-## vlan related items. vlan may not be configured. 
+## vlan related items. vlan may not be configured.
 #VLAN_VARS_EXPORT#
 
 
-## get monitoring server and other configuration data for monitoring setup on nodes. This may not be configured. 
+## get monitoring server and other configuration data for monitoring setup on nodes. This may not be configured.
 #MONITORING_VARS_EXPORT#
 
 
@@ -153,19 +153,19 @@ SWITCHNAME=#TABLE:switches:$NODE:switch#
 export SWITCHNAME
 
 SNMPVERSION=#TABLE:switches:$NODE:snmpversion#
-export SNMPVERSION 
+export SNMPVERSION
 
 SNMPUSER=#TABLE:switches:$NODE:username#
-export SNMPUSER 
+export SNMPUSER
 
 SNMPPASSWD=#TABLE:switches:$NODE:password#
-export SNMPPASSWD 
+export SNMPPASSWD
 
 SNMPPRIV=#TABLE:switches:$NODE:privacy#
-export SNMPPRIV 
+export SNMPPRIV
 
 SNMPAUTH=#TABLE:switches:$NODE:auth#
-export SNMPAUTH 
+export SNMPAUTH
 
 #CFGMGTINFO_EXPORT#
 
@@ -173,18 +173,18 @@ export SNMPAUTH
 
 
 ##
-##The line postscripts-start-here must not be deleted. 
+##The line postscripts-start-here must not be deleted.
 # postscripts-start-here
 
 #INCLUDE_POSTSCRIPTS_LIST#
 
-##The line postscripts-end-here must not be deleted. 
+##The line postscripts-end-here must not be deleted.
 # postscripts-end-here
 
-## The line postbootscripts-start-here must not be deleted. 
+## The line postbootscripts-start-here must not be deleted.
 # postbootscripts-start-here
 
 #INCLUDE_POSTBOOTSCRIPTS_LIST#
 
-## The line postbootscripts-end-here must not be deleted. 
+## The line postbootscripts-end-here must not be deleted.
 # postbootscripts-end-here
diff --git a/xCAT-server/share/xcat/netboot/SL/compute.pkglist b/xCAT-server/share/xcat/netboot/SL/compute.pkglist
index 42f78c8a2..b9a209ba8 100644
--- a/xCAT-server/share/xcat/netboot/SL/compute.pkglist
+++ b/xCAT-server/share/xcat/netboot/SL/compute.pkglist
@@ -1,9 +1,9 @@
-bash 
+bash
 nfs-utils
 openssl
-dhclient 
-kernel 
-openssh-server 
+dhclient
+kernel
+openssh-server
 openssh-clients
 busybox-anaconda
 wget
diff --git a/xCAT-server/share/xcat/netboot/add-on/autogpfs/autogpfsc b/xCAT-server/share/xcat/netboot/add-on/autogpfs/autogpfsc
index ca27be4f5..ed144b0a8 100755
--- a/xCAT-server/share/xcat/netboot/add-on/autogpfs/autogpfsc
+++ b/xCAT-server/share/xcat/netboot/add-on/autogpfs/autogpfsc
@@ -12,7 +12,7 @@
 
 # let see how we were called
 case "$1" in
-	start) 
+	start)
 		echo "Starting autoGPFS: "
 
 		lastexit=2
diff --git a/xCAT-server/share/xcat/netboot/add-on/autogpfs/autogpfsd b/xCAT-server/share/xcat/netboot/add-on/autogpfs/autogpfsd
index ce135ec1c..12999fa97 100755
--- a/xCAT-server/share/xcat/netboot/add-on/autogpfs/autogpfsd
+++ b/xCAT-server/share/xcat/netboot/add-on/autogpfs/autogpfsd
@@ -11,7 +11,7 @@
 
 # let see how we were called
 case "$1" in
-	start) 
+	start)
 		echo -n "Starting autogpfsd daemon: "
 		/usr/sbin/autogpfsd.pl && echo_success || echo_failure
 		echo
diff --git a/xCAT-server/share/xcat/netboot/add-on/statelite/rc.localdisk b/xCAT-server/share/xcat/netboot/add-on/statelite/rc.localdisk
index d83d4ffb1..6823bb84b 100755
--- a/xCAT-server/share/xcat/netboot/add-on/statelite/rc.localdisk
+++ b/xCAT-server/share/xcat/netboot/add-on/statelite/rc.localdisk
@@ -102,7 +102,7 @@ doconfigure () {
             exit 1
         fi
 
-        # To recreate the disk label when clear=yes, this action is used to resolve the issue 
+        # To recreate the disk label when clear=yes, this action is used to resolve the issue
         # that the disk has been formatted by AIX
         if [ x$clear != x ]; then
             `parted -s $dev mklabel msdos`
@@ -122,7 +122,7 @@ doconfigure () {
             msg=`echo $PLINE | grep 'unrecognised disk label'`
             if [ x"$msg" != x ]; then
                 devname=`echo $PLINE | awk -F' ' '{print $2}' | sed -e "s/://g"`
-            
+
                 if [ x$devname = x"$dev" ]; then
                     #create the label
                     `parted -s $dev mklabel msdos`
@@ -132,12 +132,12 @@ doconfigure () {
         done <  $PARTLOG
 
         `parted -lsm > $PARTLOG`
-        
+
         partinfo=`parted -lsm`
         # Verbose message
         echo "Original partition list" >>$LOG
         echo $partinfo >>$LOG
-        
+
         getpart=0
         while read PLINE
         do
@@ -161,7 +161,7 @@ doconfigure () {
                     partnum=`expr $partnum + 1`
                 fi
             fi
-        done < $PARTLOG 
+        done < $PARTLOG
 
         if [ $getpart -eq 0 ]; then
             echo "Error: Cannot get partition information for $dev" >>$LOG
@@ -319,7 +319,7 @@ do
                 fi
             elif [ x$key = x"enablepart" ]; then
                 enablepart=$value
-            fi 
+            fi
         fi
     fi
 done <  $PARTFILE
@@ -392,7 +392,7 @@ do
                 touch ${MNTDIR}${FPATH}
                 echo "touch ${MNTDIR}${FPATH}" >>$LOG
                 needsync=0
-            fi 
+            fi
             if [ ! -f ${MNTDIR}${LOCAL}${FPATH} ]; then
                 touch ${MNTDIR}${LOCAL}${FPATH}
                 echo "touch ${MNTDIR}${LOCAL}${FPATH}" >>$LOG
diff --git a/xCAT-server/share/xcat/netboot/add-on/statelite/rc.statelite b/xCAT-server/share/xcat/netboot/add-on/statelite/rc.statelite
index 56e39f60b..ac61f1173 100755
--- a/xCAT-server/share/xcat/netboot/add-on/statelite/rc.statelite
+++ b/xCAT-server/share/xcat/netboot/add-on/statelite/rc.statelite
@@ -1,5 +1,5 @@
 #!/bin/bash
-# rc.statelite will grab all the mount points we need to check 
+# rc.statelite will grab all the mount points we need to check
 # for keeping an image together.  This will have to do until unionfs
 # is ready.
 # don't do chkconfig: 345 00 99
@@ -18,8 +18,8 @@ DEFAULT="${MNTDIR}/.default"
 LOCAL="${MNTDIR}/.sllocal/localmnt"
 LOG="${MNTDIR}/${SL}/statelite.log"
 ELIST=[]    # entry list, each entry will contain the type and the path
-declare -a CLIST 
-declare -a PLIST 
+declare -a CLIST
+declare -a PLIST
 
 PERSISTENT="${MNTDIR}/$SL/persistent"
 
@@ -35,7 +35,7 @@ GetSyncInfo () {
 	# who is our xCAT server?  He's most likely our dhcp identifier.
 	
 	if [ ! -x ${MNTDIR}/usr/bin/openssl ]; then
-		echo "Image does not include openssl!"  
+		echo "Image does not include openssl!"
 		exit 1
 	fi
 	
@@ -93,7 +93,7 @@ GetSyncInfo () {
 
 	# files will now be inside /.snapshot/tmpfs/synclist in the form:
 	# options path
-    
+
 	xCATCmd $XCATSERVER litetree  \
 		| sed  -e 's/<[^>]*>//g' \
 		| egrep -v '^ *$' \
@@ -164,8 +164,8 @@ MountTrees () {
 
 ResolveLinks () {
     exec <$SYNCLIST
-    i=0 
-    while read type path 
+    i=0
+    while read type path
     do
         ELIST[$i]="$type $path";
         i=$[ $i+1 ];
@@ -176,7 +176,7 @@ ResolveLinks () {
         set -- ${ELIST[$i]}
         type=$1
         path=$2
-    
+
         parent="`/usr/bin/dirname $path`/"
         efound=0
         while [ "$parent" != "//" ]; do
@@ -187,11 +187,11 @@ ResolveLinks () {
                 if [ "$parent" = "$jpath" ]; then
                     efound=1
                     break 2
-                fi  
+                fi
             done
             parent="`/usr/bin/dirname $parent`/"
         done
-    
+
         if [ "$efound" = "1" ]; then
             # put it into CLIST
             CLIST[$[ ${#CLIST[@]} ]]=${ELIST[$i]}
@@ -207,7 +207,7 @@ ResolveLinks () {
                 # put it into PLIST
                 PLIST[$[ ${#PLIST[@]} ]]=${ELIST[$i]}
             fi
-        fi  
+        fi
     done
 
     num=${#PLIST[@]}
@@ -240,7 +240,7 @@ ProcessType () {
 		echo "mkdir -p ${TMPFS}${PPATH}" >>$LOG
 	fi	
 	
-	case "${3}" in 
+	case "${3}" in
         link)       # the previous name is tmpfs,rw
             if [ -d ${TMPFS}${2} ]; then
                 /bin/cp -r -a ${1}* ${TMPFS}${2}
@@ -270,7 +270,7 @@ ProcessType () {
             if [ "${4}" = "0" ]; then
 			    TARGET=`echo ${TMPFS}${2} |  /bin/sed -e 's/\/$//'`
 			    LINK=`echo ${1} | /bin/sed -e "s|^${MNTDIR}||"`
-			    
+			
 			    echo "ln -sf ${LINK} ${TARGET}" >>$LOG 2>&1
 			    /bin/ln -sf ${LINK} ${TARGET} >>$LOG 2>&1
             fi
@@ -355,7 +355,7 @@ ProcessType () {
         tempfs)         # "tempfs" is kept here for compatibility, "tmpfs" has replaced it
             ORIG=`echo ${2} |  /bin/sed -e 's/\/$//'`
             TARGET=`echo ${1}`
-            
+
             if [ -d ${TMPFS}${2} ]; then
                 /bin/cp -r -a ${1}* ${TMPFS}${2}
                 echo "cp -r -a ${1}* ${TMPFS}${2}" >>$LOG
@@ -363,16 +363,16 @@ ProcessType () {
                 /bin/cp -r -a ${1} ${TMPFS}${2}
                 echo "cp -r -a ${1} ${TMPFS}${2}" >>$LOG
             fi
-            
+
             if [ "$isChild" = "0" ]; then
                 echo "mount --bind ${TMPFS}${2} ${MNTDIR}${ORIG}" >>$LOG
-                /bin/mount --bind ${TMPFS}${2} ${MNTDIR}${ORIG}>>$LOG 2>&1           
+                /bin/mount --bind ${TMPFS}${2} ${MNTDIR}${ORIG}>>$LOG 2>&1
             fi
             ;;
          tmpfs)         # the default option, same as "rw" and "NULL"
             ORIG=`echo ${2} |  /bin/sed -e 's/\/$//'`
             TARGET=`echo ${1}`
-            
+
             if [ -d ${TMPFS}${2} ]; then
                 /bin/cp -r -a ${1}* ${TMPFS}${2}
                 echo "cp -r -a ${1}* ${TMPFS}${2}" >>$LOG
@@ -380,10 +380,10 @@ ProcessType () {
                 /bin/cp -r -a ${1} ${TMPFS}${2}
                 echo "cp -r -a ${1} ${TMPFS}${2}" >>$LOG
             fi
-            
+
             if [ "$isChild" = "0" ]; then
                 echo "mount --bind ${TMPFS}${2} ${MNTDIR}${ORIG}" >>$LOG
-                /bin/mount --bind ${TMPFS}${2} ${MNTDIR}${ORIG}>>$LOG 2>&1           
+                /bin/mount --bind ${TMPFS}${2} ${MNTDIR}${ORIG}>>$LOG 2>&1
             fi
             ;;
        localdisk)
@@ -416,7 +416,7 @@ ProcessType () {
        rw)         # the default option, same as "tmpfs" and "NULL"
             ORIG=`echo ${2} |  /bin/sed -e 's/\/$//'`
             TARGET=`echo ${1}`
-            
+
             if [ -d ${TMPFS}${2} ]; then
                 /bin/cp -r -a ${1}* ${TMPFS}${2}
                 echo "cp -r -a ${1}* ${TMPFS}${2}" >>$LOG
@@ -424,10 +424,10 @@ ProcessType () {
                 /bin/cp -r -a ${1} ${TMPFS}${2}
                 echo "cp -r -a ${1} ${TMPFS}${2}" >>$LOG
             fi
-            
+
             if [ "$isChild" = "0" ]; then
                 echo "mount --bind ${TMPFS}${2} ${MNTDIR}${ORIG}" >>$LOG
-                /bin/mount --bind ${TMPFS}${2} ${MNTDIR}${ORIG}>>$LOG 2>&1           
+                /bin/mount --bind ${TMPFS}${2} ${MNTDIR}${ORIG}>>$LOG 2>&1
             fi
             ;;
         persistent)
@@ -448,7 +448,7 @@ ProcessType () {
             echo "mount --bind ${TARGET} ${MNTDIR}/${ORIG}" >>$LOG
             /bin/mount --bind ${TARGET} ${MNTDIR}/${ORIG}>>$LOG 2>&1
             ;;
-		ro)  
+		ro)
 			# need to make sure directory exists:
 			if [ ! -d ${TMPFS}${PPATH} ]; then
 				/bin/mkdir -p ${TMPFS}${PPATH} >>$LOG 2>&1
@@ -457,7 +457,7 @@ ProcessType () {
             # before mount, need to check whether it exists or not
             STRPATH="${TMPFS}${2}"
             STRLEN=${#STRPATH}
-            CHAREND=`echo ${STRPATH} | /usr/bin/cut -c${STRLEN}`            
+            CHAREND=`echo ${STRPATH} | /usr/bin/cut -c${STRLEN}`
 
             if [ "${CHAREND}" = "/" ]; then # it is one directory
                     /bin/rm -rf ${STRPATH}
diff --git a/xCAT-server/share/xcat/netboot/add-on/statelite/rc.statelite.ppc.redhat b/xCAT-server/share/xcat/netboot/add-on/statelite/rc.statelite.ppc.redhat
index fafd5ebaf..8aa5dac22 100755
--- a/xCAT-server/share/xcat/netboot/add-on/statelite/rc.statelite.ppc.redhat
+++ b/xCAT-server/share/xcat/netboot/add-on/statelite/rc.statelite.ppc.redhat
@@ -1,5 +1,5 @@
 #!/bin/bash
-# rc.statelite will grab all the mount points we need to check 
+# rc.statelite will grab all the mount points we need to check
 # for keeping an image together.  This will have to do until unionfs
 # is ready.
 # don't do chkconfig: 345 00 99
@@ -18,8 +18,8 @@ DEFAULT="${MNTDIR}/.default"
 LOCAL="${MNTDIR}/.sllocal/localmnt"
 LOG="${MNTDIR}/${SL}/statelite.log"
 ELIST=[]    # entry list, each entry will contain the type and the path
-declare -a CLIST 
-declare -a PLIST 
+declare -a CLIST
+declare -a PLIST
 
 PERSISTENT="${MNTDIR}/$SL/persistent"
 
@@ -35,7 +35,7 @@ GetSyncInfo () {
 	# who is our xCAT server?  He's most likely our dhcp identifier.
 	
 	if [ ! -x ${MNTDIR}/usr/bin/openssl ]; then
-		echo "Image does not include openssl!"  
+		echo "Image does not include openssl!"
 		exit 1
 	fi
 	
@@ -93,7 +93,7 @@ GetSyncInfo () {
 
 	# files will now be inside /.snapshot/tmpfs/synclist in the form:
 	# options path
-    
+
 	xCATCmd $XCATSERVER litetree  \
 		| sed  -e 's/<[^>]*>//g' \
 		| egrep -v '^ *$' \
@@ -164,8 +164,8 @@ MountTrees () {
 
 ResolveLinks () {
     exec <$SYNCLIST
-    i=0 
-    while read type path 
+    i=0
+    while read type path
     do
         ELIST[$i]="$type $path";
         i=$[ $i+1 ];
@@ -176,7 +176,7 @@ ResolveLinks () {
         set -- ${ELIST[$i]}
         type=$1
         path=$2
-    
+
         parent="`/usr/bin/dirname $path`/"
         efound=0
         while [ "$parent" != "//" ]; do
@@ -187,11 +187,11 @@ ResolveLinks () {
                 if [ "$parent" = "$jpath" ]; then
                     efound=1
                     break 2
-                fi  
+                fi
             done
             parent="`/usr/bin/dirname $parent`/"
         done
-    
+
         if [ "$efound" = "1" ]; then
             # put it into CLIST
             CLIST[$[ ${#CLIST[@]} ]]=${ELIST[$i]}
@@ -207,7 +207,7 @@ ResolveLinks () {
                 # put it into PLIST
                 PLIST[$[ ${#PLIST[@]} ]]=${ELIST[$i]}
             fi
-        fi  
+        fi
     done
 
     num=${#PLIST[@]}
@@ -240,7 +240,7 @@ ProcessType () {
 		echo "mkdir -p ${TMPFS}${PPATH}" >>$LOG
 	fi	
 	
-	case "${3}" in 
+	case "${3}" in
         link)       # the previous name is tmpfs,rw
             if [ -d ${TMPFS}${2} ]; then
             /bin/cp -r -a ${1}* ${TMPFS}${2}
@@ -270,7 +270,7 @@ ProcessType () {
             if [ "${4}" = "0" ]; then
 			    TARGET=`echo ${TMPFS}${2} |  /bin/sed -e 's/\/$//'`
 			    LINK=`echo ${1} | /bin/sed -e "s|^${MNTDIR}||"`
-			    
+			
 			    echo "ln -sf ${LINK} ${TARGET}" >>$LOG 2>&1
 			    /bin/ln -sf ${LINK} ${TARGET} >>$LOG 2>&1
             fi
@@ -355,7 +355,7 @@ ProcessType () {
         tempfs)         # "tempfs" is kept here for compatibility, "tmpfs" has replaced it
             ORIG=`echo ${2} |  /bin/sed -e 's/\/$//'`
             TARGET=`echo ${1}`
-            
+
             if [ -d ${TMPFS}${2} ]; then
                 /bin/cp -r -a ${1}* ${TMPFS}${2}
                 echo "cp -r -a ${1}* ${TMPFS}${2}" >>$LOG
@@ -363,16 +363,16 @@ ProcessType () {
                 /bin/cp -r -a ${1} ${TMPFS}${2}
                 echo "cp -r -a ${1} ${TMPFS}${2}" >>$LOG
             fi
-            
+
             if [ "$isChild" = "0" ]; then
                 echo "mount --bind ${TMPFS}${2} ${MNTDIR}${ORIG}" >>$LOG
-                /bin/mount --bind ${TMPFS}${2} ${MNTDIR}${ORIG}>>$LOG 2>&1           
+                /bin/mount --bind ${TMPFS}${2} ${MNTDIR}${ORIG}>>$LOG 2>&1
             fi
             ;;
          tmpfs)         # the default option, same as "rw" and "NULL"
             ORIG=`echo ${2} |  /bin/sed -e 's/\/$//'`
             TARGET=`echo ${1}`
-            
+
             if [ -d ${TMPFS}${2} ]; then
                 /bin/cp -r -a ${1}* ${TMPFS}${2}
                 echo "cp -r -a ${1}* ${TMPFS}${2}" >>$LOG
@@ -380,10 +380,10 @@ ProcessType () {
                 /bin/cp -r -a ${1} ${TMPFS}${2}
                 echo "cp -r -a ${1} ${TMPFS}${2}" >>$LOG
             fi
-            
+
             if [ "$isChild" = "0" ]; then
                 echo "mount --bind ${TMPFS}${2} ${MNTDIR}${ORIG}" >>$LOG
-                /bin/mount --bind ${TMPFS}${2} ${MNTDIR}${ORIG}>>$LOG 2>&1           
+                /bin/mount --bind ${TMPFS}${2} ${MNTDIR}${ORIG}>>$LOG 2>&1
             fi
             ;;
        localdisk)
@@ -416,7 +416,7 @@ ProcessType () {
        rw)         # the default option, same as "tmpfs" and "NULL"
             ORIG=`echo ${2} |  /bin/sed -e 's/\/$//'`
             TARGET=`echo ${1}`
-            
+
             if [ -d ${TMPFS}${2} ]; then
                 /bin/cp -r -a ${1}* ${TMPFS}${2}
                 echo "cp -r -a ${1}* ${TMPFS}${2}" >>$LOG
@@ -424,10 +424,10 @@ ProcessType () {
                 /bin/cp -r -a ${1} ${TMPFS}${2}
                 echo "cp -r -a ${1} ${TMPFS}${2}" >>$LOG
             fi
-            
+
             if [ "$isChild" = "0" ]; then
                 echo "mount --bind ${TMPFS}${2} ${MNTDIR}${ORIG}" >>$LOG
-                /bin/mount --bind ${TMPFS}${2} ${MNTDIR}${ORIG}>>$LOG 2>&1           
+                /bin/mount --bind ${TMPFS}${2} ${MNTDIR}${ORIG}>>$LOG 2>&1
             fi
             ;;
         persistent)
@@ -448,7 +448,7 @@ ProcessType () {
             echo "mount --bind ${TARGET} ${MNTDIR}/${ORIG}" >>$LOG
             /bin/mount --bind ${TARGET} ${MNTDIR}/${ORIG}>>$LOG 2>&1
             ;;
-		ro)  
+		ro)
 			# need to make sure directory exists:
 			if [ ! -d ${TMPFS}${PPATH} ]; then
 				/bin/mkdir -p ${TMPFS}${PPATH} >>$LOG 2>&1
@@ -457,7 +457,7 @@ ProcessType () {
             # before mount, need to check whether it exists or not
             STRPATH="${TMPFS}${2}"
             STRLEN=${#STRPATH}
-            CHAREND=`echo ${STRPATH} | /bin/cut -c${STRLEN}`            
+            CHAREND=`echo ${STRPATH} | /bin/cut -c${STRLEN}`
 
             if [ "${CHAREND}" = "/" ]; then # it is one directory
                 if [ ! -d ${STRPATH} ]; then
diff --git a/xCAT-server/share/xcat/netboot/add-on/torque/moab b/xCAT-server/share/xcat/netboot/add-on/torque/moab
index 085fca7c1..eed7ac211 100755
--- a/xCAT-server/share/xcat/netboot/add-on/torque/moab
+++ b/xCAT-server/share/xcat/netboot/add-on/torque/moab
@@ -15,7 +15,7 @@ export LD_LIBRARY_PATH=/opt/torque/x86_64/lib
 
 # let see how we were called
 case "$1" in
-	start) 
+	start)
 		echo -n "Starting MOAB Scheduler: "
 		if [ -r $MOAB_PREFIX/bin/moab ]
 		then
diff --git a/xCAT-server/share/xcat/netboot/add-on/torque/pbs b/xCAT-server/share/xcat/netboot/add-on/torque/pbs
index 64c352287..04071bab3 100755
--- a/xCAT-server/share/xcat/netboot/add-on/torque/pbs
+++ b/xCAT-server/share/xcat/netboot/add-on/torque/pbs
@@ -11,7 +11,7 @@
 
 # let see how we were called
 case "$1" in
-	start) 
+	start)
 		chkconfig --list pbs_mom 2>&1 | grep :on >/dev/null 2>&1
 		test "$?" = "0" && /etc/rc.d/init.d/pbs_mom start
 		chkconfig --list pbs_sched 2>&1 | grep :on >/dev/null 2>&1
diff --git a/xCAT-server/share/xcat/netboot/add-on/torque/pbs_mom b/xCAT-server/share/xcat/netboot/add-on/torque/pbs_mom
index 267a53dec..0515bd019 100755
--- a/xCAT-server/share/xcat/netboot/add-on/torque/pbs_mom
+++ b/xCAT-server/share/xcat/netboot/add-on/torque/pbs_mom
@@ -28,7 +28,7 @@ fi
 
 # let see how we were called
 case "$1" in
-	start) 
+	start)
 		if [ -r /etc/security/access.conf.BOOT ]
 		then
 			cp -f /etc/security/access.conf.BOOT /etc/security/access.conf
diff --git a/xCAT-server/share/xcat/netboot/add-on/torque/pbs_sched b/xCAT-server/share/xcat/netboot/add-on/torque/pbs_sched
index ce17f2631..a985d5a34 100755
--- a/xCAT-server/share/xcat/netboot/add-on/torque/pbs_sched
+++ b/xCAT-server/share/xcat/netboot/add-on/torque/pbs_sched
@@ -23,7 +23,7 @@ fi
 
 # let see how we were called
 case "$1" in
-	start) 
+	start)
 		echo -n "Starting PBS Scheduler: "
 		daemon $PBS_PREFIX/sbin/pbs_sched
 		echo
diff --git a/xCAT-server/share/xcat/netboot/add-on/torque/pbs_server b/xCAT-server/share/xcat/netboot/add-on/torque/pbs_server
index 6211a5711..fb6af8cde 100755
--- a/xCAT-server/share/xcat/netboot/add-on/torque/pbs_server
+++ b/xCAT-server/share/xcat/netboot/add-on/torque/pbs_server
@@ -25,7 +25,7 @@ PBS_HOME=/var/spool/torque
 
 # let see how we were called
 case "$1" in
-	start) 
+	start)
 		echo -n "Starting PBS Server: "
 		if [ -r $PBS_HOME/server_priv/serverdb ]
 		then
diff --git a/xCAT-server/share/xcat/netboot/centos/compute.centos6.pkglist b/xCAT-server/share/xcat/netboot/centos/compute.centos6.pkglist
index 908c031cb..ff811a4c0 100644
--- a/xCAT-server/share/xcat/netboot/centos/compute.centos6.pkglist
+++ b/xCAT-server/share/xcat/netboot/centos/compute.centos6.pkglist
@@ -1,9 +1,9 @@
-bash 
+bash
 nfs-utils
 openssl
-dhclient 
-kernel 
-openssh-server 
+dhclient
+kernel
+openssh-server
 openssh-clients
 wget
 rsync
diff --git a/xCAT-server/share/xcat/netboot/centos/compute.pkglist b/xCAT-server/share/xcat/netboot/centos/compute.pkglist
index 59545ae2e..0fd45355a 100644
--- a/xCAT-server/share/xcat/netboot/centos/compute.pkglist
+++ b/xCAT-server/share/xcat/netboot/centos/compute.pkglist
@@ -1,9 +1,9 @@
-bash 
+bash
 nfs-utils
 openssl
-dhclient 
-kernel 
-openssh-server 
+dhclient
+kernel
+openssh-server
 openssh-clients
 busybox-anaconda
 wget
diff --git a/xCAT-server/share/xcat/netboot/centos/kvm.centos6.pkglist b/xCAT-server/share/xcat/netboot/centos/kvm.centos6.pkglist
index e04f5aa7a..14a5f7ee1 100644
--- a/xCAT-server/share/xcat/netboot/centos/kvm.centos6.pkglist
+++ b/xCAT-server/share/xcat/netboot/centos/kvm.centos6.pkglist
@@ -1,11 +1,11 @@
-bash 
+bash
 screen
 dracut-network
 nfs-utils
 openssl
-dhclient 
-kernel 
-openssh-server 
+dhclient
+kernel
+openssh-server
 openssh-clients
 wget
 vim-minimal
diff --git a/xCAT-server/share/xcat/netboot/debian/compute.pkglist b/xCAT-server/share/xcat/netboot/debian/compute.pkglist
index 814e4c449..73dc6c776 100644
--- a/xCAT-server/share/xcat/netboot/debian/compute.pkglist
+++ b/xCAT-server/share/xcat/netboot/debian/compute.pkglist
@@ -1,9 +1,9 @@
-bash 
+bash
 nfs-common
 openssl
 dhcp3-client
 linux-image
-openssh-server 
+openssh-server
 openssh-client
 wget
 vim
diff --git a/xCAT-server/share/xcat/netboot/debian/genimage b/xCAT-server/share/xcat/netboot/debian/genimage
index 537e7d221..40ed5d484 100755
--- a/xCAT-server/share/xcat/netboot/debian/genimage
+++ b/xCAT-server/share/xcat/netboot/debian/genimage
@@ -571,7 +571,7 @@ MAGENTA="\033[35m"
 BROWN="\033[33m"
 NORMAL=\$RESET
 
-# This function is used to mount files/directories from the .statelite directory 
+# This function is used to mount files/directories from the .statelite directory
 #  over the root directory.
 # This function stolen from redhat
 shell() {
@@ -637,10 +637,10 @@ echo '
 echo '
                             _________     ________________
                      ___  __\\_   ___ \\   /  _  \\__    ___/
-                     \\  \\/  /    \\  \\/  /  /_\\  \\|    |   
-                      >    <\\     \\____/    |    \\    |   
-                     /__/\\_ \\\\______  /\\____|__  /____|   
-                           \\/       \\/         \\/         
+                     \\  \\/  /    \\  \\/  /  /_\\  \\|    |
+                      >    <\\     \\____/    |    \\    |
+                     /__/\\_ \\\\______  /\\____|__  /____|
+                           \\/       \\/         \\/
 '
         echo -e "\$RESET"
 }
@@ -720,7 +720,7 @@ for i in `cat /proc/cmdline`; do
         SERVER=`echo \$VALUE|awk -F/ '{print \$3}'`
         ROOTDIR=`echo \$VALUE|awk -F/ '{for(i=4;i<=NF;i++) printf "/%s",\$i}'`
       fi
-   # for NFS root 
+   # for NFS root
    elif [ "\$KEY" == 'NFSROOT' ]; then
 	NFSROOT=1
 	VALUE=`echo \$i |awk -F= '{print \$2}'`
@@ -765,7 +765,7 @@ if [ "\$NFSROOT" = "1" ]; then
 1.  This initrd wasn't created for statelite node?  rerun genimage with the -m statelite flag, then rerun 'nodeset \$ME statelite'
 2.  Is DNS set up?  Maybe that's why I can't mount \${SERVER}.
 3.  The nfs modules aren't set right in this initfs?"
-    
+
 			shell
 			exit
 		fi
@@ -855,13 +855,13 @@ if [ "\$NFSROOT" = "1" ]; then
 
 	
 
-	[ -e /etc/ntp.conf ] && mkdir -p \$NEWROOT/\$RWDIR/tmpfs/etc && cp /etc/ntp.conf \$NEWROOT/\$RWDIR/tmpfs/etc/ 
+	[ -e /etc/ntp.conf ] && mkdir -p \$NEWROOT/\$RWDIR/tmpfs/etc && cp /etc/ntp.conf \$NEWROOT/\$RWDIR/tmpfs/etc/
 
 	
-	[ -e /etc/ntp/step-kickers ] && mkdir -p \$NEWROOT/\$RWDIR/tmpfs/etc/ntp && cp /etc/ntp/step-kickers \$NEWROOT/\$RWDIR/tmpfs/etc/ntp 
+	[ -e /etc/ntp/step-kickers ] && mkdir -p \$NEWROOT/\$RWDIR/tmpfs/etc/ntp && cp /etc/ntp/step-kickers \$NEWROOT/\$RWDIR/tmpfs/etc/ntp
 
 	
-	[ -e /etc/resolv.conf ] && mkdir -p \$NEWROOT/\$RWDIR/tmpfs/etc && cp /etc/resolv.conf \$NEWROOT/\$RWDIR/tmpfs/etc/ 
+	[ -e /etc/resolv.conf ] && mkdir -p \$NEWROOT/\$RWDIR/tmpfs/etc && cp /etc/resolv.conf \$NEWROOT/\$RWDIR/tmpfs/etc/
 
 	# now that everything is mounted, lets do this
 	# hmmm, apparently I'm checking this twice... so I'd better
diff --git a/xCAT-server/share/xcat/netboot/esxi/47.xcat-networking b/xCAT-server/share/xcat/netboot/esxi/47.xcat-networking
index 14f262d2a..046c04c49 100644
--- a/xCAT-server/share/xcat/netboot/esxi/47.xcat-networking
+++ b/xCAT-server/share/xcat/netboot/esxi/47.xcat-networking
@@ -1,6 +1,6 @@
 #!/bin/sh
 #Default networking config supporting BOOTIF semantics
-#bring up one interface, if bonding, management software can do that 
+#bring up one interface, if bonding, management software can do that
 #after the fact
 MACADDR=`vsish -e get /system/bootCmdLine | grep MAC | sed 's/.*MAC=//'|sed 's/-/:/g'`
 if [ ! -z "$MACADDR" ]; then #if MAC= syntax detected, skip execution
diff --git a/xCAT-server/share/xcat/netboot/fedora/compute.fedora13.pkglist b/xCAT-server/share/xcat/netboot/fedora/compute.fedora13.pkglist
index 8e577d5c6..b8eac2975 100644
--- a/xCAT-server/share/xcat/netboot/fedora/compute.fedora13.pkglist
+++ b/xCAT-server/share/xcat/netboot/fedora/compute.fedora13.pkglist
@@ -1,10 +1,10 @@
-bash 
+bash
 dracut-network
 nfs-utils
 openssl
-dhclient 
-kernel 
-openssh-server 
+dhclient
+kernel
+openssh-server
 openssh-clients
 wget
 vim-minimal
diff --git a/xCAT-server/share/xcat/netboot/fedora/compute.fedora14.pkglist b/xCAT-server/share/xcat/netboot/fedora/compute.fedora14.pkglist
index 8e577d5c6..b8eac2975 100644
--- a/xCAT-server/share/xcat/netboot/fedora/compute.fedora14.pkglist
+++ b/xCAT-server/share/xcat/netboot/fedora/compute.fedora14.pkglist
@@ -1,10 +1,10 @@
-bash 
+bash
 dracut-network
 nfs-utils
 openssl
-dhclient 
-kernel 
-openssh-server 
+dhclient
+kernel
+openssh-server
 openssh-clients
 wget
 vim-minimal
diff --git a/xCAT-server/share/xcat/netboot/fedora/compute.pkglist b/xCAT-server/share/xcat/netboot/fedora/compute.pkglist
index 0995c70f7..935200c6d 100644
--- a/xCAT-server/share/xcat/netboot/fedora/compute.pkglist
+++ b/xCAT-server/share/xcat/netboot/fedora/compute.pkglist
@@ -1,9 +1,9 @@
-bash 
+bash
 nfs-utils
 openssl
-dhclient 
-kernel 
-openssh-server 
+dhclient
+kernel
+openssh-server
 openssh-clients
 busybox-anaconda
 wget
diff --git a/xCAT-server/share/xcat/netboot/fedora/compute.ppc64.pkglist b/xCAT-server/share/xcat/netboot/fedora/compute.ppc64.pkglist
index 59d797324..6ac997aab 100644
--- a/xCAT-server/share/xcat/netboot/fedora/compute.ppc64.pkglist
+++ b/xCAT-server/share/xcat/netboot/fedora/compute.ppc64.pkglist
@@ -2,7 +2,7 @@ bash
 nfs-utils
 openssl
 glibc.ppc64
-dhclient 
+dhclient
 kernel.ppc64
 busybox-anaconda
 openssh-server
diff --git a/xCAT-server/share/xcat/netboot/fedora/dracut_009/xcatroot b/xCAT-server/share/xcat/netboot/fedora/dracut_009/xcatroot
index dbed8bfbd..470d27ab7 100755
--- a/xCAT-server/share/xcat/netboot/fedora/dracut_009/xcatroot
+++ b/xCAT-server/share/xcat/netboot/fedora/dracut_009/xcatroot
@@ -40,7 +40,7 @@ if [ ! -z "$imgurl" ]; then
 		ROOTDIR=$SERVER
 		SERVER=${SERVER%%/*}
 		SERVER=${SERVER%:}
-		ROOTDIR=/${ROOTDIR#*/} 
+		ROOTDIR=/${ROOTDIR#*/}
 	fi
 fi
 #echo 0 > /proc/sys/vm/zone_reclaim_mode #Avoid kernel bug
@@ -76,7 +76,7 @@ elif [ -r /rootimg.gz ]; then
   echo Done
 elif [ -r /rootimg-statelite.gz ]; then
   echo Setting up RAM-root tmpfs for statelite mode.
- 
+
   if [ -z $rootlimit];then
     mount -t tmpfs -o mode=755 rootfs $NEWROOT
   else
@@ -92,7 +92,7 @@ elif [ -r /rootimg-statelite.gz ]; then
   fi
   echo Done
   # then, the statelite staffs will be processed
-  echo Setting up Statelite 
+  echo Setting up Statelite
   modprobe nfs
   MAXTRIES=7
   ITER=0
@@ -130,7 +130,7 @@ elif [ -r /rootimg-statelite.gz ]; then
     ITER=0
 	if [ -z $MNTOPTS ]; then
                 MNT_OPTIONS="nolock,rsize=32768,tcp,timeo=14"
-                
+
 	else
 		MNT_OPTIONS=$MNTOPTS
 	fi
diff --git a/xCAT-server/share/xcat/netboot/fedora12/compute.pkglist b/xCAT-server/share/xcat/netboot/fedora12/compute.pkglist
index e91239135..51129cf22 100644
--- a/xCAT-server/share/xcat/netboot/fedora12/compute.pkglist
+++ b/xCAT-server/share/xcat/netboot/fedora12/compute.pkglist
@@ -1,9 +1,9 @@
-bash 
+bash
 nfs-utils
 openssl
-dhclient 
-kernel 
-openssh-server 
+dhclient
+kernel
+openssh-server
 openssh-clients
 wget
 ntp
diff --git a/xCAT-server/share/xcat/netboot/fedora12/compute.ppc64.pkglist b/xCAT-server/share/xcat/netboot/fedora12/compute.ppc64.pkglist
index 59d797324..6ac997aab 100644
--- a/xCAT-server/share/xcat/netboot/fedora12/compute.ppc64.pkglist
+++ b/xCAT-server/share/xcat/netboot/fedora12/compute.ppc64.pkglist
@@ -2,7 +2,7 @@ bash
 nfs-utils
 openssl
 glibc.ppc64
-dhclient 
+dhclient
 kernel.ppc64
 busybox-anaconda
 openssh-server
diff --git a/xCAT-server/share/xcat/netboot/fedora12/genimage b/xCAT-server/share/xcat/netboot/fedora12/genimage
index 23f831ec4..46be3324f 100755
--- a/xCAT-server/share/xcat/netboot/fedora12/genimage
+++ b/xCAT-server/share/xcat/netboot/fedora12/genimage
@@ -568,7 +568,7 @@ MAGENTA="\033[35m"
 BROWN="\033[33m"
 NORMAL=\$RESET
 
-# This function is used to mount files/directories from the .statelite directory 
+# This function is used to mount files/directories from the .statelite directory
 #  over the root directory.
 # This function stolen from redhat
 shell() {
@@ -611,10 +611,10 @@ echo '
 echo '
                             _________     ________________
                      ___  __\\_   ___ \\   /  _  \\__    ___/
-                     \\  \\/  /    \\  \\/  /  /_\\  \\|    |   
-                      >    <\\     \\____/    |    \\    |   
-                     /__/\\_ \\\\______  /\\____|__  /____|   
-                           \\/       \\/         \\/         
+                     \\  \\/  /    \\  \\/  /  /_\\  \\|    |
+                      >    <\\     \\____/    |    \\    |
+                     /__/\\_ \\\\______  /\\____|__  /____|
+                           \\/       \\/         \\/
 '
         echo "\$RESET"
 }
@@ -695,7 +695,7 @@ for i in `cat /proc/cmdline`; do
         SERVER=`echo \$VALUE|awk -F/ '{print \$3}'`
         ROOTDIR=`echo \$VALUE|awk -F/ '{for(i=4;i<=NF;i++) printf "/%s",\$i}'`
       fi
-   # for NFS root 
+   # for NFS root
    elif [ "\$KEY" == 'NFSROOT' ]; then
 	NFSROOT=1
 	VALUE=`echo \$i |awk -F= '{print \$2}'`
@@ -740,7 +740,7 @@ if [ "\$NFSROOT" = "1" ]; then
 1.  This initrd wasn't created for statelite node?  rerun genimage with the -m statelite flag, then rerun 'nodeset \$ME statelite'
 2.  Is DNS set up?  Maybe that's why I can't mount \${SERVER}.
 3.  The nfs modules aren't set right in this initfs?"
-    
+
 			shell
 			exit
 		fi
@@ -830,13 +830,13 @@ if [ "\$NFSROOT" = "1" ]; then
 
 	
 
-	[ -e /etc/ntp.conf ] && mkdir -p \$NEWROOT/\$RWDIR/tmpfs/etc && cp /etc/ntp.conf \$NEWROOT/\$RWDIR/tmpfs/etc/ 
+	[ -e /etc/ntp.conf ] && mkdir -p \$NEWROOT/\$RWDIR/tmpfs/etc && cp /etc/ntp.conf \$NEWROOT/\$RWDIR/tmpfs/etc/
 
 	
-	[ -e /etc/ntp/step-kickers ] && mkdir -p \$NEWROOT/\$RWDIR/tmpfs/etc/ntp && cp /etc/ntp/step-kickers \$NEWROOT/\$RWDIR/tmpfs/etc/ntp 
+	[ -e /etc/ntp/step-kickers ] && mkdir -p \$NEWROOT/\$RWDIR/tmpfs/etc/ntp && cp /etc/ntp/step-kickers \$NEWROOT/\$RWDIR/tmpfs/etc/ntp
 
 	
-	[ -e /etc/resolv.conf ] && mkdir -p \$NEWROOT/\$RWDIR/tmpfs/etc && cp /etc/resolv.conf \$NEWROOT/\$RWDIR/tmpfs/etc/ 
+	[ -e /etc/resolv.conf ] && mkdir -p \$NEWROOT/\$RWDIR/tmpfs/etc && cp /etc/resolv.conf \$NEWROOT/\$RWDIR/tmpfs/etc/
 
 	# now that everything is mounted, lets do this
 	# hmmm, apparently I'm checking this twice... so I'd better
diff --git a/xCAT-server/share/xcat/netboot/fedora12/geninitrd b/xCAT-server/share/xcat/netboot/fedora12/geninitrd
index 95480753b..62c5a1401 100755
--- a/xCAT-server/share/xcat/netboot/fedora12/geninitrd
+++ b/xCAT-server/share/xcat/netboot/fedora12/geninitrd
@@ -521,7 +521,7 @@ MAGENTA="\033[35m"
 BROWN="\033[33m"
 NORMAL=\$RESET
 
-# This function is used to mount files/directories from the .statelite directory 
+# This function is used to mount files/directories from the .statelite directory
 #  over the root directory.
 # This function stolen from redhat
 shell() {
@@ -587,10 +587,10 @@ echo '
 echo '
                             _________     ________________
                      ___  __\\_   ___ \\   /  _  \\__    ___/
-                     \\  \\/  /    \\  \\/  /  /_\\  \\|    |   
-                      >    <\\     \\____/    |    \\    |   
-                     /__/\\_ \\\\______  /\\____|__  /____|   
-                           \\/       \\/         \\/         
+                     \\  \\/  /    \\  \\/  /  /_\\  \\|    |
+                      >    <\\     \\____/    |    \\    |
+                     /__/\\_ \\\\______  /\\____|__  /____|
+                           \\/       \\/         \\/
 '
         echo "\$RESET"
 }
@@ -670,7 +670,7 @@ for i in `cat /proc/cmdline`; do
         SERVER=`echo \$VALUE|awk -F/ '{print \$3}'`
         ROOTDIR=`echo \$VALUE|awk -F/ '{for(i=4;i<=NF;i++) printf "/%s",\$i}'`
       fi
-   # for NFS root 
+   # for NFS root
    elif [ "\$KEY" = 'NFSROOT' ]; then
 	NFSROOT=1
 	VALUE=`echo \$i |awk -F= '{print \$2}'`
@@ -715,7 +715,7 @@ if [ "\$NFSROOT" = "1" ]; then
 1.  This initrd wasn't created for statelite node?  rerun genimage with the -m statelite flag, then rerun 'nodeset \$ME statelite'
 2.  Is DNS set up?  Maybe that's why I can't mount \${SERVER}.
 3.  The nfs modules aren't set right in this initfs?"
-    
+
 			shell
 			exit
 		fi
@@ -805,13 +805,13 @@ if [ "\$NFSROOT" = "1" ]; then
 
 	
 
-	[ -e /etc/ntp.conf ] && mkdir -p \$NEWROOT/\$RWDIR/tmpfs/etc && cp /etc/ntp.conf \$NEWROOT/\$RWDIR/tmpfs/etc/ 
+	[ -e /etc/ntp.conf ] && mkdir -p \$NEWROOT/\$RWDIR/tmpfs/etc && cp /etc/ntp.conf \$NEWROOT/\$RWDIR/tmpfs/etc/
 
 	
-	[ -e /etc/ntp/step-kickers ] && mkdir -p \$NEWROOT/\$RWDIR/tmpfs/etc/ntp && cp /etc/ntp/step-kickers \$NEWROOT/\$RWDIR/tmpfs/etc/ntp 
+	[ -e /etc/ntp/step-kickers ] && mkdir -p \$NEWROOT/\$RWDIR/tmpfs/etc/ntp && cp /etc/ntp/step-kickers \$NEWROOT/\$RWDIR/tmpfs/etc/ntp
 
 	
-	[ -e /etc/resolv.conf ] && mkdir -p \$NEWROOT/\$RWDIR/tmpfs/etc && cp /etc/resolv.conf \$NEWROOT/\$RWDIR/tmpfs/etc/ 
+	[ -e /etc/resolv.conf ] && mkdir -p \$NEWROOT/\$RWDIR/tmpfs/etc && cp /etc/resolv.conf \$NEWROOT/\$RWDIR/tmpfs/etc/
 
 	# now that everything is mounted, lets do this
 	# hmmm, apparently I'm checking this twice... so I'd better
diff --git a/xCAT-server/share/xcat/netboot/rh/compute.pkglist b/xCAT-server/share/xcat/netboot/rh/compute.pkglist
index 42f78c8a2..b9a209ba8 100644
--- a/xCAT-server/share/xcat/netboot/rh/compute.pkglist
+++ b/xCAT-server/share/xcat/netboot/rh/compute.pkglist
@@ -1,9 +1,9 @@
-bash 
+bash
 nfs-utils
 openssl
-dhclient 
-kernel 
-openssh-server 
+dhclient
+kernel
+openssh-server
 openssh-clients
 busybox-anaconda
 wget
diff --git a/xCAT-server/share/xcat/netboot/rh/compute.ppc64.pkglist b/xCAT-server/share/xcat/netboot/rh/compute.ppc64.pkglist
index 97b853f42..b82c16012 100644
--- a/xCAT-server/share/xcat/netboot/rh/compute.ppc64.pkglist
+++ b/xCAT-server/share/xcat/netboot/rh/compute.ppc64.pkglist
@@ -1,9 +1,9 @@
-bash 
+bash
 nfs-utils
 openssl
-dhclient 
-kernel 
-openssh-server 
+dhclient
+kernel
+openssh-server
 openssh-clients
 busybox-anaconda
 wget
diff --git a/xCAT-server/share/xcat/netboot/rh/compute.ppc64.postinstall b/xCAT-server/share/xcat/netboot/rh/compute.ppc64.postinstall
index 5fbd8e26a..c473bc1a2 100755
--- a/xCAT-server/share/xcat/netboot/rh/compute.ppc64.postinstall
+++ b/xCAT-server/share/xcat/netboot/rh/compute.ppc64.postinstall
@@ -4,16 +4,16 @@
 #-- jurij.sikorsky@t-systems.cz
 #--
 #-- this script is run after all packages from $profile.pkglist are installed
-#-- 
+#--
 #-- it gets these arguments:
-#-- 
+#--
 #-- $1 = install root (chroot directory for profile)
 #-- $2 = OS version
 #-- $3 = architecture
 #-- $4 = profile name
 #-- $5 = work dir (where genimage is located)
-#-- 
-#-- 
+#--
+#--
 installroot=$1
 osver=$2
 arch=$3
diff --git a/xCAT-server/share/xcat/netboot/rh/compute.rhas4.pkglist b/xCAT-server/share/xcat/netboot/rh/compute.rhas4.pkglist
index fa3706381..d9b8e6fdd 100644
--- a/xCAT-server/share/xcat/netboot/rh/compute.rhas4.pkglist
+++ b/xCAT-server/share/xcat/netboot/rh/compute.rhas4.pkglist
@@ -1,9 +1,9 @@
-bash 
+bash
 nfs-utils
 openssl
-dhclient 
-kernel 
-openssh-server 
+dhclient
+kernel
+openssh-server
 openssh-clients
 busybox-anaconda
 wget
diff --git a/xCAT-server/share/xcat/netboot/rh/compute.rhel5.s390x.pkglist b/xCAT-server/share/xcat/netboot/rh/compute.rhel5.s390x.pkglist
index b448841a0..41d4b9fda 100644
--- a/xCAT-server/share/xcat/netboot/rh/compute.rhel5.s390x.pkglist
+++ b/xCAT-server/share/xcat/netboot/rh/compute.rhel5.s390x.pkglist
@@ -1,10 +1,10 @@
-bash 
+bash
 postfix
 nfs-utils
 openssl
-dhclient 
-kernel 
-openssh-server 
+dhclient
+kernel
+openssh-server
 openssh-clients
 busybox-anaconda
 wget
diff --git a/xCAT-server/share/xcat/netboot/rh/compute.rhel6.pkglist b/xCAT-server/share/xcat/netboot/rh/compute.rhel6.pkglist
index 8e577d5c6..b8eac2975 100644
--- a/xCAT-server/share/xcat/netboot/rh/compute.rhel6.pkglist
+++ b/xCAT-server/share/xcat/netboot/rh/compute.rhel6.pkglist
@@ -1,10 +1,10 @@
-bash 
+bash
 dracut-network
 nfs-utils
 openssl
-dhclient 
-kernel 
-openssh-server 
+dhclient
+kernel
+openssh-server
 openssh-clients
 wget
 vim-minimal
diff --git a/xCAT-server/share/xcat/netboot/rh/compute.rhel6.ppc64.pkglist b/xCAT-server/share/xcat/netboot/rh/compute.rhel6.ppc64.pkglist
index a705db414..264f974aa 100644
--- a/xCAT-server/share/xcat/netboot/rh/compute.rhel6.ppc64.pkglist
+++ b/xCAT-server/share/xcat/netboot/rh/compute.rhel6.ppc64.pkglist
@@ -1,9 +1,9 @@
-bash 
+bash
 nfs-utils
 openssl
-dhclient 
-kernel 
-openssh-server 
+dhclient
+kernel
+openssh-server
 openssh-clients
 busybox
 wget
diff --git a/xCAT-server/share/xcat/netboot/rh/compute.rhel6.ppc64.postinstall b/xCAT-server/share/xcat/netboot/rh/compute.rhel6.ppc64.postinstall
index 5fbd8e26a..c473bc1a2 100755
--- a/xCAT-server/share/xcat/netboot/rh/compute.rhel6.ppc64.postinstall
+++ b/xCAT-server/share/xcat/netboot/rh/compute.rhel6.ppc64.postinstall
@@ -4,16 +4,16 @@
 #-- jurij.sikorsky@t-systems.cz
 #--
 #-- this script is run after all packages from $profile.pkglist are installed
-#-- 
+#--
 #-- it gets these arguments:
-#-- 
+#--
 #-- $1 = install root (chroot directory for profile)
 #-- $2 = OS version
 #-- $3 = architecture
 #-- $4 = profile name
 #-- $5 = work dir (where genimage is located)
-#-- 
-#-- 
+#--
+#--
 installroot=$1
 osver=$2
 arch=$3
diff --git a/xCAT-server/share/xcat/netboot/rh/compute.rhel6.s390x.pkglist b/xCAT-server/share/xcat/netboot/rh/compute.rhel6.s390x.pkglist
index bfa4a7fc0..4df47b9cb 100644
--- a/xCAT-server/share/xcat/netboot/rh/compute.rhel6.s390x.pkglist
+++ b/xCAT-server/share/xcat/netboot/rh/compute.rhel6.s390x.pkglist
@@ -2,9 +2,9 @@ bash
 dracut-network
 nfs-utils
 openssl
-dhclient 
-kernel 
-openssh-server 
+dhclient
+kernel
+openssh-server
 openssh-clients
 wget
 vim-minimal
diff --git a/xCAT-server/share/xcat/netboot/rh/compute.rhelhpc6.pkglist b/xCAT-server/share/xcat/netboot/rh/compute.rhelhpc6.pkglist
index 914888c93..3ffacb907 100644
--- a/xCAT-server/share/xcat/netboot/rh/compute.rhelhpc6.pkglist
+++ b/xCAT-server/share/xcat/netboot/rh/compute.rhelhpc6.pkglist
@@ -1,10 +1,10 @@
-bash 
+bash
 dracut-network
 nfs-utils
 openssl
-dhclient 
-kernel 
-openssh-server 
+dhclient
+kernel
+openssh-server
 openssh-clients
 busybox
 dash
diff --git a/xCAT-server/share/xcat/netboot/rh/compute.rhels5.pkglist b/xCAT-server/share/xcat/netboot/rh/compute.rhels5.pkglist
index 261bc3594..b19e62b68 100644
--- a/xCAT-server/share/xcat/netboot/rh/compute.rhels5.pkglist
+++ b/xCAT-server/share/xcat/netboot/rh/compute.rhels5.pkglist
@@ -1,10 +1,10 @@
-bash 
+bash
 postfix
 nfs-utils
 openssl
-dhclient 
-kernel 
-openssh-server 
+dhclient
+kernel
+openssh-server
 openssh-clients
 busybox-anaconda
 wget
diff --git a/xCAT-server/share/xcat/netboot/rh/compute.rhels5.ppc64.pkglist b/xCAT-server/share/xcat/netboot/rh/compute.rhels5.ppc64.pkglist
index e8f6a1a70..5a9335dee 100644
--- a/xCAT-server/share/xcat/netboot/rh/compute.rhels5.ppc64.pkglist
+++ b/xCAT-server/share/xcat/netboot/rh/compute.rhels5.ppc64.pkglist
@@ -1,10 +1,10 @@
-bash 
+bash
 postfix
 nfs-utils
 openssl
-dhclient 
-kernel 
-openssh-server 
+dhclient
+kernel
+openssh-server
 openssh-clients
 busybox-anaconda
 wget
diff --git a/xCAT-server/share/xcat/netboot/rh/compute.rhels5.ppc64.postinstall b/xCAT-server/share/xcat/netboot/rh/compute.rhels5.ppc64.postinstall
index 5fbd8e26a..c473bc1a2 100755
--- a/xCAT-server/share/xcat/netboot/rh/compute.rhels5.ppc64.postinstall
+++ b/xCAT-server/share/xcat/netboot/rh/compute.rhels5.ppc64.postinstall
@@ -4,16 +4,16 @@
 #-- jurij.sikorsky@t-systems.cz
 #--
 #-- this script is run after all packages from $profile.pkglist are installed
-#-- 
+#--
 #-- it gets these arguments:
-#-- 
+#--
 #-- $1 = install root (chroot directory for profile)
 #-- $2 = OS version
 #-- $3 = architecture
 #-- $4 = profile name
 #-- $5 = work dir (where genimage is located)
-#-- 
-#-- 
+#--
+#--
 installroot=$1
 osver=$2
 arch=$3
diff --git a/xCAT-server/share/xcat/netboot/rh/compute.rhels6.pkglist b/xCAT-server/share/xcat/netboot/rh/compute.rhels6.pkglist
index c5eaece65..fdbc235d1 100644
--- a/xCAT-server/share/xcat/netboot/rh/compute.rhels6.pkglist
+++ b/xCAT-server/share/xcat/netboot/rh/compute.rhels6.pkglist
@@ -1,10 +1,10 @@
-bash 
+bash
 dracut-network
 nfs-utils
 openssl
-dhclient 
-kernel 
-openssh-server 
+dhclient
+kernel
+openssh-server
 openssh-clients
 wget
 vim-minimal
diff --git a/xCAT-server/share/xcat/netboot/rh/compute.rhels6.ppc64.pkglist b/xCAT-server/share/xcat/netboot/rh/compute.rhels6.ppc64.pkglist
index 004be88cf..fcc2526c0 100644
--- a/xCAT-server/share/xcat/netboot/rh/compute.rhels6.ppc64.pkglist
+++ b/xCAT-server/share/xcat/netboot/rh/compute.rhels6.ppc64.pkglist
@@ -1,9 +1,9 @@
-bash 
+bash
 nfs-utils
 openssl
-dhclient 
-kernel 
-openssh-server 
+dhclient
+kernel
+openssh-server
 openssh-clients
 busybox
 wget
diff --git a/xCAT-server/share/xcat/netboot/rh/compute.rhels6.ppc64.postinstall b/xCAT-server/share/xcat/netboot/rh/compute.rhels6.ppc64.postinstall
index ad071c87c..475c5e246 100755
--- a/xCAT-server/share/xcat/netboot/rh/compute.rhels6.ppc64.postinstall
+++ b/xCAT-server/share/xcat/netboot/rh/compute.rhels6.ppc64.postinstall
@@ -4,16 +4,16 @@
 #-- jurij.sikorsky@t-systems.cz
 #--
 #-- this script is run after all packages from $profile.pkglist are installed
-#-- 
+#--
 #-- it gets these arguments:
-#-- 
+#--
 #-- $1 = install root (chroot directory for profile)
 #-- $2 = OS version
 #-- $3 = architecture
 #-- $4 = profile name
 #-- $5 = work dir (where genimage is located)
-#-- 
-#-- 
+#--
+#--
 installroot=$1
 osver=$2
 arch=$3
diff --git a/xCAT-server/share/xcat/netboot/rh/compute.rhels6.x86_64.pkglist b/xCAT-server/share/xcat/netboot/rh/compute.rhels6.x86_64.pkglist
index 1f690f86e..75bf48e71 100644
--- a/xCAT-server/share/xcat/netboot/rh/compute.rhels6.x86_64.pkglist
+++ b/xCAT-server/share/xcat/netboot/rh/compute.rhels6.x86_64.pkglist
@@ -1,10 +1,10 @@
-bash 
+bash
 dracut-network
 nfs-utils
 openssl
-dhclient 
-kernel 
-openssh-server 
+dhclient
+kernel
+openssh-server
 openssh-clients
 busybox
 dash
diff --git a/xCAT-server/share/xcat/netboot/rh/compute.rhels6.x86_64.postinstall b/xCAT-server/share/xcat/netboot/rh/compute.rhels6.x86_64.postinstall
index f157e7421..95d2b94d1 100755
--- a/xCAT-server/share/xcat/netboot/rh/compute.rhels6.x86_64.postinstall
+++ b/xCAT-server/share/xcat/netboot/rh/compute.rhels6.x86_64.postinstall
@@ -4,16 +4,16 @@
 #-- jurij.sikorsky@t-systems.cz
 #--
 #-- this script is run after all packages from $profile.pkglist are installed
-#-- 
+#--
 #-- it gets these arguments:
-#-- 
+#--
 #-- $1 = install root (chroot directory for profile)
 #-- $2 = OS version
 #-- $3 = architecture
 #-- $4 = profile name
 #-- $5 = work dir (where genimage is located)
-#-- 
-#-- 
+#--
+#--
 installroot=$1
 osver=$2
 arch=$3
diff --git a/xCAT-server/share/xcat/netboot/rh/compute.rhels7.ppc64.pkglist b/xCAT-server/share/xcat/netboot/rh/compute.rhels7.ppc64.pkglist
index a53f72cf5..d7d4afdee 100644
--- a/xCAT-server/share/xcat/netboot/rh/compute.rhels7.ppc64.pkglist
+++ b/xCAT-server/share/xcat/netboot/rh/compute.rhels7.ppc64.pkglist
@@ -1,9 +1,9 @@
-bash 
+bash
 nfs-utils
 openssl
-dhclient 
-kernel 
-openssh-server 
+dhclient
+kernel
+openssh-server
 openssh-clients
 wget
 rsyslog
diff --git a/xCAT-server/share/xcat/netboot/rh/compute.rhels7.ppc64.postinstall b/xCAT-server/share/xcat/netboot/rh/compute.rhels7.ppc64.postinstall
index 02effbf98..eac5a8f4d 100755
--- a/xCAT-server/share/xcat/netboot/rh/compute.rhels7.ppc64.postinstall
+++ b/xCAT-server/share/xcat/netboot/rh/compute.rhels7.ppc64.postinstall
@@ -4,16 +4,16 @@
 #-- jurij.sikorsky@t-systems.cz
 #--
 #-- this script is run after all packages from $profile.pkglist are installed
-#-- 
+#--
 #-- it gets these arguments:
-#-- 
+#--
 #-- $1 = install root (chroot directory for profile)
 #-- $2 = OS version
 #-- $3 = architecture
 #-- $4 = profile name
 #-- $5 = work dir (where genimage is located)
-#-- 
-#-- 
+#--
+#--
 installroot=$1
 osver=$2
 arch=$3
diff --git a/xCAT-server/share/xcat/netboot/rh/compute.rhels7.x86_64.pkglist b/xCAT-server/share/xcat/netboot/rh/compute.rhels7.x86_64.pkglist
index d03f18c1b..a4511526d 100644
--- a/xCAT-server/share/xcat/netboot/rh/compute.rhels7.x86_64.pkglist
+++ b/xCAT-server/share/xcat/netboot/rh/compute.rhels7.x86_64.pkglist
@@ -1,10 +1,10 @@
-bash 
+bash
 dracut-network
 nfs-utils
 openssl
-dhclient 
-kernel 
-openssh-server 
+dhclient
+kernel
+openssh-server
 openssh-clients
 iputils
 bc
diff --git a/xCAT-server/share/xcat/netboot/rh/compute.rhels7.x86_64.postinstall b/xCAT-server/share/xcat/netboot/rh/compute.rhels7.x86_64.postinstall
index e8883be8f..366e3d1df 100755
--- a/xCAT-server/share/xcat/netboot/rh/compute.rhels7.x86_64.postinstall
+++ b/xCAT-server/share/xcat/netboot/rh/compute.rhels7.x86_64.postinstall
@@ -4,16 +4,16 @@
 #-- jurij.sikorsky@t-systems.cz
 #--
 #-- this script is run after all packages from $profile.pkglist are installed
-#-- 
+#--
 #-- it gets these arguments:
-#-- 
+#--
 #-- $1 = install root (chroot directory for profile)
 #-- $2 = OS version
 #-- $3 = architecture
 #-- $4 = profile name
 #-- $5 = work dir (where genimage is located)
-#-- 
-#-- 
+#--
+#--
 installroot=$1
 osver=$2
 arch=$3
diff --git a/xCAT-server/share/xcat/netboot/rh/dracut/install.netboot b/xCAT-server/share/xcat/netboot/rh/dracut/install.netboot
index 0b19df672..dd6fb9a6b 100755
--- a/xCAT-server/share/xcat/netboot/rh/dracut/install.netboot
+++ b/xCAT-server/share/xcat/netboot/rh/dracut/install.netboot
@@ -7,4 +7,4 @@ dracut_install mount.nfs
 dracut_install parted mke2fs bc mkswap swapon chmod
 inst "$moddir/xcat-updateflag" "/tmp/updateflag"
 inst "$moddir/xcatroot" "/sbin/xcatroot"
-inst_hook cmdline 10 "$moddir/xcat-cmdline.sh" 
+inst_hook cmdline 10 "$moddir/xcat-cmdline.sh"
diff --git a/xCAT-server/share/xcat/netboot/rh/dracut/xcatroot b/xCAT-server/share/xcat/netboot/rh/dracut/xcatroot
index b53ccb366..6136b3471 100755
--- a/xCAT-server/share/xcat/netboot/rh/dracut/xcatroot
+++ b/xCAT-server/share/xcat/netboot/rh/dracut/xcatroot
@@ -47,7 +47,7 @@ if [ ! -z "$imgurl" ]; then
 		ROOTDIR=$SERVER
 		SERVER=${SERVER%%/*}
 		SERVER=${SERVER%:}
-		ROOTDIR=/${ROOTDIR#*/} 
+		ROOTDIR=/${ROOTDIR#*/}
 	fi
 fi
 #echo 0 > /proc/sys/vm/zone_reclaim_mode #Avoid kernel bug
@@ -120,7 +120,7 @@ elif [ -r /rootimg.tar.gz ] || [ -r /rootimg.tar.xz ]; then
   echo Done
 elif [ -r /rootimg-statelite.gz ]; then
   echo Setting up RAM-root tmpfs for statelite mode.
- 
+
   if [ -z $rootlimit];then
     mount -t tmpfs -o mode=755 rootfs $NEWROOT
   else
@@ -136,7 +136,7 @@ elif [ -r /rootimg-statelite.gz ]; then
   fi
   echo Done
   # then, the statelite staffs will be processed
-  echo Setting up Statelite 
+  echo Setting up Statelite
   modprobe nfs
   MAXTRIES=7
   ITER=0
diff --git a/xCAT-server/share/xcat/netboot/rh/dracut_033/install.netboot b/xCAT-server/share/xcat/netboot/rh/dracut_033/install.netboot
index 5154c4cff..2a62a66c6 100755
--- a/xCAT-server/share/xcat/netboot/rh/dracut_033/install.netboot
+++ b/xCAT-server/share/xcat/netboot/rh/dracut_033/install.netboot
@@ -7,7 +7,7 @@ dracut_install parted mke2fs bc mkswap swapon chmod
 dracut_install ethtool
 inst "$moddir/xcat-updateflag" "/tmp/updateflag"
 inst "$moddir/xcatroot" "/sbin/xcatroot"
-inst_hook cmdline 10 "$moddir/xcat-cmdline.sh" 
+inst_hook cmdline 10 "$moddir/xcat-cmdline.sh"
 for file in /etc/udev/rules.d/*;do
 	grep -qi xcat $file && inst_rules $(basename $file)
 done
diff --git a/xCAT-server/share/xcat/netboot/rh/dracut_033/patch/syslog/rsyslogd-start.sh b/xCAT-server/share/xcat/netboot/rh/dracut_033/patch/syslog/rsyslogd-start.sh
index b0a3e6a94..4545af2c2 100755
--- a/xCAT-server/share/xcat/netboot/rh/dracut_033/patch/syslog/rsyslogd-start.sh
+++ b/xCAT-server/share/xcat/netboot/rh/dracut_033/patch/syslog/rsyslogd-start.sh
@@ -13,7 +13,7 @@ rsyslog_config() {
     shift
     local filters=$*
     local filter=
-    local confline=  
+    local confline=
 
     cat $syslog_template
 
@@ -52,5 +52,5 @@ rsyslog_config() {
 template=/etc/templates/rsyslog.conf
 if [ -n "$server" ]; then
     rsyslog_config "$server" "$template" "$filters" > $conf
-    rsyslogd -i /var/run/syslogd.pid 
+    rsyslogd -i /var/run/syslogd.pid
 fi
diff --git a/xCAT-server/share/xcat/netboot/rh/dracut_033/patch/syslog/syslog-genrules.sh b/xCAT-server/share/xcat/netboot/rh/dracut_033/patch/syslog/syslog-genrules.sh
index 09a58c574..6f9d0d262 100755
--- a/xCAT-server/share/xcat/netboot/rh/dracut_033/patch/syslog/syslog-genrules.sh
+++ b/xCAT-server/share/xcat/netboot/rh/dracut_033/patch/syslog/syslog-genrules.sh
@@ -20,7 +20,7 @@ detect_syslog() {
     [ -n "$syslogtype" ]
 }
 
-#the initqueue.sh shipped does not support --online option and 
+#the initqueue.sh shipped does not support --online option and
 #there are some problem when processing --onetime option
 #implement a patched initqueue function here, named initqueue_enhanced
 initqueue_enhanced() {
@@ -52,34 +52,34 @@ initqueue_enhanced() {
         esac
         shift
     done
-    
-    local job=    
+
+    local job=
     if [ -z "$unique" ]; then
         job="${name}$$"
     else
         job="${name:-$1}"
         job=${job##*/}
     fi
-    
-    local exe= 
+
+    local exe=
     exe=$1
     shift
-    
+
     [ -x "$exe" ] || exe=$(command -v $exe)
     if [ -z "$exe" ] ; then
         echo "Invalid command"
         return 1
     fi
-    
+
     {
         [ -n "$env" ] && echo "$env"
         echo "$exe $@"
         [ -n "$onetime" ] && echo "[ -e $hookdir/initqueue${qname}/${job}.sh ] && rm -f -- $hookdir/initqueue${qname}/${job}.sh"
     } > "/tmp/$$-${job}.sh"
-    
+
     mv -f "/tmp/$$-${job}.sh" "$hookdir/initqueue${qname}/${job}.sh"
     [ -z "$qname" ] && >> $hookdir/initqueue/work
-    
+
     return 0
 }
 
@@ -91,7 +91,7 @@ fi
 if [ -e "/sbin/${syslogtype}-start" ]; then
     #printf 'ACTION=="online", SUBSYSTEM=="net", RUN+="/sbin/initqueue --onetime /sbin/'${syslogtype}'-start $env{INTERFACE}"\n' > /etc/udev/rules.d/70-syslog.rules
     #printf 'ATTR{operstate}!="down", SUBSYSTEM=="net", RUN+="/sbin/initqueue --onetime /sbin/'${syslogtype}'-start $env{INTERFACE}"\n' > /etc/udev/rules.d/70-syslog.rules
-    initqueue_enhanced --online --onetime /sbin/${syslogtype}-start     
+    initqueue_enhanced --online --onetime /sbin/${syslogtype}-start
 else
     warn "syslog-genrules: Could not find binary to start syslog of type \"$syslogtype\". Syslog will not be started."
 fi
diff --git a/xCAT-server/share/xcat/netboot/rh/dracut_033/xcatroot b/xCAT-server/share/xcat/netboot/rh/dracut_033/xcatroot
index 12888ba79..e7bf8a4b8 100755
--- a/xCAT-server/share/xcat/netboot/rh/dracut_033/xcatroot
+++ b/xCAT-server/share/xcat/netboot/rh/dracut_033/xcatroot
@@ -56,7 +56,7 @@ if [ ! -z "$imgurl" ]; then
         ROOTDIR=$SERVER
         SERVER=${SERVER%%/*}
         SERVER=${SERVER%:}
-        ROOTDIR=/${ROOTDIR#*/} 
+        ROOTDIR=/${ROOTDIR#*/}
         [ "$xcatdebugmode" > "0" ] && logger -t $log_label -p local4.debug "SERVER=$SERVER ROOTDIR=$ROOTDIR"
     fi
 fi
@@ -137,7 +137,7 @@ elif [ -r /rootimg-statelite.gz ]; then
     msg="Setting up RAM-root tmpfs for statelite mode."
     logger $SYSLOGHOST -t $log_label -p local4.info "$msg"
     echo "$msg"
- 
+
     if [ -z $rootlimit];then
         mount -t tmpfs -o mode=755 rootfs $NEWROOT
     else
@@ -219,7 +219,7 @@ elif [ -r /rootimg-statelite.gz ]; then
             echo "Trying again in $RS seconds ..."
             sleep $RS
         done
-    
+
         # create directory which is named after my node name
         mkdir -p $NEWROOT/$RWDIR/persistent/$ME
         ITER=0
@@ -272,12 +272,12 @@ else
         /bin/sleep 1
         [ "$xcatdebugmode" > "0" ] && logger -t $log_label -p local4.debug "$i..."
         echo -n $i...
-    done 
-    [ "$xcatdebugmode" > "0" ] && logger -t $log_label -p local4.debug "You're dead.  rpower nodename reset to play again." 
+    done
+    [ "$xcatdebugmode" > "0" ] && logger -t $log_label -p local4.debug "You're dead.  rpower nodename reset to play again."
     [ "$xcatdebugmode" > "0" ] && logger -t $log_label -p local4.debug "* Did you packimage with -m cpio, -m squashfs, or -m nfs?"
     [ "$xcatdebugmode" > "0" ] && logger -t $log_label -p local4.debug "* If using -m squashfs did you include aufs.ko with geninitrd? e.g.:  -n tg3,squashfs,aufs,loop"
     [ "$xcatdebugmode" > "0" ] && logger -t $log_label -p local4.debug "If using -m nfs did you export NFS and sync rootimg?  And did you include the aufs and nfs modules in the proper order: e.g.:  -n tg3,aufs,loop,sunrpc,lockd,nfs_acl,nfs"
- 
+
     echo
     echo "You're dead.  rpower nodename reset to play again.
 
diff --git a/xCAT-server/share/xcat/netboot/rh/genimage b/xCAT-server/share/xcat/netboot/rh/genimage
index 8d3fe9042..77fe68e2d 100755
--- a/xCAT-server/share/xcat/netboot/rh/genimage
+++ b/xCAT-server/share/xcat/netboot/rh/genimage
@@ -122,7 +122,7 @@ sub umount_chroot {
         print "\n\n\n\nWARNING: /proc and /sys may still be mounted in the rootimgdir\n\n\n\n";
         return 1;
     }
-    
+
     #unmount all the mount points under rootimg directory
     #to avoid removing the direcoty/files on managemment node by mistake
     my @mntptlist;
@@ -136,12 +136,12 @@ sub umount_chroot {
     foreach my $mntpt (@mntptlist){
         system("umount -l $mntpt >/dev/null 2>&1")
     }
-    
+
     if (majversion($osver) > 6) {
         #only remove the /dev in rootimg directory if it is not a mount point
         system("findmnt $rootimage_dir/dev/ >/dev/null 2>&1 || rm -rf $rootimage_dir/dev/*");
     }
-    
+
     #rpm complains "Failed to initialize NSS library" when /dev/urandom does not exist,  leave /dev/urandom
     use_devurandom();
 }
@@ -375,7 +375,7 @@ unless ($onlyinitrd) {
     if($retcode){
         print "$lock";
         exit 1;
-    } 
+    }
 
     my @envarlist=split(',',$envar);
     foreach my $entry (@envarlist){
@@ -504,7 +504,7 @@ unless ($onlyinitrd) {
                     $repohash{$pass}{$index} = 1;
                     $index++;
                 }
-                
+
                 print $yumconfig "[otherpkgs$index]\nname=otherpkgs$index\nbaseurl=file://$srcdir_otherpkgs_local/$_\ngpgpcheck=0\n\n";
                 $repohash{$pass}{$index} = 1;
                 $index++;
@@ -771,7 +771,6 @@ unless ($imagename) {
         $postinstall_filename = imgutils::get_profile_def_filename($osver, $profile, $arch, $pathtofiles, "postinstall");
     }
 }
-
 if ($postinstall_filename) {
 
     use_hackuname($arch, $kernelver);
@@ -779,7 +778,7 @@ if ($postinstall_filename) {
     $updates{'postinstall'} = $postinstall_filename if ($tempfile);
 
     #export some osimage attributes as the environment variables
-    #to postinstall script 
+    #to postinstall script
     $ENV{IMG_NAME}=$imagename if("" ne $imagename);
     $ENV{IMG_ARCH}=$arch if("" ne $arch);
     $ENV{IMG_OSVER}=$osver if("" ne $osver);
@@ -790,16 +789,17 @@ if ($postinstall_filename) {
     $ENV{IMG_OTHERPKGLIST}=$otherpkglist if("" ne $otherpkglist);
     $ENV{IMG_OTHERPKGDIR}=$srcdir_otherpkgs if("" ne $srcdir_otherpkgs);
     $ENV{IMG_ROOTIMGDIR}=$rootimg_dir if("" ne $rootimg_dir);
-   
 
-    foreach my $postinstall (split /,/, $postinstall_filename) {
+
+    foreach my $rawpostinstall (split /,/, $postinstall_filename) {
+        my ($postinstall,@args)=split(" ",$rawpostinstall) ;
         if (!-x $postinstall) {
             print "postinstall script $postinstall is not executable\n";
             unuse_hackuname();
             exit 1;
         }
 
-        my $rc = system($postinstall, $rootimg_dir, $osver, $arch, $profile);
+        my $rc = system($postinstall, $rootimg_dir, $osver, $arch, $profile,@args);
         if ($rc) {
             print "postinstall script $postinstall failed\n";
             unuse_hackuname();
@@ -1102,8 +1102,8 @@ sub mkinitrd_dracut {
         chmod($perm & 07777, "$dracutmpath/installkernel");
 
         my $dracutmodulelist = " xcat nfs base network kernel-modules syslog ";
- 
-        
+
+
         if (-d glob($dracutmoduledir . "[0-9]*systemd")) {
             $dracutmodulelist .= " systemd ";
         }
@@ -1228,7 +1228,7 @@ MAGENTA="\033[35m"
 BROWN="\033[33m"
 NORMAL=\$RESET
 
-# This function is used to mount files/directories from the .statelite directory 
+# This function is used to mount files/directories from the .statelite directory
 #  over the root directory.
 # This function is stolen from redhat
 shell() {
@@ -1271,10 +1271,10 @@ echo '
 echo '
                             _________     ________________
                      ___  __\\_   ___ \\   /  _  \\__    ___/
-                     \\  \\/  /    \\  \\/  /  /_\\  \\|    |   
-                      >    <\\     \\____/    |    \\    |   
-                     /__/\\_ \\\\______  /\\____|__  /____|   
-                           \\/       \\/         \\/         
+                     \\  \\/  /    \\  \\/  /  /_\\  \\|    |
+                      >    <\\     \\____/    |    \\    |
+                     /__/\\_ \\\\______  /\\____|__  /____|
+                           \\/       \\/         \\/
 '
         echo -e "\$RESET"
 }
@@ -1384,7 +1384,7 @@ for i in `cat /proc/cmdline`; do
         # format: XCAT=xcatmaster:3001
         XCATIPORT=\$VALUE
     fi
-    #if "nonodestatus" specified,do not update the nodestatus 
+    #if "nonodestatus" specified,do not update the nodestatus
     if [ \$i == 'nonodestatus' ]; then
        NODESTATUS='n'
     fi
@@ -1450,7 +1450,7 @@ for i in `cat /proc/cmdline`; do
         SERVER=`echo \$VALUE|awk -F/ '{print \$3}'`
         ROOTDIR=`echo \$VALUE|awk -F/ '{for(i=4;i<=NF;i++) printf "/%s",\$i}'`
       fi
-   # for NFS root 
+   # for NFS root
    elif [ "\$KEY" == 'NFSROOT' ]; then
 	NFSROOT=1
 	VALUE=`echo \$i |awk -F= '{print \$2}'`
@@ -1545,7 +1545,7 @@ EOMS
         fi
 
     fi
-    # now we need to mount the rest of the system. 
+    # now we need to mount the rest of the system.
     if [ ! -e "\$NEWROOT/\$RWDIR" ]; then
         echo ""
         echo -e "\${RED}Hmmm... this NFS root directories doesn't have a /\$RWDIR directory for me to mount a rw filesystem. You'd better to create it... \${NORMAL}"
@@ -1760,24 +1760,24 @@ EOMS
 
     print $inifile <<EOMS;
 #!/bin/sh
-if [ \$# -eq 3 ]; then                                                           
-   echo \$3 > /tmp/ncarg                                                         
-   nc  \$1 \$2 -w 60 -e /tmp/updateflag                                           
-else                                                                            
-   retrytimes=0                                                                 
-   cmd=""                                                                       
-   while [ "\$cmd" != "done" ]; do                                               
-         retrytimes=`expr \$retrytimes + 1`                                      
-         if [ \$retrytimes -eq 60 ]; then                                        
-            break;                                                              
-         fi                                                                     
-         read -t 60 cmd                                                         
-         if [ "\$cmd" == "ready" ]; then                                         
-             head -n 1 /tmp/ncarg                                               
-             rm -rf /tmp/ncarg                                                  
-         fi                                                                     
-   done                                                                         
-                                                                                
+if [ \$# -eq 3 ]; then
+   echo \$3 > /tmp/ncarg
+   nc  \$1 \$2 -w 60 -e /tmp/updateflag
+else
+   retrytimes=0
+   cmd=""
+   while [ "\$cmd" != "done" ]; do
+         retrytimes=`expr \$retrytimes + 1`
+         if [ \$retrytimes -eq 60 ]; then
+            break;
+         fi
+         read -t 60 cmd
+         if [ "\$cmd" == "ready" ]; then
+             head -n 1 /tmp/ncarg
+             rm -rf /tmp/ncarg
+         fi
+   done
+
 fi
 EOMS
     close($inifile);
@@ -2046,7 +2046,7 @@ sub generic_post { #This function is meant to leave the image in a state approxi
             chmod(0755, "$rootimg_dir/etc/init.d/gettyset");
             system("cd $rootimg_dir/etc/rc3.d; ln -sf ../init.d/gettyset S60gettyset");
         }
-     
+
         if(-e "$rootimg_dir/etc/systemd/system/multi-user.target.wants/xcatpostinit1.service"){
             unlink("$rootimg_dir/etc/systemd/system/multi-user.target.wants/xcatpostinit1.service");
         }
@@ -2056,7 +2056,7 @@ sub generic_post { #This function is meant to leave the image in a state approxi
 
         if (!-d "$rootimg_dir/opt/xcat/") {
             mkdir "$rootimg_dir/opt/xcat/";
-        }          
+        }
 
         if(-e "$rootimg_dir/usr/lib/systemd/"){
             #if systemd is the service management framework for the diskless image
@@ -2400,9 +2400,9 @@ KERNELVER=$kernelver
 case "\$1" in
 "-m")
     if [ -z "\$ARCH" ]; then
-      ARCH=\"\$(dpkg --print-architecture 2>/dev/null || rpm -q kernel-\$(\"\$0\" -r) --qf '%{arch}' 2>/dev/null)\" 
+      ARCH=\"\$(dpkg --print-architecture 2>/dev/null || rpm -q kernel-\$(\"\$0\" -r) --qf '%{arch}' 2>/dev/null)\"
     fi
-    case "\$ARCH" in 
+    case "\$ARCH" in
         "amd64") ARCH="x86_64" ;;
         "ppc64el") ARCH="ppc64le" ;;
         esac
diff --git a/xCAT-server/share/xcat/netboot/rh/genimage.rh4 b/xCAT-server/share/xcat/netboot/rh/genimage.rh4
index 89c130c16..848d88338 100755
--- a/xCAT-server/share/xcat/netboot/rh/genimage.rh4
+++ b/xCAT-server/share/xcat/netboot/rh/genimage.rh4
@@ -536,7 +536,7 @@ PATH=$PATH:/bin:/usr/bin:/usr/sbin:/sbin
 
 touch /etc/fstab
 
-# This function is used to mount files/directories from the .statelite directory 
+# This function is used to mount files/directories from the .statelite directory
 #  over the root directory.
 # This function stolen from redhat
 shell() {
@@ -579,10 +579,10 @@ echo '
 echo '
                             _________     ________________
                      ___  __\\_   ___ \\   /  _  \\__    ___/
-                     \\  \\/  /    \\  \\/  /  /_\\  \\|    |   
-                      >    <\\     \\____/    |    \\    |   
-                     /__/\\_ \\\\______  /\\____|__  /____|   
-                           \\/       \\/         \\/         
+                     \\  \\/  /    \\  \\/  /  /_\\  \\|    |
+                      >    <\\     \\____/    |    \\    |
+                     /__/\\_ \\\\______  /\\____|__  /____|
+                           \\/       \\/         \\/
 '
         echo -e "\$RESET"
 }
@@ -632,7 +632,7 @@ EOS1
 grep '\(debug\)' /proc/cmdline > /dev/null && export DEBUG=1
 mkdir /var/lib/dhcp -p
 mkdir /var/run -p
-dhclient $prinic 
+dhclient $prinic
 sleep 5
 ifconfig | grep inet
 IUP=\$?
@@ -671,7 +671,7 @@ for i in `cat /proc/cmdline`; do
         SERVER=`echo \$VALUE|awk -F/ '{print \$3}'`
         ROOTDIR=`echo \$VALUE|awk -F/ '{for(i=4;i<=NF;i++) printf "/%s",\$i}'`
       fi
-   # for NFS root 
+   # for NFS root
    elif [ "\$KEY" == 'NFSROOT' ]; then
 	NFSROOT=1
 	VALUE=`echo \$i |awk -F= '{print \$2}'`
@@ -713,7 +713,7 @@ if [ "\$NFSROOT" = "1" ]; then
 1.  This initrd wasn't created for statelite node?  rerun genimage with the -m statelite flag, then rerun 'nodeset \$ME statelite'
 2.  Is DNS set up?  Maybe that's why I can't mount \${SERVER}.
 3.  The nfs modules aren't set right in this initfs?"
-    
+
 			shell
 			exit
 		fi
@@ -744,11 +744,11 @@ if [ "\$NFSROOT" = "1" ]; then
 	grep '\\(shell\\)' /proc/cmdline >/dev/null && shell
 
     # backup the current dhclient.leases to /var/lib/dhcp/
-    
+
 
 	mount -t tmpfs rw  -o mode=$permission \$NEWROOT/\$RWDIR
 	mkdir -p \$NEWROOT/\$RWDIR/tmpfs
-    
+
 	# mount the SNAPSHOT directory here for persistent use.
 	if [ ! -z \$SNAPSHOTSERVER ]
 	then
@@ -784,13 +784,13 @@ if [ "\$NFSROOT" = "1" ]; then
 	then
 		mkdir -p \$NEWROOT/\$RWDIR/tmpfs/var/lib/dhcp
 	fi
-	[ -e /etc/ntp.conf ] && mkdir -p \$NEWROOT/\$RWDIR/tmpfs/etc && cp /etc/ntp.conf \$NEWROOT/\$RWDIR/tmpfs/etc/ 
+	[ -e /etc/ntp.conf ] && mkdir -p \$NEWROOT/\$RWDIR/tmpfs/etc && cp /etc/ntp.conf \$NEWROOT/\$RWDIR/tmpfs/etc/
 
 	
-	[ -e /etc/ntp/step-kickers ] && mkdir -p \$NEWROOT/\$RWDIR/tmpfs/etc/ntp && cp /etc/ntp/step-kickers \$NEWROOT/\$RWDIR/tmpfs/etc/ntp 
+	[ -e /etc/ntp/step-kickers ] && mkdir -p \$NEWROOT/\$RWDIR/tmpfs/etc/ntp && cp /etc/ntp/step-kickers \$NEWROOT/\$RWDIR/tmpfs/etc/ntp
 
 	
-	[ -e /etc/resolv.conf ] && mkdir -p \$NEWROOT/\$RWDIR/tmpfs/etc && cp /etc/resolv.conf \$NEWROOT/\$RWDIR/tmpfs/etc/ 
+	[ -e /etc/resolv.conf ] && mkdir -p \$NEWROOT/\$RWDIR/tmpfs/etc && cp /etc/resolv.conf \$NEWROOT/\$RWDIR/tmpfs/etc/
 
 	# now that everything is mounted, lets do this
 	# hmmm, apparently I'm checking this twice... so I'd better
@@ -802,7 +802,7 @@ if [ "\$NFSROOT" = "1" ]; then
 
 	# do all the mounts:
 	\$NEWROOT/etc/init.d/statelite	
-    
+
     cp -a /var/lib/dhcp/dhclient.leases \${NEWROOT}/\${RWDIR}/tmpfs/var/lib/dhcp/dhclient-$prinic.leases
 
 	# give the debug shell just before we go if specified!
diff --git a/xCAT-server/share/xcat/netboot/rh/kvm.rhels5.4.pkglist b/xCAT-server/share/xcat/netboot/rh/kvm.rhels5.4.pkglist
index f9981f273..55540b32f 100644
--- a/xCAT-server/share/xcat/netboot/rh/kvm.rhels5.4.pkglist
+++ b/xCAT-server/share/xcat/netboot/rh/kvm.rhels5.4.pkglist
@@ -1,10 +1,10 @@
-bash 
+bash
 postfix
 nfs-utils
 openssl
-dhclient 
-kernel 
-openssh-server 
+dhclient
+kernel
+openssh-server
 openssh-clients
 busybox-anaconda
 wget
diff --git a/xCAT-server/share/xcat/netboot/rh/kvm.rhels6.pkglist b/xCAT-server/share/xcat/netboot/rh/kvm.rhels6.pkglist
index e04f5aa7a..14a5f7ee1 100644
--- a/xCAT-server/share/xcat/netboot/rh/kvm.rhels6.pkglist
+++ b/xCAT-server/share/xcat/netboot/rh/kvm.rhels6.pkglist
@@ -1,11 +1,11 @@
-bash 
+bash
 screen
 dracut-network
 nfs-utils
 openssl
-dhclient 
-kernel 
-openssh-server 
+dhclient
+kernel
+openssh-server
 openssh-clients
 wget
 vim-minimal
diff --git a/xCAT-server/share/xcat/netboot/rh/nfsroot.pkglist b/xCAT-server/share/xcat/netboot/rh/nfsroot.pkglist
index 42f78c8a2..b9a209ba8 100644
--- a/xCAT-server/share/xcat/netboot/rh/nfsroot.pkglist
+++ b/xCAT-server/share/xcat/netboot/rh/nfsroot.pkglist
@@ -1,9 +1,9 @@
-bash 
+bash
 nfs-utils
 openssl
-dhclient 
-kernel 
-openssh-server 
+dhclient
+kernel
+openssh-server
 openssh-clients
 busybox-anaconda
 wget
diff --git a/xCAT-server/share/xcat/netboot/rh/nfsroot.rwfiles b/xCAT-server/share/xcat/netboot/rh/nfsroot.rwfiles
index b53d0feed..d5527eadc 100644
--- a/xCAT-server/share/xcat/netboot/rh/nfsroot.rwfiles
+++ b/xCAT-server/share/xcat/netboot/rh/nfsroot.rwfiles
@@ -1,6 +1,6 @@
-# This file contains the list of files/directories to be stored in the 
-# snapshot directory for each statelite client.  
-# note that this file will be updated with updated versions of xCAT so  you 
+# This file contains the list of files/directories to be stored in the
+# snapshot directory for each statelite client.
+# note that this file will be updated with updated versions of xCAT so  you
 # should copy this nfsroot to a different node name.
 # e.g: cp nfsroot.pkglist mycustom.pkglist; cp nfsroot.exlist mycustom.exlist; ...
 /boot/kernel.h
diff --git a/xCAT-server/share/xcat/netboot/rh/service.postinstall b/xCAT-server/share/xcat/netboot/rh/service.postinstall
index 192b22c78..e410490db 100755
--- a/xCAT-server/share/xcat/netboot/rh/service.postinstall
+++ b/xCAT-server/share/xcat/netboot/rh/service.postinstall
@@ -4,16 +4,16 @@
 #-- jurij.sikorsky@t-systems.cz
 #--
 #-- this script is run after all packages from $profile.pkglist are installed
-#-- 
+#--
 #-- it gets these arguments:
-#-- 
+#--
 #-- $1 = install root (chroot directory for profile)
 #-- $2 = OS version
 #-- $3 = architecture
 #-- $4 = profile name
 #-- $5 = work dir (where genimage is located)
-#-- 
-#-- 
+#--
+#--
 installroot=$1
 osver=$2
 arch=$3
diff --git a/xCAT-server/share/xcat/netboot/rh/service.rhels5.ppc64.postinstall b/xCAT-server/share/xcat/netboot/rh/service.rhels5.ppc64.postinstall
index 5fbd8e26a..c473bc1a2 100755
--- a/xCAT-server/share/xcat/netboot/rh/service.rhels5.ppc64.postinstall
+++ b/xCAT-server/share/xcat/netboot/rh/service.rhels5.ppc64.postinstall
@@ -4,16 +4,16 @@
 #-- jurij.sikorsky@t-systems.cz
 #--
 #-- this script is run after all packages from $profile.pkglist are installed
-#-- 
+#--
 #-- it gets these arguments:
-#-- 
+#--
 #-- $1 = install root (chroot directory for profile)
 #-- $2 = OS version
 #-- $3 = architecture
 #-- $4 = profile name
 #-- $5 = work dir (where genimage is located)
-#-- 
-#-- 
+#--
+#--
 installroot=$1
 osver=$2
 arch=$3
diff --git a/xCAT-server/share/xcat/netboot/rh/service.rhels6.ppc64.postinstall b/xCAT-server/share/xcat/netboot/rh/service.rhels6.ppc64.postinstall
index 5fbd8e26a..c473bc1a2 100755
--- a/xCAT-server/share/xcat/netboot/rh/service.rhels6.ppc64.postinstall
+++ b/xCAT-server/share/xcat/netboot/rh/service.rhels6.ppc64.postinstall
@@ -4,16 +4,16 @@
 #-- jurij.sikorsky@t-systems.cz
 #--
 #-- this script is run after all packages from $profile.pkglist are installed
-#-- 
+#--
 #-- it gets these arguments:
-#-- 
+#--
 #-- $1 = install root (chroot directory for profile)
 #-- $2 = OS version
 #-- $3 = architecture
 #-- $4 = profile name
 #-- $5 = work dir (where genimage is located)
-#-- 
-#-- 
+#--
+#--
 installroot=$1
 osver=$2
 arch=$3
diff --git a/xCAT-server/share/xcat/netboot/rh/xen.pkglist b/xCAT-server/share/xcat/netboot/rh/xen.pkglist
index 36aab9d51..f54e0160c 100644
--- a/xCAT-server/share/xcat/netboot/rh/xen.pkglist
+++ b/xCAT-server/share/xcat/netboot/rh/xen.pkglist
@@ -1,10 +1,10 @@
-bash 
+bash
 postfix
 nfs-utils
 openssl
-dhclient 
+dhclient
 kernel-xen
-openssh-server 
+openssh-server
 openssh-clients
 busybox-anaconda
 wget
diff --git a/xCAT-server/share/xcat/netboot/sles/compute.pkglist b/xCAT-server/share/xcat/netboot/sles/compute.pkglist
index a3165f834..461feb284 100644
--- a/xCAT-server/share/xcat/netboot/sles/compute.pkglist
+++ b/xCAT-server/share/xcat/netboot/sles/compute.pkglist
@@ -1,7 +1,7 @@
-bash 
+bash
 nfs-utils
 openssl
-dhcpcd 
+dhcpcd
 kernel-smp
 openssh
 procps
diff --git a/xCAT-server/share/xcat/netboot/sles/compute.postinstall b/xCAT-server/share/xcat/netboot/sles/compute.postinstall
index 734a63487..ac0052cf0 100755
--- a/xCAT-server/share/xcat/netboot/sles/compute.postinstall
+++ b/xCAT-server/share/xcat/netboot/sles/compute.postinstall
@@ -4,16 +4,16 @@
 #-- jurij.sikorsky@t-systems.cz
 #--
 #-- this script is run after all packages from $profile.pkglist are installed
-#-- 
+#--
 #-- it gets these arguments:
-#-- 
+#--
 #-- $1 = install root (chroot directory for profile)
 #-- $2 = OS version
 #-- $3 = architecture
 #-- $4 = profile name
 #-- $5 = work dir (where genimage is located)
-#-- 
-#-- 
+#--
+#--
 installroot=$1
 osver=$2
 arch=$3
diff --git a/xCAT-server/share/xcat/netboot/sles/compute.repolist b/xCAT-server/share/xcat/netboot/sles/compute.repolist
index e0426aecd..91cf8c1c0 100644
--- a/xCAT-server/share/xcat/netboot/sles/compute.repolist
+++ b/xCAT-server/share/xcat/netboot/sles/compute.repolist
@@ -1,9 +1,9 @@
-#-- 
+#--
 #-- This file contains list of custom repositories (directory with rpms).
 #-- Repositories will be added to the image before package installation.
 #-- This makes possible to automatically install (by defining in {profile}.pkglist)
 #-- packages that are not contained in standard distribution repository
-#-- 
+#--
 #-- File format:
 #Type|URL|name
 #-- example:
diff --git a/xCAT-server/share/xcat/netboot/sles/compute.sles10.ppc64.pkglist b/xCAT-server/share/xcat/netboot/sles/compute.sles10.ppc64.pkglist
index ff31bff94..27992975e 100644
--- a/xCAT-server/share/xcat/netboot/sles/compute.sles10.ppc64.pkglist
+++ b/xCAT-server/share/xcat/netboot/sles/compute.sles10.ppc64.pkglist
@@ -1,8 +1,8 @@
 aaa_base
-bash 
+bash
 nfs-utils
 openssl
-dhcpcd 
+dhcpcd
 kernel-ppc64
 openssh
 procps
diff --git a/xCAT-server/share/xcat/netboot/sles/compute.sles10.ppc64.postinstall b/xCAT-server/share/xcat/netboot/sles/compute.sles10.ppc64.postinstall
index 9565c4624..d1b7a5c57 100644
--- a/xCAT-server/share/xcat/netboot/sles/compute.sles10.ppc64.postinstall
+++ b/xCAT-server/share/xcat/netboot/sles/compute.sles10.ppc64.postinstall
@@ -4,16 +4,16 @@
 #-- jurij.sikorsky@t-systems.cz
 #--
 #-- this script is run after all packages from $profile.pkglist are installed
-#-- 
+#--
 #-- it gets these arguments:
-#-- 
+#--
 #-- $1 = install root (chroot directory for profile)
 #-- $2 = OS version
 #-- $3 = architecture
 #-- $4 = profile name
 #-- $5 = work dir (where genimage is located)
-#-- 
-#-- 
+#--
+#--
 installroot=$1
 osver=$2
 arch=$3
diff --git a/xCAT-server/share/xcat/netboot/sles/compute.sles11.pkglist b/xCAT-server/share/xcat/netboot/sles/compute.sles11.pkglist
index dbc8d638d..f3e10f138 100644
--- a/xCAT-server/share/xcat/netboot/sles/compute.sles11.pkglist
+++ b/xCAT-server/share/xcat/netboot/sles/compute.sles11.pkglist
@@ -1,15 +1,15 @@
 aaa_base
-bash 
+bash
 nfs-kernel-server
 openssl
-dhcpcd 
+dhcpcd
 kernel-default
 openssh
 #procps
 psmisc
 #resmgr
 wget
-sysconfig 
+sysconfig
 syslog-ng
 klogd
 vim
diff --git a/xCAT-server/share/xcat/netboot/sles/compute.sles11.postinstall b/xCAT-server/share/xcat/netboot/sles/compute.sles11.postinstall
index c75134560..8cfa620a6 100755
--- a/xCAT-server/share/xcat/netboot/sles/compute.sles11.postinstall
+++ b/xCAT-server/share/xcat/netboot/sles/compute.sles11.postinstall
@@ -4,16 +4,16 @@
 #-- jurij.sikorsky@t-systems.cz
 #--
 #-- this script is run after all packages from $profile.pkglist are installed
-#-- 
+#--
 #-- it gets these arguments:
-#-- 
+#--
 #-- $1 = install root (chroot directory for profile)
 #-- $2 = OS version
 #-- $3 = architecture
 #-- $4 = profile name
 #-- $5 = work dir (where genimage is located)
-#-- 
-#-- 
+#--
+#--
 installroot=$1
 osver=$2
 arch=$3
diff --git a/xCAT-server/share/xcat/netboot/sles/compute.sles11.ppc64.pkglist b/xCAT-server/share/xcat/netboot/sles/compute.sles11.ppc64.pkglist
index 3f9ffbed3..aabf7a35f 100644
--- a/xCAT-server/share/xcat/netboot/sles/compute.sles11.ppc64.pkglist
+++ b/xCAT-server/share/xcat/netboot/sles/compute.sles11.ppc64.pkglist
@@ -1,12 +1,12 @@
-bash 
+bash
 nfs-utils
 openssl
-dhcpcd 
+dhcpcd
 kernel-ppc64
 openssh
 psmisc
 wget
-sysconfig 
+sysconfig
 syslog-ng
 klogd
 vim
diff --git a/xCAT-server/share/xcat/netboot/sles/compute.sles12.ppc64le.postinstall b/xCAT-server/share/xcat/netboot/sles/compute.sles12.ppc64le.postinstall
index c75134560..8cfa620a6 100755
--- a/xCAT-server/share/xcat/netboot/sles/compute.sles12.ppc64le.postinstall
+++ b/xCAT-server/share/xcat/netboot/sles/compute.sles12.ppc64le.postinstall
@@ -4,16 +4,16 @@
 #-- jurij.sikorsky@t-systems.cz
 #--
 #-- this script is run after all packages from $profile.pkglist are installed
-#-- 
+#--
 #-- it gets these arguments:
-#-- 
+#--
 #-- $1 = install root (chroot directory for profile)
 #-- $2 = OS version
 #-- $3 = architecture
 #-- $4 = profile name
 #-- $5 = work dir (where genimage is located)
-#-- 
-#-- 
+#--
+#--
 installroot=$1
 osver=$2
 arch=$3
diff --git a/xCAT-server/share/xcat/netboot/sles/compute.sles12.x86_64.postinstall b/xCAT-server/share/xcat/netboot/sles/compute.sles12.x86_64.postinstall
index c75134560..8cfa620a6 100755
--- a/xCAT-server/share/xcat/netboot/sles/compute.sles12.x86_64.postinstall
+++ b/xCAT-server/share/xcat/netboot/sles/compute.sles12.x86_64.postinstall
@@ -4,16 +4,16 @@
 #-- jurij.sikorsky@t-systems.cz
 #--
 #-- this script is run after all packages from $profile.pkglist are installed
-#-- 
+#--
 #-- it gets these arguments:
-#-- 
+#--
 #-- $1 = install root (chroot directory for profile)
 #-- $2 = OS version
 #-- $3 = architecture
 #-- $4 = profile name
 #-- $5 = work dir (where genimage is located)
-#-- 
-#-- 
+#--
+#--
 installroot=$1
 osver=$2
 arch=$3
diff --git a/xCAT-server/share/xcat/netboot/sles/dracut_033/install.netboot b/xCAT-server/share/xcat/netboot/sles/dracut_033/install.netboot
index cca462a0b..79f85312e 100755
--- a/xCAT-server/share/xcat/netboot/sles/dracut_033/install.netboot
+++ b/xCAT-server/share/xcat/netboot/sles/dracut_033/install.netboot
@@ -6,4 +6,4 @@ dracut_install mount.nfs
 dracut_install parted mke2fs bc mkswap swapon chmod
 inst "$moddir/xcat-updateflag" "/tmp/updateflag"
 inst "$moddir/xcatroot" "/sbin/xcatroot"
-inst_hook cmdline 10 "$moddir/xcat-cmdline.sh" 
+inst_hook cmdline 10 "$moddir/xcat-cmdline.sh"
diff --git a/xCAT-server/share/xcat/netboot/sles/dracut_033/patch/syslog/rsyslogd-start.sh b/xCAT-server/share/xcat/netboot/sles/dracut_033/patch/syslog/rsyslogd-start.sh
index 9589af436..c9560044d 100755
--- a/xCAT-server/share/xcat/netboot/sles/dracut_033/patch/syslog/rsyslogd-start.sh
+++ b/xCAT-server/share/xcat/netboot/sles/dracut_033/patch/syslog/rsyslogd-start.sh
@@ -13,7 +13,7 @@ rsyslog_config() {
     shift
     local filters=$*
     local filter=
-    local confline=  
+    local confline=
 
     cat $syslog_template
 
@@ -21,7 +21,7 @@ rsyslog_config() {
 #        echo "${filter} @${server}"
 #    done
 
-    
+
     if [ -n "$filters" ];then
         confline="${filters}";
     else
@@ -47,5 +47,5 @@ rsyslog_config() {
 template=/etc/templates/rsyslog.conf
 if [ -n "$server" ]; then
     rsyslog_config "$server" "$template" "$filters" > $conf
-    rsyslogd -i /var/run/syslogd.pid 
+    rsyslogd -i /var/run/syslogd.pid
 fi
diff --git a/xCAT-server/share/xcat/netboot/sles/dracut_033/patch/syslog/syslog-genrules.sh b/xCAT-server/share/xcat/netboot/sles/dracut_033/patch/syslog/syslog-genrules.sh
index 09a58c574..6f9d0d262 100755
--- a/xCAT-server/share/xcat/netboot/sles/dracut_033/patch/syslog/syslog-genrules.sh
+++ b/xCAT-server/share/xcat/netboot/sles/dracut_033/patch/syslog/syslog-genrules.sh
@@ -20,7 +20,7 @@ detect_syslog() {
     [ -n "$syslogtype" ]
 }
 
-#the initqueue.sh shipped does not support --online option and 
+#the initqueue.sh shipped does not support --online option and
 #there are some problem when processing --onetime option
 #implement a patched initqueue function here, named initqueue_enhanced
 initqueue_enhanced() {
@@ -52,34 +52,34 @@ initqueue_enhanced() {
         esac
         shift
     done
-    
-    local job=    
+
+    local job=
     if [ -z "$unique" ]; then
         job="${name}$$"
     else
         job="${name:-$1}"
         job=${job##*/}
     fi
-    
-    local exe= 
+
+    local exe=
     exe=$1
     shift
-    
+
     [ -x "$exe" ] || exe=$(command -v $exe)
     if [ -z "$exe" ] ; then
         echo "Invalid command"
         return 1
     fi
-    
+
     {
         [ -n "$env" ] && echo "$env"
         echo "$exe $@"
         [ -n "$onetime" ] && echo "[ -e $hookdir/initqueue${qname}/${job}.sh ] && rm -f -- $hookdir/initqueue${qname}/${job}.sh"
     } > "/tmp/$$-${job}.sh"
-    
+
     mv -f "/tmp/$$-${job}.sh" "$hookdir/initqueue${qname}/${job}.sh"
     [ -z "$qname" ] && >> $hookdir/initqueue/work
-    
+
     return 0
 }
 
@@ -91,7 +91,7 @@ fi
 if [ -e "/sbin/${syslogtype}-start" ]; then
     #printf 'ACTION=="online", SUBSYSTEM=="net", RUN+="/sbin/initqueue --onetime /sbin/'${syslogtype}'-start $env{INTERFACE}"\n' > /etc/udev/rules.d/70-syslog.rules
     #printf 'ATTR{operstate}!="down", SUBSYSTEM=="net", RUN+="/sbin/initqueue --onetime /sbin/'${syslogtype}'-start $env{INTERFACE}"\n' > /etc/udev/rules.d/70-syslog.rules
-    initqueue_enhanced --online --onetime /sbin/${syslogtype}-start     
+    initqueue_enhanced --online --onetime /sbin/${syslogtype}-start
 else
     warn "syslog-genrules: Could not find binary to start syslog of type \"$syslogtype\". Syslog will not be started."
 fi
diff --git a/xCAT-server/share/xcat/netboot/sles/dracut_033/xcat-prepivot.sh b/xCAT-server/share/xcat/netboot/sles/dracut_033/xcat-prepivot.sh
index b5114ef43..d8e12e290 100755
--- a/xCAT-server/share/xcat/netboot/sles/dracut_033/xcat-prepivot.sh
+++ b/xCAT-server/share/xcat/netboot/sles/dracut_033/xcat-prepivot.sh
@@ -140,7 +140,7 @@ for lf in /tmp/dhclient.*.lease; do
     cp $lf  "$NEWROOT/var/lib/dhclient/dhclient-$netif.leases"
 done
 
-if [ -f $NEWROOT/etc/hostname ]; then 
+if [ -f $NEWROOT/etc/hostname ]; then
     echo `hostname -s` > $NEWROOT/etc/hostname
 fi
 
diff --git a/xCAT-server/share/xcat/netboot/sles/dracut_033/xcatroot b/xCAT-server/share/xcat/netboot/sles/dracut_033/xcatroot
index ac45f2f6c..ceb6bbd8d 100755
--- a/xCAT-server/share/xcat/netboot/sles/dracut_033/xcatroot
+++ b/xCAT-server/share/xcat/netboot/sles/dracut_033/xcatroot
@@ -50,7 +50,7 @@ if [ ! -z "$imgurl" ]; then
 		ROOTDIR=$SERVER
 		SERVER=${SERVER%%/*}
 		SERVER=${SERVER%:}
-		ROOTDIR=/${ROOTDIR#*/} 
+		ROOTDIR=/${ROOTDIR#*/}
 	fi
 fi
 #echo 0 > /proc/sys/vm/zone_reclaim_mode #Avoid kernel bug
@@ -123,7 +123,7 @@ elif [ -r /rootimg.tar.gz ] || [ -r /rootimg.tar.xz ]; then
   echo Done
 elif [ -r /rootimg-statelite.gz ]; then
   echo Setting up RAM-root tmpfs for statelite mode.
- 
+
   if [ -z $rootlimit];then
     mount -t tmpfs -o mode=755 rootfs $NEWROOT
   else
@@ -139,7 +139,7 @@ elif [ -r /rootimg-statelite.gz ]; then
   fi
   echo Done
   # then, the statelite staffs will be processed
-  echo Setting up Statelite 
+  echo Setting up Statelite
   modprobe nfs
   MAXTRIES=7
   ITER=0
@@ -312,7 +312,7 @@ if [ -z $STATEMNT ]; then
 
   if [ ! -z "$MACX" ] && [ ! -z "$ETHX" ]; then
     if [ ! -e $NEWROOT/etc/sysconfig/network/ifcfg-$ETHX ]; then
-       [ "$xcatdebugmode" > "0" ] && logger -t xcat -p debug "creating $NEWROOT/etc/sysconfig/network-scripts/ifcfg-$ETHX" 
+       [ "$xcatdebugmode" > "0" ] && logger -t xcat -p debug "creating $NEWROOT/etc/sysconfig/network-scripts/ifcfg-$ETHX"
        touch $NEWROOT/etc/sysconfig/network/ifcfg-$ETHX
     fi
     [ "$xcatdebugmode" > "0" ] && logger -t xcat -p debug "writing $NEWROOT/etc/sysconfig/network-scripts/ifcfg-$ETHX: DEVICE=$ETHX;BOOTPROTO=dhcp;HWADDR=$MACX;ONBOOT=yes"
diff --git a/xCAT-server/share/xcat/netboot/sles/genimage b/xCAT-server/share/xcat/netboot/sles/genimage
index 47f8daaba..dc6c66f09 100755
--- a/xCAT-server/share/xcat/netboot/sles/genimage
+++ b/xCAT-server/share/xcat/netboot/sles/genimage
@@ -1192,7 +1192,7 @@ MAGENTA="\033[35m"
 BROWN="\033[33m"
 NORMAL=\$RESET
 
-# This function is used to mount files/directories from the .statelite directory 
+# This function is used to mount files/directories from the .statelite directory
 #  over the root directory.
 # This function stolen from redhat
 shell() {
@@ -1235,10 +1235,10 @@ echo '
 echo '
                             _________     ________________
                      ___  __\\_   ___ \\   /  _  \\__    ___/
-                     \\  \\/  /    \\  \\/  /  /_\\  \\|    |   
-                      >    <\\     \\____/    |    \\    |   
-                     /__/\\_ \\\\______  /\\____|__  /____|   
-                           \\/       \\/         \\/         
+                     \\  \\/  /    \\  \\/  /  /_\\  \\|    |
+                      >    <\\     \\____/    |    \\    |
+                     /__/\\_ \\\\______  /\\____|__  /____|
+                           \\/       \\/         \\/
 '
         echo -e "\$RESET"
 }
@@ -1443,7 +1443,7 @@ if [ "\$STATELITE" = "1" ]; then
             if [ "\$ITER" = "\$MAXTRIES" ]; then
                 echo "You're dead. rpower \$ME boot to play again."
                 echo "Possible problems:
-1.  This initrd wan't created for the statelite node? 
+1.  This initrd wan't created for the statelite node?
 2.  IS DNS set up? Maybe that's why I can't mount \${SERVER}.
 3.  The nfs modules aren't set right in this initial ramdisk?"
                 shell
@@ -1530,7 +1530,7 @@ fi
             echo -e "\${RED}Hmmm... Can't mount \$SNAPSHOTSERVER:\$SNAPSHOTROOT. \${NORMAL} \$XCATMNTOPTS"
             RS=`expr \$RANDOM % 20`
             echo -e "Trying again in \$RS seconds"
-            sleep \$RS 
+            sleep \$RS
         done
 
         # create directory which is named after my node name
@@ -1549,7 +1549,7 @@ fi
             echo "Trying again in \$RS seconds..."
             sleep \$RS
         done
-    
+
         # mount persistent to server:/rootpath/nodename
         ITER=0
         while ! mount \$SNAPSHOTSERVER:/\$SNAPSHOTROOT/\$ME  \$NEWROOT/\$RWDIR/persistent -o nolock,\$XCATMNTOPTS; do
@@ -1575,7 +1575,7 @@ fi
         mkdir -p \$NEWROOT/\$RWDIR/tmpfs/var/lib/dhcpcd
     fi
     cp -fp /var/lib/dhcpcd/dhcpcd-\$IFACE.info \${NEWROOT}/\${RWDIR}/tmpfs/var/lib/dhcpcd/dhcpcd-\$IFACE.info
-    
+
     [ -e /etc/ntp.conf ] && mkdir -p \$NEWROOT/\$RWDIR/tmpfs/etc && cp /etc/ntp.conf \$NEWROOT/\$RWDIR/tmpfs/etc/
 
     [ -e /etc/resolv.conf ] && mkdir -p \$NEWROOT/\$RWDIR/tmpfs/etc && cp /etc/resolv.conf \$NEWROOT/\$RWDIR/tmpfs/etc/
@@ -1587,7 +1587,7 @@ fi
     do
         echo "\$NEWROOT/etc/init.d/statelite does not exist in image!"
         shell
-    done 
+    done
 
     # try to configure the local disk
     \$NEWROOT/etc/init.d/localdisk
@@ -1606,7 +1606,7 @@ EOMS
     print $inifile <<EOMS;
     # give the debug shell just before we go if specified!
     grep '\(shell\)' /proc/cmdline > /dev/null && shell
-    
+
     echo 0x100 > /proc/sys/kernel/real-root-dev
     export keep_old_ip=yes
     export fastboot=yes
@@ -1615,7 +1615,7 @@ EOMS
     mount -n --bind /dev /sysroot/dev
     umount /sys
     umount /proc
-    
+
     # sles use the standard utility to chroot
     if ! exec /usr/bin/chroot \$NEWROOT /sbin/init
     then
diff --git a/xCAT-server/share/xcat/netboot/sles/service.repolist b/xCAT-server/share/xcat/netboot/sles/service.repolist
index e0426aecd..91cf8c1c0 100644
--- a/xCAT-server/share/xcat/netboot/sles/service.repolist
+++ b/xCAT-server/share/xcat/netboot/sles/service.repolist
@@ -1,9 +1,9 @@
-#-- 
+#--
 #-- This file contains list of custom repositories (directory with rpms).
 #-- Repositories will be added to the image before package installation.
 #-- This makes possible to automatically install (by defining in {profile}.pkglist)
 #-- packages that are not contained in standard distribution repository
-#-- 
+#--
 #-- File format:
 #Type|URL|name
 #-- example:
diff --git a/xCAT-server/share/xcat/netboot/sles/service.sles10.postinstall b/xCAT-server/share/xcat/netboot/sles/service.sles10.postinstall
index d12333066..15b3cf423 100644
--- a/xCAT-server/share/xcat/netboot/sles/service.sles10.postinstall
+++ b/xCAT-server/share/xcat/netboot/sles/service.sles10.postinstall
@@ -4,16 +4,16 @@
 #-- jurij.sikorsky@t-systems.cz
 #--
 #-- this script is run after all packages from $profile.pkglist are installed
-#-- 
+#--
 #-- it gets these arguments:
-#-- 
+#--
 #-- $1 = install root (chroot directory for profile)
 #-- $2 = OS version
 #-- $3 = architecture
 #-- $4 = profile name
 #-- $5 = work dir (where genimage is located)
-#-- 
-#-- 
+#--
+#--
 installroot=$1
 osver=$2
 arch=$3
diff --git a/xCAT-server/share/xcat/netboot/sles/service.sles10.ppc64.pkglist b/xCAT-server/share/xcat/netboot/sles/service.sles10.ppc64.pkglist
index c850779bc..fb13a7e97 100644
--- a/xCAT-server/share/xcat/netboot/sles/service.sles10.ppc64.pkglist
+++ b/xCAT-server/share/xcat/netboot/sles/service.sles10.ppc64.pkglist
@@ -1,4 +1,4 @@
-kernel-ppc64 
+kernel-ppc64
 udev
 sysconfig
 aaa_base
diff --git a/xCAT-server/share/xcat/netboot/sles/service.sles10.ppc64.postinstall b/xCAT-server/share/xcat/netboot/sles/service.sles10.ppc64.postinstall
index d12333066..15b3cf423 100644
--- a/xCAT-server/share/xcat/netboot/sles/service.sles10.ppc64.postinstall
+++ b/xCAT-server/share/xcat/netboot/sles/service.sles10.ppc64.postinstall
@@ -4,16 +4,16 @@
 #-- jurij.sikorsky@t-systems.cz
 #--
 #-- this script is run after all packages from $profile.pkglist are installed
-#-- 
+#--
 #-- it gets these arguments:
-#-- 
+#--
 #-- $1 = install root (chroot directory for profile)
 #-- $2 = OS version
 #-- $3 = architecture
 #-- $4 = profile name
 #-- $5 = work dir (where genimage is located)
-#-- 
-#-- 
+#--
+#--
 installroot=$1
 osver=$2
 arch=$3
diff --git a/xCAT-server/share/xcat/netboot/sles/service.sles11.postinstall b/xCAT-server/share/xcat/netboot/sles/service.sles11.postinstall
index 201599be0..5ad98d850 100755
--- a/xCAT-server/share/xcat/netboot/sles/service.sles11.postinstall
+++ b/xCAT-server/share/xcat/netboot/sles/service.sles11.postinstall
@@ -4,16 +4,16 @@
 #-- jurij.sikorsky@t-systems.cz
 #--
 #-- this script is run after all packages from $profile.pkglist are installed
-#-- 
+#--
 #-- it gets these arguments:
-#-- 
+#--
 #-- $1 = install root (chroot directory for profile)
 #-- $2 = OS version
 #-- $3 = architecture
 #-- $4 = profile name
 #-- $5 = work dir (where genimage is located)
-#-- 
-#-- 
+#--
+#--
 installroot=$1
 osver=$2
 arch=$3
diff --git a/xCAT-server/share/xcat/netboot/sles/service.sles11.ppc64.repolist b/xCAT-server/share/xcat/netboot/sles/service.sles11.ppc64.repolist
index cfcb8d0ca..f76093e28 100644
--- a/xCAT-server/share/xcat/netboot/sles/service.sles11.ppc64.repolist
+++ b/xCAT-server/share/xcat/netboot/sles/service.sles11.ppc64.repolist
@@ -1,9 +1,9 @@
-#-- 
+#--
 #-- This file contains list of custom repositories (directory with rpms).
 #-- Repositories will be added to the image before package installation.
 #-- This makes possible to automatically install (by defining in {profile}.pkglist)
 #-- packages that are not contained in standard distribution repository
-#-- 
+#--
 #-- File format:
 #Type|URL|name
 #-- example:
diff --git a/xCAT-server/share/xcat/netboot/sles/service.sles12.postinstall b/xCAT-server/share/xcat/netboot/sles/service.sles12.postinstall
index 201599be0..5ad98d850 100755
--- a/xCAT-server/share/xcat/netboot/sles/service.sles12.postinstall
+++ b/xCAT-server/share/xcat/netboot/sles/service.sles12.postinstall
@@ -4,16 +4,16 @@
 #-- jurij.sikorsky@t-systems.cz
 #--
 #-- this script is run after all packages from $profile.pkglist are installed
-#-- 
+#--
 #-- it gets these arguments:
-#-- 
+#--
 #-- $1 = install root (chroot directory for profile)
 #-- $2 = OS version
 #-- $3 = architecture
 #-- $4 = profile name
 #-- $5 = work dir (where genimage is located)
-#-- 
-#-- 
+#--
+#--
 installroot=$1
 osver=$2
 arch=$3
diff --git a/xCAT-server/share/xcat/netboot/sles/service.sles12.ppc64le.postinstall b/xCAT-server/share/xcat/netboot/sles/service.sles12.ppc64le.postinstall
index c75134560..8cfa620a6 100755
--- a/xCAT-server/share/xcat/netboot/sles/service.sles12.ppc64le.postinstall
+++ b/xCAT-server/share/xcat/netboot/sles/service.sles12.ppc64le.postinstall
@@ -4,16 +4,16 @@
 #-- jurij.sikorsky@t-systems.cz
 #--
 #-- this script is run after all packages from $profile.pkglist are installed
-#-- 
+#--
 #-- it gets these arguments:
-#-- 
+#--
 #-- $1 = install root (chroot directory for profile)
 #-- $2 = OS version
 #-- $3 = architecture
 #-- $4 = profile name
 #-- $5 = work dir (where genimage is located)
-#-- 
-#-- 
+#--
+#--
 installroot=$1
 osver=$2
 arch=$3
diff --git a/xCAT-server/share/xcat/netboot/suse/compute.suse11.pkglist b/xCAT-server/share/xcat/netboot/suse/compute.suse11.pkglist
index dee4ca23f..78f41f77d 100644
--- a/xCAT-server/share/xcat/netboot/suse/compute.suse11.pkglist
+++ b/xCAT-server/share/xcat/netboot/suse/compute.suse11.pkglist
@@ -1,15 +1,15 @@
 aaa_base
-bash 
+bash
 nfs-utils
 openssl
-dhcpcd 
+dhcpcd
 kernel
 openssh
 #procps
 psmisc
 #resmgr
 wget
-sysconfig 
+sysconfig
 syslog-ng
 klogd
 vim
diff --git a/xCAT-server/share/xcat/netboot/suse/compute.suse11.postinstall b/xCAT-server/share/xcat/netboot/suse/compute.suse11.postinstall
index dcb61adb1..f98e91dd0 100755
--- a/xCAT-server/share/xcat/netboot/suse/compute.suse11.postinstall
+++ b/xCAT-server/share/xcat/netboot/suse/compute.suse11.postinstall
@@ -4,16 +4,16 @@
 #-- jurij.sikorsky@t-systems.cz
 #--
 #-- this script is run after all packages from $profile.pkglist are installed
-#-- 
+#--
 #-- it gets these arguments:
-#-- 
+#--
 #-- $1 = install root (chroot directory for profile)
 #-- $2 = OS version
 #-- $3 = architecture
 #-- $4 = profile name
 #-- $5 = work dir (where genimage is located)
-#-- 
-#-- 
+#--
+#--
 installroot=$1
 osver=$2
 arch=$3
diff --git a/xCAT-server/share/xcat/netboot/ubuntu/compute.pkglist b/xCAT-server/share/xcat/netboot/ubuntu/compute.pkglist
index cac5d706a..2bf7838f1 100644
--- a/xCAT-server/share/xcat/netboot/ubuntu/compute.pkglist
+++ b/xCAT-server/share/xcat/netboot/ubuntu/compute.pkglist
@@ -1,9 +1,9 @@
-bash 
+bash
 nfs-common
 openssl
 isc-dhcp-client
 linux-image-generic
-openssh-server 
+openssh-server
 openssh-client
 wget
 vim
diff --git a/xCAT-server/share/xcat/netboot/ubuntu/compute.postinstall b/xCAT-server/share/xcat/netboot/ubuntu/compute.postinstall
index 26a801c61..2edc861c3 100755
--- a/xCAT-server/share/xcat/netboot/ubuntu/compute.postinstall
+++ b/xCAT-server/share/xcat/netboot/ubuntu/compute.postinstall
@@ -4,16 +4,16 @@
 #-- jurij.sikorsky@t-systems.cz
 #--
 #-- this script is run after all packages from $profile.pkglist are installed
-#-- 
+#--
 #-- it gets these arguments:
-#-- 
+#--
 #-- $1 = install root (chroot directory for profile)
 #-- $2 = OS version
 #-- $3 = architecture
 #-- $4 = profile name
 #-- $5 = work dir (where genimage is located)
-#-- 
-#-- 
+#--
+#--
 installroot=$1
 osver=$2
 arch=$3
diff --git a/xCAT-server/share/xcat/netboot/ubuntu/compute.ubuntu12.04.1.pkglist b/xCAT-server/share/xcat/netboot/ubuntu/compute.ubuntu12.04.1.pkglist
index 6e3b04dc2..b3ace02ff 100644
--- a/xCAT-server/share/xcat/netboot/ubuntu/compute.ubuntu12.04.1.pkglist
+++ b/xCAT-server/share/xcat/netboot/ubuntu/compute.ubuntu12.04.1.pkglist
@@ -1,9 +1,9 @@
-bash 
+bash
 nfs-common
 openssl
 isc-dhcp-client
 linux-image-server
-openssh-server 
+openssh-server
 openssh-client
 wget
 vim
diff --git a/xCAT-server/share/xcat/netboot/ubuntu/compute.ubuntu12.04.2.pkglist b/xCAT-server/share/xcat/netboot/ubuntu/compute.ubuntu12.04.2.pkglist
index 324fdb29e..dd37b406b 100644
--- a/xCAT-server/share/xcat/netboot/ubuntu/compute.ubuntu12.04.2.pkglist
+++ b/xCAT-server/share/xcat/netboot/ubuntu/compute.ubuntu12.04.2.pkglist
@@ -1,9 +1,9 @@
-bash 
+bash
 nfs-common
 openssl
 isc-dhcp-client
 linux-image-generic-lts-quantal
-openssh-server 
+openssh-server
 openssh-client
 wget
 vim
diff --git a/xCAT-server/share/xcat/netboot/ubuntu/compute.ubuntu14.04.pkglist b/xCAT-server/share/xcat/netboot/ubuntu/compute.ubuntu14.04.pkglist
index 6e3b04dc2..b3ace02ff 100644
--- a/xCAT-server/share/xcat/netboot/ubuntu/compute.ubuntu14.04.pkglist
+++ b/xCAT-server/share/xcat/netboot/ubuntu/compute.ubuntu14.04.pkglist
@@ -1,9 +1,9 @@
-bash 
+bash
 nfs-common
 openssl
 isc-dhcp-client
 linux-image-server
-openssh-server 
+openssh-server
 openssh-client
 wget
 vim
diff --git a/xCAT-server/share/xcat/netboot/ubuntu/compute.ubuntu16.04.pkglist b/xCAT-server/share/xcat/netboot/ubuntu/compute.ubuntu16.04.pkglist
index 77dffd96f..1eb4bf416 100644
--- a/xCAT-server/share/xcat/netboot/ubuntu/compute.ubuntu16.04.pkglist
+++ b/xCAT-server/share/xcat/netboot/ubuntu/compute.ubuntu16.04.pkglist
@@ -1,9 +1,9 @@
-bash 
+bash
 nfs-common
 openssl
 isc-dhcp-client
 linux-image-generic-lts-xenial
-openssh-server 
+openssh-server
 openssh-client
 wget
 vim
diff --git a/xCAT-server/share/xcat/netboot/ubuntu/compute.ubuntu18.04.ppc64el.pkglist b/xCAT-server/share/xcat/netboot/ubuntu/compute.ubuntu18.04.ppc64el.pkglist
index 583d62ad1..b83d5ffdb 100644
--- a/xCAT-server/share/xcat/netboot/ubuntu/compute.ubuntu18.04.ppc64el.pkglist
+++ b/xCAT-server/share/xcat/netboot/ubuntu/compute.ubuntu18.04.ppc64el.pkglist
@@ -16,3 +16,5 @@ dnsutils
 tar
 gzip
 xz-utils
+cpio
+chrony
diff --git a/xCAT-server/share/xcat/netboot/ubuntu/compute.ubuntu18.04.x86_64.pkglist b/xCAT-server/share/xcat/netboot/ubuntu/compute.ubuntu18.04.x86_64.pkglist
index 583d62ad1..b83d5ffdb 100644
--- a/xCAT-server/share/xcat/netboot/ubuntu/compute.ubuntu18.04.x86_64.pkglist
+++ b/xCAT-server/share/xcat/netboot/ubuntu/compute.ubuntu18.04.x86_64.pkglist
@@ -16,3 +16,5 @@ dnsutils
 tar
 gzip
 xz-utils
+cpio
+chrony
diff --git a/xCAT-server/share/xcat/netboot/ubuntu/dracut/install.netboot b/xCAT-server/share/xcat/netboot/ubuntu/dracut/install.netboot
index 372fa4df8..2e24279a1 100755
--- a/xCAT-server/share/xcat/netboot/ubuntu/dracut/install.netboot
+++ b/xCAT-server/share/xcat/netboot/ubuntu/dracut/install.netboot
@@ -4,4 +4,4 @@ dracut_install wget tar cpio gzip dash modprobe touch echo cut wc xz
 dracut_install grep ifconfig hostname awk egrep grep dirname expr
 dracut_install mount.nfs
 inst "$moddir/xcatroot" "/sbin/xcatroot"
-inst_hook cmdline 10 "$moddir/xcat-cmdline.sh" 
+inst_hook cmdline 10 "$moddir/xcat-cmdline.sh"
diff --git a/xCAT-server/share/xcat/netboot/ubuntu/dracut/xcatroot b/xCAT-server/share/xcat/netboot/ubuntu/dracut/xcatroot
index 2c76d7690..0dec68081 100755
--- a/xCAT-server/share/xcat/netboot/ubuntu/dracut/xcatroot
+++ b/xCAT-server/share/xcat/netboot/ubuntu/dracut/xcatroot
@@ -22,7 +22,7 @@ if [ ! -z "$imgurl" ]; then
 		ROOTDIR=$SERVER
 		SERVER=${SERVER%%/*}
 		SERVER=${SERVER%:}
-		ROOTDIR=/${ROOTDIR#*/} 
+		ROOTDIR=/${ROOTDIR#*/}
 	fi
 fi
 #echo 0 > /proc/sys/vm/zone_reclaim_mode #Avoid kernel bug
@@ -81,7 +81,7 @@ elif [ -r /rootimg-statelite.gz ]; then
   fi
   echo Done
   # then, the statelite staffs will be processed
-  echo Setting up Statelite 
+  echo Setting up Statelite
   modprobe nfs
   MAXTRIES=7
   ITER=0
diff --git a/xCAT-server/share/xcat/netboot/ubuntu/genimage b/xCAT-server/share/xcat/netboot/ubuntu/genimage
index d1bb4ffcd..0890cfffa 100755
--- a/xCAT-server/share/xcat/netboot/ubuntu/genimage
+++ b/xCAT-server/share/xcat/netboot/ubuntu/genimage
@@ -201,7 +201,7 @@ if ($netdriver) {
     if ($arch eq 'x86' or $arch eq 'x86_64') {
         @ndrivers = qw/tg3 bnx2 bnx2x e1000 e1000e igb mlx4_en virtio_net/;
     } elsif ($arch eq 'ppc64el') {
-        @ndrivers = qw/bnx2 bnx2x e1000 e1000e igb mlx_en mlx4_en/;
+        @ndrivers = qw/bnx2 bnx2x e1000 e1000e igb mlx_en mlx4_en virtio_net/;
     } elsif ($arch eq 'ppc64') {
         @ndrivers = qw/e1000 e1000e igb ibmveth ehea/;
     } elsif ($arch eq 's390x') {
@@ -648,7 +648,7 @@ if ($postinstall_filename) {
 
     #delete the osimage attributes from environment variable
     delete @ENV{qw(IMG_ARCH IMG_NAME IMG_OSVER IMG_KERNELVERSION IMG_PROFILE IMG_PKGLIST IMG_PKGDIR IMG_OTHERPKGLIST IMG_OTHERPKGDIR IMG_ROOTIMGDIR)};
-  
+
 }
 
 # Default to the first kernel found in the install image if nothing specified explicitly.
@@ -1036,7 +1036,7 @@ MAGENTA="\033[35m"
 BROWN="\033[33m"
 NORMAL=\$RESET
 
-# This function is used to mount files/directories from the .statelite directory 
+# This function is used to mount files/directories from the .statelite directory
 #  over the root directory.
 # This function is stolen from redhat
 shell() {
@@ -1079,10 +1079,10 @@ echo '
 echo '
                             _________     ________________
                      ___  __\\_   ___ \\   /  _  \\__    ___/
-                     \\  \\/  /    \\  \\/  /  /_\\  \\|    |   
-                      >    <\\     \\____/    |    \\    |   
-                     /__/\\_ \\\\______  /\\____|__  /____|   
-                           \\/       \\/         \\/         
+                     \\  \\/  /    \\  \\/  /  /_\\  \\|    |
+                      >    <\\     \\____/    |    \\    |
+                     /__/\\_ \\\\______  /\\____|__  /____|
+                           \\/       \\/         \\/
 '
     echo -e "\$RESET"
 }
@@ -1193,8 +1193,8 @@ for i in `cat /proc/cmdline`; do
         VALUE=`echo \$i |awk -F= '{print \$2}'`
         xcatdebugmode=\$VALUE
     fi
-    
-    #if "nonodestatus" specified,do not update the nodestatus 
+
+    #if "nonodestatus" specified,do not update the nodestatus
     if [ "\$i" = 'nonodestatus' ]; then
        NODESTATUS='n'
     fi
@@ -1276,7 +1276,7 @@ for i in `cat /proc/cmdline`; do
             SERVER=`echo \$VALUE|awk -F/ '{print \$3}'`
             ROOTDIR=`echo \$VALUE|awk -F/ '{for(i=4;i<=NF;i++) printf "/%s",\$i}'`
         fi
-    # for NFS root 
+    # for NFS root
     elif [ "\$KEY" = 'NFSROOT' ]; then
         NFSROOT=1
         VALUE=`echo \$i |awk -F= '{print \$2}'`
@@ -1361,7 +1361,7 @@ EOMS
         fi
 
     fi
-    # now we need to mount the rest of the system. 
+    # now we need to mount the rest of the system.
     if [ ! -e "\$NEWROOT/\$RWDIR" ]; then
         echo ""
         echo -e "\${RED}Hmmm... this NFS root directories doesn't have a /\$RWDIR directory for me to mount a rw filesystem. You'd better to create it... \${NORMAL}"
@@ -1650,6 +1650,16 @@ EOMS
         push @filestoadd, $_;
     }
 
+    # Workaround for Ubuntu 18.04 busybox bug
+    # https://bugs.launchpad.net/ubuntu/+source/busybox/+bug/1753572
+    # On Ubuntun 18.04, will use GNU cpio instead of busybox cpio
+    if ("ubuntu18.04" eq $osver) {
+        foreach ("bin/cpio") {
+            getlibs($_);
+            push @filestoadd, $_;
+        }
+    }
+
     # Additional binaries needed for udev on s390x
     if ($arch eq "s390x") {
         foreach ("sbin/udevsettle", "sbin/udevtrigger", "sbin/udevd", "sbin/depmod") {
@@ -1657,7 +1667,7 @@ EOMS
             push @filestoadd, $_;
         }
     }
-    
+
 
     if ($arch =~ /x86_64/) {
         push @filestoadd, "lib64/libnss_dns.so.2";
diff --git a/xCAT-server/share/xcat/rollupdate/ll.tmpl b/xCAT-server/share/xcat/rollupdate/ll.tmpl
index 6cc1de7fe..e8c09c1bc 100644
--- a/xCAT-server/share/xcat/rollupdate/ll.tmpl
+++ b/xCAT-server/share/xcat/rollupdate/ll.tmpl
@@ -18,7 +18,7 @@
 # @ restart = no
 # @ error   = [[JOBDIR]]/rollupdate_[[NODESET]].$(Host).$(Cluster).$(Process).err
 # @ output  = [[JOBDIR]]/rollupdate_[[NODESET]].$(Host).$(Cluster).$(Process).out
-# @ host_file = [[LLHOSTFILE]] 
+# @ host_file = [[LLHOSTFILE]]
 # @ step_resources = [[MUTEXRESOURCES]]
 # @ queue
 
diff --git a/xCAT-server/share/xcat/rollupdate/llall.tmpl b/xCAT-server/share/xcat/rollupdate/llall.tmpl
index 3eaf9e917..be5629037 100644
--- a/xCAT-server/share/xcat/rollupdate/llall.tmpl
+++ b/xCAT-server/share/xcat/rollupdate/llall.tmpl
@@ -8,7 +8,7 @@
 #  [[NODESET]]   -  the update group name for the nodes in this reservation
 #  [[JOBDIR]]    -  the directory specified in the rollupdate input stanza
 #                   jobdir entry
-#  [[LLCOUNT]] - REQUIRED - used by xCAT to set the number of machines to 
+#  [[LLCOUNT]] - REQUIRED - used by xCAT to set the number of machines to
 #                   reserve
 #  [[UPDATEALLFEATURE]] - REQUIRED - used by xCAT to control the rolling update
 #  [[MUTEXRESOURCES]] - the resources xCAT created for max_updates
@@ -19,7 +19,7 @@
 # @ restart = no
 # @ error   = [[JOBDIR]]/rollupdate_[[NODESET]].$(Host).$(Cluster).$(Process).err
 # @ output  = [[JOBDIR]]/rollupdate_[[NODESET]].$(Host).$(Cluster).$(Process).out
-# @ node = [[LLCOUNT]] 
+# @ node = [[LLCOUNT]]
 # @ requirements = (Feature == "[[UPDATEALLFEATURE]]")
 # @ step_resources = [[MUTEXRESOURCES]]
 # @ queue
diff --git a/xCAT-server/share/xcat/rollupdate/rollupdate.input.sample b/xCAT-server/share/xcat/rollupdate/rollupdate.input.sample
index 856416623..b0bb9be9a 100644
--- a/xCAT-server/share/xcat/rollupdate/rollupdate.input.sample
+++ b/xCAT-server/share/xcat/rollupdate/rollupdate.input.sample
@@ -26,7 +26,7 @@ scheduser=loadl
 
 
 
-# Scheduler Feature values 
+# Scheduler Feature values
 #    Node feature values that will be changed in the scheduler during the
 #    update process.  These features can be used if users need to run jobs
 #    on only old nodes or only new nodes, but cannot have the job span both
@@ -36,22 +36,22 @@ scheduser=loadl
 oldfeature=oldvalue
 
 # newfeature:  A new feature value that will be set in the scheduler for each
-#    node after it has been updated.  
+#    node after it has been updated.
 newfeature=newvalue
 
 
 #
 # updategroup:  A set of nodes to be updated as a single group
 #        updategroup = name(noderange)
-#    where "name" is the name to be assigned to the updategroup and 
+#    where "name" is the name to be assigned to the updategroup and
 #    "noderange" is any valid xCAT noderange syntax (see noderange man page)
 #    You may list multiple updategroup stanzas in this file and all of them will
 #    be processed.
 updategroup=ns01(c4lpar201-c4lpar204)
 updategroup=ns11(c4lpar211-c4lpar214)
 
-# mapgroups:  Many updategroups can also be defined through a 
-#    single statement using nodegroup mappings.    
+# mapgroups:  Many updategroups can also be defined through a
+#    single statement using nodegroup mappings.
 #        mapgroups=nodegroup_range
 #    Where nodegroup_range is processed in the same way xCAT handles node name
 #    ranges to generate a set of nodegroup names.  Each nodegroup will be
@@ -64,17 +64,17 @@ mapgroups=block[01-10]
 
 
 
-# mutex:  
+# mutex:
 # mutex_count:
-#    Identify updategroups that are mutually exclusive and must not be 
+#    Identify updategroups that are mutually exclusive and must not be
 #    updated at the same time in order to maintain active resources within
-#    the cluster. 
+#    the cluster.
 #    If the mutex stanza is immediately followed by a mutex_count stanza,
-#    up to mutex_count updategroups may be updated at the same time. 
-#    If no mutex_count stanza is specified, only 1 updategroup listed  
+#    up to mutex_count updategroups may be updated at the same time.
+#    If no mutex_count stanza is specified, only 1 updategroup listed
 #    in the entry will be updated at a time.
 #        mutex=updategroup,updategroup,...
-#    For example, the update jobs for ns1 and for ns2 will not be allowed 
+#    For example, the update jobs for ns1 and for ns2 will not be allowed
 #    to run at the same time:
 mutex=ns1,ns2
 
@@ -85,8 +85,8 @@ mutex_count=2
 
 
 # You may list multiple mutex stanzas in this file to identify different
-#    sets of mutual exclusion.  
-# Multiple mutually exclusive sets can be specified using updategroup name 
+#    sets of mutual exclusion.
+# Multiple mutually exclusive sets can be specified using updategroup name
 #    ranges. For example, the following:
 #mutex=block[1-3]a,block[1-3]b,block[1-3]c
 # would be equivalent to:
@@ -101,7 +101,7 @@ mutex_count=2
 #   in that group are a member of this xCAT nodegroup, add it to the mutex
 #   entry.
 #   For example, you specifiy:
-#      nodegroup_mutex=IOservers 
+#      nodegroup_mutex=IOservers
 #   Where your xCAT nodegroup is defined as:
 #      IOservers=n4,n8,n12
 #   And your updategroups specified above are:
@@ -142,7 +142,7 @@ mutex_count=2
 
 
 
-# maxupdates:  Maximum number of updategroups that can be updated at one time 
+# maxupdates:  Maximum number of updategroups that can be updated at one time
 #    This allows you to ensure you will always have enough computing
 #    resources in your cluster and that not all nodes will attempt to
 #    be updated at once.
@@ -163,7 +163,7 @@ maxupdates=all
 
 
 
-# jobtemplate:  Scheduler job template file.  See this sample LoadLeveler file 
+# jobtemplate:  Scheduler job template file.  See this sample LoadLeveler file
 #     for details on how the template will be processed:
 jobtemplate=/opt/xcat/share/xcat/rollupdate/ll.tmpl
 
@@ -176,7 +176,7 @@ jobdir=/u/loadl/rollupdate_jobs
 
 
 #reservationcallback:  INTERNAL KEYWORD used for development only.
-#    This is the reservation notify or callback command.  
+#    This is the reservation notify or callback command.
 #    For Loadleveler, this script must reside on the LoadLeveler central
 #    manager and will be called when the reservation for an updategroup
 #    becomes active.
@@ -185,19 +185,19 @@ jobdir=/u/loadl/rollupdate_jobs
 #
 
 
-#reservationduration:  Maximum time to hold a LoadLeveler reservation for 
-#    the update process.  This value in minutes should be longer than the 
-#    expected time to shutdown, update, and reboot all the nodes in an update 
-#    group.  xCAT will release the nodes from the reservation as they come 
+#reservationduration:  Maximum time to hold a LoadLeveler reservation for
+#    the update process.  This value in minutes should be longer than the
+#    expected time to shutdown, update, and reboot all the nodes in an update
+#    group.  xCAT will release the nodes from the reservation as they come
 #    back up, and will cancel the reservation when the last node has completed.
 reservationduration=15
 
 
 
-#update_if_down:  If set to "yes", also attempt the update for any node in an 
+#update_if_down:  If set to "yes", also attempt the update for any node in an
 #    updategroup that is down or not active/available in the scheduler
 #    (useful if you have nodes that are not part of your scheduler's cluster).
-# If set to "no", any node in an updategroup that is not active in the 
+# If set to "no", any node in an updategroup that is not active in the
 #    scheduler will be skipped.
 # If set to "cancel", if any node in an updategroup is not active,
 #    the entire updategroup will be skipped.
@@ -222,7 +222,7 @@ update_if_down=yes
 #    filesystem on all the nodes, or moving critical services
 #    to a backup server for specific nodes.
 # Multiple prescript entries or prescript/prescriptnodes pairs of entries may
-#    be specified. Each command will be run in order. 
+#    be specified. Each command will be run in order.
 #
 #prescript=/u/admin/bin/shutdownGPFS $NODELIST
 #
@@ -237,10 +237,10 @@ update_if_down=yes
 
 
 
-# skipshutdown:  Should a shutdown command be sent to the nodes.  
-#    Shutdown is required for diskless nodes.  For diskfull nodes, simple 
-#    updates may be applied to the nodes through prescripts, and a node 
-#    reboot may not be required. 
+# skipshutdown:  Should a shutdown command be sent to the nodes.
+#    Shutdown is required for diskless nodes.  For diskfull nodes, simple
+#    updates may be applied to the nodes through prescripts, and a node
+#    reboot may not be required.
 # If skipshutdown is set to "yes", outofbandcmd scripts will NOT be
 #    run and bringuporder will be ignored (since no bringup).  However,
 #    bringupstatus/bringupappstatus will still be checked to verify that
@@ -252,12 +252,12 @@ skipshutdown=no
 
 # NOT IMPLEMENTED YET!  FUTURE SUPPORT...
 # shutdownorder:  (optional) The order that nodes within an updategroup
-#    will be shut down.  The value is any valid xCAT noderange.  
-#    Multiple shutdownorder entries may be specified, and they will be 
-#    processed as entered in this file.  If more than one node in the 
-#    updategroup matches a shutdownorder entry, they will be shutdown at 
+#    will be shut down.  The value is any valid xCAT noderange.
+#    Multiple shutdownorder entries may be specified, and they will be
+#    processed as entered in this file.  If more than one node in the
+#    updategroup matches a shutdownorder entry, they will be shutdown at
 #    the same time.  xCAT will wait until the node is completely shutdown
-#    before proceeding to the next nodes.  Any nodes in the updategroup not 
+#    before proceeding to the next nodes.  Any nodes in the updategroup not
 #    listed will be shutdown at the end.
 #shutdownorder=compute
 #shutdownorder=gpfsio
@@ -284,7 +284,7 @@ shutdowntimeout=5
 #    comma-delimited list of xCAT nodenames passed into your command.
 #    This can be used to run operations such as firmware updates.
 # Multiple outofbandcmd entries or outofbandcmd/outofbandnodes pairs of
-#    entries can be specified. Each command will be run in order. 
+#    entries can be specified. Each command will be run in order.
 # outofbandcmd scripts will not be run if "skipshutdown" is set to "yes".
 #
 #outofbandcmd=/u/admin/bin/myfirmwareupdates $NODELIST
@@ -295,7 +295,7 @@ shutdowntimeout=5
 
 
 # bringuporder:  (optional) The order that nodes within an updategroup
-#    will be brought up  The value is any valid xCAT noderange.  
+#    will be brought up  The value is any valid xCAT noderange.
 # Multiple bringuporder entries may be specified, and they will be processed
 #    as entered in this file.  If more than one node in the updategroup
 #    matches a bringuporder entry, they will be brought up at the same time.
@@ -308,10 +308,10 @@ shutdowntimeout=5
 
 
 
-# bringupstatus:  
+# bringupstatus:
 #  OR
-# bringupappstatus:  
-#    The xCAT database node status or appstatus value that xCAT will check and 
+# bringupappstatus:
+#    The xCAT database node status or appstatus value that xCAT will check and
 #    will wait for to determine that the node is up.  Once this status is
 #    reached, xCAT will continue bringing up more nodes (if bringuporder is set)
 #    and will release this node from the scheduler reservation.
@@ -322,9 +322,9 @@ bringupstatus=booted
 
 
 # bringuptimeout:  (optional) The maximum number of minutes xCAT should wait
-#    after issuing the rpower on command for the nodes to reach bringupstatus 
+#    after issuing the rpower on command for the nodes to reach bringupstatus
 #    before giving up.  If using bringuporder and this timeout is reached for
-#    one set of nodes, no additional nodes will be attempted to be brought up.  
-#    The scheduler reservation will be cancelled. 
+#    one set of nodes, no additional nodes will be attempted to be brought up.
+#    The scheduler reservation will be cancelled.
 bringuptimeout=10
 
diff --git a/xCAT-server/share/xcat/rollupdate/rollupdate_all.input.sample b/xCAT-server/share/xcat/rollupdate/rollupdate_all.input.sample
index e0f582fcc..aaed5d794 100644
--- a/xCAT-server/share/xcat/rollupdate/rollupdate_all.input.sample
+++ b/xCAT-server/share/xcat/rollupdate/rollupdate_all.input.sample
@@ -35,7 +35,7 @@ scheduser=loadl
 #    updated by specifying different machine requirements, classes, or other
 #    controls that LL allows you in the LL job template that you provide.
 # If updateall is used, the following entries MUST be specified in this file:
-#       updateall_nodes  
+#       updateall_nodes
 #       updateall_nodecount
 #       job_template
 #       job_dir
@@ -61,7 +61,7 @@ updateall_nodes=compute
 # updateall_nodecount:  The number of nodes that will be reserved at one time
 #    in the scheduler and updated together.  The smaller the number, the more
 #    scheduler reservation jobs that will be submitted.
-# NOTE:  LoadLeveler performance decreases with large numbers of 
+# NOTE:  LoadLeveler performance decreases with large numbers of
 #        reservations.  Do not set this value so low that you will exceed
 #        the maximum number of reservations allowed for your cluster or
 #        that you will degrade LL performance for your production jobs.
@@ -87,7 +87,7 @@ updateall_nodecount=3
 
 
 
-# Scheduler Feature values 
+# Scheduler Feature values
 #    Node feature values that will be changed in the scheduler during the
 #    update process.  These features can be used if users need to run jobs
 #    on only old nodes or only new nodes, but cannot have the job span both
@@ -97,12 +97,12 @@ updateall_nodecount=3
 oldfeature=oldvalue
 
 # newfeature:  A new feature value that will be set in the scheduler for each
-#    node after it has been updated.  
+#    node after it has been updated.
 newfeature=newvalue
 
 
 
-# maxupdates:  Maximum number of updategroups that can be updated at one time 
+# maxupdates:  Maximum number of updategroups that can be updated at one time
 #    This allows you to ensure you will always have enough computing
 #    resources in your cluster and that not all nodes will attempt to
 #    be updated at once.
@@ -123,12 +123,12 @@ maxupdates=16
 
 
 
-#jobtemplate:  Scheduler job template file.  See this sample LoadLeveler file 
+#jobtemplate:  Scheduler job template file.  See this sample LoadLeveler file
 #    for details on how the template will be processed:
 jobtemplate=/opt/xcat/share/xcat/rollupdate/llall.tmpl
 
 
- 
+
 #jobdir:  Directory to write the job command files to
 #    For LL, this directory needs to be on a filesystem available to all nodes.
 jobdir=/u/loadl/rollupdate_jobs
@@ -173,12 +173,12 @@ update_if_down=no
 # prescript
 #    (optional) Command to be run on the xCAT management node before issuing
 #    the shutdown command for the nodes in the updategroup.
-# NOTE:  For updateall operation, prescriptnodes are not supported.  
+# NOTE:  For updateall operation, prescriptnodes are not supported.
 #        Prescripts will be run for all nodes.
 #    You may specify the string $NODELIST if you would like the
 #    comma-delimited list of xCAT nodenames passed into your command.
-#    Multiple prescript entries can be specified. Each command will be run in 
-#    order. 
+#    Multiple prescript entries can be specified. Each command will be run in
+#    order.
 #prescript=/u/admin/bin/shutdownGPFS $NODELIST
 
 
@@ -202,12 +202,12 @@ shutdowntimeout=5
 # outofbandcmd
 #   (optional) Out-of-band command to run on the xCAT management
 #    node once the node has been shutdown but before it is rebooted.
-# NOTE:  For updateall operation, outofbandnodes are not supported.  
+# NOTE:  For updateall operation, outofbandnodes are not supported.
 #        Out-of-band commands will be run for all nodes.
 #    You may specify the string $NODELIST if you would like the
 #    comma-delimited list of xCAT nodenames passed into your command.
-# Multiple outofbandcmd (with optional outofbandnodes) entries can be 
-#    specified. Each command will be run in order. 
+# Multiple outofbandcmd (with optional outofbandnodes) entries can be
+#    specified. Each command will be run in order.
 #outofbandcmd=/u/admin/bin/myfirmwareupdates $NODELIST
 
 
diff --git a/xCAT-server/share/xcat/rollupdate/rollupdate_stateful.input.sample b/xCAT-server/share/xcat/rollupdate/rollupdate_stateful.input.sample
index adeb6ea07..76ab1c084 100644
--- a/xCAT-server/share/xcat/rollupdate/rollupdate_stateful.input.sample
+++ b/xCAT-server/share/xcat/rollupdate/rollupdate_stateful.input.sample
@@ -31,7 +31,7 @@ scheduser=loadl
 
 
 
-# Scheduler Feature values 
+# Scheduler Feature values
 #    Node feature values that will be changed in the scheduler during the
 #    update process.  These features can be used if users need to run jobs
 #    on only old nodes or only new nodes, but cannot have the job span both
@@ -41,7 +41,7 @@ scheduser=loadl
 oldfeature=oldvalue
 
 # newfeature:  A new feature value that will be set in the scheduler for each
-#    node after it has been updated.  
+#    node after it has been updated.
 newfeature=newvalue
 
 
@@ -49,7 +49,7 @@ newfeature=newvalue
 #
 # updategroup:  A set of nodes to be updated as a single group
 #        updategroup = name(noderange)
-#    where "name" is the name to be assigned to the updategroup and 
+#    where "name" is the name to be assigned to the updategroup and
 #    "noderange" is any valid xCAT noderange syntax (see noderange man page)
 #    You may list multiple updategroup stanzas in this file and all of them will
 #    be processed.
@@ -57,8 +57,8 @@ updategroup=ns01(c4lpar201-c4lpar204)
 updategroup=ns11(c4lpar211-c4lpar214)
 
 
-# mapgroups:  Many updategroups can also be defined through a 
-#    single statement using nodegroup mappings.    
+# mapgroups:  Many updategroups can also be defined through a
+#    single statement using nodegroup mappings.
 #        mapgroups=nodegroup_range
 #    Where nodegroup_range is processed in the same way xCAT handles node name
 #    ranges to generate a set of nodegroup names.  Each nodegroup will be
@@ -71,19 +71,19 @@ updategroup=ns11(c4lpar211-c4lpar214)
 
 
 
-# mutex:  Identify updategroups that are mutually exclusive and must not be 
+# mutex:  Identify updategroups that are mutually exclusive and must not be
 #    updated at the same time in order to maintain active resources within
-#    the cluster. Only 1 updategroup listed in the entry will be updated at 
+#    the cluster. Only 1 updategroup listed in the entry will be updated at
 #    a time.
 #        mutex=updategroup,updategroup,...
-#    For example, the update jobs for ns1 and for ns2 will not be allowed 
+#    For example, the update jobs for ns1 and for ns2 will not be allowed
 #    to run at the same time:
 #mutex=c1,c2,c3
 #mutex_count=2
 
 # You may list multiple mutex stanzas in this file to identify different
-#    sets of mutual exclusion.  
-# Multiple mutually exclusive sets can be specified using updategroup name 
+#    sets of mutual exclusion.
+# Multiple mutually exclusive sets can be specified using updategroup name
 #    ranges. For example, the following:
 #mutex=block[1-3]a,block[1-3]b,block[1-3]c
 # would be equivalent to:
@@ -110,7 +110,7 @@ updategroup=ns11(c4lpar211-c4lpar214)
 
 
 
-# maxupdates:  Maximum number of updategroups that can be updated at one time 
+# maxupdates:  Maximum number of updategroups that can be updated at one time
 #    This allows you to ensure you will always have enough computing
 #    resources in your cluster and that not all nodes will attempt to
 #    be updated at once.
@@ -130,7 +130,7 @@ maxupdates=all
 #reconfiglist=login1,login2
 
 
-# jobtemplate:  Scheduler job template file.  See this sample LoadLeveler file 
+# jobtemplate:  Scheduler job template file.  See this sample LoadLeveler file
 #     for details on how the template will be processed:
 jobtemplate=/opt/xcat/share/xcat/rollupdate/ll.tmpl
 
@@ -143,7 +143,7 @@ jobdir=/u/loadl/rollupdate_jobs
 
 
 #reservationcallback:  INTERNAL KEYWORD used for development only.
-#    This is the reservation notify or callback command.  
+#    This is the reservation notify or callback command.
 #    For Loadleveler, this script must reside on the LoadLeveler central
 #    manager and will be called when the reservation for an updategroup
 #    becomes active.
@@ -152,19 +152,19 @@ jobdir=/u/loadl/rollupdate_jobs
 #
 
 
-#reservationduration:  Maximum time to hold a LoadLeveler reservation for 
-#    the update process.  This value in minutes should be longer than the 
-#    expected time to shutdown, update, and reboot all the nodes in an update 
-#    group.  xCAT will release the nodes from the reservation as they come 
+#reservationduration:  Maximum time to hold a LoadLeveler reservation for
+#    the update process.  This value in minutes should be longer than the
+#    expected time to shutdown, update, and reboot all the nodes in an update
+#    group.  xCAT will release the nodes from the reservation as they come
 #    back up, and will cancel the reservation when the last node has completed.
 reservationduration=15
 
 
 
-#update_if_down:  If set to "yes", also attempt the update for any node in an 
+#update_if_down:  If set to "yes", also attempt the update for any node in an
 #    updategroup that is down or not active/available in the scheduler
 #    (useful if you have nodes that are not part of your scheduler's cluster).
-# If set to "no", any node in an updategroup that is not active in the 
+# If set to "no", any node in an updategroup that is not active in the
 #    scheduler will be skipped.
 # If set to "cancel", if any node in an updategroup is not active,
 #    the entire updategroup will be skipped.
@@ -189,7 +189,7 @@ update_if_down=yes
 #    filesystem on all the nodes, or moving critical services
 #    to a backup server for specific nodes.
 # Multiple prescript entries or prescript/prescriptnodes pairs of entries may
-#    be specified. Each command will be run in order. 
+#    be specified. Each command will be run in order.
 #
 #prescript=/u/admin/bin/shutdownGPFS $NODELIST
 #
@@ -204,22 +204,22 @@ prescriptnodes=sn
 
 
 
-# skipshutdown:  Should a shutdown command be sent to the nodes.  
-#    Shutdown is required for diskless nodes.  For diskfull nodes, simple 
-#    updates may be applied to the nodes through prescripts, and a node 
-#    reboot may not be required. 
+# skipshutdown:  Should a shutdown command be sent to the nodes.
+#    Shutdown is required for diskless nodes.  For diskfull nodes, simple
+#    updates may be applied to the nodes through prescripts, and a node
+#    reboot may not be required.
 # Default is "no" - a node shutdown will be performed.
 skipshutdown=no
 
 
 
-# bringupstatus:  
+# bringupstatus:
 #  OR
-# bringupappstatus:  
-#    The xCAT database node status or appstatus value that xCAT will check and 
+# bringupappstatus:
+#    The xCAT database node status or appstatus value that xCAT will check and
 #    will wait for to determine that the node has completed its updates.
 #    After running prescripts, xCAT will continue to check the status, and once
-#    this status is reached, xCAT will  release this node from the scheduler 
+#    this status is reached, xCAT will  release this node from the scheduler
 #    reservation.
 # If both attributes are set, only bringupappstatus will be used.
 #bringupappstatus="gpfs=ready"
@@ -229,7 +229,7 @@ bringupstatus=booted
 
 # bringuptimeout:  (optional) The maximum number of minutes xCAT should wait
 #    after completion of running prescripts for bringupstatus/bringupappstatus
-#    to be met before giving up.  
-#    The scheduler reservation will be cancelled if the timeout is reached. 
+#    to be met before giving up.
+#    The scheduler reservation will be cancelled if the timeout is reached.
 bringuptimeout=10
 
diff --git a/xCAT-server/share/xcat/samples/tracelevel0 b/xCAT-server/share/xcat/samples/tracelevel0
index 98ef9d9d9..a9459275e 100644
--- a/xCAT-server/share/xcat/samples/tracelevel0
+++ b/xCAT-server/share/xcat/samples/tracelevel0
@@ -1 +1 @@
-plugin_command,validate,service_connection 
+plugin_command,validate,service_connection
diff --git a/xCAT-server/share/xcat/samples/tracelevel1 b/xCAT-server/share/xcat/samples/tracelevel1
index add864574..6de047c7d 100644
--- a/xCAT-server/share/xcat/samples/tracelevel1
+++ b/xCAT-server/share/xcat/samples/tracelevel1
@@ -1 +1 @@
-plugin_command,validate,dispatch_callback,dispatch_request,do_request,build_response,becomeuser,service_connection 
+plugin_command,validate,dispatch_callback,dispatch_request,do_request,build_response,becomeuser,service_connection
diff --git a/xCAT-server/share/xcat/scripts/configBNT b/xCAT-server/share/xcat/scripts/configBNT
index 328acd16d..7cc06582a 100755
--- a/xCAT-server/share/xcat/scripts/configBNT
+++ b/xCAT-server/share/xcat/scripts/configBNT
@@ -41,8 +41,8 @@ $::SWITCH_TYPE="EthSwitch::BNT";
 if (
     !GetOptions(
                 'h|help'     => \$::HELP,
-                'switches=s' => \$::SWITCH,  
-                'port=s'     => \$::PORT,  
+                'switches=s' => \$::SWITCH,
+                'port=s'     => \$::PORT,
                 'vlan=s'     => \$::VLAN,
                 'user=s'     => \$::USER,
                 'password=s' => \$::PASSWORD,
@@ -67,6 +67,13 @@ if ($::HELP)
     exit(0);
 }
 
+my $current_usr = getpwuid($>);
+if ($current_usr ne "root")
+{
+    print "Can't run this command for non-root user\n";
+    exit(1);
+}
+
 my $switchestab;
 my $switchhash;
 my $passwdtab;
@@ -95,7 +102,7 @@ if ($::SWITCH) {
     foreach my $fsw (@filternodes)  {
         if (($switchhash->{$fsw}->[0]->{switchtype}) =~ /BNT/) {
             # use switches table first
-            if ((!defined($switchhash->{$fsw}->[0]->{sshusername})) && 
+            if ((!defined($switchhash->{$fsw}->[0]->{sshusername})) &&
                 (!defined($switchhash->{$fsw}->[0]->{sshpassword})) ) {
                 if (defined($passwd_ent[0]->{username})) {
                    $switchhash->{$fsw}->[0]->{sshusername} = $passwd_ent[0]->{username};
@@ -308,7 +315,7 @@ sub config_hostname {
     }
 }
 
-#setup secure SNMP v3 
+#setup secure SNMP v3
 sub config_snmp {
     my $snmp_user;
     my $snmp_passwd;
@@ -357,7 +364,7 @@ sub config_snmp {
             $login_cmd = "ssh $username\@$switch\r";
         }
 
-        #get hostname on the switch in case hostname is different 
+        #get hostname on the switch in case hostname is different
         my $ccmd = "snmpwalk -Os -v1 -c $snmppass $switch 1.3.6.1.2.1.1.5";
         my $result = xCAT::Utils->runcmd($ccmd, 0);
         my ($desc,$switchhost) = split /: /, $result;
@@ -371,7 +378,7 @@ sub config_snmp {
             if ($rc == 0){
                 push (@config_switches, $switch);
             }
-            next; 
+            next;
         }
 
         my $enable_cmd="enable\r";
@@ -504,8 +511,8 @@ sub config_G8264 {
     my $snmp_group = shift;
     my $cmd;
 
-    $cmd="xdsh $switch --devicetype EthSwitch::BNT '/cfg/sys/ssnmp/snmpv3/usm 5/name $snmp_user;/cfg/sys/ssnmp/snmpv3/usm 5/auth sha;/cfg/sys/ssnmp/snmpv3/usm 5/priv none;/cfg/sys/ssnmp/snmpv3/group 5/model usm;/cfg/sys/ssnmp/snmpv3/group 5/uname $snmp_user;/cfg/sys/ssnmp/snmpv3/group 5/gname $snmp_group;/cfg/sys/ssnmp/snmpv3/access 5/name $snmp_group;/cfg/sys/ssnmp/snmpv3/access 5/model usm;/cfg/sys/ssnmp/snmpv3/access 5/level authNoPriv;apply' "; 
-    
+    $cmd="xdsh $switch --devicetype EthSwitch::BNT '/cfg/sys/ssnmp/snmpv3/usm 5/name $snmp_user;/cfg/sys/ssnmp/snmpv3/usm 5/auth sha;/cfg/sys/ssnmp/snmpv3/usm 5/priv none;/cfg/sys/ssnmp/snmpv3/group 5/model usm;/cfg/sys/ssnmp/snmpv3/group 5/uname $snmp_user;/cfg/sys/ssnmp/snmpv3/group 5/gname $snmp_group;/cfg/sys/ssnmp/snmpv3/access 5/name $snmp_group;/cfg/sys/ssnmp/snmpv3/access 5/model usm;/cfg/sys/ssnmp/snmpv3/access 5/level authNoPriv;apply' ";
+
     $rc= xCAT::Utils->runcmd($cmd, 0);
 
     #use expect to set password
@@ -582,7 +589,7 @@ sub config_vlan {
 }
 
 sub config_desc {
-    # checking for port number, switches is checked earlier 
+    # checking for port number, switches is checked earlier
     if ($::PORT) {
        $port = $::PORT;
     } else {
@@ -594,7 +601,7 @@ sub config_desc {
     my $cmd_prefix = "xdsh $switches --devicetype $::SWITCH_TYPE";
     my $cmd;
 
-    # Build up the commands for easier readability 
+    # Build up the commands for easier readability
     $cmd = $cmd . "enable\;";
     $cmd = $cmd . "configure terminal\;";
     $cmd = $cmd . "interface port $port\;";
@@ -602,9 +609,9 @@ sub config_desc {
     $cmd = $cmd . "write memory\;";
     $cmd = $cmd . "exit\;exit\;";
 
-    my $final_cmd = $cmd_prefix . " \"" . $cmd . "\""; 
+    my $final_cmd = $cmd_prefix . " \"" . $cmd . "\"";
     print "Setting description=\"$::DESC\" on port $port of switches=$switches\n";
-    if ($::VERBOSE) { 
+    if ($::VERBOSE) {
         print "Executing cmd: \n==> $final_cmd\n";
     }
     $rc= xCAT::Utils->runcmd($final_cmd, 0);
@@ -625,16 +632,16 @@ sub config_desc {
 sub usage
 {
     print "Usage:
-    configBNT -h│--help 
-    configBNT --switches switchnames --ip 
-    configBNT --switches switchnames --name  
+    configBNT -h│--help
+    configBNT --switches switchnames --ip
+    configBNT --switches switchnames --name
     configBNT --switches switchnames --snmp [--user snmp_user] [--password snmp_password] [--group snmp_group]
     configBNT --switches switchnames --port port --vlan vlan
 
     To set the IP address, hostname and config snmp:
-        configBNT --switches switchnames --all 
+        configBNT --switches switchnames --all
 
-    To set the description for a port on the switch: 
+    To set the description for a port on the switch:
         configBNT --switches switchnames --port port --desc \"description\"
     \n";
 }
diff --git a/xCAT-server/share/xcat/scripts/configMellanox b/xCAT-server/share/xcat/scripts/configMellanox
index 6a085abf6..92bab24d2 100755
--- a/xCAT-server/share/xcat/scripts/configMellanox
+++ b/xCAT-server/share/xcat/scripts/configMellanox
@@ -38,7 +38,7 @@ my @filternodes;
 if (
     !GetOptions(
                 'h|help'     => \$::HELP,
-                'switches=s' => \$::SWITCH,  
+                'switches=s' => \$::SWITCH,
                 'config'     => \$::CONFIG,
                 'ip'         => \$::IP,
                 'name'       => \$::NAME,
@@ -62,6 +62,13 @@ if ($::HELP)
     exit(0);
 }
 
+my $current_usr = getpwuid($>);
+if ($current_usr ne "root")
+{
+    print "Can't run this command for non-root user\n";
+    exit(1);
+}
+
 if ($::SWITCH)
 {
     my @filternodes = xCAT::NodeRange::noderange( $::SWITCH );
@@ -147,7 +154,7 @@ sub config_ip {
             next;
         }
 
-        # Validate if this IP is reachable 
+        # Validate if this IP is reachable
         my $p = Net::Ping->new();
         if (!$p->ping($dip)) {
             print "$dip is not reachable, will not change IP address\n";
@@ -163,7 +170,7 @@ sub config_ip {
             $rc= xCAT::Utils->runcmd($cmd, 0);
             next;
         }
- 
+
         my $static_ip= $nodehash->{$switch}->[0]->{ip};
 
         # don't need to set if ip addresses are same
@@ -241,7 +248,7 @@ sub config_ip {
         $cmd = "makehosts $csw";
         $rc= xCAT::Utils->runcmd($cmd, 0);
     }
- 
+
      if (@discover_switches) {
         my $dsw = join(",",@discover_switches);
         # remove discover switch from xCATdb and /etc/hosts
@@ -304,7 +311,7 @@ sub config_snmp {
 
     my $switchtab = xCAT::Table->new('switches');
     my $switchhash = $switchtab->getNodesAttribs(\@nodes,['snmpversion','sshusername','sshpassword','username','password','auth','privacy']);
-    foreach my $switch (@nodes) 
+    foreach my $switch (@nodes)
     {
         #enable snmp function on the switch
         $cmd=`rspconfig $switch snmpcfg=enable`;
@@ -317,14 +324,14 @@ sub config_snmp {
         $snmp_version = $switchhash->{$switch}->[0]->{snmpversion};
         $snmp_passwd = $switchhash->{$switch}->[0]->{password};
 
-        #config snmpv1 with community string defined in the switches table 
+        #config snmpv1 with community string defined in the switches table
         unless ($snmp_version =~ /3/) {
             if ($snmp_passwd) {
                 $cmd=`rspconfig $switch community=$snmp_passwd`;
                 print "config snmp community string $snmp_passwd\n";
                 next;
-            }    
-        }        
+            }
+        }
 
         #config snmpv3 defined in the switches table
         $snmp_user = $switchhash->{$switch}->[0]->{username};
@@ -427,12 +434,12 @@ sub config_vlan {
             &usage;
             exit(1);
        }
-       if ($mode =~ /hybrid/) 
+       if ($mode =~ /hybrid/)
        {
            if (!$access_vlan) {
-               print "NOTE: Hybrid mode will change access VLAN back to 1\n"; 
+               print "NOTE: Hybrid mode will change access VLAN back to 1\n";
                print "If other than 1, run the command again with access VLAN number: \n";
-               print "    configMellanox --switches switchnames --port port --accessvlan vlan1 --allowvlan vlan2 --mode mode\n"; 
+               print "    configMellanox --switches switchnames --port port --accessvlan vlan1 --allowvlan vlan2 --mode mode\n";
                $access_vlan = 1;
            }
        }
@@ -507,22 +514,22 @@ sub config_vlan {
 sub usage
 {
     print "Usage:
-    configMellanox -h│--help 
+    configMellanox -h│--help
     configMellanox --switches switchnames --ip
     configMellanox --switches switchnames --name
-    configMellanox --switches switchnames --snmp 
-    
+    configMellanox --switches switchnames --snmp
+
     To set the IP address, hostname, config snmp and run rspconfig command:
         configMellanox --switches switchnames --all
 
-    To run rspconfig command: 
-        configMellanox --switches switchnames --config  
+    To run rspconfig command:
+        configMellanox --switches switchnames --config
 
     To configure VLAN on a specified port (Mellanox Ethernet switch ONLY):
         configMellanox --switches switchnames --port port --accessvlan vlan1 --allowvlan vlan2 --mode mode
 
             The following mode are supported for switchport:
-                * access        Only untagged ingress Ethernet packets are allowed 
+                * access        Only untagged ingress Ethernet packets are allowed
                 * trunk         Only tagged ingress Ethernet packets are allowed
                 * hybrid        Both tagged and untagged ingress Ethernet packets are allowed
                 * access-dcb    Only untagged ingress Ethernet packets are allowed. Egress packets will be priority tagged
diff --git a/xCAT-server/share/xcat/scripts/configonie b/xCAT-server/share/xcat/scripts/configonie
index b47aa0957..debbf89b6 100755
--- a/xCAT-server/share/xcat/scripts/configonie
+++ b/xCAT-server/share/xcat/scripts/configonie
@@ -39,8 +39,8 @@ my @filternodes;
 if (
     !GetOptions(
                 'h|help'     => \$::HELP,
-                'switches=s' => \$::SWITCH,  
-                'port=s'     => \$::PORT,  
+                'switches=s' => \$::SWITCH,
+                'port=s'     => \$::PORT,
                 'vlan=s'     => \$::VLAN,
                 'snmp'       => \$::SNMP,
                 'ssh'        => \$::SSH,
@@ -61,6 +61,13 @@ if ($::HELP)
     exit(0);
 }
 
+my $current_usr = getpwuid($>);
+if ($current_usr ne "root")
+{
+    print "Can't run this command for non-root user\n";
+    exit(1);
+}
+
 if ($::SWITCH) {
     my @filternodes = xCAT::NodeRange::noderange( $::SWITCH );
     if (nodesmissed) {
@@ -132,7 +139,7 @@ sub config_ssh {
     if ($nettab) {
         @nets = $nettab->getAllAttribs('net','mask');
     }
-    
+
     my $nodetab = xCAT::Table->new('hosts');
     my $nodehash = $nodetab->getNodesAttribs(\@nodes,['ip','otherinterfaces']);
 
@@ -154,7 +161,7 @@ sub config_ssh {
         #remove old host key from /root/.ssh/known_hosts
         $cmd = `ssh-keygen -R $switch`;
         $cmd = `ssh-keygen -R $ssh_ip`;
-        
+
 
         my ($exp, $errstr) = cumulus_connect($ssh_ip, $userid, $password, $timeout);
         if (!defined $exp) {
@@ -195,7 +202,7 @@ sub config_ssh {
         print "ssh configured for $csw\n";
         if ($::ALL) {
             $cmd = "updatenode $csw -P hardeths,syslog,enablesnmp,configinterface";
-            $rc= xCAT::Utils->runcmd($cmd, 0); 
+            $rc= xCAT::Utils->runcmd($cmd, 0);
             if ($::RUNCMD_RC != 0) {
                 xCAT::MsgUtils->message("E","Failed to run updatenode, please check the switch");
                 print "Failed to run $cmd\n";
@@ -308,7 +315,7 @@ sub install_license {
 }
 
 
-#get snmp attributes from switches tabele and setup secure SNMP v3 
+#get snmp attributes from switches tabele and setup secure SNMP v3
 sub config_snmp {
 
     my $switchestab =  xCAT::Table->new('switches');
@@ -332,7 +339,7 @@ sub config_snmp {
         if (defined $privacy) {
             $privpwd = $password;
         }
-        
+
         my $libconf = "/var/lib/snmp/snmpd.conf";
         my $etcconf = "/etc/snmp/snmpd.conf";
 
@@ -432,7 +439,7 @@ sub config_ntp {
         foreach my $server (@servers) {
             `echo "server $server iburst" >> $file`;
         }
-   
+
         $cmd = "xdcp $switch $file";
         $rc= xCAT::Utils->runcmd($cmd, 0);
         $cmd = "xdsh $switch 'cp /etc/ntp.conf /etc/ntp.conf.orig;cp $file /etc/ntp.conf;rm -fr $file;systemctl restart ntp;systemctl enable ntp' ";
@@ -455,7 +462,7 @@ sub config_ntp {
         print "$csw: NTP service is configured\n";
     }
 
-    
+
 }
 
 #---------------------------------------------------------
@@ -470,14 +477,14 @@ sub config_ntp {
 sub usage
 {
     print "Usage:
-    configonie -h│--help 
-    configonie --switches switchnames --ssh 
-    configonie --switches switchnames --license filename  
+    configonie -h│--help
+    configonie --switches switchnames --ssh
+    configonie --switches switchnames --license filename
     configonie --switches switchnames --snmp
-    configonie --switches switchnames --ntp 
+    configonie --switches switchnames --ntp
 
     To setup ssh passwordless, change ip to static, enable snmp configuration and configure basic interface :
-        configonie --switches switchnames --all 
+        configonie --switches switchnames --all
     \n";
 }
 
diff --git a/xCAT-server/share/xcat/scripts/genduiduuid.sh b/xCAT-server/share/xcat/scripts/genduiduuid.sh
index e9bf49317..a0393a407 100644
--- a/xCAT-server/share/xcat/scripts/genduiduuid.sh
+++ b/xCAT-server/share/xcat/scripts/genduiduuid.sh
@@ -1,7 +1,7 @@
 if [ ! -r /etc/redhat-release ] || ! grep "release 6" /etc/redhat-release >/dev/null; then
     exit 0; #only rhel6 supported
 fi
-if [ -r /sys/devices/virtual/dmi/id/product_uuid ]; then 
+if [ -r /sys/devices/virtual/dmi/id/product_uuid ]; then
     duid='default-duid "\000\004';
     for i in `sed -e 's/\(..\)\(..\)\(..\)\(..\)-\(..\)\(..\)-\(..\)\(..\)/\4\3\2\1-\6\5-\8\7/;s/-//g;s/\(..\)/\1 /g' /sys/devices/virtual/dmi/id/product_uuid`; do
         num=`printf "%d" 0x$i`
diff --git a/xCAT-server/share/xcat/scripts/mkay4z b/xCAT-server/share/xcat/scripts/mkay4z
index 2f4a10995..bfffbecef 100644
--- a/xCAT-server/share/xcat/scripts/mkay4z
+++ b/xCAT-server/share/xcat/scripts/mkay4z
@@ -10,7 +10,7 @@
 
     Usage: 		mkay4z
     Example: 	# ./mkay4z
-    
+
 =cut
 
 #-------------------------------------------------------
@@ -244,7 +244,7 @@ END
 
         # Show configuration
         print <<END;
-#  |   Address   |   Type   
+#  |   Address   |   Type
 ----------------------------
 END
         foreach my $addr (sort keys %dasd) {
@@ -295,7 +295,7 @@ CONFIGURING PARTITIONS...
 Select a device from the list below to create a new partition.
 END
 print <<END;
-#  |   Device   |   Address   |   Type   
+#  |   Device   |   Address   |   Type
 ---------------------------------------------
 END
 
@@ -394,7 +394,7 @@ CONFIGURING LVM PARTITIONS...
 Select an LVM group from the list below to create an LVM volume.
 END
     print <<END;
-#  |   LVM group   |   Devices   
+#  |   LVM group   |   Devices
 ---------------------------------
 END
 
@@ -481,7 +481,7 @@ END
 
                     # Show configuration
                     print <<END;
-Group      |   Volume   |    Mount   |   Size   
+Group      |   Volume   |    Mount   |   Size
 ---------------------------------------------
 END
 
@@ -621,7 +621,7 @@ exit();
     Arguments	: String
     Returns		: Trimmed string
     Example		: my $str = trim($str);
-    
+
 =cut
 
 #-------------------------------------------------------
@@ -647,7 +647,7 @@ sub trim {
     Arguments	: Dasd and partition hash
     Returns		: <dasd> section
     Example		: my $section = createDasd($dasd_ref, $partition_ref);
-    
+
 =cut
 
 #-------------------------------------------------------
@@ -816,7 +816,7 @@ END
     Arguments	: Interfaces hash
     Returns		: <interfaces> section
     Example		: my $section = createInterfaces($interfaces_ref);
-    
+
 =cut
 
 #-------------------------------------------------------
@@ -890,7 +890,7 @@ END
     Arguments	: Dasds and partition hash
     Returns		: <partitions> section
     Example		: my $section = createPartitions($dasd_ref, $partition_ref);
-    
+
 =cut
 
 #-------------------------------------------------------
@@ -1039,7 +1039,7 @@ END
     Arguments	: Hosts to be created
     Returns		: <hosts> section
     Example		: my $section = createHosts($hosts);
-    
+
 =cut
 
 #-------------------------------------------------------
@@ -1080,7 +1080,7 @@ END
     Arguments	: DNS
     Returns		: <dns> section
     Example		: my $section = createDns($dns);
-    
+
 =cut
 
 #-------------------------------------------------------
@@ -1122,7 +1122,7 @@ END
     Arguments	: Dasd hash
     Returns		: <modules> section
     Example		: my $section = createDasdModules($dasd_ref);
-    
+
 =cut
 
 #-------------------------------------------------------
@@ -1161,7 +1161,7 @@ END
     Arguments	: Interfaces hash
     Returns		: <modules> section
     Example		: my $section = createNicModules(%interfaces);
-    
+
 =cut
 
 #-------------------------------------------------------
@@ -1205,7 +1205,7 @@ END
     Arguments	: Software list
     Returns		: <software> section
     Example		: my $section = createSoftware($dns);
-    
+
 =cut
 
 #-------------------------------------------------------
@@ -1245,7 +1245,7 @@ END
     Arguments	: Interfaces hash
     Returns		: <routes> section
     Example		: my $section = createRoutes($route);
-    
+
 =cut
 
 #-------------------------------------------------------
@@ -1304,7 +1304,7 @@ END
     Arguments	: Interfaces hash
     Returns		: <scripts> section
     Example		: my $section = createScripts(%interfaces);
-    
+
 =cut
 
 #-------------------------------------------------------
@@ -1360,7 +1360,7 @@ END
     Arguments	: Question
     Returns		: Answer
     Example		: my $answer = ask("What day is today?");
-    
+
 =cut
 
 #-------------------------------------------------------
@@ -1380,7 +1380,7 @@ sub ask {
     Arguments	: String and size
     Returns		: Padded string
     Example		: my $str = pad($str, 12);
-    
+
 =cut
 
 #-------------------------------------------------------
@@ -1402,7 +1402,7 @@ sub pad {
     Arguments	: Nothing
     Returns		: SLES 11 autoyast template
     Example		: my $tmpl = genSles11Tmpl();
-    
+
 =cut
 
 #-------------------------------------------------------
@@ -1412,14 +1412,14 @@ sub genSles11Tmpl {
 <!DOCTYPE profile>
 <profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns">
 
-  <!-- The dasd attached to the virtual server -->  
+  <!-- The dasd attached to the virtual server -->
   <dasd>
     <devices config:type="list">
-      insert_devices     
+      insert_devices
     </devices>
   </dasd>
-  
-  
+
+
   <general>
     <mode>
       <confirm config:type="boolean">false</confirm>
@@ -1429,8 +1429,8 @@ sub genSles11Tmpl {
     </mouse>
     <signature-handling/>
   </general>
-  
-  
+
+
   <!-- Groups to create on Linux -->
   <groups config:type="list">
     <group>
@@ -1613,29 +1613,29 @@ sub genSles11Tmpl {
       <userlist></userlist>
     </group>
   </groups>
-  
-  
+
+
   <!-- Contents of /etc/hosts -->
   <host>
     <hosts config:type="list">
       insert_hosts
     </hosts>
   </host>
-    
+
 
   <iscsi-client>
     <initiatorname></initiatorname>
     <targets config:type="list"/>
     <version>1.0</version>
   </iscsi-client>
-  
+
 
   <!-- Language setup (english) -->
   <language>
     <language>en_US</language>
     <languages></languages>
   </language>
-  
+
 
   <!-- Networking setup -->
   <networking>
@@ -1664,8 +1664,8 @@ sub genSles11Tmpl {
       </routes>
     </routing>
   </networking>
-  
-  
+
+
   <nis>
     <nis_broadcast config:type="boolean">false</nis_broadcast>
     <nis_broken_server config:type="boolean">false</nis_broken_server>
@@ -1679,14 +1679,14 @@ sub genSles11Tmpl {
     <start_autofs config:type="boolean">false</start_autofs>
     <start_nis config:type="boolean">false</start_nis>
   </nis>
-  
-  
+
+
   <!-- File system partitioning -->
   <partitioning config:type="list">
     insert_partitioning_drives
   </partitioning>
-    
-  
+
+
   <proxy>
     <enabled config:type="boolean">false</enabled>
     <ftp_proxy></ftp_proxy>
@@ -1696,8 +1696,8 @@ sub genSles11Tmpl {
     <proxy_password></proxy_password>
     <proxy_user></proxy_user>
   </proxy>
-  
-  
+
+
   <report>
     <errors>
       <log config:type="boolean">true</log>
@@ -1720,13 +1720,13 @@ sub genSles11Tmpl {
       <timeout config:type="integer">0</timeout>
     </yesno_messages>
   </report>
-  
-  
+
+
   <runlevel>
     <default>5</default>
   </runlevel>
-  
-  
+
+
   <!-- Software to install on Linux -->
   <software>
     <patterns config:type="list">
@@ -1736,15 +1736,15 @@ sub genSles11Tmpl {
       replace_software_packages
     </packages>
   </software>
-  
-  
+
+
   <!-- Time zone -->
   <timezone>
     <hwclock>UTC</hwclock>
     <timezone>US/Eastern</timezone>
   </timezone>
-  
-  
+
+
   <user_defaults>
     <expire></expire>
     <group>100</group>
@@ -2065,13 +2065,13 @@ AUTOYASTEND
       <username>sshd</username>
     </user>
   </users>
-  
-  
+
+
   <zfcp>
     <devices config:type="list"/>
   </zfcp>
-  
-  
+
+
   <!-- Scripts (post-script) -->
   <configure>
     <scripts>
@@ -2090,7 +2090,7 @@ AUTOYASTEND
     Arguments	: Nothing
     Returns		: SLES 10 autoyast template
     Example		: my $tmpl = genSles10Tmpl();
-    
+
 =cut
 
 #-------------------------------------------------------
@@ -2100,14 +2100,14 @@ sub genSles10Tmpl {
 <!DOCTYPE profile>
 <profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns">
 
-  <!-- The dasd attached to the virtual server -->  
+  <!-- The dasd attached to the virtual server -->
   <dasd>
     <devices config:type="list">
-      insert_devices     
+      insert_devices
     </devices>
   </dasd>
-  
-  
+
+
   <general>
     <mode>
       <confirm config:type="boolean">false</confirm>
@@ -2117,8 +2117,8 @@ sub genSles10Tmpl {
     </mouse>
     <signature-handling/>
   </general>
-  
-  
+
+
   <!-- Groups to create on Linux -->
   <groups config:type="list">
     <group>
@@ -2301,29 +2301,29 @@ sub genSles10Tmpl {
       <userlist></userlist>
     </group>
   </groups>
-  
-  
+
+
   <!-- Contents of /etc/hosts -->
   <host>
     <hosts config:type="list">
       insert_hosts
     </hosts>
   </host>
-    
+
 
   <iscsi-client>
     <initiatorname></initiatorname>
     <targets config:type="list"/>
     <version>1.0</version>
   </iscsi-client>
-  
+
 
   <!-- Language setup (english) -->
   <language>
     <language>en_US</language>
     <languages></languages>
   </language>
-  
+
 
   <!-- Networking setup -->
   <networking>
@@ -2352,8 +2352,8 @@ sub genSles10Tmpl {
       </routes>
     </routing>
   </networking>
-  
-  
+
+
   <nis>
     <nis_broadcast config:type="boolean">false</nis_broadcast>
     <nis_broken_server config:type="boolean">false</nis_broken_server>
@@ -2367,14 +2367,14 @@ sub genSles10Tmpl {
     <start_autofs config:type="boolean">false</start_autofs>
     <start_nis config:type="boolean">false</start_nis>
   </nis>
-  
-  
+
+
   <!-- File system partitioning -->
   <partitioning config:type="list">
     insert_partitioning_drives
   </partitioning>
-    
-  
+
+
   <proxy>
     <enabled config:type="boolean">false</enabled>
     <ftp_proxy></ftp_proxy>
@@ -2384,8 +2384,8 @@ sub genSles10Tmpl {
     <proxy_password></proxy_password>
     <proxy_user></proxy_user>
   </proxy>
-  
-  
+
+
   <report>
     <errors>
       <log config:type="boolean">true</log>
@@ -2408,13 +2408,13 @@ sub genSles10Tmpl {
       <timeout config:type="integer">0</timeout>
     </yesno_messages>
   </report>
-  
-  
+
+
   <runlevel>
     <default>5</default>
   </runlevel>
-  
-  
+
+
   <!-- Software to install on Linux -->
   <software>
     <patterns config:type="list">
@@ -2424,15 +2424,15 @@ sub genSles10Tmpl {
       replace_software_packages
     </packages>
   </software>
-  
-  
+
+
   <!-- Time zone -->
   <timezone>
     <hwclock>UTC</hwclock>
     <timezone>US/Eastern</timezone>
   </timezone>
-  
-  
+
+
   <user_defaults>
     <expire></expire>
     <group>100</group>
@@ -2752,13 +2752,13 @@ AUTOYASTEND
       <username>sshd</username>
     </user>
   </users>
-  
-  
+
+
   <zfcp>
     <devices config:type="list"/>
   </zfcp>
-  
-  
+
+
   <!-- Scripts (post-script) -->
   <configure>
     <scripts>
diff --git a/xCAT-server/share/xcat/scripts/setup-dockerhost-cert.sh b/xCAT-server/share/xcat/scripts/setup-dockerhost-cert.sh
index 4abe89449..f23632e0b 100755
--- a/xCAT-server/share/xcat/scripts/setup-dockerhost-cert.sh
+++ b/xCAT-server/share/xcat/scripts/setup-dockerhost-cert.sh
@@ -43,12 +43,13 @@ if [ ! -e $XCATDOCKERCADIR/openssl.cnf ]; then
   echo -n "$XCATDOCKERCADIR/openssl.cnf not exist"
   exit 1
 fi
-sed -i "s@^dir.*=.*/etc/xcat/ca@dir = $XCATDOCKERCADIR@g" $XCATDOCKERCADIR/openssl.cnf 
+sed -i "s@^dir.*=.*/etc/xcat/ca@dir = $XCATDOCKERCADIR@g" $XCATDOCKERCADIR/openssl.cnf
 
 if [  -e $XCATDOCKERCADIR/index ]; then
   rm -f $XCATDOCKERCADIR/index*
 fi
 touch $XCATDOCKERCADIR/index
+touch $XCATDOCKERCADIR/index.attr
 
 echo "00" > $XCATDOCKERCADIR/serial
 
diff --git a/xCAT-server/share/xcat/scripts/setup-local-client.sh b/xCAT-server/share/xcat/scripts/setup-local-client.sh
index 7a30e40ce..11a3bc284 100755
--- a/xCAT-server/share/xcat/scripts/setup-local-client.sh
+++ b/xCAT-server/share/xcat/scripts/setup-local-client.sh
@@ -3,10 +3,10 @@
 # Must be run by root
 #   Interface
 #     setup-local-client.sh  - setup root credentials
-#     setup-local-client.sh user1  - set up user1 credentials and store in 
+#     setup-local-client.sh user1  - set up user1 credentials and store in
 #                      $HOME/.xcat
 #     setup-local-client.sh user2  /tmp/user2  - setup user2 credentials and
-#                      store in /tmp/user2/.xcat.  Must later be copied to 
+#                      store in /tmp/user2/.xcat.  Must later be copied to
 #                      $HOME/xcat for user2.  Used when root cannot write to
 #                      the home directory of user2 (e.g when mounted).
 umask 0077 #nothing make by this script should be readable by group or others
@@ -40,11 +40,11 @@ if [ -z "$2" ]; then
   if [ -x /usr/bin/getent ];then
     USERHOME=`getent passwd $1|awk -F: '{print $6}'`
   else
-    USERHOME=`grep ^$1: /etc/passwd | cut -d: -f6` 
+    USERHOME=`grep ^$1: /etc/passwd | cut -d: -f6`
   fi
 else
   CNA="$1"
-  USERHOME=$2 
+  USERHOME=$2
 fi
 XCATCADIR=$XCATDIR/ca
 
diff --git a/xCAT-server/share/xcat/scripts/setup-server-cert.sh b/xCAT-server/share/xcat/scripts/setup-server-cert.sh
index b724f7b3f..11bdf8693 100755
--- a/xCAT-server/share/xcat/scripts/setup-server-cert.sh
+++ b/xCAT-server/share/xcat/scripts/setup-server-cert.sh
@@ -41,7 +41,7 @@ fi
 
 cp `hostname`.cert $XCATDIR/cert/server-cert.pem
 #Put key and cert in a single file for the likes of conserver
-cat $XCATDIR/cert/server-cert.pem $XCATDIR/cert/server-key.pem > $XCATDIR/cert/server-cred.pem 
+cat $XCATDIR/cert/server-cert.pem $XCATDIR/cert/server-key.pem > $XCATDIR/cert/server-cred.pem
 cp ca-cert.pem $XCATDIR/cert/ca.pem
 cd -
 
diff --git a/xCAT-server/share/xcat/scripts/setup-xcat-ca.sh b/xCAT-server/share/xcat/scripts/setup-xcat-ca.sh
index 463613d2b..b124fd32b 100755
--- a/xCAT-server/share/xcat/scripts/setup-xcat-ca.sh
+++ b/xCAT-server/share/xcat/scripts/setup-xcat-ca.sh
@@ -28,6 +28,7 @@ else
 fi
 sed -e "s@##XCATCADIR##@$XCATCADIR@" $XCATROOT/share/xcat/ca/openssl.cnf.tmpl > $XCATCADIR/openssl.cnf
 cp $XCATROOT/share/xcat/ca/Makefile $XCATCADIR/
+touch $XCATCADIR/index.attr
 cd $XCATCADIR
 make init
 #openssl req -nodes -config openssl.cnf -days 7300 -x509 -newkey rsa:2048 -out ca-cert.pem -extensions v3_ca -outform PEM -subj /CN="$CNA"
diff --git a/xCAT-server/share/xcat/scripts/xHRM b/xCAT-server/share/xcat/scripts/xHRM
index 64d015911..4770c7e1e 100755
--- a/xCAT-server/share/xcat/scripts/xHRM
+++ b/xCAT-server/share/xcat/scripts/xHRM
@@ -14,7 +14,7 @@ function get_def_interface {
         #retval=`ifconfig|grep inet" " |grep -v addr:127.0.0.1|grep -v 'addr:169.254'|head -n 1|cut -d: -f 2|cut -d' ' -f 1`
         retval=$(ip -4 -oneline addr show|grep -v "127.0.0.1"|grep -v '169.254'|head -n 1|awk -F 'inet ' '{print $2}'|awk -F '/' '{print $1}')
     fi
-    if [ -z "$retval" ]; then 
+    if [ -z "$retval" ]; then
         echo "ERROR: Unable to reasonably guess the 'default' interface" >&2
         exit 1
     fi
@@ -45,7 +45,7 @@ function get_def_interface {
             fi
     done
     IFS=$OFIS
-    else 
+    else
         echo "$iface"
     fi
 }
@@ -127,7 +127,7 @@ elif [ "bridgeprereq" = "$1" ]; then
     if echo "$NETDESC"|grep ':'> /dev/null; then
         PORTS=$(echo "$NETDESC"|cut -d: -f 1)
         BNAME=$(echo "$NETDESC"|cut -d: -f 2)
-    else 
+    else
         if [ -n "$NETDESC" ]; then
             BNAME=$NETDESC
         else
@@ -144,7 +144,7 @@ elif [ "bridgeprereq" = "$1" ]; then
         fi
 
         if [ -z "$PORTS" ] || [[ "$PORTS" =~ ^(mac|MAC)$ ]]; then
-            if [ -n "$MACADDRESS" ] ; then   
+            if [ -n "$MACADDRESS" ] ; then
                 PORTS=$(ip -oneline link show|grep -i ether|grep -i $MACADDRESS |awk -F ':' '{print $2}'|grep -o "[^ ]\+\( \+[^ ]\+\)*")
             else
                 echo "should configure mac in $NODE definition."
@@ -155,10 +155,10 @@ elif [ "bridgeprereq" = "$1" ]; then
     fi
 
     # To check whether the brctl have been installed
-    if ! which brctl &> /dev/null; then 
+    if ! which brctl &> /dev/null; then
         echo "No bridge-utils installed, pls install it first"
         exit 1
-    fi 
+    fi
 
     if brctl showstp "$BNAME" &> /dev/null; then
         echo "$BNAME already exists"
@@ -168,7 +168,7 @@ elif [ "bridgeprereq" = "$1" ]; then
     if [ -z "$PORTS" ]; then #This has been checked many times before in theory, check again just in case
         exit 1
     fi
-     
+
     #TO check whether the NIC had been attached to another bridge
     bridgename=$(brctl show |grep $PORTS)
     if [ ! -z "$bridgename" ]; then
@@ -179,7 +179,7 @@ elif [ "bridgeprereq" = "$1" ]; then
 
     #For now, we only support bridge name==network name.  This precludes
     #the config of the same vlan number on multiple fabrics, but
-    #will cover that flexibility later if demanded (with 4k vlan ids, 
+    #will cover that flexibility later if demanded (with 4k vlan ids,
     #I think it would be unwise to reuse them as it could confuse anyway)
     if echo "$PORTS"|grep '&'; then #we have bonding... fun to be had
     #To be slack, going to just support one bond for now..
@@ -194,7 +194,7 @@ elif [ "bridgeprereq" = "$1" ]; then
             IFS=$'\n'
             saveip=$(ip addr show dev $p scope global|grep inet|grep -v dynamic|sed -e 's/inet.//'|sed -e 's/[^ ]*$//')
             if [ ! -z "$saveip" ]; then
-                for line in $saveip; do 
+                for line in $saveip; do
                     ip addr add dev bond0 $line
                 done
             fi
@@ -202,11 +202,11 @@ elif [ "bridgeprereq" = "$1" ]; then
             ifenslave bond0 $p
             if [ ! -z "$saveroutes" ]; then
                 ip route add $saveroutes
-            fi 
+            fi
         done
         PORTS=bond0
     fi
-    if echo "$BNAME"|egrep '^vl(an)?[0123456789]' > /dev/null; then 
+    if echo "$BNAME"|egrep '^vl(an)?[0123456789]' > /dev/null; then
         vlan="yes"
         TNAME=${BNAME##vl}
         TNAME=${TNAME##an}
@@ -227,24 +227,24 @@ elif [ "bridgeprereq" = "$1" ]; then
     saveroutes="$(ip route | grep default| grep "dev $PORTS"|grep via|sed -e 's/dev .*//')"
     saveip="$(ip -4 -o addr show dev $PORTS scope global | sed 's/.*inet //'| sed 's/\( global \).*/\1/')"
     if [ ! -z "$saveip" ]; then
-        while read line; do 
+        while read line; do
             ip addr add dev $BNAME ${line//dynamic}
         done <<<"$saveip"
     else
         if [ ! -z "$3" ]; then
-            ip addr add dev $BNAME $3 
+            ip addr add dev $BNAME $3
         fi
     fi
     brctl addif $BNAME $PORTS
     if [ ! -z "$saveip" ]; then
-        while read line; do 
+        while read line; do
             ip addr del dev $PORTS ${line//dynamic}
         done <<<"$saveip"
     fi
     if [ ! -z "$saveroutes" ]; then
         ip route add $saveroutes
     fi
-    
+
     #now save the settings into the config files so that they will be persistent among reboots
     if [[ $OSVER = sles* ]] || [[ $OSVER = suse* ]] || [[ -f /etc/SuSE-release ]]; then
         nwdir="/etc/sysconfig/network"
@@ -257,10 +257,10 @@ elif [ "bridgeprereq" = "$1" ]; then
         if [ $? -ne 0 ];then
             setcap cap_net_admin=ei /usr/bin/qemu-system-x86_64
         fi
-    else 
+    else
         nwdir="/etc/sysconfig/network-scripts"
-    fi 
-    
+    fi
+
      #write into the network configuration file
     if [[ $isSLES -eq 1 ]]; then
         { cat <<EOF
@@ -275,14 +275,14 @@ EOF
         if [ ! -z "$vlan" ]; then
             echo "VLAN='yes'"
         fi; } >"$nwdir/ifcfg-$PORTS"
-        { cat <<EOF      
+        { cat <<EOF
 DEVICE='$BNAME'
 TYPE='Bridge'
 ONBOOT='yes'
 PEERDNS='yes'
 DELAY='0'
 EOF
-        if [ ! -z "$3" ]; then 
+        if [ ! -z "$3" ]; then
             echo "IPADDR='$3'"
             if [ ! -z "$4" ]; then
                 echo "NETMASK='$4'"
@@ -294,7 +294,7 @@ EOF
         #ubuntu/debian
         echo "auto $PORTS" >$nwdir/$PORTS
         echo "iface $PORTS inet manual" >> $nwdir/$PORTS
-        
+
         if [ ! -z "$vlan" ];then
             echo "  vlan-raw-device $PORTORG"
         fi
@@ -317,7 +317,7 @@ EOF
                 echo "iface $BNAME inet static"
                 echo "  address $bridge_ip"
                 echo "  netmask $bridge_mask";
-            else 
+            else
                 echo "iface $BNAME inet dhcp"
             fi
         fi
@@ -340,14 +340,14 @@ EOF
         if [ ! -z "$vlan" ]; then
             echo "VLAN=yes"
         fi; } >"$nwdir/ifcfg-$PORTS"
-        { cat <<EOF      
+        { cat <<EOF
 DEVICE=$BNAME
 TYPE=Bridge
 ONBOOT=yes
 PEERDNS=yes
 DELAY=0
 EOF
-        if [ ! -z "$3" ]; then 
+        if [ ! -z "$3" ]; then
             echo "IPADDR=$3"
             if [ ! -z "$4" ]; then
                 echo "NETMASK=$4"
@@ -355,7 +355,7 @@ EOF
         else
             echo "$ATTRS"
         fi ; }  > "$nwdir/ifcfg-$BNAME"
-    fi 
- 
+    fi
+
     ifdown "$BNAME"; ifup "$BNAME"
 fi #END bridge config.
diff --git a/xCAT-server/share/xcat/scripts/xcatconf4z b/xCAT-server/share/xcat/scripts/xcatconf4z
index 9340df53d..7bd966846 100644
--- a/xCAT-server/share/xcat/scripts/xcatconf4z
+++ b/xCAT-server/share/xcat/scripts/xcatconf4z
@@ -6,7 +6,7 @@
 # Default-Start: 2 3 5
 # Default-stop: 0 1 4 6
 # Required-Start: $syslog
-# Should-Start: 
+# Should-Start:
 # Required-Stop:
 # Short-Description: A basic active engine used to initialize and configure vm.
 # Description: Reads class x files from the reader and acts based on the type of file.
@@ -35,7 +35,7 @@ function getOsVersion {
   #        "rhel62" or "sles11sp2"
   # @Code:
   release=`cat /etc/*release`
-  
+
   if echo $release | grep -i "SUSE Linux Enterprise Server" > /dev/null ; then
     os='sles'
     version=`echo "$release" | grep "VERSION =" | sed \
@@ -44,7 +44,7 @@ function getOsVersion {
       -e 's/.//' \
       -e 's/[^0-9]*([0-9]+).*/$1/'`
     os=$os$version;
-    
+
     # Append service level
     level=`echo "$release" | grep "LEVEL =" | sed \
       -e 's/^.*LEVEL =//' \
@@ -52,7 +52,7 @@ function getOsVersion {
       -e 's/.//' \
       -e 's/[^0-9]*([0-9]+).*/$1/'`
     os=$os'sp'$level
-    
+
   elif version=`echo $release | grep -i "Red Hat Enterprise Linux Server"`; then
     os='rhel'
     version=`echo $version | sed \
@@ -107,16 +107,16 @@ function pullReader {
   # @Code:
   local funcName="pullReader"
   /sbin/modprobe vmcp
-   
+
   # Online reader
   rc= onlineDevice "000c"
   if (( rc != 0 )); then
       return $rc
   fi
-  
+
   # Grab the spool Id, class file name, and file type
   eval records=($(/usr/sbin/vmur li | tail -n +2 | cut -c 1-72 | awk '{print $1":"$2":"$3":"$10":"$11"\n"}' ))
-  
+
   # Process each spool file that is class "x"
   for record in "${records[@]}"
   do
@@ -127,28 +127,28 @@ function pullReader {
     class=$3
     filename=$4
     type=$5
-        
+
     if [[ $class != "X" ]]; then
       # Spool file is not of the class required for processing by this script.
       continue
     fi
-    
+
     if [[ $authorizedSenders != "*" ]]; then
       if [[ " $authorizedSenders " != *" $originid "* ]]; then
         # Originator is not authorized to send configuration files.
         continue
       fi
     fi
-    
+
     if [[ -n $type ]]; then
       file="$filename.$type"
     else
       file=$filename
     fi
-    
+
     # Receive the spool file
     echo "Downloading record $spoolid: $file"
-    
+
     if [[ $type == "txt" ]]; then
       # Receiving text
       rc=$(/usr/sbin/vmur re -f $spoolid $file)
@@ -178,7 +178,7 @@ function pullReader {
       # Receive block
       rc=$(/usr/sbin/vmur re $spoolid $file)
     fi
-    
+
     if (( rc != 0 )); then
       echo "xcatconf4z funcName (Error) Failed to download record $spoolid"
     fi
@@ -198,7 +198,7 @@ function setupIso {
   # @Code:
   local funcName="setupIso"
   iso="/var/opt/xcat/transport.iso"
-  
+
   # If there are files in the transport directory then create an ISO system.
   if [ "$(ls -A .)" ]; then
     /usr/bin/mkisofs -l -V 'config-2' -o $iso $transportdir
@@ -206,8 +206,8 @@ function setupIso {
       /bin/bash /tmp/znetconfig.sh
     fi
   fi
-  
-  # If the ISO filesystem exists then create loop back device pointing 
+
+  # If the ISO filesystem exists then create loop back device pointing
   # to the ISO9660 image
   if [[ -e $iso ]]; then
     nextLoopDev=`/sbin/losetup -f`
@@ -215,7 +215,7 @@ function setupIso {
       /sbin/losetup $nextLoopDev $iso
     fi
   fi
-  
+
   # Execute init script (if one exists)
   if [[ -e ${transportdir}/init.sh ]]; then
     chmod 755 ${transportdir}/init.sh
@@ -236,13 +236,13 @@ function setupDisk {
   # @Code:
   diskFile=$1
   local funcName="setupDisk"
-  
+
   # Read the file and verify we want to handle it
   if ! grep -q "# xCAT Init" "$diskFile"; then
     # File is not one that we handle.  Leave it alone.
     return
   fi
-  
+
   # Read the file now that we know it is our file
   oldIFS=$IFS
   IFS=$'\n'
@@ -258,10 +258,10 @@ function setupDisk {
     eval $newKey=$value
   done
   IFS=$oldIFS
-  
+
   # Remove the disk file after we have read it
   rm $diskFile
-  
+
   ##########################################################################
   # Handle creating a file system node
   # Disk file input parameters:
@@ -271,12 +271,12 @@ function setupDisk {
   ##########################################################################
   if [[ $xcat_action == "createfilesysnode" ]]; then
     echo "Creating a file system node, source: $xcat_srcFile, target: $xcat_tgtFile"
-    
+
     if [[ ! -n $xcat_srcFile ]]; then
       echo "xcatconf4z $funcName (Error) Source file for creating a file system node was not specified"
       return
     fi
-    
+
     if [[ ! -n $xcat_tgtFile ]]; then
       echo "xcatconf4z $funcName (Error) Target file for creating a file system node was not specified"
       return
@@ -285,22 +285,22 @@ function setupDisk {
       echo "xcatconf4z $funcName (Error) Target file for creating a file system node already exists"
       return
     fi
-    
+
     out=`/usr/bin/stat --printf=%n ${xcat_srcFile}`
     if (( $? != 0 )); then
       echo "xcatconf4z $funcName (Error) Unable to stat the source file: $xcat_srcFile"
       return
     fi
-    
+
     configFile='/etc/udev/rules.d/56-zfcp.rules'
     tgtNode=$(echo ${xcat_tgtFile} | sed -e 's/^\/dev\///')
     wwpn_lun=$(echo ${xcat_srcFile} | sed -e 's/^\/dev.*-zfcp-//')
     wwpn=$(echo ${wwpn_lun} | sed -e 's/:0x.*//')
     lun=$(echo ${wwpn_lun} | sed -e 's/^0x.*://')
-    
+
     echo "KERNEL==\"sd*\", SYSFS{wwpn}==\"${wwpn}\", SYSFS{fcp_lun}==\"${lun}\", SYMLINK+=\"${tgtNode}%n\"" >> ${configFile}
     udevadm trigger --sysname-match=sd*
-  
+
   ##########################################################################
   # Handle removing a file system node
   # Disk file input parameters:
@@ -313,13 +313,13 @@ function setupDisk {
       echo "xcatconf4z $funcName (Error) Target file for creating a file system node was not specified"
       return
     fi
-    
+
     configFile='/etc/udev/rules.d/56-zfcp.rules'
     tgtNode=$(echo ${xcat_tgtFile} | sed -e 's/^\/dev\///')
 
     sed -i -e /SYMLINK+=\"${tgtNode}%n\"/d ${configFile}
     udevadm trigger --sysname-match=sd*
-  
+
   ##########################################################################
   # Handle adding a SCSI volume
   # Disk file input parameters:
@@ -330,38 +330,38 @@ function setupDisk {
   ##########################################################################
   elif [[ $xcat_action == "addScsiVolume" ]]; then
     echo "Adding a SCSI Volume, FCP addr: $xcat_fcpAddr, WWPN: $xcat_wwpn, LUN: $xcat_lun"
-    
+
     # Validate the input
     if [[ ! -n $xcat_fcpAddr ]]; then
       echo "xcatconf4z $funcName (Error) FCP address was not specified"
       return
     fi
     xcat_fcpAddr=`echo $xcat_fcpAddr | tr '[A-Z]' '[a-z]'`
-    
+
     if [[ ! -n $xcat_wwpn ]]; then
       echo "xcatconf4z $funcName (Error) WWPN was not specified"
       return
     fi
     xcat_wwpn=`echo $xcat_wwpn | tr '[A-Z]' '[a-z]'`
-    
+
     if [[ ! -n $xcat_lun ]]; then
       echo "xcatconf4z $funcName (Error) LUN was not specified"
       return
     fi
     xcat_lun=`echo $xcat_lun | tr '[A-Z]' '[a-z]'`
-    
+
     # Online the device
     rc= onlineDevice $xcat_fcpAddr
     if (( rc != 0 )); then
       return
     fi
-    
+
     # Set WWPN and LUN in sysfs
     if [[ -e /sys/bus/ccw/drivers/zfcp/0.0.$xcat_fcpAddr/port_add ]]; then
       echo 0x$xcat_wwpn > /sys/bus/ccw/drivers/zfcp/0.0.$xcat_fcpAddr/port_add
     fi
     echo 0x$xcat_lun > /sys/bus/ccw/drivers/zfcp/0.0.$xcat_fcpAddr/0x$xcat_wwpn/unit_add
-    
+
     # Set WWPN and LUN in configuration files
     #   RHEL: /etc/zfcp.conf
     #   SLES 10: /etc/sysconfig/hardware/hwcfg-zfcp-bus-ccw-*
@@ -373,10 +373,10 @@ function setupDisk {
     elif [[ $os == sles11* ]]; then
       /sbin/zfcp_host_configure 0.0.$xcat_fcpAddr 1
       /sbin/zfcp_disk_configure 0.0.$xcat_fcpAddr $xcat_wwpn $xcat_lun 1
-      
-      # Configure zFCP device to be persistent                
+
+      # Configure zFCP device to be persistent
       touch /etc/udev/rules.d/51-zfcp-0.0.$xcat_fcpAddr.rules
-      
+
       # Check if the file already contains the zFCP channel
       out=`cat "/etc/udev/rules.d/51-zfcp-0.0.$xcat_fcpAddr.rules" | egrep -i "ccw/0.0.$xcat_fcpAddr]online"`
       if [[ ! $out ]]; then
@@ -387,17 +387,17 @@ function setupDisk {
         echo "ACTION==\"add\", ENV{COLLECT_0.0.$xcat_fcpAddr}==\"0\", ATTR{[ccw/0.0.$xcat_fcpAddr]online}=\"1\"" \
           | tee -a /etc/udev/rules.d/51-zfcp-0.0.$xcat_fcpAddr.rules
       fi
-      
+
       echo "ACTION==\"add\", KERNEL==\"rport-*\", ATTR{port_name}==\"0x$xcat_wwpn\", SUBSYSTEMS==\"ccw\", KERNELS==\"0.0.$xcat_fcpAddr\", ATTR{[ccw/0.0.$xcat_fcpAddr]0x$xcat_wwpn/unit_add}=\"0x$xcat_lun\"" \
         | tee -a /etc/udev/rules.d/51-zfcp-0.0.$device.rules
     elif [[ $os == rhel* ]]; then
       echo "0.0.$xcat_fcpAddr 0x$xcat_wwpn 0x$xcat_lun" >> /etc/zfcp.conf
-      
+
       if [[ $os == rhel6* ]]; then
         echo "add" > /sys/bus/ccw/devices/0.0.$xcat_fcpAddr/uevent
       fi
     fi
-    
+
     # Settle the file system so when we are done the device is fully available
     if [[ $(which udevadm 2> /dev/null) != '' ]]; then
         udevadm settle
@@ -421,7 +421,7 @@ function setupDisk {
     if [[ ! -e "/dev/disk/by-path/ccw-0.0.${xcat_fcpAddr}-zfcp-0x${xcat_wwpn}:0x${xcat_lun}" ]]; then
       echo "/dev/disk/by-path/ccw-0.0.${xcat_fcpAddr}-zfcp-0x${xcat_wwpn}:0x${xcat_lun} did not appear in $maxTime seconds, continuing."
     fi
-    
+
   ##########################################################################
   # Handle removing a SCSI volume
   # Disk file input parameters:
@@ -432,32 +432,32 @@ function setupDisk {
   ##########################################################################
   elif [[ $xcat_action == "removeScsiVolume" ]]; then
     echo "Removing a SCSI Volume, FCP addr: $xcat_fcpAddr, WWPN: $xcat_wwpn, LUN: $xcat_lun"
-    
+
     # Validate the input
     if [[ ! -n $xcat_fcpAddr ]]; then
       echo "xcatconf4z $funcName (Error) FCP address was not specified"
       return
     fi
     xcat_fcpAddr=`echo $xcat_fcpAddr | tr '[A-Z]' '[a-z]'`
-    
+
     if [[ ! -n $xcat_wwpn ]]; then
       echo "xcatconf4z $funcName (Error) WWPN was not specified"
       return
     fi
     xcat_wwpn=`echo $xcat_wwpn | tr '[A-Z]' '[a-z]'`
-    
+
     if [[ ! -n $xcat_lun ]]; then
       echo "xcatconf4z $funcName (Error) LUN was not specified"
       return
     fi
     xcat_lun=`echo $xcat_lun | tr '[A-Z]' '[a-z]'`
-    
+
     # Delete the SCSI device
     scsiDevice=`lszfcp -l 0x$xcat_lun | grep 0x$xcat_lun | cut -d " " -f2`
     if [[ -n $scsiDevice ]]; then
       echo 1 > "/sys/bus/scsi/devices/$scsiDevice/delete"
     fi
-    
+
     # Delete WWPN and LUN from sysfs
     if [[ -e /sys/bus/ccw/drivers/zfcp/0.0.$xcat_fcpAddr/0x$xcat_wwpn/unit_remove ]]; then
       if [[ $(which udevadm 2> /dev/null) != '' ]]; then
@@ -467,7 +467,7 @@ function setupDisk {
       fi
       echo 0x$xcat_lun > /sys/bus/ccw/drivers/zfcp/0.0.$xcat_fcpAddr/0x$xcat_wwpn/unit_remove
     fi
-    
+
     # Delete WWPN and LUN from configuration files
     #   RHEL: /etc/zfcp.conf
     #   SLES 10: /etc/sysconfig/hardware/hwcfg-zfcp-bus-ccw-*
@@ -525,7 +525,7 @@ function setupDisk {
       rm -rf $xcat_mntdir
     fi
     mkdir -p $xcat_mntdir
-    
+
     cp /etc/fstab /etc/fstab.bak
     out=`cat "/etc/fstab" | egrep -i "ccw-0.0.$xcat_vaddr"`
     if [[  $out ]]; then
@@ -541,9 +541,9 @@ function setupDisk {
     else
       echo "The disk $xcat_vaddr has been mounted to $xcat_mntdir in format $xcat_filesys successfully"
     fi
- 
+
     fi
-  
+
   return
 }
 
@@ -587,24 +587,24 @@ function injectFiles {
 ############################################################################
 # Main Code Section
 ############################################################################
-case "$1" in  
+case "$1" in
   start)
     echo "xcatconf4z is starting"
     transportdir="/var/opt/xcat/transport"
     rm -Rf $transportdir
     /bin/mkdir -p $transportdir
     cd $transportdir
-    
+
     # Get Linux version
     getOsVersion
-    
+
     if [[ -n "$authorizedSenders" ]]; then
       pullReader
       echo "xcatconf4z has successfully processed the reader files."
     else
       echo "xcatconf4z is disabled from accepting configuration reader files."
     fi
-      
+
     setupIso
   ;;
 
@@ -615,12 +615,12 @@ case "$1" in
       echo "xcatconf4z is disabled from accepting configuration reader files."
     fi
   ;;
-  
+
   version)
     echo "xcatconf4z version:" $version
   ;;
-  
-  stop|restart|reload|force-reload)  
-    # Do nothing  
-  ;;  
-esac  
+
+  stop|restart|reload|force-reload)
+    # Do nothing
+  ;;
+esac
diff --git a/xCAT-server/share/xcat/scripts/xdcpappend.sh b/xCAT-server/share/xcat/scripts/xdcpappend.sh
index 49aba4770..9e4e83b97 100755
--- a/xCAT-server/share/xcat/scripts/xdcpappend.sh
+++ b/xCAT-server/share/xcat/scripts/xdcpappend.sh
@@ -2,7 +2,7 @@
 # This script is used by the xdcp APPEND: function to perform the
 # append operation on the nodes.
 #First parm is nodesyncfiledir,  then after that are the lines for the
-#APPEND clause  put in the format   
+#APPEND clause  put in the format
 #appendfile1:orgfile1 appendfile2:orgfile2.....
 #
 nodesyncfiledir=$1
@@ -20,12 +20,12 @@ for i in $*; do
   appendfile="$nodesyncfiledirappend$appendfilebase"
   # get the file to append to
   orgfile=`echo "$i"|cut -d ':' -f 2`
-  # get the directory to backup the original file to append 
+  # get the directory to backup the original file to append
   orgfiledir=`dirname $orgfile`
   filebackupdir="$nodesyncfiledirorg$orgfiledir"
   filebackup="$nodesyncfiledirorg$orgfile"
   # now do the work
-  mkdir -p $filebackupdir 
+  mkdir -p $filebackupdir
   # if there does not exist an original backup, make one
   if [ ! -f "$filebackup" ]; then
     cp -p $orgfile $filebackup
diff --git a/xCAT-server/share/xcat/scripts/xdcpmerge.sh b/xCAT-server/share/xcat/scripts/xdcpmerge.sh
index 00b3de1cd..03f2636e9 100755
--- a/xCAT-server/share/xcat/scripts/xdcpmerge.sh
+++ b/xCAT-server/share/xcat/scripts/xdcpmerge.sh
@@ -1,24 +1,24 @@
 #!/bin/bash
 # This script is used by the xdcp MERGE: function to perform the
-# merge operation on the nodes for the /etc/passwd, /etc/shadow and 
+# merge operation on the nodes for the /etc/passwd, /etc/shadow and
 # and /etc/group files. These are the only supported files for merge.
 # The MERGE function is also only supported on Linux.
 #First parameter is nodesyncfiledir
-#The next parameter is the MERGE clause put in the following format   
+#The next parameter is the MERGE clause put in the following format
 #mergefile1:currfile1 mergefile2:currfile2.....
 #For example:
 #/tmp/myusers:/etc/passwd /tmp/mypasswds:/etc/shadow /tmp/mygrps:/etc/group
 #
 
-# Check for Linux, AIX not supported 
+# Check for Linux, AIX not supported
 
 if [ "$(uname -s)" != "Linux" ]; then
-  logger -t xcat -p local4.err "Merge: xdcp merge is only supported on Linux" 
+  logger -t xcat -p local4.err "Merge: xdcp merge is only supported on Linux"
   exit 1
 fi
 #this is the base path to the merge directory
 nodesyncfiledir=$1
-#this is the backup copy of the original current file 
+#this is the backup copy of the original current file
 nodesyncfiledirorg="$nodesyncfiledir/org"
 #this is the path to merge working files
 nodesyncfiledirmerge="$nodesyncfiledir/merge"
@@ -39,13 +39,13 @@ for i in $*; do
   # get the file path and name to merge into, for example /etc/passwd
   curfile=`echo "$i"|cut -d ':' -f 2`
 
-  # if curfile not /etc/passwd  or /etc/shadow or /etc/group 
+  # if curfile not /etc/passwd  or /etc/shadow or /etc/group
   # exit error
   #if [ "$curfile" != "/etc/passwd" ] && [ "$curfile" != "/etc/shadow" ] && [ "$curfile" != "/etc/group" ]; then
-  #  logger -t xcat -p local4.err "Merge: $curfile is not /etc/passwd or /etc/shadow or /etc/group. It cannot be processes." 
+  #  logger -t xcat -p local4.err "Merge: $curfile is not /etc/passwd or /etc/shadow or /etc/group. It cannot be processes."
   #   exit 1
-  #fi 
-  # get the directory to backup the original file  
+  #fi
+  # get the directory to backup the original file
   curfiledir=`dirname $curfile`
   curfilename=`basename $curfile`
   filebackupdir="$nodesyncfiledirorg$curfiledir"
@@ -53,23 +53,23 @@ for i in $*; do
   filebackup="$nodesyncfiledirorg$curfile"
   # now do the work
   # make the necessary directories
-  mkdir -p $filebackupdir 
-  # copy current to  backup 
+  mkdir -p $filebackupdir
+  # copy current to  backup
   cp -p $curfile $filebackup
 
   # Go though the backup copy and remove duplicate lines that  are
-  # in the merge file and create a new backup 
-  # first get a list of  duplicate lines to remove 
+  # in the merge file and create a new backup
+  # first get a list of  duplicate lines to remove
   # based on only username:  the first field in the file
   cut -d: -f1 $filebackup > $filebackup.userlist
   cut -d: -f1 $mergefile > $mergefile.userlist
   comm -12 <(sort $filebackup.userlist | uniq) <(sort $mergefile.userlist | uniq) > $filebackup.remove
- 
-  # now if there is a remove file,  use it to remove the dup lines in backup 
-  # Need to buit a command like the following with all users 
-  #grep -v -E ^(root|bin|...) $filebackup > $filebackup.nodups 
+
+  # now if there is a remove file,  use it to remove the dup lines in backup
+  # Need to buit a command like the following with all users
+  #grep -v -E ^(root|bin|...) $filebackup > $filebackup.nodups
   if [ -s "$filebackup.remove" ]; then
-    grepcmd="grep -v -E " 
+    grepcmd="grep -v -E "
     removeusers=`cat $filebackup.remove`
     startlist="'^("
     userlist=$startlist
@@ -98,12 +98,12 @@ for i in $*; do
   cat $filebackup $mergefile > $curfile
   
   # now cleanup
-  rm $filebackup.userlist 
+  rm $filebackup.userlist
   #  echo "rm $filebackup.userlist"
-  rm $filebackup.remove 
+  rm $filebackup.remove
   #  echo "rm $filebackup.remove"
-  rm $mergefile.userlist 
+  rm $mergefile.userlist
   #  echo "rm $mergefile.userlist"
-   
+
 done
 exit 0
diff --git a/xCAT-server/share/xcat/tools/dhcpop b/xCAT-server/share/xcat/tools/dhcpop
index a1b8543ce..ef22e4557 100755
--- a/xCAT-server/share/xcat/tools/dhcpop
+++ b/xCAT-server/share/xcat/tools/dhcpop
@@ -33,14 +33,14 @@ if($help){
         print "Error: no 'omapi' entry defined in passwd table!";
         exit 1;
     }
-    
+
     my $omshell;
     open($omshell, "|/usr/bin/omshell >/dev/null");
     print $omshell "key "
       . $id . " \""
       . $passwd . "\"\n";
     print $omshell "connect\n";
-    
+
     if($hostname){
         print $omshell "new host\n";
         print $omshell
@@ -49,7 +49,7 @@ if($help){
         print $omshell "remove\n";
         print $omshell "close\n";
     }
-    
+
     if ($mac)
     {
         print $omshell "new host\n";
@@ -59,7 +59,7 @@ if($help){
         print $omshell "remove\n";
         print $omshell "close\n";
     }
-    
+
     if($ip){
        print $omshell "new host\n";
        print $omshell
diff --git a/xCAT-server/share/xcat/tools/go-xcat b/xCAT-server/share/xcat/tools/go-xcat
index 6fe87e9a2..715e5745a 100755
--- a/xCAT-server/share/xcat/tools/go-xcat
+++ b/xCAT-server/share/xcat/tools/go-xcat
@@ -2,7 +2,7 @@
 #
 # go-xcat - Install xCAT automatically.
 #
-# Version 1.0.28
+# Version 1.0.29
 #
 # Copyright (C) 2016, 2017, 2018 International Business Machines
 # Eclipse Public License, Version 1.0 (EPL-1.0)
@@ -72,7 +72,7 @@ function usage()
 # verbose_usage		This function be will be called when user run
 #			`go-xcat --long-help'.
 #			Including a bunch of secert usage.
-# 
+#
 function verbose_usage()
 (
 	local script="${0##*/}"
@@ -1320,9 +1320,19 @@ function install_packages_yum()
 	yum --nogpgcheck "${yes[@]}" install "$@"
 }
 
+# Dirty workaround on SLES 11 SP4
+function github_issue_5503_workaround()
+{
+	[[ "${GO_XCAT_LINUX_DISTRO}" = "sles" ]] || return 0
+	[[ "${GO_XCAT_LINUX_VERSION}" =~ ^11(\.[0-4]){0,1}$ ]] || return 0
+	rpm -e --allmatches gpg-pubkey-ca548a47-5b2c830b >/dev/null 2>&1
+	return 0
+}
+
 function install_packages_zypper()
 {
 	type zypper >/dev/null 2>&1 || return 255
+	github_issue_5503_workaround
 	local -a yes=()
 	[[ "$1" = "-y" ]] && yes=("-n") && shift
 	zypper --no-gpg-checks "${yes[@]}" install --force-resolution "$@"
@@ -1790,16 +1800,16 @@ case "${GO_XCAT_ACTION}" in
 		# Only print out this message on install
 		while read -r ; do echo "${REPLY}" ; done <<-EOF
 
-		xCAT has been installed!  
+		xCAT has been installed!
 		========================
 
 		If this is the very first time xCAT has been installed, run the following
 		commands to set environment variables into your PATH:
 
-		For sh: 
+		For sh:
 		    source /etc/profile.d/xcat.sh
 
-		For csh: 
+		For csh:
 		    source /etc/profile.d/xcat.csh
 		EOF
 		;;
diff --git a/xCAT-server/share/xcat/tools/jenkins/xcatjktest b/xCAT-server/share/xcat/tools/jenkins/xcatjktest
index 6909872c0..93f75e5bd 100755
--- a/xCAT-server/share/xcat/tools/jenkins/xcatjktest
+++ b/xCAT-server/share/xcat/tools/jenkins/xcatjktest
@@ -78,7 +78,7 @@ sub send_msg {
     }
     print LOGFILE "$timestamp $$ $content $msg\n";
     close LOGFILE;
-    
+
     if(!$quiet){
         print "$timestamp $$ $content $msg\n";
     }
@@ -103,7 +103,7 @@ sub runcmd {
     return @$outref;
 }
 #######################################
-# parse cluser.conf file 
+# parse cluser.conf file
 #######################################
 sub load_cluster_conf {
     my $type = undef;      #Script_Prev,Script_Post,Table,Object,System,Custom
@@ -175,7 +175,7 @@ sub load_cluster_conf {
     return 0;
 }
 #######################################
-# rewrite cluster.conf file  
+# rewrite cluster.conf file
 #######################################
 sub reset_cluster_conf{
     if(exists $config{object}){
@@ -214,7 +214,7 @@ sub reset_cluster_conf{
     return 0;
 }
 #######################################
-# get netboot value 
+# get netboot value
 #######################################
 sub get_netboot_value{
     my $osv=shift;
@@ -252,7 +252,7 @@ sub get_netboot_value{
 # init
 #######################################
 sub init{
-    
+
     $proid="$proname-$proruntime";
     $logfile="log.$proid";
     $logfiledir="$homedir/log/$proname/$proruntime";
@@ -287,7 +287,7 @@ sub read_conf{
     }
     close($myfile);
 
-    #for support both 'le' and 'el' 
+    #for support both 'le' and 'el'
     foreach my $k (keys %confkeys) {
         if($k =~ /ppc64el/i || $k =~ /ppc64le/i){
             if($k =~ /(.+)-(.+)-(.+)/){
@@ -317,10 +317,10 @@ sub usage{
     --testcase: Required, specify the test case list. value \"all\" means running daily regression test\n
     --project-name: Required, specify the project name.\n
     --num: Required, specifys this is how many times does this project run.\n
-    --xcat-core: Required, a web address, specify where to download the xcat-core package\n 
+    --xcat-core: Required, a web address, specify where to download the xcat-core package\n
     --xcat-dep: Required, a web address, specify where to download the xcat-dep package\n
     --email: a mail address, sepcify who should receive the test result report\n
-    --quiet: don't output to screen, just keep output in log file. output to screen by default\n 
+    --quiet: don't output to screen, just keep output in log file. output to screen by default\n
     --hold: hold environment for 24 hours if some case stop and need to hold environment\n\n";
 
     print "  $pro_name [-?|-h]\n";
@@ -335,12 +335,12 @@ sub usage{
 sub get_build{
     send_msg(2, "start to get xcat build........");
 
-    &runcmd("cd $xcatpackagesdir >/dev/null 2>&1 && wget $xcatcore_addr >/dev/null 2>&1"); 
+    &runcmd("cd $xcatpackagesdir >/dev/null 2>&1 && wget $xcatcore_addr >/dev/null 2>&1");
     if($?){
         send_msg(0, "[get_build] Can't download xcat-core from $xcatcore_addr");
         return 1;
     }
-   
+
     &runcmd("cd $xcatpackagesdir >/dev/null 2>&1 && wget $xcatdep_addr >/dev/null 2>&1");
     if($?){
         send_msg(0, "[get_build] Can't download xcat-dep from $xcatdep_addr");
@@ -358,7 +358,7 @@ sub get_build{
 }
 
 #######################################
-# do clean uo job when exit 
+# do clean uo job when exit
 #######################################
 sub cleanup{
     unlink("/tmp/totalcase.$proid") if(-e "/tmp/totalcase.$proid");
@@ -367,7 +367,7 @@ sub cleanup{
 }
 
 #######################################
-# exit 
+# exit
 #######################################
 sub exit_test{
     my $rst=shift;
@@ -386,7 +386,7 @@ sub env_check {
         send_msg(0, "can't find $cluster_name under $homedir");
         return 1;
     }
-     
+
     if(! -e "$orgclusterconffile"){
        send_msg(0, "can't find $orgclusterconffile");
        return 1;
@@ -406,10 +406,10 @@ sub env_check {
         send_msg(0, "can't fine arch of CN in $orgclusterconffile");
         return 1;
     }
-    
-    $arch=$config{object}{node}{$config{var}{CN}}{arch}; 
 
-    if($arch !~ /^x86/i && 
+    $arch=$config{object}{node}{$config{var}{CN}}{arch};
+
+    if($arch !~ /^x86/i &&
       $arch !~ /^ppc64$/i &&
       $arch !~ /^ppc64le$/i &&
       $arch !~ /^ppc64el$/i){
@@ -432,12 +432,12 @@ sub mn_install {
         send_msg(0, "[mn_install] Can't find definition of $mn in current control node");
         return 1;
     }
-  
+
     if(!exists($confkeys{"$os-$arch-image"}) || !defined($confkeys{"$os-$arch-image"})){
         send_msg(0, "[mn_install] Can't find image definition for $mn in global conf file");
         return 1;
     }
-   
+
     my $osimage= $confkeys{"$os-$arch-image"};
     &runcmd("lsdef -t osimage|grep $osimage");
     if($?){
@@ -467,7 +467,7 @@ sub mn_install {
         }
         send_msg(2, "[mn_install] set setupntp as $mn 's postscript...[done]");
     }
-   
+
     if($os =~ /ubuntu/i){
         if($arch =~ /le/i || $arch =~ /el/i){
             my $miniisopath=$logfiledir;
@@ -479,7 +479,7 @@ sub mn_install {
             }
             send_msg(2, "[mn_install] download mini.iso from $downloadpath  ....[done]");
             mkpath("/install/$os/ppc64el/install/netboot") if(! -e "/install/$os/ppc64el/install/netboot");
-            rename("/install/$os/ppc64el/install/netboot/initrd.gz", "/install/$os/ppc64el/install/netboot/initrd.gz.bakupby$proid") if(-e "/install/$os/ppc64el/install/netboot/initrd.gz"); 
+            rename("/install/$os/ppc64el/install/netboot/initrd.gz", "/install/$os/ppc64el/install/netboot/initrd.gz.bakupby$proid") if(-e "/install/$os/ppc64el/install/netboot/initrd.gz");
             mkpath("$miniisopath/mountpoint");
             &runcmd("mount -o loop $miniisopath/mini.iso $miniisopath/mountpoint");
             &runcmd("cp $miniisopath/mountpoint/install/initrd.gz /install/$os/ppc64el/install/netboot/");
@@ -519,13 +519,13 @@ sub mn_install {
         send_msg(0, "[mn_install] install $osimage on mn $mn failed");
         return 1;
     }
-    
+
     &runcmd("ping -c 2 $mn  > /dev/null");
     if($?){
         send_msg(0, "[mn_install] ping $mn failed after installation");
         return 1;
     }
-    
+
     &runcmd("xdsh $mn date > /dev/null");
     if($?){
         send_msg(0, "[mn_install] xdsh $mn date failed after installation");
@@ -611,7 +611,7 @@ sub prepare_mn {
         }
         send_msg(2, "[prepare_mn] copy RPM-GPG-KEY-redhat-release to $mn...[done]");
     }
-     
+
     my $iso= $confkeys{"$os-$arch-iso"};
     if ($iso eq ""){
         send_msg(0, "[prepare_mn] can't find iso for $mn in golbal conf file");
@@ -620,7 +620,7 @@ sub prepare_mn {
     if(! -e "$isodir/$iso"){
         send_msg(0, "[prepare_mn] can't find $iso under $isodir");
         return 1;
-    }  
+    }
     send_msg(2, "[prepare_mn] find $iso for os=$os and arch=$arch");
 
     &runcmd("scp $isodir/$iso root\@$mn:/  >/dev/null");
@@ -629,7 +629,7 @@ sub prepare_mn {
         return 1;
     }
     send_msg(2, "[prepare_mn] copy $iso to $mn...[done]");
- 
+
     if($os =~ /ubuntu/i){
         if($arch =~ /le/i || $arch =~ /el/i){
             my $miniisopath=$logfiledir;
@@ -643,7 +643,7 @@ sub prepare_mn {
     }
 
     &load_cluster_conf;
-    if(exists ($config{var}{SN})){ 
+    if(exists ($config{var}{SN})){
         if(!exists($config{object}{node}{$config{var}{SN}}{arch})){
             send_msg(0, "[prepare_mn] SN without arch attribute in $orgclusterconffile");
             return 1;
@@ -658,7 +658,7 @@ sub prepare_mn {
             return 1;
         }
         $config{object}{node}{$config{var}{SN}}{os}=$os;
-     
+
         if($arch =~ /ppc64le/i || $arch =~ /ppc64el/i){
             if($os =~ /ubuntu/i){
                 $config{object}{node}{$config{var}{SN}}{arch}="ppc64el";
@@ -696,14 +696,14 @@ sub prepare_mn {
     if(exists ($config{var}{ISO})){
         $config{var}{ISO}="/$iso";
     }
-    
+
     if(exists ($config{var}{OS})){
         if($os =~ /(\D+)\d.*/){
             $config{var}{OS}="$1";
-        } 
-    }   
-    &reset_cluster_conf; 
-    
+        }
+    }
+    &reset_cluster_conf;
+
     send_msg(2, "prepare mn $mn .....[done]");
     return 0;
 }
@@ -715,7 +715,7 @@ sub prepare_mn {
 sub install_xcattest {
     send_msg(2, "[install_xcattest] starting to install xcat-test in $mn");
     if($os =~ /rhel/i){
-        $os =~ /(\D+)(\d+)\.?(\d?)/;       
+        $os =~ /(\D+)(\d+)\.?(\d?)/;
         &runcmd("xdsh $mn \"cd /xcat-core && ./mklocalrepo.sh\" >/dev/null 2>&1");
         my $version=$2;
         if($arch =~ /ppc64le/i || $arch =~ /ppc64el/i){
@@ -750,7 +750,7 @@ sub install_xcattest {
         &runcmd("xdsh $mn \"rpm -ivh /xcat-core/xCAT-test-*.rpm --nodeps > $installlog 2>&1 \" >/dev/null 2>&1");
         &runcmd("xdsh $mn \"zypper -n install createrepo expect\" >/dev/null 2>&1");
         &runcmd("xdsh $mn \"zypper -n install mysql-client libmysqlclient_r15  libqt4-sql-mysql libmysqlclient15 perl-DBD-mysql mysql unixODBC\" >/dev/null 2>&1");
-        
+
         if($arch =~ /le/i || $arch =~ /el/i){
             &runcmd ("xdsh  $mn \"zypper -n install perl-Net-DNS-0.80-1.ppc64le\">/dev/null 2>&1");
         }
@@ -761,7 +761,7 @@ sub install_xcattest {
         &runcmd("xdsh $mn \"echo \"nameserver 9.0.2.1\" >> /etc/resolv.conf\" >/dev/null 2>&1");
         &runcmd("xdsh $mn 'apt-get -y install software-properties-common' >/dev/null 2>&1");
         if($?){
-            send_msg(0, "[install_xcattest] apt-get -y install software-properties-common in $mn failed");    
+            send_msg(0, "[install_xcattest] apt-get -y install software-properties-common in $mn failed");
             return 1;
         }
 
@@ -792,7 +792,7 @@ sub install_xcattest {
                 return 1;
             }
         }
-        
+
         &runcmd("xdsh $mn \"wget -O - \"http://sourceforge.net/projects/xcat/files/ubuntu/apt.key/download\" | apt-key add -\" >/dev/null 2>&1");
         if($?){
             send_msg(0, "[install_xcattest] \"wget -O - \"http://sourceforge.net/projects/xcat/files/ubuntu/apt.key/download\" | apt-key add -\" in $mn failed");
@@ -843,7 +843,7 @@ sub install_xcattest {
         }
     }
 
-    &runcmd("scp $mn:/$installlog $logfiledir/new_xcattest_installation.log >/dev/null 2>&1"); 
+    &runcmd("scp $mn:/$installlog $logfiledir/new_xcattest_installation.log >/dev/null 2>&1");
 
     #check if xcat-test is installed successfully on mn
     if($os =~ /rhel/i || $os =~ /sles/i){
@@ -855,7 +855,7 @@ sub install_xcattest {
     if($?){
        send_msg(0, "[install_xcattest] install xcat-test in $mn failed");
        return 1;
-    }    
+    }
 
     #export some environment variables
     &runcmd("xdsh $mn \"touch /etc/profile.d/xcatjk.sh; echo -e \\\"XCATROOT=/opt/xcat\nPATH=\$XCATROOT/bin:\$XCATROOT/sbin:\$XCATROOT/share/xcat/tools:\$PATH\nMANPATH=\$XCATROOT/share/man:\$MANPATH\nexport XCATROOT PATH MANPATH\nexport PERL_BADLANG=0\\\" >> /etc/profile.d/xcatjk.sh;source /etc/profile.d/xcatjk.sh\" >/dev/null 2>&1");
@@ -893,10 +893,10 @@ sub do_test {
         runcmd("xdsh $mn \"rm -rf /bin/sh\" >/dev/null 2>&1");
         runcmd("xdsh $mn \"ln -s /bin/bash /bin/sh\"");
     }
- 
+
     if($bucket =~ /^all$/i){
         my $bundle=$os."_".$arch.".bundle";
-        
+
         &runcmd("xdsh $mn 'ls -l /opt/xcat/share/xcat/tools/autotest/bundle/|grep $bundle' >/dev/null 2>&1");
         if($?){
             send_msg(0, "[do_test] can't find $bundle under $mn:/opt/xcat/share/xcat/tools/autotest/bundle/ ");
@@ -908,7 +908,7 @@ sub do_test {
             send_msg(0, "[do_test] can't copy $mn:/opt/xcat/share/xcat/tools/autotest/bundle/$bundle back");
             return 1;
         }
-     
+
         if(!open(FILE, "<$logfiledir/$bundle")){
              send_msg(0, "[do_test] can't open $logfiledir/$bundle");
              return 1;
@@ -935,7 +935,7 @@ sub do_test {
          @output1=runcmd("ssh -t $mn 'exec bash -l -i -c \"xcattest -f /opt/xcat/share/xcat/tools/autotest/default.conf:System -t  install_xCAT_on_ubuntu >/dev/null\"'");
          $rst1=$?;
        }
-       
+
       if($rst1){
           $installcasestop=1;
           my $tmpoutput1=join(' ', @output1);
@@ -950,13 +950,13 @@ sub do_test {
            &runcmd("scp -r $mn:/opt/xcat/share/xcat/tools/autotest/result/* $logfiledir >/dev/null 2>&1");
            if ($?){
             send_msg(0, "[do_test] copy install_case result to $logfiledir failed");
-           } 
-           return 2;       
+           }
+           return 2;
        }
 
         #then run other cases with the bundle file
-     
-        my $rst=0; 
+
+        my $rst=0;
         my @output;
         send_msg(2, "[do_test] doing test [$bundle] in $mn.....");
         if($os !~ /ubuntu/i){
@@ -968,7 +968,7 @@ sub do_test {
         }
         my $tmpoutput=join(' ', @output);
         send_msg(2, "[do_test] output of trigger xcattest: $tmpoutput");
-        if($rst){  
+        if($rst){
             $casestop=1;
             send_msg(2, "[do_test] the regression job in $mn was STOPPED for some one case");
         }else{
@@ -986,7 +986,7 @@ sub do_test {
     }
 
 
-    
+
     return 2 if($casestop);
     return 0;
 }
@@ -1001,20 +1001,20 @@ sub create_report{
     $mailreport .= "  Test Result for Project $proid\n";
     $mailreport .= "======================================\n\n";
     $mailreport .= "[$os+$arch]\n\n";
-    
+
     if($sub_process_rt){
         my $h=int($all_reg_time_consumption/3600);
         my $m=int(($all_reg_time_consumption - $h*3600)/60);
         my $s=($all_reg_time_consumption - $h*3600)%60;
         $mailreport .= "\tAll time consumption: $h hours $m minutes $s seconds\n\n";
-     
+
        if($env_dply_time_consumption){
            $h=int($env_dply_time_consumption/3600);
            $m=int(($env_dply_time_consumption - $h*3600)/60);
            $s=($env_dply_time_consumption- $h*3600)%60;
            $mailreport .= "\tDeploy test environment time consumption: $h hours $m minutes $s seconds\n\n";
        }
-       
+
         if($err_record ne ""){
             $mailreport .= "\tDeploy MN result: $err_record\n\n";
         }else{
@@ -1047,7 +1047,7 @@ sub create_report{
             closedir(DIR);
             $mailreport .= "\tTotalCase $totalcase TotalRun $totalcnt Failed $failcnt\n\n\tFailed cases: $faillist\n\n";
 
-            if($teststopflag){ 
+            if($teststopflag){
                 my $lastfile = `ls -l $logfiledir|grep "xcattest.log"|tail -1|awk '{print \$9}'`;
                 chomp($lastfile);
                 my $lastline=`cat $logfiledir/$lastfile |grep -- "------END::"|tail -1`;
@@ -1063,7 +1063,7 @@ sub create_report{
     }
 
     $mailreport .= "\n-------------------------------------------\nCluster Information:\n";
-    $mailreport .= "\t MN: $mn\n";    
+    $mailreport .= "\t MN: $mn\n";
     $mailreport .= "\t SN: $config{var}{SN}\n";
     $mailreport .= "\t CN: $config{var}{CN}\n";
     $mailreport .= "\t Test result are saved under $mn:/opt/xcat/share/xcat/tools/autotest/result/\n" if($teststopflag && $hold);
@@ -1079,7 +1079,7 @@ sub send_mail{
     my $subject="";
     my $attachfile="";
 
-    if($err_record ne ""){ 
+    if($err_record ne ""){
          $subject = "[JK][$proid][FAILED] $err_record";
     }else{
         my $output = `cat $mailfile |grep "Total"|grep "Failed"`;
@@ -1088,8 +1088,8 @@ sub send_mail{
             $totalcnt=$2;
             $failcnt=$3;
         }
-       
-        if($failcnt > 0){ 
+
+        if($failcnt > 0){
             $attachfile="/tmp/failed_case_detail.$proid";
             opendir(DIR, "$logfiledir");
             foreach my $file (readdir DIR){
@@ -1099,7 +1099,7 @@ sub send_mail{
             }
             close(DIR);
         }
-    
+
         if($teststopflag){
             $subject = "[JK][$proid][STOP for $lastcase] TotalCase:$totalcase TotalRun:$totalcnt Fail:$failcnt";
         }else{
@@ -1109,7 +1109,7 @@ sub send_mail{
                 $subject = "[JK][$proid][FAILED] TotalCase:$totalcase TotalRun:$totalcnt Fail:$failcnt";
             }
         }
-    } 
+    }
 
     my $sendto = "$mail_list $defaultmail";
     if($failcnt > 0){
@@ -1176,7 +1176,7 @@ send_msg(2,"xcatcore => $xcatcore_addr");
 send_msg(2,"xcatdep  => $xcatdep_addr");
 send_msg(2,"user     => $mail_list");
 if($hold){
-    send_msg(2,"hold     => ON"); 
+    send_msg(2,"hold     => ON");
 }else{
     send_msg(2,"hold     => OFF");
 }
@@ -1200,7 +1200,7 @@ foreach my $k (keys %confkeys) {
    print "$k = $confkeys{$k}\n";
 }
 =cut
- 
+
 $rst = get_build();
 if($rst) {
     send_msg(0, "get xcat build failed...........exit");
@@ -1219,7 +1219,7 @@ if ( !defined($pid) ) {
         send_msg(2, "sub proc $$ recrive INT signal to exit");
         exit 0;
     };
-  
+
     send_msg(2, "..........fork process[pid=$$] for doing test..........");
     close CONTROLREAD;
     my $res;
@@ -1273,7 +1273,7 @@ if ( !defined($pid) ) {
 
     send_msg(2, "[$$]:whole regression test on $cluster_name finished");
     syswrite MNWRITE,"[$$][$deployenvtime]:whole regression test are successful\n";
-    close MNWRITE; 
+    close MNWRITE;
     exit 0;
 }
 
diff --git a/xCAT-server/share/xcat/tools/mktoolscenter b/xCAT-server/share/xcat/tools/mktoolscenter
index 8ec88ebc8..cd633a785 100755
--- a/xCAT-server/share/xcat/tools/mktoolscenter
+++ b/xCAT-server/share/xcat/tools/mktoolscenter
@@ -399,7 +399,7 @@ open($sh, ">", "$sandbox/start.sh");
 print $sh <<'ENDOFSH';
 #!/bin/sh -x
 #
-# This script prepares the current Linux environment for ToolsCenter. 
+# This script prepares the current Linux environment for ToolsCenter.
 export PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin:/root/bin:/usr/local/bin:/usr/bin:/usr/X11R6/bin:/bin:/usr/games:/usr/lib/mit/bin:/usr/lib/mit/sbin
 
 cp -f /toolscenter/media_check.sh /tmp/media_check.sh
@@ -543,7 +543,7 @@ then
         ${BOMC_EXIT_CMD} reboot
 else
         # Shut down the system when it's PXE image
-        echo "Shut down the system ..." 
+        echo "Shut down the system ..."
         ${BOMC_EXIT_CMD} shutdown
 fi
 exit 0
diff --git a/xCAT-server/share/xcat/tools/powervm/README b/xCAT-server/share/xcat/tools/powervm/README
index 58b70baee..e2a2d684e 100644
--- a/xCAT-server/share/xcat/tools/powervm/README
+++ b/xCAT-server/share/xcat/tools/powervm/README
@@ -27,7 +27,7 @@ patch -p0 < xcataixpost.patch
 cd /opt/xcat/bin
 ln -s xcatclient configcec
 
-Then follow the steps on PowerVM Steps.odt to deploy partitions. 
+Then follow the steps on PowerVM Steps.odt to deploy partitions.
 Note: After configuring VIOS before configuring LPAR, run "patch -p0 < xcataixpost.patch" again.
 
 
diff --git a/xCAT-server/share/xcat/tools/powervm/configcec.pm b/xCAT-server/share/xcat/tools/powervm/configcec.pm
index 1065fad22..b01dbe9b6 100644
--- a/xCAT-server/share/xcat/tools/powervm/configcec.pm
+++ b/xCAT-server/share/xcat/tools/powervm/configcec.pm
@@ -46,7 +46,7 @@ sub handled_commands
 #-------------------------------------------------------------------------------
 
 =head3
-      parse_args 
+      parse_args
          Parse the command arguments
 
         Arguments:
@@ -99,7 +99,7 @@ sub parse_args()
 =head3  preprocess_request
 
   Check and setup for hierarchy , if your command must run
-  on service nodes. Otherwise preprocess_request not necessary   
+  on service nodes. Otherwise preprocess_request not necessary
 
 =cut
 
@@ -480,7 +480,7 @@ sub usage
 #-------------------------------------------------------------------------------
 
 =head3
-      parse_hmc_output 
+      parse_hmc_output
          Parse the HMC commands output, the HMC commands output lines looks like:
          attr1=val1,attr2=val2,"attr3=val3,val4,val5",attr4=val6
 
@@ -530,7 +530,7 @@ sub parse_hmc_output()
 
         Arguments:
           $hmc - HMC hostname or ip address
-          $cmd - The command that will be run on the HMC 
+          $cmd - The command that will be run on the HMC
 
         Returns:
           Hash reference for HMC commands output
@@ -568,7 +568,7 @@ sub run_hmc_cmd()
           Get available LHEA logical ports for the lpar, and generate conf line
 
         Arguments:
-          $lhearesref - Hash reference for LHEA resources 
+          $lhearesref - Hash reference for LHEA resources
 
         Returns:
           Conf line for LHEA used by mksyscfg
diff --git a/xCAT-server/share/xcat/tools/powervm/configvios b/xCAT-server/share/xcat/tools/powervm/configvios
index 884e59a76..6f6aa49d9 100755
--- a/xCAT-server/share/xcat/tools/powervm/configvios
+++ b/xCAT-server/share/xcat/tools/powervm/configvios
@@ -116,7 +116,7 @@ sub get_cmd
         $cmd = $cnt > 0 ? $cmd . ' && ioscli mkvdev' : 'ioscli mkvdev';
         $cnt++;
         $cmd = $cmd . ' -sea ' . $conf[0] . ' -vadapter ' . $conf[1] . ' -default ' . $conf[2] . ' -defaultid ' . $conf[3] . ' && mktcpip -hostname ' . $conf[4] .
-' -inetaddr ' . $conf[5] . ' -netmask ' . $conf[6] . ' -interface ' . $conf[0] . ' -gateway ' . $conf[7] . ' -nsrvdomain ' . $conf[8] . ' -nsrvaddr ' . $conf[9] . ' 
+' -inetaddr ' . $conf[5] . ' -netmask ' . $conf[6] . ' -interface ' . $conf[0] . ' -gateway ' . $conf[7] . ' -nsrvdomain ' . $conf[8] . ' -nsrvaddr ' . $conf[9] . '
 -start';
     }
     return $cmd;
diff --git a/xCAT-server/share/xcat/tools/powervm/vios.conf b/xCAT-server/share/xcat/tools/powervm/vios.conf
index 3f8c8d227..35f066af3 100755
--- a/xCAT-server/share/xcat/tools/powervm/vios.conf
+++ b/xCAT-server/share/xcat/tools/powervm/vios.conf
@@ -1,6 +1,6 @@
 [SEA_Config]
 # Configuration used for SEAs
-# should be consistent with the format: 
+# should be consistent with the format:
 # <target physical adapter> = <virtual ethernet adapter>,<default virtual adapter>,<VLAN ID>,<VIOS hostname>,<IP address>,<net mask>,<gateway>,<domain name>,<name server>
 #ent0 = ent2,ent3,1,quweivios,192.168.0.11,255.255.255.0,192.168.0.1,cn.ibm.com,192.168.0.1
 #ent1 = ent4,ent5,3,quweivios1,192.168.0.12,255.255.255.0,192.168.0.1,ppd.pok.ibm.com,192.168.0.1
diff --git a/xCAT-server/share/xcat/tools/powervm/xcataixpost.patch b/xCAT-server/share/xcat/tools/powervm/xcataixpost.patch
index 9d54b5900..1b68481b2 100644
--- a/xCAT-server/share/xcat/tools/powervm/xcataixpost.patch
+++ b/xCAT-server/share/xcat/tools/powervm/xcataixpost.patch
@@ -7,20 +7,20 @@
 - my $useSocketSSL=eval { require IO::Socket::SSL; };
   use Getopt::Long;
   use XML::Simple;
-  
+
 @@ -46,6 +45,15 @@
   open(LOGFILE,">>",$logfile);
   $::LOG_FILE = \*LOGFILE;
-  
+
 + #--------------------------------------
 + print "$::sdata xcataixpost: install the perl-IO-Socket-SSL and perl-Net_SSLeay\n";
 + `/usr/sbin/updtvpkg`;
 + `cd /xcatpost/packages; /usr/bin/rpm -i perl-IO-Socket-SSL-1.33-1.aix6.1.ppc.rpm`;
 + `cd /xcatpost/packages; /usr/bin/rpm -i perl-Net_SSLeay.pm-1.30-2.aix6.1.ppc.rpm`;
 + `cd /xcatpost/packages; /usr/bin/rpm -i bash-3.2-1.aix5.2.ppc.rpm`;
-+ 
++
 + my $useSocketSSL=eval { require IO::Socket::SSL; };
 + #-----------------------------------------
-  
+
   unless ($useSocketSSL) {
       print "$::sdate  xcataixpost: Error: cannot load necessary library IO::Socket::SSL.\n";
diff --git a/xCAT-server/share/xcat/tools/rmblade b/xCAT-server/share/xcat/tools/rmblade
index 913e79390..a35f62766 100755
--- a/xCAT-server/share/xcat/tools/rmblade
+++ b/xCAT-server/share/xcat/tools/rmblade
@@ -26,11 +26,11 @@ Usage: rmblade [-h|--help]
 Response to SNMP for monsetting to remove blade from xCAT when trap is recieved.
 Pipe the MM IP address and blade slot number into this cmd.
 
-Example: 
+Example:
  1.  user removes a blade from the chassis
  2.  snmp trap setup to point here
  3.  this script removes the blade configuration from xCAT
- 4.  so if blade is placed in new slot or back in then xCAT goes 
+ 4.  so if blade is placed in new slot or back in then xCAT goes
      through rediscover process again.
 
 Author:  Jarrod Johnson
diff --git a/xCAT-server/share/xcat/tools/rmnodecfg b/xCAT-server/share/xcat/tools/rmnodecfg
index af1d3f0d3..c89b5f16b 100755
--- a/xCAT-server/share/xcat/tools/rmnodecfg
+++ b/xCAT-server/share/xcat/tools/rmnodecfg
@@ -21,7 +21,7 @@ if ($help) {
     print <<'EOS';
 Usage: rmnodecfg [-h|--help] <noderange>
 
-Removes the configuration of a node so that the next time you reboot 
+Removes the configuration of a node so that the next time you reboot
 it, it forces it to go through the discovery process.
 This does not remove it completely from xCAT.  You may want to do this
 command before running noderm to completely purge the system of the node
diff --git a/xCAT-server/share/xcat/tools/test_hca_state b/xCAT-server/share/xcat/tools/test_hca_state
index 7b6adf880..7e25a7346 100755
--- a/xCAT-server/share/xcat/tools/test_hca_state
+++ b/xCAT-server/share/xcat/tools/test_hca_state
@@ -12,10 +12,10 @@
 #
 #   The following (Red Hat) rpms include the version of pciutils (aka
 #   lspci) that can read gen3 correctly.
-#       
+#
 #       pciutils-3.1.10-2.el6.x86_64.rpm 
 #       pciutils-libs-3.1.10-2.el6.x86_64.rpm
-#       
+#
 #   This may impact the "PCI:" speed test performed by this script.
 #
 
@@ -47,12 +47,12 @@ Usage: $PROGNAME NODERANGE [FILTER] | xcoll
 EOF
 
     cat <<'EOF'
-Purpose:  
+Purpose:
 
     This tool provides a quick and easily repeatable method of
     validating key InfiniBand adapter (HCA) and node based InfiniBand
-    settings across an entire cluster.  
-    
+    settings across an entire cluster.
+
     Having consistent OFED settings, and even HCA firmware, can be very
     important for a properly functioning InfiniBand fabric.  This tool
     can help you confirm that your nodes are using the settings you
@@ -85,7 +85,7 @@ Example output:
         rate: 10 Gb/sec (4X)
         symbol_error: 0
         port_rcv_errors: 0
-    
+
       IPoIB
         recv_queue_size: 8192
         send_queue_size: 8192
@@ -101,10 +101,10 @@ Example output:
 
     #
     # This example uses a FILTER on the word 'firmware'.  In this case, we've
-    # upgraded the firmware across rack11 and rack12.  
+    # upgraded the firmware across rack11 and rack12.
     #
     #   - On rack11, we've also restarted the IB stack (/etc/init.d/openibd
-    #     restart) to activate the new firmware.  
+    #     restart) to activate the new firmware.
     #
     #   - Rack 12 has also been updated, as we can see from the 'Firmware
     #     installed' line, but it's nodes are still running with their prior
@@ -116,7 +116,7 @@ Example output:
     ====================================
       Firmware installed: 2.30.3200
       Firmware active:    2.30.3200
-    
+
     ====================================
     rack12
     ====================================
@@ -150,7 +150,7 @@ if [ -z $THINGY ]; then
     THINGY="."
 fi
 
-xdsh $NR -t3 ' 
+xdsh $NR -t3 '
 
 echo -n "OFED Version: " ; ofed_info | head -n 1
 if [ ! -d /sys/class/infiniband ]; then
@@ -216,7 +216,7 @@ else
   do
     echo    "    $IFACE:"
     echo -n "      Mode: " ; cat /sys/class/net/ib0/mode
-    echo -n "      MTU:  " ; cat /sys/class/net/ib0/mtu 
+    echo -n "      MTU:  " ; cat /sys/class/net/ib0/mtu
     echo -n "      Mode: " ; cat /sys/class/net/ib0/operstate
   done
 fi
diff --git a/xCAT-server/share/xcat/tools/xcatstat b/xCAT-server/share/xcat/tools/xcatstat
index 46a460766..75b0dbf90 100755
--- a/xCAT-server/share/xcat/tools/xcatstat
+++ b/xCAT-server/share/xcat/tools/xcatstat
@@ -36,7 +36,7 @@ Output:
   For OS status: 1 means on; 0 means off; 127 means unknown
   For nic interface status: the format is <nicname-<status>>. 1 means on; 0 means off; 127 means unknown
 
-Example: 
+Example:
   Get the status of three nodes: rh6mn,rh7mn,rh7cn
    # ./xcatstat rh6mn,rh7mn,rh7cn
      # Hostname:Status:Network-Interfaces:
diff --git a/xCAT-server/share/xcat/tools/zvm/README b/xCAT-server/share/xcat/tools/zvm/README
index 4254fff77..22a840028 100644
--- a/xCAT-server/share/xcat/tools/zvm/README
+++ b/xCAT-server/share/xcat/tools/zvm/README
@@ -10,4 +10,4 @@ that interacts with xCAT.  These scripts end contain the name of the OpenStack
 release that they support.  The scripts scan the OpenStack configuration files
 and produce a driver script which is used to validate the installation of the
 OpenStack code with xCAT.  For more information on the scripts, invoke the
-help function for the individual script (operand --help).
\ No newline at end of file
+help function for the individual script (operand --help).
diff --git a/xCAT-server/share/xcat/tools/zvm/prep_zxcatIVP_HAVANA.pl b/xCAT-server/share/xcat/tools/zvm/prep_zxcatIVP_HAVANA.pl
index 3f0bfc1bc..c8710ffef 100644
--- a/xCAT-server/share/xcat/tools/zvm/prep_zxcatIVP_HAVANA.pl
+++ b/xCAT-server/share/xcat/tools/zvm/prep_zxcatIVP_HAVANA.pl
@@ -68,7 +68,7 @@ my $usage_string = "Usage:\n
 sub buildDriverProgram{
     my $rc;
     my @driverText;
-    
+
     if ( $verbose ) {
         print "Building the IVP driver program.\n";
     }
@@ -76,7 +76,7 @@ sub buildDriverProgram{
     # Erase any existing driver program.
     if ( -e $driver and ! -z $driver ) {
         # Make certain the file is one of our driver files.
-        my $found = `grep 'Function: z/VM xCAT IVP driver program' $driver`; 
+        my $found = `grep 'Function: z/VM xCAT IVP driver program' $driver`;
         if ( ! $found ) {
             print "$driver is not a z/VM xCAT IVP driver program\n";
             print "File will not be changed.\n";
@@ -108,7 +108,7 @@ sub buildDriverProgram{
         push( @driverText, "" );
         push( @driverText, "# IP address or hostname of the compute node that is accessing this xCAT MN." );
         push( @driverText, "# From \'my_ip\' in /etc/nova/nova.conf." );
-        push( @driverText, "export zxcatIVP_cNAddress=\"$novaConf{'DEFAULT'}{'my_ip'}\"" ); 
+        push( @driverText, "export zxcatIVP_cNAddress=\"$novaConf{'DEFAULT'}{'my_ip'}\"" );
     } else {
         push( @driverText, "" );
         push( @driverText, "# IP address or hostname of the compute node that is accessing this xCAT MN." );
@@ -190,7 +190,7 @@ sub buildDriverProgram{
     push( @driverText, "" );
     push( @driverText, "# Expected space available in the xCAT MN image repository" );
     push( @driverText, "# From \'xcat_free_space_threshold\' in /etc/nova/nova.conf." );
-    push( @driverText, "export zxcatIVP_expectedReposSpace=\"$novaConf{'DEFAULT'}{'xcat_free_space_threshold'}G\"" );                
+    push( @driverText, "export zxcatIVP_expectedReposSpace=\"$novaConf{'DEFAULT'}{'xcat_free_space_threshold'}G\"" );
 
     push( @driverText, "" );
     push( @driverText, "############## End of Nova Config Properties" );
@@ -261,7 +261,7 @@ sub buildDriverProgram{
     push( @driverText, "# logged in the xCAT MN syslog, 0: do not log, 1: log to syslog." );
     push( @driverText, "export zxcatIVP_syslogErrors=1" );
     push( @driverText, "" );
-    push( @driverText, "perl $driverLocation$ivp" ); 
+    push( @driverText, "perl $driverLocation$ivp" );
 
     # Write the array to the driver file.
     foreach (@driverText) {
@@ -477,7 +477,7 @@ sub showHelp{
 
 =head3   validateConfigs
 
-    Description : Compare and validate the configuration 
+    Description : Compare and validate the configuration
                   values obtained by the scans.
     Arguments   : None.
     Returns     : 0 - No error
@@ -532,7 +532,7 @@ sub validateConfigs{
 
     my @requiredNeutronConfOpts = (
         'base_mac',
-        'core_plugin', 
+        'core_plugin',
         );
     foreach $option ( @requiredNeutronConfOpts ) {
         if ( !exists $neutronConf{'DEFAULT'}{$option} ) {
@@ -552,7 +552,7 @@ sub validateConfigs{
         }
     }
 
-    my @requiredNeutronZvmPluginIniOpts = ( 
+    my @requiredNeutronZvmPluginIniOpts = (
         "zvm_xcat_server",
         );
     foreach $option ( @requiredNeutronZvmPluginIniOpts ) {
@@ -566,11 +566,11 @@ sub validateConfigs{
     # Verify optional operands were specified.
     #******************************************
     if ( keys %cinderConf ) {
-        if ( !exists $cinderConf{'DEFAULT'}{'san_ip'} and 
-             !exists $cinderConf{'DEFAULT'}{'san_private_key'} and 
-             !exists $cinderConf{'DEFAULT'}{'storwize_svc_connection_protocol'} and 
-             !exists $cinderConf{'DEFAULT'}{'storwize_svc_volpool_name'} and 
-             !exists $cinderConf{'DEFAULT'}{'storwize_svc_vol_iogrp'} and 
+        if ( !exists $cinderConf{'DEFAULT'}{'san_ip'} and
+             !exists $cinderConf{'DEFAULT'}{'san_private_key'} and
+             !exists $cinderConf{'DEFAULT'}{'storwize_svc_connection_protocol'} and
+             !exists $cinderConf{'DEFAULT'}{'storwize_svc_volpool_name'} and
+             !exists $cinderConf{'DEFAULT'}{'storwize_svc_vol_iogrp'} and
              !exists $cinderConf{'DEFAULT'}{'volume_driver'} ) {
              print "Info: z/VM specific Cinder keys are not defined in section \'DEFAULT\'\n" .
                     "      in /etc/cinder/cinder.conf.  Cinder support for creation of persistent\n" .
@@ -635,7 +635,7 @@ sub validateConfigs{
         if ( !exists $novaConf{'DEFAULT'}{$key} ) {
             print "Info: \'$key\' is missing from section \'DEFAULT\'\n" .
                 "      in /etc/nova/nova.conf.\n";
-            if ( $optionalNovaConfOpts{$key} ne '' ) { 
+            if ( $optionalNovaConfOpts{$key} ne '' ) {
                 print "      " . $optionalNovaConfOpts{$key} . "\n";
             }
             if ( exists $defaultNovaConfOpts{$key} ) {
@@ -698,7 +698,7 @@ sub validateConfigs{
                   "      in /etc/neutron/plugins/zvm/neutron_zvm_plugin.ini.\n";
             if ( $optionalNeutronZvmPluginIniOpts{$key} ne '' ) {
                 print "      " . $optionalNeutronZvmPluginIniOpts{$key} . "\n";
-            } 
+            }
             if ( exists $defaultNeutronZvmPluginIniOpts{'agent'}{$key} ) {
                 $neutronZvmPluginIni{'agent'}{$key} = $defaultNeutronZvmPluginIniOpts{$key};
             }
@@ -732,7 +732,7 @@ sub validateConfigs{
         if ( $novaConf{'DEFAULT'}{'zvm_xcat_password'} ne $neutronZvmPluginIni{'agent'}{'zvm_xcat_password'} ) {
             print "Warning: xCAT user passwords are not the same:\n" .
                   "         Please review 'zvm_xcat_password' in /etc/nova/nova.conf and\n" .
-                  "         /etc/neutron/plugins/zvm/neutron_zvm_plugin.ini.\n"; 
+                  "         /etc/neutron/plugins/zvm/neutron_zvm_plugin.ini.\n";
         }
     }
 
@@ -746,7 +746,7 @@ sub validateConfigs{
     } else {
         if ( $novaConf{'DEFAULT'}{'zvm_xcat_server'} ne $neutronZvmPluginIni{'agent'}{'zvm_xcat_server'} ) {
             print "Warning: xCAT server addresses mismatch; review 'zvm_xcat_server':\n" .
-                  "        \'$novaConf{'DEFAULT'}{'zvm_xcat_server'}\' in /etc/nova/nova.conf.\n" . 
+                  "        \'$novaConf{'DEFAULT'}{'zvm_xcat_server'}\' in /etc/nova/nova.conf.\n" .
                   "        \'$neutronZvmPluginIni{'agent'}{'zvm_xcat_server'}\' in /etc/neutron/plugins/zvm/neutron_zvm_plugin.ini.\n";
         }
     }
@@ -767,7 +767,7 @@ sub validateConfigs{
 
     # Verify the compute_driver is for z/VM
     if ( exists $novaConf{'DEFAULT'}{'compute_driver'} ) {
-        if ( $novaConf{'DEFAULT'}{'compute_driver'} ne "nova.virt.zvm.ZVMDriver" and 
+        if ( $novaConf{'DEFAULT'}{'compute_driver'} ne "nova.virt.zvm.ZVMDriver" and
              $novaConf{'DEFAULT'}{'compute_driver'} ne "zvm.ZVMDriver") {
             print "Warning: In /etc/nova/nova.conf, compute_driver does not contain the\n" .
                   "         expected value of \'zvm.ZVMDriver\' and instead contains:\n" .
@@ -890,7 +890,7 @@ $localIpAddress = inet_ntoa((gethostbyname(hostname))[4]);
 
 if ( defined( $scan ) ) {
     if ( $verbose ) {
-      print "Operand --scan: $scan\n"; 
+      print "Operand --scan: $scan\n";
     }
     if ( 'all nova neutron' !~ $scan ) {
         print "--scan operand($scan) is not all, nova or neutron\n";
@@ -903,7 +903,7 @@ if ( defined( $scan ) ) {
 
 if ( defined( $driver ) ) {
     if ( $verbose ) {
-      print "Operand --driver: $driver\n"; 
+      print "Operand --driver: $driver\n";
     }
     $driver = "$driver.sh";
 } else {
diff --git a/xCAT-server/share/xcat/tools/zvm/prep_zxcatIVP_ICEHOUSE.pl b/xCAT-server/share/xcat/tools/zvm/prep_zxcatIVP_ICEHOUSE.pl
index db8f9d5f5..37df59364 100644
--- a/xCAT-server/share/xcat/tools/zvm/prep_zxcatIVP_ICEHOUSE.pl
+++ b/xCAT-server/share/xcat/tools/zvm/prep_zxcatIVP_ICEHOUSE.pl
@@ -90,7 +90,7 @@ sub buildDriverProgram{
     # Erase any existing driver program.
     if ( -e $driver and ! -z $driver ) {
         # Make certain the file is one of our driver files.
-        my $found = `grep 'Function: z/VM xCAT IVP driver program' $driver`; 
+        my $found = `grep 'Function: z/VM xCAT IVP driver program' $driver`;
         if ( ! $found ) {
             print "$driver is not a z/VM xCAT IVP driver program\n";
             print "File will not be changed.\n";
@@ -132,7 +132,7 @@ sub buildDriverProgram{
         push( @driverText, "" );
         push( @driverText, "# IP address or hostname of the compute node that is accessing this xCAT MN." );
         push( @driverText, "# From \'my_ip\' in $locNovaConf." );
-        push( @driverText, "export zxcatIVP_cNAddress=\"$novaConf{'DEFAULT'}{'my_ip'}\"" ); 
+        push( @driverText, "export zxcatIVP_cNAddress=\"$novaConf{'DEFAULT'}{'my_ip'}\"" );
     } else {
         print "Info: 'my_ip' property is missing from section 'DEFAULT'\n" .
                   "      in $locNovaConf.  A default value of '$localIpAddress'\n" .
@@ -168,7 +168,7 @@ sub buildDriverProgram{
         push( @driverText, "# Node of host being managed.  If blank, IVP will search for the host node." );
         push( @driverText, "# From \'zvm_host\' in $locNovaConf." );
         push( @driverText, "export zxcatIVP_hostNode=\"$novaConf{'DEFAULT'}{'zvm_host'}\"" );
-        
+
     }
     if ( exists $novaConf{'DEFAULT'}{'zvm_xcat_master'} ) {
         push( @driverText, "" );
@@ -220,7 +220,7 @@ sub buildDriverProgram{
     push( @driverText, "" );
     push( @driverText, "# Expected space available in the xCAT MN image repository" );
     push( @driverText, "# From \'xcat_free_space_threshold\' in $locNovaConf." );
-    push( @driverText, "export zxcatIVP_expectedReposSpace=\"$novaConf{'DEFAULT'}{'xcat_free_space_threshold'}G\"" );                
+    push( @driverText, "export zxcatIVP_expectedReposSpace=\"$novaConf{'DEFAULT'}{'xcat_free_space_threshold'}G\"" );
 
     push( @driverText, "" );
     push( @driverText, "############## End of Nova Config Properties" );
@@ -247,10 +247,10 @@ sub buildDriverProgram{
         push( @driverText, "# From \'xcat_mgt_mask\' in $locNeutronZvmPluginIni." );
         push( @driverText, "export zxcatIVP_mgtNetmask=\"$neutronZvmPluginIni{'agent'}{'xcat_mgt_mask'}\"" );
     }
-    if ( exists $ml2ConfIni{'ml2_type_flat'}{'flat_networks'} or 
+    if ( exists $ml2ConfIni{'ml2_type_flat'}{'flat_networks'} or
          exists $ml2ConfIni{'ml2_type_vlan'}{'network_vlan_ranges'} ) {
         my $list = '';
-        if ( exists $ml2ConfIni{'ml2_type_flat'}{'flat_networks'} and 
+        if ( exists $ml2ConfIni{'ml2_type_flat'}{'flat_networks'} and
              $ml2ConfIni{'ml2_type_flat'}{'flat_networks'} ne '*' ) {
             $list = $ml2ConfIni{'ml2_type_flat'}{'flat_networks'};
         }
@@ -308,7 +308,7 @@ sub buildDriverProgram{
     push( @driverText, "# logged in the xCAT MN syslog, 0: do not log, 1: log to syslog." );
     push( @driverText, "export zxcatIVP_syslogErrors=1" );
     push( @driverText, "" );
-    push( @driverText, "perl $driverLocation$ivp" ); 
+    push( @driverText, "perl $driverLocation$ivp" );
 
     # Write the array to the driver file.
     foreach (@driverText) {
@@ -333,7 +333,7 @@ sub buildDriverProgram{
     Returns     : 0 - No error
                   non-zero - Error detected.
     Example     : $rc = hashFile( $file, \%novaConf, 1 );
-    
+
 =cut
 
 #-------------------------------------------------------
@@ -382,14 +382,14 @@ sub hashFile{
                 if ( !$caseSensitive ) {
                     $parts[0] = lc( $parts[0] );
                 }
-                
+
                 if ( exists $parts[1] ) {
                     chomp( $parts[1] );
                     $parts[1] =~ s/^\s+|\s+$//g;       # trim both ends of the string
                 } else {
                     $parts[1] = '';
                 }
-                
+
                 $$hash{$section}{$parts[0]} = $parts[1];
                 #print "$section $parts[0]" . ": " . $parts[1]. "\n";
                 #print $parts[0] . ": " . $$hash{$section}{$parts[0]}. "\n";
@@ -400,7 +400,7 @@ sub hashFile{
         # Read the file and remove comment lines and sequence columns (72-80)
         $out = `grep -v ^\$ $file| cut -c1-71`;
         $out =~ s{/\*.*?\*/}{}gs;
-        
+
         my @lines = split( "\n", $out );
         foreach my $line ( @lines ) {
             # Weed out blank lines
@@ -442,7 +442,7 @@ sub hashFile{
     Returns     : 0 - No error
                   non-zero - Error detected.
     Example     : $rc = scanCinder();
-    
+
 =cut
 
 #-------------------------------------------------------
@@ -554,7 +554,7 @@ sub showHelp{
 
 =head3   validateConfigs
 
-    Description : Compare and validate the configuration 
+    Description : Compare and validate the configuration
                   values obtained by the scans.
     Arguments   : None.
     Returns     : 0 - No error
@@ -610,7 +610,7 @@ sub validateConfigs{
 
     my @requiredNeutronConfOpts = (
         'DEFAULT','base_mac',
-        'DEFAULT','core_plugin', 
+        'DEFAULT','core_plugin',
         );
     for ( my $i = 0; $i < $#requiredNeutronConfOpts; $i = $i + 2 ) {
         my $section = $requiredNeutronConfOpts[$i];
@@ -657,11 +657,11 @@ sub validateConfigs{
     if ( keys %cinderConf ) {
         if ( exists $dmssicmoCopy{'openstack_system_role'} and uc( $dmssicmoCopy{'openstack_system_role'} ) eq "COMPUTE" ) {
             print "Info: CMO appliance system role is a compute server.\n      Cinder will not be validated.\n";
-        } elsif ( !exists $cinderConf{'DEFAULT'}{'san_ip'} and 
-                !exists $cinderConf{'DEFAULT'}{'san_private_key'} and 
-                !exists $cinderConf{'DEFAULT'}{'storwize_svc_connection_protocol'} and 
-                !exists $cinderConf{'DEFAULT'}{'storwize_svc_volpool_name'} and 
-                !exists $cinderConf{'DEFAULT'}{'storwize_svc_vol_iogrp'} and 
+        } elsif ( !exists $cinderConf{'DEFAULT'}{'san_ip'} and
+                !exists $cinderConf{'DEFAULT'}{'san_private_key'} and
+                !exists $cinderConf{'DEFAULT'}{'storwize_svc_connection_protocol'} and
+                !exists $cinderConf{'DEFAULT'}{'storwize_svc_volpool_name'} and
+                !exists $cinderConf{'DEFAULT'}{'storwize_svc_vol_iogrp'} and
                 !exists $cinderConf{'DEFAULT'}{'volume_driver'} ) {
                print "Info: z/VM specific Cinder keys are not defined in $locCinderConf.\n" .
                     "      Cinder support for creation of persistent disks for z/VM\n" .
@@ -733,7 +733,7 @@ sub validateConfigs{
         if ( !exists $novaConf{$section}{$option} ) {
             print "Info: \'$option\' is missing from section \'$section\'\n" .
                 "      in $locNovaConf.\n";
-            if ( $optionalNovaConfOpts{$key} ne '' ) { 
+            if ( $optionalNovaConfOpts{$key} ne '' ) {
                 print "      " . $optionalNovaConfOpts{$key} . "\n";
             }
             if ( exists $defaultNovaConfOpts{$key} ) {
@@ -808,7 +808,7 @@ sub validateConfigs{
                   "      in $locNeutronZvmPluginIni.\n";
             if ( $optionalNeutronZvmPluginIniOpts{$key} ne '' ) {
                 print "      " . $optionalNeutronZvmPluginIniOpts{$key} . "\n";
-            } 
+            }
             if ( exists $defaultNeutronZvmPluginIniOpts{$key} ) {
                 $neutronZvmPluginIni{$section}{$option} = $defaultNeutronZvmPluginIniOpts{$key};
             }
@@ -825,11 +825,11 @@ sub validateConfigs{
     } else {
         if ( $novaConf{'DEFAULT'}{'zvm_xcat_username'} ne $neutronZvmPluginIni{'agent'}{'zvm_xcat_username'} ) {
             print "Warning: xCAT user names mismatch; review 'zvm_xcat_username':\n" .
-                  "         \'$novaConf{'DEFAULT'}{'zvm_xcat_username'}\' in $locNovaConf.\n" . 
+                  "         \'$novaConf{'DEFAULT'}{'zvm_xcat_username'}\' in $locNovaConf.\n" .
                   "         \'$neutronZvmPluginIni{'agent'}{'zvm_xcat_username'}\' in\n" .
                   "         $locNeutronZvmPluginIni.\n";
         }
-    } 
+    }
 
     # Verify xCAT user passwords are the same.
     if ( !exists $novaConf{'DEFAULT'}{'zvm_xcat_password'} ) {
@@ -842,7 +842,7 @@ sub validateConfigs{
         if ( $novaConf{'DEFAULT'}{'zvm_xcat_password'} ne $neutronZvmPluginIni{'agent'}{'zvm_xcat_password'} ) {
             print "Warning: xCAT user passwords are not the same:\n" .
                   "         Please review 'zvm_xcat_password' in $locNovaConf and\n" .
-                  "         $locNeutronZvmPluginIni.\n"; 
+                  "         $locNeutronZvmPluginIni.\n";
         }
     }
 
@@ -856,18 +856,18 @@ sub validateConfigs{
     } else {
         if ( $novaConf{'DEFAULT'}{'zvm_xcat_server'} ne $neutronZvmPluginIni{'agent'}{'zvm_xcat_server'} ) {
             print "Warning: xCAT server addresses mismatch; review 'zvm_xcat_server':\n" .
-                  "        \'$novaConf{'DEFAULT'}{'zvm_xcat_server'}\' in $locNovaConf.\n" . 
+                  "        \'$novaConf{'DEFAULT'}{'zvm_xcat_server'}\' in $locNovaConf.\n" .
                   "        \'$neutronZvmPluginIni{'agent'}{'zvm_xcat_server'}\' in $locNeutronZvmPluginIni.\n";
         }
     }
 
     # Verify host and zvm_host properties are the same.
-    if ( exists $novaConf{'DEFAULT'}{'host'} and 
+    if ( exists $novaConf{'DEFAULT'}{'host'} and
          exists $neutronZvmPluginIni{'agent'}{'zvm_host'} ) {
         if ( $novaConf{'DEFAULT'}{'host'} ne $neutronZvmPluginIni{'agent'}{'zvm_host'} ) {
             print "Warning: 'host' property in section 'DEFAULT' in $locNovaConf\n" .
                   "      does not specify the same value as 'zvm_host' property in section\n" .
-                  "      'agent' in $locNeutronZvmPluginIni.\n"; 
+                  "      'agent' in $locNeutronZvmPluginIni.\n";
         }
     }
 
@@ -887,7 +887,7 @@ sub validateConfigs{
 
     # Verify the compute_driver is for z/VM
     if ( exists $novaConf{'DEFAULT'}{'compute_driver'} ) {
-        if ( $novaConf{'DEFAULT'}{'compute_driver'} ne "nova.virt.zvm.ZVMDriver" and 
+        if ( $novaConf{'DEFAULT'}{'compute_driver'} ne "nova.virt.zvm.ZVMDriver" and
              $novaConf{'DEFAULT'}{'compute_driver'} ne "zvm.ZVMDriver") {
             print "Warning: In $locNovaConf, compute_driver does not contain the\n" .
                   "         expected value of \'zvm.ZVMDriver\' and instead contains:\n" .
@@ -1020,7 +1020,7 @@ $localIpAddress = inet_ntoa((gethostbyname(hostname))[4]);
 
 if ( defined( $scan ) ) {
     if ( $verbose ) {
-      print "Operand --scan: $scan\n"; 
+      print "Operand --scan: $scan\n";
     }
     if ( 'all cinder neutron nova' !~ $scan ) {
         print "--scan operand($scan) is not all, cinder, neutron or nova\n";
@@ -1046,7 +1046,7 @@ if ( -e $locVersionFileCMO ) {
 
 if ( defined( $driver ) ) {	
     if ( $verbose ) {
-      print "Operand --driver: $driver\n"; 
+      print "Operand --driver: $driver\n";
     }
 
     if ( -d $driver ) {
diff --git a/xCAT-server/share/xcat/tools/zvm/prep_zxcatIVP_JUNO.pl b/xCAT-server/share/xcat/tools/zvm/prep_zxcatIVP_JUNO.pl
index f51e1327f..8e9b27980 100644
--- a/xCAT-server/share/xcat/tools/zvm/prep_zxcatIVP_JUNO.pl
+++ b/xCAT-server/share/xcat/tools/zvm/prep_zxcatIVP_JUNO.pl
@@ -241,7 +241,7 @@ sub buildDriverProgram{
         push( @driverText, "" );
         push( @driverText, "# User password defined to communicate with xCAT MN." );
         push( @driverText, "# From \'zvm_xcat_password\' in $locNovaConf." );
-        
+
         if ( -e $obfuscateProg ) {
             # assume password is obfuscated already and get it in the clear.
             $clearPW = `$obfuscateProg -u $novaConf{'DEFAULT'}{'zvm_xcat_password'}`;
@@ -740,7 +740,7 @@ sub showHelp{
     The default name of the driver program is composed of the following:
       '$driverPrefix', and
       IP address of the system where driver was prepared, and
-      (optionally) a hypen and the value specified on --Host operand, and 
+      (optionally) a hypen and the value specified on --Host operand, and
       '.sh'.
     For example:
       $driverPrefix"."9.123.345.91.sh
@@ -1137,7 +1137,7 @@ sub validateConfigs{
             print "Warning: In $locNovaConf, instance_name_template will not\n" .
                   "         create a usable name with the value: $novaConf{'DEFAULT'}{'instance_name_template'}\n";
         }
-        my $words; 
+        my $words;
         $words++ while $base_name =~ /\S+/g;
         if ( $words != 1 ) {
             print "Warning: In $locNovaConf, instance_name_template will not create\n" .
diff --git a/xCAT-server/share/xcat/tools/zvm/prep_zxcatIVP_KILO.pl b/xCAT-server/share/xcat/tools/zvm/prep_zxcatIVP_KILO.pl
index 17f16a7d5..d914ab249 100644
--- a/xCAT-server/share/xcat/tools/zvm/prep_zxcatIVP_KILO.pl
+++ b/xCAT-server/share/xcat/tools/zvm/prep_zxcatIVP_KILO.pl
@@ -621,7 +621,7 @@ sub scanInitScript{
     if ( $verbose ) {
         print "Scanning $filename for '$property' variable.\n";
     }
-    
+
     # verify the file exists
     if ( !-e "/etc/init.d/$filename" ) {
         print "Info: /etc/init.d/$filename does not exist.\n";
@@ -735,7 +735,7 @@ sub scanNova{
 sub showHelp{
     print "$0 prepares and builds a z/VM xCAT IVP driver program
     using the information from the configuration files in the
-    compute node.  
+    compute node.
 
     The default name of the driver program is composed of the following:
       '$driverPrefix', and
@@ -1138,7 +1138,7 @@ sub validateConfigs{
             print "Warning: In $locNovaConf, instance_name_template will not\n" .
                   "         create a usable name with the value: $novaConf{'DEFAULT'}{'instance_name_template'}\n";
         }
-        my $words; 
+        my $words;
         $words++ while $base_name =~ /\S+/g;
         if ( $words != 1 ) {
             print "Warning: In $locNovaConf, instance_name_template will not create\n" .
diff --git a/xCAT-server/share/xcat/tools/zvm/prep_zxcatIVP_LIBERTY.pl b/xCAT-server/share/xcat/tools/zvm/prep_zxcatIVP_LIBERTY.pl
index ee269271f..33b2b3af4 100644
--- a/xCAT-server/share/xcat/tools/zvm/prep_zxcatIVP_LIBERTY.pl
+++ b/xCAT-server/share/xcat/tools/zvm/prep_zxcatIVP_LIBERTY.pl
@@ -255,7 +255,7 @@ sub buildDriverProgram{
         push( @driverText, "# User password defined to communicate with xCAT MN." );
         push( @driverText, "# From:");
         push( @driverText, split( '\n', $commonConf{'zvm_xcat_master'}{'fromLines'} ) );
-        
+
         if ( -e $obfuscateProg ) {
             # assume password is obfuscated already and get it in the clear.
             $clearPW = `$obfuscateProg -u $commonConf{'zvm_xcat_password'}{'value'}`;
@@ -444,7 +444,7 @@ sub hashFile{
     if ( $file eq '' ) {
         return 602;
     }
-    
+
     if ( ! -e $file ) {
         if ( $required ) {
             print "Warning: $file does not exist.\n";
@@ -618,8 +618,8 @@ sub saveCommonOpt {
         } else {
             print "Warning: \'$opt\' property in section \'$section\'\n" .
                   "         in $confFile\n" .
-                  "         has a value that is different from the value of the\n" . 
-                  "         \'$commonConf{$commonOptName}{'firstOpt'}\' property in section \'$commonConf{$commonOptName}{'firstSection'}\'\n" . 
+                  "         has a value that is different from the value of the\n" .
+                  "         \'$commonConf{$commonOptName}{'firstOpt'}\' property in section \'$commonConf{$commonOptName}{'firstSection'}\'\n" .
                   "         in $commonConf{$commonOptName}{'firstConf'}.\n" .
                   "         They should be the same.  The value\n" .
                   "         in $confFile is:\n" .
@@ -830,7 +830,7 @@ sub scanNova{
                   Section containing the desired property
                   Config property containing the value
     Returns     : Null - error locating the config file.
-                  Non-null - file specification of the 
+                  Non-null - file specification of the
                   configuration file.
     Example     : $confFile = scanServiceUnit( 'openstack-cinder-volume-$host',
                                                'Service', 'ExecStart' );
@@ -894,7 +894,7 @@ sub showHelp{
     The default name of the driver program is composed of the following:
       '$driverPrefix', and
       IP address of the system where driver was prepared, and
-      (optionally) a hypen and the value specified on --Host operand, and 
+      (optionally) a hypen and the value specified on --Host operand, and
       '.sh'.
     For example:
       $driverPrefix"."9.123.345.91.sh
@@ -1315,7 +1315,7 @@ sub validateConfigs{
             print "Warning: In $locNovaConf, instance_name_template will not\n" .
                   "         create a usable name with the value: $novaConf{'DEFAULT'}{'instance_name_template'}\n";
         }
-        my $words; 
+        my $words;
         $words++ while $base_name =~ /\S+/g;
         if ( $words != 1 ) {
             print "Warning: In $locNovaConf, instance_name_template will not create\n" .
diff --git a/xCAT-server/xCAT-server.spec b/xCAT-server/xCAT-server.spec
index c589295dd..e78e44b29 100644
--- a/xCAT-server/xCAT-server.spec
+++ b/xCAT-server/xCAT-server.spec
@@ -15,6 +15,7 @@ BuildRoot: /var/tmp/%{name}-%{version}-%{release}-root
 %ifnos linux
 AutoReqProv: no
 %endif
+%define debug_package %{nil}
 
 %define fsm %(if [ "$fsm" = "1" ];then echo 1; else echo 0; fi)
 
diff --git a/xCAT-server/xCAT-wsapi/xcatws-test.pl b/xCAT-server/xCAT-wsapi/xcatws-test.pl
index 222807095..b20cefddc 100755
--- a/xCAT-server/xCAT-wsapi/xcatws-test.pl
+++ b/xCAT-server/xCAT-wsapi/xcatws-test.pl
@@ -12,7 +12,7 @@ require HTTP::Request;
 # set the usage message
 my $usage_string = "Usage:
     restapi -u url -m GET|PUT|POST|DELETE [-f html|json|xml] [-V]
-      -u The url of the action. .e.g to get the power status of node \'nodename\' https://httpserver/xcatws/nodes/nodename/power 
+      -u The url of the action. .e.g to get the power status of node \'nodename\' https://httpserver/xcatws/nodes/nodename/power
       -m The method of the request
       -h The hostname of the xCAT web server
       -o Target object
diff --git a/xCAT-server/xCAT-wsapi/xcatws-test.sh b/xCAT-server/xCAT-wsapi/xcatws-test.sh
index 55049dad8..246c5743c 100755
--- a/xCAT-server/xCAT-wsapi/xcatws-test.sh
+++ b/xCAT-server/xCAT-wsapi/xcatws-test.sh
@@ -32,7 +32,7 @@ do
   if [ $i = '-t' ]; then
     token=yes
   fi
- 
+
 done
 
 # display the usage message
@@ -51,7 +51,7 @@ if [ "$USER" = "" ] || [ "$PW" = "" ]; then
   echo "Error: Miss username or userPW"
   usage
   exit 1
-fi 
+fi
 
 if [ "$cert" = "yes" ] && [ "$HOST" = "" ]; then
   echo "Error: -c must be used with -h that user needs specify the FQDN of xCAT MN"
@@ -80,10 +80,10 @@ function REST {
     else
       CMD="curl -X $METHOD --cacert /tmp/ca-cert.pem $datamsg https://$HOST/xcatws$SRC?pretty=1&userName=$USER&passwor=$PW"
     fi
-  else 
+  else
     if [ "$token" = "yes" ]; then
       CMD="curl -X $METHOD -k -H X-Auth-Token:$TOKENID $datamsg https://$HOST/xcatws$SRC?pretty=1"
-    else 
+    else
       CMD="curl -X $METHOD -k $datamsg https://$HOST/xcatws$SRC?pretty=1&userName=$USER&userPW=$PW"
     fi
   fi
@@ -112,7 +112,7 @@ function PUT {
 echo "***********************************************************"
 echo "** Username: $USER"
 echo "** Password: $PW"
-echo "** Hostname: $HOST" 
+echo "** Hostname: $HOST"
 
 
 # get the CA of server certificate
@@ -120,7 +120,7 @@ if [ "$cert" = "yes" ]; then
   rm -f /tmp/ca-cert.pem
   cd /tmp
   wget http://$HOST/install/postscripts/ca/ca-cert.pem  2>1 1>/dev/null
-  echo "** Using CA /tmp/ca-cert.pem for server certificate checking" 
+  echo "** Using CA /tmp/ca-cert.pem for server certificate checking"
 fi
 
 # get a token
@@ -182,7 +182,7 @@ REST GET "/nodes/restapinode1,restapinode2"
 RESTMSG="Display all the nodes in the cluster"
 REST GET "/nodes"
 
-# test group 
+# test group
 RESTMSG="Display the group restapi"
 REST GET "/groups/restapi"
 
diff --git a/xCAT-test/autotest/aix.conf.template b/xCAT-test/autotest/aix.conf.template
index 1e204dfdf..9c51aea36 100644
--- a/xCAT-test/autotest/aix.conf.template
+++ b/xCAT-test/autotest/aix.conf.template
@@ -1,4 +1,4 @@
-#add rows to xCAT database table tablename 
+#add rows to xCAT database table tablename
 #[Table_tablename]
 #key=value
 [Table_passwd]
@@ -7,7 +7,7 @@ username=root
 password=cluster
 
 #add object definition to xCAT database
-#[Object_objecttype] 
+#[Object_objecttype]
 #Name=object name
 #Attribute=value
 [Object_network]
diff --git a/xCAT-test/autotest/bundle/hdctrl_openpower_ipmi.bundle b/xCAT-test/autotest/bundle/hdctrl_openpower_ipmi.bundle
index 5690af353..980e43c6b 100644
--- a/xCAT-test/autotest/bundle/hdctrl_openpower_ipmi.bundle
+++ b/xCAT-test/autotest/bundle/hdctrl_openpower_ipmi.bundle
@@ -1,4 +1,4 @@
-description:the cases in this bundle is to verify xCAT hardware control functions on servers which are managed using IPMI. 
+description:the cases in this bundle is to verify xCAT hardware control functions on servers which are managed using IPMI.
 #INCLUDE:hdctrl_general.bundle#
 rinv_uuid
 rinv_vpd
diff --git a/xCAT-test/autotest/bundle/hdctrl_openpower_openbmc.bundle b/xCAT-test/autotest/bundle/hdctrl_openpower_openbmc.bundle
index 366289ce7..27cf90082 100644
--- a/xCAT-test/autotest/bundle/hdctrl_openpower_openbmc.bundle
+++ b/xCAT-test/autotest/bundle/hdctrl_openpower_openbmc.bundle
@@ -1,4 +1,4 @@
-description:the cases in this bundle is to used to verify xCAT hardware control funtions on openpower servers which are mananged using openbmc. 
+description:the cases in this bundle is to used to verify xCAT hardware control funtions on openpower servers which are mananged using openbmc.
 #INCLUDE:hdctrl_general.bundle#
 rinv_cpu
 rinv_dimm
@@ -80,4 +80,4 @@ reventlog_s_openbmc
 rpower_softoff
 rpower_suspend_OpenpowerBmc
 rpower_wake_OpenpowerBmc
-rpower_errorcommand_OpenpowerBmc
\ No newline at end of file
+rpower_errorcommand_OpenpowerBmc
diff --git a/xCAT-test/autotest/confsamples/rhxmn.conf b/xCAT-test/autotest/confsamples/rhxmn.conf
index 440881b9a..4f2a7cf73 100644
--- a/xCAT-test/autotest/confsamples/rhxmn.conf
+++ b/xCAT-test/autotest/confsamples/rhxmn.conf
@@ -18,7 +18,7 @@ Name=c910f04x27v03
     arch=x86_64
     cons=kvm
     groups=all
-mac=42:80:31:af:fe:ee    
+mac=42:80:31:af:fe:ee
 mgt=kvm
     netboot=xnba
     serialflow=hard
@@ -57,6 +57,6 @@ OS=rhels        #####
 ISO=/RHEL6.5-20131111.0-Server-x86_64-DVD1.iso   ######
 NETBOOTDIR=/opt/xcat/share/xcat/netboot/rh       #path of netboot directory, used by diskless installation
 SECONDNIC=eth2
-THIRDNIC=eth3 
+THIRDNIC=eth3
 INSTALLNICIP="10.4.27.4"
 GATEWAY=10.0.0.103
diff --git a/xCAT-test/autotest/confsamples/slesxmn.conf b/xCAT-test/autotest/confsamples/slesxmn.conf
index e66e4eca0..eb0e9f875 100644
--- a/xCAT-test/autotest/confsamples/slesxmn.conf
+++ b/xCAT-test/autotest/confsamples/slesxmn.conf
@@ -60,4 +60,4 @@ SECONDNIC=eth2
 THIRDNIC=eth3
 INSTALLNICIP="10.4.27.7"
 GATEWAY=10.0.0.103
- 
+
diff --git a/xCAT-test/autotest/confsamples/ubuntuxmn.conf b/xCAT-test/autotest/confsamples/ubuntuxmn.conf
index 368bfed65..47e624f6f 100644
--- a/xCAT-test/autotest/confsamples/ubuntuxmn.conf
+++ b/xCAT-test/autotest/confsamples/ubuntuxmn.conf
@@ -20,7 +20,7 @@ Name=c910f04x27v09
     arch=x86_64
     cons=kvm
     groups=all
-mac=42:bf:39:9e:f6:5f    
+mac=42:bf:39:9e:f6:5f
 mgt=kvm
     netboot=xnba
     serialflow=hard
@@ -40,7 +40,7 @@ SNOS=ubuntu14.04.1        #####
 ISO=/ubuntu-14.04.1-server-amd64.iso   ######
 NETBOOTDIR=/opt/xcat/share/xcat/netboot/ubuntu       #path of netboot directory, used by diskless installation
 SECONDNIC=eth2
-THIRDNIC=eth3 
+THIRDNIC=eth3
 INSTALLNICIP="10.4.27.9"
 GATEWAY=10.0.0.103
 
diff --git a/xCAT-test/autotest/kitdata/buildkit.conf b/xCAT-test/autotest/kitdata/buildkit.conf
index a525cea10..32e2685fe 100644
--- a/xCAT-test/autotest/kitdata/buildkit.conf
+++ b/xCAT-test/autotest/kitdata/buildkit.conf
@@ -1,5 +1,5 @@
 # Kit Build File
-# sample file used for Kit automation test, modify it according to your test OS 
+# sample file used for Kit automation test, modify it according to your test OS
 #
 kit:
   basename=ubuntukit
@@ -7,8 +7,8 @@ kit:
   version=1.0
   release=1
   ostype=Linux
-  osarch=ppc64el 
-  vendor=IBM Corp.  
+  osarch=ppc64el
+  vendor=IBM Corp.
   kitdeployparams=ubu.env
   kitlicense=EPL
 
@@ -31,7 +31,7 @@ kitcomponent:
   description=description for component ubuntukit-compute-2
   serverroles=compute
   kitrepoid=ubuntu14.04
-  kitcompdeps=ubuntukit-compute-1 
+  kitcompdeps=ubuntukit-compute-1
   kitpkgdeps=pkg2,pkg3
   ospkgdeps=xinetd
   postinstall=test_postinstall
diff --git a/xCAT-test/autotest/linux.conf.template b/xCAT-test/autotest/linux.conf.template
index e54bf8c9b..44002883f 100644
--- a/xCAT-test/autotest/linux.conf.template
+++ b/xCAT-test/autotest/linux.conf.template
@@ -58,7 +58,7 @@ os=rhels5.4
 
 #system varible for autotest
 [System]
-MN=rhmn      
+MN=rhmn
 SN=rhsn
 CN=lpar5            #It can be used in flat environment
 CNWITHSN=lpar6      #It can be used in hierarchy environment for cn
diff --git a/xCAT-test/autotest/testcase/UT_openbmc/rflash_cases0 b/xCAT-test/autotest/testcase/UT_openbmc/rflash_cases0
index 9cff4f9ef..de394bdf3 100644
--- a/xCAT-test/autotest/testcase/UT_openbmc/rflash_cases0
+++ b/xCAT-test/autotest/testcase/UT_openbmc/rflash_cases0
@@ -17,7 +17,7 @@ label:cn_bmc_ready,hctrl_openbmc
 cmd: rflash $$CN -a /tmp/abc123.tz
 check:rc==1
 check:output=~Error: (\[.*?\]: )?Invalid firmware specified with -a
-end 
+end
 
 start:rflash_invalid_activate_and_delete
 description: Cannot specify -a and --delete at the same time
@@ -27,9 +27,9 @@ label:cn_bmc_ready,hctrl_openbmc
 cmd: rflash $$CN -a 123 --delete 123
 check:rc==1
 check:output=~Error: (\[.*?\]: )?Multiple options are not supported
-end 
+end
 
-start:rflash_invalid_id 
+start:rflash_invalid_id
 description: Passing an invalid ID to activate
 os:Linux
 hcp:openbmc
@@ -37,17 +37,17 @@ label:cn_bmc_ready,hctrl_openbmc
 cmd: rflash $$CN -a 123
 check:rc==1
 check:output=~Error: (\[.*?\]: )?Invalid ID provided to activate
-end 
+end
 
 start:rflash_invalid_multiple_id_3
 description: Code does not currently support multiple IDs to activate
 os:Linux
 hcp:openbmc
 label:cn_bmc_ready,hctrl_openbmc
-cmd: rflash $$CN -a 123 abc asdbas 
+cmd: rflash $$CN -a 123 abc asdbas
 check:rc==1
 check:output=~Error: (\[.*?\]: )?More than one firmware specified is not supported
-end 
+end
 
 start:rflash_invalid_multiple_id_2
 description: Code does not currently support multiple IDs to activate
@@ -57,15 +57,15 @@ label:cn_bmc_ready,hctrl_openbmc
 cmd: rflash $$CN -a asdbas 123
 check:rc==1
 check:output=~Error: (\[.*?\]: )?More than one firmware specified is not supported
-end 
+end
 
 start:rflash_invalid_node
-description: Activate a valid ID hash but forget to put in a node range 
+description: Activate a valid ID hash but forget to put in a node range
 os:Linux
 hcp:openbmc
 label:cn_bmc_ready,hctrl_openbmc
 cmd: rflash -a 221d9020
-check:rc==1 
+check:rc==1
 check:output=~Error: (\[.*?\]: )?Invalid nodes and/or groups in noderange: 221d9020
 end
 
@@ -75,7 +75,7 @@ os:Linux
 hcp:openbmc
 label:cn_bmc_ready,hctrl_openbmc
 cmd: rflash $$CN --delete 221d9020 221d9020
-check:rc==1 
+check:rc==1
 check:output=~Error: (\[.*?\]: )?More than one firmware specified is not supported
 end
 
diff --git a/xCAT-test/autotest/testcase/UT_openbmc/rspconfig_cases0 b/xCAT-test/autotest/testcase/UT_openbmc/rspconfig_cases0
index 750516a15..01eb49a07 100644
--- a/xCAT-test/autotest/testcase/UT_openbmc/rspconfig_cases0
+++ b/xCAT-test/autotest/testcase/UT_openbmc/rspconfig_cases0
@@ -7,7 +7,7 @@ check:rc==0
 end
 
 start:rspconfig_get_all
-description: Check that we can get all the attributes from the BMC 
+description: Check that we can get all the attributes from the BMC
 os:Linux
 hcp:openbmc
 label:cn_bmc_ready,hctrl_openbmc
@@ -21,13 +21,13 @@ check:output=~$$CN: BMC VLAN ID:
 end
 
 start:rspconfig_get_all_error
-description: Check the parsing code for rspconfig (error cases) 
+description: Check the parsing code for rspconfig (error cases)
 hcp: openbmc
 label:cn_bmc_ready,hctrl_openbmc
 cmd: rspconfig $$CN ip,netmask,gateway,hostname,vlan
 check:rc==1
 check:output=~Error: (\[.*?\]: )?Unsupported command
-end 
+end
 
 start:rspconfig_get_set_error
 description: Check the parsing code for rspconfig (error cases) - Cannot get/set in same line
@@ -39,35 +39,35 @@ check:output=~Error: (\[.*?\]: )?Can not set and query OpenBMC information at th
 end
 
 start:rspconfig_get_and_set_hostname
-description: Test setting and getting hostname on the BMC 
+description: Test setting and getting hostname on the BMC
 os:Linux
 hcp:openbmc
 label:cn_bmc_ready,hctrl_openbmc
-# Save the hostname to a file.... 
+# Save the hostname to a file....
 cmd:rspconfig $$CN hostname | tee /tmp/xcattest.rspconfig.hostname
 check:rc==0
-check:output=~$$CN: BMC Hostname: 
+check:output=~$$CN: BMC Hostname:
 # Set to witherspoon first
-cmd:rspconfig $$CN hostname=witherspoon 
+cmd:rspconfig $$CN hostname=witherspoon
 check:rc==0
 check:output=~$$CN: BMC Setting Hostname...
 # Check that it's set to witherspoon
-cmd:rspconfig $$CN hostname 
+cmd:rspconfig $$CN hostname
 check:rc==0
 check:output=~$$CN: BMC Hostname: witherspoon
-# Set to <host>-UTset 
+# Set to <host>-UTset
 cmd:rspconfig $$CN hostname=$$CN-UTset
 check:rc==0
 check:output=~$$CN: BMC Setting Hostname...
-# Check that it's set 
-cmd:rspconfig $$CN hostname 
+# Check that it's set
+cmd:rspconfig $$CN hostname
 check:rc==0
 check:output=~$$CN: BMC Hostname: $$CN-UTset
-# Restore to saved version 
+# Restore to saved version
 cmd:grep BMC /tmp/xcattest.rspconfig.hostname  | cut -d' ' -f4 | xargs -i{} rspconfig $$CN hostname={}
 check:rc==0
 check:output=~$$CN: BMC Setting Hostname...
-cmd:rspconfig $$CN hostname 
+cmd:rspconfig $$CN hostname
 check:rc==0
 check:output=~$$CN: BMC Hostname:
 cmd:rm /tmp/xcattest.rspconfig.hostname
diff --git a/xCAT-test/autotest/testcase/UT_openbmc/scripts/bmcreboot.sh b/xCAT-test/autotest/testcase/UT_openbmc/scripts/bmcreboot.sh
index 214aae1ed..648fa7f7c 100755
--- a/xCAT-test/autotest/testcase/UT_openbmc/scripts/bmcreboot.sh
+++ b/xCAT-test/autotest/testcase/UT_openbmc/scripts/bmcreboot.sh
@@ -55,7 +55,7 @@ while [[ $counter -le $ITERATIONS ]]; do
        if [[ $ready_cnd > 2 ]]; then
            echo "Leaving loop...."
            break
-       fi 
+       fi
    fi
 done
 
diff --git a/xCAT-test/autotest/testcase/UT_openbmc/supported_commands_case0 b/xCAT-test/autotest/testcase/UT_openbmc/supported_commands_case0
index 9567dbf35..dd20a6260 100644
--- a/xCAT-test/autotest/testcase/UT_openbmc/supported_commands_case0
+++ b/xCAT-test/autotest/testcase/UT_openbmc/supported_commands_case0
@@ -5,7 +5,7 @@ hcp:openbmc
 label:cn_bmc_ready,hctrl_openbmc
 cmd:rpower $$CN state
 check:rc==0
-check:output=~$$CN: 
+check:output=~$$CN:
 cmd: rpower $$CN bmcstate
 check:rc==0
 check:output=~$$CN: BMC
@@ -35,7 +35,7 @@ check:output=~$$CN: CPU
 cmd: rinv $$CN dimm
 check:rc==0
 check:output=~$$CN: DIMM
-end 
+end
 
 start:supported_cmds_rvitals
 description: Make sure that the rvitals command works...
@@ -68,7 +68,7 @@ check:output=~$$CN: Rear
 cmd: rvitals $$CN all
 check:rc==0
 check:output=~$$CN: Ambient:
-end 
+end
 
 start:supported_cmds_rbeacon
 description: Make sure the rbeacon command works ...
@@ -77,7 +77,7 @@ hcp:openbmc
 label:cn_bmc_ready,hctrl_openbmc
 cmd:rbeacon $$CN on
 check:rc==0
-check:output=~$$CN: on 
+check:output=~$$CN: on
 cmd: rbeacon $$CN off
 check:rc==0
 check:output=~$$CN: off
diff --git a/xCAT-test/autotest/testcase/addkitcomp/case0 b/xCAT-test/autotest/testcase/addkitcomp/case0
index 9581d6e15..aea1ed058 100644
--- a/xCAT-test/autotest/testcase/addkitcomp/case0
+++ b/xCAT-test/autotest/testcase/addkitcomp/case0
@@ -87,7 +87,7 @@ start:addkitcomp_a
 os:Linux
 cmd:rm -rf /opt/xcat/share/xcat/tools/autotest/testcase/addkitcomp/$$KITDATA
 cmd:mkdir -p /opt/xcat/share/xcat/tools/autotest/testcase/addkitcomp/$$KITDATA
-cmd:cp -rf /opt/xcat/share/xcat/tools/autotest/$$KITDATA /opt/xcat/share/xcat/tools/autotest/testcase/addkitcomp 
+cmd:cp -rf /opt/xcat/share/xcat/tools/autotest/$$KITDATA /opt/xcat/share/xcat/tools/autotest/testcase/addkitcomp
 cmd:cd /opt/xcat/share/xcat/tools/autotest/testcase/addkitcomp/$$KITDATA;buildkit buildrepo all
 check:rc==0
 cmd:cd /opt/xcat/share/xcat/tools/autotest/testcase/addkitcomp/$$KITDATA;buildkit buildtar
@@ -97,7 +97,7 @@ check:rc==0
 check:output=~successfully added
 cmd:mkdef testimage -u profile=compute provmethod=install osarch=__GETNODEATTR($$CN,arch)__
 check:rc==0
-cmd:addkitcomp -i testimage -a ubuntukit-compute-2 
+cmd:addkitcomp -i testimage -a ubuntukit-compute-2
 check:rc==0
 check:output=~Assigning kit component ubuntukit-compute-2
 cmd:lsdef -t osimage -o testimage |grep -i kitcomponents
@@ -108,16 +108,16 @@ cmd:lsdef -t osimage -o testimage
 check:rc==0
 check:output=~KIT_DEPLOY_PARAMS
 check:output=~KIT_COMPONENTS
-cmd:rmkitcomp -i testimage ubuntukit-compute-1-1.0-1-ubuntu-14.04-ppc64el 
+cmd:rmkitcomp -i testimage ubuntukit-compute-1-1.0-1-ubuntu-14.04-ppc64el
 check:rc==1
 check:output=~Error: (\[.*?\]: )?Failed to remove kitcomponent
 cmd:rmkitcomp -i testimage -f ubuntukit-compute-1-1.0-1-ubuntu-14.04-ppc64el
 check:rc==0
 check:output=~Removing kitcomponent ubuntukit-compute-1-1.0-1-ubuntu-14.04-ppc64el from osimage testimage
-cmd:rmkitcomp -i testimage -f ubuntukit-compute-2-1.0-1-ubuntu-14.04-ppc64el 
+cmd:rmkitcomp -i testimage -f ubuntukit-compute-2-1.0-1-ubuntu-14.04-ppc64el
 check:rc==0
 check:output=~Removing kitcomponent ubuntukit-compute-2-1.0-1-ubuntu-14.04-ppc64el from osimage testimage
-cmd:rmkit ubuntukit-1.0-1-ppc64el  
+cmd:rmkit ubuntukit-1.0-1-ppc64el
 check:rc==0
 cmd:rm -f /opt/xcat/share/xcat/tools/autotest/testcase/addkitcomp/$$KITDATA/ubuntukit-1.0-1-ppc64el.tar.bz2
 cmd:rm -rf /opt/xcat/share/xcat/tools/autotest/testcase/addkitcomp/$$KITDATA
@@ -142,7 +142,7 @@ check:rc==0
 cmd:addkitcomp -i testimage -a ubuntukit-compute-2 --noscripts
 check:rc==0
 check:output=~Assigning kit component ubuntukit-compute-2
-cmd:lsdef -t osimage -o testimage 
+cmd:lsdef -t osimage -o testimage
 check:rc==0
 check:output!=~postbootscripts
 cmd:rmkitcomp -i testimage -f ubuntukit-compute-1-1.0-1-ubuntu-14.04-ppc64el
diff --git a/xCAT-test/autotest/testcase/bmcdiscover/cases0 b/xCAT-test/autotest/testcase/bmcdiscover/cases0
index 2e47ca3b6..203b5ae2d 100644
--- a/xCAT-test/autotest/testcase/bmcdiscover/cases0
+++ b/xCAT-test/autotest/testcase/bmcdiscover/cases0
@@ -11,7 +11,7 @@ end
 
 start:bmcdiscover_help
 os:linux
-decription:show bmcdiscover help information 
+decription:show bmcdiscover help information
 cmd:bmcdiscover help
 check:rc==0
 check:output=~bmcdiscover \- Discover BMC \(Baseboard Management Controller\) using the specified scan method
@@ -31,7 +31,7 @@ end
 start:bmcdiscover_h
 os:Linux
 decription:help
-cmd:bmcdiscover -h 
+cmd:bmcdiscover -h
 check:rc==0
 check:output=~Usage
 end
@@ -64,7 +64,7 @@ start:bmcdiscover_range_w
 cmd:bmcdiscover --range  $$bmcrange -u $$bmcusername -p $$bmcpasswd -w
 check:rc==0
 check:output=~Writing node
-check:output=~$$bmcrange,.+,.+,$$bmcusername,$$bmcpasswd 
+check:output=~$$bmcrange,.+,.+,$$bmcusername,$$bmcpasswd
 end
 
 
diff --git a/xCAT-test/autotest/testcase/buildkit/cases0 b/xCAT-test/autotest/testcase/buildkit/cases0
index 17149110d..717bafb98 100644
--- a/xCAT-test/autotest/testcase/buildkit/cases0
+++ b/xCAT-test/autotest/testcase/buildkit/cases0
@@ -223,7 +223,7 @@ cmd:cd /opt/xcat/share/xcat/tools/autotest/testcase/buildkit/prodkit;reponame=`c
 check:rc==0
 check:output=~been removed
 check:output!~error
-cmd:ls /opt/xcat/share/xcat/tools/autotest/testcase/buildkit/prodkit/build/kit_repodir|grep ubuntu 
+cmd:ls /opt/xcat/share/xcat/tools/autotest/testcase/buildkit/prodkit/build/kit_repodir|grep ubuntu
 check:output!~ubuntu
 cmd:cd -;rm -rf /opt/xcat/share/xcat/tools/autotest/testcase/buildkit/prodkit
 end
diff --git a/xCAT-test/autotest/testcase/chdef/cases0 b/xCAT-test/autotest/testcase/chdef/cases0
index d32f8d31b..82b749c5b 100644
--- a/xCAT-test/autotest/testcase/chdef/cases0
+++ b/xCAT-test/autotest/testcase/chdef/cases0
@@ -12,12 +12,12 @@ cmd:mkdef -t node -o testnode groups=all
 check:rc==0
 cmd:chdef -t node -o testnode groups=aix
 check:rc==0
-cmd:lsdef -t node -l testnode 
+cmd:lsdef -t node -l testnode
 check:rc==0
 check:output=~groups=aix
 cmd:chdef testnode groups=linux
 check:rc==0
-cmd:lsdef -t node -l testnode 
+cmd:lsdef -t node -l testnode
 check:rc==0
 check:output=~groups=linux
 cmd:chdef -t node -o testnode postscripts="syslog,remoteshell,syncfiles"
@@ -60,7 +60,7 @@ cmd:mkdef -t node -o testnode groups=all
 check:rc==0
 cmd:chdef -p -t node -o testnode groups=aix
 check:rc==0
-cmd:lsdef -t node -l testnode 
+cmd:lsdef -t node -l testnode
 check:output=~groups=all,aix
 cmd:rmdef -t node testnode
 end
@@ -72,7 +72,7 @@ cmd:mkdef -t node -o testnode groups=all,testgroup
 check:rc==0
 cmd:chdef -m -t node -o testnode groups=testgroup
 check:rc==0
-cmd:lsdef -t node -l testnode 
+cmd:lsdef -t node -l testnode
 check:output!~testgroup
 cmd:rmdef -t node testnode
 end
@@ -247,7 +247,7 @@ end
 
 
 start:chdef_template
-description:try to change a template, a new node is created according to chdef. 
+description:try to change a template, a new node is created according to chdef.
 label:mn_only,db
 cmd:result=`lsdef | grep  switch-template`; if [[ $result =~ "switch-template" ]]; then echo $result; noderm switch-template; fi
 cmd:chdef -t node -o switch-template groups=test
diff --git a/xCAT-test/autotest/testcase/chtab/cases0 b/xCAT-test/autotest/testcase/chtab/cases0
index 769bd1f91..fbc6d4106 100644
--- a/xCAT-test/autotest/testcase/chtab/cases0
+++ b/xCAT-test/autotest/testcase/chtab/cases0
@@ -8,7 +8,7 @@ end
 
 
 start:chtab_d
-description:check chtab -d 
+description:check chtab -d
 label:mn_only,db
 cmd:chtab key=rsh_test site.value=/opt/xcat/bin/rcp site.comments="the rcp command" site.disable=no
 check:rc==0
@@ -37,12 +37,12 @@ end
 start:chtab_modify_key
 description:check chtab with key=xxx
 label:mn_only,db
-cmd:chtab key=rsh_test site.value=/opt/xcat/bin/rcp site.comments="the rcp command" 
+cmd:chtab key=rsh_test site.value=/opt/xcat/bin/rcp site.comments="the rcp command"
 check:rc==0
 cmd:tabdump site | grep rsh_test
 check:output=~/opt/xcat/bin/rcp
 check:output=~the rcp command
-cmd:chtab key=rsh_test site.value=/opt/xcat/bin/scp 
+cmd:chtab key=rsh_test site.value=/opt/xcat/bin/scp
 check:rc==0
 cmd:tabdump site | grep rsh_test
 check:output=~/opt/xcat/bin/scp
diff --git a/xCAT-test/autotest/testcase/chvm/cases0 b/xCAT-test/autotest/testcase/chvm/cases0
index eccd82b47..89e7bc0b2 100644
--- a/xCAT-test/autotest/testcase/chvm/cases0
+++ b/xCAT-test/autotest/testcase/chvm/cases0
@@ -56,7 +56,7 @@ cmd:dir="/tmp/chvm_err_node";echo ${dir}".old";if [ -d "${dir}" ];then mv ${dir}
 check:rc==0
 cmd:lsdef bogusnode > /dev/null 2>&1;if [[ $? -eq 0 ]]; then lsdef bogusnode -z >/tmp/chvm_err_node/bogusnode.stanza ;rmdef bogusnode;fi
 check:rc==0
-cmd:chvm bogusnode 
+cmd:chvm bogusnode
 check:rc!=0
 check:output=~Error: (\[.*?\]: )?Invalid nodes and/or groups in noderange
 cmd:if [[ -e /tmp/chvm_err_node/bogusnode.stanza ]]; then cat /tmp/chvm_err_node/bogusnode.stanza | mkdef -z;fi
diff --git a/xCAT-test/autotest/testcase/confignetwork/cases0 b/xCAT-test/autotest/testcase/confignetwork/cases0
index dabb60afe..969f7fbee 100644
--- a/xCAT-test/autotest/testcase/confignetwork/cases0
+++ b/xCAT-test/autotest/testcase/confignetwork/cases0
@@ -1,5 +1,5 @@
 start: confignetwork_s_installnic_diskful
-description: this case is to test confignetwork -s could configure installnic successfully in diskful provision. 
+description: this case is to test confignetwork -s could configure installnic successfully in diskful provision.
 cmd:if ping -c 1 $$SN > /dev/null;then rpower $$SN off > /dev/null;fi
 cmd:chdef -t node -o $$CN servicenode= monserver=$$MN nfsserver=$$MN tftpserver=$$MN  xcatmaster=$$MN
 check:rc==0
@@ -21,7 +21,7 @@ cmd:copycds $$ISO
 check:rc==0
 cmd:chdef $$CN postscripts="confignetwork -s"
 check:rc==0
-cmd:rinstall $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute 
+cmd:rinstall $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute
 check:rc==0
 cmd:sleep 300
 cmd:a=0;while ! `lsdef -l $$CN|grep status|grep booted >/dev/null`; do sleep 20;((a++));if [ $a -gt 300 ];then break;fi done
@@ -70,7 +70,7 @@ cmd:packimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-comput
 check:rc==0
 cmd:rinstall $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute
 check:rc==0
-cmd:sleep 180 
+cmd:sleep 180
 cmd:a=0;while ! `lsdef -l $$CN|grep status|grep booted >/dev/null`; do sleep 10;((a++));if [ $a -gt 60 ];then break;fi done
 cmd:ping $$CN -c 3
 check:rc==0
@@ -91,7 +91,7 @@ start: confignetwork_secondarynic_diskless
 description: this case is to test confignetwork -s could config installnic and secondarynic at the same time successfully in diskless provision.
 cmd:chdef -t node -o $$CN servicenode= monserver=$$MN nfsserver=$$MN tftpserver=$$MN  xcatmaster=$$MN
 check:rc==0
-cmd:mkdef -t network -o 100_1_0_0-255_255_0_0 net=100.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC 
+cmd:mkdef -t network -o 100_1_0_0-255_255_0_0 net=100.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC
 check:rc==0
 cmd:chdef $$CN nicips.$$SECONDNIC=100.1.0.100 nictypes.$$SECONDNIC=Ethernet nicnetworks.$$SECONDNIC=100_1_0_0-255_255_0_0
 check:rc==0
@@ -122,7 +122,7 @@ cmd:packimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-comput
 check:rc==0
 cmd:rinstall $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute
 check:rc==0
-cmd:sleep 180 
+cmd:sleep 180
 cmd:a=0;while ! `lsdef -l $$CN|grep status|grep booted >/dev/null`; do sleep 10;((a++));if [ $a -gt 60 ];then break;fi done
 cmd:ping $$CN -c 3
 check:rc==0
@@ -156,7 +156,7 @@ cmd:xdsh $$CN "mkdir -p /tmp/backupnet/"
 check:rc==0
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "cp -f /etc/sysconfig/network/ifcfg-* /tmp/backupnet/"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "cp -f /etc/sysconfig/network-scripts/ifcfg-* /tmp/backupnet/"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cp -f /etc/network/interfaces.d/* /tmp/backupnet/;cp -f /etc/network/interfaces /tmp";else echo "Sorry,this is not supported os"; fi
 check:rc==0
-cmd:mkdef -t network -o 11_1_0_0-255_255_0_0 net=11.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC 
+cmd:mkdef -t network -o 11_1_0_0-255_255_0_0 net=11.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC
 check:rc==0
 cmd:chdef $$CN nicips.$$SECONDNIC=11.1.0.100 nictypes.$$SECONDNIC=Ethernet nicnetworks.$$SECONDNIC=11_1_0_0-255_255_0_0
 check:rc==0
@@ -228,7 +228,7 @@ check:rc==0
 cmd:cat /etc/hosts
 check:output=~aliases1-1 aliases1-1-1
 check:output=~aliases1-2
-cmd:updatenode $$CN -P confignetwork 
+cmd:updatenode $$CN -P confignetwork
 check:rc==0
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "cat /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "cat /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cat /etc/network/interfaces.d/*";else echo "Sorry,this is not supported os"; fi
 check:output=~11.1.0.100
@@ -296,7 +296,7 @@ start:confignetwork_secondarynic_nicnetworks_updatenode_false
 description: this case is to test confignetwork could return error message when there is no not enough attributes when configing secondarynic with updatenode.
 cmd:lsdef $$CN;if [ $? -eq 0 ]; then lsdef -l $$CN -z >/tmp/CN.standa ;fi
 check:rc==0
-cmd:mkdef -t network -o 11_1_0_0-255_255_0_0 net=11.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC 
+cmd:mkdef -t network -o 11_1_0_0-255_255_0_0 net=11.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC
 check:rc==0
 cmd:chdef $$CN nicips.$$SECONDNIC=11.1.0.100 nictypes.$$SECONDNIC=Ethernet nicnetworks.$$SECONDNIC=
 check:rc==0
@@ -395,7 +395,7 @@ cmd:mkdef -t network -o 11_1_0_0-255_255_0_0 net=11.1.0.0 mask=255.255.0.0 mgtif
 check:rc==0
 cmd:chdef $$CN nicips.$$SECONDNIC=11.1.0.100 nictypes.$$SECONDNIC=Ethernet nicnetworks.$$SECONDNIC=11_1_0_0-255_255_0_0 niccustomscripts.$$SECONDNIC=script1
 check:rc==0
-cmd:updatenode $$CN -P confignetwork 
+cmd:updatenode $$CN -P confignetwork
 check:rc==0
 cmd:xdsh $$CN "cat /tmp/confignetwork_niccustomscript"
 check:rc==0
@@ -468,7 +468,7 @@ cmd:xdsh $$CN "rm -rf /tmp/backupnet/"
 end
 
 start:confignetwork_vlan_eth0
-description: this case is to verify if confignetwork could config vlan for CN.When CN has Ethernet nic eth0, user wants to confgure 2 vlans, Configure vlan eth0.6 60.5.106.9 and eth0.7 70.5.106.9 based on ethernet nic eth0 
+description: this case is to verify if confignetwork could config vlan for CN.When CN has Ethernet nic eth0, user wants to confgure 2 vlans, Configure vlan eth0.6 60.5.106.9 and eth0.7 70.5.106.9 based on ethernet nic eth0
 cmd:lsdef $$CN;if [ $? -eq 0 ]; then lsdef -l $$CN -z >/tmp/CN.standa ;fi
 check:rc==0
 cmd:xdsh $$CN "rm -rf /tmp/backupnet/"
@@ -486,7 +486,7 @@ cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/sysconfig/ne
 check:output=~11.1.0.100
 cmd:chdef $$CN nicips.$$SECONDNIC= nictypes.$$SECONDNIC= nicnetworks.$$SECONDNIC=
 check:rc==0
-cmd:mkdef -t network -o 60_0_0_0-255_0_0_0 net=60.0.0.0 mask=255.0.0.0 mgtifname=$$SECONDNIC 
+cmd:mkdef -t network -o 60_0_0_0-255_0_0_0 net=60.0.0.0 mask=255.0.0.0 mgtifname=$$SECONDNIC
 check:rc==0
 cmd:mkdef -t network -o 70_0_0_0-255_0_0_0 net=70.0.0.0 mask=255.0.0.0 mgtifname=$$SECONDNIC
 check:rc==0
@@ -504,7 +504,7 @@ check:rc==0
 cmd:rmdef -t network -o 60_0_0_0-255_0_0_0
 cmd:rmdef -t network -o 70_0_0_0-255_0_0_0
 cmd:xdsh $$CN "ip addr del 60.5.106.9/8 dev $$SECONDNIC.6"
-cmd:xdsh $$CN "ip addr del 70.5.106.9/8 dev $$SECONDNIC.7" 
+cmd:xdsh $$CN "ip addr del 70.5.106.9/8 dev $$SECONDNIC.7"
 cmd:xdsh $$CN "ip link del dev $$SECONDNIC.6"
 cmd:xdsh $$CN "ip link del dev $$SECONDNIC.7"
 cmd:xdsh $$CN "ip addr del 11.1.0.100/16 dev $$SECONDNIC"
@@ -535,13 +535,13 @@ cmd:updatenode $$CN -P confignetwork
 check:rc==0
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 11.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
 check:output=~11.1.0.100
-cmd:chdef $$CN nicips.$$SECONDNIC= nictypes.$$SECONDNIC= nicnetworks.$$SECONDNIC= 
+cmd:chdef $$CN nicips.$$SECONDNIC= nictypes.$$SECONDNIC= nicnetworks.$$SECONDNIC=
 check:rc==0
 cmd:mkdef -t network -o 60_0_0_0-255_0_0_0 net=60.0.0.0 mask=255.0.0.0 mgtifname=$$SECONDNIC mtu=1500
 check:rc==0
 cmd:mkdef -t network -o 70_0_0_0-255_0_0_0 net=70.0.0.0 mask=255.0.0.0 mgtifname=$$SECONDNIC mtu=1500
 check:rc==0
-cmd:chdef $$CN nicnetworks.$$SECONDNIC.6="60_0_0_0-255_0_0_0" nicnetworks.$$SECONDNIC.7="70_0_0_0-255_0_0_0" nictypes.$$SECONDNIC.6=vlan nictypes.$$SECONDNIC.7=vlan nicips.$$SECONDNIC.6=60.5.106.9 nicips.$$SECONDNIC.7=70.5.106.9 
+cmd:chdef $$CN nicnetworks.$$SECONDNIC.6="60_0_0_0-255_0_0_0" nicnetworks.$$SECONDNIC.7="70_0_0_0-255_0_0_0" nictypes.$$SECONDNIC.6=vlan nictypes.$$SECONDNIC.7=vlan nicips.$$SECONDNIC.6=60.5.106.9 nicips.$$SECONDNIC.7=70.5.106.9
 check:rc==0
 cmd:updatenode $$CN -P confignetwork
 check:rc!=0
@@ -583,7 +583,7 @@ cmd:updatenode $$CN -P confignetwork
 check:rc==0
 cmd:chdef $$CN nicips.$$SECONDNIC= nictypes.$$SECONDNIC= nicnetworks.$$SECONDNIC= nicips.$$THIRDNIC= nictypes.$$THIRDNIC= nicnetworks.$$THIRDNIC=
 check:rc==0
-cmd:mkdef -t network -o 30_5_0_0-255_255_0_0 net=30.5.0.0 mask=255.255.0.0 
+cmd:mkdef -t network -o 30_5_0_0-255_255_0_0 net=30.5.0.0 mask=255.255.0.0
 check:rc==0
 cmd:chdef $$CN nicnetworks.bond0=30_5_0_0-255_255_0_0 nictypes.$$SECONDNIC=ethernet nictypes.$$THIRDNIC=ethernet nictypes.bond0=bond nicips.bond0=30.5.106.9 nicdevices.bond0="$$SECONDNIC|$$THIRDNIC"
 check:rc==0
@@ -602,7 +602,7 @@ check:rc==0
 cmd:rmdef -t network -o 12_1_0_0-255_255_0_0
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifcfg-$$THIRDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network-scripts/ifcfg-$$THIRDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "rm -rf /etc/network/interfaces.d/$$THIRDNIC";else echo "Sorry,this is not supported os"; fi
 check:rc==0
-cmd:rmdef -t network -o 30_5_0_0-255_255_0_0  
+cmd:rmdef -t network -o 30_5_0_0-255_255_0_0
 cmd:xdsh $$CN "ip addr del 30.5.106.9/16 dev bond0"
 cmd:xdsh $$CN "ip link del dev bond0"
 cmd:xdsh $$CN "echo -bond0 > /sys/class/net/bonding_masters"
@@ -665,7 +665,7 @@ check:rc==0
 end
 
 start:confignetwork_vlan_bond
-description: this case is to verify if confignetwork could config bond for CN.CN has 2 Ethernet nic eth2 and eth3, user wants to bond them to bond0, then make 2 vlan bond0.2 and bond0.3 for data network. 
+description: this case is to verify if confignetwork could config bond for CN.CN has 2 Ethernet nic eth2 and eth3, user wants to bond them to bond0, then make 2 vlan bond0.2 and bond0.3 for data network.
 cmd:lsdef $$CN;if [ $? -eq 0 ]; then lsdef -l $$CN -z >/tmp/CN.standa ;fi
 check:rc==0
 cmd:xdsh $$CN "rm -rf /tmp/backupnet/"
@@ -866,7 +866,7 @@ cmd:mkdef -t network -o 12_1_0_0-255_255_0_0 net=12.1.0.0 mask=255.255.0.0 mgtif
 check:rc==0
 cmd:chdef $$CN nicips.$$THIRDNIC=12.1.0.100 nictypes.$$THIRDNIC=Ethernet nicnetworks.$$THIRDNIC=12_1_0_0-255_255_0_0
 check:rc==0
-cmd:updatenode $$CN -P confignetwork 
+cmd:updatenode $$CN -P confignetwork
 check:rc==0
 cmd:chdef $$CN nicips.$$SECONDNIC= nictypes.$$SECONDNIC= nicnetworks.$$SECONDNIC= nicips.$$THIRDNIC= nictypes.$$THIRDNIC= nicnetworks.$$THIRDNIC=
 check:rc==0
@@ -931,7 +931,7 @@ cmd:mkdef -t network -o 30_5_0_0-255_255_0_0 net=30.5.0.0 mask=255.255.0.0
 check:rc==0
 cmd:mkdef -t network -o 40_5_0_0-255_255_0_0 net=40.5.0.0 mask=255.255.0.0
 check:rc==0
-cmd:chdef $$CN nicdevices.br22= nicdevices.br33= nictypes.br22=bridge nictypes.br33=bridge nicnetworks.br22=30_5_0_0-255_255_0_0 nicnetworks.br33=40_5_0_0-255_255_0_0 nicips.br22=30.5.106.8 nicips.br33=40.5.106.8 nicdevices.bond0.2=bond0 nicdevices.bond0.3=bond0 nictypes.bond0.2=vlan nictypes.bond0.3=vlan nictypes.bond0=bond nictypes.$$SECONDNIC=ethernet nictypes.$$THIRDNIC=ethernet 
+cmd:chdef $$CN nicdevices.br22= nicdevices.br33= nictypes.br22=bridge nictypes.br33=bridge nicnetworks.br22=30_5_0_0-255_255_0_0 nicnetworks.br33=40_5_0_0-255_255_0_0 nicips.br22=30.5.106.8 nicips.br33=40.5.106.8 nicdevices.bond0.2=bond0 nicdevices.bond0.3=bond0 nictypes.bond0.2=vlan nictypes.bond0.3=vlan nictypes.bond0=bond nictypes.$$SECONDNIC=ethernet nictypes.$$THIRDNIC=ethernet
 check:rc==0
 cmd:updatenode $$CN -P "confignetwork -s"
 check:rc!=0
diff --git a/xCAT-test/autotest/testcase/confignics/cases0 b/xCAT-test/autotest/testcase/confignics/cases0
index f73c0e282..6b161461e 100644
--- a/xCAT-test/autotest/testcase/confignics/cases0
+++ b/xCAT-test/autotest/testcase/confignics/cases0
@@ -1,5 +1,5 @@
 start:confignics_config_one_port_single_value
-description:confignics 
+description:confignics
 cmd:lsdef $$CN;if [ $? -eq 0 ]; then lsdef -l $$CN -z >/tmp/CN.standa ;fi
 check:rc==0
 cmd:mkdef -t network -o 100_1_0_0-255_255_0_0 net=100.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC mtu=1501
@@ -12,7 +12,7 @@ cmd:if [ "$$OS" = "ubuntu" ];then xdsh $$CN cat /etc/network/interfaces.d/$$SECO
 check:output=~100.1.0.100
 check:output=~MTU=1501
 cmd:rmdef -t network -o 100_1_0_0-255_255_0_0
-cmd:if [ "$$OS" = "ubuntu" ];then xdsh $$CN rm -rf /etc/network/interfaces.d/$$SECONDNIC; else xdsh $$CN rm -rf /etc/sysconfig/network*/ifcfg-$$SECONDNIC; fi 
+cmd:if [ "$$OS" = "ubuntu" ];then xdsh $$CN rm -rf /etc/network/interfaces.d/$$SECONDNIC; else xdsh $$CN rm -rf /etc/sysconfig/network*/ifcfg-$$SECONDNIC; fi
 cmd:if [ -e /tmp/CN.standa ]; then rmdef $$CN; cat /tmp/CN.standa | mkdef -z; rm -rf /tmp/CN.standa; fi
 check:rc==0
 end
@@ -59,9 +59,9 @@ cmd:mkdef -t network -o 13_1_0_0-255_255_0_0 net=13.1.0.0 mask=255.255.0.0 mgtif
 check:rc==0
 cmd:mkdef -t network -o 14_1_0_0-255_255_0_0 net=14.1.0.0 mask=255.255.0.0 mgtifname=$$THIRDNIC    mtu=1503
 check:rc==0
-cmd:chdef $$CN nicips.$$SECONDNIC="11.1.0.100|12.1.0.100" nictypes.$$SECONDNIC=Ethernet nicnetworks.$$SECONDNIC="11_1_0_0-255_255_0_0|12_1_0_0-255_255_0_0" 
+cmd:chdef $$CN nicips.$$SECONDNIC="11.1.0.100|12.1.0.100" nictypes.$$SECONDNIC=Ethernet nicnetworks.$$SECONDNIC="11_1_0_0-255_255_0_0|12_1_0_0-255_255_0_0"
 check:rc==0
-cmd:chdef $$CN nicips.$$THIRDNIC="13.1.0.100|14.1.0.100" nictypes.$$THIRDNIC=Ethernet nicnetworks.$$THIRDNIC="13_1_0_0-255_255_0_0|14_1_0_0-255_255_0_0" 
+cmd:chdef $$CN nicips.$$THIRDNIC="13.1.0.100|14.1.0.100" nictypes.$$THIRDNIC=Ethernet nicnetworks.$$THIRDNIC="13_1_0_0-255_255_0_0|14_1_0_0-255_255_0_0"
 check:rc==0
 cmd:updatenode $$CN -P confignics
 check:rc==0
@@ -69,7 +69,7 @@ cmd:if [ "$$OS" = "ubuntu" ];then xdsh $$CN cat /etc/network/interfaces.d/$$SECO
 check:output=~11.1.0.100
 check:output!~dhcp
 check:output=~MTU=1501
-cmd:if [ "$$OS" = "ubuntu" ];then xdsh $$CN cat /etc/network/interfaces.d/$$SECONDNIC:1 ; elif [ "$$OS" = "rhels" ]; then xdsh $$CN cat /etc/sysconfig/network*/ifcfg-$$SECONDNIC:1;else xdsh $$CN cat /etc/sysconfig/network*/ifcfg-$$SECONDNIC; fi  
+cmd:if [ "$$OS" = "ubuntu" ];then xdsh $$CN cat /etc/network/interfaces.d/$$SECONDNIC:1 ; elif [ "$$OS" = "rhels" ]; then xdsh $$CN cat /etc/sysconfig/network*/ifcfg-$$SECONDNIC:1;else xdsh $$CN cat /etc/sysconfig/network*/ifcfg-$$SECONDNIC; fi
 check:output=~12.1.0.100
 check:output!~dhcp
 cmd:if [ "$$OS" = "ubuntu" ];then xdsh $$CN cat /etc/network/interfaces.d/$$THIRDNIC; else xdsh $$CN cat /etc/sysconfig/network*/ifcfg-$$THIRDNIC; fi
@@ -139,7 +139,7 @@ cmd:rmdef -t network -o 14_1_0_0-255_255_0_0
 cmd:if [ "$$OS" = "ubuntu" ];then xdsh $$CN rm -rf /etc/network/interfaces.d/$$SECONDNIC; else xdsh $$CN rm -rf /etc/sysconfig/network*/ifcfg-$$SECONDNIC; fi
 cmd:if [ "$$OS" = "ubuntu" ];then xdsh $$CN rm -rf /etc/network/interfaces.d/$$SECONDNIC:1; else xdsh $$CN rm -rf /etc/sysconfig/network*/ifcfg-$$SECONDNIC:1; fi
 cmd:if [ "$$OS" = "ubuntu" ];then xdsh $$CN rm -rf /etc/network/interfaces.d/$$THIRDNIC; else xdsh $$CN rm -rf /etc/sysconfig/network*/ifcfg-$$THIRDNIC; fi
-cmd:if [ "$$OS" = "ubuntu" ];then xdsh $$CN rm -rf /etc/network/interfaces.d/$$THIRDNIC:1; else xdsh $$CN rm -rf /etc/sysconfig/network*/ifcfg-$$THIRDNIC:1; fi 
+cmd:if [ "$$OS" = "ubuntu" ];then xdsh $$CN rm -rf /etc/network/interfaces.d/$$THIRDNIC:1; else xdsh $$CN rm -rf /etc/sysconfig/network*/ifcfg-$$THIRDNIC:1; fi
 cmd:cp /etc/hosts.backup /etc/hosts
 cmd:if [ -e /tmp/CN.standa ]; then rmdef $$CN; cat /tmp/CN.standa | mkdef -z; rm -rf /tmp/CN.standa; fi
 check:rc==0
@@ -149,13 +149,13 @@ start:confignics_config_multiple_port_withnicaliases_multiple_value
 description:confignics
 cmd:lsdef $$CN;if [ $? -eq 0 ]; then lsdef -l $$CN -z >/tmp/CN.standa ;fi
 check:rc==0
-cmd:mkdef -t network -o 11_1_0_0-255_255_0_0 net=11.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC 
+cmd:mkdef -t network -o 11_1_0_0-255_255_0_0 net=11.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC
 check:rc==0
 cmd:mkdef -t network -o 12_1_0_0-255_255_0_0 net=12.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC
 check:rc==0
-cmd:mkdef -t network -o 13_1_0_0-255_255_0_0 net=13.1.0.0 mask=255.255.0.0 mgtifname=$$THIRDNIC   
+cmd:mkdef -t network -o 13_1_0_0-255_255_0_0 net=13.1.0.0 mask=255.255.0.0 mgtifname=$$THIRDNIC
 check:rc==0
-cmd:mkdef -t network -o 14_1_0_0-255_255_0_0 net=14.1.0.0 mask=255.255.0.0 mgtifname=$$THIRDNIC    
+cmd:mkdef -t network -o 14_1_0_0-255_255_0_0 net=14.1.0.0 mask=255.255.0.0 mgtifname=$$THIRDNIC
 check:rc==0
 cmd:chdef $$CN nicips.$$SECONDNIC="11.1.0.100|12.1.0.100" nictypes.$$SECONDNIC=Ethernet nicnetworks.$$SECONDNIC="11_1_0_0-255_255_0_0|12_1_0_0-255_255_0_0" nicaliases.$$SECONDNIC="aliases1-1 aliases1-1-1|aliases1-2" nichostnamesuffixes.$$SECONDNIC="-$$SECONDNIC|-$$SECONDNIC-1"
 check:rc==0
diff --git a/xCAT-test/autotest/testcase/confignics/mtu_set_clean b/xCAT-test/autotest/testcase/confignics/mtu_set_clean
index adbc8db69..f5b12308f 100755
--- a/xCAT-test/autotest/testcase/confignics/mtu_set_clean
+++ b/xCAT-test/autotest/testcase/confignics/mtu_set_clean
@@ -5,7 +5,7 @@ function test_ip()
     VALID_CHECK=$(echo $IP|awk -F. '$1<=255&&$2<=255&&$3<=255&&$4<=255{print "yes"}')
     if echo $IP|grep -E "^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$">/dev/null; then
         if [ ${VALID_CHECK:-no} == "yes" ]; then
-            echo $1; 
+            echo $1;
         else
             return 1;
         fi
@@ -33,12 +33,12 @@ MASTERIP=""
 NETWORKNAME=""
 MASTERIP=`lsdef -t site -i master -c  2>&1 | awk -F'=' '{print $2}'`;
 MASTERIP=$(get_master_ip $MASTERIP);
-if [[ `tabdump networks |grep $MASTERIP` = "" ]]; then 
+if [[ `tabdump networks |grep $MASTERIP` = "" ]]; then
     makenetworks
 fi
 NETWORKNAME=`tabdump networks |grep $MASTERIP|awk -F'"' '{print $2}'`;
 echo $NETWORKNAME,$MASTERIP;
-if [[ $NETWORKNAME = "" ]] || [[ $MASTERIP = "" ]];then 
+if [[ $NETWORKNAME = "" ]] || [[ $MASTERIP = "" ]];then
     exit 2;
 else
     if [ $1 = "S" ] ;then
diff --git a/xCAT-test/autotest/testcase/copycds/cases0 b/xCAT-test/autotest/testcase/copycds/cases0
index da1d9bb46..7f2632131 100644
--- a/xCAT-test/autotest/testcase/copycds/cases0
+++ b/xCAT-test/autotest/testcase/copycds/cases0
@@ -6,7 +6,7 @@ cmd:copycds $$ISO
 check:rc==0
 check:output=~Copying media to /install/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__
 check:output=~Media copy operation successful
-cmd:ls /install/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__ 
+cmd:ls /install/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__
 check:rc==0
 end
 
diff --git a/xCAT-test/autotest/testcase/copycds/cases1 b/xCAT-test/autotest/testcase/copycds/cases1
index dd3d2ddec..a814a99cc 100644
--- a/xCAT-test/autotest/testcase/copycds/cases1
+++ b/xCAT-test/autotest/testcase/copycds/cases1
@@ -2,4 +2,4 @@ start:copycds_bogus_disc
 description: Test cases for the copycds with a bogus disc
 cmd:/opt/xcat/share/xcat/tools/autotest/testcase/copycds/copycds_bogus_disc
 check:rc==0
-end 
+end
diff --git a/xCAT-test/autotest/testcase/discovery/bmc_discovery_only b/xCAT-test/autotest/testcase/discovery/bmc_discovery_only
index 924547e7d..0b871c218 100644
--- a/xCAT-test/autotest/testcase/discovery/bmc_discovery_only
+++ b/xCAT-test/autotest/testcase/discovery/bmc_discovery_only
@@ -1,6 +1,6 @@
 start:bmc_discovery_only
-description: test the whole process of bmc discovery 
-Attribute: $$NODE_DISCOVERY_TARGET:The machine plan to be discovered. $$NODE_DISCOVERY_BMC_DYNAMIC_IP_RANGE :The valid dymanic ip range which has been configured in DHCP server and can offer service.   
+description: test the whole process of bmc discovery
+Attribute: $$NODE_DISCOVERY_TARGET:The machine plan to be discovered. $$NODE_DISCOVERY_BMC_DYNAMIC_IP_RANGE :The valid dymanic ip range which has been configured in DHCP server and can offer service.
 cmd:/opt/xcat/share/xcat/tools/autotest/testcase/discovery/discovery_test --discovery_target_node $$NODE_DISCOVERY_TARGET --bmc_dynamic_ip_range $$NODE_DISCOVERY_BMC_DYNAMIC_IP_RANGE --bmc_discovery_only
 check:rc==0
 end
diff --git a/xCAT-test/autotest/testcase/discovery/discovery_test b/xCAT-test/autotest/testcase/discovery/discovery_test
index c940f57a4..00b1314bd 100755
--- a/xCAT-test/autotest/testcase/discovery/discovery_test
+++ b/xCAT-test/autotest/testcase/discovery/discovery_test
@@ -58,7 +58,7 @@ $::USAGE = "Usage:
 
 To get help:
     $program_name -h
-    
+
 To just test the process of bmc discovery
     $program_name  --discovery_target_node <node_name> --bmc_dynamic_ip_range <ip_range> --bmc_discovery_only
 
@@ -74,7 +74,7 @@ Options:
     discovery_mode: The mode of discovery. Valid mode are mtms or switch. Used with option 'osimage'. Can not be used with 'bmc_discovery_only' at the same time.
     osimage: The image used to deploy on target node. Used with option 'discovery_mode'. Can not be used with option 'bmc_discovery_only' at the same time.
     bmc_discovery_only: Just test bmc discovery process, not test node discovery process. Can not be used with option 'osimage' or 'discovery_mode' at the same time.
-    
+
 Notes:
     Up to now, only support one discovery_target_node.
     When preparing discovery_target_node, below atrributes are required for each test scenario.
@@ -109,7 +109,7 @@ if ($needhelp)
 unless(defined $discovery_target_node and defined $bmc_dynamic_ip_range){
     print "[ERROR] options 'discovery_target_node' and 'bmc_dynamic_ip_range' are required.\n\n$::USAGE";
     to_exit(1);
-} 
+}
 
 if($bmc_discovery_only){
     if($discovery_mode or $osimage){
@@ -288,7 +288,7 @@ sub check_test_case_self_conf {
         }else{
              push @$error_ref, "The ip $discovery_target_node_info{bmc} corresponds to $bmcinfo{mtm}|$bmcinfo{serial}, not to expected $discovery_target_node_info{mtm}|$discovery_target_node_info{serial}";
         }
-    
+
         unless(defined $bmc_target_mac){
             push @$error_ref, "Failed to calculate bmc's mac";
         }
@@ -630,7 +630,7 @@ sub node_discovery {
         }
     }
 
-    print "Waiting for node $discovery_prodefine_node_name_in_automation be discoveried\n"; 
+    print "Waiting for node $discovery_prodefine_node_name_in_automation be discoveried\n";
 
     #suppose discovery process should get MAC address for predined node in 10 minuts
     my $find_me_succ = 0;
@@ -809,7 +809,7 @@ sub parse_dynamic_ip_range {
 
 }
 #--------------------------------------------------------
-# Fuction name: calculate_bmc_info 
+# Fuction name: calculate_bmc_info
 # Description:
 # Atrributes:
 # Retrun code:
diff --git a/xCAT-test/autotest/testcase/dockercommand/cases0 b/xCAT-test/autotest/testcase/dockercommand/cases0
index 4baaa725b..3ae9503b4 100644
--- a/xCAT-test/autotest/testcase/dockercommand/cases0
+++ b/xCAT-test/autotest/testcase/dockercommand/cases0
@@ -14,7 +14,7 @@ check:ouptut=~success
 cmd:rpower $$DOCKERCN state
 check:rc==0
 check:output=~running
-cmd:rpower $$DOCKERCN stop 
+cmd:rpower $$DOCKERCN stop
 check:rc==0
 cmd:rpower $$DOCKERCN state
 check:output=~exited
@@ -41,7 +41,7 @@ check:rc==0
 check:output=~success
 cmd:rpower  $$DOCKERCN state
 check:rc==0
-check:output=~running 
+check:output=~running
 cmd:rmdocker $$DOCKERCN -f
 check:rc==0
 cmd:makehosts -d $$DOCKERCN
@@ -172,15 +172,15 @@ check:rc==0
 check:output=~Usage: mkdocker
 end
 start:mkdocker_command
-description:create docker instance image should be ubuntu and command should be bash here 
+description:create docker instance image should be ubuntu and command should be bash here
 cmd:chdef $$DOCKERCN  dockerhost=$$DOCKERHOST:2375 dockercpus=1 ip=$$DOCKERCONIP dockermemory=4096 groups=docker,all mgt=docker
 check:rc==0
 cmd:makehosts $$DOCKERCN
-check:rc==0 
+check:rc==0
 cmd:mkdocker  $$DOCKERCN image=$$DOCKERIMAGE command=$$DOCKERCOMMAND dockerflag="{\"AttachStdin\":true,\"AttachStdout\":true,\"AttachStderr\":true,\"OpenStdin\":true,\"Tty\":true}"
 check:rc==0
 check:output=~$$DOCKERCN: success
-cmd:lsdocker $$DOCKERCN 
+cmd:lsdocker $$DOCKERCN
 check:rc==0
 check:output=~$$DOCKERIMAGE
 check:output=~$$DOCKERCOMMAND
@@ -204,12 +204,12 @@ check:rc==0
 end
 start:rmdocker_h
 description:output usage for rmdocker
-cmd:rmdocker -h 
+cmd:rmdocker -h
 check:rc==0
 check:output=~Usage: rmdocker <noderage>
 end
 start:rmdocker_command
-description:remove docker instance 
+description:remove docker instance
 cmd:chdef $$DOCKERCN  dockerhost=$$DOCKERHOST:2375 dockercpus=1 ip=$$DOCKERCONIP dockermemory=4096 groups=docker,all mgt=docker
 check:rc==0
 cmd:makehosts $$DOCKERCN
@@ -230,7 +230,7 @@ cmd:rmdef $$DOCKERCN
 check:rc==0
 end
 start:rmdocker_f_command
-description:force to remove docker instance 
+description:force to remove docker instance
 cmd:chdef $$DOCKERCN  dockerhost=$$DOCKERHOST:2375 dockercpus=1 ip=$$DOCKERCONIP dockermemory=4096 groups=docker,all mgt=docker
 check:rc==0
 cmd:makehosts $$DOCKERCN
diff --git a/xCAT-test/autotest/testcase/genesis/cases0 b/xCAT-test/autotest/testcase/genesis/cases0
index 545b552b1..92796a276 100644
--- a/xCAT-test/autotest/testcase/genesis/cases0
+++ b/xCAT-test/autotest/testcase/genesis/cases0
@@ -2,7 +2,7 @@ start:nodeset_shell
 description: verify could log in genesis shell
 cmd:perl /opt/xcat/share/xcat/tools/autotest/testcase/genesis/genesistest.pl  -n $$CN  -g
 check:rc==0
-cmd:perl /opt/xcat/share/xcat/tools/autotest/testcase/genesis/genesistest.pl  -n $$CN -s 
+cmd:perl /opt/xcat/share/xcat/tools/autotest/testcase/genesis/genesistest.pl  -n $$CN -s
 check:rc==0
 cmd:perl /opt/xcat/share/xcat/tools/autotest/testcase/genesis/genesistest.pl  -n $$CN -c
 check:rc==0
@@ -15,7 +15,7 @@ cmd:perl /opt/xcat/share/xcat/tools/autotest/testcase/genesis/genesistest.pl  -n
 check:rc==0
 cmd:perl /opt/xcat/share/xcat/tools/autotest/testcase/genesis/genesistest.pl -n $$CN -d
 check:rc==0
-cmd:perl /opt/xcat/share/xcat/tools/autotest/testcase/genesis/genesistest.pl  -n $$CN -c 
+cmd:perl /opt/xcat/share/xcat/tools/autotest/testcase/genesis/genesistest.pl  -n $$CN -c
 check:rc==0
 cmd:cat /tmp/genesistestlog/*
 end
@@ -24,7 +24,7 @@ start:nodeset_runimg
 description:verify runimg could work
 cmd:perl /opt/xcat/share/xcat/tools/autotest/testcase/genesis/genesistest.pl  -n $$CN  -g
 check:rc==0
-cmd:perl /opt/xcat/share/xcat/tools/autotest/testcase/genesis/genesistest.pl -n $$CN -i 
+cmd:perl /opt/xcat/share/xcat/tools/autotest/testcase/genesis/genesistest.pl -n $$CN -i
 check:rc==0
 cmd:perl /opt/xcat/share/xcat/tools/autotest/testcase/genesis/genesistest.pl -n $$CN -c
 check:rc==0
diff --git a/xCAT-test/autotest/testcase/genesis/genesistest.pl b/xCAT-test/autotest/testcase/genesis/genesistest.pl
index 5d24812a0..8f4b9405f 100755
--- a/xCAT-test/autotest/testcase/genesis/genesistest.pl
+++ b/xCAT-test/autotest/testcase/genesis/genesistest.pl
@@ -21,9 +21,9 @@ my $help = 0;
 my $nodestanza;
 $::USAGE = "Usage:
     $program_name -h
-    $program_name -n <node_range> -s 
-    $program_name -n <node_range> -d 
-    $program_name -n <node_range> -i 
+    $program_name -n <node_range> -s
+    $program_name -n <node_range> -d
+    $program_name -n <node_range> -i
     $program_name -n <node_range> -c
     $program_name -n <node_range> -g
 Description:
@@ -33,9 +33,9 @@ Options:
     -n : The range of node
     -i : Run genesis runimage
     -d : Run genesis runcmd
-    -s : Run genesis nodeshell mode 
+    -s : Run genesis nodeshell mode
     -c : Clear genesis test environment
-    -g : Check genesis file 
+    -g : Check genesis file
 ";
 ##################################
 # main process
@@ -79,12 +79,12 @@ if ($check_genesis_file) {
 my $master=`lsdef -t site -i master -c  2>&1 | awk -F'=' '{print \$2}'`;
 if (!$master) { $master=hostname(); }
 chomp($master);
-print "master is $master\n"; 
+print "master is $master\n";
 $nodestanza="/tmp/$noderange.stanza";
 if (!(-e $nodestanza)) {
     `lsdef $noderange -z > $nodestanza`;
     `chdef $noderange xcatmaster= `;
-} 
+}
 ####################################
 ####nodesetshell test for genesis
 ####################################
@@ -313,12 +313,12 @@ sub clearenv {
     }
     if (-e "$nodestanza") {
     `cat $nodestanza | chdef -z`;
-    unlink("$nodestanza"); 
-    } 
+    unlink("$nodestanza");
+    }
     return 0;
 }
 ####################################
-#get os 
+#get os
 ###################################
 sub get_os {
     my $os     = "unknown";
@@ -344,8 +344,8 @@ sub get_arch {
      } elsif (($arch =~ /x86/i)&&($os =~ /ubuntu/i)) {
          if ($check_genesis_file) {
              $arch = "amd64";
-         } 
-     } 
+         }
+     }
     return $arch;
 }
 #######################################
diff --git a/xCAT-test/autotest/testcase/genesis/test.sh b/xCAT-test/autotest/testcase/genesis/test.sh
index d0332ca7e..2509ed9de 100755
--- a/xCAT-test/autotest/testcase/genesis/test.sh
+++ b/xCAT-test/autotest/testcase/genesis/test.sh
@@ -25,7 +25,7 @@ net2ip="";
         cat "$SHELLFOLDER"testnode |grep "xcatd=60.3.3.3:3001 destiny=shell";
             if [[ $? -eq 0 ]] ;then
                 return 0;
-            else 
+            else
                 echo wrong;
                 return 1;
             fi
@@ -34,24 +34,24 @@ net2ip="";
 function clear_env(){
 makehosts -d testnode
 rmdef testnode
-    if [[ $? -eq 0 ]];then 
+    if [[ $? -eq 0 ]];then
        return 0;
-    else 
+    else
        return 1;
     fi
 }
 NETBOOT=""
 SHELLFOLDER=""
 while [ "$#" -gt "0" ]
-do 
-        case $1 in 
+do
+        case $1 in
                 "--check" )
                 NETBOOT=$2;
                     if [[ $NETBOOT =~ petitboot ]];then
                         SHELLFOLDER="/tftpboot/petitboot/";
                     elif [[ $NETBOOT =~  xnba ]];then
                         SHELLFOLDER="/tftpboot/xcat/xnba/nodes/"
-                    else 
+                    else
                         SHELLFOLDER="/tftpboot/boot/grub2/";
                     fi
                     check_destiny ;
@@ -62,7 +62,7 @@ do
                         fi
                 ;;
                 "-c"|"--clear" )
-                clear_env; 
+                clear_env;
                     if [[ $? -eq 1 ]];then
                         exit 1
                     else
diff --git a/xCAT-test/autotest/testcase/get_install_disk/fresh_install_disk b/xCAT-test/autotest/testcase/get_install_disk/fresh_install_disk
index 8ca69dbcb..628424a0a 100644
--- a/xCAT-test/autotest/testcase/get_install_disk/fresh_install_disk
+++ b/xCAT-test/autotest/testcase/get_install_disk/fresh_install_disk
@@ -6,19 +6,19 @@ cmd:xdsh $$CN "dd if=/dev/zero of=/dev/sdb bs=1048576 count=100"
 cmd:xdsh $$CN "dd if=/dev/zero of=/dev/sdb bs=1048576 count=300 seek=60858"
 cmd:makedns -n
 check:rc==0
-cmd:makeconservercf 
+cmd:makeconservercf
 check:rc==0
 cmd:cat /etc/conserver.cf | grep $$CN
 check:output=~$$CN
 cmd:sleep 20
-cmd:if [ "__GETNODEATTR($$CN,arch)__" = "ppc64" -a  "__GETNODEATTR($$CN,mgt)__" != "ipmi" ]; then getmacs -D $$CN; fi 
+cmd:if [ "__GETNODEATTR($$CN,arch)__" = "ppc64" -a  "__GETNODEATTR($$CN,mgt)__" != "ipmi" ]; then getmacs -D $$CN; fi
 check:rc==0
 cmd:makedhcp -n
 check:rc==0
 cmd:makedhcp -a
 check:rc==0
 cmd:sleep 10
-cmd:if cat /etc/*release |grep SUSE >/dev/null;then cat /var/lib/dhcp/db/dhcpd.leases|grep $$CN;elif cat /etc/*release |grep "Red Hat" >/dev/null;then cat /var/lib/dhcpd/dhcpd.leases|grep $$CN;fi     
+cmd:if cat /etc/*release |grep SUSE >/dev/null;then cat /var/lib/dhcp/db/dhcpd.leases|grep $$CN;elif cat /etc/*release |grep "Red Hat" >/dev/null;then cat /var/lib/dhcpd/dhcpd.leases|grep $$CN;fi
 check:output=~$$CN
 
 cmd:if cat /etc/*release |grep "7.2" |grep "Red Hat">/dev/null;then mkdef $$STATELITE -u profile=compute provmethod=statelite osvers=rhels7.2;else mkdef $$STATELITE -u profile=compute provmethod=statelite; fi
@@ -55,7 +55,7 @@ check:output=~0x500a0751036d9e61
 check:output=~0x500a0751036d9e83
 check:output=~0x500a0751036d9e7a
 check:output=~0x500a0751036d9c24
-cmd:cat /tmp/__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__fr_$$NO | grep "into wwn secondchoicedisks" 
+cmd:cat /tmp/__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__fr_$$NO | grep "into wwn secondchoicedisks"
 check:output=~sda 0x500a0751036d9e61
 check:output=~sdb 0x500a0751036d9c24
 check:output=~sdc 0x500a0751036d9e7a
diff --git a/xCAT-test/autotest/testcase/get_install_disk/reinstall_disk b/xCAT-test/autotest/testcase/get_install_disk/reinstall_disk
index 27a4b1ffa..2a366e880 100644
--- a/xCAT-test/autotest/testcase/get_install_disk/reinstall_disk
+++ b/xCAT-test/autotest/testcase/get_install_disk/reinstall_disk
@@ -6,19 +6,19 @@ cmd:xdsh $$CN "dd if=/dev/zero of=/dev/sdb bs=1048576 count=100"
 cmd:xdsh $$CN "dd if=/dev/zero of=/dev/sdb bs=1048576 count=300 seek=60858"
 cmd:makedns -n
 check:rc==0
-cmd:makeconservercf 
+cmd:makeconservercf
 check:rc==0
 cmd:cat /etc/conserver.cf | grep $$CN
 check:output=~$$CN
 cmd:sleep 20
-cmd:if [ "__GETNODEATTR($$CN,arch)__" = "ppc64" -a  "__GETNODEATTR($$CN,mgt)__" != "ipmi" ]; then getmacs -D $$CN; fi 
+cmd:if [ "__GETNODEATTR($$CN,arch)__" = "ppc64" -a  "__GETNODEATTR($$CN,mgt)__" != "ipmi" ]; then getmacs -D $$CN; fi
 check:rc==0
 cmd:makedhcp -n
 check:rc==0
 cmd:makedhcp -a
 check:rc==0
 cmd:sleep 10
-cmd:if cat /etc/*release |grep SUSE >/dev/null;then cat /var/lib/dhcp/db/dhcpd.leases|grep $$CN;elif cat /etc/*release |grep "Red Hat" >/dev/null;then cat /var/lib/dhcpd/dhcpd.leases|grep $$CN;fi     
+cmd:if cat /etc/*release |grep SUSE >/dev/null;then cat /var/lib/dhcp/db/dhcpd.leases|grep $$CN;elif cat /etc/*release |grep "Red Hat" >/dev/null;then cat /var/lib/dhcpd/dhcpd.leases|grep $$CN;fi
 check:output=~$$CN
 
 cmd:if cat /etc/*release |grep "7.2" |grep "Red Hat">/dev/null;then mkdef $$STATELITE -u profile=compute provmethod=statelite osvers=rhels7.2;else mkdef $$STATELITE -u profile=compute provmethod=statelite; fi
@@ -71,7 +71,7 @@ cmd:cat /tmp/__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__fr_$$NO | grep "
 check:output=~The disk sdb information
 cmd:cat /tmp/__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__fr_$$NO | grep "disk_wwn="
 check:output=~0x500a0751036d9c24
-cmd:cat /tmp/__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__fr_$$NO | grep "into wwn" 
+cmd:cat /tmp/__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__fr_$$NO | grep "into wwn"
 check:output=~sdb 0x500a0751036d9c24 into wwn
 cmd:cat /tmp/__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__fr_$$NO | grep "by sorting wwn and DRIVER"
 check:output=~sdb
diff --git a/xCAT-test/autotest/testcase/go-xcat/case0 b/xCAT-test/autotest/testcase/go-xcat/case0
index 2f575d4aa..dbcdf0a47 100644
--- a/xCAT-test/autotest/testcase/go-xcat/case0
+++ b/xCAT-test/autotest/testcase/go-xcat/case0
@@ -1,5 +1,5 @@
 start:go_xcat_local_repo_case1
-description:test go_xcat with the option --xcat-core=/path/to/xcat-core.repo install 
+description:test go_xcat with the option --xcat-core=/path/to/xcat-core.repo install
 os:Linux
 cmd:if xdsh $$CN "zypper -h"; then  xdsh $$CN "zypper remove -y *xCAT*"; elif xdsh $$CN "yum -h";then xdsh $$CN  "yum remove -y *xCAT*"; elif xdsh $$CN "apt-get -h";then xdsh $$CN "apt-get purge perl-xcat xcat-client xcat-server xcat -y"; else echo "Sorry,this is not supported os"; fi
 cmd:if grep Ubuntu /etc/*release;then xdsh $$CN "dpkg -l |grep -i perl-xcat";else xdsh $$CN "rpm -qa |grep -i perl-xcat";fi
@@ -153,7 +153,7 @@ cmd:xdsh $$CN "cd /; rm -rf /xcat-core* /xcat-dep* /go-xcat"
 end
 
 start:go_xcat_local_repo_case5
-description:test go_xcat with the option --xcat-core=/path/to/xcat-core.repo --xcat-dep=/path/to/xcat-dep.repo install 
+description:test go_xcat with the option --xcat-core=/path/to/xcat-core.repo --xcat-dep=/path/to/xcat-dep.repo install
 os:Linux
 cmd:if xdsh $$CN "zypper -h"; then  xdsh $$CN "zypper remove -y *xCAT*"; elif xdsh $$CN "yum -h";then xdsh $$CN  "yum remove -y *xCAT*"; elif xdsh $$CN "apt-get -h";then xdsh $$CN "apt-get purge perl-xcat xcat-client xcat-server xcat -y"; else echo "Sorry,this is not supported os"; fi
 cmd:if grep Ubuntu /etc/*release;then xdsh $$CN "dpkg -l |grep -i perl-xcat";else xdsh $$CN "rpm -qa |grep -i perl-xcat";fi
@@ -199,7 +199,7 @@ cmd:xdsh $$CN "cd /; rm -rf /xcat-core* /xcat-dep* /go-xcat"
 end
 
 start:go_xcat_local_repo_case6
-description:test go_xcat with the option --xcat-core=/path/to/xcat-core --xcat-dep=/path/to/xcat-dep install 
+description:test go_xcat with the option --xcat-core=/path/to/xcat-core --xcat-dep=/path/to/xcat-dep install
 os:Linux
 cmd:if xdsh $$CN "zypper -h"; then  xdsh $$CN "zypper remove -y *xCAT*"; elif xdsh $$CN "yum -h";then xdsh $$CN  "yum remove -y *xCAT*"; elif xdsh $$CN "apt-get -h";then xdsh $$CN "apt-get purge perl-xcat xcat-client xcat-server xcat -y"; else echo "Sorry,this is not supported os"; fi
 cmd:if grep Ubuntu /etc/*release;then xdsh $$CN "dpkg -l |grep -i perl-xcat";else xdsh $$CN "rpm -qa |grep -i perl-xcat";fi
@@ -241,7 +241,7 @@ cmd:xdsh $$CN "cd /; rm -rf /xcat-core* /xcat-dep*"
 end
 
 start:go_xcat_local_repo_case7
-description:test go_xcat with the option --xcat-core=/path/to/xcat-core.tar.bz2  --xcat-dep=/path/to/xcat-dep.tar.bz2 install 
+description:test go_xcat with the option --xcat-core=/path/to/xcat-core.tar.bz2  --xcat-dep=/path/to/xcat-dep.tar.bz2 install
 os:Linux
 cmd:if xdsh $$CN "zypper -h"; then  xdsh $$CN "zypper remove -y *xCAT*"; elif xdsh $$CN "yum -h";then xdsh $$CN  "yum remove -y *xCAT*"; elif xdsh $$CN "apt-get -h";then xdsh $$CN "apt-get purge perl-xcat xcat-client xcat-server xcat xcat-buildkit xcat-genesis-scripts  xcat-genesis-base-amd64 xcat-genesis-base-ppc64 -y"; else echo "Sorry,this is not supported os"; fi
 cmd:if grep Ubuntu /etc/*release;then xdsh $$CN "dpkg -l |grep -i perl-xcat";else xdsh $$CN "rpm -qa |grep -i perl-xcat";fi
diff --git a/xCAT-test/autotest/testcase/go-xcat/case1 b/xCAT-test/autotest/testcase/go-xcat/case1
index ee34b3ceb..1cfec3af9 100644
--- a/xCAT-test/autotest/testcase/go-xcat/case1
+++ b/xCAT-test/autotest/testcase/go-xcat/case1
@@ -1,11 +1,12 @@
 start:go_xcat_noinput
-description:test go_xcat without any input parameters 
+description:test go_xcat without any input parameters
 os:Linux
 cmd:if xdsh $$CN "zypper -h"; then  xdsh $$CN "zypper remove -y *xCAT*"; elif xdsh $$CN "yum -h";then xdsh $$CN  "yum remove -y *xCAT*"; elif xdsh $$CN "apt-get -h";then xdsh $$CN "apt-get purge perl-xcat xcat-client xcat-server xcat xcat-buildkit xcat-genesis-scripts  xcat-genesis-base-amd64 xcat-genesis-base-ppc64 -y"; else echo "Sorry,this is not supported os"; fi
 cmd:if grep Ubuntu /etc/*release;then xdsh $$CN "dpkg -l |grep -i perl-xcat";else xdsh $$CN "rpm -qa |grep -i perl-xcat";fi
 check:rc!=0
 cmd:if xdsh $$CN "grep \"Red Hat\" /etc/*release >/dev/null"; then xdsh $$CN "yum install -y yum-utils bzip2"; fi
 check:rc==0
+cmd:if grep Ubuntu /etc/*release;then xdsh $$CN "apt-get install -y gpg"; fi
 cmd:xdsh $$CN "cd /; rm -rf /go-xcat"
 check:rc==0
 cmd:xdsh $$CN "cd /; scp -r $$MN:/opt/xcat/share/xcat/tools/go-xcat ./"
@@ -33,7 +34,7 @@ cmd:xdsh $$CN "cd /; rm -rf /go-xcat"
 end
 
 start:go_xcat_with_x
-description:test go_xcat with the option -x version -y install 
+description:test go_xcat with the option -x version -y install
 os:Linux
 cmd:if xdsh $$CN "zypper -h"; then  xdsh $$CN "zypper remove -y *xCAT*"; elif xdsh $$CN "yum -h";then xdsh $$CN  "yum remove -y *xCAT*"; elif xdsh $$CN "apt-get -h";then xdsh $$CN "apt-get purge perl-xcat xcat-client xcat-server xcat xcat-buildkit xcat-genesis-scripts  xcat-genesis-base-amd64 xcat-genesis-base-ppc64 -y"; else echo "Sorry,this is not supported os"; fi
 cmd:if grep Ubuntu /etc/*release;then xdsh $$CN "dpkg -l |grep -i perl-xcat";else xdsh $$CN "rpm -qa |grep -i perl-xcat";fi
@@ -74,7 +75,7 @@ cmd:rm -rf /buildinfo
 end
 
 start:go_xcat_with_xcat-version-1
-description:test go_xcat with the option --xcat-version=devel install 
+description:test go_xcat with the option --xcat-version=devel install
 os:Linux
 cmd:if xdsh $$CN "zypper -h"; then  xdsh $$CN "zypper remove -y *xCAT*"; elif xdsh $$CN "yum -h";then xdsh $$CN  "yum remove -y *xCAT*"; elif xdsh $$CN "apt-get -h";then xdsh $$CN "apt-get purge perl-xcat xcat-client xcat-server xcat xcat-buildkit xcat-genesis-scripts  xcat-genesis-base-amd64 xcat-genesis-base-ppc64 -y"; else echo "Sorry,this is not supported os"; fi
 cmd:if grep Ubuntu /etc/*release;then xdsh $$CN "dpkg -l |grep -i perl-xcat";else xdsh $$CN "rpm -qa |grep -i perl-xcat";fi
diff --git a/xCAT-test/autotest/testcase/go-xcat/case2 b/xCAT-test/autotest/testcase/go-xcat/case2
index 1017d054c..ef1812a6f 100644
--- a/xCAT-test/autotest/testcase/go-xcat/case2
+++ b/xCAT-test/autotest/testcase/go-xcat/case2
@@ -1,5 +1,5 @@
 start:go_xcat_online_repo_case1
-description:test go_xcat with the option --xcat-core=http://xcat.org/path/to/xcat-core.repo install. This case is only for rh and suse 
+description:test go_xcat with the option --xcat-core=http://xcat.org/path/to/xcat-core.repo install. This case is only for rh and suse
 os:Linux
 cmd:if xdsh $$CN "zypper -h"; then  xdsh $$CN "zypper remove -y *xCAT*"; elif xdsh $$CN "yum -h";then xdsh $$CN  "yum remove -y *xCAT*"; elif xdsh $$CN "apt-get -h";then xdsh $$CN "apt-get purge perl-xcat xcat-client xcat-server xcat -y"; else echo "Sorry,this is not supported os"; fi
 cmd:if grep Ubuntu /etc/*release;then xdsh $$CN "dpkg -l |grep -i perl-xcat";else xdsh $$CN "rpm -qa |grep -i perl-xcat";fi
diff --git a/xCAT-test/autotest/testcase/go-xcat/case4 b/xCAT-test/autotest/testcase/go-xcat/case4
index 54e0dce6e..79137ac6f 100644
--- a/xCAT-test/autotest/testcase/go-xcat/case4
+++ b/xCAT-test/autotest/testcase/go-xcat/case4
@@ -1,5 +1,5 @@
 start:go_xcat_update_case1
-description:test go_xcat with the option update 
+description:test go_xcat with the option update
 os:Linux
 cmd:if xdsh $$CN "zypper -h"; then  xdsh $$CN "zypper remove -y *xCAT*"; elif xdsh $$CN "yum -h";then xdsh $$CN  "yum remove -y *xCAT*"; elif xdsh $$CN "apt-get -h";then xdsh $$CN "apt-get purge perl-xcat xcat-client xcat-server xcat -y"; else echo "Sorry,this is not supported os"; fi
 cmd:if grep Ubuntu /etc/*release;then xdsh $$CN "dpkg -l |grep -i perl-xcat";else xdsh $$CN "rpm -qa |grep -i perl-xcat";fi
diff --git a/xCAT-test/autotest/testcase/imgexport/cases0 b/xCAT-test/autotest/testcase/imgexport/cases0
index 7f2264d6b..b707553d5 100644
--- a/xCAT-test/autotest/testcase/imgexport/cases0
+++ b/xCAT-test/autotest/testcase/imgexport/cases0
@@ -8,7 +8,7 @@ cmd:genimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-statelite-compu
 check:rc==0
 cmd:ls -l /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg
 check:rc==0
-cmd:packimage -o __GETNODEATTR($$CN,os)__ -p compute -a __GETNODEATTR($$CN,arch)__ 
+cmd:packimage -o __GETNODEATTR($$CN,os)__ -p compute -a __GETNODEATTR($$CN,arch)__
 check:rc==0
 cmd:ls -l /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.gz
 check:rc==0
diff --git a/xCAT-test/autotest/testcase/imgimport/cases0 b/xCAT-test/autotest/testcase/imgimport/cases0
index 93a982949..af145b820 100644
--- a/xCAT-test/autotest/testcase/imgimport/cases0
+++ b/xCAT-test/autotest/testcase/imgimport/cases0
@@ -54,7 +54,7 @@ cmd:packimage -o __GETNODEATTR($$CN,os)__ -p compute -a __GETNODEATTR($$CN,arch)
 check:rc==0
 cmd:ls -l /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.gz
 check:rc==0
-cmd:imgexport __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-statelite-compute foo.tgz 
+cmd:imgexport __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-statelite-compute foo.tgz
 check:rc==0
 check:output=~Done!
 cmd:ls foo.tgz
@@ -83,7 +83,7 @@ check:rc==0
 check:output=~Done!
 cmd:ls foo.tgz
 check:rc==0
-cmd:imgimport foo.tgz -f compute_test 
+cmd:imgimport foo.tgz -f compute_test
 check:rc==0
 check:output=~Successfully imported the image.
 cmd:ls /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute_test
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 393f41f75..b0c646118 100755
--- a/xCAT-test/autotest/testcase/infiniband/rhel-infiniband-diskless-install.sh
+++ b/xCAT-test/autotest/testcase/infiniband/rhel-infiniband-diskless-install.sh
@@ -141,7 +141,7 @@ mkdir -p /install/custom/netboot/rh
 cp /opt/xcat/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install.v2 \
 	/install/postscripts/mlnxofed_ib_install.v2
 (
-	cat "/opt/xcat/share/xcat/netboot/rh/compute.${LINUX_DISTRO%%.*}.${LINUX_ARCH}.postinstall" 
+	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
diff --git a/xCAT-test/autotest/testcase/installation/SN_diskless_setup_case b/xCAT-test/autotest/testcase/installation/SN_diskless_setup_case
index 574ab5307..ee1517af5 100644
--- a/xCAT-test/autotest/testcase/installation/SN_diskless_setup_case
+++ b/xCAT-test/autotest/testcase/installation/SN_diskless_setup_case
@@ -58,7 +58,7 @@ cmd:if [[ "__GETNODEATTR($$SN,os)__" =~ "rh" ]]; then path="rh";elif [[ "__GETNO
 check:rc==0
 
 
-cmd:path="/install/netboot/__GETNODEATTR($$SN,os)__/__GETNODEATTR($$SN,arch)__/service"; if [ -d "$path" ]; then mv $path $path."org"; fi; mkdir -p $path 
+cmd:path="/install/netboot/__GETNODEATTR($$SN,os)__/__GETNODEATTR($$SN,arch)__/service"; if [ -d "$path" ]; then mv $path $path."org"; fi; mkdir -p $path
 check:rc==0
 cmd:chdef -t osimage __GETNODEATTR($$SN,os)__-__GETNODEATTR($$SN,arch)__-netboot-service rootimgdir=/install/netboot/__GETNODEATTR($$SN,os)__/__GETNODEATTR($$SN,arch)__/service
 check:rc==0
@@ -73,7 +73,7 @@ check:rc==0
 cmd:if [ ! -d /tmp/mountoutput ]; then mkdir -p /tmp/mountoutput; fi
 cmd:mount |sort > /tmp/mountoutput/file.org
 
-cmd:genimage __GETNODEATTR($$SN,os)__-__GETNODEATTR($$SN,arch)__-netboot-service 
+cmd:genimage __GETNODEATTR($$SN,os)__-__GETNODEATTR($$SN,arch)__-netboot-service
 check:rc==0
 
 cmd:mount |sort > /tmp/mountoutput/file.new
@@ -81,7 +81,7 @@ cmd:diff -y /tmp/mountoutput/file.org /tmp/mountoutput/file.new
 check:rc==0
 cmd:rm -rf /tmp/mountoutput
 
-cmd:packimage __GETNODEATTR($$SN,os)__-__GETNODEATTR($$SN,arch)__-netboot-service 
+cmd:packimage __GETNODEATTR($$SN,os)__-__GETNODEATTR($$SN,arch)__-netboot-service
 check:rc==0
 
 cmd:rinstall $$SN osimage=__GETNODEATTR($$SN,os)__-__GETNODEATTR($$SN,arch)__-netboot-service
diff --git a/xCAT-test/autotest/testcase/installation/SN_setup_case b/xCAT-test/autotest/testcase/installation/SN_setup_case
index 4b3e5f1ee..566600ba9 100644
--- a/xCAT-test/autotest/testcase/installation/SN_setup_case
+++ b/xCAT-test/autotest/testcase/installation/SN_setup_case
@@ -12,7 +12,7 @@ check:rc==0
 
 cmd:makedns -n
 check:rc==0
-cmd:makeconservercf $$SN 
+cmd:makeconservercf $$SN
 check:rc==0
 cmd:cat /etc/conserver.cf | grep $$SN
 check:output=~$$SN
@@ -23,7 +23,7 @@ cmd:makedhcp -n
 check:rc==0
 cmd:makedhcp -a
 check:rc==0
-cmd:if cat /etc/*release |grep SUSE >/dev/null;then cat /var/lib/dhcp/db/dhcpd.leases|grep $$SN;elif cat /etc/*release |grep "Red Hat" >/dev/null;then cat /var/lib/dhcpd/dhcpd.leases|grep $$SN;fi 
+cmd:if cat /etc/*release |grep SUSE >/dev/null;then cat /var/lib/dhcp/db/dhcpd.leases|grep $$SN;elif cat /etc/*release |grep "Red Hat" >/dev/null;then cat /var/lib/dhcpd/dhcpd.leases|grep $$SN;fi
 check:output=~$$SN
 cmd:chdef -t node $$SN groups=service,all
 check:rc==0
@@ -42,7 +42,7 @@ check:rc==0
 cmd:chdef -t site clustersite installloc="/install"
 check:rc==0
 
-cmd:cd /install/post/otherpkgs/__GETNODEATTR($$SN,os)__/__GETNODEATTR($$SN,arch)__/xcat/xcat-core && createrepo .  
+cmd:cd /install/post/otherpkgs/__GETNODEATTR($$SN,os)__/__GETNODEATTR($$SN,arch)__/xcat/xcat-core && createrepo .
 check:rc==0
 
 cmd:if [[ "__GETNODEATTR($$SN,os)__" =~ "rh" ]]; then path="rh";elif [[ "__GETNODEATTR($$SN,os)__" =~ "sles" ]];then path="sles";fi; ver="__GETNODEATTR($$SN,os)__"; tmp=${ver%.*};ver=`echo "$tmp"|sed 's:[a-zA-Z]::g'`;cd /install/post/otherpkgs/__GETNODEATTR($$SN,os)__/__GETNODEATTR($$SN,arch)__/xcat/xcat-dep/$path$ver/__GETNODEATTR($$SN,arch)__ && createrepo .;
@@ -84,7 +84,7 @@ check:rc==0
 check:output=~$$SN: $$SN
 cmd:xdsh $$SN "tabdump site"
 check:rc==0
-check:output=~tftpdir 
+check:output=~tftpdir
 cmd:xdsh $$SN "mount"
 check:rc==0
 check:output=~/install on /install
diff --git a/xCAT-test/autotest/testcase/installation/customize_sleep_for_sn b/xCAT-test/autotest/testcase/installation/customize_sleep_for_sn
index 75be09f11..9ad77f007 100755
--- a/xCAT-test/autotest/testcase/installation/customize_sleep_for_sn
+++ b/xCAT-test/autotest/testcase/installation/customize_sleep_for_sn
@@ -31,5 +31,5 @@ while ($timecnt < 120) {
     $timecnt++;
 }
 
-print ">>>Leave $program_name\n"; 
+print ">>>Leave $program_name\n";
 exit 0;
diff --git a/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_flat b/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_flat
index 0df3cf3dd..ee6747707 100644
--- a/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_flat
+++ b/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_flat
@@ -12,12 +12,12 @@ cmd:chdef -t node -o $$CN servicenode= monserver=$$MN nfsserver=$$MN tftpserver=
 check:rc==0
 cmd:makedns -n
 check:rc==0
-cmd:makeconservercf 
+cmd:makeconservercf
 check:rc==0
 cmd:cat /etc/conserver.cf | grep $$CN
 check:output=~$$CN
 cmd:sleep 20
-cmd:if [[ "__GETNODEATTR($$CN,arch)__" = "ppc64" ]] && [[ "__GETNODEATTR($$CN,mgt)__" != "ipmi" ]]; then getmacs -D $$CN; fi 
+cmd:if [[ "__GETNODEATTR($$CN,arch)__" = "ppc64" ]] && [[ "__GETNODEATTR($$CN,mgt)__" != "ipmi" ]]; then getmacs -D $$CN; fi
 check:rc==0
 cmd:chtab key=extntpservers site.value=""
 check:rc==0
@@ -32,7 +32,7 @@ check:rc==0
 cmd:sleep 10
 cmd:a=0;while true; do [ $a -eq 100 ] && exit 1;output=$(makedhcp -q $$CN);[ $? -ne 0 ] && exit 1;echo $output|grep $$CN 2>/dev/null && exit 0;a=$[$a+1];sleep 1;done
 check:rc==0
-cmd:copycds $$ISO 
+cmd:copycds $$ISO
 check:rc==0
 cmd:if [[ -f /test.synclist ]] ;then mv -f /test.synclist /test.synclist.bak;fi;
 cmd:echo "/test.synclist -> /test.synclist" > /test.synclist;chdef -t osimage -o __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute synclists=/test.synclist
diff --git a/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_flat_postscripts_failed b/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_flat_postscripts_failed
index 5d6d45f87..d61220f77 100644
--- a/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_flat_postscripts_failed
+++ b/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_flat_postscripts_failed
@@ -11,12 +11,12 @@ cmd:chdef -t node -o $$CN servicenode= monserver=$$MN nfsserver=$$MN tftpserver=
 check:rc==0
 cmd:makedns -n
 check:rc==0
-cmd:makeconservercf 
+cmd:makeconservercf
 check:rc==0
 cmd:cat /etc/conserver.cf | grep $$CN
 check:output=~$$CN
 cmd:sleep 20
-cmd:if [[ "__GETNODEATTR($$CN,arch)__" = "ppc64" ]] && [[ "__GETNODEATTR($$CN,mgt)__" != "ipmi" ]]; then getmacs -D $$CN; fi 
+cmd:if [[ "__GETNODEATTR($$CN,arch)__" = "ppc64" ]] && [[ "__GETNODEATTR($$CN,mgt)__" != "ipmi" ]]; then getmacs -D $$CN; fi
 check:rc==0
 cmd:chtab key=extntpservers site.value=""
 check:rc==0
@@ -31,7 +31,7 @@ check:rc==0
 cmd:sleep 10
 cmd:a=0;while true; do [ $a -eq 100 ] && exit 1;output=$(makedhcp -q $$CN);[ $? -ne 0 ] && exit 1;echo $output|grep $$CN 2>/dev/null && exit 0;a=$[$a+1];sleep 1;done
 check:rc==0
-cmd:copycds $$ISO 
+cmd:copycds $$ISO
 check:rc==0
 cmd:/opt/xcat/share/xcat/tools/autotest/testcase/installation/setup_postscript_failed.sh
 check:rc==0
diff --git a/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_hierarchy b/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_hierarchy
index 2dc2af6ac..b055cf563 100644
--- a/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_hierarchy
+++ b/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_hierarchy
@@ -20,7 +20,7 @@ check:rc==0
 
 cmd:makedns -n
 check:rc==0
-cmd:makeconservercf 
+cmd:makeconservercf
 check:rc==0
 cmd:cat /etc/conserver.cf | grep $$CN
 check:output=~$$CN
diff --git a/xCAT-test/autotest/testcase/installation/ubuntu_full_installation_vm_docker b/xCAT-test/autotest/testcase/installation/ubuntu_full_installation_vm_docker
index 590853fe4..e7aabd53b 100644
--- a/xCAT-test/autotest/testcase/installation/ubuntu_full_installation_vm_docker
+++ b/xCAT-test/autotest/testcase/installation/ubuntu_full_installation_vm_docker
@@ -13,12 +13,12 @@ cmd:mkdef -t osimage -o __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-inst
 check:rc==0
 cmd:if [[ "__GETNODEATTR($$CN,os)__" =~ "ubuntu" ]];then  ver=`cat /etc/*-release |grep "VERSION_ID"|  awk -F '"'  '{print $2}'| awk -F"." '{printf "%s%s\n",$1,$2}'` ; chdef -t osimage -o __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-dockerhost  otherpkgdir="https://apt.dockerproject.org/repo ubuntu-trusty main,http://cz.archive.ubuntu.com/ubuntu trusty main" otherpkglist="/install/custom/ubuntu$ver/ubuntu"$ver"_docker.pkglist" osdistroname="__GETNODEATTR($$CN,os)__ ";fi
 check:rc==0
-cmd:if [[ "__GETNODEATTR($$CN,os)__" =~ "ubuntu" ]];then ver=`cat /etc/*-release |grep "VERSION_ID"|  awk -F '"'  '{print $2}'| awk -F"." '{printf "%s%s\n",$1,$2}'` ; mkdir -p /install/custom/ubuntu$ver/ ;  chdef -t osimage -o __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-dockerhost otherpkglist="/install/custom/ubuntu$ver/ubuntu"$ver"_docker.pkglist"  pkglist="/install/custom/ubuntu$ver/ubuntu$ver.pkglist";fi 
+cmd:if [[ "__GETNODEATTR($$CN,os)__" =~ "ubuntu" ]];then ver=`cat /etc/*-release |grep "VERSION_ID"|  awk -F '"'  '{print $2}'| awk -F"." '{printf "%s%s\n",$1,$2}'` ; mkdir -p /install/custom/ubuntu$ver/ ;  chdef -t osimage -o __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-dockerhost otherpkglist="/install/custom/ubuntu$ver/ubuntu"$ver"_docker.pkglist"  pkglist="/install/custom/ubuntu$ver/ubuntu$ver.pkglist";fi
 check:rc==0
 cmd:if [[ "__GETNODEATTR($$CN,os)__" =~ "ubuntu" ]];then ver=`cat /etc/*-release |grep "VERSION_ID"|  awk -F '"'  '{print $2}'| awk -F"." '{printf "%s%s\n",$1,$2}'` ;for i in openssh-server ntp gawk nfs-common snmpd bridge-utils; do  cat /install/custom/ubuntu$ver/ubuntu$ver.pkglist|grep "$i$";if [ $? -ne 0 ] ; then echo "$i" >> /install/custom/ubuntu$ver/ubuntu$ver.pkglist; fi done;fi
 check:rc==0
 cmd:if [[ "__GETNODEATTR($$CN,os)__" =~ "ubuntu14.04" ]];then ver=`cat /etc/*-release |grep "VERSION_ID"|  awk -F '"'  '{print $2}'| awk -F"." '{printf "%s%s\n",$1,$2}'`; for i in docker-engine;do cat /install/custom/ubuntu$ver/ubuntu"$ver"\_docker.pkglist |grep "$i$";if [ $? -ne 0 ] ; then echo "$i" >> /install/custom/ubuntu$ver/ubuntu"$ver"\_docker.pkglist;fi done;fi
-check:rc==0 
+check:rc==0
 cmd: chdef $$CN -p postbootscripts="setupdockerhost mynet0=$$MYNET0VALUE@$$DOCKERHOSIP:$$NICNAME"
 check:rc==0
 cmd:rinstall $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-dockerhost
diff --git a/xCAT-test/autotest/testcase/lsdef/cases0 b/xCAT-test/autotest/testcase/lsdef/cases0
index 731065f5f..1daf6ad95 100644
--- a/xCAT-test/autotest/testcase/lsdef/cases0
+++ b/xCAT-test/autotest/testcase/lsdef/cases0
@@ -247,12 +247,12 @@ check:output=~Object name\: switch-template
 check:output=~groups=switch
 check:output=~nodetype=switch
 check:output=~postbootscripts\=otherpkgs
-check:output=~postscripts\=syslog\,remoteshell\,syncfiles 
-check:output=~usercomment\=the switch definition template  
-check:output=~postscripts\=syslog\,remoteshell\,syncfiles 
+check:output=~postscripts\=syslog\,remoteshell\,syncfiles
+check:output=~usercomment\=the switch definition template
+check:output=~postscripts\=syslog\,remoteshell\,syncfiles
 check:output=~ip\=OPTIONAL\:the ip address of the switch
 check:output=~mac\=OPTIONAL\:the MAC address of the switch
-check:output=~switchtype\=OPTIONAL\:The type of switch 
+check:output=~switchtype\=OPTIONAL\:The type of switch
 end
 
 start:lsdef_template_with_invalid_name
@@ -262,4 +262,4 @@ cmd:result=`lsdef | grep  test_with_invalid_name`; if [[ $result =~ "test_with_i
 cmd:lsdef --template "test_with_invalid_name"
 check:rc==1
 check:output=~Error: (\[.*?\]: )?Could not find test_with_invalid_name in xCAT templates.
-end 
+end
diff --git a/xCAT-test/autotest/testcase/lskit/case0 b/xCAT-test/autotest/testcase/lskit/case0
index 2a3a2c87d..ffdb9ae1f 100644
--- a/xCAT-test/autotest/testcase/lskit/case0
+++ b/xCAT-test/autotest/testcase/lskit/case0
@@ -54,7 +54,7 @@ check:rc==0
 cmd:addkit /opt/xcat/share/xcat/tools/autotest/testcase/lskit/mykits/mykits-1.0-1.tar.bz2
 check:rc==0
 check:output=~Kit mykits-1.0-1 was successfully added
-cmd:lskit -K basename mykits-1.0-1 
+cmd:lskit -K basename mykits-1.0-1
 check:rc==0
 check:output=~basename
 cmd:rmkit mykits-1.0-1
diff --git a/xCAT-test/autotest/testcase/lskitdeployparam/case0 b/xCAT-test/autotest/testcase/lskitdeployparam/case0
index 33ff5547e..7a62f5586 100644
--- a/xCAT-test/autotest/testcase/lskitdeployparam/case0
+++ b/xCAT-test/autotest/testcase/lskitdeployparam/case0
@@ -24,9 +24,9 @@ end
 
 start:lskitdeployparam_no_param
 os:Linux
-cmd:lskitdeployparam 
+cmd:lskitdeployparam
 check:rc==1
-check:output=~Error  
+check:output=~Error
 check:output=~ Usage
 end
 
@@ -44,7 +44,7 @@ check:rc==0
 cmd:addkit /opt/xcat/share/xcat/tools/autotest/testcase/lskit/mykits/mykits-1.0-1.tar.bz2
 check:rc==0
 check:output=~Kit mykits-1.0-1 was successfully added
-cmd:lskit -K basename mykits-1.0-1 
+cmd:lskit -K basename mykits-1.0-1
 check:rc==0
 check:output=~basename
 cmd:lskitdeployparam -k mykits-1.0-1
diff --git a/xCAT-test/autotest/testcase/lslite/cases0 b/xCAT-test/autotest/testcase/lslite/cases0
index 5c350922c..2f77574e4 100644
--- a/xCAT-test/autotest/testcase/lslite/cases0
+++ b/xCAT-test/autotest/testcase/lslite/cases0
@@ -1,4 +1,4 @@
-start:lslite_i 
+start:lslite_i
 description:lslite -i
 os:Linux
 cmd:copycds $$ISO
diff --git a/xCAT-test/autotest/testcase/makedhcp/cases0 b/xCAT-test/autotest/testcase/makedhcp/cases0
index c522ef2a3..157ab8982 100644
--- a/xCAT-test/autotest/testcase/makedhcp/cases0
+++ b/xCAT-test/autotest/testcase/makedhcp/cases0
@@ -52,13 +52,13 @@ os:Linux
 label:mn_only,dhcp
 cmd:mkdef -t node -o testnode1 groups=compute mac=11:22:33:55:66:88 arch=ppc64
 cmd:chdef -t node -o testnode1 netboot=yaboot tftpserver=192.16.10.0 nfsserver=192.16.10.0 monserver=192.16.10.0 xcatmaster=192.16.10.0 installnic="mac" primarynic="mac"
-cmd:lsdef -l testnode1 -z > /tmp/CN.stanza
+cmd:lsdef -l testnode1 -z | tee /tmp/CN.stanza
 cmd:chdef -t node -o testnode1 mac=11:22:33:44:55:66
 cmd:if [ -f "/etc/dhcp/dhcpd.conf" ];then mv -f /etc/dhcp/dhcpd.conf /etc/dhcp/dhcpd.conf.bak ; elif [ -f "/etc/dhcpd.conf" ]; then mv -f /etc/dhcpd.conf /etc/dhcpd.conf.bak; fi
 cmd:makedhcp -n
 cmd:makedhcp -a
 check:rc==0
-cmd:if [ -f /var/lib/dhcpd/dhcpd.leases ]; then cat /var/lib/dhcpd/dhcpd.leases; elif [ -f /var/lib/dhcp/db/dhcpd.leases ]; then cat /var/lib/dhcp/db/dhcpd.leases; fi
+cmd:if [ -f /var/lib/dhcpd/dhcpd.leases ]; then cat /var/lib/dhcpd/dhcpd.leases; elif [ -f /var/lib/dhcp/db/dhcpd.leases ]; then cat /var/lib/dhcp/db/dhcpd.leases; elif [ -f "/var/lib/dhcp/dhcpd.leases" ]; then cat /var/lib/dhcp/dhcpd.leases; fi
 check:output=~testnode1
 check:output=~11:22:33:44:55:66
 cmd:cat /tmp/CN.stanza | chdef -z
@@ -66,6 +66,19 @@ cmd:rmdef testnode1
 cmd:if [ -f "/etc/dhcp/dhcpd.conf" ];then mv -f /etc/dhcp/dhcpd.conf /etc/dhcp/dhcpd.conf.bak ; elif [ -f "/etc/dhcpd.conf" ]; then mv -f /etc/dhcpd.conf /etc/dhcpd.conf.bak; fi
 end
 
+start:makedhcp_a_linux_check_invalid_mac
+description:Define all nodes to the DHCP server. If mac format is invalid, makedhcp -a print error and return 1
+os:Linux
+label:mn_only,dhcp
+cmd:lsdef -l $$CN -z > /tmp/$$CN.stanza
+cmd:chdef -t node -o $$CN mac=11:22:33
+cmd:makedhcp $$CN
+check:rc!=0
+check:output!~ ^11:22:33$
+cmd:chdef -t node -o $$CN mac=
+cmd:cat /tmp/$$CN.stanza | chdef -z
+end
+
 start:makedhcp_a_d_linux
 os:Linux
 label:mn_only,dhcp
@@ -74,13 +87,13 @@ cmd:mkdef -t node -o testnode1 groups=compute mac=11:22:33:55:66:88 arch=ppc64
 cmd:mkdef -t node -o testnode2 groups=compute mac=11:22:33:55:66:99 arch=ppc64
 cmd:if [ -f "/etc/dhcp/dhcpd.conf" ];then mv -f /etc/dhcp/dhcpd.conf /etc/dhcp/dhcpd.conf.bak ; elif [ -f "/etc/dhcpd.conf" ]; then mv -f /etc/dhcpd.conf /etc/dhcpd.conf.bak; fi
 cmd:makedhcp -n
-cmd:makedhcp -a 
+cmd:makedhcp -a
 check:rc==0
-cmd:if [ -f /var/lib/dhcpd/dhcpd.leases ]; then cat /var/lib/dhcpd/dhcpd.leases > /tmp/1; elif [ -f /var/lib/dhcp/db/dhcpd.leases ]; then cat /var/lib/dhcp/db/dhcpd.leases > /tmp/1; fi
+cmd:if [ -f /var/lib/dhcpd/dhcpd.leases ]; then cat /var/lib/dhcpd/dhcpd.leases > /tmp/1; elif [ -f /var/lib/dhcp/db/dhcpd.leases ]; then cat /var/lib/dhcp/db/dhcpd.leases > /tmp/1;elif [ -f /var/lib/dhcp/dhcpd.leases ]; then cat /var/lib/dhcp/dhcpd.leases > /tmp/1; fi
 cmd:makedhcp -a -d
 check:rc==0
-cmd:if [ -f /var/lib/dhcpd/dhcpd.leases ]; then cat /var/lib/dhcpd/dhcpd.leases > /tmp/2; elif [ -f /var/lib/dhcp/db/dhcpd.leases ]; then cat /var/lib/dhcp/db/dhcpd.leases > /tmp/2; fi
-cmd:diff /tmp/1 /tmp/2 
+cmd:if [ -f /var/lib/dhcpd/dhcpd.leases ]; then cat /var/lib/dhcpd/dhcpd.leases > /tmp/2; elif [ -f /var/lib/dhcp/db/dhcpd.leases ]; then cat /var/lib/dhcp/db/dhcpd.leases > /tmp/2;elif [ -f /var/lib/dhcp/dhcpd.leases ]; then cat /var/lib/dhcp/dhcpd.leases > /tmp/2; fi
+cmd:diff /tmp/1 /tmp/2
 check:output=~testnode1
 check:output=~deleted
 check:output=~testnode2
@@ -101,10 +114,10 @@ cmd:lsdef -l testnode1 -z > /tmp/CN.stanza
 cmd:chdef -t node -o testnode1 mac=11:22:33:44:55:66
 cmd:makedhcp -n
 cmd:makedhcp testnode1
-cmd:if [ -f /var/lib/dhcpd/dhcpd.leases ]; then cat /var/lib/dhcpd/dhcpd.leases > /tmp/1; elif [ -f /var/lib/dhcp/db/dhcpd.leases ]; then cat /var/lib/dhcp/db/dhcpd.leases > /tmp/1; fi
-cmd:makedhcp -d testnode1 
+cmd:if [ -f /var/lib/dhcpd/dhcpd.leases ]; then cat /var/lib/dhcpd/dhcpd.leases > /tmp/1; elif [ -f /var/lib/dhcp/db/dhcpd.leases ]; then cat /var/lib/dhcp/db/dhcpd.leases > /tmp/1;elif [ -f /var/lib/dhcp/dhcpd.leases ]; then cat /var/lib/dhcp/dhcpd.leases > /tmp/1; fi
+cmd:makedhcp -d testnode1
 check:rc==0
-cmd:if [ -f /var/lib/dhcpd/dhcpd.leases ]; then cat /var/lib/dhcpd/dhcpd.leases > /tmp/2; elif [ -f /var/lib/dhcp/db/dhcpd.leases ]; then cat /var/lib/dhcp/db/dhcpd.leases > /tmp/2; fi
+cmd:if [ -f /var/lib/dhcpd/dhcpd.leases ]; then cat /var/lib/dhcpd/dhcpd.leases > /tmp/2; elif [ -f /var/lib/dhcp/db/dhcpd.leases ]; then cat /var/lib/dhcp/db/dhcpd.leases > /tmp/2;elif [ -f /var/lib/dhcp/dhcpd.leases ]; then cat /var/lib/dhcp/dhcpd.leases > /tmp/2; fi
 cmd:diff /tmp/1 /tmp/2
 check:output=~testnode1
 check:output=~deleted
@@ -186,18 +199,22 @@ check:rc==0
 cmd:lsdef -t network
 check:rc==0
 check:output=~testnetwork
+cmd:mkdef -t node -o testnode ip=100.100.100.2 groups=all mac=42:3d:0a:05:27:0b
 check:rc==0
-cmd:mkdef -t node -o testnode ip=100.100.100.2 groups=all mac=42:3d:0a:05:27:0b 
+cmd:cat /etc/hosts
+cmd:echo -e "\n100.100.100.2 testnode" >> /etc/hosts
 check:rc==0
-cmd: cp -f /etc/hosts /etc/hosts.bak
-cmd:echo "100.100.100.2 testnode" >> /etc/hosts
+cmd:cat /etc/hosts
+cmd:makedhcp -n
 check:rc==0
 cmd:makedhcp -d testnode
+cmd:if [ -f /var/lib/dhcpd/dhcpd.leases ]; then a="/var/lib/dhcpd/dhcpd.leases"; elif [ -f /var/lib/dhcp/db/dhcpd.leases ]; then a="/var/lib/dhcp/db/dhcpd.leases"; elif [ -f "/var/lib/dhcp/dhcpd.leases" ]; then a="/var/lib/dhcp/dhcpd.leases";fi; ls -l $a; cat $a
 cmd:makedhcp testnode
 check:rc==0
+cmd:if [ -f /var/lib/dhcpd/dhcpd.leases ]; then a="/var/lib/dhcpd/dhcpd.leases"; elif [ -f /var/lib/dhcp/db/dhcpd.leases ]; then a="/var/lib/dhcp/db/dhcpd.leases"; elif [ -f "/var/lib/dhcp/dhcpd.leases" ]; then a="/var/lib/dhcp/dhcpd.leases";fi; ls -l $a; cat $a
 cmd:makedhcp -q testnode
 check:rc==0
-check:output=~testnode: ip-address = 100.100.100.2 
+check:output=~testnode: ip-address = 100.100.100.2
 cmd:makedhcp -d testnode
 check:rc==0
 cmd:makedhcp -n
diff --git a/xCAT-test/autotest/testcase/makedns/cases0 b/xCAT-test/autotest/testcase/makedns/cases0
index bc4f6aa96..d2ef5f905 100644
--- a/xCAT-test/autotest/testcase/makedns/cases0
+++ b/xCAT-test/autotest/testcase/makedns/cases0
@@ -10,11 +10,16 @@ end
 
 start:makedns_d_node
 description:makedns -d noderange
-label:mn_only,dns
+label:mn_only,dns,wait_fix
 cmd:chtab netname=testnetwork networks.net=100.100.100.0 networks.mask=255.255.255.0 networks.mgtifname=eth0 networks.gateway=100.100.100.254
 check:rc==0
 cmd:chdef -t node -o dnstestnode groups=all  ip=100.100.100.1
 check:rc==0
+cmd:hostname
+cmd:cat /etc/hosts
+cmd:ip a
+cmd:lsdef -l
+cmd:tabdump networks
 cmd:makedns -n
 check:rc==0
 cmd:makedns dnstestnode
@@ -37,13 +42,17 @@ end
 
 start:makedns_node
 description:makedns noderange
-label:mn_only,dns
+label:mn_only,dns,wait_fix
 cmd:chtab netname=testnetwork networks.net=100.100.100.0 networks.mask=255.255.255.0 networks.mgtifname=eth0 networks.gateway=100.100.100.254
 check:rc==0
 cmd:chdef -t node -o dnstestnode groups=all  ip=100.100.100.1
 check:rc==0
+cmd:lsdef -l  dnstestnode
+cmd:cat /etc/hosts
 cmd:makedns -n
 check:rc==0
+cmd:cat /etc/hosts
+cmd:ps aux|grep name
 cmd:makedns dnstestnode
 check:rc==0
 cmd:nslookup dnstestnode $$MN
@@ -65,7 +74,7 @@ end
 start:makedns_ubuntu_n
 description:makedns -n
 os:ubuntu
-label:mn_only,dns
+label:mn_only,dns,wait_fix
 cmd:chtab netname=testnetwork networks.net=100.100.100.0 networks.mask=255.255.255.0 networks.mgtifname=eth0 networks.gateway=100.100.100.254
 check:rc==0
 cmd:cp /etc/hosts  /etc/hosts.testbak
@@ -74,10 +83,10 @@ cmd:echo "100.100.100.1  dnstestnode" >> /etc/hosts
 check:rc==0
 cmd:makedns -n
 check:rc==0
-cmd:cat /etc/bind/named.conf 
+cmd:cat /etc/bind/named.conf
 check:rc==0
 check:output~=zone "100.100.100.IN-ADDR.ARPA."
-cmd:nslookup dnstestnode $$MN 
+cmd:nslookup dnstestnode $$MN
 check:output~=Server:             $$MN
 check:output!~(server can't find dnstestnode)
 cmd:rm -f /etc/hosts
@@ -88,7 +97,7 @@ cmd:chtab -d netname=testnetwork networks
 check:rc==0
 cmd:makedns -n
 check:rc==0
-cmd:cat /etc/bind/named.conf 
+cmd:cat /etc/bind/named.conf
 check:rc==0
 check:output!~zone "100.100.100.IN-ADDR.ARPA."
 cmd:nslookup dnstestnode $$MN
@@ -132,17 +141,17 @@ end
 
 start:makedns
 description:makedns
-label:mn_only,dns
+label:mn_only,dns,wait_fix
 cmd:chtab netname=testnetwork networks.net=100.100.100.0 networks.mask=255.255.255.0 networks.mgtifname=eth0 networks.gateway=100.100.100.254
 check:rc==0
 cmd:makedns -n
 check:rc==0
-cmd:cat /etc/named.conf 
+cmd:if [ -f "/etc/named.conf" ]; then a="/etc/named.conf"; elif [ -f "/etc/bind/named.conf" ]; then a="/etc/bind/named.conf";fi; cat $a
 check:rc==0
 check:output~=zone "100.100.100.IN-ADDR.ARPA."
 cmd:rm -f /tmp/makedns_named_conf.org /tmp/makedns_named_conf.new
 check:rc==0
-cmd:cat /etc/named.conf  > /tmp/makedns_named_conf.org
+cmd:if [ -f "/etc/named.conf" ]; then a="/etc/named.conf"; elif [ -f "/etc/bind/named.conf" ]; then a="/etc/bind/named.conf";fi; cat $a >/tmp/makedns_named_conf.org
 check:rc==0
 cmd:cp /etc/hosts  /etc/hosts.testbak
 check:rc==0
@@ -153,9 +162,9 @@ check:rc==0
 cmd:nslookup dnstestnode $$MN
 check:output~=Server:             $$MN
 check:output!~(server can't find dnstestnode)
-cmd:cat /etc/named.conf  > /tmp/makedns_named_conf.old
+cmd:if [ -f "/etc/named.conf" ]; then a="/etc/named.conf"; elif [ -f "/etc/bind/named.conf" ]; then a="/etc/bind/named.conf";fi; cat $a > /tmp/makedns_named_conf.new
 check:rc==0
-cmd:diff /tmp/makedns_named_conf.org   /tmp/makedns_named_conf.old
+cmd:diff /tmp/makedns_named_conf.org   /tmp/makedns_named_conf.new
 check:rc==0
 check:output~=
 cmd:rm -f /tmp/makedns_named_conf.org /tmp/makedns_named_conf.new
@@ -168,7 +177,7 @@ cmd:chtab -d netname=testnetwork networks
 check:rc==0
 cmd:makedns -n
 check:rc==0
-cmd:cat /etc/named.conf 
+cmd:if [ -f "/etc/named.conf" ]; then a="/etc/named.conf"; elif [ -f "/etc/bind/named.conf" ]; then a="/etc/bind/named.conf";fi; cat $a
 check:rc==0
 check:output!~zone "100.100.100.IN-ADDR.ARPA."
 cmd:nslookup dnstestnode $$MN
@@ -512,7 +521,7 @@ check:rc==0
 cmd:xdsh $$SN "service xcatd restart"
 check:rc==0
 cmd:xdsh $$SN "service xcatd status"
-check:output~=running 
+check:output~=running
 end
 
 start:makedns_when_nameserver_on_mn_down
@@ -567,7 +576,7 @@ check:rc==0
 cmd:xdsh $$SN "service xcatd restart"
 check:rc==0
 cmd:xdsh $$SN "service xcatd status"
-check:output~=running  
+check:output~=running
 end
 
 
@@ -737,7 +746,7 @@ description:when nameserver's conf file on mn was changed, nameserver's conf fil
 label:cn_os_ready,dns,
 cmd:makedns -n
 check:rc==0
-cmd:cat /etc/named.conf 
+cmd:cat /etc/named.conf
 check:rc==0
 check:output!~zone "100.100.100.IN-ADDR.ARPA."
 cmd:xdsh $$SN "cat /etc/named.conf"
@@ -747,7 +756,7 @@ cmd:chtab netname=testnetwork networks.net=100.100.100.0 networks.mask=255.255.2
 check:rc==0
 cmd:makedns -n
 check:rc==0
-cmd:cat /etc/named.conf 
+cmd:cat /etc/named.conf
 check:rc==0
 check:output~=zone "100.100.100.IN-ADDR.ARPA."
 cmd:xdsh $$SN "cat /etc/named.conf"
@@ -762,7 +771,7 @@ cmd:chtab -d netname=testnetwork networks
 check:rc==0
 cmd:makedns -n
 check:rc==0
-cmd:cat /etc/named.conf 
+cmd:cat /etc/named.conf
 check:rc==0
 check:output!~zone "100.100.100.IN-ADDR.ARPA."
 cmd:xdsh $$SN "cat /etc/named.conf"
@@ -834,7 +843,7 @@ end
 
 start:makedns_n_noderange
 description:to verify makedns -n noderange works as design. add case for bug #2572. Test case bug number is #2826.
-label:mn_only,dns
+label:mn_only,dns,wait_fix
 cmd:chtab netname=testnetwork networks.net=100.100.100.0 networks.mask=255.255.255.0 networks.mgtifname=eth0 networks.gateway=100.100.100.254
 check:rc==0
 cmd:chdef -t node -o dnstestnode[1-10] groups=dnsnode  ip="|dnstestnode(\d+)|100.100.100.(\$1+0)|"
@@ -843,6 +852,11 @@ cmd:cp -f /etc/hosts  /etc/hosts.testbak
 check:rc==0
 cmd:for i in {1..10}; do echo "100.100.100.$i  dnstestnode$i" >> /etc/hosts; done
 check:rc==0
+cmd:hostname
+cmd:cat /etc/hosts
+cmd:ip a
+cmd:lsdef -l
+cmd:tabdump networks
 cmd:makedns -n dnstestnode[1-10]
 check:rc==0
 cmd:nslookup dnstestnode5 $$MN
@@ -858,7 +872,7 @@ check:rc==0
 cmd:nslookup dnstestnode5 $$MN
 check:output~=Server:             $$MN
 check:output!~(server can't find dnstestnode)
-cmd:makedns -d dnsnode 
+cmd:makedns -d dnsnode
 check:rc==0
 cmd:nslookup dnstestnode5 $$MN
 check:output~=Server:             $$MN
diff --git a/xCAT-test/autotest/testcase/makehosts/cases0 b/xCAT-test/autotest/testcase/makehosts/cases0
index 077fd4db9..c647af508 100644
--- a/xCAT-test/autotest/testcase/makehosts/cases0
+++ b/xCAT-test/autotest/testcase/makehosts/cases0
@@ -15,7 +15,7 @@ check:output=~Usage
 end
 
 start:makehosts_null
-description:makehosts 
+description:makehosts
 label:mn_only,dns
 cmd:cp -f /etc/hosts /etc/hosts.xcatbakautotest
 cmd:chtab node=nouse_compute hosts.ip="|node(\d+)|1.2.3.(\$1+0)|" hosts.hostnames="|(.*)|(\$1).cluster.net|"
@@ -23,12 +23,12 @@ check:rc==0
 cmd:mkdef -t node -o node01,node02 groups="nouse_compute"
 check:rc==0
 cmd:sleep 30
-cmd:XCATBYPASS=1 makehosts 
+cmd:XCATBYPASS=1 makehosts
 check:rc==0
 cmd:sleep 30
 cmd:cat /etc/hosts
-check:output=~1.2.3.2 
-check:output=~1.2.3.1 
+check:output=~1.2.3.2
+check:output=~1.2.3.1
 check:output=~node01
 check:output=~node02
 cmd:chtab -d node=nouse_compute hosts
@@ -38,42 +38,47 @@ cmd:mv -f /etc/hosts.xcatbakautotest /etc/hosts
 end
 
 start:makehosts_l
-label:mn_only,dns
+label:mn_only,dns,wait_fix
 cmd:cp -f /etc/hosts /etc/hosts.xcatbakautotest
+cmd:cat /etc/hosts
 cmd:chtab node=nouse_compute hosts.ip="|node(\d+)|1.2.3.(\$1+0)|" hosts.hostnames="|(.*)|(\$1).cluster.net|"
 check:rc==0
 cmd:chdef -t node -o node01,node02 groups="nouse_compute"
 check:rc==0
 cmd:sleep 30
+cmd:lsdef -l nouse_compute
 cmd:XCATBYPASS=1 makehosts -l
 check:rc==0
 cmd:sleep 30
-cmd:cp -f /etc/hosts /tmp/hosts
-cmd:cat /tmp/hosts|awk '{print $2}'
+cmd:cat /etc/hosts
+cmd:cat /etc/hosts |awk '{print $2}'
 check:output=~node01.cluster.net
 check:output=~node02.cluster.net
-cmd:chtab -d node=nouse_compute hosts
 cmd:rmdef node01
 cmd:rmdef node02
+cmd:chtab -d node=nouse_compute hosts
 cmd:mv -f /etc/hosts.xcatbakautotest /etc/hosts
-cmd:rm -rf /tmp/hosts
 end
 
 start:makehosts_d
-label:mn_only,dns
+label:mn_only,dns,wait_fix
 cmd:cp -f /etc/hosts /etc/hosts.xcatbakautotest
 cmd:chtab node=compute hosts.ip="|node(\d+)|1.2.3.(\$1+0)|" hosts.hostnames="|(.*)|(\$1).cluster.net|"
 check:rc==0
 cmd:chdef -t node -o node01 groups="compute"
 check:rc==0
+cmd:lsdef  -l node01
 cmd:sleep 30
-cmd:makehosts node01 
+cmd:cat /etc/hosts
+cmd:makehosts node01
 check:rc==0
-cmd:cat /etc/hosts > /tmp/1
 cmd:sleep 30
+cmd:cat /etc/hosts |tee /tmp/1
+cmd:grep "node01" /etc/hosts
+check:rc==0
 cmd:XCATBYPASS=1 makehosts -d node01
 check:rc==0
-cmd:cat /etc/hosts > /tmp/2
+cmd:cat /etc/hosts |tee /tmp/2
 cmd:diff /tmp/1 /tmp/2
 check:output=~node01.cluster.net
 cmd:chtab -d node=compute hosts
@@ -128,51 +133,122 @@ cmd:chtab -d node=compute hosts
 cmd:rmdef node01
 cmd:mv -f /etc/hosts.xcatbakautotest /etc/hosts
 cmd:cat /etc/hosts| grep -v node01 > /tmp/1
-cmd:mv -f /tmp/1 /etc/hosts 
+cmd:mv -f /tmp/1 /etc/hosts
 cmd:rm -rf /tmp/hosts
 end
 
 start:makehost_n_r
-label:mn_only,dns
+label:mn_only,dns,wait_fix
 descriptions:modify makehosts testcases according to special node name eg:s01 and s01r* . for issue #2717 and #2683
 cmd:cp -f /etc/hosts /etc/hosts.xcatbakautotest
+cmd:cat /etc/hosts
 cmd:lsdef s01;if [ $? -eq 0 ]; then lsdef -l s01 -z >/tmp/s01.standa ;rmdef s01;fi
 check:rc==0
 cmd:lsdef s01r1b01;if [ $? -eq 0 ]; then lsdef -l s01r1b01 -z >/tmp/s01r1b01.standa ;rmdef s01r1b01;fi
 check:rc==0
-cmd:nodeadd s01 groups=service; chdef s01 ip=70.2.0.254;nodeadd s01r1b01 groups=compute; chdef s01r1b01 ip=80.2.0.254;makehosts
+cmd:nodeadd s01 groups=service; chdef s01 ip=70.2.0.254;nodeadd s01r1b01 groups=compute; chdef s01r1b01 ip=80.2.0.254
 check:rc==0
-cmd:a=0;while true; do [ $a -eq 60 ] && exit 1;rc=`cat /etc/hosts`;if [[ $rc =~ "70.2.0.254 s01" ]] && [[ $rc =~ "80.2.0.254 s01r1b01" ]];then exit 0;else a=$[$a+1];sleep 1;echo $a;fi;done
+cmd:lsdef -l s01,s01r1b01
+cmd:makehosts
 check:rc==0
+cmd:cat /etc/hosts
+cmd:#!/bin/bash
+file="/etc/hosts"
+for i in {1..5}; do
+    if (grep "70.2.0.254 s01" $file >/dev/null 2>&1) && (grep "80.2.0.254 s01r1b01" $file >/dev/null 2>&1); then
+        exit 0;
+    else
+        echo "Do not find s01 and s01r1b01 in $file, sleep $[i*2] seconds and try again"
+        sleep $[i*2]
+    fi
+done
+exit 1
+check:rc==0
+cmd:cp -f /etc/hosts.xcatbakautotest /etc/hosts
 cmd:makehosts s01
 check:rc==0
 cmd:cat /etc/hosts
-cmd:a=0;while true; do [ $a -eq 60 ] && exit 1;rc=`cat /etc/hosts`;if [[ $rc =~ "70.2.0.254 s01" ]] && [[ $rc =~ "80.2.0.254 s01r1b01" ]];then exit 0;else a=$[$a+1];sleep 1;echo $a;fi;done
+cmd:#!/bin/bash
+file="/etc/hosts"
+for i in {1..5}; do
+    if (grep "70.2.0.254 s01" $file >/dev/null 2>&1) && ( ! grep "80.2.0.254 s01r1b01" $file >/dev/null 2>&1); then
+        exit 0;
+    else
+        echo "sleep $[i*2] seconds and try again"
+        sleep $[i*2]
+    fi
+done
+exit 1
 check:rc==0
+cmd:cp -f /etc/hosts.xcatbakautotest /etc/hosts
 cmd:makehosts service
 check:rc==0
-cmd:a=0;while true; do [ $a -eq 60 ] && exit 1;rc=`cat /etc/hosts`;if [[ $rc =~ "70.2.0.254 s01" ]] && [[ $rc =~ "80.2.0.254 s01r1b01" ]];then exit 0;else a=$[$a+1];sleep 1;echo $a;fi;done
-check:rc==0
 cmd:cat /etc/hosts
+cmd:#!/bin/bash
+file="/etc/hosts"
+for i in {1..5}; do
+    if (grep "70.2.0.254 s01" $file >/dev/null 2>&1) && (! grep "80.2.0.254 s01r1b01" $file >/dev/null 2>&1); then
+        exit 0;
+    else
+        echo "sleep $[i*2] seconds and try again"
+        sleep $[i*2]
+    fi
+done
+exit 1
+check:rc==0
 cmd:makehosts -d s01
 check:rc==0
-cmd:a=0;while true; do [ $a -eq 60 ] && exit 1;rc=`cat /etc/hosts`;if !([[  $rc =~ "70.2.0.254 s01"  ]]) && [[  $rc =~ "80.2.0.254 s01r1b01" ]];then exit 0;else a=$[$a+1];sleep 1;echo $a;fi;done
-check:rc==0
 cmd:cat /etc/hosts
+cmd:#!/bin/bash
+file="/etc/hosts"
+for i in {1..5}; do
+    if (! grep "70.2.0.254 s01" $file >/dev/null 2>&1) && (! grep "80.2.0.254 s01r1b01" $file >/dev/null 2>&1); then
+        exit 0;
+    else
+        echo "sleep $[i*2] seconds and try again"
+        sleep $[i*2]
+    fi
+done
+exit 1
+check:rc==0
+cmd:cp -f /etc/hosts.xcatbakautotest /etc/hosts
 cmd:makehosts
 check:rc==0
-cmd:makehosts -d service 
-check:rc==0
-cmd:a=0;while true; do [ $a -eq 60 ] && exit 1;rc=`cat /etc/hosts`;if !([[  $rc =~ "70.2.0.254 s01"  ]]) && [[  $rc =~ "80.2.0.254 s01r1b01" ]];then exit 0;else a=$[$a+1];sleep 1;echo $a;fi;done
+cmd:cat /etc/hosts
+cmd:makehosts -d service
 check:rc==0
 cmd:cat /etc/hosts
+cmd:#!/bin/bash
+file="/etc/hosts"
+for i in {1..5}; do
+    if (! grep "70.2.0.254 s01" $file >/dev/null 2>&1) && (grep "80.2.0.254 s01r1b01" $file >/dev/null 2>&1); then
+        exit 0;
+    else
+        echo "sleep $[i*2] seconds and try again"
+        sleep $[i*2]
+    fi
+done
+exit 1
+check:rc==0
+cmd:cp -f /etc/hosts.xcatbakautotest /etc/hosts
 cmd:makehosts
 check:rc==0
+cmd:cat /etc/hosts
 cmd:makehosts -d s01r1b01
 check:rc==0
-cmd:a=0;while true; do [ $a -eq 60 ] && exit 1;rc=`cat /etc/hosts`;if [[  $rc =~ "70.2.0.254 s01"  ]] && !([[  $rc =~ "80.2.0.254 s01r1b01" ]]);then exit 0;else a=$[$a+1];sleep 1;echo $a;fi;done
-check:rc==0
 cmd:cat /etc/hosts
+cmd:#!/bin/bash
+file="/etc/hosts"
+for i in {1..5}; do
+    if (grep "70.2.0.254 s01" $file >/dev/null 2>&1) && (! grep "80.2.0.254 s01r1b01" $file >/dev/null 2>&1); then
+        exit 0;
+    else
+        echo "sleep $[i*2] seconds and try again"
+        sleep $[i*2]
+    fi
+done
+exit 1
+check:rc==0
 cmd:if [ -e /tmp/s01.standa ]; then rmdef s01; cat /tmp/s01.standa | mkdef -z; rm -rf /tmp/s01.standa; else rmdef s01;fi
 check:rc==0
 cmd:if [ -e /tmp/s01r1b01.standa ]; then rmdef s01r1b01; cat /tmp/s01r1b01.standa | mkdef -z; rm -rf /tmp/s01r1b01.standa;else rmdef s01r1b01; fi
@@ -188,6 +264,7 @@ cmd:if lsdef -z sn4b;then lsdef -z sn4b|tee /tmp/sn4bdef;noderm sn4b;fi
 cmd:if lsdef -t group -z regextest;then lsdef -t group -z regextest |tee /tmp/regextestdef;rmdef -t group -o regextest;fi
 cmd:if grep sn4b /etc/hosts;then sed -i '/sn4b/d' /etc/hosts;fi
 check:rc==0
+cmd:cat /etc/hosts
 cmd:mkdef -t node sn4b groups=compute
 check:rc==0
 cmd:mkdef -t group regextest ip="|\D+(\d+)\D+|20.80.1.($1*2+103)|" members=sn4b nichostnamesuffixes.eth0=-eth0 nicips.eth0="|\D+(\d+)\D+|10.80.1.($1*2+103)|" nicnetworks.eth0=10_0_0_0-255_0_0_0
@@ -196,6 +273,7 @@ cmd:lsdef -t group regextest
 check:rc==0
 cmd:makehosts sn4b
 check:rc==0
+cmd:cat /etc/hosts
 cmd:sn4bip=`lsdef sn4b |grep -w ip|awk -F= '{print $2}'`;grep $sn4bip /etc/hosts
 check:rc==0
 cmd:sn4beth0ip=`lsdef sn4b |grep -w nicips.eth0|awk -F= '{print $2}'`;grep $sn4beth0ip /etc/hosts
diff --git a/xCAT-test/autotest/testcase/makeknownhosts/cases0 b/xCAT-test/autotest/testcase/makeknownhosts/cases0
index 7bd31898b..95442b651 100644
--- a/xCAT-test/autotest/testcase/makeknownhosts/cases0
+++ b/xCAT-test/autotest/testcase/makeknownhosts/cases0
@@ -13,12 +13,12 @@ check:rc==0
 cmd:cat  ~/.ssh/known_hosts|grep $$CN
 check:rc==0
 check:output=~$$CN
-cmd:makeknownhosts $$CN -r 
+cmd:makeknownhosts $$CN -r
 end
 
 start:makeknownhosts_node_r
 description:remove known node in $ROOTHOME/.ssh
-cmd:makeknownhosts $$CN 
+cmd:makeknownhosts $$CN
 cmd:cat  ~/.ssh/known_hosts|grep $$CN
 check:output=~$$CN
 cmd:makeknownhosts $$CN -r
@@ -30,14 +30,14 @@ end
 
 start:makeknownhosts_node_d
 description:delete known node entry from $ROOTHOME/.ssh
-cmd:makeknownhosts $$CN 
+cmd:makeknownhosts $$CN
 cmd:cat ~/.ssh/known_hosts|grep $$CN
 check:output=~$$CN
 cmd:cat ~/.ssh/known_hosts|grep __GETNODEATTR($$CN,ip)__
 check:rc==0
 cmd:makeknownhosts $$CN -d
 check:rc==0
-cmd:cat ~/.ssh/known_hosts|grep __GETNODEATTR($$CN,ip)__ 
+cmd:cat ~/.ssh/known_hosts|grep __GETNODEATTR($$CN,ip)__
 check:rc!=0
 check:output!~__GETNODEATTR($$CN,ip)__
 end
diff --git a/xCAT-test/autotest/testcase/makentp/cases0 b/xCAT-test/autotest/testcase/makentp/cases0
index 17ac57c65..d88159074 100644
--- a/xCAT-test/autotest/testcase/makentp/cases0
+++ b/xCAT-test/autotest/testcase/makentp/cases0
@@ -14,13 +14,13 @@ end
 
 start:makentp_extntpserver_null
 descriptiop:test makentp with default value. extntpserver is set to blank
-cmd:lsdef -t site -o clustersite -i extntpservers -c >/tmp/extntpserver 
+cmd:lsdef -t site -o clustersite -i extntpservers -c >/tmp/extntpserver
 check:rc==0
 cmd:chtab key=extntpservers site.value=""
 check:rc==0
 cmd:makentp
 check:rc==0
-check:output=~configuring management node: $$MN 
+check:output=~configuring management node: $$MN
 cmd:makentp -V
 check:rc==0
 check:output=~configuring management node: $$MN
@@ -33,7 +33,7 @@ cmd:extntpserver=`cat /tmp/ntpserver | awk -F = '{print \$2}'`;chtab key=extntps
 check:rc==0
 cmd:rm -rf /tmp/extntpserver
 cmd:makentp
-check:rc==0 
+check:rc==0
 end
 
 start:makentp_extntpserver_value
@@ -54,7 +54,7 @@ check:rc==0
 check:output=~configuring management node: $$MN
 check:output=~checking if nptd is installed
 check:output=~backing up the ntp configuration file /etc/ntp.conf
-check:output=~ntp servers are: $$extntpserversip 
+check:output=~ntp servers are: $$extntpserversip
 check:output=~stopping ntpserver
 check:output=~starting ntpserver
 check:output=~enabling ntpserver
@@ -116,6 +116,6 @@ check:output=~starting ntpserver
 check:output=~enabling ntpserver
 cmd:if [[ "__GETNODEATTR($$CN,os)__" =~ "ubuntu" ]] || [[ "__GETNODEATTR($$CN,os)__" = "sles11.4" ]];then service ntp status;else service ntpd status; fi
 check:rc==0
-cmd:a=0;until ntpq -n -c peers | tail -n +2 | grep -q '^*'; do sleep 30;((a++));if [ $a -gt 30 ];then exit 1;fi done 
+cmd:a=0;until ntpq -n -c peers | tail -n +2 | grep -q '^*'; do sleep 30;((a++));if [ $a -gt 30 ];then exit 1;fi done
 check:rc==0
 end
diff --git a/xCAT-test/autotest/testcase/makeroutes/cases0 b/xCAT-test/autotest/testcase/makeroutes/cases0
index b15b4fa4a..bc5dacf29 100644
--- a/xCAT-test/autotest/testcase/makeroutes/cases0
+++ b/xCAT-test/autotest/testcase/makeroutes/cases0
@@ -11,7 +11,7 @@ check:output=~Version
 end
 
 start:makeroutes_r_d_node
-cmd:chtab routename=testr  routes.net=10.1.0.0  routes.mask=255.255.0.0  routes.gateway=10.1.254.254 
+cmd:chtab routename=testr  routes.net=10.1.0.0  routes.mask=255.255.0.0  routes.gateway=10.1.254.254
 check:rc==0
 cmd: makeroutes $$CN -r testr
 check:rc==0
@@ -29,7 +29,7 @@ end
 
 
 start:makeroutes_r_d
-cmd:chtab routename=testr routes.net=10.1.0.0 routes.mask=255.255.0.0 routes.gateway=10.1.254.254 
+cmd:chtab routename=testr routes.net=10.1.0.0 routes.mask=255.255.0.0 routes.gateway=10.1.254.254
 check:rc==0
 cmd: makeroutes -r testr
 check:rc==0
@@ -47,16 +47,16 @@ end
 
 
 start:makeroutes_use_site_mnroutenames
-cmd:chtab routename=testr  routes.net=10.1.0.0  routes.mask=255.255.0.0  routes.gateway=10.1.254.254 
+cmd:chtab routename=testr  routes.net=10.1.0.0  routes.mask=255.255.0.0  routes.gateway=10.1.254.254
 check:rc==0
 cmd:chtab key=mnroutenames  site.value=testr
-check:rc==0 
-cmd: makeroutes 
+check:rc==0
+cmd: makeroutes
 check:rc==0
 cmd:route
 check:rc==0
 check:output=~10.1.0.0\s*10.1.254.254\s*255.255.0.0
-cmd: makeroutes -d 
+cmd: makeroutes -d
 check:rc==0
 cmd:route
 check:rc==0
@@ -68,16 +68,16 @@ check:rc==0
 end
 
 start:makeroutes_use_noderes_routenames
-cmd:chtab routename=testr  routes.net=10.1.0.0  routes.mask=255.255.0.0  routes.gateway=10.1.254.254 
+cmd:chtab routename=testr  routes.net=10.1.0.0  routes.mask=255.255.0.0  routes.gateway=10.1.254.254
 check:rc==0
 cmd:chtab node=$$CN noderes.routenames=testr
-check:rc==0 
+check:rc==0
 cmd: makeroutes $$CN
 check:rc==0
 cmd:xdsh $$CN route
 check:rc==0
 check:output=~10.1.0.0\s*10.1.254.254\s*255.255.0.0
-cmd: makeroutes $$CN -d 
+cmd: makeroutes $$CN -d
 check:rc==0
 cmd:xdsh $$CN route
 check:rc==0
diff --git a/xCAT-test/autotest/testcase/migration/sles_migration b/xCAT-test/autotest/testcase/migration/sles_migration
index f20f56edb..af2cd1303 100644
--- a/xCAT-test/autotest/testcase/migration/sles_migration
+++ b/xCAT-test/autotest/testcase/migration/sles_migration
@@ -90,7 +90,7 @@ cmd:xdsh $$CN "tar -jxvf /xcat-dep*.tar.bz2"
 check:rc==0
 cmd:xdsh $$CN "cd /root/xcat-dep/sles1`more /etc/*release|grep VERSION_ID|cut -c14`/__GETNODEATTR($$CN,arch)__/;./mklocalrepo.sh"
 check:rc==0
-cmd:xdsh $$CN "zypper refresh;zypper -n update \$(rpm -q --queryformat '%{vendor}\n' xCAT-genesis-scripts-x86_64 xCAT-genesis-scripts-ppc64 | grep -q -v '^IBM Corp\.$' && echo --force-resolution) '*xCAT*'"
+cmd:xdsh $$CN "zypper refresh;zypper -n --gpg-auto-import-keys update --force-resolution '*xCAT*'"
 check:rc==0
 cmd:xdsh $$CN "service xcatd status"
 check:rc==0
@@ -200,7 +200,7 @@ cmd:xdsh $$CN "tar -jxvf /xcat-dep*.tar.bz2"
 check:rc==0
 cmd:xdsh $$CN "cd /root/xcat-dep/sles1`more /etc/*release|grep VERSION_ID|cut -c14`/__GETNODEATTR($$CN,arch)__/;./mklocalrepo.sh"
 check:rc==0
-cmd:xdsh $$CN "zypper refresh;zypper -n update \$(rpm -q --queryformat '%{vendor}\n' xCAT-genesis-scripts-x86_64 xCAT-genesis-scripts-ppc64 | grep -q -v '^IBM Corp\.$' && echo --force-resolution) '*xCAT*'"
+cmd:xdsh $$CN "zypper refresh;zypper -n --gpg-auto-import-keys update --force-resolution '*xCAT*'"
 check:rc==0
 cmd:xdsh $$CN "service xcatd status"
 check:rc==0
diff --git a/xCAT-test/autotest/testcase/migration/ubuntu_migration1_vm b/xCAT-test/autotest/testcase/migration/ubuntu_migration1_vm
index 636553292..d506123ad 100644
--- a/xCAT-test/autotest/testcase/migration/ubuntu_migration1_vm
+++ b/xCAT-test/autotest/testcase/migration/ubuntu_migration1_vm
@@ -31,7 +31,7 @@ cmd:xdsh $$CN "echo \"nameserver 9.0.2.1\" >> /etc/resolv.conf"
 check:rc==0
 cmd:xdsh $$CN "apt-get -y install software-properties-common"
 check:rc==0
-cmd:xdsh $$CN 'lsb_r=`lsb_release -sc`;add-apt-repository "deb http://archive.ubuntu.com/ubuntu $lsb_r main"' 
+cmd:xdsh $$CN 'lsb_r=`lsb_release -sc`;add-apt-repository "deb http://archive.ubuntu.com/ubuntu $lsb_r main"'
 check:rc==0
 cmd:xdsh $$CN 'lsb_r=`lsb_release -sc`;add-apt-repository "deb http://archive.ubuntu.com/ubuntu ${lsb_r}-updates main"'
 check:rc==0
@@ -45,7 +45,7 @@ cmd:xdsh $$CN "sed -i '/security.ubuntu.com/d' /etc/apt/sources.list"
 check:rc==0
 cmd:xdsh $$CN "wget -O - http://xcat.org/files/xcat/repos/apt/apt.key | apt-key add -"
 check:rc==0
-cmd:xdsh $$CN "apt-get clean all" 
+cmd:xdsh $$CN "apt-get clean all"
 check:rc==0
 cmd:xdsh $$CN "apt-get update"
 check:rc==0
diff --git a/xCAT-test/autotest/testcase/migration/ubuntu_migration2_vm b/xCAT-test/autotest/testcase/migration/ubuntu_migration2_vm
index 34c7123cb..a3ad8594b 100644
--- a/xCAT-test/autotest/testcase/migration/ubuntu_migration2_vm
+++ b/xCAT-test/autotest/testcase/migration/ubuntu_migration2_vm
@@ -31,7 +31,7 @@ cmd:xdsh $$CN "echo \"nameserver 9.0.2.1\" >> /etc/resolv.conf"
 check:rc==0
 cmd:xdsh $$CN "apt-get -y install software-properties-common"
 check:rc==0
-cmd:xdsh $$CN 'lsb_r=`lsb_release -sc`;add-apt-repository "deb http://archive.ubuntu.com/ubuntu $lsb_r main"' 
+cmd:xdsh $$CN 'lsb_r=`lsb_release -sc`;add-apt-repository "deb http://archive.ubuntu.com/ubuntu $lsb_r main"'
 check:rc==0
 cmd:xdsh $$CN 'lsb_r=`lsb_release -sc`;add-apt-repository "deb http://archive.ubuntu.com/ubuntu ${lsb_r}-updates main"'
 check:rc==0
@@ -45,7 +45,7 @@ cmd:xdsh $$CN "sed -i '/security.ubuntu.com/d' /etc/apt/sources.list"
 check:rc==0
 cmd:xdsh $$CN "wget -O - http://xcat.org/files/xcat/repos/apt/apt.key | apt-key add -"
 check:rc==0
-cmd:xdsh $$CN "apt-get clean all" 
+cmd:xdsh $$CN "apt-get clean all"
 check:rc==0
 cmd:xdsh $$CN "apt-get update"
 check:rc==0
diff --git a/xCAT-test/autotest/testcase/mkdef/cases0 b/xCAT-test/autotest/testcase/mkdef/cases0
index 6ed8a06b7..417075987 100644
--- a/xCAT-test/autotest/testcase/mkdef/cases0
+++ b/xCAT-test/autotest/testcase/mkdef/cases0
@@ -181,8 +181,8 @@ check:output=~Object name\: auto_test_node_1
 check:output=~groups=switch
 check:output=~nodetype=switch
 check:output=~postbootscripts\=otherpkgs
-check:output=~postscripts\=syslog\,remoteshell\,syncfiles 
-check:output=~usercomment\=the switch definition template  
+check:output=~postscripts\=syslog\,remoteshell\,syncfiles
+check:output=~usercomment\=the switch definition template
 check:output=~postscripts\=syslog\,remoteshell\,syncfiles
 check:output!=ip\=OPTIONAL\:the ip address of the switch
 check:output!=mac\=OPTIONAL\:the MAC address of the switch
@@ -215,7 +215,7 @@ check:rc==0
 end
 
 start:mkdef_template_invalid_template
-description:create a node with invalid template 
+description:create a node with invalid template
 label:mn_only,db
 cmd:result=`lsdef | grep  auto_test_node`; if [[ $result =~ "auto_test_node" ]]; then echo $result; noderm auto_test_node; fi
 cmd:result=`lsdef | grep  auto_test_invalid_template`; if [[ $result =~ "auto_test_invalid_template" ]]; then echo $result; noderm auto_test_invalid_template; fi
@@ -264,13 +264,13 @@ label:mn_only,db
 cmd:result=`lsdef | grep  auto_test_cec_node_1`; if [[ $result =~ "auto_test_cec_node_1" ]]; then echo $result; noderm auto_test_cec_node_1; fi
 cmd:mkdef -t node -o auto_test_cec_node_1 --template cec-template
 check:rc==1
-check:output=~Error\: (\[.*?\]: )?The attribute \"serial\" must be specified!
+check:output=~Error\: (\[.*?\]: )?The attribute \".+\" must be specified!
 cmd:mkdef -t node -o auto_test_cec_node_1 --template cec-template serial=test
 check:rc==1
-check:output=~Error\: (\[.*?\]: )?The attribute \"mtm\" must be specified!
-cmd:mkdef -t node -o auto_test_cec_node_1 --template cec-template serial=test mtm=test
+check:output=~Error\: (\[.*?\]: )?The attribute \".+\" must be specified!
+cmd:mkdef -t node -o auto_test_cec_node_1 --template cec-template serial=test hcp=test
 check:rc==1
-check:output=~Error\: (\[.*?\]: )?The attribute \"hcp\" must be specified!
+check:output=~Error\: (\[.*?\]: )?The attribute \".+\" must be specified!
 cmd:mkdef -t node -o auto_test_cec_node_1 --template cec-template serial=test mtm=test hcp=test
 check:rc==0
 check:output=~1 object definitions have been created or modified
diff --git a/xCAT-test/autotest/testcase/ngpfb/cases0 b/xCAT-test/autotest/testcase/ngpfb/cases0
index afec41638..fd7115da0 100644
--- a/xCAT-test/autotest/testcase/ngpfb/cases0
+++ b/xCAT-test/autotest/testcase/ngpfb/cases0
@@ -95,7 +95,7 @@ description:rpower
 cmd:rpower $$CN off
 check:rc==0
 cmd:sleep 50
-cmd:rpower $$CN state 
+cmd:rpower $$CN state
 check:rc==0
 cmd:rpower $$CN on
 check:rc==0
@@ -118,7 +118,7 @@ end
 
 start:getmacs_d_blade
 description:getmacs
-cmd:makeconservercf 
+cmd:makeconservercf
 check:rc==0
 cmd:chdef $$CN getmac=blade
 cmd:getmacs $$CN -d
@@ -134,7 +134,7 @@ start:rinv_firm_fb
 description:check firmware level
 cmd:rinv $$CN firm
 check:rc==0
-cmd:rvitals $$CN all 
+cmd:rvitals $$CN all
 check:rc==0
 check:output=~(Status: Good)
 end
diff --git a/xCAT-test/autotest/testcase/nodech/cases0 b/xCAT-test/autotest/testcase/nodech/cases0
index 58b6345bf..711b8bd99 100644
--- a/xCAT-test/autotest/testcase/nodech/cases0
+++ b/xCAT-test/autotest/testcase/nodech/cases0
@@ -156,7 +156,7 @@ cmd:rmdef -t node testnode
 end
 
 start:nodech_delete
-description:nodech -d 
+description:nodech -d
 label:mn_only,db
 cmd:chdef -t node -o testnode os=hello groups=all
 check:rc==0
diff --git a/xCAT-test/autotest/testcase/nodegrpch/cases0 b/xCAT-test/autotest/testcase/nodegrpch/cases0
index 0ae5ff69e..448ba50ea 100644
--- a/xCAT-test/autotest/testcase/nodegrpch/cases0
+++ b/xCAT-test/autotest/testcase/nodegrpch/cases0
@@ -1,7 +1,7 @@
 start:nodegrpch_v
 description:nodegrpch -v and --version
 label:mn_only,db
-cmd:nodegrpch -v 
+cmd:nodegrpch -v
 check:output=~Version
 cmd:nodegrpch --version
 check:output=~Version
@@ -36,7 +36,7 @@ end
 start:nodegrpch_err
 description:
 label:mn_only,db
-cmd:nodegrpch -c 
+cmd:nodegrpch -c
 check:rc!=0
 check:output=~Usage
 end
diff --git a/xCAT-test/autotest/testcase/nodels/cases0 b/xCAT-test/autotest/testcase/nodels/cases0
index cb3ebeeaf..e81b30566 100644
--- a/xCAT-test/autotest/testcase/nodels/cases0
+++ b/xCAT-test/autotest/testcase/nodels/cases0
@@ -50,7 +50,7 @@ description:Check the command nodels with =~.
 label:mn_only,db
 cmd:chdef -t node -o testnode groups=rh4.123456789
 check:rc==0
-cmd:nodels groups=~rh4.123456789 
+cmd:nodels groups=~rh4.123456789
 check:rc==0
 check:output=~testnode
 cmd:rmdef -t node testnode
@@ -64,7 +64,7 @@ cmd:chdef -t node -o testnode1 groups=rhels5.5,all
 check:rc==0
 cmd:chdef -t node -o testnode2 groups=rhels5.4,all
 check:rc==0
-cmd:nodels testnode1-testnode2 nodelist.groups\!~rhels5.5 
+cmd:nodels testnode1-testnode2 nodelist.groups\!~rhels5.5
 check:rc==0
 check:output=~testnode2
 cmd:rmdef -t node testnode1-testnode2
@@ -90,7 +90,7 @@ cmd:chdef -t node -o testnode1 groups=rhels5.5
 check:rc==0
 cmd:chdef -t node -o testnode2 groups=rhels5.4
 check:rc==0
-cmd:nodels testnode1-testnode2 groups!=rhels5.5 
+cmd:nodels testnode1-testnode2 groups!=rhels5.5
 check:rc==0
 check:output=~testnode2
 cmd:rmdef -t node testnode1-testnode2
@@ -113,7 +113,7 @@ end
 start:nodels_S
 description:nodels -S
 label:mn_only,db
-cmd:chdef -t node -o testnode hidden=1 groups=rhels5.5  
+cmd:chdef -t node -o testnode hidden=1 groups=rhels5.5
 check:rc==0
 cmd:nodels -S
 check:rc==0
diff --git a/xCAT-test/autotest/testcase/nodeset/cases0 b/xCAT-test/autotest/testcase/nodeset/cases0
index ae13c016f..f4fc5b5ed 100644
--- a/xCAT-test/autotest/testcase/nodeset/cases0
+++ b/xCAT-test/autotest/testcase/nodeset/cases0
@@ -88,7 +88,7 @@ cmd: mkdef "ubuntu14.04.5-x86_64-install-compute" -u profile=compute provmethod=
 check:rc==0
 cmd:nodeset testnode1 osimage="ubuntu14.04.5-x86_64-install-compute"
 check:rc!=0
-check:output=~grub2 is not valid when provisioning ubuntu14.04.5-x86_64-install-compute 
+check:output=~grub2 is not valid when provisioning ubuntu14.04.5-x86_64-install-compute
 check:output=~valid options: "xnba,pxe"
 cmd:rmdef -t osimage -o "ubuntu14.04.5-x86_64-install-compute"
 cmd:noderm testnode1
@@ -104,7 +104,7 @@ cmd:copycds $$ISO
 check:rc==0
 cmd:nodeset testnode1 osimage="sles11.4-ppc64-install-compute"
 check:rc!=0
-check:output=~install sles11.4-ppc64-compute 
+check:output=~install sles11.4-ppc64-compute
 cmd:noderm testnode1
 end
 
@@ -149,7 +149,7 @@ cmd: mkdef "sles12-ppc64el-install-compute" -u profile=compute provmethod=instal
 check:rc==0
 cmd:nodeset testnode1 osimage="sles12-ppc64el-install-compute"
 check:rc!=0
-check:output=~yaboot is not valid when provisioning sles12-ppc64el-install-compute 
+check:output=~yaboot is not valid when provisioning sles12-ppc64el-install-compute
 cmd:rmdef -t osimage -o "sles12-ppc64el-install-compute"
 cmd:noderm testnode1
 end
diff --git a/xCAT-test/autotest/testcase/nodeset/nodeset_nonexistent_osimage_grub2 b/xCAT-test/autotest/testcase/nodeset/nodeset_nonexistent_osimage_grub2
index dc77e6b6b..91c064f47 100755
--- a/xCAT-test/autotest/testcase/nodeset/nodeset_nonexistent_osimage_grub2
+++ b/xCAT-test/autotest/testcase/nodeset/nodeset_nonexistent_osimage_grub2
@@ -24,7 +24,7 @@ exit_if_bad "$?" "nodeset command exit with non-zero"
 for node in tz{001..005}
 do
 	[ -f "/tftpboot/boot/grub2/${node}" ]
-	exit_if_bad "$?" "file not found /tftpboot/boot/grub2/${node}" 
+	exit_if_bad "$?" "file not found /tftpboot/boot/grub2/${node}"
 done
 
 nodeset tz003 osimage=nonexistent-osimage \
@@ -52,7 +52,7 @@ exit_if_bad "$?" "nodeset command error message checking failed"
 for node in tz001 tz002 tz004 tz005
 do
 	[ -f "/tftpboot/boot/grub2/${node}" ]
-	exit_if_bad "$?" "file not found /tftpboot/boot/grub2/${node}" 
+	exit_if_bad "$?" "file not found /tftpboot/boot/grub2/${node}"
 done
 
 nodeset tz001+4 offline
diff --git a/xCAT-test/autotest/testcase/nodeset/nodeset_nonexistent_osimage_petitboot b/xCAT-test/autotest/testcase/nodeset/nodeset_nonexistent_osimage_petitboot
index 7014245e7..ac46fd5c2 100755
--- a/xCAT-test/autotest/testcase/nodeset/nodeset_nonexistent_osimage_petitboot
+++ b/xCAT-test/autotest/testcase/nodeset/nodeset_nonexistent_osimage_petitboot
@@ -24,7 +24,7 @@ exit_if_bad "$?" "nodeset command exit with non-zero"
 for node in tz{001..005}
 do
 	[ -f "/tftpboot/petitboot/${node}" ]
-	exit_if_bad "$?" "file not found /tftpboot/petitboot/${node}" 
+	exit_if_bad "$?" "file not found /tftpboot/petitboot/${node}"
 done
 
 nodeset tz003 osimage=nonexistent-osimage \
@@ -62,7 +62,7 @@ exit_if_bad "$?" "nodeset command should exit with non-zero"
 for node in tz001 tz002 tz004 tz005
 do
 	[ -f "/tftpboot/petitboot/${node}" ]
-	exit_if_bad "$?" "file not found /tftpboot/petitboot/${node}" 
+	exit_if_bad "$?" "file not found /tftpboot/petitboot/${node}"
 done
 
 nodeset tz001+4 offline
diff --git a/xCAT-test/autotest/testcase/nodeset/nodeset_osimage_grub2 b/xCAT-test/autotest/testcase/nodeset/nodeset_osimage_grub2
index ca97080ba..46e29c8be 100755
--- a/xCAT-test/autotest/testcase/nodeset/nodeset_osimage_grub2
+++ b/xCAT-test/autotest/testcase/nodeset/nodeset_osimage_grub2
@@ -36,7 +36,7 @@ exit_if_bad "$?" "nodeset command error message checking failed"
 for node in tz001 tz004 tz005
 do
 	[ -f "/tftpboot/boot/grub2/${node}" ]
-	exit_if_bad "$?" "file not found /tftpboot/boot/grub2/${node}" 
+	exit_if_bad "$?" "file not found /tftpboot/boot/grub2/${node}"
 done
 
 nodeset tz001+4 offline
diff --git a/xCAT-test/autotest/testcase/nodeset/nodeset_osimage_petitboot b/xCAT-test/autotest/testcase/nodeset/nodeset_osimage_petitboot
index 969e66548..7561aada8 100755
--- a/xCAT-test/autotest/testcase/nodeset/nodeset_osimage_petitboot
+++ b/xCAT-test/autotest/testcase/nodeset/nodeset_osimage_petitboot
@@ -43,7 +43,7 @@ exit_if_bad "$?" "nodeset command error message checking failed"
 for node in tz001 tz005
 do
 	[ -f "/tftpboot/petitboot/${node}" ]
-	exit_if_bad "$?" "file not found /tftpboot/petitboot/${node}" 
+	exit_if_bad "$?" "file not found /tftpboot/petitboot/${node}"
 done
 
 nodeset tz001+4 offline
diff --git a/xCAT-test/autotest/testcase/nodeset/nodeset_shell_petitboot b/xCAT-test/autotest/testcase/nodeset/nodeset_shell_petitboot
index 99f947ba0..f4717b74b 100755
--- a/xCAT-test/autotest/testcase/nodeset/nodeset_shell_petitboot
+++ b/xCAT-test/autotest/testcase/nodeset/nodeset_shell_petitboot
@@ -38,7 +38,7 @@ exit_if_bad "$?" "nodeset command error message checking failed"
 for node in tz001 tz002 tz005
 do
 	[ -f "/tftpboot/petitboot/${node}" ]
-	exit_if_bad "$?" "file not found /tftpboot/petitboot/${node}" 
+	exit_if_bad "$?" "file not found /tftpboot/petitboot/${node}"
 done
 
 nodeset tz001+4 offline
diff --git a/xCAT-test/autotest/testcase/osdeploy/cases0 b/xCAT-test/autotest/testcase/osdeploy/cases0
index e1b366cdc..53058dfae 100644
--- a/xCAT-test/autotest/testcase/osdeploy/cases0
+++ b/xCAT-test/autotest/testcase/osdeploy/cases0
@@ -1,6 +1,6 @@
 start:osdeploy_usage
-description: osdeploy check usage 
-cmd:xcatprobe osdeploy -h 
+description: osdeploy check usage
+cmd:xcatprobe osdeploy -h
 check:rc==0
 check:output~=Usage
 check:output~=osdeploy -h
@@ -41,7 +41,7 @@ cmd:cat /tmp/osdeploy.test |grep "All nodes provisioned successfully"|grep OK
 check:rc==0
 cmd:rm -rf /tmp/osdeploy.test
 check:rc==0
-cmd:xcatprobe osdeploy -n $$CN -r 1h>> /tmp/osdeploy.test 
+cmd:xcatprobe osdeploy -n $$CN -r 1h>> /tmp/osdeploy.test
 check:rc==0
 cmd:cat /tmp/osdeploy.test |grep "All nodes provisioned successfully"|grep "OK"
 check:rc==0
@@ -149,7 +149,7 @@ cmd:sleep 300
 cmd:a=0;while ! `lsdef -l $$CN|grep status|grep booted >/dev/null`; do sleep 20;((a++));if [ $a -gt 300 ];then break;fi done
 cmd:cat /tmp/osdeploy.test |grep "All nodes provisioned successfully"|grep OK
 check:rc==0
-cmd:xcatprobe osdeploy -n $$CN -p origin -r 1h >> /tmp/osdeploy.test 
+cmd:xcatprobe osdeploy -n $$CN -p origin -r 1h >> /tmp/osdeploy.test
 check:rc==0
 cmd:cat /tmp/osdeploy.test |grep "Start Time for Stage"
 check:rc==0
@@ -173,7 +173,7 @@ cmd:sleep 300
 cmd:a=0;while ! `lsdef -l $$CN|grep status|grep booted >/dev/null`; do sleep 20;((a++));if [ $a -gt 300 ];then break;fi done
 cmd:cat /tmp/osdeploy.test |grep "Without provision process during rollback time window"
 check:rc==0
-cmd:xcatprobe osdeploy -n $$CN -p origin -r 1m >> /tmp/osdeploy.test 
+cmd:xcatprobe osdeploy -n $$CN -p origin -r 1m >> /tmp/osdeploy.test
 check:rc==0
 cmd:cat /tmp/osdeploy.test |grep "Without provision process during rollback time window"
 check:rc==0
@@ -276,7 +276,7 @@ cmd:cat /tmp/osdeploy.test |grep "Time for Phases"
 check:rc==0
 cmd:cat /tmp/osdeploy.test |grep NODE |awk '{print $4}'|grep SVRBOOT && cat /tmp/osdeploy.test |grep NODE |awk '{print $6}'|grep INSTALL && cat /tmp/osdeploy.test |grep NODE |awk '{print $8}'|grep POST && cat /tmp/osdeploy.test |grep NODE |awk '{print $10}'|grep POSTBOOT && cat /tmp/osdeploy.test |grep NODE |awk '{print $12}'|grep ELAPSED
 check:rc==0
-cmd:cat /tmp/osdeploy.test |grep  $$CN |awk '{print $4}' |grep -v NULL && cat /tmp/osdeploy.test |grep  $$CN |awk '{print $6}' |grep -v NULL && cat /tmp/osdeploy.test |grep  $$CN |awk '{print $8}' |grep -v NULL && cat /tmp/osdeploy.test |grep  $$CN |awk '{print $10}' |grep -v NULL  && cat /tmp/osdeploy.test |grep  $$CN |awk '{print $12}' |grep -v NULL  
+cmd:cat /tmp/osdeploy.test |grep  $$CN |awk '{print $4}' |grep -v NULL && cat /tmp/osdeploy.test |grep  $$CN |awk '{print $6}' |grep -v NULL && cat /tmp/osdeploy.test |grep  $$CN |awk '{print $8}' |grep -v NULL && cat /tmp/osdeploy.test |grep  $$CN |awk '{print $10}' |grep -v NULL  && cat /tmp/osdeploy.test |grep  $$CN |awk '{print $12}' |grep -v NULL
 check:rc==0
 cmd:rm -rf /tmp/osdeploy.test
 check:rc==0
@@ -324,7 +324,7 @@ cmd:cat /tmp/osdeploy.test |grep "Time for Phases"
 check:rc==0
 cmd:cat /tmp/osdeploy.test |grep NODE |awk '{print $4}'|grep SVRBOOT && cat /tmp/osdeploy.test |grep NODE |awk '{print $6}'|grep INSTALL && cat /tmp/osdeploy.test |grep NODE |awk '{print $8}'|grep POST && cat /tmp/osdeploy.test |grep NODE |awk '{print $10}'|grep POSTBOOT && cat /tmp/osdeploy.test |grep NODE |awk '{print $12}'|grep ELAPSED
 check:rc==0
-cmd:cat /tmp/osdeploy.test |grep  $$CN |grep -v FAIL |awk '{print $4}' |grep -v NULL  &&  cat /tmp/osdeploy.test |grep  $$CN |grep -v FAIl|awk '{print $6}' |grep -v NULL  &&  cat /tmp/osdeploy.test |grep  $$CN |grep -v FAIl |awk '{print $8}' |grep -v NULL  &&  cat /tmp/osdeploy.test |grep  $$CN |grep -v FAIL |awk '{print $10}' |grep -v NULL   &&  cat /tmp/osdeploy.test |grep  $$CN |grep -v FAIL |awk '{print $12}' |grep -v NULL 
+cmd:cat /tmp/osdeploy.test |grep  $$CN |grep -v FAIL |awk '{print $4}' |grep -v NULL  &&  cat /tmp/osdeploy.test |grep  $$CN |grep -v FAIl|awk '{print $6}' |grep -v NULL  &&  cat /tmp/osdeploy.test |grep  $$CN |grep -v FAIl |awk '{print $8}' |grep -v NULL  &&  cat /tmp/osdeploy.test |grep  $$CN |grep -v FAIL |awk '{print $10}' |grep -v NULL   &&  cat /tmp/osdeploy.test |grep  $$CN |grep -v FAIL |awk '{print $12}' |grep -v NULL
 check:rc==1
 cmd:rm -rf /tmp/osdeploy.test
 check:rc==0
diff --git a/xCAT-test/autotest/testcase/packimg/cases0 b/xCAT-test/autotest/testcase/packimg/cases0
index 92f14a549..87e636866 100644
--- a/xCAT-test/autotest/testcase/packimg/cases0
+++ b/xCAT-test/autotest/testcase/packimg/cases0
@@ -2,7 +2,7 @@ start:packimage_o_p_a_m
 os:Linux
 description:
 cmd:copycds $$ISO
-cmd:ls /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg;if [ $? -eq 0 ];then mv -f /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg /rootimg.bak;fi 
+cmd:ls /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg;if [ $? -eq 0 ];then mv -f /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg /rootimg.bak;fi
 cmd:ls /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.cpio.gz;if [ $? -eq 0 ];then mv -f /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.cpio.gz /rootimg.cpio.gz.bak;fi
 cmd:genimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute
 check:rc==0
@@ -106,7 +106,7 @@ cmd:if grep SUSE /etc/*release;then zypper install -y pigz;fi
 check:rc==0
 cmd:if grep Ubuntu /etc/*release;then apt-get install pigz -y; fi
 check:rc==0
-cmd:packimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute -m cpio -c pigz 
+cmd:packimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute -m cpio -c pigz
 check:rc==0
 check:output=~archive method:cpio
 check:output=~compress method:pigz
@@ -147,7 +147,7 @@ cmd:genimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute
 check:rc==0
 cmd:ls -l /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg
 check:rc==0
-cmd:packimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute -m cpio -c xz 
+cmd:packimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute -m cpio -c xz
 check:rc==0
 check:output=~archive method:cpio
 check:output=~compress method:xz
@@ -192,7 +192,7 @@ cmd:if grep SUSE /etc/*release;then zypper install -y pigz;fi
 check:rc==0
 cmd:if grep Ubuntu /etc/*release;then apt-get install pigz -y; fi
 check:rc==0
-cmd:packimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute -m tar -c pigz 
+cmd:packimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute -m tar -c pigz
 check:rc==0
 check:output=~archive method:tar
 check:output=~compress method:pigz
@@ -242,7 +242,7 @@ cmd:genimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute
 check:rc==0
 cmd:ls -l /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg
 check:rc==0
-cmd:packimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute -m tar -c gzip 
+cmd:packimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute -m tar -c gzip
 check:rc==0
 check:output=~archive method:tar
 check:output=~compress method:gzip
@@ -284,7 +284,7 @@ end
 
 start:packimage_m_tar_c_xz
 os:Linux
-description:test packimage -m tar -c xz 
+description:test packimage -m tar -c xz
 #cmd:copycds $$ISO
 cmd:ls /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg;if [ $? -eq 0 ];then mv -f /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg /rootimg.bak;fi
 cmd:ls /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.tar.xz;if [ $? -eq 0 ];then mv -f /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.tar.xz /rootimg.tar.xz.bak;fi
@@ -292,7 +292,7 @@ cmd:genimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute
 check:rc==0
 cmd:ls -l /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg
 check:rc==0
-cmd:packimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute -m tar -c xz 
+cmd:packimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute -m tar -c xz
 check:rc==0
 check:output=~archive method:tar
 check:output=~compress method:xz
@@ -341,7 +341,7 @@ cmd:genimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute
 check:rc==0
 cmd:ls -l /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg
 check:rc==0
-cmd:packimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute -m invalid 
+cmd:packimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute -m invalid
 check:rc!=0
 check:output=~Error: (\[.*?\]: )?Invalid archive method 'invalid' requested
 cmd:rm -rf /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg
diff --git a/xCAT-test/autotest/testcase/passwd/case0 b/xCAT-test/autotest/testcase/passwd/case0
index 0631a0b20..5ba6e8dcb 100644
--- a/xCAT-test/autotest/testcase/passwd/case0
+++ b/xCAT-test/autotest/testcase/passwd/case0
@@ -8,7 +8,7 @@ cmd:if grep Ubuntu /etc/*release;then if [ ! -e /install/__GETNODEATTR($$CN,os)_
 cmd:nodeset $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute
 check:rc==0
 cmd:grep '\$1\$' /install/autoinst/$$CN
-check:rc==0 
+check:rc==0
 cmd:oldcryptmethod=`cat /tmp/tmpcryptmethod |sed 's/\"//g'`;chtab key=system passwd.cryptmethod=$oldcryptmethod
 check:rc==0
 cmd:nodeset $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute
@@ -226,7 +226,7 @@ cmd:gettab key=system passwd.password > /tmp/tmppassword
 check:rc==0
 cmd:chtab key=system passwd.username=root passwd.password=`openssl passwd -1 abc123`
 check:rc==0
-cmd:gettab key=system passwd.password > /tmp/tmpcryptedpasswd 
+cmd:gettab key=system passwd.password > /tmp/tmpcryptedpasswd
 check:rc==0
 cmd:if grep Ubuntu /etc/*release;then if [ ! -e /install/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/install/netboot/initrd.gz ]; then copycds $$ISO;mkdir -p /install/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/install/netboot/;touch /install/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/install/netboot/initrd.gz;fi;fi
 cmd:nodeset $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute
diff --git a/xCAT-test/autotest/testcase/pdu/case0 b/xCAT-test/autotest/testcase/pdu/case0
index 82a8c57f7..d8fd13a25 100644
--- a/xCAT-test/autotest/testcase/pdu/case0
+++ b/xCAT-test/autotest/testcase/pdu/case0
@@ -23,7 +23,7 @@ cmd:lsdef -t pdu
 check:rc==0
 check:output=~$$PDU
 check:output=~pdu
-cmd:rmdef $$PDU 
+cmd:rmdef $$PDU
 check:rc==0
 cmd:lsdef $$PDU
 check:rc!=0
@@ -39,7 +39,7 @@ check:rc==0
 end
 
 start:noderm_pdu_object
-description:create a pdu object and use noderm to remove it 
+description:create a pdu object and use noderm to remove it
 cmd:mkdef $$PDU groups=pdu ip=$$PDUIP mgt=pdu nodetype=pdu
 check:rc==0
 cmd:lsdef -t pdu
@@ -122,7 +122,7 @@ check:rc==0
 end
 
 start:pdu_node_operation
-description:Verify operate node's pdu attribute could operate pdu 
+description:Verify operate node's pdu attribute could operate pdu
 cmd:mkdef $$PDU groups=pdu ip=$$PDUIP mgt=pdu nodetype=pdu
 check:rc==0
 cmd:makehosts $$PDU
@@ -140,7 +140,7 @@ cmd:rpower $$CN stat |awk -F: '{print $2}' > /tmp/cnstat
 check:rc==0
 cmd:rpower $$CN pdustat
 check:rc==0
-check:output=~$$CN: $$PDU outlet $$PORT is 
+check:output=~$$CN: $$PDU outlet $$PORT is
 cmd:rpower $$CN pduoff
 check:rc==0
 check:output=~$$CN: $$PDU outlet $$PORT is off
diff --git a/xCAT-test/autotest/testcase/performance/simulatorctl.sh b/xCAT-test/autotest/testcase/performance/simulatorctl.sh
index 764536862..de9647b33 100644
--- a/xCAT-test/autotest/testcase/performance/simulatorctl.sh
+++ b/xCAT-test/autotest/testcase/performance/simulatorctl.sh
@@ -165,4 +165,4 @@ elif [ "$1" = "clean" ]; then
 else
     echo "Error: not supported action."
     exit -1
-fi
\ No newline at end of file
+fi
diff --git a/xCAT-test/autotest/testcase/pkg/cases0 b/xCAT-test/autotest/testcase/pkg/cases0
index 47f81c176..62831a853 100644
--- a/xCAT-test/autotest/testcase/pkg/cases0
+++ b/xCAT-test/autotest/testcase/pkg/cases0
@@ -48,7 +48,7 @@ start:add_includeospkg_updatenode
 descreption:add include ospkg list
 cmd:copycds $$ISO
 check:rc==0
-cmd:perl /opt/xcat/share/xcat/tools/autotest/testcase/pkg/pkgtest.pl -i -g $$osimage -t pkglist -v __GETNODEATTR($$CN,os)__ 
+cmd:perl /opt/xcat/share/xcat/tools/autotest/testcase/pkg/pkgtest.pl -i -g $$osimage -t pkglist -v __GETNODEATTR($$CN,os)__
 check:rc==0
 cmd:updatenode $$CN -S
 check:rc==0
@@ -91,7 +91,7 @@ cmd:perl /opt/xcat/share/xcat/tools/autotest/testcase/pkg/pkgtest.pl -s -o -g $$
 check:rc==0
 cmd:updatenode $$CN -S
 check:rc==0
-cmd:sleep 10 
+cmd:sleep 10
 check:rc==0
 cmd:if echo "__GETNODEATTR($$CN,os)__" | grep ubuntu >/dev/null; then xdsh $$CN dpkg -l |grep xcat ;else xdsh $$CN rpm -qa |grep xCAT-test; fi
 check:rc==0
@@ -105,14 +105,14 @@ cmd:updatenode $$CN -S
 check:rc==0
 cmd:if echo "__GETNODEATTR($$CN,os)__" | grep ubuntu >/dev/null; then xdsh $$CN dpkg -l |grep xcat ;else xdsh $$CN rpm -qa |grep xCAT-test; fi
 check:rc!=0
-cmd:perl /opt/xcat/share/xcat/tools/autotest/testcase/pkg/pkgtest.pl -c -o -g $$osimage -t otherpkgdir -v __GETNODEATTR($$CN,os)__ 
+cmd:perl /opt/xcat/share/xcat/tools/autotest/testcase/pkg/pkgtest.pl -c -o -g $$osimage -t otherpkgdir -v __GETNODEATTR($$CN,os)__
 check:rc==0
 cmd:copycds $$ISO
 check:rc==0
 end
 
 start:add_other_pkg_include
-descreption:add other pkg include other list 
+descreption:add other pkg include other list
 cmd:copycds $$ISO
 check:rc==0
 cmd:perl /opt/xcat/share/xcat/tools/autotest/testcase/pkg/pkgtest.pl -i -o -g $$osimage -t otherpkgdir  -v __GETNODEATTR($$CN,os)__
diff --git a/xCAT-test/autotest/testcase/pkg/pkgtest.pl b/xCAT-test/autotest/testcase/pkg/pkgtest.pl
index b1f9ca2e4..ac7d876cf 100755
--- a/xCAT-test/autotest/testcase/pkg/pkgtest.pl
+++ b/xCAT-test/autotest/testcase/pkg/pkgtest.pl
@@ -4,7 +4,7 @@
 use strict;
 use warnings;
 use Getopt::Long;
-use Data::Dumper; 
+use Data::Dumper;
 use Term::ANSIColor;
 use Time::Local;
 BEGIN
@@ -56,7 +56,7 @@ sub getimgattr
 {
     my @output = `lsdef -t osimage -o  $osimg -i $attr`;
     my $pkglistvalue;
-    print " output is @output \n";   
+    print " output is @output \n";
     if($?){
         print "unkonw";
         return "Unknown";
@@ -70,9 +70,9 @@ sub getimgattr
     }    }
     return $pkglistvalue;
 }
- 
+
 sub setupenv
-{  
+{
       my $int = shift;
       if ($ospkg){
       `mkdir -p $int`;
@@ -83,12 +83,12 @@ sub setupenv
        if (($osver =~ /ubuntu/)&&($ospkg ==0)){
            `echo "rpm" >>/tmp/pkgtest.bak `;
            }else{
-           `echo "xCAT-test" >>/tmp/pkgtest.bak `; 
+           `echo "xCAT-test" >>/tmp/pkgtest.bak `;
            }
 }
 sub clearenv
 {
-    my $int = shift; 
+    my $int = shift;
     if ($ospkg ==0){
     `rm -rf /tmp/pkgtest.* `;
     `rm -rf /install/pkgtest`;
@@ -97,7 +97,7 @@ sub clearenv
      `rm -rf $int`;
      }
 }
- 
+
 sub setupenvinclude
 {
     my $int = shift;
@@ -131,7 +131,7 @@ sub removerpm
     `echo "-xCAT-test" >>/tmp/pkgtest.bak`;
     }
 }
- 
+
 if  ($needhelp)
 {
     &usage;
@@ -172,7 +172,7 @@ if ($removerpm)
     &removerpm($int);
 }
 if ($clearenv)
-{   
+{
     if (-f "/tmp/int"){
     my $int=`cat /tmp/int`;
     &clearenv($int);
diff --git a/xCAT-test/autotest/testcase/ppping/cases0 b/xCAT-test/autotest/testcase/ppping/cases0
index b36f9f62f..0ac88204d 100644
--- a/xCAT-test/autotest/testcase/ppping/cases0
+++ b/xCAT-test/autotest/testcase/ppping/cases0
@@ -16,7 +16,7 @@ start:ppping_node
 description:ppping node
 Attribute: $$CN-The operation object of ppping command
 cmd:ping -c 3 $$CN > /dev/null 2>&1;if [[ $? -eq 1 ]]; then output=`ppping $$CN`;if [[ $? -eq 1 ]]&&[[ $output =~ "noping" ]];then exit 0;else exit 1;fi;else output=`ppping $$CN`; if [[ $? -eq 0 ]]&&[[ $output =~ "pinged all nodes successfully" ]];then exit 0;else exit 1;fi;fi
-check:rc==0 
+check:rc==0
 end
 
 start:ppping_V_node
diff --git a/xCAT-test/autotest/testcase/probe/detect_dhcpd b/xCAT-test/autotest/testcase/probe/detect_dhcpd
index f88141463..b67ae4495 100644
--- a/xCAT-test/autotest/testcase/probe/detect_dhcpd
+++ b/xCAT-test/autotest/testcase/probe/detect_dhcpd
@@ -29,9 +29,9 @@ mac=""
 nic=""
 declare -a array=(`lsdef $cn -i mac -c|awk -F"=" '{print $2}'|sed 's/|/ /g'`)
 for i in "${array[@]}"
-do 
+do
     if ! echo $i|grep -q  NOIP
-    then 
+    then
        mac=$i
        break
     fi
@@ -40,6 +40,6 @@ mn=`lsdef -t site -i master -c|awk -F"=" '{print $2}'`
 nic=`ip -4 -o a|grep $mn|awk -F" " '{print $2}'`
 xcatprobe -w detect_dhcpd -i $nic -m $mac
 check:output !~ There are 0 servers replied to dhcp discover
-check:output =~ Server:__GETTABLEVALUE(key,master,value,site)__ assign IP .+__GETNODEATTR($$CN,ip)__ 
+check:output =~ Server:__GETTABLEVALUE(key,master,value,site)__ assign IP .+__GETNODEATTR($$CN,ip)__
 cmd:rm -rf /tmp/detect_dhcpd_work; if [ -d "/tmp/detect_dhcpd_work.bak" ]; then mv /tmp/detect_dhcpd_work.bak /tmp/detect_dhcpd_work;fi
 end
diff --git a/xCAT-test/autotest/testcase/psh/cases0 b/xCAT-test/autotest/testcase/psh/cases0
index fed79f18a..f1ad5ad39 100644
--- a/xCAT-test/autotest/testcase/psh/cases0
+++ b/xCAT-test/autotest/testcase/psh/cases0
@@ -49,9 +49,11 @@ description: psh -i interface CN 'uptime' in linux
 os:Linux
 cmd:cp /etc/hosts /etc/hostsBK
 check:rc==0
-cmd:interface=`xdsh $$CN  'ifconfig' | sed -n 1p | awk -F : '{print $2}' | awk -F ' ' '{print $1}'`;sed -i "/$$CN/s/$/ $$CN-$interface/g" '/etc/hosts';psh -i $interface $$CN 'uptime'
+cmd:grep $$CN /etc/hosts
+cmd:interface=`xdsh $$CN 'ip route' | awk '/default/ { for (i = 1; i <= NF; ++i) if ("dev" == $i) { print $(i + 1) ; exit } }'`; echo "interface=$interface"; sed -i "/$$CN/s/$/ $$CN-$interface/g" '/etc/hosts';psh -i $interface $$CN 'uptime'
 check:output=~$$CN
 check:rc==0
+cmd:grep $$CN /etc/hosts
 cmd:rm -rf /etc/hosts
 cmd:cp /etc/hostsBK /etc/hosts
 check:rc==0
diff --git a/xCAT-test/autotest/testcase/pythonsupport/cases0 b/xCAT-test/autotest/testcase/pythonsupport/cases0
index eb3cb55ae..37c63b03b 100644
--- a/xCAT-test/autotest/testcase/pythonsupport/cases0
+++ b/xCAT-test/autotest/testcase/pythonsupport/cases0
@@ -31,7 +31,7 @@ cmd:sed -i "s|__REPLACE_PATH__FED__|$$PYTHON_DEP_FED_DIR|" /etc/yum.repos.d/xcat
 check:rc==0
 cmd: cat /etc/yum.repos.d/xcat-dep-python-local.repo
 check:rc==0
-cmd:yum install -y  xCAT-openbmc-py  
+cmd:yum install -y  xCAT-openbmc-py
 check:rc==0
 cmd:rpm -qa|grep "^xCAT-openbmc-py"
 check:output=~ xCAT-openbmc-py-\d
diff --git a/xCAT-test/autotest/testcase/rbeacon/cases0 b/xCAT-test/autotest/testcase/rbeacon/cases0
index 6b007bfe1..e79195072 100644
--- a/xCAT-test/autotest/testcase/rbeacon/cases0
+++ b/xCAT-test/autotest/testcase/rbeacon/cases0
@@ -15,11 +15,11 @@ hcp:openbmc
 label:cn_bmc_ready,hctrl_openbmc
 cmd:rbeacon $$CN stat
 check:rc==0
-check:output=~$$CN\s*:\s*Front:Off Rear:Off|Front:On Rear:On|Front:Off Rear:On|Front:On Rear:Off|Front:Blink Rear:Blink 
+check:output=~$$CN\s*:\s*Front:Off Rear:Off|Front:On Rear:On|Front:Off Rear:On|Front:On Rear:Off|Front:Blink Rear:Blink
 end
 
 start:rbeacon_help
-description: this case is to test rbeacon -h and --help output 
+description: this case is to test rbeacon -h and --help output
 os:Linux
 hcp:openbmc
 label:mn_only,hctrl_openbmc
@@ -49,7 +49,7 @@ check:output =~git commit
 end
 
 start:rbeacon_false
-description: this case is to test rbeacon could process false input 
+description: this case is to test rbeacon could process false input
 os:Linux
 hcp:openbmc
 label:cn_bmc_ready,hctrl_openbmc
diff --git a/xCAT-test/autotest/testcase/regnotif/case0 b/xCAT-test/autotest/testcase/regnotif/case0
index 2fcb65d2a..fe5a4aed9 100644
--- a/xCAT-test/autotest/testcase/regnotif/case0
+++ b/xCAT-test/autotest/testcase/regnotif/case0
@@ -37,7 +37,7 @@ end
 start:regnotif_h
 description:regnotif -h and --help
 label:mn_only,db
-cmd:regnotif -h 
+cmd:regnotif -h
 check:rc==0
 check:output=~Usage
 cmd:regnotif --help
diff --git a/xCAT-test/autotest/testcase/restapi/group/cases0 b/xCAT-test/autotest/testcase/restapi/group/cases0
index e7f170b66..ea26e4d11 100644
--- a/xCAT-test/autotest/testcase/restapi/group/cases0
+++ b/xCAT-test/autotest/testcase/restapi/group/cases0
@@ -14,7 +14,7 @@ end
 
 start:put_group_all
 description: put_group_all
-cmd:restapitest -m PUT -r /groups/all -d '{"mgt":"dfm","netboot":"yaboot"}' 
+cmd:restapitest -m PUT -r /groups/all -d '{"mgt":"dfm","netboot":"yaboot"}'
 check:rc==200
 end
 
diff --git a/xCAT-test/autotest/testcase/restapi/osimage/cases0 b/xCAT-test/autotest/testcase/restapi/osimage/cases0
index 233acfe96..3335577b4 100644
--- a/xCAT-test/autotest/testcase/restapi/osimage/cases0
+++ b/xCAT-test/autotest/testcase/restapi/osimage/cases0
@@ -84,7 +84,7 @@ end
 
 start:delete_images
 description: delete_images
-cmd:restapitest -m DELETE -r /osimages/rhels6.5-x86_64-statelite-service/instance 
+cmd:restapitest -m DELETE -r /osimages/rhels6.5-x86_64-statelite-service/instance
 check:rc==200
 end
 
diff --git a/xCAT-test/autotest/testcase/restapi/policy/cases0 b/xCAT-test/autotest/testcase/restapi/policy/cases0
index d007d40e3..73ae1b306 100644
--- a/xCAT-test/autotest/testcase/restapi/policy/cases0
+++ b/xCAT-test/autotest/testcase/restapi/policy/cases0
@@ -1,6 +1,6 @@
 start:get_policy_all
 description: get_policy_all
-cmd:restapitest -m GET -r /policy 
+cmd:restapitest -m GET -r /policy
 check:rc==200
 cmdcheck:restapitest -o '["1"]' -O ==
 end
diff --git a/xCAT-test/autotest/testcase/reventlog/cases0 b/xCAT-test/autotest/testcase/reventlog/cases0
index b07293b9d..8828a85cb 100644
--- a/xCAT-test/autotest/testcase/reventlog/cases0
+++ b/xCAT-test/autotest/testcase/reventlog/cases0
@@ -23,7 +23,7 @@ start:reventlog_numofentries
 label:cn_bmc_ready,hctrl_general
 cmd:reventlog $$CN 5
 check:rc==0
-check:output=~$$CN\s*:\s*.*\d\d/\d\d/\d\d\s*\S+|$$CN: no SEL entries|Entry|No attributes returned from the BMC 
+check:output=~$$CN\s*:\s*.*\d\d/\d\d/\d\d\s*\S+|$$CN: no SEL entries|Entry|No attributes returned from the BMC
 end
 
 start:reventlog_s_openbmc
diff --git a/xCAT-test/autotest/testcase/rflash/rflash_openbmc.0 b/xCAT-test/autotest/testcase/rflash/rflash_openbmc.0
index 4853e8dfa..e53d25715 100644
--- a/xCAT-test/autotest/testcase/rflash/rflash_openbmc.0
+++ b/xCAT-test/autotest/testcase/rflash/rflash_openbmc.0
@@ -203,7 +203,7 @@ label:cn_bmc_ready,hctrl_openbmc
 cmd:rflash $$CN -c /tmp/abc123.tz /tmp/abc124.tz
 check:output=~Error: (\[.*?\]: )?Invalid firmware specified with
 check:rc != 0
-cmd:rflash $$CN -c  1.tz 2.tz 3.tz 
+cmd:rflash $$CN -c  1.tz 2.tz 3.tz
 check:output=~Error: (\[.*?\]: )?Invalid firmware specified with
 check:rc != 0
 cmd:rflash $$CN 1.tz 2.tz 3.tz -c
@@ -320,7 +320,7 @@ cmd:rflash $$CN -u /tmp/abc123.tz /tmp/abc124.tz
 check:output=~Error: (\[.*?\]: )?Invalid firmware specified with
 check:output!~Attempting to
 check:rc != 0
-cmd:rflash $$CN -u 1.tz 2.tz 3.tz 
+cmd:rflash $$CN -u 1.tz 2.tz 3.tz
 check:output=~Error: (\[.*?\]: )?Invalid firmware specified with
 check:output!~Attempting to
 check:rc != 0
@@ -341,7 +341,7 @@ hcp:openbmc
 label:cn_bmc_ready,hctrl_openbmc
 cmd:rflash $$CN -a /tmp/abc123.tz
 check:output=~rror: Invalid firmware specified with
-check:output!~Attempting to 
+check:output!~Attempting to
 check:rc != 0
 cmd:rflash $$CN -a /tmp/
 check:output=~rror: Invalid firmware specified with
@@ -357,7 +357,7 @@ check:output!~Attempting to
 check:rc != 0
 cmd:rflash $$CN 1.tar -a
 check:output=~Error: (\[.*?\]: )?Cannot access
-check:output!~Attempting to 
+check:output!~Attempting to
 check:rc != 0
 cmd:rflash $$CN -a /tmp/1.tar
 check:output=~Error: (\[.*?\]: )?Cannot access
@@ -376,7 +376,7 @@ check:output!~Attempting to
 check:rc != 0
 cmd:rflash $$CN -a 1.tz 2.tz 3.tz
 check:output=~Error: (\[.*?\]: )?More than one firmware specified is not supported
-check:output!~Attempting to 
+check:output!~Attempting to
 check:rc != 0
 cmd:rflash $$CN 1.tz 2.tz 3.tz -a
 check:output=~Error: (\[.*?\]: )?More than one firmware specified is not supported
@@ -388,9 +388,9 @@ check:output!~Attempting to
 check:rc != 0
 cmd:rflash $$CN 1234567 -a 2345678
 check:output=~Error: (\[.*?\]: )?More than one firmware specified is not supported
-check:output!~Attempting to 
+check:output!~Attempting to
 check:rc != 0
-cmd:rflash $$CN -a 123 abc asdbas 
+cmd:rflash $$CN -a 123 abc asdbas
 check:output=~Error: (\[.*?\]: )?More than one firmware specified is not supported
 check:output!~Attempting to
 check:rc != 0
@@ -415,7 +415,7 @@ description: basic usage check for option delete. if there are multiple value as
 os:Linux
 hcp:openbmc
 label:cn_bmc_ready,hctrl_openbmc
-cmd:rflash $$CN --delete 1234567 2345678 
+cmd:rflash $$CN --delete 1234567 2345678
 check:output=~Error: (\[.*?\]: )?More than one firmware specified is not supported
 check:output!~Attempting to delete
 check:rc != 0
@@ -449,15 +449,15 @@ hcp:openbmc
 label:cn_bmc_ready,hctrl_openbmc
 cmd:rflash $$CN -d /123/   /234/
 check:output=~Error: (\[.*?\]: )?More than one
-check:output!~Attempting to 
+check:output!~Attempting to
 check:rc != 0
 cmd:rflash $$CN /123/   /234/  -d
-check:output=~Error: (\[.*?\]: )?More than one 
+check:output=~Error: (\[.*?\]: )?More than one
 check:output!~Attempting to
 check:rc != 0
 cmd:rflash $$CN /123/ -d /234/
-check:output=~Error: (\[.*?\]: )?More than one 
-check:output!~Attempting to 
+check:output=~Error: (\[.*?\]: )?More than one
+check:output!~Attempting to
 check:rc != 0
 end
 
@@ -469,9 +469,9 @@ hcp:openbmc
 label:cn_bmc_ready,hctrl_openbmc
 cmd:rm -rf /tmp/bogus123
 check:rc == 0
-cmd:rflash $$CN -d /tmp/bogus123 
+cmd:rflash $$CN -d /tmp/bogus123
 check:output=~Error: (\[.*?\]: )?Can't open directory
-check:output!~Attempting to 
+check:output!~Attempting to
 check:rc != 0
 cmd:rflash $$CN /tmp/bogus123
 check:output=~Error: (\[.*?\]: )?Invalid option specified
@@ -482,13 +482,13 @@ cmd:rflash $$CN /tmp/bogus123 -d
 check:output =~Error: (\[.*?\]: )?No BMC tar file found|Can't open directory
 check:output!~Attempting to
 check:rc != 0
-cmd:touch /tmp/bogus123/obmc-phosphor-image-witherspoon.ubi.mtd.tar 
+cmd:touch /tmp/bogus123/obmc-phosphor-image-witherspoon.ubi.mtd.tar
 check:rc == 0
 cmd:rflash $$CN -d /tmp/bogus123
 check:output =~Error: (\[.*?\]: )?No BMC tar file found|Can't open directory
 check:output!~Attempting to
 check:rc != 0
-cmd:touch /tmp/bogus123/witherspoon.pnor.squashfs.tar 
+cmd:touch /tmp/bogus123/witherspoon.pnor.squashfs.tar
 check:rc == 0
 cmd:rflash $$CN -d /tmp/bogus123
 check:output =~Error: (\[.*?\]: )?No BMC tar file found|Can't open directory
@@ -507,7 +507,7 @@ cmd:rflash -h
 check:output =~Usage:
 check:output =~OpenPOWER OpenBMC specific:
 check:output =~ -d.+no-host-reboot
-check:output =~ image_id.+--delete 
+check:output =~ image_id.+--delete
 check:rc == 0
 end
 
@@ -518,7 +518,7 @@ hcp:openbmc
 label:cn_bmc_ready,hctrl_openbmc
 cmd:activenum=`rflash $$CN -l |grep -w "Host\s*Active(\*)" |awk '{print $2}'`;rflash $$CN $activenum --delete
 check:rc != 0
-check:output =~$$CN\s*:\s*(\[.*?\]: )?Error: Deleting currently active firmware on powered on host is not supported 
+check:output =~$$CN\s*:\s*(\[.*?\]: )?Error: Deleting currently active firmware on powered on host is not supported
 cmd:activenum=`rflash $$CN -l |grep -w "BMC\s*Active(\*)" |awk '{print $2}'`;rflash $$CN $activenum --delete
 check:rc != 0
 check:output =~~$$CN\s*:\s*(\[.*?\]: )?Error: Deleting currently active BMC firmware is not supported
diff --git a/xCAT-test/autotest/testcase/rinv/cases0 b/xCAT-test/autotest/testcase/rinv/cases0
index 38634c382..e9f50487d 100644
--- a/xCAT-test/autotest/testcase/rinv/cases0
+++ b/xCAT-test/autotest/testcase/rinv/cases0
@@ -32,7 +32,7 @@ check:output=~Version
 end
 
 start:rinv_bus
-description:rinv list all buses for each I/O slot 
+description:rinv list all buses for each I/O slot
 Attribute: $$CN-The operation object of rinv command
 label:cn_bmc_ready,hctrl_fsp
 cmd:rinv $$CN bus
@@ -41,7 +41,7 @@ check:output=~I/O Bus Information
 end
 
 start:rinv_config
-description:Retrieves number of processors, speed, total memory, and DIMM locations. 
+description:Retrieves number of processors, speed, total memory, and DIMM locations.
 Attribute: $$CN-The operation object of rinv command
 label:cn_bmc_ready,hctrl_fsp
 cmd:rinv $$CN config
@@ -154,7 +154,7 @@ check:rc==0
 cmd:rinv $$CN all
 check:rc==1
 check:output=~$$CN: (\[.*?\]: )?Error:.+Invalid username or password|Error: (\[.*?\]: )?ERROR: Incorrect password provided
-cmd:cat /tmp/testnode.stanza | chdef -z;rm -rf /tmp/testnode.stanza 
+cmd:cat /tmp/testnode.stanza | chdef -z;rm -rf /tmp/testnode.stanza
 check:rc==0
 end
 
diff --git a/xCAT-test/autotest/testcase/rinv/cases2 b/xCAT-test/autotest/testcase/rinv/cases2
index 45f2b071b..9c9afb3cc 100644
--- a/xCAT-test/autotest/testcase/rinv/cases2
+++ b/xCAT-test/autotest/testcase/rinv/cases2
@@ -3,7 +3,7 @@ description:this case is to test mprom option for rinv on x86_64 servers.
 hcp:ipmi
 arch:x86_64
 label:cn_bmc_ready,hctrl_bmc_ipmi
-cmd:rinv $$CN mprom 
+cmd:rinv $$CN mprom
 check:rc==0
 check:output=~BMC Firmware:\s*\w+.\w+
 end
@@ -13,7 +13,7 @@ description:this case is to test guid option for rinv on x86_64 servers.
 hcp:ipmi
 arch:x86_64
 label:cn_bmc_ready,hctrl_bmc_ipmi
-cmd:rinv $$CN guid 
+cmd:rinv $$CN guid
 check:rc==0
 check:output=~UUID/GUID:\s*\w+-\w+-\w+-\w+-\w+
 end
diff --git a/xCAT-test/autotest/testcase/rmdef/cases0 b/xCAT-test/autotest/testcase/rmdef/cases0
index e84a5365a..57c1c074c 100644
--- a/xCAT-test/autotest/testcase/rmdef/cases0
+++ b/xCAT-test/autotest/testcase/rmdef/cases0
@@ -53,7 +53,7 @@ end
 start:rmdef_t_o_network
 description:rmdef -t network
 label:mn_only,db
-cmd:mkdef -t network -o testnet net=1.2.3.0 mask=255.0.0.0 gateway=1.2.3.1 
+cmd:mkdef -t network -o testnet net=1.2.3.0 mask=255.0.0.0 gateway=1.2.3.1
 check:rc==0
 cmd:lsdef -t network
 check:output=~testnet
@@ -138,7 +138,7 @@ check:output=~not a valid
 end
 
 start:rmdef_template
-description:try to delete a template, then error messages appear 
+description:try to delete a template, then error messages appear
 label:mn_only,db
 cmd:result=`lsdef | grep  switch-template`; if [[ $result =~ "switch-template" ]]; then echo $result; noderm switch-template; fi
 cmd:rmdef switch-template
diff --git a/xCAT-test/autotest/testcase/rmkit/case0 b/xCAT-test/autotest/testcase/rmkit/case0
index 71274f61c..b0683ed37 100644
--- a/xCAT-test/autotest/testcase/rmkit/case0
+++ b/xCAT-test/autotest/testcase/rmkit/case0
@@ -62,7 +62,7 @@ check:rc==0
 check:output=~Kit mykits-1.0-1 was successfully added
 cmd:mkdef testimage -u profile=compute provmethod=install osarch=__GETNODEATTR($$CN,arch)__
 check:rc==0
-cmd:kitcompname=`lskit mykits-1.0-1 |grep kitcompname|awk -F= '{print $2}'`;addkitcomp -i testimage $kitcompname  
+cmd:kitcompname=`lskit mykits-1.0-1 |grep kitcompname|awk -F= '{print $2}'`;addkitcomp -i testimage $kitcompname
 check:rc==0
 check:output=~Assigning kit component
 cmd:rmkit -t mykits-1.0-1
diff --git a/xCAT-test/autotest/testcase/rmkitcomp/case0 b/xCAT-test/autotest/testcase/rmkitcomp/case0
index 2cd12c966..070efb702 100644
--- a/xCAT-test/autotest/testcase/rmkitcomp/case0
+++ b/xCAT-test/autotest/testcase/rmkitcomp/case0
@@ -36,10 +36,10 @@ check:rc==0
 check:output=~successfully added
 cmd:mkdef testimage -u profile=compute provmethod=install osarch=ppc64el
 check:rc==0
-cmd:addkitcomp -i testimage -a ubuntukit-compute-2 
+cmd:addkitcomp -i testimage -a ubuntukit-compute-2
 check:rc==0
 check:output=~Assigning kit component ubuntukit-compute-2
-cmd:lsdef -t osimage -o testimage 
+cmd:lsdef -t osimage -o testimage
 check:rc==0
 check:output=~postbootscripts
 cmd:rmkitcomp -i testimage -f ubuntukit-compute-2-1.0-1-ubuntu-14.04-ppc64el --noscripts
diff --git a/xCAT-test/autotest/testcase/rpower/cases0 b/xCAT-test/autotest/testcase/rpower/cases0
index 399ab93a3..c87c569c4 100644
--- a/xCAT-test/autotest/testcase/rpower/cases0
+++ b/xCAT-test/autotest/testcase/rpower/cases0
@@ -1,5 +1,5 @@
 start:rpower_off
-description:This case is to test off option could remote power off nodes 
+description:This case is to test off option could remote power off nodes
 Attribute: $$CN-The operation object of rpower command
 label:cn_bmc_ready,hctrl_general
 cmd:rpower $$CN on
@@ -35,7 +35,7 @@ check:output=~Not Activated|off
 end
 
 start:rpower_boot
-description:This case is to test boot option could power on the nodes if nodes in off state.  Or could  hard reset the nodes if they are on. 
+description:This case is to test boot option could power on the nodes if nodes in off state.  Or could  hard reset the nodes if they are on.
 Attribute: $$CN-The operation object of rpower command
 label:cn_bmc_ready,hctrl_general
 cmd:rpower $$CN off
@@ -122,7 +122,7 @@ end
 
 start:rpower_err_noderange
 description:This case is to test rpower could process error usage and return help information.
-Attribute:N/A 
+Attribute:N/A
 label:mn_only,hctrl_general
 cmd:rpower testnode stat
 check:rc!=0
@@ -130,7 +130,7 @@ check:output=~Error
 end
 
 start:rpower_softoff
-description:This case is to test softoff option could remote shutdown nodes 
+description:This case is to test softoff option could remote shutdown nodes
 Attribute: $$CN-The operation object of rpower command
 label:cn_bmc_ready,hctrl_fsp,hctrl_openbmc
 cmd:rpower $$CN on
@@ -144,7 +144,7 @@ check:output=~Not Activated|off
 end
 
 start:rpower_onstandby
-description:This case is to test onstandby option could bring server to standby state 
+description:This case is to test onstandby option could bring server to standby state
 Attribute: $$CN-The operation object of rpower command
 label:cn_bmc_ready,hctrl_fsp
 arch:ppc64
@@ -159,12 +159,12 @@ check:ouptut=~standby|Standby
 end
 
 start:rpower_wrongpasswd
-description:rpower ipmi and openbmc using wrong passwd  
+description:rpower ipmi and openbmc using wrong passwd
 Attribute: $$CN-The operation object of rpower command
 label:cn_bmc_ready,hctrl_openpower_ipmi
 cmd:/opt/xcat/share/xcat/tools/autotest/testcase/rpower/rpower_wrongpasswd_test.sh  -pt $$CN  $$bmcpasswd $$bmcusername
 check:rc==0
-cmd:/opt/xcat/share/xcat/tools/autotest/testcase/rpower/rpower_wrongpasswd_test.sh  -c $$CN 
+cmd:/opt/xcat/share/xcat/tools/autotest/testcase/rpower/rpower_wrongpasswd_test.sh  -c $$CN
 check:rc==0
 cmd:/opt/xcat/share/xcat/tools/autotest/testcase/rpower/rpower_wrongpasswd_test.sh  -apt $$CN  $$bmcpasswd $$bmcusername
 check:rc==0
@@ -198,7 +198,7 @@ check:rc==1
 end
 
 start:rpower_bmcreboot_perl_python_output
-description:record the output for rpower bmcreboot and compare the output for perl and python version. 
+description:record the output for rpower bmcreboot and compare the output for perl and python version.
 hcp:openbmc
 label:cn_bmc_ready,hctrl_openbmc
 cmd: /opt/xcat/share/xcat/tools/autotest/testcase/UT_openbmc/scripts/bmcreboot.sh $$CN /tmp/xcattest.rpower.bmcstate.perl.out PERL
diff --git a/xCAT-test/autotest/testcase/rpower/rpower_wrongpasswd_test.sh b/xCAT-test/autotest/testcase/rpower/rpower_wrongpasswd_test.sh
index 1e0b41222..45b1b1891 100755
--- a/xCAT-test/autotest/testcase/rpower/rpower_wrongpasswd_test.sh
+++ b/xCAT-test/autotest/testcase/rpower/rpower_wrongpasswd_test.sh
@@ -39,7 +39,7 @@ function clear_env(){
     if [ -f $TMPFILE ];then
         Username=`cat $TMPFILE |awk -F "\""  '{print $4}'`;
         Passwd=`cat $TMPFILE |awk -F "\""  '{print $6}'`;
-        chtab key=$MGT passwd.password=$Passwd passwd.username=$Username;tabdump passwd; 
+        chtab key=$MGT passwd.password=$Passwd passwd.username=$Username;tabdump passwd;
         chdef $1 bmcpassword= bmcusername=;
         rm -rf $TMPFILE;
     else
@@ -51,9 +51,9 @@ function check_result(){
 output=$(rpower $1 stat  2>&1)
 echo output is $output
 value="";
-    if [[ `lsdef $1 |grep mgt ` =~ "ipmi" ]];then 
+    if [[ `lsdef $1 |grep mgt ` =~ "ipmi" ]];then
         value="Incorrect password provided";
-    else 
+    else
         value="Error: Invalid username or password";
     fi
         if [[ $output =~ $value ]];then
@@ -75,14 +75,14 @@ MGT=""
     else
         MGT="openbmc";
     fi
-echo mgt is $MGT 
+echo mgt is $MGT
 while [ "$#" -gt "0" ]
 do
         case $1 in
                 "-pt"|"--passwdtable" )
                 check_passwd_table
-                    if [[ $? -eq 0 ]];then  
-                        modify_passwd_table 
+                    if [[ $? -eq 0 ]];then
+                        modify_passwd_table
                         check_result $2
                             if [[ $? -eq 1 ]];then
                                 exit 1
@@ -103,7 +103,7 @@ do
                 "-apt"|"--addpasswdtable" )
                 check_passwd_table
                     if [[ $? -eq 0 ]];then
-                        `chtab -d key=ipmi passwd`;                        
+                        `chtab -d key=ipmi passwd`;
                             if [[ $? -eq 1 ]];then
                                 exit 1
                             fi
@@ -117,7 +117,7 @@ do
                         fi
                 ;;
                 "-c"|"--clear" )
-                clear_env $2 
+                clear_env $2
                 if [[ $? -eq 1 ]];then
                     exit 1
                 else
diff --git a/xCAT-test/autotest/testcase/rsetboot/cases0 b/xCAT-test/autotest/testcase/rsetboot/cases0
index 20e563ee5..1b32f4fa8 100644
--- a/xCAT-test/autotest/testcase/rsetboot/cases0
+++ b/xCAT-test/autotest/testcase/rsetboot/cases0
@@ -15,7 +15,7 @@ check:rc==0
 cmd:if [[ -f /tmp/rsetboot.stat.bak ]];then mv -f /tmp/rsetboot.stat.bak /tmp/rsetboot.stat;else rm -rf /tmp/rsetboot.stat;fi
 check:rc==0
 end
- 
+
 start:rsetboot_net_statcheck
 description:set the boot device from net
 Attribute: $$CN-The operation object of rsetboot command.
@@ -135,7 +135,7 @@ check:output=~Error: (\[.*?\]: )?unsupported command|Unsupported command
 end
 
 start:rsetboot_group_net
-description:rsetboot group node 
+description:rsetboot group node
 Attribute: $$CN-The operation object of rsetboot command.
 label:cn_bmc_ready,hctrl_openbmc,hctrl_bmc_ipmi
 cmd:test=$(lsdef testnode);if [[ $? -eq 0 ]]; then lsdef -l testnode -z >/tmp/testnode.stanza ;rmdef testnode;fi
diff --git a/xCAT-test/autotest/testcase/rspconfig/cases0 b/xCAT-test/autotest/testcase/rspconfig/cases0
index 9d6578b5d..c69df2a04 100644
--- a/xCAT-test/autotest/testcase/rspconfig/cases0
+++ b/xCAT-test/autotest/testcase/rspconfig/cases0
@@ -69,7 +69,7 @@ check:rc==0
 end
 
 start:rspconfig_set_ip
-description:To test change openbmc ip separately by rspconfig. should not support and throw out error message 
+description:To test change openbmc ip separately by rspconfig. should not support and throw out error message
 Attribute: $$CN-The operation object of rspconfig command
 os:Linux
 hcp:openbmc
@@ -105,7 +105,7 @@ check:rc!=0
 end
 
 start:rspconfig_set_netmask
-description:To test change openbmc netmask separately by rspconfig. should not support and throw out error message 
+description:To test change openbmc netmask separately by rspconfig. should not support and throw out error message
 Attribute: $$CN-The operation object of rspconfig command
 os:Linux
 hcp:openbmc
@@ -129,7 +129,7 @@ cmd:rspconfig $$CN netmask= ip=__GETNODEATTR($$CN,bmc)__ gateway=0.0.0.0
 check:output=~Error: (\[.*?\]: )?Invalid parameter for option netmask
 check:rc!=0
 end
- 
+
 start:rspconfig_set_gateway
 description:To test change openbmc gateway by rspconfig. should not support and throw out error message
 Attribute: $$CN-The operation object of rspconfig command
@@ -157,10 +157,10 @@ start:rspconfig_set_all
 description:rspconfig change openbmc ip/netmask/gateway/vlan
 Attribute: $$CN-The operation object of rspconfig command
 label:cn_bmc_ready,hctrl_openbmc
-cmd:/opt/xcat/share/xcat/tools/autotest/testcase/rspconfig/rspconfig.sh -a  $$CN 
+cmd:/opt/xcat/share/xcat/tools/autotest/testcase/rspconfig/rspconfig.sh -a  $$CN
 check:rc==0
 end
- 
+
 start:rspconfig_gateway_invalid
 despcription:rspconfig could not change openbmc gatway using invalid gateway
 Attribute: $$CN-The operation object of rspconfig command
@@ -231,7 +231,7 @@ end
 start:rspconfig_list_ip
 despcription:rspconfig list bmc ip
 label:cn_bmc_ready,hctrl_bmc_ipmi,hctrl_openbmc
-cmd:rspconfig $$CN ip 
+cmd:rspconfig $$CN ip
 check:rc==0
 check:output=~__GETNODEATTR($$CN,bmc)__
 end
@@ -251,7 +251,7 @@ hcp:openbmc
 description:rspconfig list openbmc netmask
 Attribute: $$CN-The operation object of rspconfig command
 label:cn_bmc_ready,hctrl_bmc_ipmi,hctrl_openbmc
-cmd:rspconfig $$CN netmask 
+cmd:rspconfig $$CN netmask
 check:rc==0
 check:output=~$$CN: BMC Netmask:
 end
@@ -266,7 +266,7 @@ check:output=~$$CN: BMC VLAN ID:
 end
 
 start:rspconfig_list_all
-description:rspconfig list openbmc ip gateway netmask vlan 
+description:rspconfig list openbmc ip gateway netmask vlan
 Attribute: $$CN-The operation object of rspconfig command
 label:cn_bmc_ready,hctrl_bmc_ipmi,hctrl_openbmc
 cmd: rspconfig $$CN ip gateway netmask vlan
@@ -283,7 +283,7 @@ description:when bmc=<ip>, rspconfig <node> hostname=* should throw out error
 os:Linux
 hcp:openbmc
 label:cn_bmc_ready,hctrl_openbmc
-#in automation environment, bmc is ip by default. 
+#in automation environment, bmc is ip by default.
 cmd:lsdef $$CN -i bmc -c
 check:rc == 0
 cmd:rspconfig $$CN hostname=*
@@ -294,7 +294,7 @@ end
 
 
 start:rspconfig_set_hostname_equal_star_with_bmc_is_hostname
-description:when bmc=<bmc_hostname>, rspconfig <node> hostname=* should set bmc_hostname into bmc 
+description:when bmc=<bmc_hostname>, rspconfig <node> hostname=* should set bmc_hostname into bmc
 os:Linux
 hcp:openbmc
 label:cn_bmc_ready,hctrl_openbmc
@@ -328,7 +328,7 @@ check:rc == 0
 end
 
 start:rspconfig_get_hostname
-description:To test get bmc hostname by rspconfig. 
+description:To test get bmc hostname by rspconfig.
 os:Linux
 hcp:openbmc
 label:cn_bmc_ready,hctrl_openbmc
@@ -336,7 +336,7 @@ cmd:mkdir -p /tmp/rspconfig_get_hostname
 check:rc == 0
 cmd:rspconfig $$CN sshcfg
 check:rc == 0
-cmd:ssh __GETNODEATTR($$CN,bmc)__ "hostname" | tee /tmp/rspconfig_get_hostname/working_hostname 
+cmd:ssh __GETNODEATTR($$CN,bmc)__ "hostname" | tee /tmp/rspconfig_get_hostname/working_hostname
 check:rc == 0
 cmd:cat  /tmp/rspconfig_get_hostname/working_hostname
 check:rc == 0
@@ -378,7 +378,7 @@ cmd:rspconfig $$CN sshcfg
 check:rc == 0
 cmd:ssh __GETNODEATTR($$CN,bmc)__ "hostname" | tee /tmp/rspconfig_set_hostname/working_hostname
 check:rc == 0
-cmd:a=$(cat /tmp/rspconfig_set_hostname/working_hostname); rspconfig $$CN hostname=test_$a |tee /tmp/rspconfig_set_hostname/rspconfig_output 
+cmd:a=$(cat /tmp/rspconfig_set_hostname/working_hostname); rspconfig $$CN hostname=test_$a |tee /tmp/rspconfig_set_hostname/rspconfig_output
 check:rc == 0
 cmd:grep -i '$$CN: BMC hostname:' /tmp/rspconfig_set_hostname/rspconfig_output|awk -F':' '{print $3}'  |sed s/\\s//g |tee /tmp/rspconfig_set_hostname/rspconfig_get_hostname
 check:rc == 0
@@ -393,7 +393,7 @@ check:rc == 0
 cmd:rm -rf /tmp/rspconfig_set_hostname
 check:rc == 0
 end
- 
+
 start:rspconfig_set_admin_passwd_with_error_input
 description: To test "rspconfig <node> admin_passwd=xxx,yyy". If the format of "xxx,yyy" is wrong, should throw out error message
 os:Linux
diff --git a/xCAT-test/autotest/testcase/rspconfig/cases1 b/xCAT-test/autotest/testcase/rspconfig/cases1
index 1900c1ebf..1a6f93b69 100644
--- a/xCAT-test/autotest/testcase/rspconfig/cases1
+++ b/xCAT-test/autotest/testcase/rspconfig/cases1
@@ -1,10 +1,10 @@
 start:rspconfig_ipsrc
-description: To test "rspconfig <node> ipsrc",to get the IP source for OpenBMC 
+description: To test "rspconfig <node> ipsrc",to get the IP source for OpenBMC
 os:Linux
 hcp:openbmc
 label:cn_bmc_ready,hctrl_openbmc
-cmd:rspconfig $$CN ipsrc 
-check:output=~$$CN\s*:\s*BMC IP Source: Static|BMC IP Source: Dynamic 
+cmd:rspconfig $$CN ipsrc
+check:output=~$$CN\s*:\s*BMC IP Source: Static|BMC IP Source: Dynamic
 check:rc == 0
 cmd:rspconfig $$CN  hostname sshcfg
 check:output =~Error: (\[.*?\]: )?Configure sshcfg must be issued without other options.
@@ -12,26 +12,26 @@ check:rc != 0
 end
 
 start:rspconfig_dump_list
-description: To test "rspconfig <node> dump -l" and "rspconfig <node> dump --list" 
+description: To test "rspconfig <node> dump -l" and "rspconfig <node> dump --list"
 os:Linux
 hcp:openbmc
 label:cn_bmc_ready,hctrl_openbmc
-cmd:rspconfig $$CN dump -l  
+cmd:rspconfig $$CN dump -l
 check:output =~$$CN:\s*No attributes returned from the BMC.|\s*\[\d+\]\s* Generated:
 check:rc == 0
-cmd:rspconfig $$CN dump --list 
+cmd:rspconfig $$CN dump --list
 check:output =~$$CN:\s*No attributes returned from the BMC.|\s*\[\d+\]\s* Generated:
 check:rc == 0
 end
 
 start:rspconfig_dump_generate
-description: To test "rspconfig <node> dump -g" and "rspconfig <node> dump --generate" 
+description: To test "rspconfig <node> dump -g" and "rspconfig <node> dump --generate"
 os:Linux
 hcp:openbmc
 label:cn_bmc_ready,hctrl_openbmc
 cmd:rspconfig $$CN dump -l|tee /tmp/dumplistold
 check:output =~$$CN:\s*No attributes returned from the BMC.|\s*\[\d+\]\s* Generated:
-check:rc == 0 
+check:rc == 0
 cmd:rspconfig $$CN dump -g|tee /tmp/dumpgenerate
 check:rc == 0
 check:output =~$$CN:\s*\[\d+\]\s* success
@@ -60,7 +60,7 @@ cmd:rm -rf /tmp/dumplistold /tmp/dumplistnew /tmp/dumpgenerate
 end
 
 start:rspconfig_dump_clear
-description: To test "rspconfig <node> dump -c" and "rspconfig <node> dump --clear" 
+description: To test "rspconfig <node> dump -c" and "rspconfig <node> dump --clear"
 os:Linux
 hcp:openbmc
 label:cn_bmc_ready,hctrl_openbmc
@@ -73,7 +73,7 @@ check:rc == 0
 cmd:dumpnumber=`sed -r 's/.+\[(.+)\].+/\1/g' /tmp/dumpgenerate`;rspconfig $$CN dump --clear $dumpnumber
 check:rc == 0
 check:output =~$$CN:\s*\[\d+\]\s* clear
-cmd:rspconfig $$CN dump -g 
+cmd:rspconfig $$CN dump -g
 check:rc == 0
 check:output =~$$CN:\s*\[\d+\]\s* success
 cmd:rspconfig $$CN dump -g
@@ -130,7 +130,7 @@ check:rc == 0
 check:output =~Downloading all dumps
 cmd:rspconfig $$CN dump --download all
 check:rc == 0
-check:output =~Downloading all dumps 
+check:output =~Downloading all dumps
 cmd:rm -rf /tmp/dumpgenerate /tmp/dumpdown
 end
 
@@ -139,7 +139,7 @@ description: To test "rspconfig <node> dump"
 os:Linux
 hcp:openbmc
 label:cn_bmc_ready,hctrl_openbmc
-cmd:rspconfig $$CN dump  
+cmd:rspconfig $$CN dump
 check:rc == 0
 check:output =~$$CN:\s*Dump requested
 check:output =~$$CN:\s*Downloading dump
@@ -151,11 +151,11 @@ cmd:rm -rf /tmp/dumpgenerate
 end
 
 start:rspconfig_gard
-description: To test "rspconfig <node> gard -c" 
+description: To test "rspconfig <node> gard -c"
 os:Linux
 hcp:openbmc
 label:cn_bmc_ready,hctrl_openbmc
-cmd:rspconfig $$CN gard -c 
+cmd:rspconfig $$CN gard -c
 check:output =~$$CN:\s*GARD cleared
 check:rc == 0
 cmd:rspconfig $$CN gard --clear
@@ -164,24 +164,24 @@ check:rc == 0
 end
 
 start:rspconfig_ntpserver
-description: To test "rspconfig <node> ntpservers" to show the ntp server of the node 
+description: To test "rspconfig <node> ntpservers" to show the ntp server of the node
 os:Linux
 hcp:openbmc
 label:cn_bmc_ready,hctrl_openbmc
-cmd:rspconfig $$CN ntpservers 
+cmd:rspconfig $$CN ntpservers
 check:output =~$$CN:\s*BMC NTP Servers:\s*None|\s*\d+.\d+.\d+.\d+
 check:rc == 0
 end
 
 start:rspconfig_powerrestorepolicy
-description: To test "rspconfig <node> powerrestorepolicy" to show the policy 
+description: To test "rspconfig <node> powerrestorepolicy" to show the policy
 os:Linux
 hcp:openbmc
 label:cn_bmc_ready,hctrl_openbmc
-cmd:rspconfig $$CN powerrestorepolicy |tee /tmp/powerrestorepolicy 
+cmd:rspconfig $$CN powerrestorepolicy |tee /tmp/powerrestorepolicy
 check:output =~$$CN:\s*BMC PowerRestorePolicy:\s*AlwaysOff|AlwaysOn|Restore
 check:rc == 0
-cmd:rspconfig $$CN powerrestorepolicy=always_on 
+cmd:rspconfig $$CN powerrestorepolicy=always_on
 check:output =~$$CN:\s*BMC Setting BMC PowerRestorePolicy...
 check:rc == 0
 cmd:rspconfig $$CN powerrestorepolicy
@@ -204,29 +204,29 @@ check:rc == 0
 check:output =~$$CN:\s*BMC PowerRestorePolicy:\s*Restore
 cmd:policy=`cat /tmp/powerrestorepolicy | awk -F ":" '{print $3}'`;newpolicy=`echo $policy |tr 'A-Z' 'a-z'`;rspconfig $$CN powerrestorepolicy=$newpolicy
 check:rc == 0
-cmd:rm -rf /tmp/powerrestorepolicy 
+cmd:rm -rf /tmp/powerrestorepolicy
 end
 
 start:rspconfig_powersupplyredundancy
-description: To test "rspconfig <node> powersupplyredundancy" to show the powersupplyredundancy state 
+description: To test "rspconfig <node> powersupplyredundancy" to show the powersupplyredundancy state
 os:Linux
 hcp:openbmc
 label:cn_bmc_ready,hctrl_openbmc
-cmd:rspconfig $$CN powersupplyredundancy |tee /tmp/powersupplyredundancy 
+cmd:rspconfig $$CN powersupplyredundancy |tee /tmp/powersupplyredundancy
 check:output =~$$CN:\s*BMC PowerSupplyRedundancy:\s*Enabled|Disabled
 check:rc == 0
 cmd:rspconfig $$CN powersupplyredundancy=enabled
 check:output =~$$CN:\s*BMC Setting BMC PowerSupplyRedundancy...
 check:rc == 0
 cmd:rspconfig $$CN powersupplyredundancy
-check:rc == 0 
+check:rc == 0
 check:output =~$$CN:\s*BMC PowerSupplyRedundancy:\s*Enabled
 cmd:rspconfig $$CN powersupplyredundancy=disabled
 check:output =~$$CN:\s*BMC Setting BMC PowerSupplyRedundancy...
 check:rc == 0
-cmd:rspconfig $$CN powersupplyredundancy 
+cmd:rspconfig $$CN powersupplyredundancy
 check:rc == 0
-check:output =~$$CN:\s*BMC PowerSupplyRedundancy:\s*Disabled 
+check:output =~$$CN:\s*BMC PowerSupplyRedundancy:\s*Disabled
 cmd:rspconfig $$CN powersupplyredundancy=abc
 check:output =~$$CN:\s*(\[.*?\]: )?Error: Invalid value \S* for 'powersupplyredundancy', Valid values: disabled,enabled
 check:rc != 0
@@ -236,7 +236,7 @@ cmd:rm -rf /tmp/powersupplyredundancy
 end
 
 start:rspconfig_timesyncmethod
-description: To test "rspconfig <node> timesyncmethod" to show the timesyncmethod 
+description: To test "rspconfig <node> timesyncmethod" to show the timesyncmethod
 os:Linux
 hcp:openbmc
 label:cn_bmc_ready,hctrl_openbmc
@@ -246,7 +246,7 @@ check:rc == 0
 cmd:rspconfig $$CN  timesyncmethod=ntp
 check:output =~$$CN:\s*BMC Setting BMC TimeSyncMethod...
 check:rc == 0
-cmd:rspconfig $$CN timesyncmethod 
+cmd:rspconfig $$CN timesyncmethod
 check:rc == 0
 check:output =~$$CN:\s*BMC TimeSyncMethod:\s*NTP
 cmd:rspconfig $$CN  timesyncmethod=manual
@@ -264,18 +264,18 @@ cmd:rm -rf /tmp/timesyncmethod
 end
 
 start:rspconfig_bootmode
-description: To test "rspconfig <node> bootmode" to show and change bootmode 
+description: To test "rspconfig <node> bootmode" to show and change bootmode
 os:Linux
 hcp:openbmc
 label:cn_bmc_ready,hctrl_openbmc
 cmd:rspconfig $$CN bootmode|tee /tmp/bootmode
 check:output =~$$CN:\s*BMC BootMode:\s*Regular|Safe|Setup
 check:rc == 0
-cmd:rspconfig $$CN bootmode=regular 
+cmd:rspconfig $$CN bootmode=regular
 check:output =~$$CN:\s*BMC Setting BMC BootMode...
 check:rc == 0
 cmd:rspconfig $$CN bootmode
-check:rc == 0 
+check:rc == 0
 check:output =~$$CN:\s*BMC BootMode:\s*Regular
 cmd:rspconfig $$CN bootmode=safe
 check:output =~$$CN:\s*BMC Setting BMC BootMode...
@@ -298,7 +298,7 @@ cmd:rm -rf /tmp/bootmode
 end
 
 start:rspconfig_autoreboot
-description: To test "rspconfig <node> autoreboot" to show and change autoreboot 
+description: To test "rspconfig <node> autoreboot" to show and change autoreboot
 os:Linux
 hcp:openbmc
 label:cn_bmc_ready,hctrl_openbmc
@@ -308,7 +308,7 @@ check:rc == 0
 cmd:rspconfig $$CN autoreboot=1
 check:output =~$$CN:\s*BMC Setting BMC AutoReboot...
 check:rc == 0
-cmd:rspconfig $$CN autoreboot 
+cmd:rspconfig $$CN autoreboot
 check:rc == 0
 check:output =~$$CN:\s*BMC AutoReboot:\s*1
 cmd:rspconfig $$CN autoreboot=0
diff --git a/xCAT-test/autotest/testcase/rspconfig/rspconfig.sh b/xCAT-test/autotest/testcase/rspconfig/rspconfig.sh
index b24c11cec..e7f988b3f 100755
--- a/xCAT-test/autotest/testcase/rspconfig/rspconfig.sh
+++ b/xCAT-test/autotest/testcase/rspconfig/rspconfig.sh
@@ -19,7 +19,7 @@ Options:
  	-lv|--list vlan               To test rspconfig could list bmc's vlan
 	-a|--all                      To test rspconfig could change bmc's ip,gateway,netmask,vlan
 	-la|--list all                To test rspconfig could list bmc's ip,gateway,netmask,vlan
-	-c|--clear                    To clear test environment 
+	-c|--clear                    To clear test environment
 Examples:
 	${script} -i noderange nodeip=node's ip
 	${script} -n noderange netmask
@@ -105,7 +105,7 @@ function check_result()
 	a=0; while true;
 	do [ $a -eq 20 ] && return 1;
 		output=`rspconfig $1 $2 |awk -F: '{print $3}'`;
-		if [[ $(echo $output|tr '.' '+'|bc) -eq $(echo $3|tr '.' '+'|bc)  ]];then 
+		if [[ $(echo $output|tr '.' '+'|bc) -eq $(echo $3|tr '.' '+'|bc)  ]];then
         		return 0 ;
      		else
         		a=$[$a+1];
@@ -117,7 +117,7 @@ function check_result()
 function clear_env()
 {
 	echo "Start to clear test environment.";
-	if [[ -f /tmp/BMCIP ]];then 
+	if [[ -f /tmp/BMCIP ]];then
         	originip=$(cat /tmp/BMCIP);
         	rspconfig $2 ip=$originip
         	if [[ $? -eq 0 ]];then
@@ -134,7 +134,7 @@ function clear_env()
       			return 1;
        		else
             		echo "Node's bmc ip really setted to originip successfully.";
-                        return 0; 
+                        return 0;
        		fi
     	fi
         return 1;
@@ -143,9 +143,9 @@ function change_nonip
 {
 	echo "Prepare to change node's bmc $4.";
 	echo "Start to check node's bmc $4 valid or not.";
-	if [[ $4 =~ "gateway" ]]||[[ $4 =~ "netmask" ]];then 
+	if [[ $4 =~ "gateway" ]]||[[ $4 =~ "netmask" ]];then
         	test_ip $1;
-		if [[ $? -ne 0 ]];then 
+		if [[ $? -ne 0 ]];then
 			echo "Node's bmc $4 is invalid";
 			return 1;
 		fi
@@ -208,7 +208,7 @@ function change_all
 
 		else
 			echo "------------------Bmc vlan disabled so could not change vlan id using rspconfig.--------------------"
-			rspconfig $1 ip=$BMCIP netmask=$BMCNETMASK gateway=$BMCGGATEWAY 
+			rspconfig $1 ip=$BMCIP netmask=$BMCNETMASK gateway=$BMCGGATEWAY
 				if [[ $? -eq 0 ]];then
 		               		echo "Run rspconfig $1 ip=$BMCIP netmask=$BMCNETMASK gateway=$BMCGGATEWAY and return value is 0.";
 		       		else
@@ -222,7 +222,7 @@ function change_all
                 		rc2=$?;
                 		check_result $1 gateway $BMCGGATEWAY
                 		rc3=$?;
-				if [[ $rc1 -eq 0 ]] && [[ $rc2 -eq 0 ]] && [[ $rc3 -eq 0 ]];then 
+				if [[ $rc1 -eq 0 ]] && [[ $rc2 -eq 0 ]] && [[ $rc3 -eq 0 ]];then
 					echo "Node's bmc IP/netmask/gateway really setted successfully."
 					return 0;
 				else
@@ -253,14 +253,14 @@ do
 			BMCNETMASK=`rspconfig  $2 netmask |awk -F":" '{print $3}'`
 		else
 			echo "Run rspconfig $2 ip and return value is 1. "
-			exit 1; 
+			exit 1;
 		fi
 		change_ip $BMCIP $2 $BMCNETMASK $3
 		if [[ $? -eq 1 ]];then
 			echo "--------------------Result for test rspconfig change node's bmc ip failed.--------------------"
 			exit 1
 		else
-			echo "--------------------Restult for test rspconfig change node's bmc ip successfully.-------------------" 
+			echo "--------------------Restult for test rspconfig change node's bmc ip successfully.-------------------"
 			exit 0
 		fi
 		;;
@@ -270,7 +270,7 @@ do
 		rspconfig $2 ip
 		if [[ $? -eq 0 ]];then
 			BMCIP=`rspconfig $2 ip |awk -F":" '{print $3}'`
-				if [[ $BMCIP =~ "$BMCIP_LSDEF" ]];then 
+				if [[ $BMCIP =~ "$BMCIP_LSDEF" ]];then
 					echo "-----------------Result for test rspconfig list node's bmc ip successfully.-----------------"
 					exit 0;
 				else
@@ -304,7 +304,7 @@ do
 		"-lg"|"--list gateway" )
 		output=`rspconfig $2 gateway`
 		if [[ $? -eq 0 ]];then
-			if [[ $output =~ "$2: BMC Gateway:" ]];then 
+			if [[ $output =~ "$2: BMC Gateway:" ]];then
 				echo "--------------------Result for test rspconfig list node's bmc gateway  successfully.-----------------"
 				exit 0;
 			else
@@ -335,7 +335,7 @@ do
 		fi
 		;;
 		"-ln"|"--list netmask" )
-		output=`rspconfig $2 netmask` 
+		output=`rspconfig $2 netmask`
 		if [[ $? -eq 0 ]];then
 			if [[ $output =~ "$2: BMC Netmask:" ]];then
 				echo "-------------------Result for test rspconfig list node's bmc Netmask successfully.-----------------"
@@ -397,7 +397,7 @@ do
 		BMCIP=`rspconfig $2 ip |awk -F":" '{print $3}'`
 		output=`rspconfig $2 ip gateway netmask vlan`
 		if [[ $? -eq 0 ]];then
-			if [[ $output =~ "$2: BMC VLAN ID" ]]&&[[ $output =~ "BMC Netmask:" ]]&&[[ $output =~ "BMC Gateway:" ]]&&[[ $BMCIP =~ "$BMCIP_LSDEF" ]];then 
+			if [[ $output =~ "$2: BMC VLAN ID" ]]&&[[ $output =~ "BMC Netmask:" ]]&&[[ $output =~ "BMC Gateway:" ]]&&[[ $BMCIP =~ "$BMCIP_LSDEF" ]];then
 				echo "------------------Result for rspconfig list node's  BMC IP/netmask/gateway/vlan succssfully.-----------------"
 				exit 0
 			else
diff --git a/xCAT-test/autotest/testcase/rspconfig/rspconfig_ntp.sh b/xCAT-test/autotest/testcase/rspconfig/rspconfig_ntp.sh
index 13c53fa61..1525b0de4 100755
--- a/xCAT-test/autotest/testcase/rspconfig/rspconfig_ntp.sh
+++ b/xCAT-test/autotest/testcase/rspconfig/rspconfig_ntp.sh
@@ -12,8 +12,8 @@ fi
 echo "The original BMC NTP Servers is $ntpservers"
 
 if [ $ntpservers != "None" ]; then
-   new_ntpservers=$ntpservers"_test"  
-else 
+   new_ntpservers=$ntpservers"_test"
+else
    new_ntpservers=$mn
 fi
 
@@ -25,7 +25,7 @@ fi
 
 if [[ $output =~ "$cn: BMC NTP Servers" ]]  && [[ $output =~ "$new_ntpservers" ]]; then
     echo "Setting NTPServers as $new_ntpservers success"
-else 
+else
     echo "Setting NTPServers as $new_ntpservers failed, the output is $output"
     exit 1
 fi
@@ -40,7 +40,7 @@ fi
 
 output=`rspconfig $cn ntpservers=$original_ntpservers`
 if [ $? -ne 0 ]; then
-    echo "rspconfig $cn ntpservers=$ntpservers failed when clearing environment"  
+    echo "rspconfig $cn ntpservers=$ntpservers failed when clearing environment"
     exit 1
 fi
 
diff --git a/xCAT-test/autotest/testcase/runcmdinstaller/cases0 b/xCAT-test/autotest/testcase/runcmdinstaller/cases0
index 6e17e0224..22b3e23b1 100644
--- a/xCAT-test/autotest/testcase/runcmdinstaller/cases0
+++ b/xCAT-test/autotest/testcase/runcmdinstaller/cases0
@@ -43,5 +43,5 @@ check:output=~$$CN: +
 cmd:cat /var/log/messages /var/log/xcat/computes.log 2>/dev/null |grep "trying to download postscripts"
 check:rc==0
 cmd:chtab key=xcatdebugmode site.value="0"
-cmd:chdef $$CN  -m  postscripts=setupntp 
+cmd:chdef $$CN  -m  postscripts=setupntp
 end
diff --git a/xCAT-test/autotest/testcase/rvitals/cases0 b/xCAT-test/autotest/testcase/rvitals/cases0
index ecc4276ff..d55db2649 100644
--- a/xCAT-test/autotest/testcase/rvitals/cases0
+++ b/xCAT-test/autotest/testcase/rvitals/cases0
@@ -1,7 +1,7 @@
 start:rvitals_h
 description:get rvitals's usage
 label:mn_only,hctrl_general
-cmd:rvitals -h 
+cmd:rvitals -h
 check:rc==0
 check:output=~Usage:
 check:output=~rvitals
@@ -124,7 +124,7 @@ end
 start:rvitals_noderange_err
 description:using not defined node
 label:mn_only,hctrl_general
-cmd:/opt/xcat/share/xcat/tools/autotest/testcase/rvitals/openbmctest.sh rvitals testnode 
+cmd:/opt/xcat/share/xcat/tools/autotest/testcase/rvitals/openbmctest.sh rvitals testnode
 check:rc!=0
 end
 
diff --git a/xCAT-test/autotest/testcase/rvitals/openbmctest.sh b/xCAT-test/autotest/testcase/rvitals/openbmctest.sh
index c28e9fbfd..5fde844ea 100755
--- a/xCAT-test/autotest/testcase/rvitals/openbmctest.sh
+++ b/xCAT-test/autotest/testcase/rvitals/openbmctest.sh
@@ -12,29 +12,29 @@ if [[ $1 ]]&&[[ $2 ]]&&[[ $3 ]];then
         echo number is $number
         `cat /tmp/openbmccommand.test |awk -F : '{print $1}' > /tmp/openbmccommand.test1`
         for i in `cat /tmp/openbmccommand.test1`
-            do 
+            do
                   echo $i
-                  if [[ $i == $2 ]];then 
+                  if [[ $i == $2 ]];then
                       node_number=1;
                   else
                      echo no than more node checked
                      node_number=2;
                   fi
              done
-        if [[ $node_number -eq 1 ]];then 
+        if [[ $node_number -eq 1 ]];then
             `cat /tmp/openbmccommand.test |awk -F : '{print $2}'> /tmp/openbmccommand.test2`
             if [[ $number -eq 1 ]]&&[[ `awk -F "" '{for(i=1;i<=NF;++i) if($i==":") ++sum}END{print sum}' /tmp/openbmccommand.test` -eq 1 ]];then
-                if [[ `cat /tmp/openbmccommand.test` =~ "No attributes returned from the BMC" ]]||[[ `cat /tmp/openbmccommand.test` =~ "No mprom information is available" ]]||[[ `cat /tmp/openbmccommand.test` =~ "No deviceid information is available" ]]||[[ `cat /tmp/openbmccommand.test` =~ "No uuid information is available" ]]||[[ `cat /tmp/openbmccommand.test` =~ "No guid information is available" ]];then 
+                if [[ `cat /tmp/openbmccommand.test` =~ "No attributes returned from the BMC" ]]||[[ `cat /tmp/openbmccommand.test` =~ "No mprom information is available" ]]||[[ `cat /tmp/openbmccommand.test` =~ "No deviceid information is available" ]]||[[ `cat /tmp/openbmccommand.test` =~ "No uuid information is available" ]]||[[ `cat /tmp/openbmccommand.test` =~ "No guid information is available" ]];then
                     echo "No attributes"
                     return 0;
                 else
                     return 1;
-                fi                                                                                                                                                         
-            else 
+                fi
+            else
                 if [[ `cat /tmp/openbmccommand.test2` =~ "No attributes returned from the BMC" ]]||[[ `cat /tmp/openbmccommand.test` =~ "No mprom information is available" ]]||[[ `cat /tmp/openbmccommand.test` =~ "No deviceid information is available" ]]||[[ `cat /tmp/openbmccommand.test` =~ "No uuid information is available" ]]||[[ `cat /tmp/openbmccommand.test` =~ "No guid information is available" ]];then
                     echo "wrong return"
                     return 1;
-                else 
+                else
                     echo "right return"
                     return 0
                 fi
@@ -44,7 +44,7 @@ if [[ $1 ]]&&[[ $2 ]]&&[[ $3 ]];then
                return 0;
             fi
         fi
-    else 
+    else
         return 1;
     fi
 else
@@ -54,6 +54,6 @@ fi
 test_openbmccommand $1 $2 $3
 if  [[ $? -eq 0 ]];then
     exit 0;
-else 
+else
     exit 1;
 fi
diff --git a/xCAT-test/autotest/testcase/simulator/config_simulator.sh b/xCAT-test/autotest/testcase/simulator/config_simulator.sh
index 566c826bd..7846f139f 100755
--- a/xCAT-test/autotest/testcase/simulator/config_simulator.sh
+++ b/xCAT-test/autotest/testcase/simulator/config_simulator.sh
@@ -48,12 +48,12 @@ if [ $flag = "-s" ]; then
         lsdef $cnhn -z > /tmp/$cnhn.stanza
         rmdef $cnhn
 
-        if [ $delay_type ] && [ $delay_time ]; then 
+        if [ $delay_type ] && [ $delay_time ]; then
             option_string="-d $delay_type -t $delay_time -n $nic -r $range"
         else
             option_string="-n $nic -r $range"
         fi
-        /root/openbmc_simulator/simulator $option_string 
+        /root/openbmc_simulator/simulator $option_string
         if [ $? != 0 ]; then
             echo "Start simulator Failed"
             exit 1
@@ -62,7 +62,7 @@ if [ $flag = "-s" ]; then
         node_end=$[nodes-1]
         chdef -t group $cnhn mgt=openbmc bmc="|\D+(\d+)$|10.100.(1+((\$1)/100)).((\$1)%100+1)|" bmcusername=$username bmcpassword=$password
         chdef simulator_test[0-$node_end] groups=$cnhn  # use CN hostname as group, so when run command against CN will rpower against all nodes added here
-    else 
+    else
         cnip=`lsdef $cnhn -i bmc -c | awk -F '=' '{print $2}'`
         echo $cnip > "/tmp/simulator"
         mnip=`ping $mnhn -c 1 | grep "64 bytes from" |awk -F'(' '{print $2}'|awk -F')' '{print $1}'`
@@ -78,7 +78,7 @@ elif [ $flag = "-c" ]; then
         /root/openbmc_simulator/simulator -c -n $nic -r $range
         rmdef $cnhn
         cat /tmp/$cnhn.stanza | mkdef -z
-    else 
+    else
         /root/openbmc_simulator/simulator -c
         cnip=`cat /tmp/simulator`
         chdef $cnhn bmc=$cnip
diff --git a/xCAT-test/autotest/testcase/snpool/not_set_xcatmaster_in_sn_pool_tftp_mount_mode b/xCAT-test/autotest/testcase/snpool/not_set_xcatmaster_in_sn_pool_tftp_mount_mode
index 9c3bd2aac..797c6b44f 100644
--- a/xCAT-test/autotest/testcase/snpool/not_set_xcatmaster_in_sn_pool_tftp_mount_mode
+++ b/xCAT-test/autotest/testcase/snpool/not_set_xcatmaster_in_sn_pool_tftp_mount_mode
@@ -11,7 +11,7 @@ check:rc==0
 
 cmd:makedns -n
 check:rc==0
-cmd:makeconservercf $$SN,$$CN 
+cmd:makeconservercf $$SN,$$CN
 check:rc==0
 cmd:cat /etc/conserver.cf | grep $$SN
 check:output=~$$SN
@@ -26,7 +26,7 @@ cmd:makedhcp -n
 check:rc==0
 cmd:makedhcp -a
 check:rc==0
-cmd:if cat /etc/*release |grep SUSE >/dev/null;then cat /var/lib/dhcp/db/dhcpd.leases|grep $$SN;elif cat /etc/*release |grep "Red Hat" >/dev/null;then cat /var/lib/dhcpd/dhcpd.leases|grep $$SN;fi 
+cmd:if cat /etc/*release |grep SUSE >/dev/null;then cat /var/lib/dhcp/db/dhcpd.leases|grep $$SN;elif cat /etc/*release |grep "Red Hat" >/dev/null;then cat /var/lib/dhcpd/dhcpd.leases|grep $$SN;fi
 check:output=~$$SN
 cmd:if cat /etc/*release |grep SUSE >/dev/null;then cat /var/lib/dhcp/db/dhcpd.leases|grep $$CN;elif cat /etc/*release |grep "Red Hat" >/dev/null;then cat /var/lib/dhcpd/dhcpd.leases|grep $$CN;fi
 check:output=~$$CN
@@ -48,7 +48,7 @@ check:rc==0
 cmd:chdef -t site clustersite installloc=""
 check:rc==0
 
-cmd:cd /install/post/otherpkgs/__GETNODEATTR($$SN,os)__/__GETNODEATTR($$SN,arch)__/xcat/xcat-core && createrepo .  
+cmd:cd /install/post/otherpkgs/__GETNODEATTR($$SN,os)__/__GETNODEATTR($$SN,arch)__/xcat/xcat-core && createrepo .
 check:rc==0
 
 cmd:if [[ "__GETNODEATTR($$SN,os)__" =~ "rh" ]]; then path="rh";elif [[ "__GETNODEATTR($$SN,os)__" =~ "sles" ]];then path="sles";fi; ver="__GETNODEATTR($$SN,os)__"; tmp=${ver%.*};ver=`echo "$tmp"|sed 's:[a-zA-Z]::g'`;cd /install/post/otherpkgs/__GETNODEATTR($$SN,os)__/__GETNODEATTR($$SN,arch)__/xcat/xcat-dep/$path$ver/__GETNODEATTR($$SN,arch)__ && createrepo .;
@@ -88,7 +88,7 @@ check:rc==0
 check:output=~$$SN: $$SN
 cmd:xdsh $$SN "tabdump site"
 check:rc==0
-check:output=~tftpdir 
+check:output=~tftpdir
 cmd:rsync -auv --exclude 'autoinst' /install $$SN:/
 check:rc==0
 
@@ -110,7 +110,7 @@ check:rc==0
 check:output=~xcatd:
 cmd:xdsh $$CN "lsdef"
 check:rc==0
-check:output=~$$CN: $$CN 
+check:output=~$$CN: $$CN
 cmd:xdsh $$CN "tabdump site"
 check:rc==0
 check:output=~tftpdir
@@ -122,7 +122,7 @@ cmd:mkdef -t node -o compute1 groups=compute ip=10.0.0.199 mac=4a:c8:f7:de:d0:09
 check:rc==0
 cmd:chdef -t node -o compute1 servicenode=$$SN,$$CN xcatmaster=
 check:rc==0
-cmd:makehosts compute1 
+cmd:makehosts compute1
 check:rc==0
 cmd:cat /etc/hosts
 check:output=~compute1
diff --git a/xCAT-test/autotest/testcase/snpool/not_set_xcatmaster_in_sn_pool_tftp_mount_mode_checkresult b/xCAT-test/autotest/testcase/snpool/not_set_xcatmaster_in_sn_pool_tftp_mount_mode_checkresult
index 106bea82f..2f6c1c524 100644
--- a/xCAT-test/autotest/testcase/snpool/not_set_xcatmaster_in_sn_pool_tftp_mount_mode_checkresult
+++ b/xCAT-test/autotest/testcase/snpool/not_set_xcatmaster_in_sn_pool_tftp_mount_mode_checkresult
@@ -6,7 +6,7 @@ cmd:mkdef -t node -o compute1 groups=compute ip=10.0.0.199 mac=4a:c8:f7:de:d0:09
 check:rc==0
 cmd:chdef -t node -o compute1 servicenode=$$SN,$$CN xcatmaster=
 check:rc==0
-cmd:makehosts compute1 
+cmd:makehosts compute1
 check:rc==0
 cmd:cat /etc/hosts
 check:output=~compute1
@@ -41,7 +41,7 @@ check:output=~http://$$MN|http://$$MASTERIP|http://${next-server}
 cmd:if [[ "__GETNODEATTR($$CN,arch)__" =~ "ppc64le" ]]; then xdsh $$SN  cat /tftpboot/petitboot/compute1;else echo "http://$$SN";fi
 check:output=~http://$$SN|http://__GETNODEATTR($$SN,ip)__|http://${next-server}
 cmd:if [[ "__GETNODEATTR($$CN,arch)__" =~ "ppc64le" ]]; then xdsh $$CN cat /tftpboot/petitboot/compute1;else echo "http://$$CN";fi
-check:output=~http://$$CN|http://__GETNODEATTR($$CN,ip)__|http://${next-server} 
+check:output=~http://$$CN|http://__GETNODEATTR($$CN,ip)__|http://${next-server}
 
 cmd:noderm compute1
 check:rc==0
diff --git a/xCAT-test/autotest/testcase/snpool/set_disjointdhcps_in_sn_pool_tftp_sync_mode b/xCAT-test/autotest/testcase/snpool/set_disjointdhcps_in_sn_pool_tftp_sync_mode
index 8c369410e..308c908b0 100644
--- a/xCAT-test/autotest/testcase/snpool/set_disjointdhcps_in_sn_pool_tftp_sync_mode
+++ b/xCAT-test/autotest/testcase/snpool/set_disjointdhcps_in_sn_pool_tftp_sync_mode
@@ -45,7 +45,7 @@ cmd:xdsh $$CN 'umount /tftpboot'
 
 cmd:cd / && rsync -P -p -r -o -g -v tftpboot $$SN:/
 check:rc==0
-cmd:cd / && rsync -P -p -r -o -g -v tftpboot $$CN:/ 
+cmd:cd / && rsync -P -p -r -o -g -v tftpboot $$CN:/
 check:rc==0
 
 cmd:nodeset testnode1 osimage=rhels7.99-ppc64le-install-compute
diff --git a/xCAT-test/autotest/testcase/snpool/set_xcatmaster_in_sn_pool_tftp_mount_mode b/xCAT-test/autotest/testcase/snpool/set_xcatmaster_in_sn_pool_tftp_mount_mode
index 712946aa7..b7a6d77c6 100644
--- a/xCAT-test/autotest/testcase/snpool/set_xcatmaster_in_sn_pool_tftp_mount_mode
+++ b/xCAT-test/autotest/testcase/snpool/set_xcatmaster_in_sn_pool_tftp_mount_mode
@@ -11,7 +11,7 @@ check:rc==0
 
 cmd:makedns -n
 check:rc==0
-cmd:makeconservercf $$SN,$$CN 
+cmd:makeconservercf $$SN,$$CN
 check:rc==0
 cmd:cat /etc/conserver.cf | grep $$SN
 check:output=~$$SN
@@ -26,7 +26,7 @@ cmd:makedhcp -n
 check:rc==0
 cmd:makedhcp -a
 check:rc==0
-cmd:if cat /etc/*release |grep SUSE >/dev/null;then cat /var/lib/dhcp/db/dhcpd.leases|grep $$SN;elif cat /etc/*release |grep "Red Hat" >/dev/null;then cat /var/lib/dhcpd/dhcpd.leases|grep $$SN;fi 
+cmd:if cat /etc/*release |grep SUSE >/dev/null;then cat /var/lib/dhcp/db/dhcpd.leases|grep $$SN;elif cat /etc/*release |grep "Red Hat" >/dev/null;then cat /var/lib/dhcpd/dhcpd.leases|grep $$SN;fi
 check:output=~$$SN
 cmd:if cat /etc/*release |grep SUSE >/dev/null;then cat /var/lib/dhcp/db/dhcpd.leases|grep $$CN;elif cat /etc/*release |grep "Red Hat" >/dev/null;then cat /var/lib/dhcpd/dhcpd.leases|grep $$CN;fi
 check:output=~$$CN
@@ -48,7 +48,7 @@ check:rc==0
 cmd:chdef -t site clustersite installloc=""
 check:rc==0
 
-cmd:cd /install/post/otherpkgs/__GETNODEATTR($$SN,os)__/__GETNODEATTR($$SN,arch)__/xcat/xcat-core && createrepo .  
+cmd:cd /install/post/otherpkgs/__GETNODEATTR($$SN,os)__/__GETNODEATTR($$SN,arch)__/xcat/xcat-core && createrepo .
 check:rc==0
 
 cmd:if [[ "__GETNODEATTR($$SN,os)__" =~ "rh" ]]; then path="rh";elif [[ "__GETNODEATTR($$SN,os)__" =~ "sles" ]];then path="sles";fi; ver="__GETNODEATTR($$SN,os)__"; tmp=${ver%.*};ver=`echo "$tmp"|sed 's:[a-zA-Z]::g'`;cd /install/post/otherpkgs/__GETNODEATTR($$SN,os)__/__GETNODEATTR($$SN,arch)__/xcat/xcat-dep/$path$ver/__GETNODEATTR($$SN,arch)__ && createrepo .;
@@ -88,7 +88,7 @@ check:rc==0
 check:output=~$$SN: $$SN
 cmd:xdsh $$SN "tabdump site"
 check:rc==0
-check:output=~tftpdir 
+check:output=~tftpdir
 cmd:rsync -auv --exclude 'autoinst' /install $$SN:/
 check:rc==0
 
@@ -110,7 +110,7 @@ check:rc==0
 check:output=~xcatd:
 cmd:xdsh $$CN "lsdef"
 check:rc==0
-check:output=~$$CN: $$CN 
+check:output=~$$CN: $$CN
 cmd:xdsh $$CN "tabdump site"
 check:rc==0
 check:output=~tftpdir
diff --git a/xCAT-test/autotest/testcase/snpool/setup_sn_pool_tftp_mount_mode b/xCAT-test/autotest/testcase/snpool/setup_sn_pool_tftp_mount_mode
index 286606ce6..5a2c2520f 100644
--- a/xCAT-test/autotest/testcase/snpool/setup_sn_pool_tftp_mount_mode
+++ b/xCAT-test/autotest/testcase/snpool/setup_sn_pool_tftp_mount_mode
@@ -11,7 +11,7 @@ check:rc==0
 
 cmd:makedns -n
 check:rc==0
-cmd:makeconservercf $$SN,$$CN 
+cmd:makeconservercf $$SN,$$CN
 check:rc==0
 cmd:cat /etc/conserver.cf | grep $$SN
 check:output=~$$SN
@@ -26,7 +26,7 @@ cmd:makedhcp -n
 check:rc==0
 cmd:makedhcp -a
 check:rc==0
-cmd:if cat /etc/*release |grep SUSE >/dev/null;then cat /var/lib/dhcp/db/dhcpd.leases|grep $$SN;elif cat /etc/*release |grep "Red Hat" >/dev/null;then cat /var/lib/dhcpd/dhcpd.leases|grep $$SN;fi 
+cmd:if cat /etc/*release |grep SUSE >/dev/null;then cat /var/lib/dhcp/db/dhcpd.leases|grep $$SN;elif cat /etc/*release |grep "Red Hat" >/dev/null;then cat /var/lib/dhcpd/dhcpd.leases|grep $$SN;fi
 check:output=~$$SN
 cmd:if cat /etc/*release |grep SUSE >/dev/null;then cat /var/lib/dhcp/db/dhcpd.leases|grep $$CN;elif cat /etc/*release |grep "Red Hat" >/dev/null;then cat /var/lib/dhcpd/dhcpd.leases|grep $$CN;fi
 check:output=~$$CN
@@ -48,7 +48,7 @@ check:rc==0
 cmd:chdef -t site clustersite installloc=""
 check:rc==0
 
-cmd:cd /install/post/otherpkgs/__GETNODEATTR($$SN,os)__/__GETNODEATTR($$SN,arch)__/xcat/xcat-core && createrepo .  
+cmd:cd /install/post/otherpkgs/__GETNODEATTR($$SN,os)__/__GETNODEATTR($$SN,arch)__/xcat/xcat-core && createrepo .
 check:rc==0
 
 cmd:if [[ "__GETNODEATTR($$SN,os)__" =~ "rh" ]]; then path="rh";elif [[ "__GETNODEATTR($$SN,os)__" =~ "sles" ]];then path="sles";fi; ver="__GETNODEATTR($$SN,os)__"; tmp=${ver%.*};ver=`echo "$tmp"|sed 's:[a-zA-Z]::g'`;cd /install/post/otherpkgs/__GETNODEATTR($$SN,os)__/__GETNODEATTR($$SN,arch)__/xcat/xcat-dep/$path$ver/__GETNODEATTR($$SN,arch)__ && createrepo .;
@@ -88,7 +88,7 @@ check:rc==0
 check:output=~$$SN: $$SN
 cmd:xdsh $$SN "tabdump site"
 check:rc==0
-check:output=~tftpdir 
+check:output=~tftpdir
 cmd:rsync -auv --exclude 'autoinst' /install $$SN:/
 check:rc==0
 
@@ -110,7 +110,7 @@ check:rc==0
 check:output=~xcatd:
 cmd:xdsh $$CN "lsdef"
 check:rc==0
-check:output=~$$CN: $$CN 
+check:output=~$$CN: $$CN
 cmd:xdsh $$CN "tabdump site"
 check:rc==0
 check:output=~tftpdir
diff --git a/xCAT-test/autotest/testcase/switchdiscover/cases0 b/xCAT-test/autotest/testcase/switchdiscover/cases0
index abf7220a3..1009f74b3 100644
--- a/xCAT-test/autotest/testcase/switchdiscover/cases0
+++ b/xCAT-test/autotest/testcase/switchdiscover/cases0
@@ -5,7 +5,7 @@ cmd:switchdiscover -h
 check:rc==0
 check:output=~Usage
 end
-start:switchdiscover_range_default 
+start:switchdiscover_range_default
 cmd:switchdiscover --range $$range
 check:rc==0
 check:output=~Discovering switches using nmap
diff --git a/xCAT-test/autotest/testcase/switchdiscover/switch_based_switch_discovery_key_process b/xCAT-test/autotest/testcase/switchdiscover/switch_based_switch_discovery_key_process
index 5d252baef..6cdc8d142 100755
--- a/xCAT-test/autotest/testcase/switchdiscover/switch_based_switch_discovery_key_process
+++ b/xCAT-test/autotest/testcase/switchdiscover/switch_based_switch_discovery_key_process
@@ -481,7 +481,7 @@ sub backup_env {
 }
 
 #--------------------------------------------------------
-# Fuction name: deletearray 
+# Fuction name: deletearray
 # Description:
 # Atrributes:
 # Retrun code:
diff --git a/xCAT-test/autotest/testcase/sysclone/cases0 b/xCAT-test/autotest/testcase/sysclone/cases0
index 90dd67c79..b18002ed1 100644
--- a/xCAT-test/autotest/testcase/sysclone/cases0
+++ b/xCAT-test/autotest/testcase/sysclone/cases0
@@ -1,4 +1,4 @@
-start:sysclone 
+start:sysclone
 cmd:makedns -n
 check:rc==0
 cmd:makedhcp -n
@@ -35,12 +35,12 @@ cmd:cp $$XCAT_DEP_TARBALL_PATH/$$XCAT_DEP_TARBALL $$OTHERPKGDIR/xcat
 check:rc==0
 cmd:cd $$OTHERPKGDIR/xcat && tar xvf $$XCAT_DEP_TARBALL
 check:rc==0
-cmd:chdef -t osimage -o $$GOS-x86_64-install-compute -p otherpkgdir=$$OTHERPKGDIR 
+cmd:chdef -t osimage -o $$GOS-x86_64-install-compute -p otherpkgdir=$$OTHERPKGDIR
 check:rc==0
 cmd:chdef -t osimage -o $$GOS-x86_64-install-compute otherpkglist=$$OTHERPKGLIST
 check:rc==0
 
-cmd:rinstall $$GOLDEN_CLIENT osimage=$$GOS-x86_64-install-compute   
+cmd:rinstall $$GOLDEN_CLIENT osimage=$$GOS-x86_64-install-compute
 check:rc==0
 check:output=~Provision node\(s\)\: $$GOLDEN_CLIENT
 
@@ -108,4 +108,4 @@ check:rc==0
 end
 
 
- 
+
diff --git a/xCAT-test/autotest/testcase/tabprune/cases0 b/xCAT-test/autotest/testcase/tabprune/cases0
index b0154bf41..f17f21ad4 100644
--- a/xCAT-test/autotest/testcase/tabprune/cases0
+++ b/xCAT-test/autotest/testcase/tabprune/cases0
@@ -15,7 +15,7 @@ check:output=~Version
 end
 
 start:tabprune_a_eventlog
-description:tabprune eventlog -a 
+description:tabprune eventlog -a
 label:mn_only,db
 cmd:tabprune eventlog -a
 check:rc==0
diff --git a/xCAT-test/autotest/testcase/testenv/case0 b/xCAT-test/autotest/testcase/testenv/case0
index 4d482e503..f78099826 100644
--- a/xCAT-test/autotest/testcase/testenv/case0
+++ b/xCAT-test/autotest/testcase/testenv/case0
@@ -1,5 +1,5 @@
 start:clean_up_env
-description:power off service node and compute node for next test usage 
+description:power off service node and compute node for next test usage
 cmd:rpower $$CN stat >> /tmp/cnstat
 cmd:if [[ ! `cat /tmp/cnstat |grep -i "Not Activated"` ]]; then rpower $$CN off;fi
 check:rc==0
diff --git a/xCAT-test/autotest/testcase/updatenode/cases0 b/xCAT-test/autotest/testcase/updatenode/cases0
index 4ef2115a7..44cb35ec3 100644
--- a/xCAT-test/autotest/testcase/updatenode/cases0
+++ b/xCAT-test/autotest/testcase/updatenode/cases0
@@ -10,11 +10,11 @@ check:output=~Version
 end
 
 start:updatenode_diskful_syncfiles
-cmd:mkdir -p /install/custom/install/__GETNODEATTR($$CN,os)__/ 
+cmd:mkdir -p /install/custom/install/__GETNODEATTR($$CN,os)__/
 check:rc==0
-cmd:echo "/etc/hosts -> /etc/hosts" > /install/custom/install/__GETNODEATTR($$CN,os)__/compute.$$OS.synclist 
+cmd:echo "/etc/hosts -> /etc/hosts" > /install/custom/install/__GETNODEATTR($$CN,os)__/compute.$$OS.synclist
 check:rc==0
-cmd:echo "/etc/resolv.conf -> /etc/resolv.conf" >> /install/custom/install/__GETNODEATTR($$CN,os)__/compute.$$OS.synclist 
+cmd:echo "/etc/resolv.conf -> /etc/resolv.conf" >> /install/custom/install/__GETNODEATTR($$CN,os)__/compute.$$OS.synclist
 check:rc==0
 cmd:chdef -t osimage -o __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute synclists=/install/custom/install/__GETNODEATTR($$CN,os)__/compute.$$OS.synclist
 check:rc==0
@@ -35,7 +35,7 @@ check:rc==0
 cmd:rm -rf /install/custom/install/__GETNODEATTR($$CN,os)__/compute.$$OS.synclist
 cmd:chdef -t osimage -o  __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute synclists=
 check:rc==0
-end 
+end
 
 start:updatenode_diskful_syncfiles_rename
 cmd:mkdir -p /tmp/syncfile/
@@ -44,9 +44,9 @@ cmd:echo "test1" > /tmp/syncfile/test1.txt
 check:rc==0
 cmd:echo "test2" > /tmp/syncfile/test2.txt
 check:rc==0
-cmd:echo "/tmp/syncfile/test1.txt -> /tmp/testx.txt" > /install/custom/install/__GETNODEATTR($$CN,os)__/compute.$$OS.synclist 
+cmd:echo "/tmp/syncfile/test1.txt -> /tmp/testx.txt" > /install/custom/install/__GETNODEATTR($$CN,os)__/compute.$$OS.synclist
 check:rc==0
-cmd:echo "/tmp/syncfile/test2.txt -> /tmp/testy.txt" >> /install/custom/install/__GETNODEATTR($$CN,os)__/compute.$$OS.synclist 
+cmd:echo "/tmp/syncfile/test2.txt -> /tmp/testy.txt" >> /install/custom/install/__GETNODEATTR($$CN,os)__/compute.$$OS.synclist
 check:rc==0
 cmd:chdef -t osimage -o __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute synclists=/install/custom/install/__GETNODEATTR($$CN,os)__/compute.$$OS.synclist
 check:rc==0
@@ -74,24 +74,24 @@ cmd:echo "test1" > /tmp/sync/test1.txt
 check:rc==0
 cmd:echo "test2" > /tmp/sync/test2.txt
 check:rc==0
-cmd:echo "/tmp/sync/* -> /tmp/" > /install/custom/install/__GETNODEATTR($$CN,os)__/compute.$$OS.synclist  
+cmd:echo "/tmp/sync/* -> /tmp/" > /install/custom/install/__GETNODEATTR($$CN,os)__/compute.$$OS.synclist
 check:rc==0
 cmd:chdef -t osimage -o __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute synclists=/install/custom/install/__GETNODEATTR($$CN,os)__/compute.$$OS.synclist
 check:rc==0
-cmd:updatenode $$CN -F 
+cmd:updatenode $$CN -F
 check:rc==0
 cmd:xdsh $$CN "ls -l /tmp"
 check:output=~test1.txt
 check:output=~test2.txt
 cmd:xdsh $$CN "cat /tmp/test1.txt"
-check:output=~test1 
+check:output=~test1
 cmd:xdsh $$CN "cat /tmp/test2.txt"
-check:output=~test2 
+check:output=~test2
 cmd:xdsh $$CN "rm -rf /tmp/test1.txt /tmp/test2.txt"
 check:rc==0
 cmd:chdef -t osimage -o  __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute synclists=
 check:rc==0
-cmd:rm -rf /tmp/sync /install/custom/install/__GETNODEATTR($$CN,os)__/compute.$$OS.synclist 
+cmd:rm -rf /tmp/sync /install/custom/install/__GETNODEATTR($$CN,os)__/compute.$$OS.synclist
 check:rc==0
 end
 
@@ -125,7 +125,7 @@ check:rc==0
 cmd:xdsh $$CN diff /etc/hosts /tmp/etc/hosts
 check:rc==0
 cmd:xdsh $$CN "rm /tmp/hosts"
-cmd:scp /tmp/prog1/conf1.tmpl root@$$CN:/tmp/ 
+cmd:scp /tmp/prog1/conf1.tmpl root@$$CN:/tmp/
 check:rc==0
 cmd:xdsh $$CN "ls -l /prog1/conf1"
 check:rc==0
@@ -159,7 +159,7 @@ cmd:echo "EXECUTE:" >> /install/custom/install/__GETNODEATTR($$CN,os)__/compute.
 cmd:echo "/tmp/file.post" >> /install/custom/install/__GETNODEATTR($$CN,os)__/compute.$$OS.synclist
 cmd:chdef -t osimage -o __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute synclists=/install/custom/install/__GETNODEATTR($$CN,os)__/compute.$$OS.synclist
 check:rc==0
-cmd:updatenode $$CN -F 
+cmd:updatenode $$CN -F
 check:rc==0
 cmd:xdsh $$CN "cat /tmp/test"
 check:rc==0
@@ -247,12 +247,12 @@ cmd:xdsh $$CN "cat /etc/shadow |grep -i \"bogususer:\*:15385::::::\""
 check:rc==0
 cmd:xdsh $$CN "cat /etc/shadow |grep -i \"bogususer1:\*:15385::::::\""
 check:rc==0
-cmd:xdsh $$CN "cat /etc/group |grep -i bogusgroup1|grep 19998" 
+cmd:xdsh $$CN "cat /etc/group |grep -i bogusgroup1|grep 19998"
 check:output=~1
-cmd:xdsh $$CN "cat /etc/group |grep -i bogusgroup|grep 29999" 
+cmd:xdsh $$CN "cat /etc/group |grep -i bogusgroup|grep 29999"
 check:rc==0
 cmd:xdsh $$CN "mv -f /tmp/updatenode_syncfile_MERGE/passwd /etc/passwd"
-check:rc==0 
+check:rc==0
 cmd:xdsh $$CN "mv -f /tmp/updatenode_syncfile_MERGE/group /etc/group"
 check:rc==0
 cmd:xdsh $$CN "mv -f /tmp/updatenode_syncfile_MERGE/shadow /etc/shadow"
@@ -261,7 +261,7 @@ cmd:xdsh  $$CN "rm -rf /tmp/updatenode_syncfile_MERGE"
 check:rc==0
 cmd:chdef -t osimage -o  __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute synclists=
 check:rc==0
-cmd:rm -rf /tmp/updatenode_syncfile_MERGE 
+cmd:rm -rf /tmp/updatenode_syncfile_MERGE
 check:rc==0
 end
 
@@ -289,14 +289,14 @@ check:rc==0
 end
 
 start:updatenode_P_script2
-cmd:echo "#!/bin/bash" > /tmp/updatenode_P_script_input 
+cmd:echo "#!/bin/bash" > /tmp/updatenode_P_script_input
 cmd:echo "if [ -n \$1 ]" >> /tmp/updatenode_P_script_input
 cmd:echo "then" >> /tmp/updatenode_P_script_input
 cmd:echo "    echo \"There is input parameter\" > /tmp/updatenode_P_script2" >> /tmp/updatenode_P_script_input
 cmd:echo "    if [[ \$1 == \"-a\" ]];then" >>  /tmp/updatenode_P_script_input
 cmd:echo "        echo \"The input is a\" >> /tmp/updatenode_P_script2" >> /tmp/updatenode_P_script_input
 cmd:echo "    elif [[ \$1 == \"-b\" ]];then" >> /tmp/updatenode_P_script_input
-cmd:echo "        echo \"The input is b\" >> /tmp/updatenode_P_script2" >> /tmp/updatenode_P_script_input 
+cmd:echo "        echo \"The input is b\" >> /tmp/updatenode_P_script2" >> /tmp/updatenode_P_script_input
 cmd:echo "    fi" >> /tmp/updatenode_P_script_input
 cmd:echo "fi" >> /tmp/updatenode_P_script_input
 cmd:cp /tmp/updatenode_P_script_input /install/postscripts/
@@ -408,7 +408,7 @@ cmd:cp /tmp/updatenode_P_script_input /install/postscripts/
 check:rc==0
 cmd:ls /install/postscripts/
 check:rc==0
-check:output=~updatenode_P_script_input 
+check:output=~updatenode_P_script_input
 cmd:chdef $$CN postscripts=updatenode_P_script_input
 check:rc==0
 cmd:updatenode $$CN "updatenode_P_script_input c"
@@ -427,7 +427,7 @@ end
 
 start:updatenode_P_script1_script2
 description:check updatenode noderange -P "script1 a,script2 b"
-cmd:echo "#!/bin/bash" > /tmp/updatenode_P1_script_input 
+cmd:echo "#!/bin/bash" > /tmp/updatenode_P1_script_input
 cmd:echo "if [ -n \$1 ];then" >> /tmp/updatenode_P1_script_input
 cmd:echo "    if [[ \$1 == \"a\" ]];then" >>  /tmp/updatenode_P1_script_input
 cmd:echo "        echo \"The input is \$1.\" >> /tmp/updatenode_P1_script" >> /tmp/updatenode_P1_script_input
@@ -437,8 +437,8 @@ cmd:cp /tmp/updatenode_P1_script_input /install/postscripts/
 check:rc==0
 cmd:ls /install/postscripts/
 check:rc==0
-check:output=~updatenode_P1_script_input 
-cmd:echo "#!/bin/bash" > /tmp/updatenode_P2_script_input 
+check:output=~updatenode_P1_script_input
+cmd:echo "#!/bin/bash" > /tmp/updatenode_P2_script_input
 cmd:echo "if [ -n \$1 ];then" >> /tmp/updatenode_P2_script_input
 cmd:echo "    if [[ \$1 == \"b\" ]];then" >>  /tmp/updatenode_P2_script_input
 cmd:echo "        echo \"The input is \$1.\" >> /tmp/updatenode_P2_script" >> /tmp/updatenode_P2_script_input
@@ -447,7 +447,7 @@ cmd:echo "fi" >> /tmp/updatenode_P2_script_input
 cmd:cp /tmp/updatenode_P2_script_input /install/postscripts/
 check:rc==0
 cmd:ls /install/postscripts/
-check:output=~updatenode_P2_script_input 
+check:output=~updatenode_P2_script_input
 cmd:chdef $$CN postscripts=updatenode_P1_script_input,updatenode_P2_script_input
 check:rc==0
 cmd:updatenode $$CN -P "updatenode_P1_script_input a,updatenode_P2_script_input b"
diff --git a/xCAT-test/autotest/testcase/updatenode/cases1 b/xCAT-test/autotest/testcase/updatenode/cases1
index cafd28d45..9b7685dc5 100644
--- a/xCAT-test/autotest/testcase/updatenode/cases1
+++ b/xCAT-test/autotest/testcase/updatenode/cases1
@@ -11,7 +11,7 @@ cmd:grep 'FOO BAR BAZ QUX' /tmp/updatenode.blah.out
 check:rc==0
 cmd:rm -f /install/postscripts/blah /tmp/updatenode.blah.out
 check:rc==0
-end 
+end
 
 start:updatenode_scripts_timeout
 cmd:mkdir -p /install/postscripts
@@ -32,4 +32,4 @@ cmd:grep 'SIGINT' /tmp/updatenode.blah.err
 check:rc==0
 cmd:rm -f /install/postscripts/blah /tmp/updatenode.blah.out /tmp/updatenode.blah.err
 check:rc==0
-end 
+end
diff --git a/xCAT-test/autotest/testcase/updatenode/cases2 b/xCAT-test/autotest/testcase/updatenode/cases2
index 9ba8c73e5..6a02c9372 100644
--- a/xCAT-test/autotest/testcase/updatenode/cases2
+++ b/xCAT-test/autotest/testcase/updatenode/cases2
@@ -2,7 +2,7 @@ start:updatenode_S
 cmd:updatenode $$CN -S >/tmp/updatenode.S.out
 cmd:grep 'Running of Software Maintenance has completed' /tmp/updatenode.S.out
 check:rc==0
-end 
+end
 
 start:updatenode_S_gcc
 cmd:lsdef $$CN -i provmethod | tail -n 1 | cut -d= -f2 | xargs lsdef -t osimage -i pkglist | tail -n 1 | cut -d= -f2 >/tmp/pkglist.filename
diff --git a/xCAT-test/autotest/testcase/updatenode/cases3 b/xCAT-test/autotest/testcase/updatenode/cases3
index 4f622e706..6c0a50143 100644
--- a/xCAT-test/autotest/testcase/updatenode/cases3
+++ b/xCAT-test/autotest/testcase/updatenode/cases3
@@ -1,8 +1,8 @@
 start:updatenode_diskful_syncfiles_failing
 description: Test exit code when syncfiles failing.
-cmd:mkdir -p /install/custom/install/__GETNODEATTR($$CN,os)__/ 
+cmd:mkdir -p /install/custom/install/__GETNODEATTR($$CN,os)__/
 check:rc==0
-cmd:echo "/tmp/non-existent -> /etc/motd" > /install/custom/install/__GETNODEATTR($$CN,os)__/booboo.synclist 
+cmd:echo "/tmp/non-existent -> /etc/motd" > /install/custom/install/__GETNODEATTR($$CN,os)__/booboo.synclist
 check:rc==0
 cmd:chdef -t osimage -o __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute synclists=/install/custom/install/__GETNODEATTR($$CN,os)__/booboo.synclist
 check:rc==0
@@ -14,6 +14,6 @@ cmd:grep '"/tmp/non-existent" failed: No such file or directory' /tmp/updatenode
 check:rc==0
 cmd:chdef -t osimage -o  __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute synclists=
 check:rc==0
-cmd:rm -f /install/custom/install/__GETNODEATTR($$CN,os)__/booboo.synclist 
+cmd:rm -f /install/custom/install/__GETNODEATTR($$CN,os)__/booboo.synclist
 cmd:rm -rf /tmp/updatenode.F.out
-end 
+end
diff --git a/xCAT-test/autotest/testcase/updatenode/cases4 b/xCAT-test/autotest/testcase/updatenode/cases4
index 008767fb3..bf849b45c 100644
--- a/xCAT-test/autotest/testcase/updatenode/cases4
+++ b/xCAT-test/autotest/testcase/updatenode/cases4
@@ -2,10 +2,10 @@ start:updatenode_syncfiles
 description: Test cases for the syncfiles feature
 cmd:/opt/xcat/share/xcat/tools/autotest/testcase/updatenode/syncfiles $$CN
 check:rc==0
-end 
+end
 
 start:updatenode_syncfiles_scp
 description: Test cases for the syncfiles feature with scp
 cmd:/opt/xcat/share/xcat/tools/autotest/testcase/updatenode/syncfiles $$CN scp
 check:rc==0
-end 
+end
diff --git a/xCAT-test/autotest/testcase/updatenode/filesyncing_hierarchy_case b/xCAT-test/autotest/testcase/updatenode/filesyncing_hierarchy_case
index 6b62feffb..92a69c30f 100644
--- a/xCAT-test/autotest/testcase/updatenode/filesyncing_hierarchy_case
+++ b/xCAT-test/autotest/testcase/updatenode/filesyncing_hierarchy_case
@@ -1,28 +1,28 @@
 start:updatenode_f_F_hierarchy
-description: verify the behavior of updatenode -f/-F in the hierarchy environment-- (1)the different kind of synclist entries including destination nodes (2)make sure the location of directory to hold the files/dirs to sync on SN is correct (3)check the result of updatenode -f/-F  
+description: verify the behavior of updatenode -f/-F in the hierarchy environment-- (1)the different kind of synclist entries including destination nodes (2)make sure the location of directory to hold the files/dirs to sync on SN is correct (3)check the result of updatenode -f/-F
 
 #create environment files to hold variables accross the case
-cmd: MYENVFILE="/tmp/updatenode_f_F_hierarchy.envs"; rm -rf $MYENVFILE; echo "MYENVFILE=\"$MYENVFILE\"">> $MYENVFILE; chmod +x $MYENVFILE 
+cmd: MYENVFILE="/tmp/updatenode_f_F_hierarchy.envs"; rm -rf $MYENVFILE; echo "MYENVFILE=\"$MYENVFILE\"">> $MYENVFILE; chmod +x $MYENVFILE
 #obtain and save the site.SNsyncfiledir
 cmd: source /tmp/updatenode_f_F_hierarchy.envs;echo $(lsdef -t site -o clustersite -i SNsyncfiledir|grep SNsyncfiledir||echo "SNsyncfiledir=/var/xcat/syncfiles")>>$MYENVFILE
 #create and save dir to hold intermidate files/dirs related to the case
-cmd: source /tmp/updatenode_f_F_hierarchy.envs;SYNCDIR='/tmp/updatenode_f_F_hierarchy.dir/';echo "SYNCDIR=\"$SYNCDIR\"">>$MYENVFILE; rm -rf $SYNCDIR; mkdir -p $SYNCDIR 
+cmd: source /tmp/updatenode_f_F_hierarchy.envs;SYNCDIR='/tmp/updatenode_f_F_hierarchy.dir/';echo "SYNCDIR=\"$SYNCDIR\"">>$MYENVFILE; rm -rf $SYNCDIR; mkdir -p $SYNCDIR
 #create and save synclist path
 cmd: source /tmp/updatenode_f_F_hierarchy.envs; SYNCLIST="$SYNCDIR/synclist";echo "SYNCLIST=\"$SYNCLIST\"">>$MYENVFILE
 
 #obtain the cn's osimage name, backup the osimage definition, save the osimage name and the path to the osimage stanza
 cmd: source /tmp/updatenode_f_F_hierarchy.envs; CNOSIMGSTANZA="$SYNCDIR/osimage.stanza";CNOSIMG=__GETNODEATTR($$CN,provmethod)__;lsdef -t osimage -o $CNOSIMG -z>$CNOSIMGSTANZA; echo "CNOSIMGSTANZA=\"$CNOSIMGSTANZA\"" >> $MYENVFILE; echo "CNOSIMG=\"$CNOSIMG\"">>$MYENVFILE
 #specify the synclists attribute for cn's osimage
-cmd: source /tmp/updatenode_f_F_hierarchy.envs; chdef -t osimage -o $CNOSIMG synclists=$SYNCLIST 
+cmd: source /tmp/updatenode_f_F_hierarchy.envs; chdef -t osimage -o $CNOSIMG synclists=$SYNCLIST
 check:rc==0
 
 #create the dirs+files to sync, append the sync list entries
 cmd: source /tmp/updatenode_f_F_hierarchy.envs; echo "$SYNCDIR/testdir1/ -> ($$CN) /tmp/" >>$SYNCLIST ; mkdir -p "$SYNCDIR/testdir1/"; echo "hellotest" > "$SYNCDIR/testdir1/testfile1"
-cmd: source /tmp/updatenode_f_F_hierarchy.envs; echo "$SYNCDIR/testdir2/* -> ($$CN) /tmp/" >>$SYNCLIST; mkdir -p "$SYNCDIR/testdir2/"; echo "hellotest" > "$SYNCDIR/testdir2/testfile2" 
-cmd: source /tmp/updatenode_f_F_hierarchy.envs; echo "$SYNCDIR/testdir3 -> ($$CN) /tmp/" >>$SYNCLIST; mkdir -p "$SYNCDIR/testdir3/"; echo "hellotest" > "$SYNCDIR/testdir3/testfile3" 
-cmd: source /tmp/updatenode_f_F_hierarchy.envs; echo "$SYNCDIR/testdir4/testfile4 -> ($$CN) /tmp/" >>$SYNCLIST; mkdir -p "$SYNCDIR/testdir4/"; echo "hellotest" > "$SYNCDIR/testdir4/testfile4" 
-cmd: source /tmp/updatenode_f_F_hierarchy.envs; echo "$SYNCDIR/testdir5/testfile5 -> /tmp/" >>$SYNCLIST; mkdir -p "$SYNCDIR/testdir5/"; echo "hellotest" > "$SYNCDIR/testdir5/testfile5" 
-cmd: source /tmp/updatenode_f_F_hierarchy.envs; echo "$SYNCDIR/testdir6/testfile6 -> ($$SN) /tmp/" >>$SYNCLIST; mkdir -p "$SYNCDIR/testdir6/"; echo "hellotest" > "$SYNCDIR/testdir6/testfile6" 
+cmd: source /tmp/updatenode_f_F_hierarchy.envs; echo "$SYNCDIR/testdir2/* -> ($$CN) /tmp/" >>$SYNCLIST; mkdir -p "$SYNCDIR/testdir2/"; echo "hellotest" > "$SYNCDIR/testdir2/testfile2"
+cmd: source /tmp/updatenode_f_F_hierarchy.envs; echo "$SYNCDIR/testdir3 -> ($$CN) /tmp/" >>$SYNCLIST; mkdir -p "$SYNCDIR/testdir3/"; echo "hellotest" > "$SYNCDIR/testdir3/testfile3"
+cmd: source /tmp/updatenode_f_F_hierarchy.envs; echo "$SYNCDIR/testdir4/testfile4 -> ($$CN) /tmp/" >>$SYNCLIST; mkdir -p "$SYNCDIR/testdir4/"; echo "hellotest" > "$SYNCDIR/testdir4/testfile4"
+cmd: source /tmp/updatenode_f_F_hierarchy.envs; echo "$SYNCDIR/testdir5/testfile5 -> /tmp/" >>$SYNCLIST; mkdir -p "$SYNCDIR/testdir5/"; echo "hellotest" > "$SYNCDIR/testdir5/testfile5"
+cmd: source /tmp/updatenode_f_F_hierarchy.envs; echo "$SYNCDIR/testdir6/testfile6 -> ($$SN) /tmp/" >>$SYNCLIST; mkdir -p "$SYNCDIR/testdir6/"; echo "hellotest" > "$SYNCDIR/testdir6/testfile6"
 
 #clear up the SNsyncfiledir directory on sn
 cmd: source /tmp/updatenode_f_F_hierarchy.envs;ssh $$SN "rm -rf $SNsyncfiledir/*"
@@ -33,15 +33,15 @@ check:rc==0
 
 #verify the behavior of updatenode -f
 cmd: source /tmp/updatenode_f_F_hierarchy.envs; ssh $$SN "cat $SNsyncfiledir/$SYNCDIR/testdir1/testfile1|grep 'hellotest'"
-check:rc==0  
+check:rc==0
 cmd: source /tmp/updatenode_f_F_hierarchy.envs; ssh $$SN "cat $SNsyncfiledir/$SYNCDIR/testdir2/testfile2|grep 'hellotest'"
-check:rc==0  
+check:rc==0
 cmd: source /tmp/updatenode_f_F_hierarchy.envs; ssh $$SN "cat $SNsyncfiledir/$SYNCDIR/testdir3/testfile3|grep 'hellotest'"
-check:rc==0  
+check:rc==0
 cmd: source /tmp/updatenode_f_F_hierarchy.envs; ssh $$SN "cat $SNsyncfiledir/$SYNCDIR/testdir4/testfile4|grep 'hellotest'"
-check:rc==0  
+check:rc==0
 cmd: source /tmp/updatenode_f_F_hierarchy.envs; ssh $$SN "cat $SNsyncfiledir/$SYNCDIR/testdir5/testfile5|grep 'hellotest'"
-check:rc==0  
+check:rc==0
 
 #clean up existing files/dirs with the same name as the ones to sync
 cmd: source /tmp/updatenode_f_F_hierarchy.envs; ssh $$CN "rm -rf /tmp/test{dir,file}*"
@@ -65,7 +65,7 @@ cmd: source /tmp/updatenode_f_F_hierarchy.envs; ssh $$CN "cat /tmp/testfile6|gre
 check:rc!=0
 
 # restore the cn osimage definition
-cmd: source /tmp/updatenode_f_F_hierarchy.envs; cat $CNOSIMGSTANZA|chdef -z 
+cmd: source /tmp/updatenode_f_F_hierarchy.envs; cat $CNOSIMGSTANZA|chdef -z
 check:rc==0
 
 #clean up the intermidate dirs/files generated in this case
diff --git a/xCAT-test/autotest/testcase/xcat-inventory/cases.common b/xCAT-test/autotest/testcase/xcat-inventory/cases.common
index f688d02cb..ff1e9c844 100644
--- a/xCAT-test/autotest/testcase/xcat-inventory/cases.common
+++ b/xCAT-test/autotest/testcase/xcat-inventory/cases.common
@@ -40,13 +40,13 @@ end
 start:xcat_inventory_export_option_t_invalid_type
 description:This case is used to test xcat-inventory export subcommand to handle invalid type for option t
 cmd:xcat-inventory export -t aaa
-check:output=~Invalid object type 
+check:output=~Invalid object type
 check:output!~Traceback (most recent call last):
 check:rc!=0
 end
 
 start:xcat_inventory_export_option_format_invalid_type
-description:This case is used to test xcat-inventory export subcommand to handle invalid type for option format 
+description:This case is used to test xcat-inventory export subcommand to handle invalid type for option format
 cmd:xcat-inventory export --format aaa
 check:output=~Invalid exporting format: aaa
 check:output!~Traceback (most recent call last):
@@ -124,7 +124,7 @@ check:rc==0
 cmd:cat /tmp/xcat_inventory_import_option_f_invalid_file/invaild_json
 check:rc==0
 cmd:xcat-inventory import -f /tmp/xcat_inventory_import_option_f_invalid_file/invaild_json
-check:output =~ Error: failed to load file 
+check:output =~ Error: failed to load file
 check:output !~Traceback
 check:rc!=0
 #To handle a invalid yaml file
@@ -140,7 +140,7 @@ check:rc==0
 cmd:cat /tmp/xcat_inventory_import_option_f_invalid_file/invaild_yaml
 check:rc==0
 cmd:xcat-inventory import -f /tmp/xcat_inventory_import_option_f_invalid_file/invaild_yaml
-check:output =~ Error: 
+check:output =~ Error:
 check:output !~Traceback
 check:rc!=0
 cmd:rm -rf /tmp/xcat_inventory_import_option_f_invalid_file
diff --git a/xCAT-test/autotest/testcase/xcat-inventory/cases.credential b/xCAT-test/autotest/testcase/xcat-inventory/cases.credential
new file mode 100644
index 000000000..fb4014c7e
--- /dev/null
+++ b/xCAT-test/autotest/testcase/xcat-inventory/cases.credential
@@ -0,0 +1,51 @@
+start:export_import_credential
+description:This case is used to test xcat-inventory support credential export and import.
+label:others,xcat_inventory
+cmd:dir="/tmp/credential";if [ -e "${dir}" ];then mv ${dir} ${dir}".bak"; fi; mkdir -p $dir
+cmd:dir="/tmp/backup";if [ -e "${dir}" ];then mv ${dir} ${dir}".bak"; fi; mkdir -p $dir
+cmd:cp -rf /etc/xcat/ca/ca-cert.pem /etc/xcat/ca/private/ca-key.pem /etc/xcat/cert/server-cred.pem /root/.xcat/client-key.pem /tmp/backup
+check:rc==0
+cmd:xcat-inventory export -t credential -d /tmp/credential
+check:rc==0
+check:output=~The credential objects has been exported to directory /tmp/credential
+cmd:diff -y /etc/xcat/ca/ca-cert.pem /tmp/credential/credential/etc/xcat/ca/ca-cert.pem
+check:rc==0
+cmd:diff -y /etc/xcat/ca/private/ca-key.pem  /tmp/credential/credential/etc/xcat/ca/private/ca-key.pem
+check:rc==0
+cmd:diff -y  /etc/xcat/cert/server-cred.pem  /tmp/credential/credential/etc/xcat/cert/server-cred.pem
+check:rc==0
+cmd:diff -y /root/.xcat/client-key.pem  /tmp/credential/credential/root/.xcat/client-key.pem
+check:rc==0
+cmd:sed -i '$a\test' /etc/xcat/ca/ca-cert.pem
+check:rc==0
+cmd:sed -i '$a\test' /etc/xcat/ca/private/ca-key.pem
+check:rc==0
+cmd:sed -i '$a\test' /etc/xcat/cert/server-cred.pem
+check:rc==0
+cmd:sed -i '$a\test' /root/.xcat/client-key.pem
+check:rc==0
+cmd:xcat-inventory import -t credential -d /tmp/credential
+check:rc==0
+check:output=~Inventory import successfully!
+check:output=~Warning: the /etc/xcat/ca/ca-cert.pem already exists, will be overwritten
+check:output=~Warning: the /etc/xcat/ca/private/ca-key.pem already exists, will be overwritten
+check:output=~Warning: the /root/.xcat/client-key.pem already exists, will be overwritten
+check:output=~Warning: the /etc/xcat/cert/server-cred.pem already exists, will be overwritten
+check:output=~The object credential has been imported
+cmd:diff -y /etc/xcat/ca/ca-cert.pem /tmp/backup/ca-cert.pem
+check:rc==0
+cmd:diff -y /etc/xcat/ca/private/ca-key.pem  /tmp/backup/ca-key.pem
+check:rc==0
+cmd:diff -y  /etc/xcat/cert/server-cred.pem  /tmp/backup/server-cred.pem
+check:rc==0
+cmd:diff -y /root/.xcat/client-key.pem  /tmp/backup/client-key.pem
+check:rc==0
+cmd:rm -rf /tmp/credential
+cmd:cp -rf /tmp/backup/ca-cert.pem /etc/xcat/ca/ca-cert.pem
+cmd:cp -rf /tmp/backup/ca-key.pem /etc/xcat/ca/private/ca-key.pem
+cmd:cp -rf /tmp/backup/server-cred.pem /etc/xcat/cert/server-cred.pem
+cmd:cp -rf /tmp/backup/client-key.pem /root/.xcat/client-key.pem
+cmd:rm -rf /tmp/backup
+cmd:dir="/tmp/credential";if [ -e "${dir}" ];then mv ${dir}".bak" ${dir}; fi;
+cmd:dir="/tmp/backup";if [ -e "${dir}" ];then mv ${dir}".bak" ${dir}; fi;
+end
diff --git a/xCAT-test/autotest/testcase/xcat-inventory/cases.environment b/xCAT-test/autotest/testcase/xcat-inventory/cases.environment
index f0c269173..6e25e315a 100644
--- a/xCAT-test/autotest/testcase/xcat-inventory/cases.environment
+++ b/xCAT-test/autotest/testcase/xcat-inventory/cases.environment
@@ -21,17 +21,16 @@ check:rc==0
 
 cmd:rootimgdir=`lsdef -t osimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute|grep rootimgdir|awk -F'=' '{print $2}'`; if [ -d $rootimgdir ]; then mv $rootimgdir $rootimgdir.regbak -f;fi
 check:rc==0
-cmd:export GITREPO="/opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/environment/gitrepo";export SWDIR="/opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/environment/swdir";xcat-inventory import -f /opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/environment/test.environments.osimage.yaml
+cmd:xcat-inventory import -f /opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/environment/test.environments.osimage.yaml -e GITREPO=/opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/environment/gitrepo -e SWDIR=/opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/environment/swdir
 check:output=~Importing object: test.environments.osimage
 check:output=~Inventory import successfully!
 check:rc==0
 cmd:lsdef -t osimage -o test.environments.osimage
 check:rc==0
-cmd:genimage test.environments.osimage 
+cmd:genimage test.environments.osimage
 check:rc==0
-cmd:packimage test.environments.osimage 
+cmd:packimage test.environments.osimage
 check:rc==0
-
 cmd:rinstall $$CN osimage=test.environments.osimage
 check:rc==0
 check:output=~Provision node\(s\)\: $$CN
@@ -73,7 +72,7 @@ cmd:xdsh $$CN "rpm -qa |grep -i conserver-xcat"
 check:rc==0
 cmd:xdsh $$CN "rpm -qa |grep -i perl-Net-Telnet"
 check:rc==0
-cmd:xdsh $$CN "rpm -qa |grep -i tftp" 
+cmd:xdsh $$CN "rpm -qa |grep -i tftp"
 check:rc==0
 cmd:xdsh $$CN "rpm -qa |grep -w dhcp"
 check:rc==0
@@ -86,7 +85,7 @@ label:others,xcat_inventory
 cmd:lsdef -t osimage -o test.environments.osimage >/dev/null 2>&1;if [[ $? -eq 0 ]]; then lsdef -t osimage -o test.environments.osimage -z >/tmp/test.environments.osimage_image.stanza ;rmdef -t osimage -o test.environments.osimage;fi
 check:rc==0
 cmd:dir="/tmp/export";if [ -e "${dir}" ];then mv ${dir} ${dir}".bak"; fi; mkdir -p $dir
-cmd:export GITREPO="/opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/environment/gitrepo";export SWDIR="/opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/environment/swdir";xcat-inventory import -f /opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/environment/test.environments.osimage.update.yaml
+cmd:xcat-inventory import -f /opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/environment/test.environments.osimage.update.yaml -e GITREPO=/opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/environment/gitrepo -e SWDIR=/opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/environment/swdir
 check:output=~Importing object: test.environments.osimage
 check:output=~Inventory import successfully!
 check:rc==0
@@ -101,7 +100,7 @@ cmd:diff -y  /opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templat
 check:rc==0
 cmd:rmdef -t osimage -o test.environments.osimage
 check:rc==0
-cmd:export GITREPO="/opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/environment/gitrepo";export SWDIR="/opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/environment/swdir";xcat-inventory import -f /opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/environment/test.environments.osimage.update.json
+cmd:xcat-inventory import -f /opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/environment/test.environments.osimage.update.json -e GITREPO=/opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/environment/gitrepo -e SWDIR=/opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/environment/swdir
 check:output=~Importing object: test.environments.osimage
 check:output=~Inventory import successfully!
 check:rc==0
diff --git a/xCAT-test/autotest/testcase/xcat-inventory/cases.include b/xCAT-test/autotest/testcase/xcat-inventory/cases.include
index b38e40f49..e1c85460f 100644
--- a/xCAT-test/autotest/testcase/xcat-inventory/cases.include
+++ b/xCAT-test/autotest/testcase/xcat-inventory/cases.include
@@ -14,15 +14,15 @@ check:rc==0
 cmd:rm -rf /tmp/imagedata/test_osimage/test_osimage.stanza
 cmd:lsdef -t osimage -o test_osimage
 check:rc==0
-cmd:xcat-inventory export -t osimage -o test_osimage -d /tmp/imagedata/export 
-check:output=~The osimage objects has been exported to directory /tmp/imagedata/export 
+cmd:xcat-inventory export -t osimage -o test_osimage -d /tmp/imagedata/export
+check:output=~The osimage objects has been exported to directory /tmp/imagedata/export
 cmd:ls -lFR /tmp/imagedata/export
 cmd:diff -r /tmp/imagedata/test_osimage /tmp/imagedata/export/test_osimage/tmp/imagedata/test_osimage/
 check:output=~Only in /tmp/imagedata/test_osimage: file7
-cmd:diff -y /etc/hosts /tmp/imagedata/export/test_osimage/etc/hosts 
+cmd:diff -y /etc/hosts /tmp/imagedata/export/test_osimage/etc/hosts
 check:rc==0
 cmd:ls -l /tmp/imagedata/export/test_osimage/tmp/imagedata/test_osimage/file7
-check:rc!=0 
+check:rc!=0
 cmd: rmdef -t osimage -o  test_osimage
 check:rc==0
 cmd:rm -rf /tmp/imagedata/test_osimage
@@ -33,7 +33,7 @@ check:output=~Inventory import successfully!
 check:output=~The object test_osimage has been imported
 cmd:lsdef -t osimage -o test_osimage
 check:rc==0
-cmd:diff -r /tmp/imagedata/export/test_osimage/tmp/imagedata/test_osimage/ /tmp/imagedata/test_osimage 
+cmd:diff -r /tmp/imagedata/export/test_osimage/tmp/imagedata/test_osimage/ /tmp/imagedata/test_osimage
 check:rc==0
 cmd: rmdef -t osimage -o  test_osimage
 check:rc==0
diff --git a/xCAT-test/autotest/testcase/xcat-inventory/cases.node b/xCAT-test/autotest/testcase/xcat-inventory/cases.node
index ece113319..c08329e40 100644
--- a/xCAT-test/autotest/testcase/xcat-inventory/cases.node
+++ b/xCAT-test/autotest/testcase/xcat-inventory/cases.node
@@ -621,7 +621,7 @@ end
 
 
 start:export_import_nodes_delimited_with_comma_by_yaml
-description:This case is used to test xcat-inventory export and import the definition of nodes delimited with comma by yaml between 2 exact same MNs.Before running this case, make sure these two MNs have been installed same exactly, and the current MN can connect the other MN by ssh without password. This case also can be run in one MN, this is, export from currnet node then import back to currnet node, in this case, just need to set $$DSTMN=<currnet node ip> 
+description:This case is used to test xcat-inventory export and import the definition of nodes delimited with comma by yaml between 2 exact same MNs.Before running this case, make sure these two MNs have been installed same exactly, and the current MN can connect the other MN by ssh without password. This case also can be run in one MN, this is, export from currnet node then import back to currnet node, in this case, just need to set $$DSTMN=<currnet node ip>
 Attribute: $$DSTMN - the ip of MN which is used to run import operation.
 cmd:mkdir -p /tmp/export_import_nodes_delimited_with_comma_by_yaml
 check:rc==0
@@ -672,7 +672,7 @@ check:rc==0
 end
 
 start:export_import_nodes_delimited_with_comma_by_json
-description:This case is used to test xcat-inventory export and import the definition of nodes delimited with comma by json between 2 exact same MNs.Before running this case, make sure these two MNs have been installed same exactly, and the current MN can connect the other MN by ssh without password. This case also can be run in one MN, this is, export from currnet node then import back to currnet node, in this case, just need to set $$DSTMN=<currnet node ip> 
+description:This case is used to test xcat-inventory export and import the definition of nodes delimited with comma by json between 2 exact same MNs.Before running this case, make sure these two MNs have been installed same exactly, and the current MN can connect the other MN by ssh without password. This case also can be run in one MN, this is, export from currnet node then import back to currnet node, in this case, just need to set $$DSTMN=<currnet node ip>
 Attribute: $$DSTMN - the ip of MN which is used to run import operation.
 cmd:mkdir -p /tmp/export_import_nodes_delimited_with_comma_by_json
 check:rc==0
@@ -892,7 +892,7 @@ check:rc==0
 end
 
 start:xcat_inventory_try_to_import_all_type_is_node_yaml_format
-description:This case is used to test xcat-inventory import all definition which type is node from a yaml file. 
+description:This case is used to test xcat-inventory import all definition which type is node from a yaml file.
 cmd:mkdir -p /tmp/xcat_inventory_try_to_import_all_type_is_node_yaml_format
 check:rc==0
 cmd:for i in 1 2 3; do lsdef bogusnode$i > /dev/null 2>&1;if [[ $? -eq 0 ]]; then lsdef bogusnode$i -z >> /tmp/xcat_inventory_try_to_import_all_type_is_node_yaml_format/bogusnode.stanza ;rmdef bogusnode$i;fi;done
@@ -1216,7 +1216,7 @@ end
 
 
 start:xcat_inventory_try_to_import_all_type_is_node_json_format
-description:This case is used to test xcat-inventory import all definition which type is node from a yaml file. 
+description:This case is used to test xcat-inventory import all definition which type is node from a yaml file.
 cmd:mkdir -p /tmp/xcat_inventory_try_to_import_all_type_is_node_json_format
 check:rc==0
 cmd:for i in 1 2 3; do lsdef bogusnode$i > /dev/null 2>&1;if [[ $? -eq 0 ]]; then lsdef bogusnode$i -z >> /tmp/xcat_inventory_try_to_import_all_type_is_node_json_format/bogusnode.stanza ;rmdef bogusnode$i;fi;done
@@ -1822,7 +1822,7 @@ check:rc==0
 cmd:sed -i 's/"42:d6:0a:03:05:08"/"42:d6:0a:03:05:09"/g' /tmp/export_single_node_then_modify_json_then_import/bogusnode_json.inv
 check:rc==0
 cmd:sed -i 's/ "grub2"/ "petitboot"/g' /tmp/export_single_node_then_modify_json_then_import/bogusnode_json.inv
-check:rc==0 
+check:rc==0
 cmd:a=('setuptftp' 'setupnameserver' 'setupdhcp' 'setupntp' 'setupldap' 'setupproxydhcp' 'setupipforward' 'setupconserver' 'setupnfs');for i in ${a[@]};do sed -i "s/\"$i\": \"1\"/\"$i\": \"0\"/g" /tmp/export_single_node_then_modify_json_then_import/bogusnode_json.inv; done
 check:rc==0
 cmd:scp /tmp/export_single_node_then_modify_json_then_import/bogusnode_json.inv $$DSTMN:/tmp/export_single_node_then_modify_json_then_import_$$DSTMN/
diff --git a/xCAT-test/autotest/testcase/xcat-inventory/cases.osimage.import_from_osimage_dir b/xCAT-test/autotest/testcase/xcat-inventory/cases.osimage.import_from_osimage_dir
index dff942529..237956de5 100644
--- a/xCAT-test/autotest/testcase/xcat-inventory/cases.osimage.import_from_osimage_dir
+++ b/xCAT-test/autotest/testcase/xcat-inventory/cases.osimage.import_from_osimage_dir
@@ -1,9 +1,9 @@
 start:export_import_an_osimage_directory
 description: import an osimage diretory with `xcat-inventroy import -d <osimage directory>`
-#backup any existing test_myimage 
+#backup any existing test_myimage
 cmd:mkdir -p /tmp/export_import_an_osimage_directory/backup
 check:rc==0
-cmd:lsdef -t osimage -o test_myimage >/dev/null 2>&1;if [[ $? -eq 0 ]]; then lsdef -t osimage -o test_myimage -z >/tmp/export_import_an_osimage_directory/backup/test_myimage.stanza;fi 
+cmd:lsdef -t osimage -o test_myimage >/dev/null 2>&1;if [[ $? -eq 0 ]]; then lsdef -t osimage -o test_myimage -z >/tmp/export_import_an_osimage_directory/backup/test_myimage.stanza;fi
 
 #remove any existing test_myimage
 cmd:rmdef -t osimage -o test_myimage
@@ -16,7 +16,7 @@ cmd: xcat-inventory import -d /opt/xcat/share/xcat/tools/autotest/testcase/xcat-
 check:rc==0
 
 #check whether the osimage definition is created
-cmd: lsdef -t osimage -o test_myimage -z |tee /tmp/export_import_an_osimage_directory/test_myimage.stanza 
+cmd: lsdef -t osimage -o test_myimage -z |tee /tmp/export_import_an_osimage_directory/test_myimage.stanza
 check:rc==0
 cmd: diff /tmp/export_import_an_osimage_directory/test_myimage.stanza /opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/cluster_invdir/osimage/test_myimage/test_myimage.stanza
 check: rc==0
@@ -38,11 +38,11 @@ end
 
 start:export_import_multiple_osimages_from_osimage_directory
 description: import multiple osimage diretories  with `xcat-inventroy import -d <osimage directory>`
-#backup any existing test_myimage,test_myimage2 
+#backup any existing test_myimage,test_myimage2
 cmd:mkdir -p /tmp/export_import_multiple_osimages_from_osimage_directory/backup
 check:rc==0
-cmd:lsdef -t osimage -o test_myimage >/dev/null 2>&1;if [[ $? -eq 0 ]]; then lsdef -t osimage -o test_myimage -z >/tmp/export_import_multiple_osimages_from_osimage_directory/backup/test_myimage.stanza;fi 
-cmd:lsdef -t osimage -o test_myimage2 >/dev/null 2>&1;if [[ $? -eq 0 ]]; then lsdef -t osimage -o test_myimage2 -z >/tmp/export_import_multiple_osimages_from_osimage_directory/backup/test_myimage2.stanza;fi 
+cmd:lsdef -t osimage -o test_myimage >/dev/null 2>&1;if [[ $? -eq 0 ]]; then lsdef -t osimage -o test_myimage -z >/tmp/export_import_multiple_osimages_from_osimage_directory/backup/test_myimage.stanza;fi
+cmd:lsdef -t osimage -o test_myimage2 >/dev/null 2>&1;if [[ $? -eq 0 ]]; then lsdef -t osimage -o test_myimage2 -z >/tmp/export_import_multiple_osimages_from_osimage_directory/backup/test_myimage2.stanza;fi
 
 #remove any existing test_myimage,test_myimage2
 cmd:rmdef -t osimage -o test_myimage,test_myimage2
@@ -53,14 +53,14 @@ check:rc!=0
 cmd:dir="/tmp/test_myimage";if [ -d "${dir}" ];then mv ${dir} ${dir}".old"; fi
 cmd:dir="/tmp/test_myimage2";if [ -d "${dir}" ];then mv ${dir} ${dir}".old"; fi
 
-#import osimages 
+#import osimages
 cmd: xcat-inventory import -d /opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/cluster_invdir/osimage/
 check:rc==0
 
 #check whether the osimage definition is created
-cmd: lsdef -t osimage -o test_myimage -z | tee /tmp/export_import_multiple_osimages_from_osimage_directory/test_myimage.stanza 
+cmd: lsdef -t osimage -o test_myimage -z | tee /tmp/export_import_multiple_osimages_from_osimage_directory/test_myimage.stanza
 check:rc==0
-cmd: lsdef -t osimage -o test_myimage2 -z | tee /tmp/export_import_multiple_osimages_from_osimage_directory/test_myimage2.stanza 
+cmd: lsdef -t osimage -o test_myimage2 -z | tee /tmp/export_import_multiple_osimages_from_osimage_directory/test_myimage2.stanza
 check:rc==0
 cmd: diff /tmp/export_import_multiple_osimages_from_osimage_directory/test_myimage.stanza /opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/cluster_invdir/osimage/test_myimage/test_myimage.stanza
 check: rc==0
@@ -91,10 +91,10 @@ end
 
 start:export_import_specified_from_osimage_directory
 description: import specified osimage from osimage diretory with `xcat-inventroy import -d <osimage directory> -t osimage -o`
-#backup any existing test_myimage 
+#backup any existing test_myimage
 cmd:mkdir -p /tmp/export_import_specified_from_osimage_directory/backup
 check:rc==0
-cmd:lsdef -t osimage -o test_myimage >/dev/null 2>&1;if [[ $? -eq 0 ]]; then lsdef -t osimage -o test_myimage -z >/tmp/export_import_specified_from_osimage_directory/backup/test_myimage.stanza;fi 
+cmd:lsdef -t osimage -o test_myimage >/dev/null 2>&1;if [[ $? -eq 0 ]]; then lsdef -t osimage -o test_myimage -z >/tmp/export_import_specified_from_osimage_directory/backup/test_myimage.stanza;fi
 
 #remove any existing test_myimage
 cmd:rmdef -t osimage -o test_myimage
@@ -107,7 +107,7 @@ cmd: xcat-inventory import -d /opt/xcat/share/xcat/tools/autotest/testcase/xcat-
 check:rc==0
 
 #check whether the osimage definition is created
-cmd: lsdef -t osimage -o test_myimage -z |tee /tmp/export_import_specified_from_osimage_directory/test_myimage.stanza 
+cmd: lsdef -t osimage -o test_myimage -z |tee /tmp/export_import_specified_from_osimage_directory/test_myimage.stanza
 check:rc==0
 cmd: diff /tmp/export_import_specified_from_osimage_directory/test_myimage.stanza /opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/cluster_invdir/osimage/test_myimage/test_myimage.stanza
 check: rc==0
diff --git a/xCAT-test/autotest/testcase/xcat-inventory/cases.passwd b/xCAT-test/autotest/testcase/xcat-inventory/cases.passwd
index 5ea837961..a6a605d97 100644
--- a/xCAT-test/autotest/testcase/xcat-inventory/cases.passwd
+++ b/xCAT-test/autotest/testcase/xcat-inventory/cases.passwd
@@ -5,7 +5,7 @@ check:rc==0
 cmd:mkdir -p /tmp/xcat_inventory_import_validation_passwd_bak
 check:rc==0
 
-cmd:/opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/validatehelper "passwd" "autotest" "cryptmethod" "" "/tmp/xcat_inventory_import_validation_passwd" 
+cmd:/opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/validatehelper "passwd" "autotest" "cryptmethod" "" "/tmp/xcat_inventory_import_validation_passwd"
 check:rc==0
 
 cmd:/opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/validatehelper "passwd" "autotest" "cryptmethod" "md5" "/tmp/xcat_inventory_import_validation_passwd"
diff --git a/xCAT-test/autotest/testcase/xcat-inventory/cases.route b/xCAT-test/autotest/testcase/xcat-inventory/cases.route
index 4c90f703e..eb070b3e5 100644
--- a/xCAT-test/autotest/testcase/xcat-inventory/cases.route
+++ b/xCAT-test/autotest/testcase/xcat-inventory/cases.route
@@ -5,7 +5,7 @@ check:rc==0
 cmd:lsdef -t route -o autotestnet > /dev/null 2>&1;if [[ $? -eq 0 ]]; then lsdef -t route -o autotestnet -z >/tmp/xcat_inventory_import_validation_route_bak/autotestnet.stanza ;rmdef -t route -o autotestnet;fi
 check:rc==0
 
-cmd:/opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/validatehelper "route" "autotestnet" "net" "200.0.0.0" "/tmp/xcat_inventory_import_validation_route" 
+cmd:/opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/validatehelper "route" "autotestnet" "net" "200.0.0.0" "/tmp/xcat_inventory_import_validation_route"
 check:rc==0
 
 cmd:/opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/validatehelper "route" "autotestnet" "net" "200.0" "/tmp/xcat_inventory_import_validation_route"
diff --git a/xCAT-test/autotest/testcase/xcat-inventory/cases.site b/xCAT-test/autotest/testcase/xcat-inventory/cases.site
index e135da258..c123b1c6c 100644
--- a/xCAT-test/autotest/testcase/xcat-inventory/cases.site
+++ b/xCAT-test/autotest/testcase/xcat-inventory/cases.site
@@ -51,7 +51,7 @@ cmd:mkdir -p /tmp/export_import_site_by_json
 check:rc==0
 cmd:ssh $$DSTMN 'mkdir -p /tmp/export_import_site_by_json_$$DSTMN/'
 check:rc==0
-cmd: lsdef -t site -o clustersite -z >/tmp/export_import_site_by_json/site.stanza 
+cmd: lsdef -t site -o clustersite -z >/tmp/export_import_site_by_json/site.stanza
 check:rc==0
 cmd:ssh $$DSTMN 'lsdef -t site -o clustersite -z >/tmp/export_import_site_by_json_$$DSTMN/site.stanza '
 check:rc==0
@@ -61,7 +61,7 @@ cmd:lsdef -t site -o clustersite -z|sort -t'=' -k1 |tee  /tmp/export_import_site
 check:rc==0
 cmd:xcat-inventory export --format=json -t site -o clustersite |tee /tmp/export_import_site_by_json/export_site_json.inv
 check:rc==0
-cmd:mnip=$(lsdef -t site -o clustersite -i master -c|awk -F'=' '{print $2}');sed -i "s/$mnip/$$DSTMN/g" /tmp/export_import_site_by_json/export_site_json.inv 
+cmd:mnip=$(lsdef -t site -o clustersite -i master -c|awk -F'=' '{print $2}');sed -i "s/$mnip/$$DSTMN/g" /tmp/export_import_site_by_json/export_site_json.inv
 check:rc==0
 cmd:cat /tmp/export_import_site_by_json/export_site_json.inv
 check:rc==0
@@ -192,10 +192,10 @@ echo '{
             "xcatsslversion": "TLSv1"
         }
     }
-}' > /tmp/xcat_inventory_try_to_export_all_type_is_site_default_format/site.org 
+}' > /tmp/xcat_inventory_try_to_export_all_type_is_site_default_format/site.org
 cmd:mnip=$(lsdef -t site -o clustersite -i master -c|awk -F'=' '{print $2}');sed -i "s/10.3.5.8/$mnip/g" /tmp/xcat_inventory_try_to_export_all_type_is_site_default_format/site.org
 check:rc==0
-cmd:xcat-inventory export -t site |tee /tmp/xcat_inventory_try_to_export_all_type_is_site_default_format/site.export 
+cmd:xcat-inventory export -t site |tee /tmp/xcat_inventory_try_to_export_all_type_is_site_default_format/site.export
 check:rc==0
 cmd:#!/bin/bash
 diff -y --ignore-blank-lines  --ignore-matching-lines="^#"  /tmp/xcat_inventory_try_to_export_all_type_is_site_default_format/site.org /tmp/xcat_inventory_try_to_export_all_type_is_site_default_format/site.export
@@ -308,10 +308,10 @@ echo '{
             "xcatsslversion": "TLSv1"
         }
     }
-}' > /tmp/xcat_inventory_try_to_export_all_type_is_site_json_format/site.org 
+}' > /tmp/xcat_inventory_try_to_export_all_type_is_site_json_format/site.org
 cmd:mnip=$(lsdef -t site -o clustersite -i master -c|awk -F'=' '{print $2}');sed -i "s/10.3.5.8/$mnip/g" /tmp/xcat_inventory_try_to_export_all_type_is_site_json_format/site.org
 check:rc==0
-cmd:xcat-inventory export --format=json -t site |tee /tmp/xcat_inventory_try_to_export_all_type_is_site_json_format/site.export 
+cmd:xcat-inventory export --format=json -t site |tee /tmp/xcat_inventory_try_to_export_all_type_is_site_json_format/site.export
 check:rc==0
 cmd:#!/bin/bash
 diff -y --ignore-blank-lines  --ignore-matching-lines="^#"  /tmp/xcat_inventory_try_to_export_all_type_is_site_json_format/site.org /tmp/xcat_inventory_try_to_export_all_type_is_site_json_format/site.export
@@ -420,10 +420,10 @@ site:
     xcatmaxbatchconnections: '64'
     xcatmaxconnections: '60'
     xcatsslciphers: 3DES
-    xcatsslversion: TLSv1" > /tmp/xcat_inventory_try_to_export_all_type_is_site_yaml_format/site.org 
+    xcatsslversion: TLSv1" > /tmp/xcat_inventory_try_to_export_all_type_is_site_yaml_format/site.org
 cmd:mnip=$(lsdef -t site -o clustersite -i master -c|awk -F'=' '{print $2}');sed -i "s/10.3.5.8/$mnip/g" /tmp/xcat_inventory_try_to_export_all_type_is_site_yaml_format/site.org
 check:rc==0
-cmd:xcat-inventory export --format=yaml -t site|sed -e '/^\s*$/d' |tee /tmp/xcat_inventory_try_to_export_all_type_is_site_yaml_format/site.export 
+cmd:xcat-inventory export --format=yaml -t site|sed -e '/^\s*$/d' |tee /tmp/xcat_inventory_try_to_export_all_type_is_site_yaml_format/site.export
 check:rc==0
 cmd:#!/bin/bash
 diff -y --ignore-blank-lines  --ignore-matching-lines="^#"  /tmp/xcat_inventory_try_to_export_all_type_is_site_yaml_format/site.org /tmp/xcat_inventory_try_to_export_all_type_is_site_yaml_format/site.export
@@ -831,7 +831,7 @@ echo "Object name: clustersite
     xcatmaxbatchconnections=64
     xcatmaxconnections=60
     xcatsslciphers=3DES
-    xcatsslversion=TLSv1"> /tmp/xcat_inventory_try_to_import_all_type_is_site_json_format/site.org 
+    xcatsslversion=TLSv1"> /tmp/xcat_inventory_try_to_import_all_type_is_site_json_format/site.org
 check:rc==0
 cmd:mnip=$(lsdef -t site -o clustersite -i master -c|awk -F'=' '{print $2}');sed -i "s/10.3.5.8/$mnip/g" /tmp/xcat_inventory_try_to_import_all_type_is_site_json_format/site.org
 check:rc==0
@@ -1197,7 +1197,7 @@ echo "Object name: clustersite
     xcatmaxbatchconnections=64
     xcatmaxconnections=60
     xcatsslciphers=3DES
-    xcatsslversion=TLSv1"> /tmp/xcat_inventory_try_to_import_all_type_is_site_yaml_format/site.org 
+    xcatsslversion=TLSv1"> /tmp/xcat_inventory_try_to_import_all_type_is_site_yaml_format/site.org
 check:rc==0
 cmd:mnip=$(lsdef -t site -o clustersite -i master -c|awk -F'=' '{print $2}');sed -i "s/10.3.5.8/$mnip/g" /tmp/xcat_inventory_try_to_import_all_type_is_site_yaml_format/site.org
 check:rc==0
diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/environment/gitrepo/postinstall/test1.postinstall b/xCAT-test/autotest/testcase/xcat-inventory/templates/environment/gitrepo/postinstall/test1.postinstall
index 979d03cf4..46b69ee52 100755
--- a/xCAT-test/autotest/testcase/xcat-inventory/templates/environment/gitrepo/postinstall/test1.postinstall
+++ b/xCAT-test/autotest/testcase/xcat-inventory/templates/environment/gitrepo/postinstall/test1.postinstall
@@ -4,16 +4,16 @@
 #-- jurij.sikorsky@t-systems.cz
 #--
 #-- this script is run after all packages from $profile.pkglist are installed
-#-- 
+#--
 #-- it gets these arguments:
-#-- 
+#--
 #-- $1 = install root (chroot directory for profile)
 #-- $2 = OS version
 #-- $3 = architecture
 #-- $4 = profile name
 #-- $5 = work dir (where genimage is located)
-#-- 
-#-- 
+#--
+#--
 installroot=$1
 osver=$2
 arch=$3
@@ -48,5 +48,5 @@ fi
 #  [ -r $workdir/$profile.$ext ] && cat $workdir/$profile.$ext | grep -E '^[[:space:]]*#.*[[:space:]]\$Id' >> $installroot/etc/IMGVERSION
 #done
 echo "test postisntall" >> $installroot/tmp/test1.postinstall
-${GITREPO}/postinstall/test2.postinstall
+${GITREPO}/postinstall/test2.postinstall $installroot
 
diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/environment/test.environments.osimage.yaml b/xCAT-test/autotest/testcase/xcat-inventory/templates/environment/test.environments.osimage.yaml
index 89a511b21..82143abc4 100644
--- a/xCAT-test/autotest/testcase/xcat-inventory/templates/environment/test.environments.osimage.yaml
+++ b/xCAT-test/autotest/testcase/xcat-inventory/templates/environment/test.environments.osimage.yaml
@@ -2,8 +2,8 @@ osimage:
   test.environments.osimage:
     basic_attributes:
       arch: ppc64le
-      distribution: rhels7.5-alternate 
-      osdistro: rhels7.5-alternate-ppc64le 
+      distribution: rhels7.5
+      osdistro: rhels7.5-ppc64le
       osname: Linux
     filestosync: {{GITREPO}}/syncfiles/synclist
     deprecated:
@@ -16,7 +16,7 @@ osimage:
     package_selection:
       otherpkgdir: {{SWDIR}}/otherpkgdir/
       otherpkglist: {{GITREPO}}/otherpkglist/test1.otherpkglist,{{GITREPO}}/otherpkglist/test2.otherpkglist,
-      pkgdir: /install/rhels7.5-alternate/ppc64le,{{SWDIR}}/pkgdir/
+      pkgdir: /install/rhels7.5/ppc64le,{{SWDIR}}/pkgdir/
       pkglist: /opt/xcat/share/xcat/netboot/rh/compute.rhels7.ppc64le.pkglist,{{GITREPO}}/pkglist/test1.pkglist,{{GITREPO}}/pkglist/test2.pkglist
     provision_mode: netboot
     role: compute
diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/imagedata/test_osimage/exlist b/xCAT-test/autotest/testcase/xcat-inventory/templates/imagedata/test_osimage/exlist
index 0aca75548..c97f32cba 100644
--- a/xCAT-test/autotest/testcase/xcat-inventory/templates/imagedata/test_osimage/exlist
+++ b/xCAT-test/autotest/testcase/xcat-inventory/templates/imagedata/test_osimage/exlist
@@ -1,2 +1,2 @@
 #Test file for exlist
-#INCLUDE: /tmp/imagedata/test_osimage/file1.1# 
+#INCLUDE: /tmp/imagedata/test_osimage/file1.1#
diff --git a/xCAT-test/autotest/testcase/xcat-inventory/validatehelper b/xCAT-test/autotest/testcase/xcat-inventory/validatehelper
index e953678ef..2609acaa4 100755
--- a/xCAT-test/autotest/testcase/xcat-inventory/validatehelper
+++ b/xCAT-test/autotest/testcase/xcat-inventory/validatehelper
@@ -3,7 +3,7 @@ from __future__ import print_function
 
 import yaml
 import json
-import os 
+import os
 import re
 import sys
 import shutil
@@ -69,15 +69,15 @@ def GetAttrInFile(fpath,objtype,objname,attrpath):
 def compattr(exptattr,rawattr):
     if isinstance(exptattr,list) and re.match(r'^\[.*\]$',rawattr):
         rawattr=eval(rawattr)
-    if isinstance(rawattr,str): 
+    if isinstance(rawattr,str):
         if rawattr in exptattr:
             return 0
         else:
             return 1
     else:
         return cmp(exptattr,rawattr)
-     
-        
+
+
 
 def runCommand(cmd, env=None):
     """ Run one command only, when you don't want to bother setting up
@@ -98,8 +98,8 @@ def runCommand(cmd, env=None):
         print('Command %s failed with return code %d : %s' % (cmd , p.returncode, err))
     print(out)
     print(err)
-    return p.returncode 
-  
+    return p.returncode
+
 
 def UpdateAttrInFile(fpath,fformat,objtype,objname,attrpath,value):
     f=open(fpath,'r')
@@ -127,7 +127,7 @@ def UpdateAttrInFile(fpath,fformat,objtype,objname,attrpath,value):
         if isinstance(origobjdict,list) and  isinstance(newvalue,str):
             newvalue=[newvalue]
         Util_setdictval(objdict,myattrpath,newvalue)
-    f=open(fpath,'w') 
+    f=open(fpath,'w')
     if fformat  == "yaml":
         print(yaml.dump(objdict,default_flow_style=False),file=f)
     elif fformat  == "json":
@@ -137,7 +137,7 @@ def UpdateAttrInFile(fpath,fformat,objtype,objname,attrpath,value):
 def removeobj(objtype,objname):
     print("removing existing \""+objtype+"\" type object \""+objname+"\" from xCAT\n")
     if str(objtype) in ('node','osimage','network','site','route','zone','policy'):
-        runCommand("rmdef -t "+objtype+" -o "+objname) 
+        runCommand("rmdef -t "+objtype+" -o "+objname)
     elif str(objtype) in ('passwd'):
         runCommand("tabch -d key="+objname+" passwd")
 
@@ -148,7 +148,7 @@ def Usage():
 if len(sys.argv) < 6:
     Usage()
     exit(1)
-   
+
 
 objtype=str(sys.argv[1])
 objname=str(sys.argv[2])
@@ -186,7 +186,7 @@ runCommand("cat "+yamldef)
 print("===============================================================================\n")
 
 
-print("import the inventory file "+yamldef+"\n") 
+print("import the inventory file "+yamldef+"\n")
 rc=runCommand("xcat-inventory import -t "+objtype+" -o "+objname+" -f "+yamldef)
 if rc !=0:
     print("failed to import the inventory file "+yamldef)
@@ -196,7 +196,7 @@ else:
     print("export the \""+objtype+"\" type object \""+objname+"\" just imported\n")
     rc=runCommand("xcat-inventory export -t "+objtype+" -o "+objname+" --format=yaml 1>"+yamldefout)
     if rc!=0:
-        print("failed to export the \""+objtype+"\" type object \""+objname+"\"\n") 
+        print("failed to export the \""+objtype+"\" type object \""+objname+"\"\n")
         rcyaml=1
     else:
         print("==============the exported inventory file "+yamldefout+"======================\n")
@@ -208,7 +208,7 @@ else:
                 rcyaml=1
         else:
             if compattr(myattrvalue,attrvalue) != 0 :
-                rcyaml=1           
+                rcyaml=1
 
 if rcyaml == 0:
     print("yaml validation passed\n")
@@ -223,7 +223,7 @@ runCommand("cat "+jsondef)
 print("===============================================================================\n")
 
 
-print("import the inventory file "+jsondef+"\n") 
+print("import the inventory file "+jsondef+"\n")
 rc=runCommand("xcat-inventory import -t "+objtype+" -o "+objname+" -f "+jsondef)
 print("rc="+str(rc))
 if rc !=0:
@@ -234,7 +234,7 @@ else:
     print("export the \""+objtype+"\" type object \""+objname+"\" just imported\n")
     rc=runCommand("xcat-inventory export -t "+objtype+" -o "+objname+" --format=json 1>"+jsondefout)
     if rc!=0:
-        print("failed to export the \""+objtype+"\" type object \""+objname+"\"\n") 
+        print("failed to export the \""+objtype+"\" type object \""+objname+"\"\n")
         rcjson=1
     else:
         print("==============the exported inventory file "+jsondefout+"======================\n")
@@ -246,7 +246,7 @@ else:
                 rcjson=1
         else:
             if compattr(myattrvalue,attrvalue) != 0 :
-                rcjson=1           
+                rcjson=1
 
 if rcjson ==0:
     print("json validation passed\n")
diff --git a/xCAT-test/autotest/testcase/xcatconfig/case0 b/xCAT-test/autotest/testcase/xcatconfig/case0
index 275e720c4..f66c6cb8b 100644
--- a/xCAT-test/autotest/testcase/xcatconfig/case0
+++ b/xCAT-test/autotest/testcase/xcatconfig/case0
@@ -1,5 +1,5 @@
 start:testtest
-label:mn_only,db
+label:mn_only,db,wait_fix
 cmd:/opt/xcat/share/xcat/tools/autotest/testcase/xcatconfig/change_site_table_values
 check:rc==0
 end
@@ -69,9 +69,13 @@ check:rc==0
 #step2:run command and check the output
 cmd:xcatconfig -k -c >/tmp/xcatconfig.test 2>&1
 check:rc==0
-cmd:if [[ `cat /tmp/xcatconfig.test |grep FAILED` ]] || [[ `cat /tmp/xcatconfig.test |grep error` ]] || [[ `cat /tmp/xcatconfig.test |grep "fail"` ]] || [[ `cat /tmp/xcatconfig.test |grep Error` ]];then exit 1;fi
+cmd:grep -Ei "error|fail" /tmp/xcatconfig.test
+check:rc!=0
+cmd:grep "Generated /root/.ssh/id_rsa.pub" /tmp/xcatconfig.test
 check:rc==0
-cmd:if [[ `cat /tmp/xcatconfig.test |grep "Generated /root/.ssh/id_rsa.pub"` ]] &&  [[ `cat /tmp/xcatconfig.test |grep "Created xCAT certificate"` ]] && [[ `cat /tmp/xcatconfig.test |grep "Signature ok"` ]];then exit 0;else exit 1;fi
+cmd:grep "Created xCAT certificate" /tmp/xcatconfig.test
+check:rc==0
+cmd:grep "Signature ok"  /tmp/xcatconfig.test
 check:rc==0
 #step3:To make sure /root/.ssh/id_rsa.pub is regenerated
 cmd:diff /root/.ssh/id_rsa.pub /root/sshbak/id_rsa.pub
@@ -97,11 +101,13 @@ label:mn_only
 #step1:backup: /etc/xcat/ca /etc/xcat/cert
 cmd:cp -r /etc/xcat/ca /etc/xcat/cabak;cp -r /etc/xcat/cert /etc/xcat/certbak
 #step2:run command and check the output
-cmd:xcatconfig  -c 2>&1 | tee /tmp/xcatconfig.test 
+cmd:xcatconfig  -c 2>&1 | tee /tmp/xcatconfig.test
 check:rc==0
-cmd:if [[ `cat /tmp/xcatconfig.test |grep -i fail` ]] || [[ `cat /tmp/xcatconfig.test |grep -i error` ]] ;then exit 1;else exit 0;fi
+cmd:grep -iE "fail|error" /tmp/xcatconfig.test
+check:rc!=0
+cmd:grep "Created xCAT certificate" /tmp/xcatconfig.test
 check:rc==0
-cmd:if [[ `cat /tmp/xcatconfig.test |grep "Created xCAT certificate"` ]] && [[ `cat /tmp/xcatconfig.test |grep "Signature ok"` ]];then exit 0;else exit 1;fi
+cmd:grep "Signature ok" /tmp/xcatconfig.test
 check:rc==0
 #step3:make sure the  /etc/xcat/ca /etc/xcat/cert is rewrite
 cmd:diff -y /etc/xcat/ca /etc/xcat/cabak
@@ -131,7 +137,7 @@ check:output=~Generating SSH2 RSA Key
 #step3:Make sure /etc/xcat/hostkeys/ssh_host_rsa_key.pub is regenerated
 cmd:diff /etc/xcat/hostkeys/ssh_host_rsa_key.pub /etc/xcat/hostkeysbak/ssh_host_rsa_key.pub
 check:rc!=0
-#step4:Make sure /install/postscripts/hostkeys/ssh_host_rsa_key.pub is regenerated 
+#step4:Make sure /install/postscripts/hostkeys/ssh_host_rsa_key.pub is regenerated
 cmd:diff /install/postscripts/hostkeys/ssh_host_rsa_key.pub /install/postscripts/hostkeysbak/ssh_host_rsa_key.pub
 check:rc!=0
 #step5:restore test environment
@@ -154,16 +160,22 @@ check:rc==0
 cmd:cp -rf /install/postscripts/hostkeys /install/postscripts/hostkeysbak
 check:rc==0
 #step2:run command and check messages
-cmd:xcatconfig -s -c  >/tmp/xcatconfig.test 2>&1
+cmd:xcatconfig -s -c 2>&1 |tee /tmp/xcatconfig.test
 check:rc==0
-cmd:if [[ `cat /tmp/xcatconfig.test |grep FAILED` ]] || [[ `cat /tmp/xcatconfig.test |grep error` ]] || [[ `cat /tmp/xcatconfig.test |grep "fail"` ]] || [[ `cat /tmp/xcatconfig.test |grep Error` ]];then exit 1;fi
+cmd:grep -iE "fail|error" /tmp/xcatconfig.test
+check:rc!=0
+cmd:grep "Created xCAT certificate" /tmp/xcatconfig.test
 check:rc==0
-cmd:if [[ `cat /tmp/xcatconfig.test |grep "Created xCAT certificate"` ]] &&  [[ `cat /tmp/xcatconfig.test |grep "Generating new node hostkeys"` ]] && [[ `cat /tmp/xcatconfig.test |grep "Signature ok"` ]] && [[ `cat /tmp/xcatconfig.test |grep "Generating SSH2 RSA Key"` ]];then exit 0;else exit 1;fi
+cmd:grep "Generating new node hostkeys" /tmp/xcatconfig.test
+check:rc==0
+cmd:grep "Signature ok" /tmp/xcatconfig.test
+check:rc==0
+cmd:grep "Generating SSH2 RSA Key" /tmp/xcatconfig.test
 check:rc==0
 #step3:Make sure /etc/xcat/hostkeys/ssh_host_rsa_key.pub is regenerated
 cmd:diff /etc/xcat/hostkeys/ssh_host_rsa_key.pub /etc/xcat/hostkeysbak/ssh_host_rsa_key.pub
 check:rc!=0
-#step4:Make sure /install/postscripts/hostkeys/ssh_host_rsa_key.pub is regenerated 
+#step4:Make sure /install/postscripts/hostkeys/ssh_host_rsa_key.pub is regenerated
 cmd:diff /install/postscripts/hostkeys/ssh_host_rsa_key.pub /install/postscripts/hostkeysbak/ssh_host_rsa_key.pub
 check:rc!=0
 #step5:restore test environment
@@ -246,24 +258,24 @@ check:rc==0
 cmd:diff /root/.ssh/id_rsa.pub /install/postscripts/_ssh/authorized_keys
 check:rc==0
 #keys in site table are not changed
-cmd:lsdef -t site -i testxcatconfigoptiond | grep "=test" 
+cmd:lsdef -t site -i testxcatconfigoptiond | grep "=test"
 check:rc==0
-cmd:lsdef -t site -i "dhcplease" | grep "=43201" 
+cmd:lsdef -t site -i "dhcplease" | grep "=43201"
 check:rc==0
 #step4.restore test environment
 cmd:rm -rf /etc/xcat/hostkeysbak;rm -rf /install/postscripts/hostkeysbak
 check:rc==0
 cmd:restorexCATdb -p /tmp/xcatconfigtest
 check:rc==0
-cmd:lsdef -t site -i "dhcplease" | grep "=43200" 
+cmd:lsdef -t site -i "dhcplease" | grep "=43200"
 check:rc==0
 cmd:rm -rf /tmp/xcatconfigtest
 check:rc==0
 cmd:rm -rf /tmp/xcatconfig.test
 check:rc==0
 end
-     
-     
+
+
 start:xcatconfig_u
 description:Update xCAT in Management Node, xcatd restart; database, xCAT credentials, node ssh key and root ssh key are not changed
 label:mn_only
@@ -303,7 +315,7 @@ check:rc==0
 #keys in site table are not changed
 cmd:lsdef -t site -i testxcatconfigoptiond | grep "=test$"
 check:rc==0
-cmd:lsdef -t site -i maxssh | grep "=888$" 
+cmd:lsdef -t site -i maxssh | grep "=888$"
 check:rc==0
 #step4.restore test environment
 cmd:restorexCATdb -p /tmp/xcatconfigtest
diff --git a/xCAT-test/autotest/testcase/xcatconfig/change_site_table_values b/xCAT-test/autotest/testcase/xcatconfig/change_site_table_values
index 7f91cf8a8..df3f0560c 100755
--- a/xCAT-test/autotest/testcase/xcatconfig/change_site_table_values
+++ b/xCAT-test/autotest/testcase/xcatconfig/change_site_table_values
@@ -10,7 +10,7 @@ sub runcmd {
     my $cmd = shift;
     `$cmd >> $log 2>&1`;
     if ($?) {
-        
+
         exit 1;
     }
 }
@@ -21,7 +21,7 @@ my $fsptimeout_value=100;
 my $installdir_value="installdirtest";
 my $ipmimaxp_value=6400;
 my $ipmiretries_value=300;
-my $ipmitimeout_value=200;    
+my $ipmitimeout_value=200;
 my $consoleondemand_value="notest";
 my $master_value="mastertest";
 my $forwarders_value="forwarderstest";
@@ -33,11 +33,11 @@ my $ppctimeout_value=100;
 my $powerinterval_value=100;
 my $syspowerinterval_value=100;
 my $sharedtftp_value=100;
-my $SNsyncfiledir_value="syncdirtest";       
+my $SNsyncfiledir_value="syncdirtest";
 my $nodesyncfiledir_value="nodesyncdirtest";
-my $tftpdir_value="tftpdirtest";     
+my $tftpdir_value="tftpdirtest";
 my $xcatdport_value="xcatporttest";
-my $xcatiport_value="xcatiporttest";     
+my $xcatiport_value="xcatiporttest";
 my $xcatconfdir_value="confdirtest";
 my $timezone_value="test";
 my $useNmapfromMN_value="notest";
diff --git a/xCAT-test/autotest/testcase/xcatconfig/verify_site_table_values_is_changed b/xCAT-test/autotest/testcase/xcatconfig/verify_site_table_values_is_changed
index bc8ff0810..8933d4867 100755
--- a/xCAT-test/autotest/testcase/xcatconfig/verify_site_table_values_is_changed
+++ b/xCAT-test/autotest/testcase/xcatconfig/verify_site_table_values_is_changed
@@ -21,7 +21,7 @@ my $fsptimeout_value=100;
 my $installdir_value="installdirtest";
 my $ipmimaxp_value=6400;
 my $ipmiretries_value=300;
-my $ipmitimeout_value=200;    
+my $ipmitimeout_value=200;
 my $consoleondemand_value="notest";
 my $master_value="mastertest";
 my $forwarders_value="forwarderstest";
@@ -33,11 +33,11 @@ my $ppctimeout_value=100;
 my $powerinterval_value=100;
 my $syspowerinterval_value=100;
 my $sharedtftp_value=100;
-my $SNsyncfiledir_value="syncdirtest";       
+my $SNsyncfiledir_value="syncdirtest";
 my $nodesyncfiledir_value="nodesyncdirtest";
-my $tftpdir_value="tftpdirtest";     
+my $tftpdir_value="tftpdirtest";
 my $xcatdport_value="xcatporttest";
-my $xcatiport_value="xcatiporttest";     
+my $xcatiport_value="xcatiporttest";
 my $xcatconfdir_value="confdirtest";
 my $timezone_value="test";
 my $useNmapfromMN_value="notest";
diff --git a/xCAT-test/autotest/testcase/xcatd/case0 b/xCAT-test/autotest/testcase/xcatd/case0
index 4d7fe3edd..046073d51 100644
--- a/xCAT-test/autotest/testcase/xcatd/case0
+++ b/xCAT-test/autotest/testcase/xcatd/case0
@@ -81,8 +81,9 @@ cmd:service xcatd status
 check:output=~xcatd service|xcatd.service
 check:output=~xcatd service is running|active \(running\)
 check:rc==0
-cmd:times=10; while [ $times -gt 0 ]; do service xcatd restart; if [ "$?" -ne "0" ]; then break; fi; ((times--)); done; if [ $times -gt 0 ]; then $?=1; fi
+cmd:service xcatd restart
 check:rc==0
+cmd:sleep 10
 cmd:service xcatd status
 check:output=~xcatd service|xcatd.service
 check:output=~xcatd service is running|active \(running\)
@@ -119,7 +120,7 @@ check:output=~xcatd service is running|active \(running\)
 end
 
 start:disable_root_permission_in_policy_table
-description:disable root permission, only with XCATBYPASS=YES, the command works 
+description:disable root permission, only with XCATBYPASS=YES, the command works
 label:mn_only,xcatd
 cmd:service xcatd status
 check:rc==0
@@ -139,7 +140,7 @@ end
 
 
 start:assign_certain_command_permission
-description:assign root permission to certain command, only this command works 
+description:assign root permission to certain command, only this command works
 label:mn_only,xcatd
 cmd:service xcatd status
 check:rc==0
@@ -152,7 +153,7 @@ check:rc==0
 cmd:chtab name=root policy.commands=lsdef policy.rule=allow
 check:rc==0
 cmd:lsdef
-check:rc==0 
+check:rc==0
 cmd:tabdump policy
 check:output=~Error: (\[.*?\]: )?Permission denied for request
 cmd:chtab name=root policy.commands= policy.rule=allow
diff --git a/xCAT-test/autotest/testcase/xcatdebugmode/rhels_xcatdebugmode_diskful b/xCAT-test/autotest/testcase/xcatdebugmode/rhels_xcatdebugmode_diskful
index 916c526ae..b7bff8f0b 100644
--- a/xCAT-test/autotest/testcase/xcatdebugmode/rhels_xcatdebugmode_diskful
+++ b/xCAT-test/autotest/testcase/xcatdebugmode/rhels_xcatdebugmode_diskful
@@ -6,25 +6,25 @@ cmd:chdef -t node -o $$CN servicenode= monserver=$$MN nfsserver=$$MN tftpserver=
 check:rc==0
 cmd:makedns -n
 check:rc==0
-cmd:makeconservercf 
+cmd:makeconservercf
 check:rc==0
 cmd:cat /etc/conserver.cf | grep $$CN
 check:output=~$$CN
 cmd:sleep 20
-cmd:if [ "__GETNODEATTR($$CN,arch)__" = "ppc64" -a  "__GETNODEATTR($$CN,mgt)__" != "ipmi" ]; then getmacs -D $$CN; fi 
+cmd:if [ "__GETNODEATTR($$CN,arch)__" = "ppc64" -a  "__GETNODEATTR($$CN,mgt)__" != "ipmi" ]; then getmacs -D $$CN; fi
 check:rc==0
 cmd:makedhcp -n
 check:rc==0
 cmd:makedhcp -a
 check:rc==0
 cmd:sleep 10
-cmd:if cat /etc/*release |grep SUSE >/dev/null;then cat /var/lib/dhcp/db/dhcpd.leases|grep $$CN;elif cat /etc/*release |grep "Red Hat" >/dev/null;then cat /var/lib/dhcpd/dhcpd.leases|grep $$CN;fi     
+cmd:if cat /etc/*release |grep SUSE >/dev/null;then cat /var/lib/dhcp/db/dhcpd.leases|grep $$CN;elif cat /etc/*release |grep "Red Hat" >/dev/null;then cat /var/lib/dhcpd/dhcpd.leases|grep $$CN;fi
 check:output=~$$CN
-cmd:copycds $$ISO 
+cmd:copycds $$ISO
 check:rc==0
 cmd:chtab key=xcatdebugmode site.value="0"
 check:rc==0
-cmd:rinstall $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute                 
+cmd:rinstall $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute
 check:rc==0
 check:output=~Provision node\(s\)\: $$CN
 cmd:a=0;while ! `lsdef -l $$CN|grep status|grep installing >/dev/null`; do sleep 20;((a++));if [ $a -gt 30 ];then break;fi done
@@ -65,25 +65,25 @@ cmd:chdef -t node -o $$CN servicenode= monserver=$$MN nfsserver=$$MN tftpserver=
 check:rc==0
 cmd:makedns -n
 check:rc==0
-cmd:makeconservercf 
+cmd:makeconservercf
 check:rc==0
 cmd:cat /etc/conserver.cf | grep $$CN
 check:output=~$$CN
 cmd:sleep 20
-cmd:if [ "__GETNODEATTR($$CN,arch)__" = "ppc64" -a  "__GETNODEATTR($$CN,mgt)__" != "ipmi" ]; then getmacs -D $$CN; fi 
+cmd:if [ "__GETNODEATTR($$CN,arch)__" = "ppc64" -a  "__GETNODEATTR($$CN,mgt)__" != "ipmi" ]; then getmacs -D $$CN; fi
 check:rc==0
 cmd:makedhcp -n
 check:rc==0
 cmd:makedhcp -a
 check:rc==0
 cmd:sleep 10
-cmd:if cat /etc/*release |grep SUSE >/dev/null;then cat /var/lib/dhcp/db/dhcpd.leases|grep $$CN;elif cat /etc/*release |grep "Red Hat" >/dev/null;then cat /var/lib/dhcpd/dhcpd.leases|grep $$CN;fi     
+cmd:if cat /etc/*release |grep SUSE >/dev/null;then cat /var/lib/dhcp/db/dhcpd.leases|grep $$CN;elif cat /etc/*release |grep "Red Hat" >/dev/null;then cat /var/lib/dhcpd/dhcpd.leases|grep $$CN;fi
 check:output=~$$CN
-cmd:copycds $$ISO 
+cmd:copycds $$ISO
 check:rc==0
 cmd:chtab key=xcatdebugmode site.value="1"
 check:rc==0
-cmd:rinstall $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute                 
+cmd:rinstall $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute
 check:rc==0
 check:output=~Provision node\(s\)\: $$CN
 cmd:sleep 120
@@ -152,25 +152,25 @@ cmd:chdef -t node -o $$CN servicenode= monserver=$$MN nfsserver=$$MN tftpserver=
 check:rc==0
 cmd:makedns -n
 check:rc==0
-cmd:makeconservercf 
+cmd:makeconservercf
 check:rc==0
 cmd:cat /etc/conserver.cf | grep $$CN
 check:output=~$$CN
 cmd:sleep 20
-cmd:if [ "__GETNODEATTR($$CN,arch)__" = "ppc64" -a  "__GETNODEATTR($$CN,mgt)__" != "ipmi" ]; then getmacs -D $$CN; fi 
+cmd:if [ "__GETNODEATTR($$CN,arch)__" = "ppc64" -a  "__GETNODEATTR($$CN,mgt)__" != "ipmi" ]; then getmacs -D $$CN; fi
 check:rc==0
 cmd:makedhcp -n
 check:rc==0
 cmd:makedhcp -a
 check:rc==0
 cmd:sleep 10
-cmd:if cat /etc/*release |grep SUSE >/dev/null;then cat /var/lib/dhcp/db/dhcpd.leases|grep $$CN;elif cat /etc/*release |grep "Red Hat" >/dev/null;then cat /var/lib/dhcpd/dhcpd.leases|grep $$CN;fi     
+cmd:if cat /etc/*release |grep SUSE >/dev/null;then cat /var/lib/dhcp/db/dhcpd.leases|grep $$CN;elif cat /etc/*release |grep "Red Hat" >/dev/null;then cat /var/lib/dhcpd/dhcpd.leases|grep $$CN;fi
 check:output=~$$CN
-cmd:copycds $$ISO 
+cmd:copycds $$ISO
 check:rc==0
 cmd:chtab key=xcatdebugmode site.value="2"
 check:rc==0
-cmd:rinstall $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute                 
+cmd:rinstall $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute
 check:rc==0
 check:output=~Provision node\(s\)\: $$CN
 cmd:a=0;while ! `lsdef -l $$CN|grep status|grep installing >/dev/null`; do sleep 20;((a++));if [ $a -gt 30 ];then break;fi done
@@ -248,7 +248,7 @@ cmd:makeconservercf $$CN
 check:rc==0
 cmd:cat /etc/conserver.cf | grep $$CN
 check:output=~$$CN
-cmd:rinstall $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute                 
+cmd:rinstall $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute
 check:rc==0
 check:output=~Provision node\(s\)\: $$CN
 
@@ -302,7 +302,7 @@ cmd:makeconservercf $$CN
 check:rc==0
 cmd:cat /etc/conserver.cf | grep $$CN
 check:output=~$$CN
-cmd:rinstall $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute                 
+cmd:rinstall $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute
 check:rc==0
 check:output=~Provision node\(s\)\: $$CN
 
@@ -391,7 +391,7 @@ cmd:makeconservercf $$CN
 check:rc==0
 cmd:cat /etc/conserver.cf | grep $$CN
 check:output=~$$CN
-cmd:rinstall $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute                 
+cmd:rinstall $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute
 check:rc==0
 check:output=~Provision node\(s\)\: $$CN
 
diff --git a/xCAT-test/autotest/testcase/xcatdebugmode/sles_xcatdebugmode_diskful b/xCAT-test/autotest/testcase/xcatdebugmode/sles_xcatdebugmode_diskful
index f9aab96f5..4191e6c51 100644
--- a/xCAT-test/autotest/testcase/xcatdebugmode/sles_xcatdebugmode_diskful
+++ b/xCAT-test/autotest/testcase/xcatdebugmode/sles_xcatdebugmode_diskful
@@ -7,25 +7,25 @@ cmd:chdef -t node -o $$CN servicenode= monserver=$$MN nfsserver=$$MN tftpserver=
 check:rc==0
 cmd:makedns -n
 check:rc==0
-cmd:makeconservercf 
+cmd:makeconservercf
 check:rc==0
 cmd:cat /etc/conserver.cf | grep $$CN
 check:output=~$$CN
 cmd:sleep 20
-cmd:if [ "__GETNODEATTR($$CN,arch)__" = "ppc64" -a  "__GETNODEATTR($$CN,mgt)__" != "ipmi" ]; then getmacs -D $$CN; fi 
+cmd:if [ "__GETNODEATTR($$CN,arch)__" = "ppc64" -a  "__GETNODEATTR($$CN,mgt)__" != "ipmi" ]; then getmacs -D $$CN; fi
 check:rc==0
 cmd:makedhcp -n
 check:rc==0
 cmd:makedhcp -a
 check:rc==0
 cmd:sleep 10
-cmd:if cat /etc/*release |grep SUSE >/dev/null;then cat /var/lib/dhcp/db/dhcpd.leases|grep $$CN;elif cat /etc/*release |grep "Red Hat" >/dev/null;then cat /var/lib/dhcpd/dhcpd.leases|grep $$CN;fi     
+cmd:if cat /etc/*release |grep SUSE >/dev/null;then cat /var/lib/dhcp/db/dhcpd.leases|grep $$CN;elif cat /etc/*release |grep "Red Hat" >/dev/null;then cat /var/lib/dhcpd/dhcpd.leases|grep $$CN;fi
 check:output=~$$CN
-cmd:copycds $$ISO 
+cmd:copycds $$ISO
 check:rc==0
 cmd:chtab key=xcatdebugmode site.value="0"
 check:rc==0
-cmd:rinstall $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute                 
+cmd:rinstall $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute
 check:rc==0
 check:output=~Provision node\(s\)\: $$CN
 
@@ -75,23 +75,23 @@ cmd:chdef -t node -o $$CN servicenode= monserver=$$MN nfsserver=$$MN tftpserver=
 check:rc==0
 cmd:makedns -n
 check:rc==0
-cmd:makeconservercf 
+cmd:makeconservercf
 check:rc==0
 cmd:cat /etc/conserver.cf | grep $$CN
 check:output=~$$CN
 cmd:sleep 20
-cmd:if [ "__GETNODEATTR($$CN,arch)__" = "ppc64" -a  "__GETNODEATTR($$CN,mgt)__" != "ipmi" ]; then getmacs -D $$CN; fi 
+cmd:if [ "__GETNODEATTR($$CN,arch)__" = "ppc64" -a  "__GETNODEATTR($$CN,mgt)__" != "ipmi" ]; then getmacs -D $$CN; fi
 check:rc==0
 cmd:makedhcp -n
 check:rc==0
 cmd:makedhcp -a
 check:rc==0
 cmd:sleep 10
-cmd:if cat /etc/*release |grep SUSE >/dev/null;then cat /var/lib/dhcp/db/dhcpd.leases|grep $$CN;elif cat /etc/*release |grep "Red Hat" >/dev/null;then cat /var/lib/dhcpd/dhcpd.leases|grep $$CN;fi     
+cmd:if cat /etc/*release |grep SUSE >/dev/null;then cat /var/lib/dhcp/db/dhcpd.leases|grep $$CN;elif cat /etc/*release |grep "Red Hat" >/dev/null;then cat /var/lib/dhcpd/dhcpd.leases|grep $$CN;fi
 check:output=~$$CN
 cmd:chtab key=xcatdebugmode site.value="1"
 check:rc==0
-cmd:rinstall $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute                 
+cmd:rinstall $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute
 check:rc==0
 check:output=~Provision node\(s\)\: $$CN
 
@@ -178,7 +178,7 @@ cmd:makeconservercf $$CN
 check:rc==0
 cmd:cat /etc/conserver.cf | grep $$CN
 check:output=~$$CN
-cmd:rinstall $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute                 
+cmd:rinstall $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute
 check:rc==0
 check:output=~Provision node\(s\)\: $$CN
 
@@ -241,7 +241,7 @@ cmd:makeconservercf $$CN
 check:rc==0
 cmd:cat /etc/conserver.cf | grep $$CN
 check:output=~$$CN
-cmd:rinstall $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute                 
+cmd:rinstall $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute
 check:rc==0
 check:output=~Provision node\(s\)\: $$CN
 
diff --git a/xCAT-test/autotest/testcase/xcatdebugmode/ubuntu_xcatdebugmode_diskful b/xCAT-test/autotest/testcase/xcatdebugmode/ubuntu_xcatdebugmode_diskful
index 534ed9c31..bef44b866 100644
--- a/xCAT-test/autotest/testcase/xcatdebugmode/ubuntu_xcatdebugmode_diskful
+++ b/xCAT-test/autotest/testcase/xcatdebugmode/ubuntu_xcatdebugmode_diskful
@@ -17,7 +17,7 @@ cmd:makeconservercf $$CN
 check:rc==0
 cmd:cat /etc/conserver.cf | grep $$CN
 check:output=~$$CN
-cmd:rinstall $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute                 
+cmd:rinstall $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute
 check:rc==0
 check:output=~Provision node\(s\)\: $$CN
 cmd:a=0;while ! `lsdef -l $$CN|grep status|grep installing >/dev/null`; do sleep 20;((a++));if [ $a -gt 30 ];then break;fi done
@@ -55,11 +55,11 @@ cmd:makeconservercf $$CN
 check:rc==0
 cmd:cat /etc/conserver.cf | grep $$CN
 check:output=~$$CN
-cmd:copycds $$ISO 
+cmd:copycds $$ISO
 check:rc==0
 cmd:chtab key=xcatdebugmode site.value="0"
 check:rc==0
-cmd:rinstall $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute                 
+cmd:rinstall $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute
 check:rc==0
 check:output=~Provision node\(s\)\: $$CN
 cmd:a=0;while ! `lsdef -l $$CN|grep status|grep installing >/dev/null`; do sleep 20;((a++));if [ $a -gt 30 ];then break;fi done
@@ -104,7 +104,7 @@ cmd:cat /etc/conserver.cf | grep $$CN
 check:output=~$$CN
 cmd:copycds $$ISO
 check:rc==0
-cmd:rinstall $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute                 
+cmd:rinstall $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute
 check:rc==0
 check:output=~Provision node\(s\)\: $$CN
 cmd:a=0;while ! `lsdef -l $$CN|grep status|grep installing >/dev/null`; do sleep 20;((a++));if [ $a -gt 30 ];then break;fi done
@@ -173,9 +173,9 @@ cmd:makeconservercf $$CN
 check:rc==0
 cmd:cat /etc/conserver.cf | grep $$CN
 check:output=~$$CN
-cmd:copycds $$ISO 
+cmd:copycds $$ISO
 check:rc==0
-cmd:rinstall $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute                 
+cmd:rinstall $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute
 check:rc==0
 check:output=~Provision node\(s\)\: $$CN
 cmd:a=0;while ! `lsdef -l $$CN|grep status|grep installing >/dev/null`; do sleep 20;((a++));if [ $a -gt 30 ];then break;fi done
diff --git a/xCAT-test/autotest/testcase/xcatstanzafile/cases0 b/xCAT-test/autotest/testcase/xcatstanzafile/cases0
index b671c668c..2a6c7167d 100644
--- a/xCAT-test/autotest/testcase/xcatstanzafile/cases0
+++ b/xCAT-test/autotest/testcase/xcatstanzafile/cases0
@@ -1,8 +1,14 @@
 start:xcatstanzafile_normal
 description:xcatstanzafile in normal format
 label:mn_only,db
-cmd:echo -e "default-node:\n	groups=all,compute\ntestnode:\n    objtype=node\n    xcatmaster=MS02.ppd.pok.com\n    nfsserver=IS227.ppd.pok.com" > testfile
+cmd:echo 'default-node:
+    groups=all,compute
+testnode:
+    objtype=node
+    xcatmaster=MS02.ppd.pok.com
+    nfsserver=IS227.ppd.pok.com' > testfile
 check:rc==0
+cmd:cat testfile
 cmd:cat testfile|chdef -z
 check:rc==0
 cmd:lsdef testnode
@@ -17,7 +23,12 @@ end
 start:xcatstanzafile_colon
 description:xcatstanzafile's header without colon
 label:mn_only,db
-cmd:echo -e "default-node:\n    groups=all,compute\ntestnode\n    objtype=node\n    xcatmaster=MS02.ppd.pok.com\n    nfsserver=IS227.ppd.pok.com" > testfile
+cmd:echo 'default-node:
+    groups=all,compute
+testnode
+    objtype=node
+    xcatmaster=MS02.ppd.pok.com
+    nfsserver=IS227.ppd.pok.com' > testfile
 check:rc==0
 cmd:cat testfile|chdef -z
 check:rc!=0
@@ -31,21 +42,36 @@ end
 start:xcatstanzafile_attribute
 description:xcatstanzafile with error attribute line
 label:mn_only,db
-cmd:echo -e "default-node:\n    groups=all,compute\ntestnode:\n    objtype=node\n    xcatmasterMS02.ppd.pok.com\n    nfsserver=IS227.ppd.pok.com" > testfile
+cmd:echo 'default-node:
+    groups=all,compute
+testnode:
+    objtype=node
+    xcatmasterMS02.ppd.pok.com
+    nfsserver=IS227.ppd.pok.com' > testfile
 check:rc==0
 cmd:cat testfile|chdef -z
 cmd:lsdef testnode
 check:output!~xcatmaster=MS02.ppd.pok.com
 cmd:rmdef -t node testnode
 cmd:rm -f testfile
-cmd:echo -e "default-node:\n    groups=all,compute\ntestnode:\n    objtype=node\n    xcatmaster=\n    nfsserver=IS227.ppd.pok.com" > testfile
+cmd:echo 'default-node:
+    groups=all,compute
+testnode:
+    objtype=node
+    xcatmaster=
+    nfsserver=IS227.ppd.pok.com' > testfile
 check:rc==0
 cmd:cat testfile|chdef -z
 cmd:lsdef testnode
 check:output!~xcatmaster=
 cmd:rmdef -t node testnode
 cmd:rm -f testfile
-cmd:echo -e "default-node:\n    groups=all,compute\ntestnode\n    objtype=node\n    =MS02.ppd.pok.com\n    nfsserver=IS227.ppd.pok.com" > testfile
+cmd:echo 'default-node:
+    groups=all,compute
+testnode:
+    objtype=node
+    =MS02.ppd.pok.com
+    nfsserver=IS227.ppd.pok.com' > testfile
 check:rc==0
 cmd:cat testfile|chdef -z
 cmd:lsdef testnode
@@ -57,7 +83,11 @@ end
 start:xcatstanzafile_objtype
 description:xcatstanzafile,a stanza without objtype definition
 label:mn_only,db
-cmd:echo -e "default-node:\n    groups=all,compute\ntestnode:\n    xcatmaster=MS02.ppd.pok.com\n    nfsserver=IS227.ppd.pok.com" > testfile
+cmd:echo 'default-node:
+    groups=all,compute
+testnode:
+    xcatmaster=MS02.ppd.pok.com
+    nfsserver=IS227.ppd.pok.com' > testfile
 check:rc==0
 cmd:cat testfile|mkdef -z
 check:rc!=0
@@ -69,7 +99,12 @@ end
 #start:xcatstanzafile_comment
 #description:xcatstanzafile,a stanza without objtype definition
 #label:mn_only,db
-#cmd:echo -ne "default-node:\n    groups=all,compute\ntestnode:\n    objtype=node\n    xcatmaster=MS02.ppd.pok.com\n    nfsserver=IS227.ppd.pok.com" > testfile
+#cmd:echo 'default-node:
+#    groups=all,compute
+#testnode:
+#    objtype=node
+#    xcatmaster= MS02.ppd.pok.com
+#    nfsserver=IS227.ppd.pok.com' > testfile
 #check:rc==0
 #cmd:echo '#abc' >> testfile
 #cmd:cat testfile|mkdef -z
@@ -82,7 +117,12 @@ end
 start:xcatstanzafile_tab
 description:xcatstanzafile,line with tab and space
 label:mn_only,db
-cmd:echo -e "default-node:\n    groups=all,compute\ntestnode:\n    objtype=node\n    xcatmaster	=	MS02.ppd.pok.com\n    nfsserver=IS227.ppd.pok.com" > testfile
+cmd:echo 'default-node:
+    groups=all,compute
+testnode:
+    objtype=node
+    xcatmaster  =   MS02.ppd.pok.com
+    nfsserver=IS227.ppd.pok.com' > testfile
 check:rc==0
 cmd:cat testfile|mkdef -z
 check:rc==0
@@ -93,12 +133,18 @@ end
 start:xcatstanzafile_multattr
 description:xcatstanzafile,line with multiple attribute
 label:mn_only,db
-cmd:echo -e "default-node:\n    groups=all,compute\ntestnode:\n    objtype=node\n    xcatmaster= MS02.ppd.pok.com	nfsserver=IS227.ppd.pok.com" > testfile
+cmd:echo 'default-node:
+    groups=all,compute
+testnode:
+    objtype=node
+    xcatmaster= MS02.ppd.pok.com
+    nfsserver=IS227.ppd.pok.com' > testfile
 check:rc==0
 cmd:cat testfile|mkdef -z
 check:rc==0
 cmd:lsdef testnode
-check:output=~\s*xcatmaster=MS02.ppd.pok.com\s*nfsserver=IS227.ppd.pok.com
+check:output=~\s*xcatmaster=MS02.ppd.pok.com
+check:output=~\s*nfsserver=IS227.ppd.pok.com
 cmd:rmdef -t node testnode
 cmd:rm -f testfile
 end
@@ -107,8 +153,14 @@ end
 start:xcatstanzafile_defaultvalue
 description:xcatstanzafile,If the header name is ``default-<object type>:'' the attribute values in the stanza are considered default values for subsequent definitions in the file that are the same object type.
 label:mn_only,db
-cmd:echo -e "default-node:\n    groups=all,compute\ntestnode:\n    objtype=node\n    xcatmaster= MS02.ppd.pok.com\n       nfsserver=IS227.ppd.pok.com" > testfile
+cmd:echo 'default-node:
+    groups=all,compute
+testnode:
+    objtype=node
+    xcatmaster= MS02.ppd.pok.com
+    nfsserver=IS227.ppd.pok.com' > testfile
 check:rc==0
+cmd:cat testfile
 cmd:cat testfile|mkdef -z
 check:rc==0
 cmd:lsdef testnode
@@ -120,7 +172,13 @@ end
 start:xcatstanzafile_specificvalue
 description:When a specific value for an attribute is provided in the stanza, it takes priority over any default value that had been set.
 label:mn_only,db
-cmd:bash -c 'echo -e "default-node:\n    groups=all,compute\ntestnode:\n    objtype=node\n    groups=all,rhels5.5\n	xcatmaster= MS02.ppd.pok.com\n       nfsserver=IS227.ppd.pok.com" > testfile'
+cmd:echo 'default-node:
+    groups=all,compute
+testnode:
+    objtype=node
+    groups=all,rhels5.5
+    xcatmaster= MS02.ppd.pok.com
+    nfsserver=IS227.ppd.pok.com' > testfile
 check:rc==0
 cmd:cat testfile|mkdef -z
 check:rc==0
diff --git a/xCAT-test/autotest/testcase/xdcp/cases0 b/xCAT-test/autotest/testcase/xdcp/cases0
index 39398ab43..57fa39bf9 100644
--- a/xCAT-test/autotest/testcase/xdcp/cases0
+++ b/xCAT-test/autotest/testcase/xdcp/cases0
@@ -26,7 +26,7 @@ cmd:xdsh $$CN rm -f /tmp/hosts
 cmd:rm -f /tmp/hosts
 end
 
-start:xdcp_P_src_dst 
+start:xdcp_P_src_dst
 label:cn_os_ready,parallel_cmds
 cmd:xdcp $$CN -P /etc/inittab /tmp/
 check:rc==0
@@ -112,7 +112,7 @@ cmd:xdsh $$CN "ls -l /tmp"
 check:output=~test1.txt
 check:output=~test2.txt
 cmd:xdsh $$CN "ls -l /tmp/test1.txt"
-check:output=~test1 
+check:output=~test1
 cmd:xdsh $$CN "ls -l /tmp/test2.txt"
 check:output=~test2
 cmd:xdsh $$CN "rm -rf /tmp/test1.txt  /tmp/test2.txt"
@@ -136,7 +136,7 @@ cmd:xdsh $$CN "ls -l /tmp"
 check:output=~test1.txt
 check:output=~test2.txt
 cmd:xdsh $$CN "ls -l /tmp/test1.txt"
-check:output=~test1 
+check:output=~test1
 cmd:xdsh $$CN "ls -l /tmp/test2.txt"
 check:output=~test2
 cmd:xdsh $$CN "rm -rf /tmp/test1.txt  /tmp/test2.txt"
@@ -159,7 +159,7 @@ check:rc==0
 cmd:xdsh $$CN "ls -l /tmp"
 check:output=~test1.txt
 cmd:xdsh $$CN "ls -l /tmp/test1.txt"
-check:output=~test1 
+check:output=~test1
 cmd:xdsh $$CN "rm -rf /tmp/test1.txt"
 check:rc==0
 cmd:rm -rf /tmp/xdcp /tmp/myrsync
@@ -183,9 +183,9 @@ cmd:xdsh $$CN "ls -l /tmp"
 check:output=~test1.txt
 check:output=~test2.txt
 cmd:xdsh $$CN "ls -l /tmp/test1.txt"
-check:output=~test1 
+check:output=~test1
 cmd:xdsh $$CN "ls -l /tmp/test2.txt"
-check:output=~test2 
+check:output=~test2
 cmd:xdsh $$CN "rm -rf /tmp/test1.txt /tmp/test2.txt"
 check:rc==0
 cmd:rm -rf /tmp/xdcp /tmp/myrsync
@@ -211,9 +211,9 @@ cmd:xdsh $$CN "ls -l /tmp"
 check:output=~testx.txt
 check:output=~testy.txt
 cmd:xdsh $$CN "cat /tmp/testx.txt"
-check:output=~test1 
+check:output=~test1
 cmd:xdsh $$CN "cat /tmp/testy.txt"
-check:output=~test2 
+check:output=~test2
 cmd:xdsh $$CN "rm -rf /tmp/testx.txt /tmp/testy.txt"
 check:rc==0
 cmd:rm -rf /tmp/xdcp /tmp/myrsync
diff --git a/xCAT-test/autotest/testcase/xdcp/cases1 b/xCAT-test/autotest/testcase/xdcp/cases1
index 5282aa160..d2b9f9bf1 100644
--- a/xCAT-test/autotest/testcase/xdcp/cases1
+++ b/xCAT-test/autotest/testcase/xdcp/cases1
@@ -13,7 +13,7 @@ check:rc==0
 cmd:xdsh $$CN "chown -R xyzzy ~xyzzy/.ssh"
 check:rc==0
 cmd:su -c "xdcp $$CN /etc/sysctl.conf /tmp/sysctl.conf" - xyzzy
-check:rc==0 
+check:rc==0
 cmd:xdsh $$CN "stat -c '%U' /tmp/sysctl.conf"
 check:output=~xyzzy
 cmd:xdsh $$CN "userdel xyzzy"
diff --git a/xCAT-test/autotest/testcase/xdsh/cases0 b/xCAT-test/autotest/testcase/xdsh/cases0
index 513ba2154..2890a992c 100644
--- a/xCAT-test/autotest/testcase/xdsh/cases0
+++ b/xCAT-test/autotest/testcase/xdsh/cases0
@@ -33,7 +33,7 @@ cmd: xdsh $$SN "echo 'test' > /var/xcat/syncfiles/xdsh_c.tmp"
 check:rc==0
 cmd: xdsh $$SN -c
 check:rc==0
-cmd:xdsh $$SN "ls -l /var/xcat/syncfiles" 
+cmd:xdsh $$SN "ls -l /var/xcat/syncfiles"
 check:rc==0
 check:output=~
 end
@@ -46,7 +46,7 @@ cmd: xdsh $$CN "echo 'test' > /var/xcat/node/syncfiles/xdsh_c.tmp"
 check:rc==0
 cmd: xdsh $$CN -c
 check:rc==0
-cmd:xdsh $$CN "ls -l /var/xcat/node" 
+cmd:xdsh $$CN "ls -l /var/xcat/node"
 check:rc==0
 check:output=~
 end
@@ -69,7 +69,7 @@ cmd:rm -r /tmp/xdsh_script.sh
 check:rc==0
 end
 
-start:xdsh_E 
+start:xdsh_E
 label:cn_os_ready,parallel_cmds
 cmd:echo 'export DSH_FANOUT=8' > /tmp/xdsh.test
 check:rc==0
diff --git a/xCAT-test/bin/xcatperftest b/xCAT-test/bin/xcatperftest
index 547291fd8..b0d5d5d21 100755
--- a/xCAT-test/bin/xcatperftest
+++ b/xCAT-test/bin/xcatperftest
@@ -9,7 +9,7 @@
 #     generate n*250 fake nodes based on a predefined template (/opt/xcat/share/xcat/templates/objects/node/),
 #     and then run the performance testing on a batch of xCAT commands.
 #
-#     Note: It is availabe for the commands which require management node only. 
+#     Note: It is availabe for the commands which require management node only.
 #
 # Syntax:
 #       $prog <total> [command-list-file]
@@ -110,13 +110,13 @@ if [ "$PERF_RUN_WITH_ENV" = "1" ];then
   FAKE_NODE_TOTAL=`nodels|wc -l`
 fi
 
-# Optional, the prefix of the fake compute node name. 
+# Optional, the prefix of the fake compute node name.
 # By default, it is 'fake' but it could be changed when you set environment variable `FAKE_NODE_PREFIX`
 if [ -z $FAKE_NODE_PREFIX ]; then
   FAKE_NODE_PREFIX='fake'
 fi
 
-# Optional, the group name of all the fake compute nodes. 
+# Optional, the group name of all the fake compute nodes.
 # By default, it is 'perftest' but it could be changed when you set environment variable `FAKE_NODE_GROUP`
 if [ -z $FAKE_NODE_GROUP ]; then
   FAKE_NODE_GROUP='perftest'
@@ -250,7 +250,7 @@ getOSimage()
   # The OS image name used in nodeset to replace the MACRO Variable `#OSIMAGE#`.
   # By default, it could be detectd automatically according to the arch
   if [ -z $PERF_OSIMAGE ]; then
-    
+
     # covert it to an array
     osimage_array=($(lsdef -t osimage 2>/dev/null| grep `arch`|grep 'install'|awk '/compute/ {print $1}'))
     index=`expr $RANDOM % ${#osimage_array[@]} 2>/dev/null`
@@ -287,7 +287,7 @@ runTest()
   if [[ $cmd =~ '#STANZ#' ]]; then
     #mkdef -z
     execCmd "${cmd/\#STANZ\#/$PERFORMANCE_STANZ}" "$FAKE_NODE_TOTAL"
-  
+
   elif [[ $cmd =~ '#NODES#' ]]; then
     #noderange operation
     if [ -z "$2" ]; then
@@ -295,7 +295,7 @@ runTest()
       execCmd "${cmd/\#NODES\#/$FAKE_NODE_GROUP}" "$FAKE_NODE_TOTAL"
     else
       # run the command for each number in SERIES
-      for num in $2   
+      for num in $2
       do
         isNumber $num || continue
         if [[ $num -le $FAKE_NODE_TOTAL ]]; then
diff --git a/xCAT-test/debian/copyright b/xCAT-test/debian/copyright
index f61d34dfe..87e60f492 100644
--- a/xCAT-test/debian/copyright
+++ b/xCAT-test/debian/copyright
@@ -85,4 +85,4 @@ Everyone is permitted to copy and distribute copies of this Agreement, but in or
 
 This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
 
- 
+
diff --git a/xCAT-test/pods/man1/xcatperftest.1.pod b/xCAT-test/pods/man1/xcatperftest.1.pod
index 2f1ef8663..19bea2307 100644
--- a/xCAT-test/pods/man1/xcatperftest.1.pod
+++ b/xCAT-test/pods/man1/xcatperftest.1.pod
@@ -1,27 +1,27 @@
 =head1 NAME
 
-B<xcatperftest> - Run xCAT command performance baseline testing on fake nodes. 
+B<xcatperftest> - Run xCAT command performance baseline testing on fake nodes.
 
 =head1 SYNOPSIS
 
-B<xcatperftest> [B<-?|-h>] 
+B<xcatperftest> [B<-?|-h>]
 
 [B<PERF_DRYRUN>=y] [B<PERF_NOCREATE>=y] B<xcatperftest> <total> [I<command-list-file>]
 
 
 =head1 DESCRIPTION
 
-The xcatperftest command runs commandes defined in a command list file and get their execution response time baseline for performance purpose. 
+The xcatperftest command runs commandes defined in a command list file and get their execution response time baseline for performance purpose.
 The xcatperftest command is part of the xCAT package xCAT-test, and you can run it standalone or leverage it to build up your automation test cases.
 
-Any commands could be defined in the command list file, however, it is recommended that the one-time initial configuration are well prepared prior to run xcatperftest command. 
+Any commands could be defined in the command list file, however, it is recommended that the one-time initial configuration are well prepared prior to run xcatperftest command.
 For example, the network object, osdistor and osimage image objects.
 
 Follow the below steps to run xcatperftest command:
 
 1, Install xCAT-test on a xCAT management nodes.
 
-2, Prepare a command list in which the commands are what you want to messure. 
+2, Prepare a command list in which the commands are what you want to messure.
 
 3, Prepare the initial configuration based on the command list to make sure all commands could be executed in techinal.
 
@@ -74,7 +74,7 @@ The command list file is in flat text format, the testing framework will parse t
   noderm #PERFGRP#
 
 
-B<Note>: Each line defines one command, and the commands dependency should be handled by the line order. 
+B<Note>: Each line defines one command, and the commands dependency should be handled by the line order.
 If you define a node range series line (started with #SERIES#) in this file, xcatperftest will run the command for each node range defined in series line.
 
 B<#SERIES#>       To define a node range series, and the series should be an comma split incremental number sequence.
@@ -90,33 +90,33 @@ B<#PERFGRP#>    It will be replaced with node group when this command line runs.
 The xcatperftest command supports be customized by some environment variables.
 
 
-B<FAKE_NODE_PREFIX> 
+B<FAKE_NODE_PREFIX>
 
 Optional, the prefix of the fake compute node name. By default, the value is 'fake'
 
-B<FAKE_NODE_GROUP> 
+B<FAKE_NODE_GROUP>
 
 # Optional, the group name of all the fake compute nodes. By default, the value is 'perftest'
 
-B<FAKE_NETWORK_PRO> 
+B<FAKE_NETWORK_PRO>
 
 Mandatory, the Provision network for all the fake compute nodes. By default, the value is '192.168'.
 It must be a string like 'A.B', and be matched with `tabdump networks`
 
-B<FAKE_NETWORK_BMC> 
+B<FAKE_NETWORK_BMC>
 
 Mandatory, the BMC network for all the fake compute nodes. By default, the value is '192.168'. Note:  It could not be the same subnet as 'FAKE_NETWORK_PRO'
-It must be a string like 'A.B' and no need to be defined in 'networks' table. 
+It must be a string like 'A.B' and no need to be defined in 'networks' table.
 
-B<PERF_NODETEMPL> 
+B<PERF_NODETEMPL>
 
 Optional, The node template name used for generating fake nodes. By default, it will be auto-detected according to the current arch.
 
-B<PERF_DRYRUN> 
+B<PERF_DRYRUN>
 
 Optional, Indicate no real commands will be executed if the environment variable is set.
 
-B<PERF_NOCREATE> 
+B<PERF_NOCREATE>
 
 Optional, Indicate no new fake nodes will be created if the environment variable is set.
 
diff --git a/xCAT-test/pods/man1/xcattest.1.pod b/xCAT-test/pods/man1/xcattest.1.pod
index f21804684..4867a731b 100644
--- a/xCAT-test/pods/man1/xcattest.1.pod
+++ b/xCAT-test/pods/man1/xcattest.1.pod
@@ -1,12 +1,12 @@
 =head1 NAME
 
-B<xcattest> - Run automated xCAT test cases. 
+B<xcattest> - Run automated xCAT test cases.
 
 =head1 SYNOPSIS
 
-B<xcattest> [B<-?|-h>] 
+B<xcattest> [B<-?|-h>]
 
-B<xcattest> [B<-f> I<configure file>] [B<-b> I<case bundle list>] 
+B<xcattest> [B<-f> I<configure file>] [B<-b> I<case bundle list>]
 
 B<xcattest> [B<-f> I<configure file>] [B<-t> I<case list>]
 
@@ -46,7 +46,7 @@ Comma separated list of test cases bundle files, each test cases bundle can cont
 
 =item B<-t> I<cases list>
 
-Comma separated list of test cases that will be run. 
+Comma separated list of test cases that will be run.
 
 =item B<-c> I<cmd list>
 
@@ -76,7 +76,7 @@ The xCAT-test test cases are in flat text format, the testing framework will par
   start:case name
   #optional, description of the test case
   description: what the test case is for?
-  #optional, environment requirements 
+  #optional, environment requirements
   os:AIX/Linux
   #optional, environment requirements
   arch:ppc/x86
@@ -114,11 +114,11 @@ To run customized bundle with /tmp/config file:
 
 To run specified test cases with /tmp/config file:
 
-  xcattest -f /tmp/config -t lsdef_t_o_l_z 
+  xcattest -f /tmp/config -t lsdef_t_o_l_z
 
 =item 4.
 
-To add a new case to test chvm. In the example, we assume that the min_mem should not be equal to 16 in the lpar profile of computenode. The case name is chvm_custom. It create a test lpar named testnode firstly, that change the min_mem of the lpar to 16 using chvm, then check if min_mem have changed correctly. At last, the testnode be remove to ensure no garbage produced in the cases. 
+To add a new case to test chvm. In the example, we assume that the min_mem should not be equal to 16 in the lpar profile of computenode. The case name is chvm_custom. It create a test lpar named testnode firstly, that change the min_mem of the lpar to 16 using chvm, then check if min_mem have changed correctly. At last, the testnode be remove to ensure no garbage produced in the cases.
 
   add a new test case file in /opt/xcat/share/xcat/tools/autotest/chvm
   edit filename
@@ -142,7 +142,7 @@ To add a new case to test chvm. In the example, we assume that the min_mem shoul
 
 =head1 INLINE FUNCTIONS
 
-The xCAT-test testing framework provides some inline functions. The inline functions can be called in test cases as __FUNCTIONNAME(PARAMTERLIST)__ to get some necessary attributes defined in the configuration file. The inline functions can be used in I<cmd> section and the I<check:output> section. 
+The xCAT-test testing framework provides some inline functions. The inline functions can be called in test cases as __FUNCTIONNAME(PARAMTERLIST)__ to get some necessary attributes defined in the configuration file. The inline functions can be used in I<cmd> section and the I<check:output> section.
 
 1. B<GETNODEATTR(nodename, attribute)> To get the value of specified node's attribute
 
diff --git a/xCAT-test/xcattest b/xCAT-test/xcattest
index 0a1ef119b..5881aa2eb 100755
--- a/xCAT-test/xcattest
+++ b/xCAT-test/xcattest
@@ -85,48 +85,48 @@ $::USAGE = "Usage:
 To get help:
     $program_name -h
 
-To list the information about all cases shipped by xcat test package  
+To list the information about all cases shipped by xcat test package
     $program_name -l {caselist|caseinfo|casenum}
 To list the information about all bunldes shipped by xcat test package
-    $program_name -l bundleinfo 
+    $program_name -l bundleinfo
 To list the information about label
     $program_name -l labelinfo
 To list the information about cases in specific bundles
     $program_name -l {caselist|caseinfo|casenum} -b <bundle_list>
 To list the information about cases related to specific commands
-    $program_name -l {caselist|caseinfo|casenum} -c <command_list> 
-To list the information about specific cases  
+    $program_name -l {caselist|caseinfo|casenum} -c <command_list>
+To list the information about specific cases
     $program_name -l {caselist|caseinfo|casenum} -t <case_list>
 
 To list cases information that satisfy specific filter expression
-    $program_name -l {caselist|caseinfo|casenum} -s \"filter_expression\"    
+    $program_name -l {caselist|caseinfo|casenum} -s \"filter_expression\"
 For short, show the cases list can use below command
     $program_name -l -s \"filter_expression\"
 To list information about cases in specific bundles and satisfy specific filter expression at same time
     $program_name -l {caselist|caseinfo|casenum} -b <bundle_list> -s \"filter_expression\"
 
-To run test cases in specific bundles 
+To run test cases in specific bundles
     $program_name [-f {configure_file|configure_file:System}] -b <bundle_list>  [-r] [-q]
-To run specific test cases 
+To run specific test cases
     $program_name [-f {configure_file|configure_file:System}] -t <case_list>  [-r] [-q]
-To run all cases related to specific commands 
+To run all cases related to specific commands
     $program_name [-f {configure_file|configure_file:System}] -c <command_list> [-r] [-q]
 To run test cases that satisfy specific filter expression
     $program_name -s \"filter_expression\"
 
 Options:
-    -h : Get $program_name usage information. 
+    -h : Get $program_name usage information.
     -l : list specific information. The valid options are caselist,caseinfo,casenum,bundleinfo. For list case information, caselist is default value.
     -f : specify the configuration file. If 'System' tag is used, only [System] section in the configuration file will be used. If 'System' is not used all other sections of the configuration file will be used, like [Table], [Object], etc.
-    -c : Comma separated list of command names to test. 
+    -c : Comma separated list of command names to test.
     -t : Comma separated list of test case names to test.
     -b : Comma separated list of bundle names to test. If a bundle name is specified without an absolute path, such like /<path/xxx.bundle, or ./xxx.bundle, bundles under $bundledir will be searched by default.
     -r : Back up the original environment settings before running test, and restore them after running test.
-    -q : Just record all the output of $program_name into log file under $resultdir, not print to STDOUT. Print to STDOUT by default. 
-    -s : Filter case by label. The acceptable value looks like 'label1+label2-label3\|label4\|label5', 'label1+label2-label3' works as sub expression. 
-         '|' means union filter, it has lower priority, expression1|expression2 means the case either satisfies expression1 or satisfies expression2. 
+    -q : Just record all the output of $program_name into log file under $resultdir, not print to STDOUT. Print to STDOUT by default.
+    -s : Filter case by label. The acceptable value looks like 'label1+label2-label3\|label4\|label5', 'label1+label2-label3' works as sub expression.
+         '|' means union filter, it has lower priority, expression1|expression2 means the case either satisfies expression1 or satisfies expression2.
          '+' means the case need have specific label. higher priority.
-         '-' means the case does not have specific label. higher priority. 
+         '-' means the case does not have specific label. higher priority.
 ";
 
 #==============================================================================================
@@ -199,7 +199,7 @@ if (defined $list) {
                 log_this($running_log_fd, "$_");
             }
         } elsif (!@cases_to_be_run && $search_expression){
-            log_this($running_log_fd, "There is no cases match search expression $search_expression"); 
+            log_this($running_log_fd, "There is no cases match search expression $search_expression");
         } else {
 
             #list the cases shipped by xcat test package
@@ -251,7 +251,7 @@ if (defined $list) {
         my %label_conut;
         my %case_label_str_map;
         foreach my $case (keys %case_label_map){
-            if($case_label_map{$case}{label_str}){ 
+            if($case_label_map{$case}{label_str}){
                 $case_label_str_map{$case} = $case_label_map{$case}{label_str};
                 my @labels = split(",", $case_label_map{$case}{label_str});
                 foreach my $label (@labels){
@@ -262,7 +262,7 @@ if (defined $list) {
                     }
                 }
             }
-        }  
+        }
 
         log_this($running_log_fd, "-------------------------------");
         log_this($running_log_fd, "The labels of cases:");
@@ -270,7 +270,7 @@ if (defined $list) {
         print_table(\%case_label_str_map);
         my $label_total_num=keys %label_conut;
         log_this($running_log_fd, "\n-------------------------------");
-        log_this($running_log_fd, "There are $label_total_num different labels"); 
+        log_this($running_log_fd, "There are $label_total_num different labels");
         log_this($running_log_fd, "The number of cases of each label:");
         log_this($running_log_fd, "-------------------------------");
         print_table(\%label_conut);
@@ -278,7 +278,7 @@ if (defined $list) {
         my $total_case = keys %case_label_map;
         my $case_with_label_num = keys %case_label_str_map;
         log_this($running_log_fd, "There are $total_case cases totaly, there are $case_with_label_num cases with label.");
-        
+
     }
 
     to_exit(0);
@@ -566,7 +566,7 @@ sub calculate_cases_to_be_run {
             return 1;
         }
 
-        @$cases_to_be_run_ref=@rest_cases_to_be_run;        
+        @$cases_to_be_run_ref=@rest_cases_to_be_run;
     }
     return 0;
 }
@@ -1052,12 +1052,12 @@ sub load_case {
                 $case_ref->[$i]->{arch} = $1;
 
                 if ($run_case_flag) {
-                    
+
                     #To judge whether need to skip the current case
 
                     my @vaild_archs_tmp = split(",", $case_ref->[$i]->{arch});
                     my @vaild_archs=();
-                    foreach my $arch (@vaild_archs_tmp){                    
+                    foreach my $arch (@vaild_archs_tmp){
                         my $tmp_str="";
                         if ($arch =~ /ppc/i && $arch !~ /le|el/i) {
                             $tmp_str = "ppc";
@@ -1066,7 +1066,7 @@ sub load_case {
                         } elsif ($arch =~ /x86/i) {
                             $tmp_str = "x86";
                         }
-                        push @vaild_archs, $tmp_str; 
+                        push @vaild_archs, $tmp_str;
                     }
 
                     my $env_arch = "";
@@ -1124,7 +1124,7 @@ sub load_case {
                             }
                             last;
                         }
-                    } 
+                    }
                     unless ($valid) {
                         if (exists($case_name_index_map_bak{ $case_ref->[$i]->{name} })) {
                             $$case_name_index_map_ref{ $case_ref->[$i]->{name} } = $case_name_index_map_bak{ $case_ref->[$i]->{name} };
diff --git a/xCAT-test/xmlapi/README b/xCAT-test/xmlapi/README
index 4d770945b..f38acf174 100644
--- a/xCAT-test/xmlapi/README
+++ b/xCAT-test/xmlapi/README
@@ -1,5 +1,5 @@
 xCAT has an XML input interface to the xCAT tables.  The routines are in tabutils.pm and map to the
-Table.pm routines by the same name. These routines were written for PCM but are also used in the restapi.  They are not a documented api.  
+Table.pm routines by the same name. These routines were written for PCM but are also used in the restapi.  They are not a documented api.
 For the restapi, check the following for how and which routines are used.
 xCAT-server/xCAT-wsapi/xcatws.cgi at all the functions between tablenodehdl() and tablerowdelhdl().
 
@@ -16,13 +16,13 @@ xCAT-server/xCAT-wsapi/xcatws.cgi at all the functions between tablenodehdl() an
 
 If you vi /opt/xcat/lib/perl/xCAT_plugin/tabutils.pm,  and search for example "sub getAllEntries", you will see documented in the routines comments to  input XML format requried and the output XML sent.
 
-To test these routines,  I put together a driver program pcmdriver, that generates the test XML and sends it  and displays the returned output. 
+To test these routines,  I put together a driver program pcmdriver, that generates the test XML and sends it  and displays the returned output.
 
 
 For example:
 vi xmldriver in this directory
 
-You will see 
+You will see
 
  $ENV{'XCATXMLTRACE'}=1;
 my $XML=`cat /.../xmlapi/getTablesAllRowAttribsreq`;
@@ -34,11 +34,11 @@ xCAT::Client::submit_request($data, \&xCAT::Client::handle_response);
 exit $xCAT::Client::EXITCODE;
 
 If you vi getTablesAllRowAttribsreq, you will see the following. This is an XML request to get the all rows from the passwd table the attributes username and rack. These is one of these  XML request files for all
-possible input to the routines in the directory. 
+possible input to the routines in the directory.
 
-XCATXMLTRACE is exported to show the XML that is being sent to xcatd. XCATSHOWXML is exported  to display the XML returned to the client. 
+XCATXMLTRACE is exported to show the XML that is being sent to xcatd. XCATSHOWXML is exported  to display the XML returned to the client.
 
-To get the XML request you must not be running in XCATBYPASS mode,  you can get the reponse in XCATBYPASS mode. 
+To get the XML request you must not be running in XCATBYPASS mode,  you can get the reponse in XCATBYPASS mode.
 
 <xcatrequest>
 <clienttype>PCM</clienttype>
diff --git a/xCAT-test/xmlapi/Table.pm.routines b/xCAT-test/xmlapi/Table.pm.routines
index 83336e081..8a4b547c2 100644
--- a/xCAT-test/xmlapi/Table.pm.routines
+++ b/xCAT-test/xmlapi/Table.pm.routines
@@ -2,8 +2,8 @@ sub setNodeAttribs
 sub addNodeAttribs
 sub setAttribs
 sub setAttribsWhere
-sub setNodesAttribs 
-sub getNodesAttribs 
+sub setNodesAttribs
+sub getNodesAttribs
 sub getNodeAttribs
 sub getAllEntries
 sub getAllAttribsWhere
diff --git a/xCAT-test/xmlapi/deltblreq b/xCAT-test/xmlapi/deltblreq
index 6030b4ce4..48a9bcf58 100644
--- a/xCAT-test/xmlapi/deltblreq
+++ b/xCAT-test/xmlapi/deltblreq
@@ -9,24 +9,24 @@
 .
 .
 or <node>ALL</node>
-<attr>attribute1</attr> 
-<attr>attribute2</attr> 
+<attr>attribute1</attr>
+<attr>attribute2</attr>
 .
 .
 .
-<attr>attributeN</attr> 
+<attr>attributeN</attr>
 </xcatrequest>
 <xcatresponse>
 <rows>
 <attr>attribute1</attr>
 <value>value1</value>
-<attr>attribute2</attr> 
+<attr>attribute2</attr>
 <value>value2</value>
 .
 .
 .
 .
-<attr>attributeN</attr> 
+<attr>attributeN</attr>
 <value>valueN</value>
 </rows>
 <xcatresponse>
diff --git a/xCAT-test/xmlapi/getAttribsreq b/xCAT-test/xmlapi/getAttribsreq
index de8172e18..0f36fb9c5 100644
--- a/xCAT-test/xmlapi/getAttribsreq
+++ b/xCAT-test/xmlapi/getAttribsreq
@@ -3,8 +3,8 @@
 <command>getAttribs</command>
 <table>site</table>
 <keys>
-  <key>domain</key>  
+  <key>domain</key>
 </keys>
-<attrs>value</attrs>  
-<attrs>comments</attrs>  
+<attrs>value</attrs>
+<attrs>comments</attrs>
 </xcatrequest>
diff --git a/xCAT-test/xmlapi/getAttribsreq.old b/xCAT-test/xmlapi/getAttribsreq.old
index bee39d797..9123ff099 100644
--- a/xCAT-test/xmlapi/getAttribsreq.old
+++ b/xCAT-test/xmlapi/getAttribsreq.old
@@ -3,6 +3,6 @@
 <command>getAttribs</command>
 <table>site</table>
 <key>domain</key>
-<attr>value</attr> 
-<attr>comments</attr> 
+<attr>value</attr>
+<attr>comments</attr>
 </xcatrequest>
diff --git a/xCAT-test/xmlapi/getAttribsreq2 b/xCAT-test/xmlapi/getAttribsreq2
index a4029372d..40b7de55d 100644
--- a/xCAT-test/xmlapi/getAttribsreq2
+++ b/xCAT-test/xmlapi/getAttribsreq2
@@ -7,5 +7,5 @@
   <mask>255.255.0.0</mask>
 </keys>
 <attr>netname</attr>
-<attr>dhcpserver</attr>    
+<attr>dhcpserver</attr>
 </xcatrequest>
diff --git a/xCAT-test/xmlapi/getNodeAttribs b/xCAT-test/xmlapi/getNodeAttribs
index 7eabc87d1..a48220ac0 100644
--- a/xCAT-test/xmlapi/getNodeAttribs
+++ b/xCAT-test/xmlapi/getNodeAttribs
@@ -1,18 +1,18 @@
-# Reads the table input for the noderange and returns list of attributes 
+# Reads the table input for the noderange and returns list of attributes
 # requested
 <xcatrequest>
 <clienttype>PCM</clienttype>
 <command>getNodeAttribs</command>
 <table>tablename</table>
 <node>noderange</node>
-<attr>attribute1</attr> 
+<attr>attribute1</attr>
 <value>value1</value>
-<attr>attribute2</attr> 
+<attr>attribute2</attr>
 <value>value2</value>
 .
 .
 .
-<attr>attributeN</attr> 
+<attr>attributeN</attr>
 <value>valueN</value>
 </xcatrequest>
 <xcatresponse>
diff --git a/xCAT-test/xmlapi/getNodeAttribs1 b/xCAT-test/xmlapi/getNodeAttribs1
index 7eabc87d1..a48220ac0 100644
--- a/xCAT-test/xmlapi/getNodeAttribs1
+++ b/xCAT-test/xmlapi/getNodeAttribs1
@@ -1,18 +1,18 @@
-# Reads the table input for the noderange and returns list of attributes 
+# Reads the table input for the noderange and returns list of attributes
 # requested
 <xcatrequest>
 <clienttype>PCM</clienttype>
 <command>getNodeAttribs</command>
 <table>tablename</table>
 <node>noderange</node>
-<attr>attribute1</attr> 
+<attr>attribute1</attr>
 <value>value1</value>
-<attr>attribute2</attr> 
+<attr>attribute2</attr>
 <value>value2</value>
 .
 .
 .
-<attr>attributeN</attr> 
+<attr>attributeN</attr>
 <value>valueN</value>
 </xcatrequest>
 <xcatresponse>
diff --git a/xCAT-test/xmlapi/getNodesAttribsreq b/xCAT-test/xmlapi/getNodesAttribsreq
index fcc79224c..28d855ea6 100644
--- a/xCAT-test/xmlapi/getNodesAttribsreq
+++ b/xCAT-test/xmlapi/getNodesAttribsreq
@@ -3,6 +3,6 @@
 <command>getNodesAttribs</command>
 <table>nodelist</table>
 <noderange>blade01-blade02</noderange>
-<attr>groups</attr> 
-<attr>status</attr> 
+<attr>groups</attr>
+<attr>status</attr>
 </xcatrequest>
diff --git a/xCAT-test/xmlapi/getNodesAttribsreq1 b/xCAT-test/xmlapi/getNodesAttribsreq1
index a2a2dd491..e23d1c2b5 100644
--- a/xCAT-test/xmlapi/getNodesAttribsreq1
+++ b/xCAT-test/xmlapi/getNodesAttribsreq1
@@ -3,5 +3,5 @@
 <command>getNodesAttribs</command>
 <table>nodelist</table>
 <noderange>blade01-blade02</noderange>
-<attr>ALL</attr> 
+<attr>ALL</attr>
 </xcatrequest>
diff --git a/xCAT-test/xmlapi/getNodesAttribsreq2 b/xCAT-test/xmlapi/getNodesAttribsreq2
index a2a2dd491..e23d1c2b5 100644
--- a/xCAT-test/xmlapi/getNodesAttribsreq2
+++ b/xCAT-test/xmlapi/getNodesAttribsreq2
@@ -3,5 +3,5 @@
 <command>getNodesAttribs</command>
 <table>nodelist</table>
 <noderange>blade01-blade02</noderange>
-<attr>ALL</attr> 
+<attr>ALL</attr>
 </xcatrequest>
diff --git a/xCAT-test/xmlapi/noderange b/xCAT-test/xmlapi/noderange
index 91f850065..fc53e28fe 100644
--- a/xCAT-test/xmlapi/noderange
+++ b/xCAT-test/xmlapi/noderange
@@ -1,4 +1,4 @@
-# Reads the table input for the noderange and returns list of attributes 
+# Reads the table input for the noderange and returns list of attributes
 # requested
 <xcatrequest>
 <clienttype>PCM</clienttype>
diff --git a/xCAT-test/xmlapi/readtblreq b/xCAT-test/xmlapi/readtblreq
index 4b9d2346f..c368d787b 100644
--- a/xCAT-test/xmlapi/readtblreq
+++ b/xCAT-test/xmlapi/readtblreq
@@ -8,24 +8,24 @@
 .
 .
 or <node>ALL</node>
-<attr>attribute1</attr> 
-<attr>attribute2</attr> 
+<attr>attribute1</attr>
+<attr>attribute2</attr>
 .
 .
 .
-<attr>attributeN</attr> 
+<attr>attributeN</attr>
 </xcatrequest>
 <xcatresponse>
 <rows>
 <attr>attribute1</attr>
 <value>value1</value>
-<attr>attribute2</attr> 
+<attr>attribute2</attr>
 <value>value2</value>
 .
 .
 .
 .
-<attr>attributeN</attr> 
+<attr>attributeN</attr>
 <value>valueN</value>
 </rows>
 <xcatresponse>
diff --git a/xCAT-test/xmlapi/readtblreq.node b/xCAT-test/xmlapi/readtblreq.node
index 4b9d2346f..c368d787b 100644
--- a/xCAT-test/xmlapi/readtblreq.node
+++ b/xCAT-test/xmlapi/readtblreq.node
@@ -8,24 +8,24 @@
 .
 .
 or <node>ALL</node>
-<attr>attribute1</attr> 
-<attr>attribute2</attr> 
+<attr>attribute1</attr>
+<attr>attribute2</attr>
 .
 .
 .
-<attr>attributeN</attr> 
+<attr>attributeN</attr>
 </xcatrequest>
 <xcatresponse>
 <rows>
 <attr>attribute1</attr>
 <value>value1</value>
-<attr>attribute2</attr> 
+<attr>attribute2</attr>
 <value>value2</value>
 .
 .
 .
 .
-<attr>attributeN</attr> 
+<attr>attributeN</attr>
 <value>valueN</value>
 </rows>
 <xcatresponse>
diff --git a/xCAT-test/xmlapi/setAttribsreq b/xCAT-test/xmlapi/setAttribsreq
index 739822823..b28ed0a53 100644
--- a/xCAT-test/xmlapi/setAttribsreq
+++ b/xCAT-test/xmlapi/setAttribsreq
@@ -3,10 +3,10 @@
 <command>setAttribs</command>
 <table>site</table>
 <keys>
-  <key>domain</key>  
+  <key>domain</key>
 </keys>
 <attr>
- <value>pok.com</value>  
- <comments>This is a test</comments>  
+ <value>pok.com</value>
+ <comments>This is a test</comments>
 </attr>
 </xcatrequest>
diff --git a/xCAT-test/xmlapi/setNodeAttribs b/xCAT-test/xmlapi/setNodeAttribs
index 45f4cbf39..cedb32f20 100644
--- a/xCAT-test/xmlapi/setNodeAttribs
+++ b/xCAT-test/xmlapi/setNodeAttribs
@@ -3,14 +3,14 @@
 <command>setNodeAttribs</command>
 <table>tablename</table>
 <node>noderange</node>
-<attr>attribute1</attr> 
+<attr>attribute1</attr>
 <value>value1</value>
-<attr>attribute2</attr> 
+<attr>attribute2</attr>
 <value>value2</value>
 .
 .
 .
-<attr>attributeN</attr> 
+<attr>attributeN</attr>
 <value>valueN</value>
 </xcatrequest>
 <xcatresponse>
diff --git a/xCAT-test/xmlapi/xmldriver b/xCAT-test/xmlapi/xmldriver
index 977038365..ef1c765b5 100755
--- a/xCAT-test/xmlapi/xmldriver
+++ b/xCAT-test/xmlapi/xmldriver
@@ -20,7 +20,7 @@ my $bname = basename($0);
 
 #-----------------------------------------------------------------------------
 
-=head1 pcmdriver - test XMLapi to Table.pm ( via tabutils.pm) 
+=head1 pcmdriver - test XMLapi to Table.pm ( via tabutils.pm)
 
 
 =cut
diff --git a/xCAT-test/xmlapi/xmldriver.old b/xCAT-test/xmlapi/xmldriver.old
index 1f1afed27..8be5b2fbb 100755
--- a/xCAT-test/xmlapi/xmldriver.old
+++ b/xCAT-test/xmlapi/xmldriver.old
@@ -20,7 +20,7 @@ my $bname = basename($0);
 
 #-----------------------------------------------------------------------------
 
-=head1 pcmdriver - test XMLapi for PCM 
+=head1 pcmdriver - test XMLapi for PCM
 
 
 =cut
diff --git a/xCAT-test/xmlapi/xmldriver.org b/xCAT-test/xmlapi/xmldriver.org
index 3465b33ad..fba3f7b2a 100644
--- a/xCAT-test/xmlapi/xmldriver.org
+++ b/xCAT-test/xmlapi/xmldriver.org
@@ -24,7 +24,7 @@ my $bname = basename($0);
 
 #-----------------------------------------------------------------------------
 
-=head1 pcmdriver - test XMLapi for PCM 
+=head1 pcmdriver - test XMLapi for PCM
 
 
 =cut
diff --git a/xCAT-vlan/debian/copyright b/xCAT-vlan/debian/copyright
index 38512affb..f99fd4033 100644
--- a/xCAT-vlan/debian/copyright
+++ b/xCAT-vlan/debian/copyright
@@ -11,7 +11,7 @@ License: <special license>
  .
  <Including paragraphs>
 
-# If you want to use GPL v2 or later for the /debian/* files use 
+# If you want to use GPL v2 or later for the /debian/* files use
 # the following clauses, or change it to suit. Delete these two lines
 Files: debian/*
 Copyright: 2013 root <root@unknown>
diff --git a/xCAT-vlan/install/postscripts/configvlan b/xCAT-vlan/install/postscripts/configvlan
index 790d5a49b..ec7bd025c 100755
--- a/xCAT-vlan/install/postscripts/configvlan
+++ b/xCAT-vlan/install/postscripts/configvlan
@@ -1,22 +1,22 @@
-#!/bin/sh 
+#!/bin/sh
 
 #-------------------------------------------------------------------------------------
 #
-# this script configures the vlan on the node, assuming the vlan is already creaed on the switch. 
+# this script configures the vlan on the node, assuming the vlan is already creaed on the switch.
 #  configvlan <vlan_id>
-#     if vlan_is is not specified, all the vlans defined for the 
+#     if vlan_is is not specified, all the vlans defined for the
 #      given node will be configured.
 #
 #-------------------------------------------------------------------------------------
 #if [[ -z "$VLANID" ]] || [[ -z "$VLANHOSTNAME" ]] || [[ -z "$VLANIP" ]]; then
 #    logger -t xcat "configvlan: please make sure that vlan id, vlan hostname and vlan ip are defined for this node.\nPlease use mkvlan or chvlan command."
-#    echo "configvlan: please make sure that vlan id, vlan hostname and vlan ip are defined for this node.\nPlease use mkvlan or chvlan command."    
+#    echo "configvlan: please make sure that vlan id, vlan hostname and vlan ip are defined for this node.\nPlease use mkvlan or chvlan command."
 #    exit 0
 #fi
 
 if [[ -z $VLANMAXINDEX ]] || [[ $VLANMAXINDEX -eq 0 ]]; then
     logger -t xcat "configvlan: Nothing to do."
-    echo "configvlan: Nothing to do." 
+    echo "configvlan: Nothing to do."
     exit 0
 fi
 
@@ -24,12 +24,12 @@ if [[ $OSTYPE = linux* ]]; then
   if [[ $OSVER = sles* ]] || [[ $OSVER = suse* ]] || [[ -f /etc/SuSE-release ]]; then
       nwdir="/etc/sysconfig/network"
       isSLES=1
-  else 
+  else
       nwdir="/etc/sysconfig/network-scripts"
-  fi 
+  fi
 else
     logger -t xcat "configvlan: Does not support AIX yet."
-    echo "configvlan: Does not support AIX yet." 
+    echo "configvlan: Does not support AIX yet."
     exit 0
 fi
 
@@ -38,31 +38,31 @@ fi
 keephostname=0
 if [ $# -eq 1 ]
 then
-    if [ "$1" = "--keephostname"] 
+    if [ "$1" = "--keephostname"]
     then
        keephostname=1
     else
        # the original logic
        if [[ -n "$1" ]]; then
-          IN_VLAN=$1 #The vlan id to be configured, if not specified, all will be configured on this note. 
+          IN_VLAN=$1 #The vlan id to be configured, if not specified, all will be configured on this note.
        fi
-    fi 
+    fi
 fi
 
 if [ $# -gt 1 ]
 then
-    if [ "$1" = "--keephostname" ] 
+    if [ "$1" = "--keephostname" ]
     then
         logger -t xcat "configvlan: Usage: configvlan <vlanid> <--keephostname>. Correct the arguments order."
-        echo "configvlan: Usage: configvlan <vlanid> <--keephostname>. Correct the arguments order." 
+        echo "configvlan: Usage: configvlan <vlanid> <--keephostname>. Correct the arguments order."
         exit -1
     fi
     # the original logic
-    IN_VLAN=$1 #The vlan id to be configured, if not specified, all will be configured on this note. 
-    if [ "$2" != "--keephostname" ] 
+    IN_VLAN=$1 #The vlan id to be configured, if not specified, all will be configured on this note.
+    if [ "$2" != "--keephostname" ]
     then
         logger -t xcat "configvlan: Usage: configvlan <vlanid> <--keephostname>. Correct the arguments order."
-        echo "configvlan: Usage: configvlan <vlanid> <--keephostname>. Correct the arguments order." 
+        echo "configvlan: Usage: configvlan <vlanid> <--keephostname>. Correct the arguments order."
         exit -1
     fi
     keephostname=1
@@ -84,7 +84,7 @@ while [ $index -le $VLANMAXINDEX ]; do
 	eval VLANNIC=\$VLANNIC_$index #VLANNIC could be ethx, primary, primary:ethx or empty
 	
         #determine if the current is primary network
-	PMRY=0   
+	PMRY=0
 	if [[ -z $VLANNIC ]] || [[ $VLANNIC = primary* ]]; then
 	    PMRY=1
 	fi
@@ -99,7 +99,7 @@ while [ $index -le $VLANMAXINDEX ]; do
 	eval VLAN_VMNICPOS=\$VLAN_VMNICPOS_$index #VLAN_VMNICPOS identifies the position of the mac address in mac, the mac has the following format: 01:02:03:04:05:0E!node5|01:02:03:05:0F!node6-eth
 
 	PMRY=0
-	if [[ $index -eq 1 ]]; then 
+	if [[ $index -eq 1 ]]; then
 	    PMRY=1   ##the first one is always primary network
 	fi
 
@@ -107,11 +107,11 @@ while [ $index -le $VLANMAXINDEX ]; do
 	    nic="eth1"
 	fi
     fi
-    
+
 	
-    
+
     if [[ -z $nic ]]; then  #get the nic
-	if [[ -n $MACADDRESS ]]; then 
+	if [[ -n $MACADDRESS ]]; then
 	    pos=0
             #mac has the following format: 01:02:03:04:05:0E!node5|01:02:03:05:0F!node6-eth1
 	    for x in `echo "$MACADDRESS" | tr "|" "\n"`
@@ -153,9 +153,9 @@ while [ $index -le $VLANMAXINDEX ]; do
 
 	    if [[ -z $mac ]]; then
 		if  [[ -n $VMNODE ]]; then
-		     mac=$mac1 
-		else 
-		    if [[ -z "$PRIMARYNIC" ]] || [[ "$PRIMARYNIC" = "mac" ]]; then 
+		     mac=$mac1
+		else
+		    if [[ -z "$PRIMARYNIC" ]] || [[ "$PRIMARYNIC" = "mac" ]]; then
 			mac=$mac1 #if nothing mathes, take the first mac
 		    else
 			nic=$PRIMARYNIC #or the primary nic itself is the nic
@@ -176,7 +176,7 @@ while [ $index -le $VLANMAXINDEX ]; do
 	ret=`ifconfig |grep -i $mac | cut -d' ' -f 1 2>&1`;
 	if [ $? -eq 0 ]; then
 	    for x in $ret
-	    do  
+	    do
                 #ignore bridge because bridge and the nic has the same mac address
 		if [[ $isSLES -eq 1 ]]; then
 		    ret1=`grep -i "TYPE='Bridge'" $nwdir/ifcfg-$x 2>&1`;
@@ -193,7 +193,7 @@ while [ $index -le $VLANMAXINDEX ]; do
 	    fi
 	else
 	    logger -t xcat "configvlan: The mac address for the network for $NODE is not defined."
-	    echo "configvlan: The mac address for the network for $NODE is not defined." 
+	    echo "configvlan: The mac address for the network for $NODE is not defined."
 	    index=$((index+1))
             continue
 	fi
@@ -202,7 +202,7 @@ while [ $index -le $VLANMAXINDEX ]; do
 
     eval VLANID=\$VLANID_$index
     eval VLANIP=\$VLANIP_$index
-    eval VLANNETMASK=\$VLANNETMASK_$index    
+    eval VLANNETMASK=\$VLANNETMASK_$index
 
     #write into the network configuration file
     if [ -z "$VMNODE" ]; then
@@ -213,7 +213,7 @@ while [ $index -le $VLANMAXINDEX ]; do
     logger -t xcat "configvlan: configuring vlan $VLANID on $newnic for $NODE..."
     echo "configvlan: configuring vlan $VLANID on $newnic for $NODE..."
 
-    
+
     if [[ $isSLES -eq 1 ]]; then
 	cat >$nwdir/ifcfg-$newnic <<EOF
 DEVICE='$newnic'
@@ -237,7 +237,7 @@ EOF
 	    echo "VLAN=yes" >> $nwdir/ifcfg-$newnic
 	fi
     fi
-    
+
     #restart the vlan network
     logger -t xcat "configvlan: starting $newnic ..."
     echo "configvlan: starting $newnic ..."
@@ -249,16 +249,16 @@ EOF
 	echo "configvlan: $ret"
 	index=$((index+1))
 	continue;
-    else 
+    else
 	logger -t xcat "configvlan: done."
 	echo "configvlan: done."
     fi
 
     #change the hostname only for primary vlan
-    if [[ $PMRY -eq 1 && $keephostname -eq 0 ]]; then   
+    if [[ $PMRY -eq 1 && $keephostname -eq 0 ]]; then
 	eval VLANHOSTNAME=\$VLANHOSTNAME_$index
 	hostname $VLANHOSTNAME
-    
+
         #change the hostname permanently
 	if [ -f /etc/SuSE-release ]
 	then
diff --git a/xCAT-vlan/install/postscripts/deconfigvlan b/xCAT-vlan/install/postscripts/deconfigvlan
index c8d486671..062ce2b51 100755
--- a/xCAT-vlan/install/postscripts/deconfigvlan
+++ b/xCAT-vlan/install/postscripts/deconfigvlan
@@ -4,13 +4,13 @@
 #
 # this script deconfigures the vlan on the node.
 #  deconfigvlan <vlan_id>
-#     if vlan_is is not specified, all the vlans defined 
+#     if vlan_is is not specified, all the vlans defined
 #     for the given node will be deconfigured.
 #
 #-------------------------------------------------------------------------------------
 if [[ -z $VLANMAXINDEX ]] || [[ $VLANMAXINDEX -eq 0 ]]; then
     logger -t xcat "deconfigvlan: Nothing to do."
-    echo "deconfigvlan: Nothing to do." 
+    echo "deconfigvlan: Nothing to do."
     exit 0
 fi
 
@@ -18,18 +18,18 @@ if [[ $OSTYPE = linux* ]]; then
   if [[ $OSVER = sles* ]] || [[ $OSVER = suse* ]] || [[ -f /etc/SuSE-release ]]; then
       nwdir="/etc/sysconfig/network"
       isSLES=1
-  else 
+  else
       nwdir="/etc/sysconfig/network-scripts"
-  fi 
+  fi
 else
     logger -t xcat "deconfigvlan: Does not support AIX yet."
-    echo "deconfigvlan: Does not support AIX yet." 
+    echo "deconfigvlan: Does not support AIX yet."
     exit 0
 fi
 
 
 if [[ -n "$1" ]]; then
-    IN_VLAN=$1 #The vlan id to be deconfigured, if not specified, all will be deconfigured on this note. 
+    IN_VLAN=$1 #The vlan id to be deconfigured, if not specified, all will be deconfigured on this note.
 fi
 
 index=1
@@ -47,7 +47,7 @@ while [ $index -le $VLANMAXINDEX ]; do
 	eval VLANNIC=\$VLANNIC_$index #VLANNIC could be ethx, primary, primary:ethx or empty
 	
         #determine if the current is primary network
-	PMRY=0   
+	PMRY=0
 	if [[ -z $VLANNIC ]] || [[ $VLANNIC = primary* ]]; then
 	    PMRY=1
 	fi
@@ -62,7 +62,7 @@ while [ $index -le $VLANMAXINDEX ]; do
 	eval VLAN_VMNICPOS=\$VLAN_VMNICPOS_$index #VLAN_VMNICPOS identifies the position of the mac address in mac, the mac has the following format: 01:02:03:04:05:0E!node5|01:02:03:05:0F!node6-eth
 
 	PMRY=0
-	if [[ $index -eq 1 ]]; then 
+	if [[ $index -eq 1 ]]; then
 	    PMRY=1   ##the first one is always primary network
 	fi
 
@@ -70,11 +70,11 @@ while [ $index -le $VLANMAXINDEX ]; do
 	    nic="eth1"
 	fi
     fi
-    
+
 	
-    
+
     if [[ -z $nic ]]; then  #get the nic
-	if [[ -n $MACADDRESS ]]; then 
+	if [[ -n $MACADDRESS ]]; then
 	    pos=0
             #mac has the following format: 01:02:03:04:05:0E!node5|01:02:03:05:0F!node6-eth1
 	    for x in `echo "$MACADDRESS" | tr "|" "\n"`
@@ -116,9 +116,9 @@ while [ $index -le $VLANMAXINDEX ]; do
 
 	    if [[ -z $mac ]]; then
 		if  [[ -n $VMNODE ]]; then
-		     mac=$mac1 
-		else 
-		    if [[ -z "$PRIMARYNIC" ]] || [[ "$PRIMARYNIC" = "mac" ]]; then 
+		     mac=$mac1
+		else
+		    if [[ -z "$PRIMARYNIC" ]] || [[ "$PRIMARYNIC" = "mac" ]]; then
 			mac=$mac1 #if nothing mathes, take the first mac
 		    else
 			nic=$PRIMARYNIC #or the primary nic itself is the nic
@@ -139,7 +139,7 @@ while [ $index -le $VLANMAXINDEX ]; do
 	ret=`ifconfig |grep -i $mac | cut -d' ' -f 1 2>&1`;
 	if [ $? -eq 0 ]; then
 	    for x in $ret
-	    do  
+	    do
                 #ignore bridge because bridge and the nic has the same mac address
 		if [[ $isSLES -eq 1 ]]; then
 		    ret1=`grep -i "TYPE='Bridge'" $nwdir/ifcfg-$x 2>&1`;
@@ -156,7 +156,7 @@ while [ $index -le $VLANMAXINDEX ]; do
 	    fi
 	else
 	    logger -t xcat "deconfigvlan: The mac address for the network for $NODE is not defined."
-	    echo "deconfigvlan: The mac address for the network for $NODE is not defined." 
+	    echo "deconfigvlan: The mac address for the network for $NODE is not defined."
 	    index=$((index+1))
             continue
 	fi
@@ -165,7 +165,7 @@ while [ $index -le $VLANMAXINDEX ]; do
 
     eval VLANID=\$VLANID_$index
     eval VLANIP=\$VLANIP_$index
-    eval VLANNETMASK=\$VLANNETMASK_$index    
+    eval VLANNETMASK=\$VLANNETMASK_$index
 
     #write into the network configuration file
     if [ -z "$VMNODE" ]; then
@@ -187,19 +187,19 @@ while [ $index -le $VLANMAXINDEX ]; do
 
         #remove the network conf file for the vlan
 	ret=`rm $nwdir/ifcfg-$newnic 2>&1`
-    else 
+    else
 	logger -t xcat "deconfigvlan: cannot find the nic that has the vlan."
-	echo "deconfigvlan: cannot find the nic that has the vlan" 
+	echo "deconfigvlan: cannot find the nic that has the vlan"
     fi
 
-    #stop the bridge on the vm hosts, 
+    #stop the bridge on the vm hosts,
     if [ -f $nwdir/ifcfg-vl$VLANID ]; then
 	ret=`ifconfig vl$VLANID down 2>&1`
 	ret=`rm $nwdir/ifcfg-vl$VLANID 2>&1`
 	ret=`brctl delbr vl$VLANID  2>&1`
     fi
 
-    if [[ $PMRY -eq 1 ]]; then   
+    if [[ $PMRY -eq 1 ]]; then
 	logger -t xcat "dconfigvlan: changing the hostname back to $NODE..."
 	echo "dconfigvlan: changing the hostname back to $NODE..."
         #change the hostname
diff --git a/xCAT-vlan/pods/man1/chvlan.1.pod b/xCAT-vlan/pods/man1/chvlan.1.pod
index 5a7d3e429..3149eaab2 100755
--- a/xCAT-vlan/pods/man1/chvlan.1.pod
+++ b/xCAT-vlan/pods/man1/chvlan.1.pod
@@ -4,9 +4,9 @@ B<chvlan> - It adds or removes nodes for the vlan.
 
 =head1 SYNOPSIS
 
-B<chvlan> I<vlanid> B<-n>|B<--nodes> I<noderange> [B<-i>|B<--interface> I<nic>]  
+B<chvlan> I<vlanid> B<-n>|B<--nodes> I<noderange> [B<-i>|B<--interface> I<nic>]
 
-B<chvlan> I<vlanid> B<-n>|B<--nodes> I<noderange> B<-d>|B<--delete> 
+B<chvlan> I<vlanid> B<-n>|B<--nodes> I<noderange> B<-d>|B<--delete>
 
 B<chvlan> [B<-h>|B<--help>]
 
@@ -14,20 +14,20 @@ B<chvlan> [B<-v>|B<--version>]
 
 =head1 DESCRIPTION
 
-The B<chvlan> command adds nodes to the given vlan. If -d is specified, the nodes will be removed from the vlan. 
+The B<chvlan> command adds nodes to the given vlan. If -d is specified, the nodes will be removed from the vlan.
 
-For added security, the root guard and bpdu guard will be enabled for the ports added to this vlan. However, the guards will not be disabled if the ports are removed from the vlan using chvlan (-d) or rmvlan commands. To disable them, you need to use the switch command line interface. Please refer to the switch command line interface manual to see how to disable the root guard and bpdu guard for a port.   
+For added security, the root guard and bpdu guard will be enabled for the ports added to this vlan. However, the guards will not be disabled if the ports are removed from the vlan using chvlan (-d) or rmvlan commands. To disable them, you need to use the switch command line interface. Please refer to the switch command line interface manual to see how to disable the root guard and bpdu guard for a port.
 
 =head1 Parameters
 
-I<vlanid> is a unique vlan number. 
+I<vlanid> is a unique vlan number.
 
 
 =head1 OPTIONS
 
 =over 10
 
-=item B<-n|--nodes>    The nodes or groups to be added or removed. It can be stand alone nodes or KVM guests. It takes the noderange format. Please check the man page for noderange for details. 
+=item B<-n|--nodes>    The nodes or groups to be added or removed. It can be stand alone nodes or KVM guests. It takes the noderange format. Please check the man page for noderange for details.
 
 =item B<-i|--interface> (For adding only). The interface name where the vlan will be tagged on. If omitted, the xCAT management network will be assumed. For KVM, it is the interface name on the host.
 
@@ -71,7 +71,7 @@ TO remove node1, node2 and node3 from vlan 3.
 =item 4.
 
 To add KVM guests node1 and node2 to vlan 3
-  
+
   mkdef node1 arch=x86_64 groups=kvm,all installnic=mac primarynic=mac mgt=kvm netboot=pxe nfsserver=10.1.0.204 os=rhels6 profile=compute provmethod=install serialport=0 serialspeed=115200 vmcpus=1 vmhost=x3650n01 vmmemory=512 vmnics=br0 vmstorage=nfs://10.1.0.203/vms
 
   mkdef node2 arch=x86_64 groups=kvm,all installnic=mac primarynic=mac mgt=kvm netboot=pxe nfsserver=10.1.0.204 os=rhels6 profile=compute provmethod=install serialport=0 serialspeed=115200 vmcpus=1 vmhost=x3650n01 vmmemory=512 vmnics=br0 vmstorage=nfs://10.1.0.203/vms
@@ -82,7 +82,7 @@ To add KVM guests node1 and node2 to vlan 3
 
   rpower node1,node2 on
 
-  rinstall node1,node2    
+  rinstall node1,node2
 
 =item 5.
 
@@ -92,7 +92,7 @@ To remove KVM guests node1 and node2 from vlan 3
 
   rpower node1,node2 off
 
-  rmvm node1,node2 
+  rmvm node1,node2
 
 =back
 
diff --git a/xCAT-vlan/pods/man1/chvlanports.1.pod b/xCAT-vlan/pods/man1/chvlanports.1.pod
index cb1da85e4..d4a0bc123 100755
--- a/xCAT-vlan/pods/man1/chvlanports.1.pod
+++ b/xCAT-vlan/pods/man1/chvlanports.1.pod
@@ -4,9 +4,9 @@ B<chvlanports> - It adds or removes nodes' switch interfaces for the vlan.
 
 =head1 SYNOPSIS
 
-B<chvlanports> I<vlanid> B<-n>|B<--nodes> I<noderange> B<-i>|B<--interface> I<nic> 
+B<chvlanports> I<vlanid> B<-n>|B<--nodes> I<noderange> B<-i>|B<--interface> I<nic>
 
-B<chvlanports> I<vlanid> B<-n>|B<--nodes> I<noderange> B<-i>|B<--interface> I<nic> B<-d>|B<--delete> 
+B<chvlanports> I<vlanid> B<-n>|B<--nodes> I<noderange> B<-i>|B<--interface> I<nic> B<-d>|B<--delete>
 
 B<chvlanports> [B<-h>|B<--help>]
 
@@ -14,19 +14,19 @@ B<chvlanports> [B<-v>|B<--version>]
 
 =head1 DESCRIPTION
 
-The B<chvlanports> command adds nodes switch interfaces to the given vlan. If -d is specified, the nodes switch interfaces will be removed from the vlan. 
+The B<chvlanports> command adds nodes switch interfaces to the given vlan. If -d is specified, the nodes switch interfaces will be removed from the vlan.
 
 This command won't create/remove vlans on switches, it just add node's switch ports into exisitng vlan or remove them from existing vlan on switch. Before calling chvlanports, the nodes switch interfaces should be configured in table switch, and vlan must already existing in switches.
 =head1 Parameters
 
-I<vlanid> is a unique vlan number. 
+I<vlanid> is a unique vlan number.
 
 
 =head1 OPTIONS
 
 =over 10
 
-=item B<-n|--nodes>    The nodes or groups to be added or removed. It takes the noderange format. Check the man page for noderange for details. 
+=item B<-n|--nodes>    The nodes or groups to be added or removed. It takes the noderange format. Check the man page for noderange for details.
 
 =item B<-i|--interface> The interface name where the vlan will be tagged on.
 
diff --git a/xCAT-vlan/pods/man1/lsvlan.1.pod b/xCAT-vlan/pods/man1/lsvlan.1.pod
index ffe21ebd3..3dc0ddf6d 100755
--- a/xCAT-vlan/pods/man1/lsvlan.1.pod
+++ b/xCAT-vlan/pods/man1/lsvlan.1.pod
@@ -4,7 +4,7 @@ B<lsvlan> - It lists the existing vlans for the cluster.
 
 =head1 SYNOPSIS
 
-B<lsvlan> 
+B<lsvlan>
 
 B<lsvlan> [I<vlanid>]
 
@@ -14,7 +14,7 @@ B<lsvlan> [B<-v>|B<--version>]
 
 =head1 DESCRIPTION
 
-The B<lsvlan> command lists all the vlans for the cluster. If I<vlanid> is specifined it will list more details about this vlan including the nodes in the vlan.  
+The B<lsvlan> command lists all the vlans for the cluster. If I<vlanid> is specifined it will list more details about this vlan including the nodes in the vlan.
 
 =head1 PARAMETERS
 
diff --git a/xCAT-vlan/pods/man1/mkvlan.1.pod b/xCAT-vlan/pods/man1/mkvlan.1.pod
index 99b357f8d..08d866eca 100755
--- a/xCAT-vlan/pods/man1/mkvlan.1.pod
+++ b/xCAT-vlan/pods/man1/mkvlan.1.pod
@@ -12,7 +12,7 @@ B<mkvlan> [B<-v>|B<--version>]
 
 =head1 DESCRIPTION
 
-The B<mkvlan> command takes a list of nodes and move them to a private vlan. 
+The B<mkvlan> command takes a list of nodes and move them to a private vlan.
 
 This command will configure the switch to create a new tagged vlan on the given nic. The primary nic will be used if the nic is not specified.  The new vlan ID is given by the command.  However, if it is omitted, xCAT will automatically generate the new vlan ID by querying all the switches involved and finding out the smallest common number that is not used by any existing vlans.  The subnet and the netmask for the vlan will be derived from the value of "vlannets" and "vlanmasks" from the I<site> table if -t and -m are not specified. The following are the default site table entires:
 
@@ -23,9 +23,9 @@ The vlan network will be entered in the I<networks> table. The nodes will be add
 
 v<vlanid>nY  where Y is the node number. For example, the hostname for node 5 on vlan 10 is v10n5.
 
-The I<switch.vlan> will be updated with the new vlan id for the node for standaline nodes. For KVM guests, the I<vm.nics> identifies which vlan this node belongs to. For example: vl3 means this node is in vlan 3. 
+The I<switch.vlan> will be updated with the new vlan id for the node for standaline nodes. For KVM guests, the I<vm.nics> identifies which vlan this node belongs to. For example: vl3 means this node is in vlan 3.
 
-If there are more than one switches involved in the vlan, the ports that connect to the switches need to entered in I<switches.linkports> with the following format: 
+If there are more than one switches involved in the vlan, the ports that connect to the switches need to entered in I<switches.linkports> with the following format:
 
     <port numner>:switch,<port number>:switch....
 
@@ -33,26 +33,26 @@ For example:
 
     "42:switch1,43:switch2"
 
-This command will automatically configure the cross-over ports if the given nodes are on different switches. 
+This command will automatically configure the cross-over ports if the given nodes are on different switches.
 
-For added security, the root guard and bpdu guard will be enabled for the ports in this vlan. However, the guards will not be disabled if the ports are removed from the vlan using chvlan or rmvlan commands. To disable them, you need to use the switch command line interface. Refer to the switch command line interface manual to see how to disable the root guard and bpdu guard for a port. 
+For added security, the root guard and bpdu guard will be enabled for the ports in this vlan. However, the guards will not be disabled if the ports are removed from the vlan using chvlan or rmvlan commands. To disable them, you need to use the switch command line interface. Refer to the switch command line interface manual to see how to disable the root guard and bpdu guard for a port.
 
 =head1 PARAMETERS
 
-I<vlanid> is a unique vlan number. If it is omitted, xCAT will automatically generate the new vlan ID by querying all the switches involved and finding out the smallest common number that is not used by any existing vlans. Use B<lsvlan> to find out the existing vlan ids used by xCAT. 
+I<vlanid> is a unique vlan number. If it is omitted, xCAT will automatically generate the new vlan ID by querying all the switches involved and finding out the smallest common number that is not used by any existing vlans. Use B<lsvlan> to find out the existing vlan ids used by xCAT.
 
 
 =head1 OPTIONS
 
 =over 10
 
-=item B<-n|--nodes>     The nodes or groups to be included in the vlan. It can be stand alone nodes or KVM guests. It takes the noderange format. Check the man page for noderange for details. 
+=item B<-n|--nodes>     The nodes or groups to be included in the vlan. It can be stand alone nodes or KVM guests. It takes the noderange format. Check the man page for noderange for details.
 
 =item B<-t|--net>       The subnet for the vlan.
 
 =item B<-m|--mask>      The netmask for the vlan
 
-=item B<-p|--prefix>    The prefix the the new hostnames for the nodes in the vlan. 
+=item B<-p|--prefix>    The prefix the the new hostnames for the nodes in the vlan.
 
 =item B<-i|--interface> The interface name where the vlan will be tagged on. If omitted, the xCAT management network will be assumed. For FVM, this is the interface name on the host.
 
@@ -84,7 +84,7 @@ To start, the xCAT switches and switches table needs to be filled with switch an
 Note that the interface value for the management (primary) network can be empty, the word "primary" or "primary:ethx". For other networks, the interface attribute must be specified.
 
 
-The following is an example of the switches table 
+The following is an example of the switches table
 
 #switch,snmpversion,username,password,privacy,auth,linkports,sshusername,sshpassword,switchtype,comments,disable
 "switch1","3","username","passw0rd",,"sha","48:switch2",,,,,
@@ -117,20 +117,20 @@ To make a private vlan for node1, node2 with given subnet and netmask.
 =item 4.
 
 To make a private vlan for KVM guests node1 and node2
-  
+
   chtab key=usexhrm site.vlaue=1
- 
+
   mkdef node1 arch=x86_64 groups=kvm,all installnic=mac primarynic=mac mgt=kvm netboot=pxe nfsserver=10.1.0.204 os=rhels6 profile=compute provmethod=install serialport=0 serialspeed=115200 vmcpus=1 vmhost=x3650n01 vmmemory=512 vmnics=br0 vmstorage=nfs://10.1.0.203/vms
 
   mkdef node2 arch=x86_64 groups=kvm,all installnic=mac primarynic=mac mgt=kvm netboot=pxe nfsserver=10.1.0.204 os=rhels6 profile=compute provmethod=install serialport=0 serialspeed=115200 vmcpus=1 vmhost=x3650n01 vmmemory=512 vmnics=br0 vmstorage=nfs://10.1.0.203/vms
 
-  mkvlan -n node1,node2 
+  mkvlan -n node1,node2
 
   mkvm node1,node2 -s 20G
 
   rpower node1,node2 on
 
-  rinstall node1,node2    
+  rinstall node1,node2
 
 =back
 
diff --git a/xCAT-vlan/pods/man1/rmvlan.1.pod b/xCAT-vlan/pods/man1/rmvlan.1.pod
index ac6a27c97..0e1e562c8 100755
--- a/xCAT-vlan/pods/man1/rmvlan.1.pod
+++ b/xCAT-vlan/pods/man1/rmvlan.1.pod
@@ -1,6 +1,6 @@
 =head1 NAME
 
-B<rmvlan> - It remves the vlan from the cluster. 
+B<rmvlan> - It remves the vlan from the cluster.
 
 =head1 SYNOPSIS
 
@@ -12,13 +12,13 @@ B<rmvlan> [B<-v>|B<--version>]
 
 =head1 DESCRIPTION
 
-The B<rmvlan> command removes the given vlan ID from the cluster. It removes the vlan id from all the swithces involved, deconfigures the nodes so that vlan adaptor (tag) will be remved, cleans up /etc/hosts, DNS and database tables for the given vlan.  
+The B<rmvlan> command removes the given vlan ID from the cluster. It removes the vlan id from all the swithces involved, deconfigures the nodes so that vlan adaptor (tag) will be remved, cleans up /etc/hosts, DNS and database tables for the given vlan.
 
-For added security, the root guard and bpdu guard were enabled for the ports in this vlan by mkvlan and chvlan commands. However, the guards will not be disabled by this command. To disable them, you need to use the switch command line interface. Refer to the switch command line interface manual to see how to disable the root guard and bpdu guard for a port. 
+For added security, the root guard and bpdu guard were enabled for the ports in this vlan by mkvlan and chvlan commands. However, the guards will not be disabled by this command. To disable them, you need to use the switch command line interface. Refer to the switch command line interface manual to see how to disable the root guard and bpdu guard for a port.
 
 =head1 Parameters
 
-I<vlanid> is a unique vlan number.  
+I<vlanid> is a unique vlan number.
 
 
 =head1 OPTIONS
diff --git a/xCAT-vlan/xCAT/SwitchHandler.pm b/xCAT-vlan/xCAT/SwitchHandler.pm
index 49846464b..6020345b4 100755
--- a/xCAT-vlan/xCAT/SwitchHandler.pm
+++ b/xCAT-vlan/xCAT/SwitchHandler.pm
@@ -71,7 +71,7 @@ sub setoid {
 #---------------------------------------------------------
 
 =head3  getsnmpsession
-   It gets an snmp session appropriate for a switch using the switches table 
+   It gets an snmp session appropriate for a switch using the switches table
    for guidance on the hows.
    Arguments: vlan=> $vid if needed for community string indexing (optional)
 =cut
@@ -181,7 +181,7 @@ sub getsnmpsession {
 
 #--------------------------------------------------------------
 
-=head3 get_vlan_ids    
+=head3 get_vlan_ids
 
   It gets the existing vlan IDs for the switch.
   Returns:  an array containing all the vlan ids for the switch
@@ -203,7 +203,7 @@ sub get_vlan_ids {
 
 #--------------------------------------------------------------
 
-=head3 get_vlanids_for_ports   
+=head3 get_vlanids_for_ports
     It returns a hash pointer that contains the vlan id for each given port.
 =cut
 
@@ -226,7 +226,7 @@ sub get_vlanids_for_ports {
 
 #--------------------------------------------------------------
 
-=head3 create_vlan   
+=head3 create_vlan
     Creates a new vlan on the switch
     Returns an array. (erorcode, errormsg). When errorcode=0, means no error.
 =cut
@@ -255,7 +255,7 @@ sub create_vlan {
 
 #--------------------------------------------------------------
 
-=head3 add_ports_to_vlan   
+=head3 add_ports_to_vlan
     Adds the given ports to the existing vlan
     Returns an array. (erorcode, errormsg). When errorcode=0, means no error.
 =cut
@@ -310,7 +310,7 @@ sub add_crossover_ports_to_vlan {
 
 #--------------------------------------------------------------
 
-=head3 remove_vlan   
+=head3 remove_vlan
     Remove a vlan from the switch
     Returns an array. (erorcode, errormsg). When errorcode=0, means no error.
 =cut
@@ -334,7 +334,7 @@ sub remove_vlan {
 
 #--------------------------------------------------------------
 
-=head3 remove_ports_from_vlan  
+=head3 remove_ports_from_vlan
     Remove ports from a vlan
     Returns an array. (erorcode, errormsg). When errorcode=0, means no error.
 =cut
diff --git a/xCAT-vlan/xCAT_plugin/vlan.pm b/xCAT-vlan/xCAT_plugin/vlan.pm
index 040f3b08b..ea09d397b 100755
--- a/xCAT-vlan/xCAT_plugin/vlan.pm
+++ b/xCAT-vlan/xCAT_plugin/vlan.pm
@@ -964,7 +964,7 @@ sub add_postscript {
 =head3  add_vlan_ip_host
 
   It goes to the hosts.otherinterfaces to see if the vlan ip and hostname
-  is defined. If not, it will add the default in the table. 
+  is defined. If not, it will add the default in the table.
   The default is v<vlanid>n<node#>
 
 =cut
@@ -1042,7 +1042,7 @@ sub add_vlan_ip_host {
 =head3 get_prefix_and_nodenumber
 
   It gets the prefix and max node number from the current nodes
-  in the given vlan. 
+  in the given vlan.
 
 =cut
 
@@ -1128,7 +1128,7 @@ sub get_prefix_and_nodenumber {
 =head3  remove_vlan_ip_host
 
   It goes to the hosts.otherinterfaces to see if the vlan ip and hostname
-  is defined. If it is, it will remove it. It also remove the entried in 
+  is defined. If it is, it will remove it. It also remove the entried in
   the /etc/hosts file
 
 =cut
@@ -1181,7 +1181,7 @@ sub remove_vlan_ip_host {
 
 =head3  verify_vlanid
 
-  It goes to all the switches to make sure that the vlan 
+  It goes to all the switches to make sure that the vlan
   id is not used by other vlans.
 =cut
 
@@ -1225,7 +1225,7 @@ sub verify_vlanid {
 
   It automatically generates the vlan ID. It goes to all the
   switches, get the smallest common integer that is not used
-  by any existing vlans. 
+  by any existing vlans.
 =cut
 
 #-------------------------------------------------------
@@ -1321,9 +1321,9 @@ sub verify_switch_ports {
 
 =head3  create_vlan
 
-  It goes to the switches and create a new vlan. 
+  It goes to the switches and create a new vlan.
   Returns:  1 -- suggessful
-            0 -- fail 
+            0 -- fail
 =cut
 
 #-------------------------------------------------------
@@ -1374,7 +1374,7 @@ sub create_vlan {
 
   It adds the ports to the vlan.
   Returns:  1 -- suggessful
-            0 -- fail 
+            0 -- fail
 =cut
 
 #-------------------------------------------------------
@@ -1410,7 +1410,7 @@ sub add_ports {
 
   It enables the vlan on the cross-over links.
   Returns:  1 -- suggessful
-            0 -- fail 
+            0 -- fail
 =cut
 
 #-------------------------------------------------------
@@ -1456,7 +1456,7 @@ sub add_crossover_ports {
 
   It goes to the switches and create a new vlan.
   Returns:  1 -- suggessful
-            0 -- fail 
+            0 -- fail
 =cut
 
 #-------------------------------------------------------
@@ -1501,9 +1501,9 @@ sub remove_ports {
 
 =head3   get_subnet
 
-  It gets the subnet address and netmask for the given 
+  It gets the subnet address and netmask for the given
   vlan ID. The pattern is defined by "vlannets" and "vlanmask"
-  on the site table.  The default is "10.<$vlanid>.0.0"/"255.255.0.0". 
+  on the site table.  The default is "10.<$vlanid>.0.0"/"255.255.0.0".
 =cut
 
 #-------------------------------------------------------
@@ -2401,7 +2401,7 @@ sub process_rmvlan {
 =head3  remove_postscript
 
     It removes configvlan postscripts from the postscripts table for the node
-    Note: if configvlan is in xcatdefaults, it will not get removed becase 
+    Note: if configvlan is in xcatdefaults, it will not get removed becase
        it may affect other vlans
 
 =cut
@@ -2654,9 +2654,9 @@ sub lsvlan_usage {
 #-------------------------------------------------------
 
 =head3  getNodeVlanConfData
-   This function is called by Postage.pm to collect all the 
-   environmental variables for setting up a vlan for a given 
-   node.  
+   This function is called by Postage.pm to collect all the
+   environmental variables for setting up a vlan for a given
+   node.
 =cut
 
 #-------------------------------------------------------
diff --git a/xCAT-vlan/xCAT_plugin/vlan/BNTSwitch.pm b/xCAT-vlan/xCAT_plugin/vlan/BNTSwitch.pm
index 755575f1b..be17c838c 100755
--- a/xCAT-vlan/xCAT_plugin/vlan/BNTSwitch.pm
+++ b/xCAT-vlan/xCAT_plugin/vlan/BNTSwitch.pm
@@ -118,13 +118,13 @@ my %HexConv = (0 => 0x80, 1 => 0x40, 2 => 0x20, 3 => 0x10,
 
 #--------------------------------------------------------------
 
-=head3 filter_string 
-  
+=head3 filter_string
+
     Every switch plugin must implement this subroutine.
 
-    The return value will be used comare against the string 
+    The return value will be used comare against the string
     from sysDescr value from snmpget. If the latter contains
-    this string, then this mudule will be used to handle the 
+    this string, then this mudule will be used to handle the
     requests for vlan configuration.
 
 =cut
@@ -137,8 +137,8 @@ sub filter_string {
 
 #--------------------------------------------------------------
 
-=head3 get_vlan_ids  
-  
+=head3 get_vlan_ids
+
   Every switch plugin must implement this subroutine.
 
   It gets the existing vlan IDs for the switch.
@@ -166,8 +166,8 @@ sub get_vlan_ids {
 
 #--------------------------------------------------------------
 
-=head3 get_vlanids_for_ports 
-  
+=head3 get_vlanids_for_ports
+
     Every switch plugin must implement this subroutine.
 
     It returns a hash pointer that contains the vlan id for each given port.
@@ -249,9 +249,9 @@ sub get_vlanids_for_ports {
 #--------------------------------------------------------------
 
 =head3 create_vlan
-  
+
     Every switch plugin must implement this subroutine.
- 
+
     Creates a new vlan on the switch
     Returns an array. (erorcode, errormsg). When errorcode=0, means no error.
 =cut
@@ -293,7 +293,7 @@ sub create_vlan {
 
 #--------------------------------------------------------------
 
-=head3 add_ports_to_vlan   
+=head3 add_ports_to_vlan
 
     Every switch plugin must implement this subroutine.
 
@@ -498,7 +498,7 @@ sub add_crossover_ports_to_vlan {
 
 #--------------------------------------------------------------
 
-=head3 remove_vlan   
+=head3 remove_vlan
 
     Every switch plugin must implement this subroutine.
 
@@ -529,7 +529,7 @@ sub remove_vlan {
 
 #--------------------------------------------------------------
 
-=head3 remove_ports_from_vlan  
+=head3 remove_ports_from_vlan
 
     Every switch plugin must implement this subroutine.
 
diff --git a/xCAT-vlan/xCAT_plugin/vlan/CiscoSwitch.pm b/xCAT-vlan/xCAT_plugin/vlan/CiscoSwitch.pm
index 370f04370..f674f29d6 100755
--- a/xCAT-vlan/xCAT_plugin/vlan/CiscoSwitch.pm
+++ b/xCAT-vlan/xCAT_plugin/vlan/CiscoSwitch.pm
@@ -46,13 +46,13 @@ my %HexConv = (0 => 0x80, 1 => 0x40, 2 => 0x20, 3 => 0x10,
 
 #--------------------------------------------------------------
 
-=head3 filter_string 
-  
+=head3 filter_string
+
     Every switch plugin must implement this subroutine.
 
-    The return value will be used comare against the string 
+    The return value will be used comare against the string
     from sysDescr value from snmpget. If the latter contains
-    this string, then this mudule will be used to handle the 
+    this string, then this mudule will be used to handle the
     requests for vlan configuration.
 
 =cut
@@ -64,8 +64,8 @@ sub filter_string {
 
 #--------------------------------------------------------------
 
-=head3 get_vlan_ids  
-  
+=head3 get_vlan_ids
+
   Every switch plugin must implement this subroutine.
 
   It gets the existing vlan IDs for the switch.
@@ -90,8 +90,8 @@ sub get_vlan_ids {
 
 #--------------------------------------------------------------
 
-=head3 get_vlanids_for_ports 
-  
+=head3 get_vlanids_for_ports
+
     Every switch plugin must implement this subroutine.
 
     It returns a hash pointer that contains the vlan ids for each given port.
@@ -161,9 +161,9 @@ sub get_vlanids_for_ports {
 #--------------------------------------------------------------
 
 =head3 create_vlan
-  
+
     Every switch plugin must implement this subroutine.
- 
+
     Creates a new vlan on the switch
     Returns an array. (erorcode, errormsg). When errorcode=0, means no error.
 =cut
@@ -252,7 +252,7 @@ sub create_vlan {
 
 #--------------------------------------------------------------
 
-=head3 add_ports_to_vlan   
+=head3 add_ports_to_vlan
 
     Every switch plugin must implement this subroutine.
 
@@ -497,7 +497,7 @@ sub add_crossover_ports_to_vlan {
 
 #--------------------------------------------------------------
 
-=head3 remove_vlan   
+=head3 remove_vlan
 
     Every switch plugin must implement this subroutine.
 
@@ -582,7 +582,7 @@ sub remove_vlan {
 
 #--------------------------------------------------------------
 
-=head3 remove_ports_from_vlan  
+=head3 remove_ports_from_vlan
 
     Every switch plugin must implement this subroutine.
 
diff --git a/xCAT/debian/copyright b/xCAT/debian/copyright
index f61d34dfe..87e60f492 100644
--- a/xCAT/debian/copyright
+++ b/xCAT/debian/copyright
@@ -85,4 +85,4 @@ Everyone is permitted to copy and distribute copies of this Agreement, but in or
 
 This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
 
- 
+
diff --git a/xCAT/postscripts/HPCbootstatus.linux b/xCAT/postscripts/HPCbootstatus.linux
index f67c51741..abab492ad 100644
--- a/xCAT/postscripts/HPCbootstatus.linux
+++ b/xCAT/postscripts/HPCbootstatus.linux
@@ -1,4 +1,4 @@
-#!/bin/sh 
+#!/bin/sh
 
 #
 # Sample postscript to check appstatus for GPFS,LAPI and LoadL on Linux system.
@@ -59,7 +59,7 @@ while [ true ]; do
 
 	# Query gpfs-filesystem
 	fs=`/bin/mount |grep "type gpfs"|awk '{print $3}'|tr '\n' '!'`
-    if [ "$fs" != "" ]; then        
+    if [ "$fs" != "" ]; then
         # Sent message to xcatd
         updateflag.awk $MASTER 3002 "hpcbootstatus gpfs-filesystem=$fs"
         echo "HPCbootstatus.linux: Reporting gpfs-filesystem=$fs to xcatd on $MASTER!"
@@ -68,17 +68,17 @@ while [ true ]; do
 
 	# Query lapi-pnsd
 	lapi=`/usr/bin/lssrc -s pnsd |/usr/bin/awk '(NR==2){print $3}'`
-    if [ "$lapi" != "" ]; then        
+    if [ "$lapi" != "" ]; then
         # Sent message to xcatd
         updateflag.awk $MASTER 3002 "hpcbootstatus lapi-pnsd=$lapi"
         echo "HPCbootstatus.linux: Reporting lapi-pnsd=$lapi to xcatd on $MASTER!"
         let COUNT=$COUNT+1
     fi
-    
+
 	# Query loadl-schedd
 	hn=`hostname| tr '[A-Z]' '[a-z]'`
 	llsc=`/usr/bin/llrstatus -h $hn -r %sca %scs`
-    if [ "$llsc" != "" ]; then        
+    if [ "$llsc" != "" ]; then
         # Sent message to xcatd
         updateflag.awk $MASTER 3002 "hpcbootstatus loadl-schedd=$llsc"
         echo "HPCbootstatus.linux: Reporting loadl-schedd=$llsc to xcatd on $MASTER!"
@@ -87,7 +87,7 @@ while [ true ]; do
 	
 	# Query loadl-startd
 	llst=`/usr/bin/llrstatus -h $hn -r %sta %sts`
-    if [ "$llst" != "" ]; then        
+    if [ "$llst" != "" ]; then
         # Sent message to xcatd
         updateflag.awk $MASTER 3002 "hpcbootstatus loadl-startd=$llst"
         echo "HPCbootstatus.linux: Reporting loadl-startd=$llst to xcatd on $MASTER!"
@@ -104,7 +104,7 @@ while [ true ]; do
 
     let PASSED=$PASSED+$INTERVAL
     sleep $INTERVAL
-    echo "HPCbootstatus.linux: passed $PASSED" 
+    echo "HPCbootstatus.linux: passed $PASSED"
 	
 done
 
diff --git a/xCAT/postscripts/addcudakey b/xCAT/postscripts/addcudakey
index 2ab69f2ba..010d513be 100755
--- a/xCAT/postscripts/addcudakey
+++ b/xCAT/postscripts/addcudakey
@@ -4,7 +4,7 @@
 if [ -r /xcatpost/cudakey ]; then
     GPGKEY=`cat /xcatpost/cudakey`
 else
-    GPGKEY="-----BEGIN PGP PUBLIC KEY BLOCK-----                
+    GPGKEY="-----BEGIN PGP PUBLIC KEY BLOCK-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
 mQGiBFFoeGMRBACjjvkdqqBafo0msmm9251rB7ocN4Es4cCq6O/8eOVoPx8fFrAK
diff --git a/xCAT/postscripts/addsiteyum b/xCAT/postscripts/addsiteyum
index c8b5fb1ed..69e11ee69 100755
--- a/xCAT/postscripts/addsiteyum
+++ b/xCAT/postscripts/addsiteyum
@@ -18,7 +18,7 @@ do
        TMP=`sed -e '/enabled/d' /etc/yum.repos.d/CentOS-Base.repo | sed -e '/^gpgkey/i enabled=0'`
        echo "$TMP" > /etc/yum.repos.d/CentOS-Base.repo
    fi
-   
+
 done
 
 exit 0
diff --git a/xCAT/postscripts/aixlitesetup b/xCAT/postscripts/aixlitesetup
index 88c009adf..1d9e7a332 100644
--- a/xCAT/postscripts/aixlitesetup
+++ b/xCAT/postscripts/aixlitesetup
@@ -4,13 +4,13 @@
 ################################################################################
 #
 #	aixlitesetup
-#		- This script is used to configure the xCAT statelite support 
+#		- This script is used to configure the xCAT statelite support
 #			for AIX
 #
 ###############################################################################
 
 SL="/.statelite"
-ROOTDIR="/"  
+ROOTDIR="/"
 MOUNTDIR="$SL/mnt"   # where I mount all the trees.
 PERSISTENT="$SL/persistent"
 TMPDIR="$SL/tmpdir"
@@ -66,7 +66,7 @@ ProcessStatelite () {
 		if [ ! -d ${PERSISTENT} ]; then
 		    echo "mkdir -m 755 -p ${PERSISTENT}" >>$LOG
 			mkdir -m 755 -p ${PERSISTENT} 2>&1 >>$LOG
-		fi 
+		fi
 
 		# mount 10.2.0.200:/nodedata /.statelite/persistent
 		echo "/usr/sbin/mount ${MNTOPTS} $SERVER:$TOMNT ${PERSISTENT}" >>$LOG
@@ -230,7 +230,7 @@ MountTrees () {
 
 		# ex. 10.2.0.200:/etc/ /.statelite/mnt/10.2.0.200/etc/
 		echo "/usr/sbin/mount ${MOPTS} $SERV:$DIR ${MOUNTDIR}/${SERV}${DIR}" >>$LOG
-        while ! /usr/sbin/mount ${MOPTS} $SERV:$DIR ${MOUNTDIR}/${SERV}${DIR} 
+        while ! /usr/sbin/mount ${MOPTS} $SERV:$DIR ${MOUNTDIR}/${SERV}${DIR}
         do
             if [ "$TRIES" = "$MAX" ]
             then
@@ -255,7 +255,7 @@ ProcessType () {
 
     PPATH=`/usr/bin/dirname ${2}` # ex. /etc
 	
-	case "${3}" in 
+	case "${3}" in
 		rw)
 			# item is mounted from litetree dir or .default location ($1)
 			#	onto local file
@@ -264,12 +264,12 @@ ProcessType () {
 			LOCAL=`echo ${2} |  /usr/bin/sed -e 's/\/$//'`
 
             if [ -d ${1} ]; then
-				# if it's a dir 
+				# if it's a dir
 				if [ ! -e ${LOCAL} ]; then
 					/usr/bin/mkdir -m 755 -p ${LOCAL}
 				fi
             else
-				# if file 
+				# if file
 				if [ ! -e ${LOCAL} ]; then
 					FDIR=`/usr/bin/dirname ${2}`
                     /usr/bin/mkdir -m 755 -p ${FDIR}
@@ -290,7 +290,7 @@ ProcessType () {
         persistent)
 			# the item is copied to the /.statelite/persistent subdir
 			#  from wherever it is found ( $1 above )
-			#	the /.statelite/persistent/blah is then mounted 
+			#	the /.statelite/persistent/blah is then mounted
 			#	over the local /blah
 			# ex. /.statelite/persistent/compute02/etc
             if [ ! -d ${PERSISTENT}/${ME}${PPATH} ]; then
@@ -385,7 +385,7 @@ FindFile () {
     isChild=$3
 	FOUND=0
 
-	# this assumes the dir are already in priority order in the 
+	# this assumes the dir are already in priority order in the
 	#	/litetree.table file
 	for i in `/usr/bin/cat $LITETREE | /usr/bin/grep -v '^#' | /usr/bin/grep $ME`
     do
@@ -432,8 +432,8 @@ FindFile () {
 
 # mount the persistent dir - if provided
 ProcessStatelite
- 
-# mount all the dirs from the litetree table. 
+
+# mount all the dirs from the litetree table.
 MountTrees
 
 # process the litefile table
diff --git a/xCAT/postscripts/aixremoteshell b/xCAT/postscripts/aixremoteshell
index c0a6baffe..1ba88e18c 100755
--- a/xCAT/postscripts/aixremoteshell
+++ b/xCAT/postscripts/aixremoteshell
@@ -6,11 +6,11 @@
 
 #-----------------------------------------------------------------------------
 
-=head1   aixremoteshell 
+=head1   aixremoteshell
 
    This sets up the remote shell for root on the AIX node,such that root can
    login with no password. The default is /bin/rsh and
-   /bin/rcp but can be overriden by setting the useSSHonAIX attribute in the 
+   /bin/rcp but can be overriden by setting the useSSHonAIX attribute in the
    site table to yes, in which case we will use ssh/scp.
    The aixremoteshell postscripts will be called from remoteshell postscript
    when on an AIX node.  It will input a -d ( for do)  flag, to indicate to run
diff --git a/xCAT/postscripts/aixvgsetup b/xCAT/postscripts/aixvgsetup
index 7ee973cf9..7260508bd 100755
--- a/xCAT/postscripts/aixvgsetup
+++ b/xCAT/postscripts/aixvgsetup
@@ -6,19 +6,19 @@
 #	aixvgsetup
 #
 #   This sample script may be used to setup up disk mirroring on an
-#	AIX diskfull node. 
+#	AIX diskfull node.
 #
 #	It assumes that rootvg is currently on hdisk0 and that the mirror will
-#	be stored on hdisk1.  You can change the disk names to suit your 
+#	be stored on hdisk1.  You can change the disk names to suit your
 #	environment.
 #
-#	Add this script as a postscript to be run during the initial installation 
-#	of an AIX diskfull (standalone) installation. 
+#	Add this script as a postscript to be run during the initial installation
+#	of an AIX diskfull (standalone) installation.
 #---------------------------------------------------------------------------
 
 # extend the root volume group with the new disk(s)
 cmd="/usr/sbin/extendvg -f rootvg hdisk1"
-result=`$cmd 2>/dev/null` 
+result=`$cmd 2>/dev/null`
 rc=$?
 if [ $rc -ne 0 ]; then
 	logger -t xcat -p local4.err  "Could not run $cmd, error = $rc"
@@ -47,7 +47,7 @@ if [ $rc -ne 0 ]; then
 fi
 
 # set the bootlist
-cmd="/usr/bin/bootlist -m normal hdisk0 hdisk1" 
+cmd="/usr/bin/bootlist -m normal hdisk0 hdisk1"
 result=`$cmd 2>/dev/null`
 rc=$?
 if [ $rc -ne 0 ]; then
diff --git a/xCAT/postscripts/allowcred.awk b/xCAT/postscripts/allowcred.awk
index 6693f1dd9..5b911e28a 100755
--- a/xCAT/postscripts/allowcred.awk
+++ b/xCAT/postscripts/allowcred.awk
@@ -3,7 +3,7 @@ BEGIN {
         listener = "/inet/tcp/300/0/0"
         quit = "no"
 
-       print $0 
+       print $0
        while (match(quit,"no")) {
          while ((listener |& getline) > 0) {
                  if (match($0,"CREDOKBYYOU?")) {
diff --git a/xCAT/postscripts/check_mlnx_firmware b/xCAT/postscripts/check_mlnx_firmware
index 5b7241b93..560c11436 100755
--- a/xCAT/postscripts/check_mlnx_firmware
+++ b/xCAT/postscripts/check_mlnx_firmware
@@ -5,19 +5,19 @@
 #
 #
 BINARIES="ofed_info mst ibdev2netdev"
-for PROG in ${BINARIES}; do 
+for PROG in ${BINARIES}; do
     RC=`command -v ${PROG} >> /dev/nul 2>&1; echo $?`
     if [[ ${RC} != 0 ]]; then
         echo "${PROG} is not installed on this node, unable to check firmware levels."
         exit 1
-    fi 
+    fi
 done
 
 MELLANOX_SOFTWARE=`ofed_info -s | cut -d: -f1`
 echo "Mellanox Software: $MELLANOX_SOFTWARE"
 
 
-mst start >> /dev/null 
+mst start >> /dev/null
 if [[ $? != 0 ]]; then
    echo "Error:  Could not start mst, cannot check adapter firmware level."
    exit 1
diff --git a/xCAT/postscripts/chef-client b/xCAT/postscripts/chef-client
index 8485aa837..b248ffe6d 100755
--- a/xCAT/postscripts/chef-client
+++ b/xCAT/postscripts/chef-client
@@ -3,8 +3,8 @@
 #This script will invoke the config_chef_client directly.
 #If the chef-server and chef-client are installed successfully at first,
 #and then on the chef-server node configure the software for the chef-client nodes.
-#We can run 
-#  updatenode  <chef-client-nodes>  chef-client 
+#We can run
+#  updatenode  <chef-client-nodes>  chef-client
 #To configure the softare on the chef-client node.
 
 ./config_chef_client
diff --git a/xCAT/postscripts/cleanup_nvm.sh b/xCAT/postscripts/cleanup_nvm.sh
index 20bda8351..fef4ec61c 100755
--- a/xCAT/postscripts/cleanup_nvm.sh
+++ b/xCAT/postscripts/cleanup_nvm.sh
@@ -8,7 +8,7 @@
 #cleanup_nvm.sh
 # It is found that in some case, there will be nvram entries wrote that block
 #     the normal booting for Tuleta server running OPAL mode and OpenPOWER server.
-# This script is used to clean up the nvram entries within host OS, can be run as 
+# This script is used to clean up the nvram entries within host OS, can be run as
 #     a postscript for xCAT.
 #
 #-----------------------------------------------------------------------------
@@ -20,7 +20,7 @@ while true; do
 
     if [ $? -ne 0 ]; then
         if [ $tries -gt 0 ]; then
-            echo "The nvram cleaning up is done" 
+            echo "The nvram cleaning up is done"
         else
             echo "No nvram entry found that is releated to petitboot"
         fi
diff --git a/xCAT/postscripts/confGang b/xCAT/postscripts/confGang
index bfa4a97d8..13ce7cfe4 100755
--- a/xCAT/postscripts/confGang
+++ b/xCAT/postscripts/confGang
@@ -28,7 +28,7 @@ MASTER=$ms_ip
 #echo "I will replace now....
 gmond_conf="/etc/ganglia/gmond.conf"
 gmond_conf_old="/etc/gmond.conf"
- 
+
     if [ $OS == "AIX" ]; then
       echo "into AIX loop"
       logger -t xcat  -p local4.info  "into AIX loop"
@@ -48,7 +48,7 @@ gmond_conf_old="/etc/gmond.conf"
            echo "# xCAT gmond settings done sh" >> $gmond_conf_old
          fi
        fi
-    fi   
+    fi
 
 
     if [ $OS == "AIX" ]; then
@@ -93,7 +93,7 @@ gmond_conf_old="/etc/gmond.conf"
          fi
        fi
      fi
- 
+
 
  if [ $OS != "AIX" ]; then
        echo "not AIX"
@@ -110,11 +110,11 @@ gmond_conf_old="/etc/gmond.conf"
            sed -i 's/mcast_join/#/g' $gmond_conf_old
            sed -i 's/bind/#/g' $gmond_conf_old
            echo "# xCAT gmond settings done sh_old" >> $gmond_conf_old
-         fi 
+         fi
     fi
 fi
 
-     if [ ! -f  $gmond_conf ]; then 
+     if [ ! -f  $gmond_conf ]; then
        #  echo "file not found"
           logger -t xcat  -p local4.warning "gmond configuration file not found"
      fi
@@ -124,4 +124,4 @@ fi
           logger -t xcat -p local4.warning "gmond configuration file not found"
      fi
 
-exit 0 
+exit 0
diff --git a/xCAT/postscripts/config_chef_client b/xCAT/postscripts/config_chef_client
index 60dacd811..8e8cc3c98 100755
--- a/xCAT/postscripts/config_chef_client
+++ b/xCAT/postscripts/config_chef_client
@@ -5,7 +5,7 @@
 #-------------------------------------------------------------------------------
 #=head1  config_chef_client
 #=head2  This command configures the chef client on a xCAT node.
-#        It is used by install_chef_client on Ubuntu and chef kit on RH. 
+#        It is used by install_chef_client on Ubuntu and chef kit on RH.
 #=cut
 #-------------------------------------------------------------------------------
 
diff --git a/xCAT/postscripts/config_chef_server b/xCAT/postscripts/config_chef_server
index d3abdc077..69b13ca55 100755
--- a/xCAT/postscripts/config_chef_server
+++ b/xCAT/postscripts/config_chef_server
@@ -1,4 +1,4 @@
-#!/bin/bash  
+#!/bin/bash
 # IBM(c) 2013 EPL license http://www.eclipse.org/legal/epl-v10.html
 
 
@@ -14,7 +14,7 @@ fi
 #=head2  This command configures the chef server on a xCAT node.
 #        It is used by install_chef_client on Ubuntu and chef kit on RH.
 #        It also can be used postscripts on diskless
-#    usage:  
+#    usage:
 #      1. configure the chef server using updatenode
 #            updatenode <noderange> -P "config_chef_server"
 #      2. configure chef server during os provisioning
@@ -35,8 +35,8 @@ fi
 # for ubuntu
 if [ -e "/etc/lsb-release" ]
 then
-    apt-get install nfs-kernel-server portmap nfs-common  -y 
-    
+    apt-get install nfs-kernel-server portmap nfs-common  -y
+
     grep "/etc/chef-server" /etc/exports
     if [ $? -ne 0 ]
     then
@@ -60,6 +60,6 @@ then
         echo $errmsg
         exit 1
     fi
-fi    
+fi
 
 exit 0;
diff --git a/xCAT/postscripts/config_puppet_client b/xCAT/postscripts/config_puppet_client
index 5442f2e98..168a99ed4 100755
--- a/xCAT/postscripts/config_puppet_client
+++ b/xCAT/postscripts/config_puppet_client
@@ -4,7 +4,7 @@
 
 #-------------------------------------------------------------------------------
 #=head1  config_puppet_client
-#=head2  This command configure the puppet client on a xCAT node. 
+#=head2  This command configure the puppet client on a xCAT node.
 #        It is used by install_puppet_client on Ubuntu and puppet kit on RH.
 #=cut
 #-------------------------------------------------------------------------------
@@ -13,10 +13,10 @@ echo "Configuring pupper client....."
 #check if the current node is also a puppet master
 ismaster=0
 if [ -f /etc/puppet/fileserver.conf ]; then
-   ismaster=1 
+   ismaster=1
 fi
 
-#configure the puppet.conf file. 
+#configure the puppet.conf file.
 #the pupper server can be passed as an argument or as an environmental variable
 #the default is $SITEMASTER
 ARGNUM=$#;
@@ -79,7 +79,7 @@ else
     echo "  pluginsync = true" >> $confname
     echo "  server = $puppet_server" >> $confname
     echo "# xcat-added-agent-section-end-here #" >> $confname
-fi    
+fi
 
 exit 0
 
diff --git a/xCAT/postscripts/config_puppet_server b/xCAT/postscripts/config_puppet_server
index d0e01fd7e..eb91514eb 100755
--- a/xCAT/postscripts/config_puppet_server
+++ b/xCAT/postscripts/config_puppet_server
@@ -22,26 +22,26 @@ else
     xcatroot="/opt/xcat"
 fi
 
-#use site.puppetserver or site.master as the puppet server certname 
-if [ -n "$PUPPETSERVER" ]; then 
+#use site.puppetserver or site.master as the puppet server certname
+if [ -n "$PUPPETSERVER" ]; then
     node=$PUPPETSERVER
-else 
-    tmp=`XCATBYPASS=Y $xcatroot/bin/lsdef -t site clustersite  2>&1 |grep "puppetserver="` 
+else
+    tmp=`XCATBYPASS=Y $xcatroot/bin/lsdef -t site clustersite  2>&1 |grep "puppetserver="`
     if [ $? -eq 0 ]; then
 	node=`echo $tmp|cut -d= -f2`
     fi
-fi    
+fi
 if [ -z "$node" ]; then
-    if [ -n "$SITEMASTER" ]; then 
+    if [ -n "$SITEMASTER" ]; then
 	node=$SITEMASTER
-    else 
+    else
 	tmp=`XCATBYPASS=Y $xcatroot/bin/lsdef -t site clustersite  2>&1 |grep "master="`
 	if [ $? -eq 0 ]; then
 	    node=`echo $tmp|cut -d= -f2`
 	fi
     fi
 fi
-if [ -z "$node" ]; then    
+if [ -z "$node" ]; then
     if [ -n "$NODE" ]; then
 	node=$NODE
     else
@@ -76,7 +76,7 @@ fi
 sed -i "/\[main\]/ a\
     certname = $node" $confname
 sed -i "/\[main\]/ a\
-    server = $node" $confname    
+    server = $node" $confname
 
 #create a site manifest site.pp on the master:
 cat > /etc/puppet/manifests/site.pp << EOT
diff --git a/xCAT/postscripts/configbond b/xCAT/postscripts/configbond
index f2567193a..659561d32 100755
--- a/xCAT/postscripts/configbond
+++ b/xCAT/postscripts/configbond
@@ -5,16 +5,16 @@
 # configbond bondname nic1@nic2@... [opt1@opt2@...]
 #
 # Description:
-#   This script is used to configure bond interface base on the arguments from the 
+#   This script is used to configure bond interface base on the arguments from the
 #   command line and the network information from nics and networks tables.
 #
 #   This script will create bond interface named <bondname> with 'nic1','nic2'... as slave
 #   devices. The bonding options 'opt1','opt2'... will be configured to bond interface.
-#   
+#
 #   The network information for the bond interface will be gotten from the nics.nicsip and
-#   nics.nicnetworks for interface <bondname>. If cannot get for <bondname>, try to 
+#   nics.nicnetworks for interface <bondname>. If cannot get for <bondname>, try to
 #   search for nic1. If failed too, then nic2 ...
-#   
+#
 #   It only supports to configure one bond device at each run. If you want to create
 #   multiple bond devices, call it multiple times.
 #
@@ -22,13 +22,13 @@
 #   This script only works for IPv4 so far.
 
 
-# Following are examples of variables which are exported from mypostscript. Mostly, we need the nics and 
+# Following are examples of variables which are exported from mypostscript. Mostly, we need the nics and
 # networks related varirables which are exported from xcat nics and networks tables.
 #   NICIPS=bond0!10.0.0.12
 #   NICTYPES=bond0!Ethernet
 #   NICHOSTNAMESUFFIXES=bond0!-bond0
 #   NICNETWORKS=bond0!10_0_0_0-255_255_255_0
-#   NICCUSTOMSCRIPTS=bond0!configbond 
+#   NICCUSTOMSCRIPTS=bond0!configbond
 #   NETWORKS_LINES=2
 #   NETWORKS_LINE1=netname=10_0_0_0-255_255_255_0||net=10.0.0.0||mask=255.255.255.0||mgtifname=eth1||gateway=<xcatmaster>||dhcpserver=||tftpserver=10.0.0.10||nameservers=||ntpservers=||logservers=||dynamicrange=||staticrange=||staticrangeincrement=||nodehostname=||ddnsdomain=||vlanid=||domain=||mtu=||disable=||comments=
 #   NETWORKS_LINE2=netname=10_0_2_0-255_255_255_0||net=10.0.2.0||mask=255.255.255.0||mgtifname=eth0||gateway=10.0.2.2||dhcpserver=||tftpserver=10.0.2.15||nameservers=||ntpservers=||logservers=||dynamicrange=||staticrange=||staticrangeincrement=||nodehostname=||ddnsdomain=||vlanid=||domain=||mtu=||disable=||comments=
@@ -51,7 +51,7 @@ function showmsg() {
     else
         $(logger -t xcat -p local4.info $msg)
     fi
-    
+
     echo $msg
 }
 
@@ -74,7 +74,7 @@ if [ "$str_os_type" = "linux" ];then
     fi
 else
     showmsg "Does NOT support non-Linux Operating System" "error"
-    exit -1 
+    exit -1
 fi
 
 
@@ -164,7 +164,7 @@ while [ $num_i -le $NETWORKS_LINES ];do
     str_temp_net=${str_temp_net%%|*}             # remove the right part from first '|'
     str_temp_mask=${str_bond_network#*mask=}    # remove the left part from 'mask='
     str_temp_mask=${str_temp_mask%%|*}             # remove the right part from first '|'
-    
+
     str_temp_net1=$(v4calcnet $str_bond_ip $str_temp_mask)
     str_temp_net2=$(v4calcnet $str_temp_net $str_temp_mask)
     if [ "$str_temp_net1" = "$str_temp_net2" ];then
diff --git a/xCAT/postscripts/configefi b/xCAT/postscripts/configefi
index 2473d9c0b..71359173f 100644
--- a/xCAT/postscripts/configefi
+++ b/xCAT/postscripts/configefi
@@ -20,20 +20,20 @@ if [ "$arch" =  "x86_64" ]; then
                 #support for redhat 7.0
                 elif [ -f "/boot/efi/EFI/redhat/grubx64.efi" ];then
                         efibootmgr -c -l \\EFI\\redhat\\grubx64.efi -L syscloneLinux
-                        
+
                         boot_root=`mount | grep -E ' on\s+/ type ' | awk '{print $1}'`
-                        sed -i 's| root=\S*| root='$boot_root' net.ifnames=0|' /boot/efi/EFI/redhat/grub.cfg 
-      
+                        sed -i 's| root=\S*| root='$boot_root' net.ifnames=0|' /boot/efi/EFI/redhat/grub.cfg
+
                         blkid -c /dev/null |grep UUID|while read str_line
                         do
                                 partition=`echo "$str_line"|grep UUID|awk '{print $1}'|sed -e 's|/dev/\(.*\):|\1|g'`
                                 #echo "partition=$partition"
-  
+
                                 if echo "$partition"|grep /; then
                                     continue
                                 fi
- 
-                                newuuid=`blkid -c /dev/null|grep "$partition"|sed -e 's|.*UUID="\(.*\)" T.*|\1|g'`    
+
+                                newuuid=`blkid -c /dev/null|grep "$partition"|sed -e 's|.*UUID="\(.*\)" T.*|\1|g'`
                                 #echo "newuuid=$newuuid"
                                 sed -i '/'$partition'/s|UUID=\S*|UUID='$newuuid'|' /etc/fstab
                         done
@@ -117,7 +117,7 @@ elif [ "$arch" = "ppc64" ]; then
        echo "Using /usr/lib/yaboot/yaboot"
        echo "dd if=/usr/lib/yaboot/yaboot of=/dev/sda1 bs=4096"
        dd if=/usr/lib/yaboot/yaboot of=/dev/sda1 bs=4096
-      
+
        # Set 0x41 as the partition type of the first partition
        # echo A | dd of=/dev/sda bs=1 count=1 seek=450
     elif [ -f "/lib/lilo/pmac/yaboot" ]; then
@@ -151,7 +151,7 @@ elif [ "$arch" = "ppc64" ]; then
        done
     else
        echo "Can not find boot loader"
-    fi     
+    fi
 else
     echo "[ERROR]: unsupport arch....."
 fi	
diff --git a/xCAT/postscripts/configeth b/xCAT/postscripts/configeth
index d4f528a11..c56996770 100755
--- a/xCAT/postscripts/configeth
+++ b/xCAT/postscripts/configeth
@@ -1,4 +1,4 @@
-#!/bin/bash  
+#!/bin/bash
 # IBM(c) 2014 EPL license http://www.eclipse.org/legal/epl-v10.html
 # Internal script used by confignics only.
 # It configs the Ethernet adpaters on the node
@@ -9,6 +9,15 @@ if [ "$(uname -s|tr 'A-Z' 'a-z')" = "linux" ];then
    . $str_dir_name/nicutils.sh
 fi
 error_code=0
+#########################################################################
+# ifdown/ifup will not be executed in diskful provision postscripts stage
+#########################################################################
+reboot_nic_bool=1
+if [ -z "$UPDATENODE" ] || [ $UPDATENODE -ne 1 ] ; then
+    if [ "$NODESETSTATE" = "install" ] && ! grep "REBOOT=TRUE" /opt/xcat/xcatinfo >/dev/null 2>&1; then
+        reboot_nic_bool=0
+    fi
+fi
 function configipv4(){
     str_if_name=$1
     str_v4ip=$2
@@ -22,7 +31,7 @@ function configipv4(){
     if [ "$str_extra_params" != "$str_default_token" ]; then
 		parse_nic_extra_params "$str_extra_params"
     fi	
-    
+
     if [ "$str_os_type" = "sles" ];then
         str_conf_file="/etc/sysconfig/network/ifcfg-${str_if_name}"
         if [ $num_v4num -eq 0 ];then
@@ -36,7 +45,7 @@ function configipv4(){
             echo "_nm_name=static-0" >> $str_conf_file
             if [ "$str_nic_mtu" != "$str_default_token" ]; then
                 echo "MTU=${str_nic_mtu}" >> $str_conf_file
-            fi  
+            fi
 			#add extra params
 			i=0
 			while [ $i -lt ${#array_extra_param_names[@]} ]
@@ -84,7 +93,7 @@ function configipv4(){
         echo "  netmask ${str_v4mask}" >> $str_conf_file
         echo "  network ${str_v4net}" >> $str_conf_file
         if [ "$str_nic_mtu" != "$str_default_token" ]; then
-            echo "  mtu ${str_nic_mtu}" >> $str_conf_file    
+            echo "  mtu ${str_nic_mtu}" >> $str_conf_file
         fi
 		#add extra params
 		i=0
@@ -175,7 +184,7 @@ configipv6(){
             if [ $? -ne 0 ];then
                 echo "default $str_v6gateway - -" >> /etc/sysconfig/network/routes
             fi
-        fi 
+        fi
 
         #add extra params
 		i=0
@@ -301,7 +310,7 @@ function add_ip_temporary(){
             fi
             ip addr add ${str_ip}/${str_mask} dev $str_temp_name
         #ipv4
-        else 
+        else
             str_label=''
             ip addr show dev $str_temp_name | grep inet | grep "global" | grep -v ':' | grep "${str_temp_name}"
             if [ $? -eq 0 ];then
@@ -400,7 +409,7 @@ if [ "$1" = "-r" ];then
         log_info "configeth on $NODE run command: chdev -l $str_nic_name -a netaddr='' -a netmask='' -a netaddr6='' -a prefixlen='' -a state=down"
         chdev -l $str_nic_name -a netaddr='' -a netmask='' -a netaddr6='' -a prefixlen='' -a state=down
     else
-        #shut down the nic if it is on 
+        #shut down the nic if it is on
         ip link show $str_nic_name | grep -i ',up'
         if [ $? -eq 0 ];then
             if [ "$str_os_type" = "debian" ];then
@@ -436,15 +445,15 @@ elif [ "$1" = "-s" ];then
             str_inst_mask=`grep subnet-mask $str_lease_file | tail -n 1 | awk '{print $3}' | sed 's/;$//'`
             str_inst_gateway=`grep routers $str_lease_file | tail -n 1 | awk '{print $3}' | sed 's/;$//'`
         else
-            if [ -n "$MACADDRESS" ];then       
+            if [ -n "$MACADDRESS" ];then
                 str_inst_mac=$MACADDRESS
                 inst_nic=`ip -o link |grep -i ${str_inst_mac} |awk '{print $2}'|sed 's/://g'`
                 if [ ! -z "${inst_nic}" ];then
                     str_inst_ip=`ip -4 -o addr|grep -i ${inst_nic} |awk '{print $4}'|awk -F/ '{print $1}'`
                     if [ ! -z "$str_inst_ip" ];then
-                        inst_ip_pre=`ip ro ls|grep -i ${str_inst_ip}|awk '{print $1}'|awk -F/ '{print $1}'`
-                        if [ ! -z "$inst_ip_pre" ];then
-                            str_inst_mask=`route |grep ^${inst_ip_pre}|awk '{print $3}'|head -1`
+                        inst_prefix=`ip ro ls|grep -i ${str_inst_ip}|awk '{print $1}'|awk -F/ '{print $2}'`
+                        if [ ! -z "$inst_prefix" ];then
+                            str_inst_mask=`v4prefix2mask $inst_prefix`
                         fi
                     fi
                 fi
@@ -464,9 +473,9 @@ elif [ "$1" = "-s" ];then
                 if [ ! -z "${inst_nic}" ];then
                     str_inst_ip=`ip -4 -o addr|grep -i ${inst_nic} |awk '{print $4}'|awk -F/ '{print $1}'`
                     if [ ! -z "$str_inst_ip" ];then
-                        inst_ip_pre=`ip ro ls|grep -i ${str_inst_ip}|awk '{print $1}'|awk -F/ '{print $1}'`
-                        if [ ! -z "$inst_ip_pre" ];then
-                            str_inst_mask=`route |grep ^${inst_ip_pre}|awk '{print $3}'|head -1`
+                        inst_prefix=`ip ro ls|grep -i ${str_inst_ip}|awk '{print $1}'|awk -F/ '{print $2}'`
+                        if [ ! -z "$inst_prefix" ];then
+                            str_inst_mask=`v4prefix2mask $inst_prefix`
                         fi
                     fi
                 fi
@@ -500,7 +509,7 @@ elif [ "$1" = "-s" ];then
     if [ -n "$IPADDR" ];then
         str_inst_ip=$IPADDR
     fi
-    
+
     if [ -n "$MACADDRESS" ];then
         str_inst_mac=$MACADDRESS
     else
@@ -532,7 +541,7 @@ elif [ "$1" = "-s" ];then
 	if [ ${#array_nic_params[@]} -gt 0 ]; then
 		str_extra_params=${array_nic_params[0]}
 		parse_nic_extra_params "$str_extra_params"
-	fi 
+	fi
 
     # cofniguring the interface
 
@@ -641,8 +650,13 @@ elif [ "$1" = "-s" ];then
     fi
 
     if [ "$UPDATENODE" = "1" ] || grep "REBOOT=TRUE" /opt/xcat/xcatinfo >/dev/null 2>&1; then
-        ifdown $str_inst_nic;ifup $str_inst_nic
-    fi 
+        if [ "$str_os_type" = "debian" ];then
+            ifdown --force $str_inst_nic
+        else
+            ifdown $str_inst_nic
+        fi
+        ifup $str_inst_nic
+    fi
     if [ $? -ne 0 ]; then
         log_error "ifup $str_inst_nic failed."
         error_code=1
@@ -733,7 +747,7 @@ while [ $num_index -lt ${#array_nic_ips[*]} ];do
         continue
     fi
 
-    #find out the network definition 
+    #find out the network definition
     str_line=${array_nic_network_config[$num_index]}
     if [ ! $str_line ];then
         logger -t xcat -p local4.err "configeth: Network object $str_netname is not defined."
@@ -747,8 +761,8 @@ while [ $num_index -lt ${#array_nic_ips[*]} ];do
     str_subnet=`echo $str_line | awk -F'net=' '{print $2}' | awk -F'|' '{print $1}'`
     str_netmask=`echo $str_line | awk -F'mask=' '{print $2}' | awk -F'|' '{print $1}' | sed 's:^/::'`
     str_gateway=`echo $str_line | awk -F'gateway=' '{print $2}' | awk -F'|' '{print $1}'`
-    str_mtu=`echo $str_line | awk -F'mtu=' '{print $2}' | awk -F'|' '{print $1}'`   
- 
+    str_mtu=`echo $str_line | awk -F'mtu=' '{print $2}' | awk -F'|' '{print $1}'`
+
     if [ ! $str_subnet -o ! $str_netmask ];then
         logger -t xcat -p local4.err "configeth: subnet or netmask is not defined in network object $str_netname."
         log_error "configeth on $NODE: subnet or netmask is not defined in network object $str_netname."
@@ -823,7 +837,7 @@ if [ "$str_os_type" = "aix" ];then
             echo "configeth on $NODE: delete undefined ipv6 address $str_old_ip"
         fi
     fi
-    
+
     #check the ipv4 alias
     str_history=`lsattr -El $str_nic_name | grep alias4 | awk '{print $2}' | grep '\.'`
     if [ $? -eq 0 ];then
@@ -839,7 +853,7 @@ if [ "$str_os_type" = "aix" ];then
                 hashset hash_new_config $str_old_ip "old"
             else
                 chdev -l $str_nic_name -a delalias4=$str_temp
-                
+
             fi
         done
     fi
@@ -877,7 +891,7 @@ if [ "$str_os_type" = "aix" ];then
             add_ip_temporary $str_new_ip $str_nic_name
         fi
     done
-    
+
     #change the nic status to up
     chdev -l $str_nic_name -a state=up
     if [ $? -ne 0 ]; then
@@ -978,7 +992,9 @@ else
                 if [ "$str_os_type" = "debian" ];then
                     ifdown --force $str_nic_name > /dev/null
                 else
-                    ifdown $str_nic_name > /dev/null
+                    if [ $reboot_nic_bool -eq 1 ]; then
+                        ifdown $str_nic_name > /dev/null
+                    fi
                 fi
             fi
             #delete all old ip address
@@ -1057,11 +1073,13 @@ else
                 error_code=1
             fi
         else
-            echo "bring up ip"
-            ifup $str_nic_name
-            if [ $? -ne 0 ]; then
-                log_error "ifup $str_nic_name failed."
-                error_code=1
+            if [ $reboot_nic_bool -eq 1 ]; then
+                echo "bring up ip"
+                ifup $str_nic_name
+                if [ $? -ne 0 ]; then
+                    log_error "ifup $str_nic_name failed."
+                    error_code=1
+                fi
             fi
         fi
     fi
diff --git a/xCAT/postscripts/confighfi b/xCAT/postscripts/confighfi
index 87d0c447f..e0fc7db96 100644
--- a/xCAT/postscripts/confighfi
+++ b/xCAT/postscripts/confighfi
@@ -6,7 +6,7 @@
 # This scripts works for both diskfull installs, diskless boots on AIX or Linux.
 # Input:
 #   IP address: Each hfi interface should be assigned its hostname and IP address.
-#               hostname should be resolable from either /etc/hosts or name 
+#               hostname should be resolable from either /etc/hosts or name
 #               resolution, with format: <nodename>-hfx
 #   netmask: Netmask is hardcoded in this script.  You have to manually modify it
 #            if it doesn't meet your requirement.
@@ -16,8 +16,8 @@ NETMASK=255.0.0.0
 
 RETURNVAL=0
 
-# bond-mld binary is shipped seperately, admin should adjust the following PATH 
-# to where bond-mld binary is. 
+# bond-mld binary is shipped seperately, admin should adjust the following PATH
+# to where bond-mld binary is.
 PATH=$PATH:/usr/local/sbin/
 export PATH
 
@@ -88,7 +88,7 @@ ONBOOT=yes
         rmmod bonding
     fi
 
-    modprobe bonding mode=multi-link miimon=100 xmit_hash_policy=layer3+4 
+    modprobe bonding mode=multi-link miimon=100 xmit_hash_policy=layer3+4
 
     CLIENT_IP=`ping -c 3 $name-bond0 -I bond0 2>/dev/null | grep "data" | sed 's/.* (\([0-9.]*\)).*/\1/' | uniq 2>&1`
     if [ -n "$CLIENT_IP" ]
@@ -180,7 +180,7 @@ else
 
         chdev -l ml0 -a state=detach
 
-        # Reconfig ml0 since HFx are configured after ml0 is available 
+        # Reconfig ml0 since HFx are configured after ml0 is available
         rmdev -l mlt0
         mkdev -l mlt0
 
diff --git a/xCAT/postscripts/configib b/xCAT/postscripts/configib
index d21046d66..0deac3f8d 100755
--- a/xCAT/postscripts/configib
+++ b/xCAT/postscripts/configib
@@ -1,4 +1,4 @@
-#!/bin/bash 
+#!/bin/bash
 # IBM(c) 2013 EPL license http://www.eclipse.org/legal/epl-v10.html
 # Internal script used by confignics only
 # xCAT post script for configuring ib adapters.
@@ -7,7 +7,7 @@
 # NIC_IBNICS=ib0,ib1
 # NIC_IBAPORTS=1 (or 2)
 # OSVER=sles11.1
-# NICNODE=dxm360m4n04 
+# NICNODE=dxm360m4n04
 # NICIPS='eth0!10.1.34.242,ib1!15.0.1.242,ib2!15.0.2.242'
 # NICHOSTNAMESUFFIXES='eth1!-eth1,ib1!-ib1,ib2!-ib2'
 # NICTYPES='eth1!ethernet,ib1!infiniband,ib2!infiniband'
@@ -60,7 +60,7 @@ convert_netmask_to_cidr() {
     IFS=$OLDIFS
     echo $cidrnum
 }
- 
+
 
 
 #if $NIC_IBNICS is not defined, all ib nics' configuration files will be deleted.
@@ -71,7 +71,7 @@ fi
 
 #find correct IB driver
 PLTFRM=`uname`
-if [[ $OSVER == rhels5*  || "$OSVER" == rhels6* || "$OSVER" == ubuntu14* ]] 
+if [[ $OSVER == rhels5*  || "$OSVER" == rhels6* || "$OSVER" == ubuntu14* ]]
 then
     ib_driver="rdma"
     #/sbin/service $ib_driver status
@@ -89,7 +89,7 @@ then
             logger -p local4.info -t xcat "Not found the driver dameon: rdma or openibd"
             exit
         fi
-    fi   
+    fi
 else
     ib_driver="openibd"
 fi
@@ -102,7 +102,7 @@ then
     then
         md5f1=$(md5sum /etc/rdma/rdma.conf |cut -d' ' -f1)
         TMP1=`sed "s/SDP_LOAD=yes/SDP_LOAD=no/g" /etc/rdma/rdma.conf`
-	echo "$TMP1" > /etc/rdma/rdma.conf 
+	echo "$TMP1" > /etc/rdma/rdma.conf
         md5f2=$(md5sum /etc/rdma/rdma.conf |cut -d' ' -f1)
         if [ "$md5f2" != "$md5f1" ]; then
             restart_ib_driver=1
@@ -135,7 +135,7 @@ then
     #/sbin/chkconfig --level 2345 $ib_driver on > /dev/null 2>&1
     enableservice $ib_driver > /dev/null 2>&1
     #/sbin/service $ib_driver restart
-    #restartservice $ib_driver 
+    #restartservice $ib_driver
     sysctl -p > /dev/null 2>&1
 fi
 
@@ -149,7 +149,7 @@ then
     then
         OS_name="suse"
     elif [ -f /etc/os-release ] && cat /etc/os-release |grep NAME|grep Ubuntu>/dev/null
-	then 
+	then
         OS_name="ubuntu"
     else
         echo "Unsupported to config IB on this OS!"
@@ -157,7 +157,7 @@ then
         exit
     fi
 	
-    if [ $OS_name != 'ubuntu' ]; then  
+    if [ $OS_name != 'ubuntu' ]; then
         if [ $OS_name == 'suse' ]
         then
             dir="/etc/sysconfig/network"
@@ -172,20 +172,20 @@ then
             rm -f $dir/ifcfg-$nic 2>&1 1>/dev/null
         done
 
-        else  
+        else
             interfaces="/etc/network/interfaces"
 
             for tmp  in `sed -n "/auto ib/=" ${interfaces}`
-            do 
+            do
                 startline=`sed -n "/auto ib/=" ${interfaces}|  head -n 1`
                 endline=`sed -n "$startline,/^auto/p" ${interfaces} |wc -l`
-    
+
                 if sed -n "$startline,/^auto/p" ${interfaces} |sed '$!d' |grep "auto" >/dev/null;then
                     endline=`expr $startline + $endline - 2`
                 else
                     endline=`expr $startline + $endline - 1`
                 fi
-    
+
                 ((startline--))
                 temp=`sed -n ${startline}p ${interfaces}`
                 while [[ $temp =~ ^# ]]
@@ -194,7 +194,7 @@ then
                     temp=`sed -n ${startline}p ${interfaces}`
                 done
     		    ((startline++))
-    
+
                 temp=`sed -n ${endline}p ${interfaces}`
                 while [[ $temp =~ ^# ]]
                 do
@@ -210,7 +210,7 @@ else
     num=0
     while [ $num -lt $loop_number ]
     do
-	 if [ "$portnum" == "2" ]; then 
+	 if [ "$portnum" == "2" ]; then
              num0=`expr $num \* 2`
              num1=`expr $num0 + 1`
              `rmdev -d -l ib$num0 >/dev/null 2>&1`
@@ -228,8 +228,8 @@ else
              num=`expr $num + 1`
 	 fi
     done
-    
-    `rmdev -dl icm >/dev/null 2>&1`  
+
+    `rmdev -dl icm >/dev/null 2>&1`
 
     #restart the managers
     mkdev -c management -s infiniband -t icm
@@ -240,8 +240,8 @@ fi
 
 goodnics=""
 for nic in `echo "$NIC_IBNICS" | tr "," "\n"`
-do 
-    #Get nic ips 
+do
+    #Get nic ips
     nicips=""
     for tmp in `echo "$NICIPS" | tr "," "\n"`
     do
@@ -253,7 +253,7 @@ do
         fi
     done
    # echo "nic=$nic, nicip=$nicip"
-    
+
    #get nic networks name
    nicnets=""
    for tmp in `echo "$NICNETWORKS" | tr "," "\n"`
@@ -266,12 +266,12 @@ do
        fi
    done
    #echo "nic=$nic, nicnet=$nicnet"
-   
+
    if [ -z "$nicnets" ]; then
        echo "No network defined for $nic"
        logger -p local4.info -t xcat "No network defined for $nic"
        continue
-   fi   
+   fi
 
    unset array_nic_params
    unset array_extra_param_names
@@ -310,22 +310,22 @@ do
                            break;
                        fi
                    ;;
-                  net)  
+                  net)
                       net=`echo "$tmp" | awk -F"=" '{print $2}'`
                   ;;
-                  mask) 
+                  mask)
                        netmask=`echo "$tmp" | awk -F"=" '{print $2}'`
                        # remove the prefix "/" from ipv6 mask
                        if echo $netmask | grep "/" 2>&1 1>/dev/null
                        then
                            netmask=`echo $netmask | awk -F'/' '{print $2}'`
                        fi
-                  ;; 
-                  gateway) 
+                  ;;
+                  gateway)
                        gateway=`echo "$tmp" | awk -F"=" '{print $2}'`
                        found=1
                   ;;
-                 esac 
+                 esac
                  if [ $found -eq 1 ]; then
                     break;
                  fi
@@ -360,12 +360,12 @@ do
 	   if [ ${#array_nic_params[@]} -gt 0 ]; then
 		   str_extra_params=${array_nic_params[$ipindex-1]}
 		   parse_nic_extra_params "$str_extra_params"
-	   fi 
+	   fi
 
        if [ $PLTFRM == "Linux" ]
        then
            # Issue openibd for Linux at boot time
-       
+
            if [ -f /etc/sysctl.conf ]
            then
                TMP1=`sed "/net.ipv4.conf.$nic.arp_filter=1/d" /etc/sysctl.conf`
@@ -385,10 +385,10 @@ do
                    echo "net.ipv4.conf.$nic.arp_ignore=1" >> /etc/sysctl.conf
                fi
            fi
-           
+
            if [ $OS_name == 'suse' ]
            then
-               # First ip address 
+               # First ip address
                if [ $ipindex -eq 1 ]
                then
                    # Write the info to the ifcfg file
@@ -452,7 +452,7 @@ IPADDR_$ipindex=$nicip" >> $dir/ifcfg-$nic
                 fi # end if [ $ipindex -eq 1 ]
             elif [ $OS_name == 'redhat' ]
             then
-               # First ip address 
+               # First ip address
                if [ $ipindex -eq 1 ]
                then
                    # Write the info to the ifcfg file
@@ -544,7 +544,7 @@ IPADDR=$nicip" > $dir/ifcfg-$nic:$ipindex
                 fi # end not the first ip address
             elif [ $OS_name == 'ubuntu' ]
             then
-                # First ip address 
+                # First ip address
                 if [ $ipindex -eq 1 ]; then
                     # ipv6
                     if echo $nicip | grep : 2>&1 1>/dev/null
@@ -558,7 +558,7 @@ netmask $netmask" >> /etc/network/interfaces
                             echo "gateway $gateway" >> /etc/network/interfaces
                         fi
                     # ipv4		
-                    else  
+                    else
                         # Write the info to the ifcfg file
                         echo "auto $nic
 iface $nic inet static
@@ -569,7 +569,7 @@ netmask $netmask" >> /etc/network/interfaces
                         #    echo "gateway $gateway" >> /etc/network/interfaces
                         #fi
                     fi
-                else   # Not the first ip address 
+                else   # Not the first ip address
                     # ipv6
                     if echo $nicip | grep : 2>&1 1>/dev/null
                     then
@@ -620,14 +620,14 @@ netmask $netmask" >> /etc/network/interfaces
                logger -p local4.info -t xcat "$mltnum is not available."
                continue
            fi
-       
+
            #Check whether the ml0 is available
            lsdev -C | grep $nic 2>&1 >/dev/null
            if [ $? -ne 0 ]
            then
                cfgmgr 2>&1 >/dev/null
            fi
-       
+
            chdev -l $nic -a state=detach 2>&1
            chdev -l $nic -a netaddr=$nicip -a netmask=$netmask -a state=up 2>&1
            else #assume it is ib*
@@ -644,10 +644,10 @@ netmask $netmask" >> /etc/network/interfaces
                #        fi
                #    fi
                # fi
-       
+
                #Configure the IB interfaces.  Customize the port num.
                num=${nic##ib}   #this assumes that all the nics starts with 'ib'
-               if [ "$portnum" == "1" ]; then 
+               if [ "$portnum" == "1" ]; then
                    iba_num=$num
                    ib_adapter="iba$iba_num"
                    port=1
@@ -684,23 +684,23 @@ then
             restartservice $ib_driver
     fi
     for nic in `echo "$goodnics" | tr "," "\n"|sort -u`
-    do     
+    do
         sleep 5
         if [[ "$OSVER" == rhels6* ]]
         then
             ip link set dev $nic up
-        else 
+        else
             if [[ "$OSVER" == ubuntu14* ]]
             then
                 interfaces="/etc/network/interfaces"
                 for tmp in `cat $interfaces |grep "auto ib" |sort -u|awk '{print $2}'`
-                do 
+                do
                     ifdown $tmp  > /dev/null 2>&1
                     sleep 2
                     ifup   $tmp > /dev/null 2>&1
                 done
-            else 
-                ifup $nic > /dev/null 2>&1   
+            else
+                ifup $nic > /dev/null 2>&1
             fi
         fi
     done
diff --git a/xCAT/postscripts/configinterface b/xCAT/postscripts/configinterface
index 25e465d5e..cc75ea143 100755
--- a/xCAT/postscripts/configinterface
+++ b/xCAT/postscripts/configinterface
@@ -71,6 +71,6 @@ fi
 if [ $UPDATED -eq 1 ]; then
     systemctl enable switchd
     systemctl start switchd
-    ifreload -a 
+    ifreload -a
 fi
 
diff --git a/xCAT/postscripts/confignetwork b/xCAT/postscripts/confignetwork
index 4e57753b3..51f316aee 100755
--- a/xCAT/postscripts/confignetwork
+++ b/xCAT/postscripts/confignetwork
@@ -1,4 +1,4 @@
-#!/bin/bash 
+#!/bin/bash
 #-------------------------------------------------------------------------------
 #  confignetwork
 #      Configure Ethernet nic/bond/vlan/bridge/ on the nodes
@@ -14,14 +14,14 @@
 #
 ############################################################################
 
-# load library 
+# load library
 str_os_type=`uname -s`
 if [ x"$str_os_type" = "xLinux" ];then
     str_dir_name="${0%/*}"
     . $str_dir_name/xcatlib.sh
     . $str_dir_name/nicutils.sh
 else
-    log_error "Does NOT support non-Linux Operating System." 
+    log_error "Does NOT support non-Linux Operating System."
     exit 1
 fi
 
@@ -59,7 +59,7 @@ function get_nic_cfg_file_content {
     cfg_dev=$1
     cfg_file=''
     if [ $is_redhat -eq 1 ] || [ $is_sles -eq 1 ]; then
-         cfg_file="$nwdir/ifcfg-${cfg_dev}" 
+         cfg_file="$nwdir/ifcfg-${cfg_dev}"
     elif [ $is_debian -eq 1 ]; then
          cfg_file="$nwdir/${cfg_dev}"
     fi
@@ -182,7 +182,7 @@ function find_nic_type {
     if [ ! "$1" ];then
         return
     fi
-    nic=$1 
+    nic=$1
     echo $(hashget "nictypes" $nic)
 }
 
@@ -304,7 +304,7 @@ function sort_nics_device_order {
     num=1
     alone_nics=`echo "$all_nics_list"|awk '{if(0<NF&&NF<2) print $0}'`
     nics_list=`echo "$all_nics_list"|awk '{if(NF>1) print $0}'`
- 
+
     #find stand alone nic
     num1=1
     max1=`echo "$alone_nics"|wc -l`
@@ -332,7 +332,7 @@ function sort_nics_device_order {
                 elif [ x"$alonenictype" = "xvlan" ] || [ x"$alonenictype" = "xbond" ]; then
                     echo "Error: should configure nicdevices for $alonenic."
                     errorcode=1
-                     
+
                 else
                     echo $alonenic
                 fi
@@ -352,10 +352,10 @@ function sort_nics_device_order {
     #get all ib nics, format is ib0,ib1,...
     if [ -n "$ib_slots" ]; then
         echo "$ib_slots"
-    fi   
- 
+    fi
+
     if [ -n "$nics_list" ]; then
-      if [ $is_redhat -eq 1 ]; then  
+      if [ $is_redhat -eq 1 ]; then
         num=1
         max=`echo "$nics_list"|wc -l`
         ((max+=1))
@@ -389,7 +389,7 @@ function sort_nics_device_order {
             #valid nic_dev and base_nic_dev pair as  bond-ethernet or vlan-ethernet or bridge-ethernet
             if [ x"$base_nic_type" = "xethernet" ]&& \
                [ x"$nic_dev_type" = "xbond" -o x"$nic_dev_type" = "xvlan" -o x"$nic_dev_type" = "xbridge" -o x"$nic_dev_type" = "xbridge_ovs" ]; then
-            
+
                 if [ x"$eth_slot" = x ]; then
                     eth_slot=$num
                 else
@@ -444,7 +444,7 @@ function sort_nics_device_order {
             echo "$nics_list" |sed -n "${i}p"
         done`
     fi
-    echo "$new_order_list" 
+    echo "$new_order_list"
 }
 
 #####################################################################################
@@ -457,7 +457,7 @@ function sort_nics_device_order {
 ###################################################################################
 function configure_nicdevice {
     nics_pair=$*
-    #configure nic and its device pair one by one   
+    #configure nic and its device pair one by one
     num=1
     max=`echo "$nics_pair"|wc -l`
     base_temp_nic=""
@@ -514,7 +514,7 @@ function configure_nicdevice {
             else
                 base_temp_nic=$base_nic_dev
             fi
-        
+
             base_nic_type=`find_nic_type "$base_temp_nic" | $utolcmd`
         fi
         #if there is ib nics
@@ -531,7 +531,7 @@ function configure_nicdevice {
 
         #configure standalone ethernet nic
         elif [ x"$nic_dev_type" = "xethernet" ]; then
-            xcatnet=`query_nicnetworks_net $nic_dev`            
+            xcatnet=`query_nicnetworks_net $nic_dev`
             ipaddrs=`find_nic_ips $nic_dev`
             if [ -n "$ipaddrs" ]; then
                 log_info "configure $nic_dev"
@@ -549,7 +549,7 @@ function configure_nicdevice {
             if [ $noip -eq $max ]; then
                 log_error "There is no any ip configured for any nic. Check nicips in nics table first."
                 errorcode=1
-            fi 
+            fi
 
         #configure bridge
         #linux bridge type is bridge
@@ -561,7 +561,7 @@ function configure_nicdevice {
             else
                create_bridge_interface ifname=$nic_dev _brtype=$nic_dev_type _port=$base_nic_dev _pretype=$base_nic_type
             fi
-        #configure vlan 
+        #configure vlan
         elif [ x"$nic_dev_type" = "xvlan" ]; then
             if echo "$nic_dev" | grep -sq ".*\.[0-9]\+"; then
                 vlanid=`echo "$nic_dev" | $cut -s -d. -f2-`
@@ -572,9 +572,9 @@ function configure_nicdevice {
             fi
             create_vlan_interface ifname=$vlanname vlanid=$vlanid
 
-        #configure bond 
+        #configure bond
         elif [ x"$nic_dev_type" = "xbond" ]; then
-            create_bond_interface ifname=$nic_dev slave_ports=$base_nic_for_bond slave_type=$base_nic_type 
+            create_bond_interface ifname=$nic_dev slave_ports=$base_nic_for_bond slave_type=$base_nic_type
         elif [ x"$nic_dev_type" = "xinfiniband" ]; then
             log_info "Call configib for IB nics: $nic_dev, ports: $num_iba_ports"
             log_info "NIC_IBNICS=$nic_dev NIC_IBAPORTS=$num_iba_ports configib"
@@ -586,7 +586,7 @@ function configure_nicdevice {
         else
             log_error "Check the NIC data in the 'nics' table."
             errorcode=1
-        fi 
+        fi
 
         ((num+=1))
     done
@@ -609,7 +609,7 @@ function enable_network_service {
         startservice network
     else
         log_info "NetworkManager is inactive."
-    fi 
+    fi
 
 }
 
@@ -632,7 +632,7 @@ if [ $boot_install_nic -eq 1 ];then
         echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
         log_info "configure the install nic $installnic. "
         instnic_conf=1
-        configeth -s $installnic 
+        configeth -s $installnic
         if [ $? -ne 0 ]; then
             errorcode=1
         fi
@@ -670,7 +670,7 @@ parser_nic_attribute "$NICCUSTOMSCRIPTS" "niccustomscripts"
 new_nicdevice=`find_nic_and_device_list $str_all_nics|sort -g -k1 -g -k2|uniq`
 if [ -z "$new_nicdevice" ]; then
     log_info "There is no other nic device to configure."
-    exit $errorcode  
+    exit $errorcode
 fi
 
 #sort nics device pair based on nicdevice type
@@ -691,7 +691,7 @@ fi
 
 #delete invalid nics device pair based on Error
 valid_sorted_nicdevice_list=`echo "$sorted_nicdevice_list" | sed '/Error/d' | sed '/unused/d'`
-if [ -n "$valid_sorted_nicdevice_list" ]; then 
+if [ -n "$valid_sorted_nicdevice_list" ]; then
     log_info "All valid nics and device list:"
     echo "$valid_sorted_nicdevice_list" |log_lines info
 fi
diff --git a/xCAT/postscripts/confignics b/xCAT/postscripts/confignics
index 96a452ab4..f5b6a228a 100755
--- a/xCAT/postscripts/confignics
+++ b/xCAT/postscripts/confignics
@@ -1,4 +1,4 @@
-#!/bin/bash 
+#!/bin/bash
 # IBM(c) 2014 EPL license http://www.eclipse.org/legal/epl-v10.html
 
 #-------------------------------------------------------------------------------
@@ -19,7 +19,7 @@ if [ "$(uname -s|tr 'A-Z' 'a-z')" = "linux" ];then
    . $str_dir_name/xcatlib.sh
 fi
 error_code=0
-#the nics' information contain: 
+#the nics' information contain:
 #1. ip address
 #2. nic network
 #3. nic type
@@ -48,7 +48,7 @@ function splitconfig(){
         fi
         key=`echo "$token" | cut -d"$D" -f 1`
         str_temp_value=`echo "$token" | cut -d"$D" -f 2`
-        
+
         str_temp=$(hashget hash_defined_nics $key)
         if [ -n "$str_temp" ];then
            str_temp=$str_temp",${str_temp_value}"
@@ -100,7 +100,7 @@ function findnetwork(){
         fi
         num_i=$((num_i+1))
     done
-    
+
     echo "Error: Can not find the corresponding network defination for ip address: $str_ip ."
     error_code=1
 }
@@ -201,7 +201,7 @@ if [ "$str_temp" = "mac" ];then
             fi
         done
     else
-       str_inst_nic=`ip -o link | grep -i "$MACADDRESS" | awk '{print $2;}' | sed s/://` 
+       str_inst_nic=`ip -o link | grep -i "$MACADDRESS" | awk '{print $2;}' | sed s/://`
     fi
 elif [ `echo $str_temp | grep -E "e(n|th|m)[0-9a-zA-Z]+"` ];then
     str_inst_nic=$str_temp
@@ -264,11 +264,11 @@ if [ $bool_remove -eq 1 ];then
         if [ -n "$str_temp" ];then
             continue
         fi
-        
+
         if [ "$str_temp_nic" = "$str_inst_nic" ];then
             continue
         fi
-        
+
         #ignore the vlan interface
         echo $str_temp_nic | grep "\."
         if [ $? -eq 0 ];then
@@ -305,7 +305,7 @@ do
             # don't run customized script for installnic if not specify the -s
             continue
         fi
-        logger -t xcat -p local4.info "confignics: processing custom scripts: ${array_temp[1]} for interface $key" 
+        logger -t xcat -p local4.info "confignics: processing custom scripts: ${array_temp[1]} for interface $key"
         echo "confignics on $NODE: processing custom scripts: ${array_temp[1]} for interface $key"
         ${array_temp[1]}
     else
diff --git a/xCAT/postscripts/confignimsh b/xCAT/postscripts/confignimsh
index bae5dc534..9043db920 100755
--- a/xCAT/postscripts/confignimsh
+++ b/xCAT/postscripts/confignimsh
@@ -7,16 +7,16 @@
 =head1   confignimsh
 
 	This sample customization script can be used to automatically configure
-	the NIM nimsh (NIM service handler).  It will also configure NIMSH to 
+	the NIM nimsh (NIM service handler).  It will also configure NIMSH to
 	use OpenSSL in the NIM environment.
 
-	It assumes that the openssl software has already been installed on the 
+	It assumes that the openssl software has already been installed on the
 	node.
 
-	This script also assumes that you have run "nimconfig -c" on the NIM 
-	master for the nodes.  
+	This script also assumes that you have run "nimconfig -c" on the NIM
+	master for the nodes.
 
-	This script should only be run on AIX standalone (diskfull) cluster compute 
+	This script should only be run on AIX standalone (diskfull) cluster compute
 	nodes. It should NOT be run on the xCAT management node, service nodes or
 	diskless nodes.
 
diff --git a/xCAT/postscripts/createFS b/xCAT/postscripts/createFS
index b593f2798..f3dc84fcf 100644
--- a/xCAT/postscripts/createFS
+++ b/xCAT/postscripts/createFS
@@ -1,15 +1,15 @@
 #!/bin/sh
 #set -x
 #-----------------------------------------------------------------------------
-#  createFS 
+#  createFS
 #
 # This script is used to create new FS on xCAT Service Node to hold the nim
 # resources. Currently it support AIX system, will support Linux later.
 #
-# By default, the new FS is created as 5G based on rootvg. But it can be 
+# By default, the new FS is created as 5G based on rootvg. But it can be
 # customized, the options are compatible with AIX crfs command.
 #
-# If we need to create multiple file systems, then we need to call "create_FS" 
+# If we need to create multiple file systems, then we need to call "create_FS"
 # multiple times at the bottom of this script, passing it different parameters.
 #
 # For example:
@@ -22,13 +22,13 @@
 #-----------------------------------------------------------------------------
 
 # For AIX system
-# MountPiont, VfsType, VolumeGroup, harddisks, AutoMount, Attributes 
+# MountPiont, VfsType, VolumeGroup, harddisks, AutoMount, Attributes
 FS1="/install,jfs2,rootvg,,yes,size=5G"
 #FS2="/install,jfs2,datavg,hdisk2 hdisk3,yes,size=5G frag=512 nbpi=1024"
 
 # To-DO
 # For Linux system
-# MountPiont, VfsType, fs-options 
+# MountPiont, VfsType, fs-options
 
 #-----------------------------------------------------------------------------
 create_FS(){
@@ -59,7 +59,7 @@ create_FS_AIX(){
     hd=$4
     mnt=$5
     attrs=$6
-    
+
     unset IFS
 
     echo "MountPiont: $mp, VfsType: $vfs, VolumeGroup: $vg, harddisks: $hd, AutoMount: $mnt, Attributes: $attrs"
@@ -83,7 +83,7 @@ create_FS_AIX(){
                 # harddisk provided
                 # check if hardisk is the same with current ones
                 old_hd=`lsvg -p $vg|grep 'hd'|awk '{print $1}'|tr "\n" " "`
-                
+
                 if [ "$old_hd" = "$hd" ]; then
                     # use the existed vg
                     tocr_fs=1
@@ -147,7 +147,7 @@ create_FS_AIX(){
             echo "Back up $mp to $tmp_mp"
             bakup=1
         fi
-        
+
         # create fs
         cmd="crfs"
         if [ "$vfs" != "" ]; then
@@ -169,7 +169,7 @@ create_FS_AIX(){
         if [ "$attrs" != "" ]; then
             cmd="$cmd -a $attrs"
         fi
-        
+
         echo "Running command: $cmd"
         result=`$cmd`
         if [ $? -ne 0 ]; then
@@ -182,11 +182,11 @@ create_FS_AIX(){
             echo "Can not mount file system $mp"
             exit 1
         fi
-        
+
         # restore /install to FS
         if [ "$bakup" = "1" ]; then
             echo "Restore $tmp_mp to new FS $mp"
-            
+
             result=`cd $tmp_mp;find . -print | cpio -pdlvu $mp`
             if [ $? -ne 0 ]; then
                 echo "Can not restore $tmp_install to file system $mp"
@@ -198,7 +198,7 @@ create_FS_AIX(){
                 echo "Can not remove $tmp_mp"
                 exit 1
             fi
-        fi    
+        fi
     fi
 }
 
diff --git a/xCAT/postscripts/cuda_power9_setup b/xCAT/postscripts/cuda_power9_setup
index 977cf1520..23a9f8aa7 100755
--- a/xCAT/postscripts/cuda_power9_setup
+++ b/xCAT/postscripts/cuda_power9_setup
@@ -29,7 +29,7 @@ fi
 
 echo 'options nvidia NVreg_EnableStreamMemOPs=1 NVreg_RegistryDwords="PeerMappingOverride=1"' >${IMG_ROOTIMGDIR}/usr/lib/modprobe.d/nvidia.conf
 
-if [ -z "${IMG_ROOTIMGDIR}" ] 
+if [ -z "${IMG_ROOTIMGDIR}" ]
 then
 	kernel_version="$(for d in $(ls /lib/modules | sort -V) ; do : ; done && echo $d)"
 	mkinitrd -v -f "/boot/initramfs-${kernel_version}.img" "${kernel_version}"
diff --git a/xCAT/postscripts/cumulusztp b/xCAT/postscripts/cumulusztp
index 20534f7cc..e9f7a8e6c 100755
--- a/xCAT/postscripts/cumulusztp
+++ b/xCAT/postscripts/cumulusztp
@@ -1,24 +1,41 @@
 #!/bin/bash
 #this script will be invoked by ZTP(zero touch provision) process in the onie switch
 #this script finish the discovery and configuration after the switch is pluged in the cluster and powered on
-
 function error() {
   echo -e "\e[0;33mERROR: The Zero Touch Provisioning script failed while running the command $BASH_COMMAND at line $BASH_LINENO.\e[0m" >&2
   exit 1
 }
- 
+
 # Log all output from this script
 exec >/var/log/autoprovision 2>&1
- 
+
 #trap error ERR
- 
+
 #Add Debian Repositories
 #since in most cases, the switch has no internet access, skip this step
 #echo "deb http://http.us.debian.org/debian jessie main" >> /etc/apt/sources.list
 #echo "deb http://security.debian.org/ jessie/updates main" >> /etc/apt/sources.list
 
+# $1 - The name of the network interface
+function get_last_lease()
+{
+    local ifname="$1"
+    local lease=""
+    while read -r
+    do
+        if [[ $REPLY =~ ^lease ]]
+        then
+            lease="$REPLY"$'\n'
+        else
+            lease+="$REPLY"$'\n'
+        fi
+    done <"/var/lib/dhcp/dhclient.${ifname}.leases" 2>/dev/null
+    echo "${lease}"
+}
+
 #get ip address for server node
-server_ip=`grep cumulus-provision-url /var/lib/dhcp/dhclient.eth0.leases | tail -1 | awk -F/ '{print $3}'`
+server_ip="$(grep 'cumulus-provision-url' < <(get_last_lease eth0) | awk -F/ '{print $3}')"
+hashostname="$(grep 'host-name' < <(get_last_lease eth0))"
 
 #download /install/postscripts from MN
 max_retries=5
@@ -30,7 +47,7 @@ while [ 0 -eq 0 ]; do
     if [ -e "/xcatpost" ]; then
         rm -rf "/xcatpost"
     fi
-    
+
     export LANG=C; wget -l inf -nH -N -r --waitretry=10 --random-wait -e robots=off -T 60 -nH --cut-dirs=2 --reject "index.html*" --no-parent http://$server_ip/install/postscripts/ -P /xcatpost 2> /tmp/wget.log
     rc=$?
     if [ $rc -eq 0 ]; then
@@ -72,37 +89,45 @@ chmod -R +x `find /xcatpost/ -maxdepth 1 -print | grep -E -v '^(/xcatpost/|/xcat
 cd /xcatpost
 rc=0
 
-./documulusdiscovery
-rc=$?
-if [ "$rc" != "0" ];then
-    ztp -R 
-    exit 1
-fi
-
-logger -s -t "xcat.cumulusztp" -p local4.info "switch discovered!"
-
-#restart mgt interface to apply the specified IP address
-ifdown eth0;ifup eth0
-
-retry=0
-while true; do
-    #check whether the network access between MN/CN and the node is ready
-    ping $server_ip -c 1 >/dev/null && break
-    retry=$[ $retry + 1 ]
-    if [ $retry -eq 90 ];then
-       #timeout, complain and exit
-       logger -s -t "xcat.cumulusztp" -p local4.err " the network between the node and $server_ip is not ready, please check[retry=$retry]..." "/var/log/xcat/xcat.log"
-       ztp -R
-       exit 1
+#if 'host-name' appears in dhcp lease, it means that the node definition and dhcp lease
+#have been created on MN, no need to invoke discovery process
+if [ -n "$hashostname"  ]; then
+    echo "My definition and dhcp lease exist, skip discovery and begin configuring..."
+    logger -s -t "xcat.cumulusztp" -p local4.info "My definition and dhcp lease exist, skip discovery and begin configuring..."
+else
+    ./documulusdiscovery
+    rc=$?
+    if [ "$rc" != "0" ];then
+        ztp -R
+        exit 1
     fi
 
-    #sleep sometime before the next scan
-    sleep 2
-done
+    logger -s -t "xcat.cumulusztp" -p local4.info "switch discovered!"
 
+    #restart mgt interface to apply the specified IP address
+    ifdown eth0;ifup eth0
+
+    retry=0
+    while true; do
+        #check whether the network access between MN/CN and the node is ready
+        ping $server_ip -c 1 >/dev/null && break
+        retry=$[ $retry + 1 ]
+        if [ $retry -eq 90 ];then
+           #timeout, complain and exit
+           logger -s -t "xcat.cumulusztp" -p local4.err " the network between the node and $server_ip is not ready, please check[retry=$retry]..." "/var/log/xcat/xcat.log"
+           ztp -R
+           exit 1
+        fi
+
+        #sleep sometime before the next scan
+        sleep 2
+    done
+fi
+
+echo "installstatus configuring" | socat STDIN TCP:$server_ip:3002,sourceport=301,reuseaddr,retry=5
 #push root ssh keys, config passwordless
 mkdir -p /root/.ssh
-mv _ssh/authorized_keys /root/.ssh/authorized_keys 
+mv _ssh/authorized_keys /root/.ssh/authorized_keys
 
 #install license, if needed
 /usr/cumulus/bin/cl-license > /dev/null 2>&1
@@ -119,7 +144,7 @@ if [ "$rc" != "0" ];then
 fi
 
 #obtain myposctscript from MN
-./getmypostscript.cumulus $server_ip:3001 
+./getmypostscript.cumulus $server_ip:3001
 rc=$?
 if [ "$rc" != "0" ]; then
    logger -s -t "xcat.cumulusztp" -p local4.info "failed to get mypostscript"
diff --git a/xCAT/postscripts/db2install b/xCAT/postscripts/db2install
index 33fa21450..836a829d6 100755
--- a/xCAT/postscripts/db2install
+++ b/xCAT/postscripts/db2install
@@ -6,14 +6,14 @@
 
 #-----------------------------------------------------------------------------
 
-=head1   db2install 
+=head1   db2install
 
  This postscript installs and sets up db2 on a client machine, usually a Service Node
  or a login node. This script can only be used to automatically install an
- AIX 6.1 or 7.1,  or a Linux Redhat5 or Redhat6 Client. 
+ AIX 6.1 or 7.1,  or a Linux Redhat5 or Redhat6 Client.
  Note: the db2 code must be in a mountable directory  defined by the
  db2installloc attribute in the site table.
- The perl-DBD-DB2 code should have been installed during the xCAT install from 
+ The perl-DBD-DB2 code should have been installed during the xCAT install from
  the AIX or Linux xCAT deps package for AIX6.1 or 7.1 or Redhat5 or Redhat 6.
  More information can be obtained from the xCAT http://xcat.svn.sourceforge.net/viewvc/xcat/xcat-core/trunk/xCAT-client/share/doc/xCAT2SetupDB2.pdf.
  Needs  export MASTER=site.master
@@ -22,7 +22,7 @@
         export INSTALLDIR=site.installdir
         export XCATDPORT=site.xcatdport
         export NODE=<mynodename>
- 
+
 =cut
 
 #-----------------------------------------------------------------------------
diff --git a/xCAT/postscripts/documulusdiscovery b/xCAT/postscripts/documulusdiscovery
index db82ef84e..c3e9d8db7 100755
--- a/xCAT/postscripts/documulusdiscovery
+++ b/xCAT/postscripts/documulusdiscovery
@@ -1,6 +1,6 @@
 #!/bin/bash
 #this script grabs the switch information, then composes a "findme" request and sends it to MN
-#so that the switch can be discovered 
+#so that the switch can be discovered
 
 # TODO: Figure out the master based on the DHCP packet
 XCATMASTER=$(cat /var/lib/dhcp/dhclient.eth0.leases |grep cumulus-provision-url|tail -1|awk -F/ '{print $3}')
@@ -107,25 +107,25 @@ while [ $RETRY -lt $MAX_RETRY ]; do
     (cat /tmp/discopacket.gz | socat STDIN UDP:$XCATMASTER:$XCATPORT,sourceport=301 ) &
 
     WAITRETRY=0
-    while [ $WAITRETRY -lt 60 ]; do
+    while [ $WAITRETRY -lt 100 ]; do
         if [ -f "/tmp/result.socat.out" ];then
             if grep "restart" /tmp/result.socat.out; then
                 DISCOVERED=1
                 break;
-            elif grep "processing" /tmp/result.socat.out; then 
+            elif grep "processing" /tmp/result.socat.out; then
                 echo "My findme request is still under processing, do not send new request"
                 logger -s -t $log_label -p local4.info  "My findme request is still under processing, do not send new request"
-                sleep 5
+                sleep 6
             elif grep "processed" /tmp/result.socat.out; then
-                echo "Fail to discover me, retry to send findme request 10 second later!"
-                logger -s -t $log_label -p local4.info "Fail to discover me, retry to send findme request 10 seconds later"
-                sleep 10 
+                echo "Fail to discover me, retry to send findme request 900 seconds later!"
+                logger -s -t $log_label -p local4.info "Fail to discover me, retry to send findme request 900 seconds later"
+                sleep 900
                 break;
             else
-                echo "no response from $XCATMASTER, wait for 1 second"
-                logger -s -t $log_label -p local4.info "no response from $XCATMASTER, wait for 1 second"
-                sleep 1
-            fi 
+                echo "no response from $XCATMASTER, wait for 6 seconds"
+                logger -s -t $log_label -p local4.info "no response from $XCATMASTER, wait for 6 seconds"
+                sleep 6
+            fi
         fi
         ((WAITRETRY=WAITRETRY+1))
     done
@@ -133,7 +133,7 @@ while [ $RETRY -lt $MAX_RETRY ]; do
     if [ "$DISCOVERED" = "1" ]; then
         break
     fi
-    
+
     ((RETRY=RETRY+1))
 done
 
diff --git a/xCAT/postscripts/efibootmgr b/xCAT/postscripts/efibootmgr
index 62ae70345..833b0af89 100644
--- a/xCAT/postscripts/efibootmgr
+++ b/xCAT/postscripts/efibootmgr
@@ -1,2 +1,2 @@
 echo "Setting Boot Manager for the next boot."
-efibootmgr -c -l \\EFI\\redhat\\grub.efi -L Linux
\ No newline at end of file
+efibootmgr -c -l \\EFI\\redhat\\grub.efi -L Linux
diff --git a/xCAT/postscripts/enablecapi b/xCAT/postscripts/enablecapi
index 628e8f19a..923adacc3 100644
--- a/xCAT/postscripts/enablecapi
+++ b/xCAT/postscripts/enablecapi
@@ -8,7 +8,7 @@ fi
 #---------------------------------------------------------------------------
 #=head1  enablecapi
 #=head2  enable CAPI and tunnel Atomics for compute nodes
-#        at least MOFED 4.3.1 has to be installed and only support on ConnectX5 
+#        at least MOFED 4.3.1 has to be installed and only support on ConnectX5
 #
 #        updatenode <node> enablecapi
 #
@@ -46,7 +46,7 @@ if (( $(echo "$majorversion == 4.3" |bc -l) )); then
        ERRMSG="Current MOFED version is $version and needs to be at least 4.3-1"
        logerr $ERRMSG
        exit 1
-   fi 
+   fi
 fi
 
 service mst restart >/dev/null 2>&1
@@ -60,7 +60,7 @@ reboot_flag=0
 
 for x in `ls /dev/mst/mt*`
 do
-    mlxconfig -y -d $x q | grep 'ConnectX5' >/dev/null 2>&1 
+    mlxconfig -y -d $x q | grep 'ConnectX5' >/dev/null 2>&1
     if [ $? == 0 ]; then
         mlxconfig -y -d $x set ADVANCED_PCI_SETTINGS=true >/dev/null 2>&1
         mlxconfig -y -d $x set IBM_CAPI_EN=true  >/dev/null 2>&1
diff --git a/xCAT/postscripts/enablekdump b/xCAT/postscripts/enablekdump
index bac579804..66c193a95 100755
--- a/xCAT/postscripts/enablekdump
+++ b/xCAT/postscripts/enablekdump
@@ -1,7 +1,7 @@
 #!/bin/bash
 # IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html
 #(C)IBM Corp
-# 
+#
 
 
 if [ "$(uname -s|tr 'A-Z' 'a-z')" = "linux" ];then
@@ -86,7 +86,7 @@ if [ ! -z "$DUMP" ]; then
     # parse "dump=<proto>://<nfsserver_IP>/<directory>"
     KDPATH=${DUMP#*:}
     KDPROTO=${DUMP%:$KDPATH*}
-    
+
     KDPATH=${KDPATH/\/\//}
     KDIP=`echo $KDPATH | cut -d'/' -f1`
     KDPATH=${KDPATH/$KDIP/}
@@ -105,7 +105,7 @@ if [ ! -z "$DUMP" ]; then
         MOUNTPATH="/mnt"
     else
 	MOUNTPATH="/var/tmp"
-    fi 
+    fi
 
     if [ "$KDPROTO" = "nfs" ]; then
 	if (pmatch $OSVER "sles*") || (pmatch $OSVER "suse*") || [ -f /etc/SuSE-release ]; then
@@ -144,7 +144,7 @@ if [ ! -z "$DUMP" ]; then
                             fi
                         fi
                     done
-                    /bin/cp $file "./bin/" 
+                    /bin/cp $file "./bin/"
                  done
 
                 #modify the original init to support dump to an nfs server
@@ -204,7 +204,7 @@ EOF
                 echo "/bin/mkdir -p /tmp/${NODE}" >> /tmp/createdir
                 echo "/bin/sleep ${TEMPDELAY}" >> /tmp/createdir
                 echo "/bin/umount /tmp" >> /tmp/createdir
-                /bin/chmod 777 /tmp/createdir    
+                /bin/chmod 777 /tmp/createdir
                 #change the mount and remount shell scripts' name, workaround for kdump on stateless node
                 oldmount=`ls /lib/mkinitrd/boot/*-mount.sh`
                 oldremount=`ls /lib/mkinitrd/boot/*-remount.sh`
@@ -222,10 +222,10 @@ EOF
 
                #The initramfs used in kdump does not need "root", however, the initramfs refused to continue
                #if no valid "root" provided in redhat7.1 kdump; As a workaround,we provide a fake "root=nfs:$KDIP:$KDPATH"
-               #with a dummy "proc" inside, which will fake "root=nfs:$KDIP:$KDPATH" as a valid root directory 
+               #with a dummy "proc" inside, which will fake "root=nfs:$KDIP:$KDPATH" as a valid root directory
                [ -e $MOUNTPATH/proc ] || echo "Dummy file: fake the /proc to pass the checking of 'root=' inside dracut-cmdline " > $MOUNTPATH/proc
 
-               echo "nfs $KDIP:$KDPATH" > /etc/kdump.conf 
+               echo "nfs $KDIP:$KDPATH" > /etc/kdump.conf
                echo "default shell" >> /etc/kdump.conf
                #strip "xcat" out of the initramfs for kdump
                echo "dracut_args --omit \"xcat\"" >> /etc/kdump.conf
@@ -235,8 +235,8 @@ EOF
                #with "command line overflow" since the kernel options are longer than 255 chars`
                kdumpcmdline=
                for i in $(cat /proc/cmdline)
-                   do 
-                       if [[ $i == console=* ]] || [[ $i == crashkernel=* ]]; then 
+                   do
+                       if [[ $i == console=* ]] || [[ $i == crashkernel=* ]]; then
                              kdumpcmdline="$kdumpcmdline $i "
                        fi
                done
@@ -244,7 +244,7 @@ EOF
                sed -i "s#^[\t ]*KDUMP_COMMANDLINE_APPEND=\"#KDUMP_COMMANDLINE_APPEND=\"root=nfs:$KDIP:$KDPATH #" /etc/sysconfig/kdump
                [ -f /etc/dracut.conf ] && mv /etc/dracut.conf  /tmp/dracut.conf
                restartservice kdump
-               [ -f /tmp/dracut.conf ] && mv /tmp/dracut.conf /etc/dracut.conf 
+               [ -f /tmp/dracut.conf ] && mv /tmp/dracut.conf /etc/dracut.conf
 	    elif (pmatch $OSVER "fedora*") || (pmatch $OSVER "rhel6*") || (pmatch $OSVER "rhels6*") || [ -f /etc/fedora-release ] || [ -f /etc/redhat-release ];then
                 /bin/mount -o nolock $KDIP:$KDPATH $MOUNTPATH
 		echo "net $KDIP:$KDPATH" > /etc/kdump.conf
diff --git a/xCAT/postscripts/enablesnmp b/xCAT/postscripts/enablesnmp
index 2d0010955..c4b51df49 100755
--- a/xCAT/postscripts/enablesnmp
+++ b/xCAT/postscripts/enablesnmp
@@ -17,7 +17,7 @@ fi
 [ -f ${snmp_conf}.orig ] || cp $snmp_conf ${snmp_conf}.orig
 
 #get snmp attribute
-#NOTE: the length of SNMP Password has to be min=8 
+#NOTE: the length of SNMP Password has to be min=8
 xCATSettingsSTART="xCAT settings START"
 xCATSettingsEND="xCAT settings END"
 xCATSettingsOID="xCAT customized"
@@ -30,7 +30,7 @@ snmpauth=$SNMPAUTH
 snmpc=$SNMPC
 community="public"
 
-#Get cumulus orig conf file 
+#Get cumulus orig conf file
 grep "$xCATSettingsOID" $snmp_conf 2>&1 1> /dev/null
 if [ $? -eq 0 ]; then
     cp ${snmp_conf}.cumulus $snmp_conf
@@ -79,7 +79,7 @@ elif [ -n "$snmppwd" ]; then
     community=$snmppwd
 elif [ -n "$snmpc" ]; then
     community=$snmpc
-fi 
+fi
 
 echo "rocommunity $community default" >> $snmp_conf
 echo "rocommunity $community default -V systemonly" >> $snmp_conf
diff --git a/xCAT/postscripts/getcredentials.awk b/xCAT/postscripts/getcredentials.awk
index 53864815d..4c5ea4e9e 100755
--- a/xCAT/postscripts/getcredentials.awk
+++ b/xCAT/postscripts/getcredentials.awk
@@ -11,7 +11,7 @@ BEGIN {
         print "<xcatrequest>" |& server
         print "   <command>getcredentials</command>" |& server
         print "   <callback_port>300</callback_port>" |& server
-        for (i=1; i<ARGC; i++) 
+        for (i=1; i<ARGC; i++)
             print "   <arg>"ARGV[i]"</arg>" |& server
         print "</xcatrequest>" |& server
 
diff --git a/xCAT/postscripts/getinv b/xCAT/postscripts/getinv
index f452b7256..859bbd1f6 100755
--- a/xCAT/postscripts/getinv
+++ b/xCAT/postscripts/getinv
@@ -40,7 +40,7 @@ while [ ! -f $xml_file ] || grep error $xml_file; do
             timer=$(($timer-1));
         done
     fi
- 
+
     if [ -f /etc/xcat/cert.pem -a -f /etc/xcat/certkey.pem ]; then
         cat $tmp_file | openssl s_client -key /etc/xcat/certkey.pem -cert /etc/xcat/cert.pem -connect $XCATDEST -quiet 2> /dev/null > $xml_file
     else
diff --git a/xCAT/postscripts/getmypostscript.cumulus b/xCAT/postscripts/getmypostscript.cumulus
index b51181d9b..961671a67 100755
--- a/xCAT/postscripts/getmypostscript.cumulus
+++ b/xCAT/postscripts/getmypostscript.cumulus
@@ -1,5 +1,5 @@
 #!/bin/bash
-#this script send getpostscript request to xcatd on MN and generate /xcatpost/mypostscript 
+#this script send getpostscript request to xcatd on MN and generate /xcatpost/mypostscript
 #which includes the glocal environment variables to run postscripts
 
 if [ -z "$XCATDEST" ]; then
@@ -13,9 +13,9 @@ echo "<xcatrequest>
 
 
 
-if [ -f /tmp/resp.xml ]; then 
+if [ -f /tmp/resp.xml ]; then
     #remove any existing response file
-    rm /tmp/resp.xml; 
+    rm /tmp/resp.xml;
 fi
 
 
@@ -42,7 +42,7 @@ if [ -f /tmp/resp.xml ] && grep '<data>' /tmp/resp.xml >/dev/null 2>&1 ;then
     echo "Success to obtain mypostscript!"
 else
     echo "Failed to obtain mypostscript!"
-    exit 1 
+    exit 1
 fi
 
 #parse the script from the xml-formated  resposne
diff --git a/xCAT/postscripts/hardeths b/xCAT/postscripts/hardeths
index 46765f673..86dcce797 100755
--- a/xCAT/postscripts/hardeths
+++ b/xCAT/postscripts/hardeths
@@ -1,4 +1,4 @@
-#!/bin/sh 
+#!/bin/sh
 # pmatch determines if 1st argument string is matched by 2nd argument pattern
 
 pmatch ()
@@ -50,7 +50,7 @@ if [ -f /etc/os-release ] && (cat /etc/os-release |grep -i  '^NAME=[ "]*Cumulus
     OSVER="cumulus"
 fi
 
-defgw=`ip route | grep default | awk '{print $3}'`
+defgw=`ip route | grep default | awk '{print $3}' | head -n1`
 if ( pmatch $OSVER "ubuntu*" ) || (pmatch $OSVER "cumulus")
 then
     echo `hostname` >/etc/hostname
@@ -73,7 +73,9 @@ else
         sed -i "s/HOSTNAME.*/HOSTNAME=`hostname`/" /etc/sysconfig/network
     fi
     if [ ! -z "$defgw" ]; then
-        echo "GATEWAY=$defgw" >> /etc/sysconfig/network
+        grep -qw GATEWAY /etc/sysconfig/network && \
+            sed -i "s/^GATEWAY.*/GATEWAY=$defgw/" /etc/sysconfig/network || \
+            echo "GATEWAY=$defgw" >> /etc/sysconfig/network
     fi
 fi
 
@@ -106,7 +108,7 @@ for nic in `ip link |grep "BROADCAST" |awk '{print $2}'   | sed s/://`; do
             broadcast_line=""
         fi
 
-        
+
         if [ ! -z "$defgw" ]; then
             gateway_line="gateway $defgw"
         else
@@ -165,7 +167,7 @@ EOF
         then
             sed -i '/NETMASK=/d' $NICFILE
         fi
-        echo NETMASK=$NETMASK >> $NICFILE    
+        echo NETMASK=$NETMASK >> $NICFILE
     fi
 
     #for netboot/statelite case, restart the network interface. For diskful installation, it is not necessary because the restart of the network  will happen at the first boot.
diff --git a/xCAT/postscripts/injectservice b/xCAT/postscripts/injectservice
new file mode 100755
index 000000000..99b53ac85
--- /dev/null
+++ b/xCAT/postscripts/injectservice
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+#4 implicit arguments passed by genimage
+rootimg_dir=$1
+osver=$2
+arch=$3
+profile=$4
+
+#user-specified arguments in "postinstall" attribute
+#the name of the service to inject
+servicename=$5
+#the full path of the service unit file to inject on management node(non-chroot)
+servicefile=$6
+
+echo servicename=$servicename
+echo servicefile=$servicefile
+
+#append the suffix ".service" to service name if not specified
+echo "$servicename" |grep -q -e "\.service$" || servicename=$servicename.service
+
+if [ -e "$rootimg_dir/usr/lib/systemd/" ]; then
+            #if systemd is the service management framework for the diskless image
+            #enable the xcatpostinit1.service
+            destfile="$rootimg_dir/etc/systemd/system/$servicename"
+            if [ -e "$rootimg_dir/etc/systemd/system/$servicename" ]; then
+                rm -rf $destfile
+            fi
+            cp -f $servicefile $destfile
+            rm -rf "$rootimg_dir/etc/systemd/system/multi-user.target.wants/$servicename"
+            oldpwd=$(pwd)
+            cd $rootimg_dir/etc/systemd/system/multi-user.target.wants/
+            ln -s ../$servicename "$rootimg_dir/etc/systemd/system/multi-user.target.wants/$servicename"
+            cd $oldpwd
+fi
diff --git a/xCAT/postscripts/install_chef_client b/xCAT/postscripts/install_chef_client
index ad6342b79..e33b00980 100755
--- a/xCAT/postscripts/install_chef_client
+++ b/xCAT/postscripts/install_chef_client
@@ -1,4 +1,4 @@
-#!/bin/bash 
+#!/bin/bash
 # IBM(c) 2013 EPL license http://www.eclipse.org/legal/epl-v10.html
 #####################################################
 #=head1  install_chef_client
@@ -90,7 +90,7 @@ if [ "$os" == "ubuntu" ]; then
     #urelease="precise" #default release name
     urelease=`cat /etc/lsb-release |grep DISTRIB_CODENAME |cut -d= -f2`
 
-    
+
     hostname=`hostname -f`
     ##hostname="10.1.0.82"
 
@@ -104,16 +104,16 @@ deb http://us.archive.ubuntu.com/ubuntu/ ${urelease}-updates universe\n
 
     # download the chef-server deb packages
     #wget https://opscode-omnitruck-release.s3.amazonaws.com/ubuntu/12.04/x86_64/chef-server_11.0.6-1.ubuntu.12.04_amd64.deb
-    rm -rf /tmp/chef.deb 
+    rm -rf /tmp/chef.deb
     wget -N --waitretry=10 --random-wait -T 60  $chefurl   -O /tmp/chef.deb
     rc=$?
     if [ $rc -eq 0 ] && [ -f /tmp/chef.deb ]; then
         # install it
         dpkg -i /tmp/chef.deb
-    else 
+    else
         echo "Cannot download $chef"
         exit 1
-    fi   
+    fi
 
     apt-get -y update
 
@@ -124,7 +124,7 @@ fi
 
 #configure the chef configuration file
 result=`dirname $0`
-${result}/config_chef_client -s $chefserver 
+${result}/config_chef_client -s $chefserver
 
 
 
diff --git a/xCAT/postscripts/install_chef_server b/xCAT/postscripts/install_chef_server
index 8ccaa87fd..4dced5405 100755
--- a/xCAT/postscripts/install_chef_server
+++ b/xCAT/postscripts/install_chef_server
@@ -59,13 +59,13 @@ if [ "$os" == "ubuntu" ]; then
     rm -rf /etc/chef-server
     rm -rf /etc/chef
     rm -rf /root/.chef
-    rm -rf /opt/chef-server/    
+    rm -rf /opt/chef-server/
 
     #add the internet Ubuntu repositories
     #urelease="precise" #default release name
     urelease=`cat /etc/lsb-release |grep DISTRIB_CODENAME |cut -d= -f2`
 
-    
+
     hostname=`hostname -f`
     ##hostname="10.1.0.82"
 
@@ -79,16 +79,16 @@ deb http://us.archive.ubuntu.com/ubuntu/ ${urelease}-updates universe\n
 
     # download the chef-server deb packages
     #wget https://opscode-omnitruck-release.s3.amazonaws.com/ubuntu/12.04/x86_64/chef-server_11.0.6-1.ubuntu.12.04_amd64.deb
-    rm -rf /tmp/chef-server* 
+    rm -rf /tmp/chef-server*
     wget -N --waitretry=10 --random-wait -T 60  $chefserverurl   -O /tmp/chef-server.deb
     rc=$?
     if [ $rc -eq 0 ] && [ -f /tmp/chef-server.deb ]; then
         # install it
         dpkg -i /tmp/chef-server.deb
-    else 
+    else
         echo "Cannot download $chefserverurl"
         exit 1
-    fi   
+    fi
 
     apt-get -y update
 
diff --git a/xCAT/postscripts/install_chef_workstation b/xCAT/postscripts/install_chef_workstation
index 38098613a..30e19e8eb 100755
--- a/xCAT/postscripts/install_chef_workstation
+++ b/xCAT/postscripts/install_chef_workstation
@@ -1,4 +1,4 @@
-#!/bin/bash 
+#!/bin/bash
 # IBM(c) 2013 EPL license http://www.eclipse.org/legal/epl-v10.html
 #####################################################
 #=head1  install_chef_client
@@ -89,7 +89,7 @@ if [ $os == "ubuntu" ]; then
     #urelease="precise" #default release name
     urelease=`cat /etc/lsb-release |grep DISTRIB_CODENAME |cut -d= -f2`
 
-    
+
     hostname=`hostname -f`
     ##hostname="10.1.0.82"
 
@@ -103,16 +103,16 @@ deb http://us.archive.ubuntu.com/ubuntu/ ${urelease}-updates universe\n
 
     # download the chef-server deb packages
     #wget https://opscode-omnitruck-release.s3.amazonaws.com/ubuntu/12.04/x86_64/chef-server_11.0.6-1.ubuntu.12.04_amd64.deb
-    rm -rf /tmp/chef.deb 
+    rm -rf /tmp/chef.deb
     wget -N --waitretry=10 --random-wait -T 60  $chefurl   -O /tmp/chef.deb
     rc=$?
     if [ $rc -eq 0 ] && [ -f /tmp/chef.deb ]; then
         # install it
         dpkg -i /tmp/chef.deb
-    else 
+    else
         echo "Cannot download $chefurl"
         exit 1
-    fi   
+    fi
 
     apt-get -y update
 
diff --git a/xCAT/postscripts/install_lsf b/xCAT/postscripts/install_lsf
index 1448cff71..95b29bf39 100755
--- a/xCAT/postscripts/install_lsf
+++ b/xCAT/postscripts/install_lsf
@@ -1,4 +1,4 @@
-#!/bin/bash 
+#!/bin/bash
 #README################################################################
 # (1)Check you have  LSF installer script package and  LSF distribution packages. e.g. "lsf9.1.3_lsfinstall.tar.Z" and "lsf9.1.3_lnx26-lib23-ppc64le.tar.Z"
 # (2)Get LSF entitlement file for the edition you are installing. e.g. "platform_lsf_std_entitlement.dat"
@@ -13,7 +13,7 @@
 # LSF_TARDIR=""
 # (4)Run this script on one compute node,you can also use "updatenode <nodename> -P install_lsf" to execute this script on one compute node
 #   (It's not necessary to run it on each compute node).
-# 
+#
 # NOTE for install.config:
 # -----------------
 # LSF_TOP="/usr/share/lsf"
@@ -190,7 +190,7 @@ else
 		exit 1
 	elif [[ $count -eq 1 ]]; then
 	 :
-	else 
+	else
 		echo "ERROR: lsfinstall TAR file not found in LSF_TARDIR $LSF_TARDIR."
 		exit 1
 	fi
@@ -222,7 +222,7 @@ is_parameter_set "SILENT_INSTALL"
 is_parameter_set "LSF_SILENT_INSTALL_TARLIST"
 
 
-#Extract lsfinstall package 
+#Extract lsfinstall package
 cd $LSF_TARDIR
 LSF_INSTALL_PACKAGE=`basename $LSF_INSTALL_FILE_PATH`
 zcat $LSF_INSTALL_PACKAGE | tar xvf -
@@ -268,18 +268,18 @@ echo "LSF_PE_NETWORK_UPDATE_INTERVAL=6" >> $LSF_CONF_FILE
 echo "EGO_DEFINE_NCPUS=threads" >> $LSF_CONF_FILE
 echo "LSF_HPC_EXTENSIONS="CUMULATIVE_RUSAGE"">> $LSF_CONF_FILE
 
-LSB_HOSTS_FILE="$LSF_TOP/conf/lsbatch/$LSF_CLUSTER_NAME/configdir/lsb.hosts" 
+LSB_HOSTS_FILE="$LSF_TOP/conf/lsbatch/$LSF_CLUSTER_NAME/configdir/lsb.hosts"
 LSB_HOSTS_FILE_ORIG="$LSF_TOP/conf/lsbatch/$LSF_CLUSTER_NAME/configdir/lsb.hosts.orig"
 mv $LSB_HOSTS_FILE $LSB_HOSTS_FILE_ORIG
 
 PRIMARY_MASTER_NODE=`echo $LSF_MASTER_LIST |  awk '{print $1}'`
-echo "Begin Host" >> $LSB_HOSTS_FILE 
+echo "Begin Host" >> $LSB_HOSTS_FILE
 echo "HOST_NAME MXJ   r1m     pg    ls    tmp  DISPATCH_WINDOW  AFFINITY" >> $LSB_HOSTS_FILE
 echo "default	!	()	()	()	()	()	(Y)" >> $LSB_HOSTS_FILE
 echo "$PRIMARY_MASTER_NODE	0	()	()	()	()	()    (Y)" >> $LSB_HOSTS_FILE
 echo "End Host" >> $LSB_HOSTS_FILE
 echo "Begin HostGroup" >> $LSB_HOSTS_FILE
 echo "GROUP_NAME    GROUP_MEMBER" >> $LSB_HOSTS_FILE
-echo "End HostGroup" >> $LSB_HOSTS_FILE 
+echo "End HostGroup" >> $LSB_HOSTS_FILE
 
 fi
diff --git a/xCAT/postscripts/install_puppet_client b/xCAT/postscripts/install_puppet_client
index 24baca49b..b33d4d9a7 100755
--- a/xCAT/postscripts/install_puppet_client
+++ b/xCAT/postscripts/install_puppet_client
@@ -4,9 +4,9 @@
 
 #-------------------------------------------------------------------------------
 #=head1  install_puppet_client
-#=head2  This command installs the puppet client on a xCAT node. It is used as 
-# a postscript on Ubuntu only. 
-#    usage:  
+#=head2  This command installs the puppet client on a xCAT node. It is used as
+# a postscript on Ubuntu only.
+#    usage:
 #      1. use $PUPPETSERVER or $MASTER as the puppet server
 #            updatenode <noderange> -P "install_puppet_client"
 #      2. explicitly specify the puppet server
@@ -42,7 +42,7 @@ if [ "$os" == "Ubuntu" ]; then
     #check if the current node is also a puppet master
     ismaster=0
     if [ -f /etc/puppet/fileserver.conf ]; then
-	ismaster=1 
+	ismaster=1
     fi
 
     #clean the all the configuration files if it is not a master
@@ -50,43 +50,43 @@ if [ "$os" == "Ubuntu" ]; then
 	rm -Rf /etc/puppet/*
 	rm -Rf /var/lib/puppet/*
     fi
-       
+
     echo "Adding new repositories....."
     #get os release name
     urelease="precise" #default release name
     urelease=`cat /etc/lsb-release |grep DISTRIB_CODENAME |cut -d= -f2`
-    
+
     #add ubuntu repositories from the net.
-    #We use us mirror, what about for the customers of other contires? 
+    #We use us mirror, what about for the customers of other contires?
     echo "deb http://us.archive.ubuntu.com/ubuntu/ $urelease main" > /etc/apt/sources.list.d/os_remote.list
     echo "deb http://us.archive.ubuntu.com/ubuntu/ ${urelease}-updates main" >> /etc/apt/sources.list.d/os_remote.list
     echo "deb http://us.archive.ubuntu.com/ubuntu/ $urelease universe" >> /etc/apt/sources.list.d/os_remote.list
     echo "deb http://us.archive.ubuntu.com/ubuntu/ ${urelease}-updates universe" >> /etc/apt/sources.list.d/os_remote.list
-    
-    #add the puppet lab repositories 
+
+    #add the puppet lab repositories
     repname=puppetlabs-release-${urelease}.deb
     wget -N --waitretry=10 --random-wait -T 60  http://apt.puppetlabs.com/$repname   -P /tmp 2>> /tmp/wget.log
     rc=$?
     if [ $rc -eq 0 ] && [ -f /tmp/$repname ]; then
 	dpkg -i /tmp/$repname
 	apt-get update
-    else 
+    else
 	echo "Cannot download  http://apt.puppetlabs.com/$repname"
 	exit 1
     fi
-    rm /tmp/$repname 
-    
+    rm /tmp/$repname
+
     #refresh the repository
     apt-get -y update
 
     echo "Installing puppet client....."
     #install puppet client
     apt-get -y install puppet
-    
+
     #configure the puppet agent configuration files
     result=`dirname $0`
-    ${result}/config_puppet_client "$@" 
-    
+    ${result}/config_puppet_client "$@"
+
     #puppet agent -t --waitforcert 60&
 
 elif [ "$os" == "RedHat" ]; then
diff --git a/xCAT/postscripts/install_puppet_server b/xCAT/postscripts/install_puppet_server
index 086797a6d..9b00cf051 100755
--- a/xCAT/postscripts/install_puppet_server
+++ b/xCAT/postscripts/install_puppet_server
@@ -11,10 +11,10 @@ fi
 #=head1  install_puppet_server
 #=head2  This command installs the puppet server on a xCAT server or node.
 #        It is used on Ubuntu only.
-#        Usage:  
+#        Usage:
 #        set $PUPPETSERVER as the puppet server on site table. The default is
 #        site.master
-#           install_puppet_server   
+#           install_puppet_server
 #         or
 #           updatenode <node> install_puppet_server
 #=cut
@@ -45,54 +45,54 @@ if [ "$os" == "Ubuntu" ]; then
     apt-get -y autoremove puppetmaster puppet --purge
     rm -Rf /etc/puppet/*
     rm -Rf /var/lib/puppet/*
-    
+
     echo "Adding new repositories....."
     #get os release name
     urelease="precise" #default release name
     urelease=`cat /etc/lsb-release |grep DISTRIB_CODENAME |cut -d= -f2`
-    
+
     #add ubuntu repositories from the net.
-    #We use us mirror, what about for the customers of other contires? 
+    #We use us mirror, what about for the customers of other contires?
     echo "deb http://us.archive.ubuntu.com/ubuntu/ $urelease main" > /etc/apt/sources.list.d/os_remote.list
     echo "deb http://us.archive.ubuntu.com/ubuntu/ ${urelease}-updates main" >> /etc/apt/sources.list.d/os_remote.list
     echo "deb http://us.archive.ubuntu.com/ubuntu/ $urelease universe" >> /etc/apt/sources.list.d/os_remote.list
     echo "deb http://us.archive.ubuntu.com/ubuntu/ ${urelease}-updates universe" >> /etc/apt/sources.list.d/os_remote.list
-    
-    #add the puppet lab repositories 
+
+    #add the puppet lab repositories
     repname=puppetlabs-release-${urelease}.deb
     wget -N --waitretry=10 --random-wait -T 60  http://apt.puppetlabs.com/$repname   -P /tmp 2>> /tmp/wget.log
     rc=$?
     if [ $rc -eq 0 ] && [ -f /tmp/$repname ]; then
 	dpkg -i /tmp/$repname
 	apt-get update
-    else 
+    else
 	echo "Cannot download  http://apt.puppetlabs.com/$repname"
 	exit 1
     fi
-    rm /tmp/$repname 
+    rm /tmp/$repname
 
     #refresh the repository
     apt-get -y update
-    
-    
+
+
     echo "Installing puppet server....."
     #install puppet server
     apt-get -y install puppetmaster
-    
+
     #install rake and git
     apt-get -y install rake git
-    
+
     #Now configure the pupper server
     result=`dirname $0`
     ${result}/config_puppet_server "$@"
-    
+
     #restart puppet master
     #service puppetmaster stop
     stopservice puppetmaster
-    kill $(ps auxww | grep puppet | grep master | grep -v grep | awk '{print $2}') 
+    kill $(ps auxww | grep puppet | grep master | grep -v grep | awk '{print $2}')
     #service puppetmaster start
     startservice puppetmaster
-    
+
 elif [ "$os" == "RedHat" ]; then
      echo "Puppet server installation with xCAT on RedHat is through a kit. Please refer to ... for details.".
 else
diff --git a/xCAT/postscripts/joindomain b/xCAT/postscripts/joindomain
index 151c9921c..6db214f0f 100644
--- a/xCAT/postscripts/joindomain
+++ b/xCAT/postscripts/joindomain
@@ -6,8 +6,8 @@ HOSTPRINC=`hostname`
 #generate a random 32 character password
 MYPASS=$(tr -dc A-Za-z0-9 </dev/urandom|head -c 32)
 
-if [ "$OSVER" = "rhels6" ]; then 
-    #enable kerberos 
+if [ "$OSVER" = "rhels6" ]; then
+    #enable kerberos
     authconfig --update --krb5realm=$UPDNSDOMAIN --enablekrb5kdcdns --enablekrb5
     #change password
     (echo $TEMPHOSTPASS;echo $MYPASS;echo $MYPASS)|kpasswd $HOSTPRINC
diff --git a/xCAT/postscripts/lsf_startup b/xCAT/postscripts/lsf_startup
index d23f83a51..f44396ebe 100644
--- a/xCAT/postscripts/lsf_startup
+++ b/xCAT/postscripts/lsf_startup
@@ -1,4 +1,4 @@
-#!/bin/bash 
+#!/bin/bash
 #README################################################################
 # (1)lsf_startup should be ran after lsf is installed, so it should be ran after install_lsf script
 # (2)lsf_startup use the same install.config file with install_lsf, install.config should be in the same directory with install_lsf and lsf_startup scripts.
@@ -44,9 +44,9 @@ for item in $ALL_LSF_NODES
 do
    if [[ x${item} == x$NODE ]]
    then
-      
+
       $LSF_TOP/$LSF_VERSION/install/hostsetup --top="$LSF_TOP" --boot="y"
-     
+
    fi
 done
 
@@ -59,9 +59,9 @@ for lsfnode in $ALL_LSF_NODES
 do
     if [[ x${lsfnode} == x$NODE ]]
     then
-        if [[ -f /root/.bash_profile ]] 
+        if [[ -f /root/.bash_profile ]]
         then
-            if ! grep -q -i "#Added by lsf_startup" /root/.bash_profile ; then 
+            if ! grep -q -i "#Added by lsf_startup" /root/.bash_profile ; then
                 echo "#Added by lsf_startup." >> /root/.bash_profile
                 echo ". $LSF_TOP/conf/profile.lsf" >> /root/.bash_profile
             fi
@@ -70,7 +70,7 @@ do
                 echo "#Added by lsf_startup." >> /root/.profile
                 echo ". $LSF_TOP/conf/profile.lsf" >> /root/.profile
             fi
-            
+
         fi
     fi
 done
diff --git a/xCAT/postscripts/make_sn_fs b/xCAT/postscripts/make_sn_fs
index 4491af6bc..80eb90215 100755
--- a/xCAT/postscripts/make_sn_fs
+++ b/xCAT/postscripts/make_sn_fs
@@ -1,19 +1,19 @@
 #!/bin/sh
 # IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html
 
-# This script, ("make_sn_fs"), is a sample xCAT post script for 
+# This script, ("make_sn_fs"), is a sample xCAT post script for
 #	creating file systems on xCAT service
-#	nodes.  You can modify this script to create and mount local 
+#	nodes.  You can modify this script to create and mount local
 #	file systems when the service nodes are installed.
 #
-#	Make sure your script is executable and that is is in the 
+#	Make sure your script is executable and that is is in the
 #	/install/postscripts directory on the xCAT management node.
 #
-#	You must also add the script name to the list of scripts that 
+#	You must also add the script name to the list of scripts that
 #	must be run at install time.  (See below.)
 #
-# 	To use this script you should make sure it gets run before the 
-#	"servicenode" script or any other scipts that may need to use these 
+# 	To use this script you should make sure it gets run before the
+#	"servicenode" script or any other scipts that may need to use these
 #	file systems.
 #	
 #	For example, to get it to run before the "servicenode" script you
diff --git a/xCAT/postscripts/mkhyperv b/xCAT/postscripts/mkhyperv
index 827ad6b15..c015a299e 100755
--- a/xCAT/postscripts/mkhyperv
+++ b/xCAT/postscripts/mkhyperv
@@ -10,15 +10,15 @@
 #     kvm
 #     libvirt.x86_64
 #     gpxe-kvm
-# 
-# 2.  In order to get those packaes, you'll need to add the 
+#
+# 2.  In order to get those packaes, you'll need to add the
 #     xCAT-dep repo.  For our test we added the line:
 #     repo  --name=xcat-dep --baseurl=http://#TABLE:noderes:$NODE:nfsserver#/install/xcat/xcat-dep/rh5/#TABLE:nodetype:$NODE:arch#
 #     This line can be added after the url --url <blah> line
 #
 #  Once you have that, then the following scripts just set up kvm
 #  When the machine boots the first time you'll know it works if you can
-#  run the command: 
+#  run the command:
 #  virsh list
 #  You'll then see output like:
 # Id Name                 State
diff --git a/xCAT/postscripts/mkresolvconf b/xCAT/postscripts/mkresolvconf
index 39cf9c06a..f89476d86 100755
--- a/xCAT/postscripts/mkresolvconf
+++ b/xCAT/postscripts/mkresolvconf
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html
 #
 #---------------------------------------------------------------------------
diff --git a/xCAT/postscripts/mountinstall b/xCAT/postscripts/mountinstall
index 63b57c29a..df213cb7c 100755
--- a/xCAT/postscripts/mountinstall
+++ b/xCAT/postscripts/mountinstall
@@ -1,17 +1,17 @@
 #!/bin/sh
 # IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html
 
-# This script, ("mountinstall"), is a sample xCAT post script for 
+# This script, ("mountinstall"), is a sample xCAT post script for
 #	mounting /install from managment node to xCAT chef-server
-#	nodes.  
+#	nodes.
 #
-#	Make sure your script is executable and that is is in the 
+#	Make sure your script is executable and that is is in the
 #	/install/postscripts directory on the xCAT management node.
 #
-#	You must add the script name to the list of scripts that 
+#	You must add the script name to the list of scripts that
 #	must be run at install time,  or use it with updatenode.
 #
-# 	To use this script you should make sure it gets run before the 
+# 	To use this script you should make sure it gets run before the
 #	"loadchefdata" script or any other scipts that may need to use
 #       scripts in the /install directory.
 #	
diff --git a/xCAT/postscripts/nicutils.sh b/xCAT/postscripts/nicutils.sh
index ea86d4320..9d1666b2f 100755
--- a/xCAT/postscripts/nicutils.sh
+++ b/xCAT/postscripts/nicutils.sh
@@ -28,12 +28,22 @@ uniq="uniq"
 xargs="xargs"
 modprobe="modprobe"
 
+#########################################################################
+# ifdown/ifup will not be executed in diskful provision postscripts stage
+#########################################################################
+reboot_nic_bool=1
+if [ -z "$UPDATENODE" ] || [ $UPDATENODE -ne 1 ] ; then
+    if [ "$NODESETSTATE" = "install" ] && ! grep "REBOOT=TRUE" /opt/xcat/xcatinfo >/dev/null 2>&1; then
+        reboot_nic_bool=0
+    fi
+fi
+
 ######################################################
 #
 # log lines
 #
 # input : info or warn or error or status
-# 
+#
 # output : multiple lines of string
 #
 ######################################################
@@ -76,7 +86,7 @@ function log_lines {
 ######################################################
 function log_error {
     local __msg="$*"
-    $log_print_cmd $log_print_arg "[E]:Error: $__msg" 
+    $log_print_cmd $log_print_arg "[E]:Error: $__msg"
     return 1
 }
 
@@ -92,7 +102,7 @@ function log_error {
 ######################################################
 function log_warn {
     local __msg="$*"
-    $log_print_cmd $log_print_arg "[W]: $__msg" 
+    $log_print_cmd $log_print_arg "[W]: $__msg"
     return 0
 }
 
@@ -108,7 +118,7 @@ function log_warn {
 ######################################################
 function log_info {
     local __msg="$*"
-    $log_print_cmd $log_print_arg "[I]: $__msg" 
+    $log_print_cmd $log_print_arg "[I]: $__msg"
     return 0
 }
 
@@ -124,7 +134,7 @@ function log_info {
 __my_log_status=
 function log_status {
     local __msg="$*"
-    $log_print_cmd $log_print_arg "[S]: $__msg" 
+    $log_print_cmd $log_print_arg "[S]: $__msg"
 
     # call my_log_status hook to triger more processing for status messages.
     if [ -n "$__my_log_status" ]; then
@@ -135,7 +145,7 @@ function log_status {
 
 ####################################################
 #
-# print output 
+# print output
 #
 ###################################################
 function log_print_default {
@@ -164,7 +174,7 @@ function set_log_print {
 
 #####################################################
 #
-# uniq line in cfg files 
+# uniq line in cfg files
 #
 # input : -t"str_for_FS" -k"num"
 #
@@ -257,13 +267,13 @@ function load_kmod {
 
 
 #################################################################
-# 
+#
 # query nicextraparams from nics table
 # example: nicextraparams.eth0="MTU=9000 something=yes"
 # input: nic, here is eth0
 # output: set value for globe ${array_extra_param_names}
 #         and ${array_extra_param_values}
-#         example: 
+#         example:
 #         array_extra_param_names[0]="MTU"
 #         array_extra_param_values[0]="9000"
 #         array_extra_param_names[1]="something"
@@ -274,7 +284,7 @@ function query_extra_params {
 
     nic=$1
     if [ -z "$nic" ]; then
-        return 
+        return
     fi
     get_nic_extra_params $nic "$NICEXTRAPARAMS"
     j=0
@@ -342,7 +352,7 @@ function query_nicnetworks_nic {
 
 #############################################################
 #
-# query netname from networks table 
+# query netname from networks table
 #
 # input : nic
 #
@@ -413,7 +423,7 @@ function get_mac {
 #
 # wait for nic state
 #
-# input : <nic> <expect_state> <try_count> <sleep_time> 
+# input : <nic> <expect_state> <try_count> <sleep_time>
 #
 ####################################################################
 function wait_for_ifstate {
@@ -446,12 +456,12 @@ function wait_for_ifstate {
 # create ifcfg-* files
 #
 # input : ifname=<ifname> nwdir="cfg_file_dir" xcatnet=<xcatnet> _ipaddr=<ip> _netmask=<mask> inattrs=<attrs>
-#        
-# return : 0 success 
+#
+# return : 0 success
 #
 #################################################################
 function create_persistent_ifcfg {
-    log_info "create_persistent_ifcfg $@" 
+    log_info "create_persistent_ifcfg $@"
 
     local nwdir="/etc/sysconfig/network-scripts"
 
@@ -546,7 +556,7 @@ function create_persistent_ifcfg {
             attrs=${attrs}${attrs:+,}"HWADDR=$mac"
         fi
     fi
-    
+
     #add extra params
     i=0
     while [ $i -lt ${#array_extra_param_names[@]} ]
@@ -570,7 +580,7 @@ function create_persistent_ifcfg {
 
     # log for debug
     echo "['ifcfg-${ifname}']" >&2
-    cat $fcfg | $sed -e 's/^/ >> /g' | log_lines info 
+    cat $fcfg | $sed -e 's/^/ >> /g' | log_lines info
     return $rc
 }
 
@@ -583,7 +593,7 @@ function create_persistent_ifcfg {
 #
 ###############################################################################
 function expand_ports {
-    log_info "expand_ports $@" 
+    log_info "expand_ports $@"
 
     local i
     local ports=`echo "$1" | $sed -e 's/,/ /g'`
@@ -627,7 +637,7 @@ function expand_ports {
 #
 #########################################################################
 function migrate_ip {
-    log_info "migrate_ip $@" 
+    log_info "migrate_ip $@"
 
     local ifname=""
     local sports=""
@@ -699,7 +709,7 @@ function add_br() {
          log_info "ovs-vsctl add-br $BNAME"
          ovs-vsctl add-br $BNAME
      elif [[ $BRIDGE == "bridge" ]]; then
-         log_info "brctl addbr $BNAME" 
+         log_info "brctl addbr $BNAME"
          brctl addbr $BNAME
          log_info "brctl stp $BNAME on"
          brctl stp $BNAME on
@@ -746,13 +756,13 @@ function add_if() {
          log_info "ovs-vsctl add-br $BNAME"
          ovs-vsctl add-br $BNAME
 
-        log_info "ovs-vsctl add-port $BNAME $PORT" 
+        log_info "ovs-vsctl add-port $BNAME $PORT"
         ovs-vsctl add-port $BNAME $PORT
     elif [[ $BRIDGE == "bridge" ]]; then
-        log_info "brctl addif $BNAME $PORT" 
+        log_info "brctl addif $BNAME $PORT"
         brctl addif $BNAME $PORT
     fi
-    
+
 
 }
 
@@ -764,8 +774,8 @@ function add_if() {
 #
 ###############################################################################
 function create_raw_vlan_for_br {
-  
-    log_info "create_raw_vlan_interface $@" 
+
+    log_info "create_raw_vlan_interface $@"
     local lines=""
 
     local ifname=""
@@ -778,7 +788,7 @@ function create_raw_vlan_for_br {
         key=`echo "$1" | $cut -s -d= -f1`
         if [ "$key" = "ifname" ] || \
            [ "$key" = "_mtu" ] || \
-           [ "$key" = "_bridge" ]; then 
+           [ "$key" = "_bridge" ]; then
             eval "$1"
         fi
         shift
@@ -822,7 +832,7 @@ function create_raw_vlan_for_br {
 ###############################################################################
 function create_raw_bond_for_br {
 
-    log_info "create_raw_bond_interface $@" 
+    log_info "create_raw_bond_interface $@"
     local lines=""
     local ifname=""
     local _mtu=""
@@ -875,7 +885,7 @@ function create_raw_bond_for_br {
 ###############################################################################
 function create_bridge_interface {
 
-    log_info "create_bridge_interface $@" 
+    log_info "create_bridge_interface $@"
     local lines=""
     local ifname="" #current bridge
     local xcatnet=""
@@ -885,7 +895,7 @@ function create_bridge_interface {
     local _pretype=""
     local _port=""  #pre nic
     local _mtu=""
-
+    rc=0
     # parser input arguments
     while [ -n "$1" ];
     do
@@ -906,7 +916,7 @@ function create_bridge_interface {
     # let's query "nicnetworks" table about its target "xcatnet"
     if [ -n "$ifname" -a -z "$xcatnet" -a -z "$_ipaddr" ]; then
         xcatnet=`query_nicnetworks_net $ifname`
-        log_info "Pickup xcatnet, \"$xcatnet\", from NICNETWORKS for interface \"$ifname\"." 
+        log_info "Pickup xcatnet, \"$xcatnet\", from NICNETWORKS for interface \"$ifname\"."
     fi
 
     # Query mtu value from "networks" table
@@ -917,7 +927,7 @@ function create_bridge_interface {
         fi
     fi
 
-    if [ x$_pretype == "xethernet" ]; then 
+    if [ x$_pretype == "xethernet" ]; then
         create_raw_ethernet_for_br \
             ifname=$_port \
             _bridge=$ifname \
@@ -927,14 +937,14 @@ function create_bridge_interface {
             ifname=$_port \
             _bridge=$ifname \
             _mtu=$_mtu
-            
+
     elif [ x$_pretype == "xbond" ]; then
         create_raw_bond_for_br \
             ifname=$_port \
             _bridge=$ifname \
             _mtu=$_mtu \
-            _bonding_opts="mode=802.3ad miimon=100" 
-    fi  
+            _bonding_opts="mode=802.3ad miimon=100"
+    fi
 
     add_br $ifname $_brtype
     add_if $ifname $_port $_brtype
@@ -942,7 +952,7 @@ function create_bridge_interface {
     [ -n "$_mtu" ] && $ip link set $ifname mtu $_mtu
 
     # log for debug
-   
+
     migrate_ip ifname=$ifname sports="$_port"
 
     # define and bring up bridge interface, if required.
@@ -955,10 +965,10 @@ function create_bridge_interface {
     fi
 
     if [ x$_brtype == x"bridge" ]; then
-    
+
         cfg="${cfg}${cfg:+,}TYPE=Bridge"
     elif [ x$_brtype == x"bridge_ovs" ]; then
-    
+
         cfg="${cfg}${cfg:+,}TYPE=OVSBridge"
 
     fi
@@ -970,8 +980,10 @@ function create_bridge_interface {
          inattrs="$cfg"
 
     # bring up interface formally
-    lines=`$ifdown $ifname; $ifup $ifname`
-    rc=$?
+    if [ $reboot_nic_bool -eq 1 ]; then
+        lines=`$ifdown $ifname; $ifup $ifname`
+        rc=$?
+    fi
     if [ $rc -ne 0 ]; then
         log_warn "ifup $ifname failed with return code equals to $rc"
         echo "$lines" \
@@ -1014,12 +1026,12 @@ function create_ethernet_interface {
         shift
     done
     if [ -z "$ifname" -a -z "$mport" ]; then
-        log_error "No valid \"ifname\" or \"mport\". Abort!" 
+        log_error "No valid \"ifname\" or \"mport\". Abort!"
         return 1
 
     # if caller only knows the real "mport", assume it is the defined "ifname".
     elif [ -z "$ifname" ]; then
-        log_info "Assume defined nic is the member nic \"$mport\"." 
+        log_info "Assume defined nic is the member nic \"$mport\"."
         ifname=$mport
     fi
     # let's query "nicnetworks" table about its target "xcatnet"
@@ -1029,7 +1041,7 @@ function create_ethernet_interface {
 
     # Verify if there could be valid ipaddr/netmask
     if [ -z "$xcatnet" -a -z "$_ipaddr" ]; then
-        log_error "No valid \"xcatnet\" or explicite \"_ipaddr/_netmask\". Abort!" 
+        log_error "No valid \"xcatnet\" or explicite \"_ipaddr/_netmask\". Abort!"
         return 1
     fi
 
@@ -1062,8 +1074,10 @@ function create_ethernet_interface {
         inattrs="$cfg"
 
     # bring up interface formally
-    true || lines=`$ifdown $ifname; $ifup $ifname`
-    rc=$?
+    if [ $reboot_nic_bool -eq 1 ]; then
+        lines=`$ifdown $ifname; $ifup $ifname`
+        rc=$?
+    fi
     if [ $rc -ne 0 ]; then
         log_warn "ifup $ifname failed with return code equals to $rc"
         echo "$lines" \
@@ -1076,7 +1090,7 @@ function create_ethernet_interface {
 
 ###############################################################################
 #
-# create vlan 
+# create vlan
 #
 # input : ifname=<ifname> slave_ports=<ports> xcatnet=<xcatnetwork> _ipaddr=<ip> _netmask=<netmask> _mtu=<mtu> _bridge=<bridge_name> vlanid=<vlanid>
 # return : 0 success
@@ -1121,7 +1135,7 @@ function create_vlan_interface {
     # let's query "nicnetworks" table about its target "xcatnet"
     if [ -n "$ifname" -a -z "$xcatnet" -a -z "$_ipaddr" -a -n "$vlanid" ]; then
         xcatnet=`query_nicnetworks_net $ifname.$vlanid`
-        log_info "Pickup xcatnet, \"$xcatnet\", from NICNETWORKS for interface \"$ifname\"." 
+        log_info "Pickup xcatnet, \"$xcatnet\", from NICNETWORKS for interface \"$ifname\"."
     fi
 
     # Query mtu value from "networks" table
@@ -1155,7 +1169,7 @@ function create_vlan_interface {
         return 1
     fi
 
-    # setup interface 
+    # setup interface
     [ -n "$_mtu" ] && $ip link set $ifname.$vlanid mtu $_mtu
     $ip link set $ifname.$vlanid up
     log_info "$ip link set $ifname.$vlanid up"
@@ -1173,11 +1187,11 @@ function create_vlan_interface {
     # generate vlan interface definition
     cfg=""
     cfg="${cfg}${cfg:+,}ONBOOT=yes"
-    
+
     if grep -q -i "release 6" /etc/redhat-release ; then
        cfg="${cfg}${cfg:+,}NM_CONTROLLED=no"
     fi
-    
+
     cfg="${cfg}${cfg:+,}USERCTL=no"
     cfg="${cfg}${cfg:+,}VLAN=yes"
     [ -n "$_mtu" ] && \
@@ -1188,8 +1202,10 @@ function create_vlan_interface {
         inattrs="$cfg"
     if [ x$xcatnet != x ]; then
         # bring up interface formally
-        lines=`$ifdown $ifname.$vlanid; $ifup $ifname.$vlanid`
-        rc=$?
+        if [ $reboot_nic_bool -eq 1 ]; then
+            lines=`$ifdown $ifname.$vlanid; $ifup $ifname.$vlanid`
+            rc=$?
+        fi
         if [ $rc -ne 0 ]; then
             log_warn "ifup $ifname.$vlanid failed with return code equals to $rc"
             echo "$lines" \
@@ -1210,7 +1226,7 @@ function create_vlan_interface {
 ###############################################################################
 function create_raw_ethernet_for_br {
 
-    log_info "create_raw_eth_interface_for_br $@" 
+    log_info "create_raw_eth_interface_for_br $@"
 
     local lines=""
     local ifname=""
@@ -1252,11 +1268,11 @@ function create_raw_ethernet_for_br {
 # https://www.kernel.org/doc/Documentation/networking/bonding.txt
 # https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/7/html/Networking_Guide/sec-Using_Channel_Bonding.html
 #
-# input : ifname=<nic> xcatnet=<xcatnetwork> _ipaddr=<ip> _netmask=<netmask> _bonding_opts=<bonding_opts> _mtu=<mtu> slave_ports=<port1,port2> 
+# input : ifname=<nic> xcatnet=<xcatnetwork> _ipaddr=<ip> _netmask=<netmask> _bonding_opts=<bonding_opts> _mtu=<mtu> slave_ports=<port1,port2>
 #
 ############################################################################################################################
 function create_bond_interface {
-    log_info "create_bond_interface $@" 
+    log_info "create_bond_interface $@"
 
     local lines=""
     local ifname=""
@@ -1298,10 +1314,10 @@ function create_bond_interface {
         slave_type="Infiniband"
         _bonding_opts="mode=1 miimon=100 fail_over_mac=1"
     fi
-    # let's query "nicnetworks" table about its target "xcatnet" 
+    # let's query "nicnetworks" table about its target "xcatnet"
     if [ -n "$ifname" -a -z "$xcatnet" -a -z "$_ipaddr" ]; then
         xcatnet=`query_nicnetworks_net $ifname`
-        log_info "Pickup xcatnet, \"$xcatnet\", from NICNETWORKS for interface \"$ifname\"." 
+        log_info "Pickup xcatnet, \"$xcatnet\", from NICNETWORKS for interface \"$ifname\"."
     fi
 
     local cnt
@@ -1311,7 +1327,7 @@ function create_bond_interface {
         _bonding_opts=`echo "$_bonding_opts" | $sed -e 's/,/ /g'`
     fi
 
-    # Query mtu value from "networks" table   
+    # Query mtu value from "networks" table
     if [ -z "$_mtu" ]; then
         _mtu=`get_network_attr $xcatnet mtu`
         if [ $? -ne 0 ]; then
@@ -1333,7 +1349,7 @@ function create_bond_interface {
         if [ $cnt -eq 0 -a ! -f /proc/net/bonding/$ifname ]; then
             # load the bonding module if not loaded.
             load_kmod module=bonding retry=10 interval=0.5
-    
+
             # create required bond device
             ((i=0))
             while ! grep -sq "\b$ifname\b" /sys/class/net/bonding_masters;
@@ -1344,7 +1360,7 @@ function create_bond_interface {
                 [ $i -ge 10 ] && break
             done
             if [ $i -ge 10 -o ! -f /proc/net/bonding/$ifname ]; then
-                log_error "stage 0: Fail to create bond device \"$ifname\"" 
+                log_error "stage 0: Fail to create bond device \"$ifname\""
                 break
             fi
 
@@ -1354,7 +1370,7 @@ function create_bond_interface {
             # 1.1) bring down bond interface before setup its attributes
             $ip link set $ifname down
             log_info "$ip link set $ifname down"
-            $ip link show $ifname | $sed -e 's/^/[bond.down] >> /g' | log_lines info 
+            $ip link show $ifname | $sed -e 's/^/[bond.down] >> /g' | log_lines info
 
             # 1.2) remove current slaves first
             local saved_slaves=$(</sys/class/net/$ifname/bonding/slaves)
@@ -1364,12 +1380,12 @@ function create_bond_interface {
             done
             lines=`$(</sys/class/net/$ifname/bonding/slaves)`
             if [ -n "$lines" ]; then
-                log_warn "stage 1: Cannot clean up bond slaves before setting up its attributes." 
+                log_warn "stage 1: Cannot clean up bond slaves before setting up its attributes."
                 echo "$lines" \
                 | $sed -e 's/[failed.slaves] >> /g' \
-                | log_lines info 
+                | log_lines info
             fi
-    
+
             # 1.3) apply bond options
             local option
             for option in $_bonding_opts
@@ -1379,19 +1395,19 @@ function create_bond_interface {
                 echo "$val" >/sys/class/net/$ifname/bonding/$key
                 rc=$?
                 if [ $rc -ne 0 ]; then
-                    log_warn "stage 1: Fail to set bonding option \"$key\" to \"$val\" in device \"$ifname\"" 
+                    log_warn "stage 1: Fail to set bonding option \"$key\" to \"$val\" in device \"$ifname\""
                     cat /sys/class/net/$ifname/bonding/$key \
                     | $sed -e 's/^/[bond.'$key'] >>/g' \
-                    | log_lines info 
+                    | log_lines info
                 fi
             done
-    
+
             # 1.4) restore saved bond slaves
             for ifslave in $saved_slaves
             do
                 echo "+$ifslave" >/sys/class/net/$ifname/bonding/slaves
             done
-            log_info "[bond.slavesAft] >> $(</sys/class/net/$ifname/bonding/slaves)" 
+            log_info "[bond.slavesAft] >> $(</sys/class/net/$ifname/bonding/slaves)"
 
         # Stage 2:
         # add slave ports
@@ -1405,18 +1421,18 @@ function create_bond_interface {
                     # the slave interface will be brought up implicitely after bonded to master.
                     $ip link set $ifslave down
                     log_info "$ip link set $ifslave down"
-    
+
                     # log for debug
                     $ip link show $ifslave | $sed -e 's/^/[slave]: >> /g' \
                     | log_lines info >&2
-        
+
                     echo "+$ifslave" >/sys/class/net/$ifname/bonding/slaves
                 fi
 
                 # define and bring up slave interfaces.
                 cfg=""
                 cfg="${cfg}${cfg:+,}ONBOOT=yes"
-                
+
                 if grep -q -i "release 6" /etc/redhat-release ; then
                     cfg="${cfg}${cfg:+,}NM_CONTROLLED=no"
                 fi
@@ -1433,7 +1449,7 @@ function create_bond_interface {
                     inattrs="$cfg"
             done
             # log for debug
-            log_info "[bond.slavesNew] >> $(</sys/class/net/$ifname/bonding/slaves)" 
+            log_info "[bond.slavesNew] >> $(</sys/class/net/$ifname/bonding/slaves)"
 
             # 2.2) apply other bond interface options on the fly
             [ -n "$_mtu" ] && $ip link set $ifname mtu $_mtu
@@ -1447,10 +1463,10 @@ function create_bond_interface {
             wait_for_ifstate $ifname UP 200 1
             rc=$?
             # log for debug
-            $ip link show $ifname | $sed -e 's/^/[ip.link] >> /g' | log_lines info 
+            $ip link show $ifname | $sed -e 's/^/[ip.link] >> /g' | log_lines info
 
             if [ $rc -ne 0 ]; then
-                log_warn "stage 3: Fail to bring up bond interface \"$ifname\"" 
+                log_warn "stage 3: Fail to bring up bond interface \"$ifname\""
                 break
             fi
         fi
@@ -1459,7 +1475,7 @@ function create_bond_interface {
     done
     test $cnt -eq 4
     rc=$?
-    
+
     # migrate slave ports ip and route to bond master
     #[ $_g_migrate_ip -eq 1 ] && \
     #migrate_ip ifname=$ifname sports="$slave_ports"
@@ -1468,11 +1484,11 @@ function create_bond_interface {
     # DHCLIENTARGS is optional, but default to have.
     cfg=""
     cfg="${cfg}${cfg:+,}ONBOOT=yes"
-                
+
     if grep -q -i "release 6" /etc/redhat-release ; then
         cfg="${cfg}${cfg:+,}NM_CONTROLLED=no"
     fi
-    
+
     cfg="${cfg}${cfg:+,}USERCTL=no"
     cfg="${cfg}${cfg:+,}TYPE=Bond"
     cfg="${cfg}${cfg:+,}BONDING_MASTER=yes"
@@ -1486,8 +1502,10 @@ function create_bond_interface {
         xcatnet=$xcatnet \
         inattrs="$cfg"
     if [ x$xcatnet != x ]; then
-        lines=`$ifdown $ifname; $ifup $ifname 2>&1`
-        rc=$?
+        if [ $reboot_nic_bool -eq 1 ]; then
+            lines=`$ifdown $ifname; $ifup $ifname 2>&1`
+            rc=$?
+        fi
         if [ $rc -ne 0 ]; then
             log_warn "ifup $ifname failed with return code equals to $rc"
             echo "$lines" \
@@ -1511,7 +1529,7 @@ function create_bond_interface {
 #
 # base64 encoded, decode first
 #
-# input : string 
+# input : string
 #
 ############################################################################
 function decode_arguments {
diff --git a/xCAT/postscripts/odbcsetup b/xCAT/postscripts/odbcsetup
index 61350432d..142d6ac92 100755
--- a/xCAT/postscripts/odbcsetup
+++ b/xCAT/postscripts/odbcsetup
@@ -6,12 +6,12 @@
 
 #-----------------------------------------------------------------------------
 
-=head1   odbcsetup 
+=head1   odbcsetup
 
- This postscript sets up the odbc for the database running on the Client 
+ This postscript sets up the odbc for the database running on the Client
  machine usually the Service Node.
  The xCAT service node client and the DB client should have already been
- installed on the node, before this postscript is run. 
+ installed on the node, before this postscript is run.
 =cut
 
 #-----------------------------------------------------------------------------
diff --git a/xCAT/postscripts/ospkgs b/xCAT/postscripts/ospkgs
index 6b6100e42..4c6d095ef 100755
--- a/xCAT/postscripts/ospkgs
+++ b/xCAT/postscripts/ospkgs
@@ -1,25 +1,25 @@
-#!/bin/bash  
+#!/bin/bash
 # IBM(c) 2010 EPL license http://www.eclipse.org/legal/epl-v10.html
 #-------------------------------------------------------------------------------
 #=head1  ospkgs
-#=head2  Used on Linux only. It installs/updates the rpms thta are from OS distro. 
+#=head2  Used on Linux only. It installs/updates the rpms thta are from OS distro.
 #        The environment variable OSPKGS contains the rpms to be installed/updated.
 #        On MN, You need to:
 #        1. update the rpms under /install/os/arch/... directory where 'os' and 'arch'
 #           can be found in the nodetype table.
-#        2. put new package names to /install/custom/netboot(install)/platform or 
+#        2. put new package names to /install/custom/netboot(install)/platform or
 #           /opt/xcat/share/xcat/netboot(install)/platform
 #           directory. The file name is one of the following:
-#              profile.os.arch.pkglist  
-#              profile.os.pkglist   
-#              profile.arch.pkglist  
+#              profile.os.arch.pkglist
+#              profile.os.pkglist
+#              profile.arch.pkglist
 #              profile.pkglist
 #  You can run the following commands to install/update the rpms from os distro.
-#       updatenode noderange ospkgs 
+#       updatenode noderange ospkgs
 #       updatenode noderange -S    (this one intslls/updates rpms from os distro as well as otherpkgs)
 #       updatenode noderange -P "ospkgs --keeprepo"  (this one will preserve the original repositories when installing/updating the rpms. )
-#    
-#   
+#
+#
 #=cut
 #-------------------------------------------------------------------------------
 
@@ -179,9 +179,9 @@ fi
 #if [ -z "$UPDATENODE" ] || [ $UPDATENODE -ne 1 ]; then
 #    echo "  Did not install any extra rpms."
 #    exit 0
-#fi 
+#fi
 
-if [ -z "$OSPKGS" ]; then 
+if [ -z "$OSPKGS" ]; then
    echo "$0: no extra rpms to install"
    exit 0
 fi
@@ -208,21 +208,21 @@ if [ -z "$INSTALLDIR" ]; then
     INSTALLDIR="/install"
 fi
 
-#check if /install is mounted on the server, we may need to add code to conver NFSSERVER to ip 
+#check if /install is mounted on the server, we may need to add code to conver NFSSERVER to ip
 mounted=0;
 result=`mount |grep " $INSTALLDIR " |grep $NFSSERVER`
 if [ $? -eq 0 ]; then
     NFSSERVER="/install"
-    mounted=1 
+    mounted=1
 fi
 
 if [ -z "$OSPKGDIR" ]; then
     OSPKGDIR="$INSTALLDIR/$OSVER/$ARCH"
 fi
 
-if [ "$KERNELDIR" != "" ]; then 
+if [ "$KERNELDIR" != "" ]; then
     OSPKGDIR="$OSPKGDIR,$KERNELDIR"
-fi 
+fi
 
 OIFS=$IFS
 IFS=$','
@@ -230,25 +230,25 @@ if ( pmatch "$OSVER" "ubuntu*" ); then
     IFS=$(printf ',')
 fi
 
-array_ospkgdirs=($OSPKGDIR)   
+array_ospkgdirs=($OSPKGDIR)
 
-#initialize the array "os_path" with all the valid repository paths 
+#initialize the array "os_path" with all the valid repository paths
 #under the directories specified in "OSPKGDIR"
 
 array_empty os_path
 index=0
-for dir in  ${array_ospkgdirs[@]}  
+for dir in  ${array_ospkgdirs[@]}
 do
-     
+
     default_pkgdir="$INSTALLDIR/$OSVER/$ARCH"
-    OSPKGDIR="$OSPKGDIR" 
+    OSPKGDIR="$OSPKGDIR"
     if [ $mounted -eq 0 ]; then
-        #OSPKGDIR="$OSPKGDIR" 
+        #OSPKGDIR="$OSPKGDIR"
         ospkgdir="$NFSSERVER$dir"
-    else 
+    else
         ospkgdir="$dir"
     fi
-    
+
     # for the os base pkg dir(default_pkgdir) , there are some special cases.
     # (1)for rhels6, there is one repodata in the os base dir; so keep it here, and handle the other cases below
     # (2)for sles, we should specified the baseurl should be ./install/sles11/ppc64/1
@@ -265,37 +265,37 @@ do
         fi
     fi
     array_set_element os_path $index $ospkgdir
-     
+
     if ( pmatch "$OSVER" "rhel*" ); then
         #default_pkgdir="$INSTALLDIR/$OSVER/$ARCH"
         if [ $dir == $default_pkgdir ] || [ $dir == "$default_pkgdir/" ]; then
-      
+
             if ( pmatch "$OSVER" "rhels6*" ); then
                if [ $ARCH == "ppc64" ]; then
                    ospkgdir_ok="$ospkgdir/Server"
-                   index=$(expr $index + 1)          
+                   index=$(expr $index + 1)
                    array_set_element os_path $index $ospkgdir_ok
-               fi               
+               fi
 
                if [ $ARCH == "x86_64" ]; then
-                    for arg in "Server" "ScalableFileSystem" "HighAvailability" "ResilientStorage" "LoadBalancer" 
+                    for arg in "Server" "ScalableFileSystem" "HighAvailability" "ResilientStorage" "LoadBalancer"
                     do
                         ospkgdir_ok="$ospkgdir/$arg"
-                        index=$(expr $index + 1)          
+                        index=$(expr $index + 1)
                         array_set_element os_path $index $ospkgdir_ok
                     done
-                fi               
+                fi
 
             elif ( pmatch "$OSVER" "rhels5*" ); then
                  # for rhels5, the repodata is in ./Server, ./Cluster, ./CusterStorage, not in ./
                  ospkgdir_ok="$ospkgdir/Server"
                  array_set_element os_path $index $ospkgdir_ok
-           
+
                  if [ $ARCH == "x86_64" ]; then
                      for arg in "Cluster" "ClusterStorage"
                      do
                          ospkgdir_ok="$ospkgdir/$arg"
-                         index=$(expr $index + 1)          
+                         index=$(expr $index + 1)
                          array_set_element os_path $index $ospkgdir_ok
                      done
                  fi   # x86_64
@@ -303,20 +303,20 @@ do
          fi  # eq default_pkgdir
       fi    # match rhel*
 
-      index=$(expr $index + 1)          
-        
-done    
+      index=$(expr $index + 1)
+
+done
 
 IFS=$OIFS
- 
 
 
-#if [ "$SDKDIR" != "" ]; then 
+
+#if [ "$SDKDIR" != "" ]; then
 #    if [ $mounted -eq 0 ]; then
 #        SDKDIR="$NFSSERVER/$SDKDIR"
 #    fi
 #fi
-    
+
 #if [ $mounted -eq 0 ]; then
 #    OSPKGDIR_NO_PREFIX=${OSPKGDIR#$INSTALLDIR}
 
@@ -332,7 +332,7 @@ logger -t xcat -p local4.info "OSPKGS=$OSPKGS"
 if [ $debug -ne 0 ]; then
     echo NFSSERVER=$NFSSERVER
     echo OSPKGDIR=$OSPKGDIR
-    echo OSPKGS = $OSPKGS 
+    echo OSPKGS = $OSPKGS
 fi
 
 pkgs=''  #packages
@@ -348,7 +348,7 @@ if ( pmatch "$OSVER" "ubuntu*" ); then
 fi
 pkgarray=($OSPKGS)
 
-#parse the pkglist file, categorize the pkglist entries according to 
+#parse the pkglist file, categorize the pkglist entries according to
 #the type(package/group/patterns) and action(install/remove)
 for x in ${pkgarray[@]};
 do
@@ -360,13 +360,13 @@ do
     x=`echo $x |sed 's/^ *//;s/ *$//'`
     #echo "x=$x"
     pos=`expr index  "$x" -`
-    if [ $pos -eq 1 ]; then 
+    if [ $pos -eq 1 ]; then
        remove=1
        x=${x#-}
     fi
 
     pos=`expr index  "$x" @`
-    if [ $pos -eq 1 ]; then 
+    if [ $pos -eq 1 ]; then
         #remove leading @
         tmp=${x#@}
         #remove leading and trailing spaces
@@ -376,7 +376,7 @@ do
         if [ $pos -gt 0  ]; then
            tmp="\"$tmp\""
         fi
-        
+
         #categorize the groups according to the action(install/remove)
         if [ $remove -eq 0 ]; then
     	   groups="$groups $tmp"
@@ -385,7 +385,7 @@ do
         fi
     else
         if ( pmatch  "$x" "cuda*" ); then
-            cudapkgs="$cudapkgs $x" 
+            cudapkgs="$cudapkgs $x"
         else
             #categorize the packages according to the action(install/remove)
             if [ $remove -eq 0 ]; then
@@ -410,7 +410,7 @@ if [ $debug -ne 0 ]; then
 fi
 
 #perform the software maintenance with the available package management tools, the process:
-#1.make sure the necessary package management tool is available 
+#1.make sure the necessary package management tool is available
 #2.enable all the available repositories and refresh the relevant metadata
 #3.upgrade all the existing packages
 #4.install specified package groups if any
@@ -420,7 +420,7 @@ fi
 if ( pmatch "$OSVER" "sles10*" ); then
     #check if rug is installed
     result=`rpm -q rug`
-    if [ $? -ne 0 ]; then 
+    if [ $? -ne 0 ]; then
 	echo "Please install rug on $NODE."
 	exit 1
     fi
@@ -446,18 +446,18 @@ if ( pmatch "$OSVER" "sles10*" ); then
         path="dir://$OSPKGDIR"
     fi
     result=`rug sa $path $OSVER`
-    if [ $? -ne 0 ]; then 
+    if [ $? -ne 0 ]; then
 	logger -t xcat -p local4.info "ospkgs: rug sa $path $OSVER\n    $result"
 	echo "ospkgs: rug sa $path $OSVER"
 	echo "    $result"
     fi
     result=`rug sub $OSVER`
-    if [ $? -ne 0 ]; then 
+    if [ $? -ne 0 ]; then
 	logger -t xcat -p local4.info "ospkgs: rug sub $OSVER\n    $result"
 	echo "ospkgs: rug sub $OSVER"
 	echo "    $result"
     fi
-    result=`rug refresh 2>&1` 
+    result=`rug refresh 2>&1`
     if [ $debug -ne 0 ]; then
 	echo "rug refresh"
 	echo $result
@@ -534,7 +534,7 @@ if ( pmatch "$OSVER" "sles10*" ); then
 elif ( pmatch "$OSVER" "sles*" ); then
     #check if zypper is installed
     result=`rpm -q zypper`
-    if [ $? -ne 0 ]; then 
+    if [ $? -ne 0 ]; then
 	echo "Please install zypper on $NODE."
 	exit 1
     fi
@@ -555,8 +555,8 @@ elif ( pmatch "$OSVER" "sles*" ); then
 
     SUM=$(array_get_size os_path)
     i=0
-   
-    if [ $SUM -eq 0 ]; then 
+
+    if [ $SUM -eq 0 ]; then
 
         if [ $mounted -eq 0 ]; then
 	    path="http://$OSPKGDIR"
@@ -564,15 +564,15 @@ elif ( pmatch "$OSVER" "sles*" ); then
             path="file://$OSPKGDIR"
         fi
         result=`zypper ar $path xCAT-$OSVER 2>&1`
-        if [ $? -ne 0 ]; then 
-	    if ( ! pmatch "$result" "*exists*" ); then 
+        if [ $? -ne 0 ]; then
+	    if ( ! pmatch "$result" "*exists*" ); then
 	        logger -t xcat -p local4.info "ospkgs: zypper ar $path xCAT-$OSVER\n    $result"
 	        echo "ospkgs: zypper ar $path xCAT-OSVER"
 	        echo "    $result"
 	    fi
         fi
-    else 
-        while [ $i -lt $SUM ]; do 
+    else
+        while [ $i -lt $SUM ]; do
             OSPKGDIR=$(array_get_element os_path $i)
             if [ $mounted -eq 0 ]; then
                 path="http://$OSPKGDIR"
@@ -580,15 +580,15 @@ elif ( pmatch "$OSVER" "sles*" ); then
                 path="file://$OSPKGDIR"
             fi
             result=`zypper ar $path xCAT-$OSVER-"path$i"  2>&1`
-            if [ $? -ne 0 ]; then 
-	        if ( ! pmatch "$result" "*exists*" ); then 
+            if [ $? -ne 0 ]; then
+	        if ( ! pmatch "$result" "*exists*" ); then
 	            logger -t xcat -p local4.info "ospkgs: zypper ar $path xCAT-$OSVER-path$i\n    $result"
 	            echo "ospkgs: zypper ar $path xCAT-$OSVER-path$i"
 	            echo "    $result"
 	        fi
             fi
-           
-            i=$((i+1)) 
+
+            i=$((i+1))
         done
     fi
 
@@ -617,7 +617,7 @@ elif ( pmatch "$OSVER" "sles*" ); then
         IFS=$OIFS
     fi
 
-    result=`zypper --non-interactive --no-gpg-checks refresh 2>&1` 
+    result=`zypper --non-interactive --no-gpg-checks refresh 2>&1`
     if [ $debug -ne 0 ]; then
 	echo "zypper --non-interactive refresh"
 	echo $result
@@ -675,7 +675,7 @@ elif ( pmatch "$OSVER" "sles*" ); then
     fi
 
 
-    
+
     #remove  patterns if any
     if [ -n "$groups_d" ]; then
 	cmd="$ENVLIST zypper remove -y  -t pattern $groups_d"
@@ -730,7 +730,7 @@ elif ( pmatch "$OSVER" "ubuntu*" ); then
         # check whether the os package path in primary apt source (/etc/apt/sources.list) or not
         # if the os package path does not exist in /etc/apt/sources.list,
         # create apt source file in /etc/apt/sources.list.d
-        
+
         # replace space with "===" to avoid the string split issue
         OSPKGDIR=`echo $OSPKGDIR | sed 's/\ /===/g'`
 
@@ -779,8 +779,8 @@ elif ( pmatch "$OSVER" "ubuntu*" ); then
                    RETURNVAL=$R
                 fi
 	fi
-  
-        #remove package group is not supported in ubuntu, 
+
+        #remove package group is not supported in ubuntu,
         #cause there is no  rpm-like "groups" supported by dpkg/apt
 
 	# install packages
@@ -794,7 +794,7 @@ elif ( pmatch "$OSVER" "ubuntu*" ); then
                 fi
 	fi
         if [ -n "$cudapkgs" ]; then
-                
+
                 command="$ENVLIST apt-get -q -y --force-yes install --no-install-recommends $cudapkgs"
                 echo "=== $command"
                 # the nvidia-346 postinstall script will trigger the building of nvidia driver, it will use the ARCH environment parameter, unset the ARCH env variable will resolve this issue
@@ -820,10 +820,10 @@ elif ( pmatch "$OSVER" "ubuntu*" ); then
                    RETURNVAL=$R
                 fi
 	fi
-else 
+else
     #check if yum is installed
     result=`rpm -q yum`
-    if [ $? -ne 0 ]; then 
+    if [ $? -ne 0 ]; then
 	echo "Please install yum on $NODE."
 	exit 1;
     fi
@@ -836,15 +836,15 @@ else
         fi
         rm /etc/yum.repos.d/$OSVER-path*.repo >/dev/null 2>&1
         result=`rm /etc/yum.repos.d/xCAT-$OSVER-path*.repo 2>&1`
-        result=`rm /etc/yum.repos.d/xCAT-otherpkgs*.repo 2>&1` 
+        result=`rm /etc/yum.repos.d/xCAT-otherpkgs*.repo 2>&1`
     fi
 
     result=`yum clean all`
 
     SUM=$(array_get_size os_path)
     i=0
-   
-    while [ $i -lt $SUM ]; do 
+
+    while [ $i -lt $SUM ]; do
            REPOFILE="/etc/yum.repos.d/xCAT-$OSVER-path$i.repo"
            OSPKGDIR=$(array_get_element os_path $i)
 
@@ -859,9 +859,9 @@ else
 	       echo "enabled=1" >> $REPOFILE
 	       echo "gpgcheck=0" >> $REPOFILE
            fi
-           i=$((i+1)) 
-     done  
- 
+           i=$((i+1))
+     done
+
     #import the release key?
     #my $key = "$installDIR/$os/$arch/RPM-GPG-KEY-redhat-release";
     #my $tmp = "/tmp/RPM-GPG-KEY-redhat-release";
@@ -921,7 +921,7 @@ else
 	    fi
 	fi
     fi
-    
+
     #install cuda package if any
     if [ -n "$cudapkgs" ]; then
         cmd="$ENVLIST yum -y install $cudapkgs"
diff --git a/xCAT/postscripts/otherpkgs b/xCAT/postscripts/otherpkgs
index eb17aae10..a97cb73f7 100755
--- a/xCAT/postscripts/otherpkgs
+++ b/xCAT/postscripts/otherpkgs
@@ -10,15 +10,15 @@
 #           can be found in the nodetype table.
 #        2. put the name of the packages to /opt/xcat/share/xcat/netboot(install)/platform
 #           directory. The file name is one of the following:
-#              profile.os.arch.otherpkgs.pkglist  
-#              profile.os.otherpkgs.pkglist   
-#              profile.arch.otherpkgs.pkglist  
+#              profile.os.arch.otherpkgs.pkglist
+#              profile.os.otherpkgs.pkglist
+#              profile.arch.otherpkgs.pkglist
 #              profile.otherpkgs.pkglist
-#   The install/deployment process will pick up the rpms and install them on the nodes. 
+#   The install/deployment process will pick up the rpms and install them on the nodes.
 #   However, if the nodes have already installed and up and running, you can run the following
 #   command to have the extra rpms installed:
-#       updatenode noderange otherpkgs 
-#   
+#       updatenode noderange otherpkgs
+#
 #=cut
 #-------------------------------------------------------------------------------
 
@@ -28,7 +28,7 @@
 if [ -f /etc/os-release ] && cat /etc/os-release |grep -i -e "^NAME=[ \"']*Cumulus Linux[ \"']*$" >/dev/null 2>&1 ; then
    #TODO
    echo "Cumulus OS is not supported yet, nothing to do..."
-   logger -t xcat -p local4.info "Cumulus OS is not supported yet, nothing to do..."   
+   logger -t xcat -p local4.info "Cumulus OS is not supported yet, nothing to do..."
    exit 0
 fi
 
@@ -219,14 +219,14 @@ if [ -z "$UPDATENODE" ] || [ $UPDATENODE -ne 1 ]; then
   if [ "$NODESETSTATE" = "netboot" -o \
      "$NODESETSTATE" = "statelite" -o \
      "$NODESETSTATE" = "diskless" -o \
-     "$NODESETSTATE" = "dataless" ] 
+     "$NODESETSTATE" = "dataless" ]
   then
       echo "  Did not install any extra packages."
       exit 0
   fi
-fi 
+fi
 
-if [ -z "$OTHERPKGS_INDEX" ]; then 
+if [ -z "$OTHERPKGS_INDEX" ]; then
   echo "$0: no extra rpms to install"
   exit 0
 fi
@@ -243,7 +243,7 @@ fi
 mounted=0;
 result=`mount |grep " $INSTALLDIR " |grep $NFSSERVER`
 if [ $? -eq 0 ]; then
-    mounted=1 
+    mounted=1
 fi
 
 if [ -n "$OTHERPKGDIR" ]; then
@@ -271,10 +271,10 @@ if [ -z "$OTHERPKGDIR" ]; then
     else
         OTHERPKGDIR="$INSTALLDIR/post/otherpkgs/$OSVER/$ARCH"
     fi
- 
+
     if ( pmatch "$OSVER" "ubuntu*" ); then
         OTHERPKGDIR=""
-    fi 
+    fi
 else
     if [ $mounted -eq 0 ]; then
 	OTHERPKGDIR=${NFSSERVER}${OTHERPKGDIR}
@@ -282,12 +282,12 @@ else
 fi
 
 #########################
-##start collecting the repositories for os 
+##start collecting the repositories for os
 if [ -z "$OSPKGDIR" ]; then
     OSPKGDIR="$INSTALLDIR/$OSVER/$ARCH"
 fi
-    
-if [ "$KERNELDIR" != "" ]; then 
+
+if [ "$KERNELDIR" != "" ]; then
     OSPKGDIR="$OSPKGDIR,$KERNELDIR"
 fi
 
@@ -297,22 +297,22 @@ fi
         IFS=$(printf ',')
     fi
 
-    array_ospkgdirs=($OSPKGDIR)   
+    array_ospkgdirs=($OSPKGDIR)
     IFS=$OIFS
     array_empty os_path
     index=0
-    for dir in  ${array_ospkgdirs[@]}  
+    for dir in  ${array_ospkgdirs[@]}
     do
-         
+
         default_pkgdir="$INSTALLDIR/$OSVER/$ARCH"
-        OSPKGDIR="$OSPKGDIR" 
+        OSPKGDIR="$OSPKGDIR"
         if [ $mounted -eq 0 ]; then
-            #OSPKGDIR="$OSPKGDIR" 
+            #OSPKGDIR="$OSPKGDIR"
             ospkgdir="$NFSSERVER$dir"
-        else 
+        else
             ospkgdir="$dir"
         fi
-        
+
         # for the os base pkg dir(default_pkgdir) , there are some special cases.
         # (1)for rhels6, there is one repodata in the os base dir; so keep it here, and handle the other cases below
         # (2)for sles, we should specified the baseurl should be ./install/sles11/ppc64/1
@@ -329,37 +329,37 @@ fi
             fi
         fi
         array_set_element os_path $index $ospkgdir
-         
+
         if ( pmatch "$OSVER" "rhel*" ); then
             #default_pkgdir="$INSTALLDIR/$OSVER/$ARCH"
             if [ $dir == $default_pkgdir ] || [ $dir == "$default_pkgdir/" ]; then
-          
+
                 if ( pmatch "$OSVER" "rhels6*" ); then
                    if [ $ARCH == "ppc64" ]; then
                        ospkgdir_ok="$ospkgdir/Server"
-                       index=$(expr $index + 1)          
+                       index=$(expr $index + 1)
                        array_set_element os_path $index $ospkgdir_ok
-                   fi               
- 
+                   fi
+
                    if [ $ARCH == "x86_64" ]; then
-                        for arg in "Server" "ScalableFileSystem" "HighAvailability" "ResilientStorage" "LoadBalancer" 
+                        for arg in "Server" "ScalableFileSystem" "HighAvailability" "ResilientStorage" "LoadBalancer"
                         do
                             ospkgdir_ok="$ospkgdir/$arg"
-                            index=$(expr $index + 1)          
+                            index=$(expr $index + 1)
                             array_set_element os_path $index $ospkgdir_ok
                         done
-                    fi               
+                    fi
 
                 elif ( pmatch "$OSVER" "rhels5*" ); then
                      # for rhels5, the repodata is in ./Server, ./Cluster, ./CusterStorage, not in ./
                      ospkgdir_ok="$ospkgdir/Server"
                      array_set_element os_path $index $ospkgdir_ok
-               
+
                      if [ $ARCH == "x86_64" ]; then
                          for arg in "Cluster" "ClusterStorage"
                          do
                              ospkgdir_ok="$ospkgdir/$arg"
-                             index=$(expr $index + 1)          
+                             index=$(expr $index + 1)
                              array_set_element os_path $index $ospkgdir_ok
                          done
                      fi   # x86_64
@@ -367,20 +367,20 @@ fi
              fi  # eq default_pkgdir
           fi    # match rhel*
 
-          index=$(expr $index + 1)          
-            
-    done    
+          index=$(expr $index + 1)
+
+    done
 
 #fi
 
 
-#if [ "$SDKDIR" != "" ]; then 
+#if [ "$SDKDIR" != "" ]; then
 #    if [ $mounted -eq 0 ]; then
 #        SDKDIR="$NFSSERVER/$SDKDIR"
 #    fi
 #fi
 
-##end collecting the repositories for os 
+##end collecting the repositories for os
 #########################
 if [ $VERBOSE  ]; then
   echo NFSSERVER=$NFSSERVER
@@ -395,12 +395,12 @@ logger -p local4.info -t xcat "OTHERPKGDIR=$OTHERPKGDIR"
 #    dhcpcd -n $PRIMARYNIC
 #fi
 
-#check if the node has yum or zypper installed, it will try yum first, then zypper and last rpm 
-# for rpm based machines, or check if apt is installed, then it will use apt then dpkg 
+#check if the node has yum or zypper installed, it will try yum first, then zypper and last rpm
+# for rpm based machines, or check if apt is installed, then it will use apt then dpkg
 
 hasrpm=0
-hasyum=0  
-haszypper=0        
+hasyum=0
+haszypper=0
 hasapt=0
 hasdpkg=0
 supdatecommand="rpm -Uvh --replacepkgs"
@@ -450,8 +450,8 @@ if ( ! ( pmatch "$OSVER" "sles10*" ) && [ $haszypper -eq 1 ] ); then
 
     SUM=$(array_get_size os_path)
     i=0
-   
-    if [ $SUM -eq 0 ]; then 
+
+    if [ $SUM -eq 0 ]; then
 
         if [ $mounted -eq 0 ]; then
 	    path="http://$OSPKGDIR"
@@ -459,8 +459,8 @@ if ( ! ( pmatch "$OSVER" "sles10*" ) && [ $haszypper -eq 1 ] ); then
             path="file://$OSPKGDIR"
         fi
         result=`zypper ar $path xCAT-$OSVER 2>&1`
-        if [ $? -ne 0 ]; then 
-	    if ( ! pmatch "$result" "*exists*" ); then 
+        if [ $? -ne 0 ]; then
+	    if ( ! pmatch "$result" "*exists*" ); then
 	        logger -t xcat -p local4.info "ospkgs: zypper ar $path xCAT-$OSVER\n    $result"
                 if [ $VERBOSE  ]; then
 	          echo "ospkgs: zypper ar $path xCAT-$OSVER"
@@ -468,8 +468,8 @@ if ( ! ( pmatch "$OSVER" "sles10*" ) && [ $haszypper -eq 1 ] ); then
 	        fi
 	    fi
         fi
-    else 
-        while [ $i -lt $SUM ]; do 
+    else
+        while [ $i -lt $SUM ]; do
             OSPKGDIR=$(array_get_element os_path $i)
             if [ $mounted -eq 0 ]; then
                 path="http://$OSPKGDIR"
@@ -477,8 +477,8 @@ if ( ! ( pmatch "$OSVER" "sles10*" ) && [ $haszypper -eq 1 ] ); then
                 path="file://$OSPKGDIR"
             fi
             result=`zypper ar $path xCAT-$OSVER-"path$i"  2>&1`
-            if [ $? -ne 0 ]; then 
-	        if ( ! pmatch "$result" "*exists*" ); then 
+            if [ $? -ne 0 ]; then
+	        if ( ! pmatch "$result" "*exists*" ); then
 	            logger -t xcat -p local4.info "ospkgs: zypper ar $path xCAT-$OSVER-path$i\n    $result"
                   if [ $VERBOSE  ]; then
 	            echo "ospkgs: zypper ar $path xCAT-$OSVER-path$i"
@@ -486,8 +486,8 @@ if ( ! ( pmatch "$OSVER" "sles10*" ) && [ $haszypper -eq 1 ] ); then
 	          fi
 	        fi
             fi
-           
-            i=$((i+1)) 
+
+            i=$((i+1))
         done
     fi
 
@@ -518,9 +518,9 @@ if ( ! ( pmatch "$OSVER" "sles10*" ) && [ $haszypper -eq 1 ] ); then
         IFS=$OIFS
     fi
 
-    result=`zypper --non-interactive --no-gpg-checks refresh 2>&1` 
+    result=`zypper --non-interactive --no-gpg-checks refresh 2>&1`
 
-elif ( ((pmatch "$OSVER" "rhel*") || (pmatch "$OSVER" "centos*") || (pmatch "$OSVER" "SL*")) && [ $hasyum -eq 1 ] ); then 
+elif ( ((pmatch "$OSVER" "rhel*") || (pmatch "$OSVER" "centos*") || (pmatch "$OSVER" "SL*")) && [ $hasyum -eq 1 ] ); then
     #remove old repo
     mkdir -p /etc/yum.repos.d
     if [ -r "/etc/yum.repos.d/local-repository.repo" ]; then
@@ -534,8 +534,8 @@ elif ( ((pmatch "$OSVER" "rhel*") || (pmatch "$OSVER" "centos*") || (pmatch "$OS
 
     SUM=$(array_get_size os_path)
     i=0
-  
-      while [ $i -lt $SUM ]; do 
+
+      while [ $i -lt $SUM ]; do
            REPOFILE="/etc/yum.repos.d/xCAT-$OSVER-path$i.repo"
            OSPKGDIR=$(array_get_element os_path $i)
 
@@ -551,8 +551,8 @@ elif ( ((pmatch "$OSVER" "rhel*") || (pmatch "$OSVER" "centos*") || (pmatch "$OS
 	       echo "enabled=1" >> $REPOFILE
 	       echo "gpgcheck=0" >> $REPOFILE
            fi
-           i=$((i+1)) 
-      done  
+           i=$((i+1))
+      done
 fi
 
 ##end generating the os pkg repositories
@@ -568,11 +568,11 @@ fi
 #  through this loop)
 op_index=1
 #echo "OTHERPKGS_INDEX = $OTHERPKGS_INDEX"
-while [ $op_index -le $OTHERPKGS_INDEX ]; do 
+while [ $op_index -le $OTHERPKGS_INDEX ]; do
     eval pkglist=\$OTHERPKGS$op_index
     eval envlist=\$ENVLIST$op_index
     #echo "pkglist = $pkglist"
-    if [ $hasyum -eq 1 ]; then 
+    if [ $hasyum -eq 1 ]; then
         mkdir -p /etc/yum.repos.d
         result=`rm /etc/yum.repos.d/xCAT-otherpkgs*.repo 2>&1`
         result=`yum clean all`
@@ -612,12 +612,12 @@ while [ $op_index -le $OTHERPKGS_INDEX ]; do
     echo "yum: $hasyum, apt: $hasapt, zypper: $haszypper"
     for x in ${pkgsarray[@]}
     do
-        #check if the file name starts with -- or -. 
+        #check if the file name starts with -- or -.
         #If it is start with -,  then the rpm must be removed before installing other packages
         #If it is start with --, then the rpm will be removed after  installing other packages
         string_type=0;  #nornmal rpm
         pos=`expr index  $x -`
-        if [ $pos -eq 1 ]; then 
+        if [ $pos -eq 1 ]; then
 	    x=`echo ${x#-}`
 	    pos=`expr index  $x -`
 	    if [ $pos -eq 1 ]; then
@@ -627,7 +627,7 @@ while [ $op_index -le $OTHERPKGS_INDEX ]; do
 	        string_type=-1 #start with -
 	    fi
         fi
-	    
+	
         if [ $hasyum -eq 0 ] && [ $haszypper -eq 0 ] && [ $hasapt -eq 0 ]; then
 	    if [  $string_type -eq -1 ]; then
 	        plain_pkgs_preremove="$plain_pkgs_preremove $x"
@@ -668,7 +668,7 @@ while [ $op_index -le $OTHERPKGS_INDEX ]; do
 		        fi
 		        j=$((j+1))
 		    done
-		    break 
+		    break
 	        fi
 	        i=$((i+1))
 	    done
@@ -718,12 +718,12 @@ while [ $op_index -le $OTHERPKGS_INDEX ]; do
                         done
                         IFS=$OLDIFS
                     fi
-		fi 
+		fi
 	    fi
-	        if [ $hasyum -eq 1 ]; then 
+	        if [ $hasyum -eq 1 ]; then
 	            #use yum
 		    result=`yum --showduplicates list $fn 2>&1`
-		    if [ $? -eq 0 ]; then  
+		    if [ $? -eq 0 ]; then
 		        rc=0
 		        array_set_element repo_path $index $path
 		    #else
@@ -740,7 +740,7 @@ EOF`
                     fi
 
 		    result=`zypper --non-interactive refresh xcat-otherpkgs$index 2>&1`
-		    if [ $? -eq 0 ]; then  
+		    if [ $? -eq 0 ]; then
 		        rc=0
 		        array_set_element repo_path $index $path
 		    else
@@ -752,12 +752,12 @@ EOF`
 		            result=`zypper sd xcat-otherpkgs$index`
                         fi
 		    fi
-		elif [ $hasapt -eq 1 ]; then 
+		elif [ $hasapt -eq 1 ]; then
 		    #use apt
 			apt_get_update_if_repos_changed $REPOFILE
 			result=`apt-cache show $fn 2>&1`
 
-		    if [ $? -eq 0 ]; then  
+		    if [ $? -eq 0 ]; then
 		        rc=0
 				array_set_element repo_path $index $path
 		    else
@@ -766,22 +766,22 @@ EOF`
 
 	        fi
 	    if [ $rc -eq 0 ]; then
-	        repo_pkgs="$repo_pkgs $fn"  
+	        repo_pkgs="$repo_pkgs $fn"
 	    else
                 #now no hope we have to use rpm command
 	        plain_pkgs="$plain_pkgs $x*"
 	    fi
 	    array_set_element handled_path $(array_get_size handled_path) $path
         fi
-    done  
+    done
 
-    #add repo for url repos in otherpkgdir 
+    #add repo for url repos in otherpkgdir
     if [ -n "OTHERPKGDIR_INTERNET" ];then
          OIFS=$IFS
          IFS=','
          OTHERPKGDIRLIST_INTERNET=($OTHERPKGDIR_INTERNET)
 
-         index=$(array_get_size repo_path) 
+         index=$(array_get_size repo_path)
          for url in ${OTHERPKGDIRLIST_INTERNET[@]}
          do
             if [ $hasyum -eq 1 ] || [ $haszypper -eq 1 ] ; then
@@ -809,14 +809,14 @@ EOF`
     fi
 
     #now update all the existing rpms
-    if [ $hasyum -eq 1 ]; then 
+    if [ $hasyum -eq 1 ]; then
         if [ $VERBOSE  ]; then
           echo "$envlist yum -y upgrade"
         fi
         result=`eval $envlist yum -y upgrade 2>&1`
         R=$?
         if [ $R -ne 0 ]; then
-              RETURNVAL=$R 
+              RETURNVAL=$R
         fi
         logger -p local4.info -t xcat "$result"
         if [ $VERBOSE  ]; then
@@ -827,10 +827,10 @@ EOF`
           echo "$envlist zypper --non-interactive update --auto-agree-with-license"
         fi
 	result=`eval $envlist zypper --non-interactive update --auto-agree-with-license 2>&1`
-       
+
         R=$?
         if [ $R -ne 0 ]; then
-              RETURNVAL=$R 
+              RETURNVAL=$R
         fi
         logger -p local4.info -t xcat "$result"
         if [ $VERBOSE  ]; then
@@ -844,13 +844,13 @@ EOF`
         result=`eval $envlist DEBIAN_FRONTEND=noninteractive apt-get -y --allow-unauthenticated --force-yes -o Dpkg::Options::='--force-confold' -o Dpkg::Options::='--force-confdef' upgrade 2>&1`
         R=$?
         if [ $R -ne 0 ]; then
-              RETURNVAL=$R 
+              RETURNVAL=$R
         fi
 	logger -p local4.info -t xcat "$result"
         if [ $VERBOSE  ]; then
 	  echo "$result"
         fi
-    fi     
+    fi
 
     #echo "repo_pkgs=$repo_pkgs,\nrepo_pkgs_preremove=$repo_pkgs_preremove,\nrepo_pkgs_postremove=$repo_pkgs_postremove"
     #echo "plain_pkgs=$plain_pkgs,\nplain_pkgs_preremove=$plain_pkgs_preremove,\nplain_pkgs_postremove=$plain_pkgs_postremove"
@@ -858,14 +858,14 @@ EOF`
 
     #Now we have parsed the input, let's remove rpms if is specified with -
     if [ "$repo_pkgs_preremove" != "" ]; then
-        if [ $hasyum -eq 1 ]; then 
+        if [ $hasyum -eq 1 ]; then
             if [ $VERBOSE  ]; then
               echo "$envlist yum -y remove $repo_pkgs_preremove"
-            fi 
+            fi
             result=`eval $envlist yum -y remove $repo_pkgs_preremove 2>&1`
             R=$?
             if [ $R -ne 0 ]; then
-              RETURNVAL=$R 
+              RETURNVAL=$R
             fi
             logger -p local4.info -t xcat "$result"
             if [ $VERBOSE  ]; then
@@ -878,7 +878,7 @@ EOF`
 	    result=`eval $envlist zypper remove -y $repo_pkgs_preremove 2>&1`
             R=$?
             if [ $R -ne 0 ]; then
-              RETURNVAL=$R 
+              RETURNVAL=$R
             fi
             logger -p local4.info -t xcat "$result"
             if [ $VERBOSE  ]; then
@@ -892,23 +892,23 @@ EOF`
 	    result=`DEBIAN_FRONTEND=noninteractive apt-get -y remove $repo_pkgs_preremove 2>&1`
             R=$?
             if [ $R -ne 0 ]; then
-              RETURNVAL=$R 
+              RETURNVAL=$R
             fi
             logger -p local4.info -t xcat "$result"
             if [ $VERBOSE  ]; then
               echo "$result"
             fi
         fi
-    fi 
+    fi
 
-    if [ "$plain_pkgs_preremove" != "" ]; then 
+    if [ "$plain_pkgs_preremove" != "" ]; then
         if [ $VERBOSE  ]; then
-          echo "$envlist $sremovecommand $plain_pkgs_preremove" 
-        fi 
+          echo "$envlist $sremovecommand $plain_pkgs_preremove"
+        fi
         result=`eval $envlist $sremovecommand $plain_pkgs_preremove 2>&1`
         R=$?
         if [ $R -ne 0 ]; then
-              RETURNVAL=$R 
+              RETURNVAL=$R
         fi
         logger -p local4.info -t xcat "$result"
         if [ $VERBOSE  ]; then
@@ -917,16 +917,16 @@ EOF`
     fi
 
 
-    #installation using yum or zypper     
+    #installation using yum or zypper
     if [ "$repo_pkgs" != "" ]; then
-        if [ $hasyum -eq 1 ]; then 
+        if [ $hasyum -eq 1 ]; then
             if [ $VERBOSE  ]; then
              echo "$envlist yum -y install $repo_pkgs"
             fi
             result=`eval $envlist yum -y install $repo_pkgs 2>&1`
             R=$?
             if [ $R -ne 0 ]; then
-              RETURNVAL=$R 
+              RETURNVAL=$R
             fi
 	    logger -p local4.info -t xcat "$result"
             if [ $VERBOSE  ]; then
@@ -939,7 +939,7 @@ EOF`
 	    result=`eval $envlist zypper install -y $repo_pkgs 2>&1`
             R=$?
             if [ $R -ne 0 ]; then
-              RETURNVAL=$R 
+              RETURNVAL=$R
 	    fi
             logger -p local4.info -t xcat "$result"
             if [ $VERBOSE  ]; then
@@ -959,31 +959,31 @@ EOF`
 	    result=`eval $envlist DEBIAN_FRONTEND=noninteractive apt-get -q -y --force-yes  -o Dpkg::Options::='--force-confold' -o Dpkg::Options::='--force-confdef' install $repo_pkgs 2>&1`
             R=$?
             if [ $R -ne 0 ]; then
-              RETURNVAL=$R 
+              RETURNVAL=$R
 	    fi
 	    logger -p local4.info -t xcat "$result"
             if [ $VERBOSE  ]; then
              echo "$result"
 	    fi
         fi
-    fi 
+    fi
 
     #Handle the rest with rpm
-    if [ "$plain_pkgs" != "" -a -n "$OTHERPKGDIR" ]; then 
+    if [ "$plain_pkgs" != "" -a -n "$OTHERPKGDIR" ]; then
         echo "Warning: the packages $plain_pkgs could not be found in the yum/apt repository, falling back to rpm/dpkg command. If you want your packages to be installed with yum/apt, verify yum/apt is installed and createrepo/dpkg-scanpackages has been run."
-        logger -p local4.info -t xcat "Warning: the packages $plain_pkgs could not be found in the yum/apt repository, falling back to rpm/dpkg command. If you want your packages to be installed with yum/apt, verify yum/apt is installed and createrepo/dpkg-scanpackages has been run." 
+        logger -p local4.info -t xcat "Warning: the packages $plain_pkgs could not be found in the yum/apt repository, falling back to rpm/dpkg command. If you want your packages to be installed with yum/apt, verify yum/apt is installed and createrepo/dpkg-scanpackages has been run."
         if [ $mounted -eq 0 ]; then
 	    dir_no_ftproot=${OTHERPKGDIR#*$INSTALLDIR/}
-            mkdir -p /xcatpost/$dir_no_ftproot 
+            mkdir -p /xcatpost/$dir_no_ftproot
             rm -f -R /xcatpost/$dir_no_ftproot/*
             mkdir -p /tmp/postage/
             rm -f -R /tmp/postage/*
             cd /tmp/postage
-    
-	    wget -l inf -N -r --waitretry=10 --random-wait --retry-connrefused -e robots=off -t 0 -T 60 --reject "index.html*" --no-parent http://$OTHERPKGDIR/ 2> /tmp/wget.log  
-    
+
+	    wget -l inf -N -r --waitretry=10 --random-wait --retry-connrefused -e robots=off -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; 
+            mv $dir_no_ftproot/* /xcatpost/$dir_no_ftproot;
             rm -rf $dir_no_ftproot
             cd /xcatpost/$dir_no_ftproot
         else
@@ -991,18 +991,18 @@ EOF`
         fi
 
         if [ $VERBOSE  ]; then
-          echo "$envlist $supdatecommand $plain_pkgs" 
+          echo "$envlist $supdatecommand $plain_pkgs"
         fi
         result=`eval $envlist $supdatecommand $plain_pkgs 2>&1`
         R=$?
         if [ $R -ne 0 ]; then
-              RETURNVAL=$R 
+              RETURNVAL=$R
 	fi
         logger -p local4.info -t xcat "$result"
         if [ $VERBOSE  ]; then
           echo "$result"
 	fi
-    
+
         if [ $mounted -eq 0 ]; then
 	    cd /xcatpost
 	    dir_no_ftproot=${OTHERPKGDIR#*$INSTALLDIR/}
@@ -1013,14 +1013,14 @@ EOF`
 
     #remove more rpms if specified with --
     if [ "$repo_pkgs_postremove" != "" ]; then
-        if [ $hasyum -eq 1 ]; then 
+        if [ $hasyum -eq 1 ]; then
             if [ $VERBOSE  ]; then
              echo "$envlist yum -y remove $repo_pkgs_postremove"
             fi
             result=`eval $envlist yum -y remove $repo_pkgs_postremove 2>&1`
             R=$?
             if [ $R -ne 0 ]; then
-              RETURNVAL=$R 
+              RETURNVAL=$R
 	    fi
             logger -p local4.info -t xcat "$result"
             if [ $VERBOSE  ]; then
@@ -1033,13 +1033,13 @@ EOF`
 	    result=`eval $envlist zypper remove -y $repo_pkgs_postremove 2>&1`
             R=$?
             if [ $R -ne 0 ]; then
-              RETURNVAL=$R 
+              RETURNVAL=$R
 	    fi
             logger -p local4.info -t xcat "$result"
             if [ $VERBOSE  ]; then
               echo "$result"
 	    fi
-        elif [ $hasapt -eq 1 ]; then 
+        elif [ $hasapt -eq 1 ]; then
             apt_get_update_if_repos_changed $REPOFILE
             if [ $VERBOSE  ]; then
               echo "$envlist apt-get -y remove $repo_pkgs_postremove"
@@ -1047,23 +1047,23 @@ EOF`
             result=`eval $envlist apt-get -y remove $repo_pkgs_postremove 2>&1`
             R=$?
             if [ $R -ne 0 ]; then
-              RETURNVAL=$R 
+              RETURNVAL=$R
 	    fi
             logger -p local4.info  -t xcat "$result"
             if [ $VERBOSE  ]; then
               echo "$result"
 	    fi
         fi
-    fi 
+    fi
 
-    if [ "$plain_pkgs_postremove" != "" ]; then 
+    if [ "$plain_pkgs_postremove" != "" ]; then
         if [ $VERBOSE  ]; then
-           echo "$envlist $sremovecommand $plain_pkgs_postremove" 
+           echo "$envlist $sremovecommand $plain_pkgs_postremove"
         fi
         result=`eval $envlist $sremovecommand $plain_pkgs_postremove 2>&1`
         R=$?
         if [ $R -ne 0 ]; then
-              RETURNVAL=$R 
+              RETURNVAL=$R
 	fi
         logger -p local4.info -t xcat "$result"
         if [ $VERBOSE  ]; then
diff --git a/xCAT/postscripts/remoteshell b/xCAT/postscripts/remoteshell
index 6a2b612da..1c99c9951 100755
--- a/xCAT/postscripts/remoteshell
+++ b/xCAT/postscripts/remoteshell
@@ -1,10 +1,10 @@
-#!/bin/bash 
+#!/bin/bash
 # IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html
 #(C)IBM Corp
 #  This script adds xCAT specific setup to the /etc/ssh/sshd_config and ssh_config file
-#  It calls getcredentials.awk to get from the xcatmaster  ssh host keys from the 
+#  It calls getcredentials.awk to get from the xcatmaster  ssh host keys from the
 #  /etc/xcat/hostkeys directory and puts in  /etc/ssh on the node the following keys
-#     ssh_host_dsa_key,ssh_host_rsa_key, ssh_host_ecdsa_key (if supported) 
+#     ssh_host_dsa_key,ssh_host_rsa_key, ssh_host_ecdsa_key (if supported)
 #  It calls getcredentials.awk to get from the xcatmaster root ssh keys from the
 #  ~/.ssh directory on the xcatmaster and put in ~/.ssh on the node the following keys:
 #   If site.enablesshbetweennodes is yes
@@ -17,7 +17,7 @@ if [ -f /etc/os-release ] && cat /etc/os-release |grep -i -e "^NAME=[ \"']*Cumul
    echo "Cumulus OS is not supported yet, nothing to do..."
    logger -t xcat -p local4.info "Cumulus OS is not supported yet, nothing to do..."
    exit 0
-fi 
+fi
 
 if [ "$(uname -s|tr 'A-Z' 'a-z')" = "linux" ];then
    str_dir_name=`dirname $0`
@@ -28,17 +28,17 @@ if [ -e /etc/xCATMN ]; then
 	logger -t xcat -p local4.info "remoteshell:Running on the Management Node ,  exiting "
    exit 0
 fi
-# if -p input, do special PCM setup 
+# if -p input, do special PCM setup
 if [ -n "$1" ]; then
- if [ $1 = "-p" ]; then 
+ if [ $1 = "-p" ]; then
     SETUPFORPCM=1
  fi
 fi
 
 
-#  Linux or if AIX call aixremoteshell -d 
+#  Linux or if AIX call aixremoteshell -d
 if [ "$(uname -s)" = "AIX" ]; then
-   ./aixremoteshell -d 2>&1 
+   ./aixremoteshell -d 2>&1
 	logger -t xcat -p local4.info "Install: On AIX , remoteshell calling aixremoteshell -d "
    exit 0
 fi
@@ -47,7 +47,7 @@ master=$MASTER
 useflowcontrol=0
 if [ "$USEFLOWCONTROL" = "YES" ] || [ "$USEFLOWCONTROL" = "yes" ] || [ "$USEFLOWCONTROL" = "1" ]; then
   useflowcontrol=1
-fi    
+fi
 
 if [ -r /etc/ssh/sshd_config ]
 then
@@ -103,14 +103,14 @@ if [ $useflowcontrol = "1" ]; then
   #first contact daemon  xcatflowrequest <server> 3001
   logger -t xcat -p local4.info "remoteshell: sending xcatflowrequest $master 3001"
  /$xcatpost/xcatflowrequest $master 3001
- rc=$? 
- logger -t xcat -p local4.info "remoteshell:xcatflowrequest received response return=$rc" 
+ rc=$?
+ logger -t xcat -p local4.info "remoteshell:xcatflowrequest received response return=$rc"
  if [ $rc -ne 0 ]; then
       logger -t xcat -p local4.info "remoteshell: error from xcatflowrequest, will not use flow control"
       useflowcontrol=0
  fi
 
- 
+
 fi
 getcredentials.awk ssh_dsa_hostkey | grep -E -v '</{0,1}xcatresponse>|</{0,1}serverdone>' | sed -e 's/&lt;/</' -e 's/&gt;/>/' -e 's/&amp;/&/' -e 's/&quot/"/' -e "s/&apos;/'/" > /tmp/ssh_dsa_hostkey
 
@@ -124,13 +124,13 @@ if [ $? -ne 0 ]; then
    RETRY=0
    MYCONT=`cat /etc/ssh/ssh_host_dsa_key`
    while [ -z "$MYCONT" ]; do
-              # not using flow control , need to sleep         
+              # not using flow control , need to sleep
               if [ $useflowcontrol = "0" ]; then
                 let SLI=$RANDOM%10
                 let SLI=SLI+10
                 sleep $SLI
               fi
- 
+
                 RETRY=$(($RETRY+1))
                 if [ $RETRY -eq $MAX_RETRIES ]
                 then
@@ -140,8 +140,8 @@ if [ $? -ne 0 ]; then
                   #first contact daemon  xcatflowrequest <server> 3001
                   logger -t xcat -p local4.info "remoteshell: sending xcatflowrequest $master 3001"
                   /$xcatpost/xcatflowrequest $master 3001
-                  rc=$? 
-                  logger -t xcat -p local4.info "remoteshell:xcatflowrequest return=$rc" 
+                  rc=$?
+                  logger -t xcat -p local4.info "remoteshell:xcatflowrequest return=$rc"
                   if [ $rc -ne 0 ]; then
                      logger -t xcat -p local4.info "remoteshell: error from xcatflowrequest, will not use flow control"
                      useflowcontrol=0
@@ -158,7 +158,7 @@ if [ $? -ne 0 ]; then
 		chmod 644 /etc/ssh/ssh_host_dsa_key.pub
 		chown root /etc/ssh/ssh_host_dsa_key.pub
    fi
-else 
+else
 	#the message received is an error, so parse it
 	ERR_MSG=`sed -n 's%.*<error>\(.*\)</error>.*%\1%p' /tmp/ssh_dsa_hostkey`
 	logger -s -t xcat -p local4.err Error: $ERR_MSG
@@ -170,8 +170,8 @@ if [ $useflowcontrol = "1" ]; then
   #first contact daemon  xcatflowrequest <server> 3001
   logger -t xcat -p local4.info "remoteshell: sending xcatflowrequest $master 3001"
   /$xcatpost/xcatflowrequest $master 3001
-  rc=$? 
-  logger -t xcat -p local4.info "remoteshell:xcatflowrequest return=$rc" 
+  rc=$?
+  logger -t xcat -p local4.info "remoteshell:xcatflowrequest return=$rc"
   if [ $rc -ne 0 ]; then
       logger -t xcat -p local4.info "remoteshell: error from xcatflowrequest, will not use flow control"
       useflowcontrol=0
@@ -190,7 +190,7 @@ if [ $? -ne 0 ]; then
    MAX_RETRIES=10
    RETRY=0
 	while [ -z "$MYCONT" ]; do
-              # not using flow control , need to sleep         
+              # not using flow control , need to sleep
               if [ $useflowcontrol = "0" ]; then
                 let SLI=$RANDOM%10
                 let SLI=SLI+10
@@ -205,8 +205,8 @@ if [ $? -ne 0 ]; then
                   #first contact daemon  xcatflowrequest <server> 3001
                   logger -t xcat -p local4.info "remoteshell: sending xcatflowrequest $master 3001"
                   /$xcatpost/xcatflowrequest $master 3001
-                  rc=$? 
-                  logger -t xcat -p local4.info "remoteshell:xcatflowrequest return=$rc" 
+                  rc=$?
+                  logger -t xcat -p local4.info "remoteshell:xcatflowrequest return=$rc"
                   if [ $rc -ne 0 ]; then
                       logger -t xcat -p local4.info "remoteshell: error from xcatflowrequest, will not use flow control"
                       useflowcontrol=0
@@ -241,8 +241,8 @@ if ssh-keygen -t ecdsa -f /tmp/ecdsa_key -P "" &>/dev/null ; then
     #first contact daemon  xcatflowrequest <server> 3001
     logger -t xcat -p local4.info "remoteshell: sending xcatflowrequest $master 3001"
     /$xcatpost/xcatflowrequest $master 3001
-    rc=$? 
-    logger -t xcat -p local4.info "remoteshell:xcatflowrequest return=$rc" 
+    rc=$?
+    logger -t xcat -p local4.info "remoteshell:xcatflowrequest return=$rc"
     if [ $rc -ne 0 ]; then
       logger -t xcat -p local4.info "remoteshell: error from xcatflowrequest, will not use flow control"
       useflowcontrol=0
@@ -261,7 +261,7 @@ if ssh-keygen -t ecdsa -f /tmp/ecdsa_key -P "" &>/dev/null ; then
    MAX_RETRIES=10
    RETRY=0
 	while [ -z "$MYCONT" ]; do
-              # not using flow control , need to sleep         
+              # not using flow control , need to sleep
               if [ $useflowcontrol = "0" ]; then
                 let SLI=$RANDOM%10
                 let SLI=SLI+10
@@ -276,8 +276,8 @@ if ssh-keygen -t ecdsa -f /tmp/ecdsa_key -P "" &>/dev/null ; then
                   #first contact daemon  xcatflowrequest <server> 3001
                   logger -t xcat -p local4.info "remoteshell: sending xcatflowrequest $master 3001"
                   /$xcatpost/xcatflowrequest $master 3001
-                  rc=$? 
-                  logger -t xcat -p local4.info "remoteshell:xcatflowrequest return=$rc" 
+                  rc=$?
+                  logger -t xcat -p local4.info "remoteshell:xcatflowrequest return=$rc"
                   if [ $rc -ne 0 ]; then
                       logger -t xcat -p local4.info "remoteshell: error from xcatflowrequest, will not use flow control"
                       useflowcontrol=0
@@ -293,7 +293,7 @@ if ssh-keygen -t ecdsa -f /tmp/ecdsa_key -P "" &>/dev/null ; then
 	else
 		# Because of openssh version differs, provisioning errors may happen when MN support ecdsa while CN don't ecdsa.
 		# Judge CN support ecdsa or not. "-t ecdsa" indicate the key type, "-P "" " avoid hang-on and wait for input passphrase when CN don't support ecdsa.
-		# If ture, means support ecdsa, then generate corresponding key.pub. 
+		# If ture, means support ecdsa, then generate corresponding key.pub.
 		# If false, remove ssh_host_ecdsa_key useless file, to avoid future errors.
 		if ssh-keygen -t ecdsa -y -f /etc/ssh/ssh_host_ecdsa_key -P "" &>/dev/null ; then
 			ssh-keygen -y -f /etc/ssh/ssh_host_ecdsa_key > /etc/ssh/ssh_host_ecdsa_key.pub
@@ -325,22 +325,22 @@ mkdir -p /root/.ssh/
 rootsshpvtkey=ssh_root_key
 rootsshpubkey=ssh_root_pub_key
 if [ $ZONENAME ];
-then 
+then
 # This tells credentials.pm where to get the root .ssh keys.  If no zone then old path of ~/.ssh
   zonename=$ZONENAME
   rootsshpvtkey=ssh_root_key:$zonename
   rootsshpubkey=ssh_root_pub_key:$zonename
   logger -t xcat -p local4.info "remoteshell: gathering root ssh keys for $zonename"
-    
+
 fi
 
-# always get  the id_rsa.pub key for the node and put in authorized_keys 
+# always get  the id_rsa.pub key for the node and put in authorized_keys
 if [ $useflowcontrol = "1" ]; then
   #first contact daemon  xcatflowrequest <server> 3001
   logger -t xcat -p local4.info "remoteshell: sending xcatflowrequest $master 3001"
   /$xcatpost/xcatflowrequest $master 3001
-  rc=$? 
-  logger -t xcat -p local4.info "remoteshell:xcatflowrequest return=$rc" 
+  rc=$?
+  logger -t xcat -p local4.info "remoteshell:xcatflowrequest return=$rc"
   if [ $rc -ne 0 ]; then
     logger -t xcat -p local4.info "remoteshell: error from xcatflowrequest, will not use flow control"
     useflowcontrol=0
@@ -376,8 +376,8 @@ if [ $? -ne 0 ]; then
                   #first contact daemon  xcatflowrequest <server> 3001
                   logger -t xcat -p local4.info "remoteshell: sending xcatflowrequest $master 3001"
                   /$xcatpost/xcatflowrequest $master 3001
-                  rc=$? 
-                  logger -t xcat -p local4.info "remoteshell:xcatflowrequest return=$rc" 
+                  rc=$?
+                  logger -t xcat -p local4.info "remoteshell:xcatflowrequest return=$rc"
                   if [ $rc -ne 0 ]; then
                      logger -t xcat -p local4.info "remoteshell: error from xcatflowrequest, will not use flow control"
                      useflowcontrol=0
@@ -394,16 +394,16 @@ else
 fi
 rm /tmp/ssh_root_pub_key
 
-# if sshbetweennodes is enabled then we get id_rsa ( private key) 
+# if sshbetweennodes is enabled then we get id_rsa ( private key)
 if [ $ENABLESSHBETWEENNODES = "YES" ];  # want nodes to be able to ssh to each other without password
-then 
- logger -t xcat -p local4.info "remoteshell:sshbetweennodes is yes" 
+then
+ logger -t xcat -p local4.info "remoteshell:sshbetweennodes is yes"
  if [ $useflowcontrol = "1" ]; then
   #first contact daemon  xcatflowrequest <server> 3001
   logger -t xcat -p local4.info "remoteshell: sending xcatflowrequest $master 3001"
   /$xcatpost/xcatflowrequest $master 3001
-  rc=$? 
-  logger -t xcat -p local4.info "remoteshell:xcatflowrequest return=$rc" 
+  rc=$?
+  logger -t xcat -p local4.info "remoteshell:xcatflowrequest return=$rc"
   if [ $rc -ne 0 ]; then
     logger -t xcat -p local4.info "remoteshell: error from xcatflowrequest, will not use flow control"
     useflowcontrol=0
@@ -436,8 +436,8 @@ then
                   #first contact daemon  xcatflowrequest <server> 3001
                   logger -t xcat -p local4.info "remoteshell: sending xcatflowrequest $master 3001"
                   /$xcatpost/xcatflowrequest $master 3001
-                  rc=$? 
-                  logger -t xcat -p local4.info "remoteshell:xcatflowrequest return=$rc" 
+                  rc=$?
+                  logger -t xcat -p local4.info "remoteshell:xcatflowrequest return=$rc"
                   if [ $rc -ne 0 ]; then
                      logger -t xcat -p local4.info "remoteshell: error from xcatflowrequest, will not use flow control"
                      useflowcontrol=0
@@ -460,7 +460,7 @@ then
   if [ ! -f /root/.ssh/id_rsa.pub ]; then
     if [ -r /root/.ssh/id_rsa ]; then
      ssh-keygen -y -f /root/.ssh/id_rsa > /root/.ssh/id_rsa.pub
-     logger -t xcat -p local4.err  remoteshell:transfer of the id_rsa.pub key failed. Had to generate a public key. 
+     logger -t xcat -p local4.err  remoteshell:transfer of the id_rsa.pub key failed. Had to generate a public key.
     fi
   fi
 fi
@@ -538,9 +538,9 @@ if [[ $OSVER == ubuntu* || $OSVER == debian* ]]
 then
     if [ ! -d /var/run/sshd ];then
         #"/var/run/sshd":
-        #Contains the process ID of the sshd listening for connections 
-        #(if there are several daemons running concurrently for different ports, 
-        #this contains the process ID of the one started last). 
+        #Contains the process ID of the sshd listening for connections
+        #(if there are several daemons running concurrently for different ports,
+        #this contains the process ID of the one started last).
         #The content of this file is not sensitive; it can be world-read-able.
         #prepare the "/var/run/sshd" for ubuntu
         mkdir /var/run/sshd
@@ -561,7 +561,7 @@ fi
 #if the service restart with "service/systemctl" failed
 #try to kill the process and start
 if [ "$?" != "0" ];then
-   PIDLIST=`ps aux | grep -v grep | grep "/usr/sbin/sshd"|awk -F" " '{print $2}'|xargs` 
+   PIDLIST=`ps aux | grep -v grep | grep "/usr/sbin/sshd"|awk -F" " '{print $2}'|xargs`
    [ -n "$PIDLIST" ] && kill 9 $PIDLIST
    # Temporarily stick to the aes ciphers, some compatibility issues with other ciphers
    /usr/sbin/sshd -o Ciphers=$(ssh -Q cipher|grep aes|tr '\n' ',') 
diff --git a/xCAT/postscripts/replace_byid_device b/xCAT/postscripts/replace_byid_device
index 47429e9ff..269e27b21 100644
--- a/xCAT/postscripts/replace_byid_device
+++ b/xCAT/postscripts/replace_byid_device
@@ -2,7 +2,7 @@
 
 #Only used by sysclone
 
-#if the /etc/systemimager/byid_real_map.conf exist, 
+#if the /etc/systemimager/byid_real_map.conf exist,
 #the device name used in fstab and grub are in "by-id" style
 #use the by-id name on target node to replace the name on the goden client
 
@@ -17,7 +17,7 @@ do
     str_real="${str_line##*:}"
     str_real="${str_line##*/}"
 #    str_dev_prefix=`basename $str_old_dev | awk -F'-' '{print $1}'`
-    
+
     #find out the new by-id name
     str_new_dev=`ls -l --time-style=locale /dev/disk/by-id/ | grep -E "$str_real\$" | awk '{print $9}'|head -n 1`
     if [ -z "$str_new_dev" ];then
diff --git a/xCAT/postscripts/routeop b/xCAT/postscripts/routeop
index 66c58808f..eda755fa4 100755
--- a/xCAT/postscripts/routeop
+++ b/xCAT/postscripts/routeop
@@ -2,9 +2,9 @@
 # IBM(c) 2011EPL license http://www.eclipse.org/legal/epl-v10.html
 
 #-------------------------------------------------------------------------------
-#=head1  routeop  
+#=head1  routeop
 #=head2  routeop is called by makeroutes command and setuproutes postscript to
-#        setup a route on a node.    
+#        setup a route on a node.
 #        The syntax is:
 #          routeop add/delete net mask gateway ifname   #NOTE: the add/delete will be
 #                 obsoleted, using 'replace' is recommended.
@@ -159,9 +159,9 @@ route_exists()
                     tmp1=`echo $x|cut -d',' -f1`
                     gw1=`echo $x|cut -d',' -f2`
 
-                    n1=`echo $net |cut -d'.' -f1`           
-                    n2=`echo $net |cut -d'.' -f2`           
-                    n3=`echo $net |cut -d'.' -f3`           
+                    n1=`echo $net |cut -d'.' -f1`
+                    n2=`echo $net |cut -d'.' -f2`
+                    n3=`echo $net |cut -d'.' -f3`
                     n4=`echo $net |cut -d'.' -f4`
 
                     netnum="$(( ($n1 << 24) + ($n2 << 16) + ($n3 << 8) + $n4 ))"
@@ -171,7 +171,7 @@ route_exists()
                         bits="$(( $bits - 1 ))"
                         netnum="$(( $netnum >> 1 ))"
                     done
-                
+
                     tmp2="$net/$bits";
                     #echo "$tmp2=$tmp2"
                     if [ "$tmp1" = "$tmp2" ] && [ "$gw" = "$gw1" ]; then
@@ -182,12 +182,12 @@ route_exists()
                 done
         fi
     fi
-    
+
     echo $ret
 }
 
-# handle the route replace operation that adding the setting to configuration file 
-replace_persistent_route() 
+# handle the route replace operation that adding the setting to configuration file
+replace_persistent_route()
 {
     net=$1;
     mask=$2;
@@ -217,7 +217,7 @@ replace_persistent_route()
         routedest="$net/$mask"
         routedest1="$net\/$mask"
     fi
-    
+
     case $OS_name in
         sles)
             filename="/etc/sysconfig/network/routes";
@@ -256,9 +256,9 @@ replace_persistent_route()
                 if [ $? -ne 0 ]; then #route does not exist
                     echo $route >> $filename
                     echo "Persistent route \"$route\" has been added in $filename."
-                else 
+                else
                     # replace it
-                    sed -i -e "s/$routedest1.*/$route1/g" $filename
+                    sed -i -e "s/${routedest1}.*/$route1/g" $filename
                     echo "Persistent route \"$route\" has been replaced in $filename."
                 fi
             else
@@ -273,7 +273,7 @@ replace_persistent_route()
                 echo "Error: the device name is necessary to configure static route."
                 return 1
             fi
-            
+
             if echo $net | grep : 2>&1 1>/dev/null
             then
                 # ipv6
@@ -300,16 +300,18 @@ replace_persistent_route()
             if [ "$net" = "default" ]; then
                 filename="/etc/sysconfig/network"
                 route="GATEWAY=$gw"
-                routedest="$route"
+                route1=$route
+                routedest="GATEWAY="
+                routedest1=$routedest
             fi
             if [ -f $filename ]; then
                 egrep "^$routedest" $filename 2>&1 1>/dev/null
                 if [ $? -ne 0 ]; then #route does not exist
                     echo $route >> $filename
                     echo "Persistent route \"$route\" has been added in $filename."
-                else 
+                else
                     # replace it
-                    sed -i -e "s/$routedest1.*/$route1/g" $filename
+                    sed -i -e "s/${routedest1}.*/$route1/g" $filename
                     echo "Persistent route \"$route\" has been replaced in $filename."
                 fi
             else
@@ -317,7 +319,7 @@ replace_persistent_route()
                 echo "Persistent route \"$route\" has been added in $filename."
             fi
         ;;
-        
+
         debian)
             debianpreconf
             matchstr=""
@@ -344,7 +346,7 @@ replace_persistent_route()
             setflag=0
             tempfile="/etc/network/interfaces.d/tmp"
             >$tempfile
-            
+
             while read LINE
             do
                 # replace the existed setting
@@ -375,15 +377,15 @@ replace_persistent_route()
             mv -f $tempfile $filename
             echo "Persistent route \"$cmd\" is added in $filename.;    "
         ;;
-        
+
     esac
     else #AIX
     echo "Adding persistent route on AIX is not supported yet."
     fi
 }
 
-# handle the route add operation that adding the setting to configuration file 
-add_persistent_route() 
+# handle the route add operation that adding the setting to configuration file
+add_persistent_route()
 {
     net=$1;
     mask=$2;
@@ -413,7 +415,7 @@ add_persistent_route()
         if [ "$OS_name" = "redhat" -o "$OS_name" = "debain" ]; then
             echo "Warning: replace operation only supports to add persistent route for sles by now."
             return
-        fi  
+        fi
     fi
 
     case $OS_name in
@@ -471,7 +473,7 @@ add_persistent_route()
                     sed -i -e s/"$xcat_config_end"/"$route1\n$xcat_config_end"/g $filename
                 fi
                 echo "Persistent route \"$route\" added in $filename."
-            else 
+            else
                 echo "Persistent route \"$route\" already exists in $filename."
             fi
         else
@@ -567,7 +569,7 @@ add_persistent_route()
                             echo "  up route add -net $net netmask $mask gw $gw" >> $tempfile
                             echo "  down route del -net $net netmask $mask gw $gw" >> $tempfile
             fi
-                    fi 
+                    fi
                 fi
                 mv -f $tempfile $filename
                 echo "Persistent route \"$matchstr\" added in $filename."
@@ -609,7 +611,7 @@ add_persistent_route()
                     sed -i -e s/"$xcat_config_end"/"$route1\n$xcat_config_end"/g $filename
                 fi
                 echo "Persistent route \"$route\" added in $filename."
-            else 
+            else
                 echo "Persistent route \"$route\" already exists in $filename."
             fi
         else
@@ -626,7 +628,7 @@ add_persistent_route()
     fi
 }
 
-rm_persistent_route() 
+rm_persistent_route()
 {
     net=$1;
     mask=$2;
@@ -770,7 +772,7 @@ rm_persistent_route()
     echo "Removing persistent route on AIX is not supported yet."
     fi
 }
-   
+
 
 
 if [ "$op" = "add" ]; then
@@ -785,8 +787,8 @@ if [ "$op" = "add" ]; then
         else
                     cmd="ip -6 route add $net/$mask via $gw"
         fi
-            else 
-                # AIX TODO 
+            else
+                # AIX TODO
                 cmd="ip -6 route add $net/$mask via $gw"
             fi
         else
@@ -796,7 +798,7 @@ if [ "$op" = "add" ]; then
         else
                     cmd="route add -net $net netmask $mask gw $gw"
         fi
-            else 
+            else
                 cmd="route add -net $net -netmask $mask $gw"
             fi
         fi
@@ -818,8 +820,8 @@ if [ "$op" = "add" ]; then
         else
             echo "The temporary route ($net $mask $gw) already exists."
         fi
-    fi  
-  
+    fi
+
     #add persistent route
     add_persistent_route $net $mask $gw $ifname
 elif [ "$op" = "delete" ]; then
@@ -834,7 +836,7 @@ elif [ "$op" = "delete" ]; then
         else
                     cmd="ip -6 route delete $net/$mask via $gw"
         fi
-            else 
+            else
                 # AIX TODO
                 cmd="ip -6 route delete $net/$mask via $gw"
             fi
@@ -845,7 +847,7 @@ elif [ "$op" = "delete" ]; then
         else
                     cmd="route delete -net $net netmask $mask gw $gw"
         fi
-            else 
+            else
                 cmd="route delete -net $net -netmask $mask $gw"
             fi
         fi
@@ -860,14 +862,14 @@ elif [ "$op" = "delete" ]; then
     else
         echo "The temporary route ($net $mask $gw) does not exist."
     fi
-    
+
     #remove the persistent route
     rm_persistent_route $net $mask $gw $ifname
 elif [ "$op" = "replace" ]; then
     if [ $nummask -ne 1 ]; then
         mask=$(v4mask2prefix $mask)
     fi
-    
+
     if echo $net | grep : 2>&1 1>/dev/null
     then # ipv6
         if [ "$(uname -s)" = "Linux" ]; then
@@ -902,7 +904,7 @@ elif [ "$op" = "replace" ]; then
             fi
         fi
     fi
-    
+
     echo "Adding temporary route: $cmd;    "
     result=`$cmd 2>&1`
     code=$?
@@ -911,14 +913,14 @@ elif [ "$op" = "replace" ]; then
         echo "Error: $cmd [error code=$code, result=$result]"
         exit 1;
     fi
-    
+
     #replace the persistent route
-    # the $cmd param is used for Ubuntu since it needs to run the specific cmd to enable 
+    # the $cmd param is used for Ubuntu since it needs to run the specific cmd to enable
     # the route during the up of the device
     replace_persistent_route $net $mask $gw $ifname
     if [ $? -ne 0 ]; then
         exit 1
-    fi 
+    fi
 fi
 
 exit 0
diff --git a/xCAT/postscripts/servicenode b/xCAT/postscripts/servicenode
index 0be39a42d..91c026ff9 100755
--- a/xCAT/postscripts/servicenode
+++ b/xCAT/postscripts/servicenode
@@ -6,27 +6,27 @@
 
 #-----------------------------------------------------------------------------
 
-=head1   servicenode 
+=head1   servicenode
 
  On AIX and Linux :
- This updates the service node with files necessary to access the 
+ This updates the service node with files necessary to access the
  database on the MasterNode and restarts the xcat daemon
- If uses multiple environment variables setup  by postage.pm from 
+ If uses multiple environment variables setup  by postage.pm from
  the site table.
  For Linux:
    It calls xcatserver and xcatclient script to get the ssh keys, ssl
-   redentials and cfgloc file and transfer from the MN to the SN 
-   to be able to access the 
+   redentials and cfgloc file and transfer from the MN to the SN
+   to be able to access the
    database,  setup ssh keys on the nodes and have daemon to daemon
    commmunication between the SN and MN and have the SN access the DB.
  For AIX:
-   The same function in xcatserver and xcatclient is in this script for 
+   The same function in xcatserver and xcatclient is in this script for
    AIX and thus it does not call xcatserver and xcatclient.
-   We get the ssh keys, ssl 
-   credentials and cfgloc file for the SN to be able to access the 
+   We get the ssh keys, ssl
+   credentials and cfgloc file for the SN to be able to access the
    database,  setup ssh keys on the nodes and have daemon to daemon
    commmunication between the SN and MN and have the SN access the DB.
- 
+
 
 =cut
 
diff --git a/xCAT/postscripts/setbootfromdisk b/xCAT/postscripts/setbootfromdisk
index 251f0608c..60539988b 100755
--- a/xCAT/postscripts/setbootfromdisk
+++ b/xCAT/postscripts/setbootfromdisk
@@ -71,7 +71,7 @@ if [[ $OS = "Linux" ]]; then
                             echo "setbootfromdisk: setting up sda sdb to be the default bootup device"
                             bootlist -m normal sda sdb
                             exit 0
-                        elif echo $i | grep "sdc" 
+                        elif echo $i | grep "sdc"
                         then
                             logger -t xcat -p local4.info setbootfromdisk: Setting sdc sdd to be the default bootup device
                             echo "setbootfromdisk: setting up sdc sdd to be the default bootup device"
@@ -96,10 +96,10 @@ if [[ $OS = "Linux" ]]; then
             else
                 logger -t xcat -p local4.info setbootfromdisk: Setting $BOOTDEVICE to be the default bootup device
                 echo "setbootfromdisk: setting up $BOOTDEVICE as the default bootup device"
-                bootlist -m normal $BOOTDEVICE 
+                bootlist -m normal $BOOTDEVICE
                 exit 0
             fi
-        else 
+        else
             logger -t xcat -p local4.err Could not find /usr/sbin/bootlist
             echo "setbootfromdisk: could not find /usr/sbin/bootlist"
             exit -1
diff --git a/xCAT/postscripts/setbootfromnet b/xCAT/postscripts/setbootfromnet
index a979a03f3..5de3fae93 100755
--- a/xCAT/postscripts/setbootfromnet
+++ b/xCAT/postscripts/setbootfromnet
@@ -5,7 +5,7 @@
 #
 #-----------------------------------------------------------------------------
 #
-#setbootfromnet 
+#setbootfromnet
 #
 #   This sets up the node to boot from network, if the GATEWAY is set,
 #   the bootlist will be set with the client ip, server ip and gateway information,
@@ -59,7 +59,7 @@ else
    msg="$0: The environment variable NODE is null, pls check.\n"
    echo $msg
    logger -t xcat -p local4.err "$msg"
-   exit 1 
+   exit 1
 fi
 
 if [[ $RET -ne 0 ]] || [[ $NRET -ne 0 ]]; then
diff --git a/xCAT/postscripts/setroute b/xCAT/postscripts/setroute
index c30ec98d7..dc4c16579 100755
--- a/xCAT/postscripts/setroute
+++ b/xCAT/postscripts/setroute
@@ -3,11 +3,11 @@
 
 #-------------------------------------------------------------------------------
 #=head1  setroute [add]
-#        [add] - The operation to manipulate the route entry. It is optional. 
+#        [add] - The operation to manipulate the route entry. It is optional.
 #            The default is 'replace' if ignoring it.
-#        
-#=head2  setrout command replaces/adds the routes to the node according to 
-#        what is specified in the xCAT tables. 
+#
+#=head2  setrout command replaces/adds the routes to the node according to
+#        what is specified in the xCAT tables.
 #        The route name for the node is defined in noderes.routenames.
 #        The route itself is defined in the routes table.
 #=cut
@@ -36,8 +36,8 @@ do
         if [ -z "$gw" ]; then
             echo "Error: Failed to configure route $rn as gateway is not configured."
             exit_code=1
-            continue  
-        fi 
+            continue
+        fi
         # remove the suffix /64 from ipv6 net
         if echo $net | grep "/" 2>&1 1>/dev/null
         then
diff --git a/xCAT/postscripts/setupdockerhost b/xCAT/postscripts/setupdockerhost
index 3ea39f33e..f84bfb3fb 100755
--- a/xCAT/postscripts/setupdockerhost
+++ b/xCAT/postscripts/setupdockerhost
@@ -16,7 +16,7 @@ if [ "$(uname -s|tr 'A-Z' 'a-z')" = "linux" ];then
     . $str_dir_name/xcatlib.sh
 fi
 
-if [[ "$OSVER" != ubuntu* ]]; then 
+if [[ "$OSVER" != ubuntu* ]]; then
     echo "OS = $OSVER: Setup of Docker host is currently supported only on Ubuntu."
     exit 1
 fi
@@ -70,7 +70,7 @@ nicname=""
 if [ $# -ne 1 ]; then
     echo "Error: must be in format '$0 netname=net/mask@gateway[:nicname]'"
     exit 1
-else 
+else
     NETINFO="$1"
     netname=`echo $NETINFO | awk -F= '{print $1}'`
     netinfo=`echo $NETINFO | awk -F= '{print $2}'`
@@ -92,12 +92,12 @@ else
 fi
 
 
-#Setup TLS 
+#Setup TLS
 master=$MASTER
-if ! ping $master -c 1 > /dev/null 2>&1 ; then  
+if ! ping $master -c 1 > /dev/null 2>&1 ; then
     echo "Error: Host $master is not reachable"
     exit 1
-fi 
+fi
 
 if [ ! -d /root/.docker ]; then
     mkdir -p /root/.docker
@@ -116,9 +116,9 @@ kill -9 $CREDPID
 
 grep -E '<error>' /tmp/xcat_dockerhost_cert
 if [ $? -ne 0 ]; then
-    cat /tmp/xcat_dockerhost_cert |  
+    cat /tmp/xcat_dockerhost_cert |
     cat /tmp/xcat_dockerhost_cert | grep -E -v '</{0,1}errorcode>|/{0,1}data>|</{0,1}content>|</{0,1}desc>' >$HOST_CERT_PEM
-else 
+else
     echo "Error: can not get dockerhost certificate files"
     exit 1
 fi
@@ -146,7 +146,7 @@ else
         sed -i "s@--tlsverify=[^ |^\"]*@@g" $docker_conf_file
         sed -i "s@--tls@@g" $docker_conf_file
         sed -i "s@\ \{2,\}@@g" $docker_conf_file
-    fi 
+    fi
     sed -i "s@^\(DOCKER_OPTS\=\"[^\"]*\)@\1 -H unix:///var/run/docker.sock -H tcp://`hostname`:2375 --tls --tlscacert=$HOST_CA_PEM --tlscert=$HOST_CERT_PEM --tlskey=$HOST_CERT_PEM --tlsverify=true\"@" $docker_conf_file
     sed -i 's/\"\{2,\}/\"/' $docker_conf_file
 fi
diff --git a/xCAT/postscripts/setupesx b/xCAT/postscripts/setupesx
index ed785c2ff..3efdd00d1 100755
--- a/xCAT/postscripts/setupesx
+++ b/xCAT/postscripts/setupesx
@@ -1,6 +1,6 @@
 # esx setup
 # example on how to set up ESX.  We setup ssh and also add a basic
-# VLAN configuration 
+# VLAN configuration
 
 
 if [ "$(uname -s|tr 'A-Z' 'a-z')" = "linux" ];then
diff --git a/xCAT/postscripts/setupntp b/xCAT/postscripts/setupntp
index 90b0e223e..22dbca662 100755
--- a/xCAT/postscripts/setupntp
+++ b/xCAT/postscripts/setupntp
@@ -1,205 +1,313 @@
 #!/bin/bash
-# IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html
 #
-#---------------------------------------------------------------------------
-# setup NTP configuration on the compute nodes
+# setupchrony - Set up chrony
+#
+# Copyright (C) 2018 International Business Machines
+# Eclipse Public License, Version 1.0 (EPL-1.0)
+#     <http://www.eclipse.org/legal/epl-v10.html>
+#
+# 2018-07-11 GONG Jie <gongjie@linux.vnet.ibm.com>
+#     - Draft
+# 2018-07-13 GONG Jie <gongjie@linux.vnet.ibm.com>
+#     - Release to field
 #
-#---------------------------------------------------------------------------
 
-if [ "$(uname -s|tr 'A-Z' 'a-z')" = "linux" ];then
-   str_dir_name=`dirname $0`
-   . $str_dir_name/xcatlib.sh
-fi
+PATH="/usr/sbin:/usr/bin:/sbin:/bin"
+export PATH
 
-# if on the Management Node
-if [ -e /etc/xCATMN ]; then
-   logger -t xcat -p local4.info "setupntp: This postscript does not support running on the management node. Please run makentp command. exiting"
-   exit 0
-fi
-
-#for service node, the makentp -a command will call this postscript
-#so do not diable service node.
-
-exit_code=0;
-master=$MASTER
-setup=0
-conf_file="/etc/ntp.conf"
-conf_file_org="/etc/ntp.conf.org"
-conf_file_backup="/etc/ntp.conf.postbackup"
-
-# pmatch determines if 1st argument string is matched by 2nd argument pattern
-pmatch ()
+#
+# warn_if_bad           Put out warning message(s) if $1 has bad RC.
+#
+#       $1      0 (pass) or non-zero (fail).
+#       $2+     Remaining arguments printed only if the $1 is non-zero.
+#
+#       Incoming $1 is returned unless it is 0
+#
+function warn_if_bad()
 {
-  case $1 in
-    $2) return 0;;  # zero return code means string matched by pattern
-  esac
+	local -i rc="$1"
+	local script="${0##*/}"
 
-  return 1          # non-zero return code means string not matched by pattern
+	# Ignore if no problems
+	[ "${rc}" -eq "0" ] && return 0
+
+	# Broken
+	shift
+	logger -t xcat -p local4.info "${script}: $@" >/dev/null 2>&1
+	echo "${script}: $@" >&2
+	return "${rc}"
 }
 
-is_lsb_cumulus ()
+#
+# exit_if_bad           Put out error message(s) if $1 has bad RC.
+#
+#       $1      0 (pass) or non-zero (fail).
+#       $2+     Remaining arguments printed only if the $1 is non-zero.
+#
+#               Exits with 1 unless $1 is 0
+#
+function exit_if_bad()
 {
-  grep -qs Cumulus /etc/lsb-release
-  return $?
+	warn_if_bad "$@" || exit 1
+	return 0
 }
 
-logger -t xcat "Install: Setup NTP"
-# Use the ntpservers defined in the site table, if they exist. 
-# If the value of ntpservers is <xcatmaster> use the service node or
-# the management node as the ntp server.
-if [ $NTPSERVERS ]; then
-    if [ "$NODESETSTATE" = "statelite" ]; then
-        cp -a $conf_file $conf_file_org
-        echo  "" > $conf_file
-    else
-        if [ !  -f $conf_file_org ]; then
-            mv -f $conf_file $conf_file_org
-        else
-            mv -f $conf_file $conf_file_backup
-        fi
-    fi
-    if [ "$NTPSERVERS" = "&lt;xcatmaster&gt;" ] || [ "$NTPSERVERS" = "<xcatmaster>" ]; then
-        echo "server $master" >>$conf_file
-    else
-        for i in $(echo $NTPSERVERS | tr ',' ' ')
-        do
-            if ping $i -c 1 > /dev/null 2>&1 ; then
-         	echo "server $i" >>$conf_file
-        	master=$i
-                setup=1
-            fi
-        done 
-        if [ $setup -eq 0 ]; then
-	    echo "server $master" >$conf_file
-        fi
-    fi
-else
-	echo "server $master" >$conf_file
+#
+# check_executes        Check for executable(s)
+#
+#       Returns 0 if true.
+#       Returns 1 if not.
+#
+function check_executes()
+{
+	local cmd
+	local all_ok="yes"
+	for cmd in "$@"
+	do
+		if ! type "${cmd}" &>/dev/null
+		then
+			echo "Command \"${cmd}\" not found." >&2
+			all_ok="no"
+		fi
+	done
+	[ "${all_ok}" = "yes" ]
+}
+
+#
+# check_exec_or_exit    Check for required executables.
+#
+#       Exits (not returns) if commands listed on command line do not exist.
+#
+#       Returns 0 if true.
+#       Exits with 1 if not.
+#
+function check_exec_or_exit()
+{
+	check_executes "$@"
+	exit_if_bad "$?" "Above listed required command(s) not found."
+	return 0
+}
+
+[ "${UID}" -eq "0" ]
+exit_if_bad "$?" "Must be run by UID=0. Actual UID=${UID}."
+
+declare -a NTP_SERVERS=()
+
+# Handle command line arguments
+while [ "$#" -gt "0" ]
+do
+        case "$1" in
+	"--use-ntpd")
+		# Use traditional ntpd
+		USE_NTPD="yes"
+		;;
+	*)
+		NTP_SERVERS+=($1)
+		;;
+	esac
+	shift
+done
+
+if [ "${#NTP_SERVERS[@]}" -eq "0" ]
+then
+	# Handle xCAT passed environment variables
+	case "${NTPSERVERS}" in
+	"<xcatmaster>"|"&lt;xcatmaster&gt;"|"")
+		NTP_SERVERS=(${MASTER})
+		;;
+	*)
+		OLD_IFS="${IFS}"
+		IFS=","
+		NTP_SERVERS=(${NTPSERVERS})
+		IFS="${OLD_IFS}"
+		unset OLD_IFS
+		;;
+	esac
 fi
 
+check_executes chronyd >/dev/null 2>&1 || USE_NTPD="yes"
 
-OS_TYPE=`uname`
-if [ $OS_TYPE = Linux ]; then
-    # Set the timezone
-    if [ -n $TIMEZONE ]; then
-        echo $TIMEZONE > /etc/timezone
-        if type timedatectl > /dev/null; then
-            timedatectl set-timezone $(cat /etc/timezone)
-        fi
-    fi
-
-    mkdir -p /var/lib/ntp
-    chown ntp /var/lib/ntp
-    if ( pmatch $OSVER "sles*" ) || ( pmatch $OSVER "suse*" ) || [ -f /etc/SuSE-release ];then
-        echo "driftfile /var/lib/ntp/drift/ntp.drift" >>$conf_file
-    else 
-        echo "driftfile /var/lib/ntp/drift" >>$conf_file
-    fi 
-    echo "disable auth" >>$conf_file
-    echo "restrict 127.0.0.1" >>$conf_file
-
-    if ( pmatch $OSVER "Cumulus*" ) || is_lsb_cumulus; then
-        # Do not listen on Cumulus switch ports
-        echo "interface listen eth0" >>$conf_file
-    fi
-
-    # will not exit here, let all the ntp configuration finish
-    # ntpd will timeout if ntp service is not reachable
-    if ! ping $master -c 1 > /dev/null 2>&1 ; then
-        echo "Error: ntpserver $master is not reachable, will not setup NTP"
-        exit_code=1
-    fi
-
-    #ntpd/ntpdate/sntp conflict with ntpd, stop the service first
-    checkservicestatus ntpserver
-    if [ $? -eq 0 ];then
-         stopservice ntpserver
-    fi
-
-    msg='syncing the clock ...'
-    logger -t xcat $msg 
-    echo $msg
-    if ! timeout 120 ntpd -gq  > /dev/null 2>&1 ; then
-        if ! ntpdate -t5 $master > /dev/null 2>&1; then
-            msg='WARNING: NTP Sync Failed before timeout. ntp server will try to sync...'
-            logger -t xcat $msg
-            echo $msg
-        fi
-    fi
-
-    #setup the hardware clock
-    hwclock --systohc --utc
-
-    #setup the RTC is UTC format, which will be used by os
-    if ( pmatch $OSVER "sles*" ) || ( pmatch $OSVER "suse*" ) || [ -f /etc/SuSE-release ];then
-        grep -i -q "HWCLOCK" /etc/sysconfig/clock
-        if [ $? -eq 0 ];then
-            sed -i 's/.*HWCLOCK.*/HWCLOCK=\"-u\"/' /etc/sysconfig/clock
-        else
-            echo HWCLOCK=\"-u\" >> /etc/sysconfig/clock
-        fi
-    elif [ -f "/etc/debian_version" ];then
-        sed -i 's/.*UTC.*/UTC=\"yes\"/' /etc/default/rcS
-    else
-        if [ -f "/etc/sysconfig/clock" ];then
-           grep -i -q "utc" /etc/sysconfig/clock
-           if [ $? -eq 0 ];then
-              sed -i 's/.*UTC.*/UTC=\"yes\"/' /etc/sysconfig/clock
-           else
-              echo UTC=\"yes\" >> /etc/sysconfig/clock
-           fi
-        elif type -P timedatectl >/dev/null 2>&1 ;then
-           timedatectl set-local-rtc 0
-        fi
-    fi
-
-    #update the hardware clock automaticly
-    if [ -f "/etc/sysconfig/ntpd" ];then
-        grep -i -q "SYNC_HWCLOCK" /etc/sysconfig/ntpd
-        if [ $? -eq 0 ];then
-            sed -i 's/.*SYNC_HWCLOCK.*/SYNC_HWCLOCK=\"yes\"/' /etc/sysconfig/ntpd
-        else
-            echo "SYNC_HWCLOCK=\"yes\"" >> /etc/sysconfig/ntpd
-        fi
-    elif [ -f /etc/sysconfig/ntp ];then
-        grep -i -q "NTPD_FORCE_SYNC_ON_STARTUP" /etc/sysconfig/ntp
-        if [ $? -eq 0 ];then
-	    sed -i 's/NTPD_FORCE_SYNC_ON_STARTUP=\"no\"/NTPD_FORCE_SYNC_ON_STARTUP=\"yes\"/' /etc/sysconfig/ntp
-        fi
-        grep -i -q "NTPD_FORCE_SYNC_HWCLOCK_ON_STARTUP" /etc/sysconfig/ntp
-        if [ $? -eq 0 ];then
-	    sed -i 's/NTPD_FORCE_SYNC_HWCLOCK_ON_STARTUP=\"no\"/NTPD_FORCE_SYNC_HWCLOCK_ON_STARTUP=\"yes\"/' /etc/sysconfig/ntp
-        fi
-    else
-        cron_file="/etc/cron.daily/xcatsethwclock"
-        if [ ! -f "$cron_file" ];then
-            echo "#!/bin/sh" > $cron_file
-            echo "/sbin/hwclock --systohc --utc" >> $cron_file
-            chmod a+x $cron_file
-            #service cron restart
-            restartservice cron
-        fi
-    fi
-    startservice ntpserver
-
-    enableservice cron
-    enableservice ntpserver
-else
-# stop and start AIX ntp
-  echo "driftfile /etc/ntp.drift
-tracefile /etc/ntp.trace
-disable auth
-broadcastclient
-restrict 127.0.0.1" >>$conf_file
-
-    stopsrc -s xntpd 
-    logger -t xcat "ntpdate -t5 $master "
-    ntpdate -t5 $master 
-    if [ "$?" != "0" ]
-    then
-        echo "  ntpdate -t5 $master  failed "
-        logger -t xcat "ntpdate -t5 $master failed"
-    fi
-    /usr/sbin/chrctcp -S -a xntpd 
+if [ -n "${USE_NTPD}" ]
+then
+	# Call setupntp.traditional, and pass the parsed ntp servers
+	logger -t xcat -p local4.info "Will call setupntp.traditional"
+	export NTPSERVERS="$(IFS=','; echo "${NTP_SERVERS[*]:-pool.ntp.org}")"
+	exec "${0%/*}/setupntp.traditional"
+	exit 255
 fi
-exit $exit_code 
+
+# Unset xCAT passed environment variables
+unset MASTER
+unset NTPSERVERS
+
+check_exec_or_exit cp cat logger
+check_exec_or_exit systemctl timedatectl hwclock
+
+systemctl stop ntp.service 2>/dev/null
+systemctl disable ntp.service 2>/dev/null
+systemctl stop ntpd.service 2>/dev/null
+systemctl disable ntpd.service 2>/dev/null
+
+systemctl disable ntp-wait.service 2>/dev/null
+systemctl disable ntpdate.service 2>/dev/null
+
+# On Ubuntu 18.04
+systemctl stop chrony.service 2>/dev/null
+# On RHEL 7, 8
+systemctl stop chronyd.service 2>/dev/null
+
+# The system is configured to maintain the RTC in universal time.
+timedatectl set-local-rtc 0
+warn_if_bad "$?" "Failed to configure the system to maintain the RTC in universal time"
+
+# Synchronize and set the system clock once
+logger -t xcat -p local4.info "Syncing the clock ..."
+chronyd -f /dev/null -q "$(
+	if [ "${#NTP_SERVERS[@]}" -gt "0" ]
+	then
+		echo "server ${NTP_SERVERS[0]} iburst"
+	else
+		echo "pool pool.ntp.org iburst"
+	fi
+)" "pidfile /dev/null"
+
+rm -f /etc/adjtime
+# Set the hardware clock from the system clock
+hwclock --systohc --utc
+warn_if_bad "$?" "Failed to set the hardware clock"
+
+## On RHEL 8
+#CHRONY_USER="chrony"
+#CHRONY_GROUP="chrony"
+## On Ubuntu 18.04
+#CHRONY_USER="_chrony"
+#CHRONY_GROUP="_chrony"
+
+CHRONY_CONF="/etc/chrony.conf"
+KEY_FILE="/etc/chrony.keys"
+
+if [ -d "/etc/chrony" ]
+then
+	# Ubuntu 18.04 default
+	CHRONY_CONF="/etc/chrony/chrony.conf"
+	KEY_FILE="/etc/chrony/chrony.keys"
+fi
+
+# Take the best educated guess for the pathname of the chrony drift file
+DRIFT_FILE="$(
+	for file in /var/lib/chrony/drift /var/lib/chrony/chrony.drift
+	do
+		if [ -f "${file}" ]
+		then
+			echo "${file}"
+			exit
+		fi
+	done
+
+	if [ "chrony" = \
+		"$(rpm -qf /var/lib/chrony/drift --qf '%{name}' 2>/dev/null)" ]
+	then
+		echo /var/lib/chrony/drift
+		exit
+	fi
+
+	for file in /usr/share/chrony/chrony.conf \
+		/etc/chrony.conf /etc/chrony/chrony.conf \
+		$(grep -a -m 1 -o -P '/([^\x00]+/)*[^\x00]+\.conf' \
+			"$(type -p chronyd)" 2>/dev/null)
+	do
+		if [ -f "${file}" ]
+		then
+			while read -r key val blah
+			do
+				if [ "${key}" = "driftfile" -a -n "${val}" ]
+				then
+					echo "${val}"
+					exit
+				fi
+			done <"${file}"
+		fi
+	done
+
+	# The default value
+	echo /var/lib/chrony/drift
+)"
+
+LOG_DIR="/var/log/chrony"
+
+logger -t xcat -p local4.info "Install: Setup NTP - chrony"
+cp "${CHRONY_CONF}" "${CHRONY_CONF}.xcatsave"
+cat >"${CHRONY_CONF}" <<EOF
+# This chrony configuration file is generated by xCAT
+
+# Use public servers from the pool.ntp.org project.
+# Please consider joining the pool (http://www.pool.ntp.org/join.html).
+$(
+	if [ "${#NTP_SERVERS[@]}" -gt "0" ]
+	then
+		for n in "${NTP_SERVERS[@]}"
+		do
+			echo "server ${n} iburst"
+		done
+	else
+		echo "pool pool.ntp.org   iburst maxsources 4"
+		echo "pool 0.pool.ntp.org iburst maxsources 4"
+		echo "pool 1.pool.ntp.org iburst maxsources 4"
+		echo "pool 2.pool.ntp.org iburst maxsources 8"
+	fi
+)
+
+# Record the rate at which the system clock gains/losses time.
+driftfile ${DRIFT_FILE}
+
+# Allow the system clock to be stepped in the first three updates
+# if its offset is larger than 1 second.
+makestep 1.0 3
+
+# Enable kernel synchronization of the real-time clock (RTC).
+rtcsync
+
+# Enable hardware timestamping on all interfaces that support it.
+#hwtimestamp *
+
+# Increase the minimum number of selectable sources required to adjust
+# the system clock.
+#minsources 2
+
+# Allows access by any node (IPv4 or IPv6).
+allow
+
+# Serve time even if not synchronized to a time source.
+local stratum 10
+
+# Specify file containing keys for NTP authentication.
+keyfile ${KEY_FILE}
+
+# Get TAI-UTC offset and leap seconds from the system tz database.
+leapsectz right/UTC
+
+# Specify directory for log files.
+logdir ${LOG_DIR}
+
+# Select which information is logged.
+log measurements statistics tracking
+EOF
+exit_if_bad "$?" "Failed to create configuration file for chrony"
+
+systemctl reenable chrony.service 2>/dev/null ||
+	systemctl reenable chronyd.service 2>/dev/null
+exit_if_bad "$?" "Failed to enable chrony service"
+
+systemctl reload-or-restart chrony.service 2>/dev/null ||
+	systemctl reload-or-restart chronyd.service 2>/dev/null
+exit_if_bad "$?" "Failed to start chrony service"
+
+logger -t xcat -p local4.info "NTP setup accomplished!"
+
+exit 0
+
+# vim: filetype=sh
+# vim: noautoindent
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# End of file
diff --git a/xCAT/postscripts/setupntp.traditional b/xCAT/postscripts/setupntp.traditional
new file mode 100755
index 000000000..959ab905f
--- /dev/null
+++ b/xCAT/postscripts/setupntp.traditional
@@ -0,0 +1,205 @@
+#!/bin/bash
+# IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html
+#
+#---------------------------------------------------------------------------
+# setup NTP configuration on the compute nodes
+#
+#---------------------------------------------------------------------------
+
+if [ "$(uname -s|tr 'A-Z' 'a-z')" = "linux" ];then
+   str_dir_name=`dirname $0`
+   . $str_dir_name/xcatlib.sh
+fi
+
+# if on the Management Node
+if [ -e /etc/xCATMN ]; then
+   logger -t xcat -p local4.info "setupntp: This postscript does not support running on the management node. Please run makentp command. exiting"
+   exit 0
+fi
+
+#for service node, the makentp -a command will call this postscript
+#so do not diable service node.
+
+exit_code=0;
+master=$MASTER
+setup=0
+conf_file="/etc/ntp.conf"
+conf_file_org="/etc/ntp.conf.org"
+conf_file_backup="/etc/ntp.conf.postbackup"
+
+# pmatch determines if 1st argument string is matched by 2nd argument pattern
+pmatch ()
+{
+  case $1 in
+    $2) return 0;;  # zero return code means string matched by pattern
+  esac
+
+  return 1          # non-zero return code means string not matched by pattern
+}
+
+is_lsb_cumulus ()
+{
+  grep -qs Cumulus /etc/lsb-release
+  return $?
+}
+
+logger -t xcat "Install: Setup NTP"
+# Use the ntpservers defined in the site table, if they exist.
+# If the value of ntpservers is <xcatmaster> use the service node or
+# the management node as the ntp server.
+if [ $NTPSERVERS ]; then
+    if [ "$NODESETSTATE" = "statelite" ]; then
+        cp -a $conf_file $conf_file_org
+        echo  "" > $conf_file
+    else
+        if [ !  -f $conf_file_org ]; then
+            mv -f $conf_file $conf_file_org
+        else
+            mv -f $conf_file $conf_file_backup
+        fi
+    fi
+    if [ "$NTPSERVERS" = "&lt;xcatmaster&gt;" ] || [ "$NTPSERVERS" = "<xcatmaster>" ]; then
+        echo "server $master" >>$conf_file
+    else
+        for i in $(echo $NTPSERVERS | tr ',' ' ')
+        do
+            if ping $i -c 1 > /dev/null 2>&1 ; then
+         	echo "server $i" >>$conf_file
+        	master=$i
+                setup=1
+            fi
+        done
+        if [ $setup -eq 0 ]; then
+	    echo "server $master" >$conf_file
+        fi
+    fi
+else
+	echo "server $master" >$conf_file
+fi
+
+
+OS_TYPE=`uname`
+if [ $OS_TYPE = Linux ]; then
+    # Set the timezone
+    if [ -n $TIMEZONE ]; then
+        echo $TIMEZONE > /etc/timezone
+        if type timedatectl > /dev/null; then
+            timedatectl set-timezone $(cat /etc/timezone)
+        fi
+    fi
+
+    mkdir -p /var/lib/ntp
+    chown ntp /var/lib/ntp
+    if ( pmatch $OSVER "sles*" ) || ( pmatch $OSVER "suse*" ) || [ -f /etc/SuSE-release ];then
+        echo "driftfile /var/lib/ntp/drift/ntp.drift" >>$conf_file
+    else
+        echo "driftfile /var/lib/ntp/drift" >>$conf_file
+    fi
+    echo "disable auth" >>$conf_file
+    echo "restrict 127.0.0.1" >>$conf_file
+
+    if ( pmatch $OSVER "Cumulus*" ) || is_lsb_cumulus; then
+        # Do not listen on Cumulus switch ports
+        echo "interface listen eth0" >>$conf_file
+    fi
+
+    # will not exit here, let all the ntp configuration finish
+    # ntpd will timeout if ntp service is not reachable
+    if ! ping $master -c 1 > /dev/null 2>&1 ; then
+        echo "Error: ntpserver $master is not reachable, will not setup NTP"
+        exit_code=1
+    fi
+
+    #ntpd/ntpdate/sntp conflict with ntpd, stop the service first
+    checkservicestatus ntpserver
+    if [ $? -eq 0 ];then
+         stopservice ntpserver
+    fi
+
+    msg='syncing the clock ...'
+    logger -t xcat $msg
+    echo $msg
+    if ! timeout 120 ntpd -gq  > /dev/null 2>&1 ; then
+        if ! ntpdate -t5 $master > /dev/null 2>&1; then
+            msg='WARNING: NTP Sync Failed before timeout. ntp server will try to sync...'
+            logger -t xcat $msg
+            echo $msg
+        fi
+    fi
+
+    #setup the hardware clock
+    hwclock --systohc --utc
+
+    #setup the RTC is UTC format, which will be used by os
+    if ( pmatch $OSVER "sles*" ) || ( pmatch $OSVER "suse*" ) || [ -f /etc/SuSE-release ];then
+        grep -i -q "HWCLOCK" /etc/sysconfig/clock
+        if [ $? -eq 0 ];then
+            sed -i 's/.*HWCLOCK.*/HWCLOCK=\"-u\"/' /etc/sysconfig/clock
+        else
+            echo HWCLOCK=\"-u\" >> /etc/sysconfig/clock
+        fi
+    elif [ -f "/etc/debian_version" ];then
+        sed -i 's/.*UTC.*/UTC=\"yes\"/' /etc/default/rcS
+    else
+        if [ -f "/etc/sysconfig/clock" ];then
+           grep -i -q "utc" /etc/sysconfig/clock
+           if [ $? -eq 0 ];then
+              sed -i 's/.*UTC.*/UTC=\"yes\"/' /etc/sysconfig/clock
+           else
+              echo UTC=\"yes\" >> /etc/sysconfig/clock
+           fi
+        elif type -P timedatectl >/dev/null 2>&1 ;then
+           timedatectl set-local-rtc 0
+        fi
+    fi
+
+    #update the hardware clock automaticly
+    if [ -f "/etc/sysconfig/ntpd" ];then
+        grep -i -q "SYNC_HWCLOCK" /etc/sysconfig/ntpd
+        if [ $? -eq 0 ];then
+            sed -i 's/.*SYNC_HWCLOCK.*/SYNC_HWCLOCK=\"yes\"/' /etc/sysconfig/ntpd
+        else
+            echo "SYNC_HWCLOCK=\"yes\"" >> /etc/sysconfig/ntpd
+        fi
+    elif [ -f /etc/sysconfig/ntp ];then
+        grep -i -q "NTPD_FORCE_SYNC_ON_STARTUP" /etc/sysconfig/ntp
+        if [ $? -eq 0 ];then
+	    sed -i 's/NTPD_FORCE_SYNC_ON_STARTUP=\"no\"/NTPD_FORCE_SYNC_ON_STARTUP=\"yes\"/' /etc/sysconfig/ntp
+        fi
+        grep -i -q "NTPD_FORCE_SYNC_HWCLOCK_ON_STARTUP" /etc/sysconfig/ntp
+        if [ $? -eq 0 ];then
+	    sed -i 's/NTPD_FORCE_SYNC_HWCLOCK_ON_STARTUP=\"no\"/NTPD_FORCE_SYNC_HWCLOCK_ON_STARTUP=\"yes\"/' /etc/sysconfig/ntp
+        fi
+    else
+        cron_file="/etc/cron.daily/xcatsethwclock"
+        if [ ! -f "$cron_file" ];then
+            echo "#!/bin/sh" > $cron_file
+            echo "/sbin/hwclock --systohc --utc" >> $cron_file
+            chmod a+x $cron_file
+            #service cron restart
+            restartservice cron
+        fi
+    fi
+    startservice ntpserver
+
+    enableservice cron
+    enableservice ntpserver
+else
+# stop and start AIX ntp
+  echo "driftfile /etc/ntp.drift
+tracefile /etc/ntp.trace
+disable auth
+broadcastclient
+restrict 127.0.0.1" >>$conf_file
+
+    stopsrc -s xntpd
+    logger -t xcat "ntpdate -t5 $master "
+    ntpdate -t5 $master
+    if [ "$?" != "0" ]
+    then
+        echo "  ntpdate -t5 $master  failed "
+        logger -t xcat "ntpdate -t5 $master failed"
+    fi
+    /usr/sbin/chrctcp -S -a xntpd
+fi
+exit $exit_code
diff --git a/xCAT/postscripts/setuppostbootscripts b/xCAT/postscripts/setuppostbootscripts
index 4fdf586ec..582781dbc 100755
--- a/xCAT/postscripts/setuppostbootscripts
+++ b/xCAT/postscripts/setuppostbootscripts
@@ -2,12 +2,12 @@
 # IBM(c) 2012 EPL license http://www.eclipse.org/legal/epl-v10.html
 
 #-------------------------------------------------------------------------------
-#=head1  setuppostbootscripts 
+#=head1  setuppostbootscripts
 #=head2  This command setup the node so that when the node reboots,
-#        the postbootscripts will be run or not depending on the   
-#        site.runbootscripts setting. 
+#        the postbootscripts will be run or not depending on the
+#        site.runbootscripts setting.
 #        If site.runbootscripts is 'yes', then the scripts defined by
-#        postscripts.postbootscripts will be run when the node reboots. 
+#        postscripts.postbootscripts will be run when the node reboots.
 #=cut
 #-------------------------------------------------------------------------------
 
@@ -29,7 +29,7 @@ if [ "$RUNBOOTSCRIPTS" = "yes" ] || [ "$RUNBOOTSCRIPTS" = "YES" ]; then
        RUNBOOTSCRIPTS=yes
 else
        RUNBOOTSCRIPTS=no
-fi 
+fi
 #  check to see if current setting is already in the file, if so nothing to do
 if [ -f $infofile ]; then
     value=`grep "RUNBOOTSCRIPTS=$RUNBOOTSCRIPTS" $infofile`
@@ -44,7 +44,7 @@ rsync /xcatpost/xcatinstallpost /opt/xcat/xcatinstallpost
 rsync /xcatpost/xcatpostinit1 /etc/init.d/xcatpostinit1
 chmod 755 /etc/init.d/xcatpostinit1
 
-if [ ! -f "/etc/rc.d/rc3.d/S84xcatpostinit1" ]; then 
+if [ ! -f "/etc/rc.d/rc3.d/S84xcatpostinit1" ]; then
     ln -s /etc/init.d/xcatpostinit1 /etc/rc.d/rc3.d/S84xcatpostinit1
 fi
 if [ ! -f "/etc/rc.d/rc4.d/S84xcatpostinit1" ]; then
@@ -64,19 +64,19 @@ else
     value=`grep XCATSERVER $infofile`
     if [[ -n $value ]]; then
         sed -i "s/^XCATSERVER=.*$/XCATSERVER=$MASTER/" $infofile
-    else 
+    else
         echo "XCATSERVER=$MASTER" >> $infofile
     fi
     value=`grep REBOOT $infofile`
     if [[ -n $value ]]; then
         sed -i "s/^REBOOT=.*$/REBOOT=TRUE/" $infofile
-    else 
+    else
         echo REBOOT=TRUE >> $infofile
     fi
     value=`grep RUNBOOTSCRIPTS $infofile`
     if [[ -n $value ]]; then
         sed -i "s/^RUNBOOTSCRIPTS=.*$/RUNBOOTSCRIPTS=$RUNBOOTSCRIPTS/" $infofile
-    else 
+    else
         echo "RUNBOOTSCRIPTS=$RUNBOOTSCRIPTS" >> $infofile
     fi
 fi
diff --git a/xCAT/postscripts/setupscratch b/xCAT/postscripts/setupscratch
index 9f8a64b8d..49c3bed3f 100755
--- a/xCAT/postscripts/setupscratch
+++ b/xCAT/postscripts/setupscratch
@@ -2,9 +2,9 @@
 
 #
 # This postscript sets up a scratch area on the local disk for stateless
-# nodes. It is for Linux only. 
+# nodes. It is for Linux only.
 # If run with -f flag, it will wipe out all the contents on the disk and
-# repartition the disk before setting up the scratch area. 
+# repartition the disk before setting up the scratch area.
 #
 #====================================================================
 ME="setupscratch"
@@ -21,8 +21,8 @@ then
 	    echo Checking filesystem /dev/sda1
 	    logger -t xcat -p local4.info $ME Checking filesystem /dev/sda1
 	    fsck -y /dev/sda1
-	    mkdir -p $mydir 
-	    echo mounting existing /dev/sda1 to $mydir 
+	    mkdir -p $mydir
+	    echo mounting existing /dev/sda1 to $mydir
 	    logger -t xcat -p local4.info $ME mounting existing /dev/sda1 to $mydir
 	    if mount /dev/sda1 $mydir
 	    then
@@ -40,7 +40,7 @@ fi
 
 echo Creating Partition
 logger -t xcat -p local4.info $ME Creating Partition
-parted -s /dev/sda mklabel gpt 
+parted -s /dev/sda mklabel gpt
 parted -s -- /dev/sda mkpart primary ext3 0 -0
 if grep sda1 /proc/partitions >/dev/null 2>&1
 then
diff --git a/xCAT/postscripts/sudoer b/xCAT/postscripts/sudoer
index d66b77fb3..03c873965 100755
--- a/xCAT/postscripts/sudoer
+++ b/xCAT/postscripts/sudoer
@@ -1,8 +1,8 @@
-#!/bin/bash 
+#!/bin/bash
 # IBM(c) 2013 EPL license http://www.eclipse.org/legal/epl-v10.html
 #------------------------------------------------------------------------------
 #
-# Setup a sudoer named xcat and copy the xCAT public SSH key in its 
+# Setup a sudoer named xcat and copy the xCAT public SSH key in its
 # authorized_keys file. Only applies to Linux.
 #
 #------------------------------------------------------------------------------
diff --git a/xCAT/postscripts/syncfiles b/xCAT/postscripts/syncfiles
index 0816e14e6..4990d7a63 100755
--- a/xCAT/postscripts/syncfiles
+++ b/xCAT/postscripts/syncfiles
@@ -2,7 +2,7 @@
 # IBM(c) 2009 EPL license http://www.eclipse.org/legal/epl-v10.html
 #####################################################
 #
-#   Initiate the xdcp from Mangement node to sync 
+#   Initiate the xdcp from Mangement node to sync
 #   files to this node
 #
 #####################################################
@@ -18,7 +18,7 @@ fi
 if [ -n "$UPDATENODE" ] && [ $UPDATENODE -eq 1 ]; then
    #echo "  Did not sync any files. Use updatenode -F to sync the files."
    logger -t xcat -p local4.err "$0: Did not sync any files. Use updatenode -F to sync the files."
-  
+
    exit 0
 fi
 
@@ -31,7 +31,7 @@ fi
 
 RCP=
 if [ ! -e "/usr/bin/rsync" ]; then
-   [ -e "/usr/bin/scp" ] && RCP="/usr/bin/scp" 
+   [ -e "/usr/bin/scp" ] && RCP="/usr/bin/scp"
 fi
 
 logger -t xcat -p local4.info "Performing syncfiles postscript"
diff --git a/xCAT/postscripts/syscloneimgupdate b/xCAT/postscripts/syscloneimgupdate
index 724463fbe..1ece13a66 100755
--- a/xCAT/postscripts/syscloneimgupdate
+++ b/xCAT/postscripts/syscloneimgupdate
@@ -32,7 +32,7 @@ for filename in \
     /opt/xcat \
     /root/.ssh \
     /var/cache \
-    /xcatpost 
+    /xcatpost
 do
     if [ ! -e $filename ];then
         continue
@@ -61,7 +61,7 @@ fi
 str_server_ip=`echo $str_server_ip | sed "s/'//g"`
 #call system imager command to update the image
 echo "si_updateclient --server $str_server_ip --yes"
-export PERL5LIB=/usr/lib/perl5/site_perl/;LANG=C si_updateclient --server $str_server_ip --yes 
+export PERL5LIB=/usr/lib/perl5/site_perl/;LANG=C si_updateclient --server $str_server_ip --yes
 
 if [[ -f /sbin/dracut ]]; then
     # redhat6.x/centos6.x/rhels7.x
diff --git a/xCAT/postscripts/syslog b/xCAT/postscripts/syslog
index 6e5036dd7..e0c964589 100755
--- a/xCAT/postscripts/syslog
+++ b/xCAT/postscripts/syslog
@@ -2,15 +2,15 @@
 # IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html
 
 #-------------------------------------------------------------------------------
-#=head1  syslog 
+#=head1  syslog
 #=head2  syslog command that setsup the syslogd for MS, SV and nodes.
 #        On MS, it makes sure all the xCAT messages goes to /var/log/messages file,
-#               it enables syslogd receving logs from remote machies. 
+#               it enables syslogd receving logs from remote machies.
 #        On MS, it sends all the messages to MS,
-#               it enables syslogd receving logs from remote nodes. 
-#        On node,  it sends all the messages its master.  
-#        Input: none, it takes the following environment variables: 
-#           OSVER: possible values are sles10, fedora8, redhat5, aix etc.   
+#               it enables syslogd receving logs from remote nodes.
+#        On node,  it sends all the messages its master.
+#        Input: none, it takes the following environment variables:
+#           OSVER: possible values are sles10, fedora8, redhat5, aix etc.
 #=cut
 #-------------------------------------------------------------------------------
 if [ "$SYSLOG" = "ignore" ]; then
@@ -82,8 +82,8 @@ config_Rsyslog_C3()
   isReceiving=0
   isLocal=$1
 
-  if [ -f /etc/xCATMN ] ||  [ $isSN -eq 1 ] 
-  then 
+  if [ -f /etc/xCATMN ] ||  [ $isSN -eq 1 ]
+  then
     isReceiving=1
   fi
 
@@ -109,9 +109,9 @@ config_Rsyslog_C3()
   #enable to receive remote logging
   if [ $isReceiving -eq 1 ]; then
       #listen on the udp and tcp port to receive the remote logs
-      sed -i 's/^\#\(\s\)*\$ModLoad\(\s\)*imudp/\$ModLoad imudp/ 
-                     s/^\#\(\s\)*\$UDPServerRun/\$UDPServerRun/; 
-                     s/#\$ModLoad imtcp/\$ModLoad imtcp/; 
+      sed -i 's/^\#\(\s\)*\$ModLoad\(\s\)*imudp/\$ModLoad imudp/
+                     s/^\#\(\s\)*\$UDPServerRun/\$UDPServerRun/;
+                     s/#\$ModLoad imtcp/\$ModLoad imtcp/;
                      s/#\$InputTCPServerRun 514/\$InputTCPServerRun 514/' $2
   fi
 
@@ -124,15 +124,15 @@ config_Rsyslog_C3()
         chown syslog:adm /var/log/xcat
       fi
   else
-      sed -i 's/^\(\*\..*\)/\#\1/; 
+      sed -i 's/^\(\*\..*\)/\#\1/;
                      s/^\(news\|local7\|mail\|authpriv\|cron\|kern\)\./\#\1\./' $2
       echo "*.* @$master" >> $2
-  fi 
+  fi
   # Mark the end of xCAT section
   echo "# $xCATSettingsEND" >> $2
 }
 
-# This sets up rsyslog 8.x, different from the previous rsyslog versions.  
+# This sets up rsyslog 8.x, different from the previous rsyslog versions.
 # Instead of updating /etc/rsyslog.conf  for forwarding to a remote host,
 # You update /etc/rsyslog.d/remote.conf.  The /etc/sysconfig/rsyslog file does not exist.
 # This is only for Linux, since AIX does not use rsyslog.  It ships its own syslog in an lpp,
@@ -140,7 +140,7 @@ config_Rsyslog_C3()
 
 config_rsyslog_V8()
 {
-  
+
   goLocal=0;
   conf_file="/etc/rsyslog.conf"
   remoteconf="/etc/rsyslog.d/remote.conf"
@@ -154,7 +154,7 @@ config_rsyslog_V8()
   # compute nodes. Management Node is receiving from Service Nodes and possibly compute nodes.
   # They will all be put in /var/log/messages
   # For the service node, if site table svloglocal  is set then we will keep the logs on the servicenode
-  # and not forward to the Management Node. 
+  # and not forward to the Management Node.
 
   #now handling where the logs go, if goLocal=1 then log local, if not forward to MN
   if [ -f /etc/xCATMN ]; then
@@ -163,7 +163,7 @@ config_rsyslog_V8()
     # check to see if service node should forward of keep logs
     if [ $isSN -eq 1 ]; then
        if [ -n "$SVLOGLOCAL" ] && [ $SVLOGLOCAL -eq 1 ]; then
-         goLocal=1  
+         goLocal=1
        fi
     fi
   fi
@@ -211,16 +211,16 @@ config_rsyslog_V8()
     # Need to uncomment the lines $ModLoad imudp.so and $UDPServerRun 514,
     # to make the MN be able to receive syslog from remote hosts
     if [ -f "$remoteconf" ]; then
-        ##listen on tcp and udp port to enable receiving the xcat debug logs 
+        ##listen on tcp and udp port to enable receiving the xcat debug logs
         ##forwarded  via tcp/udp protocol
-        sed -i 's/#\$ModLoad imudp.so/\$ModLoad imudp.so/; 
-                       s/#\$UDPServerRun 514/\$UDPServerRun 514/; 
-                       s/#\$ModLoad imtcp.so/\$ModLoad imtcp.so/; 
+        sed -i 's/#\$ModLoad imudp.so/\$ModLoad imudp.so/;
+                       s/#\$UDPServerRun 514/\$UDPServerRun 514/;
+                       s/#\$ModLoad imtcp.so/\$ModLoad imtcp.so/;
                        s/#\$InputTCPServerRun <port>/\$InputTCPServerRun 514/' $remoteconf
     fi
 
 
-    ##listen on tcp and udp port to enable receiving the xcat debug logs 
+    ##listen on tcp and udp port to enable receiving the xcat debug logs
     ##forwarded  via tcp/udp protocol
     if [ -f "$conf_file" ]; then
         #rhels7.4 ships rsyslogd 8.24.0, which does not ship remote.conf
@@ -235,10 +235,10 @@ config_rsyslog_V8()
                 s/#module(load="imtcp")/module(load="imtcp")/;
                 s/#input(type="imtcp" port="514")/input(type="imtcp" port="514")/' $conf_file
     fi
-    
+
     if [ $isSN -eq 1 ] ; then
         [ -d "/etc/xcat/rsyslog.conf" ] && cp -a /etc/xcat/rsyslog.conf/* /etc/rsyslog.d/
-        if [ -d "/etc/xcat/logrotate.conf" ];then 
+        if [ -d "/etc/xcat/logrotate.conf" ];then
             mkdir -p "/etc/logrotate.d/"
             cp -a /etc/xcat/logrotate.conf/* /etc/logrotate.d/
         fi
@@ -254,10 +254,10 @@ config_rsyslog_V8()
     fi
 
     if [ $isSN -eq 1 ];then
-        ##listen on tcp and udp port to enable receiving the xcat debug logs 
+        ##listen on tcp and udp port to enable receiving the xcat debug logs
         ##forwarded  via tcp/udp protocol
         [ -f "$remoteconf" ] && sed -i '/#\$ModLoad \+imudp\|imtcp\|imudp.so\|imtcp.so/s/^#//;
-                       /#\$InputTCPServerRun\|UDPServerRun.*/s/^#//' $remoteconf 
+                       /#\$InputTCPServerRun\|UDPServerRun.*/s/^#//' $remoteconf
 
         [ -f "$conf_file" ] && sed -i '/#\$ModLoad \+imudp\|imtcp\|imudp.so\|imtcp.so/s/^#//;
                        /#\$InputTCPServerRun\|UDPServerRun.*/s/^#//' $conf_file
@@ -267,7 +267,7 @@ config_rsyslog_V8()
         [ -f "/etc/rsyslog.d/xcat-debug.conf" ] && rm -f "/etc/rsyslog.d/xcat-debug.conf" ;
 
         [ -f "/etc/logrotate.d/xcat" ] && rm -f "/etc/logrotate.d/xcat"
-        
+
     fi
 
 
@@ -285,7 +285,7 @@ config_rsyslog_V8()
 
 #echo "NTYPE=$NTYPE,OSVER=$OSVER,OSTYPE=$OSTYPE"
 
-if [ "$NTYPE" = service ]; then 
+if [ "$NTYPE" = service ]; then
   isSN=1
 fi
 
@@ -301,7 +301,7 @@ if [ -e "/sbin/rsyslogd" -o -e "/usr/sbin/rsyslogd" ]; then
     SYSLOGPROD=`rsyslogd -v | grep rsyslogd |awk {'print $1'}`
     SYSLOGVER=`rsyslogd -v | grep rsyslogd |awk {'print $2'}`
     if ( pmatch $SYSLOGPROD "*rsyslogd*" ) && ( pmatch $SYSLOGVER "8*" ); then
-      config_rsyslog_V8 
+      config_rsyslog_V8
       #keep a record
       logger -t xcat -p local4.info "Install: rsyslog version 8 setup"
       exit 0
@@ -322,7 +322,7 @@ if [ "$(uname -s)" = "Linux" ]; then
         sysconfig="/etc/default/rsyslog"
       fi
     fi
-  else 
+  else
     if ( pmatch $OSVER "sles*" ) || ( pmatch $OSVER "suse*" ) || [ -f /etc/SuSE-release ]; then
       #find out which syslog is used for SLES, syslog or syslog-ng
       result=`grep "^SYSLOG_DAEMON=" $sysconfig 2>&1`
@@ -331,7 +331,7 @@ if [ "$(uname -s)" = "Linux" ]; then
         ng=1
       fi
     fi
-  fi 
+  fi
 else
   sysconfig=  #AIX does not have this file
   isLinux=0;
@@ -342,8 +342,8 @@ fi
 
 
 
-#handle sysconfig file to make remote logging possible 
-if [ $isLinux -eq 1 ] && [ -e $sysconfig ]; then 
+#handle sysconfig file to make remote logging possible
+if [ $isLinux -eq 1 ] && [ -e $sysconfig ]; then
   if [ ! -f "$sysconfig.XCATORIG" ]; then
     cp -f $sysconfig $sysconfig.XCATORIG
   fi
@@ -355,16 +355,16 @@ if [ $isLinux -eq 1 ] && [ -e $sysconfig ]; then
       isC3=1
     fi
   fi
-  
+
   #no need to change anything for rsyslog version 3 for /etc/sysconf/rsyslog
-  if [ $isC3 -eq 0 ]; then 
+  if [ $isC3 -eq 0 ]; then
     if [ -f /etc/xCATMN ]; then
-      #on MN: make the syslogd be able to receive remote logs 
-      awk  '{if ($0 ~ /^SYSLOGD_OPTIONS=|^SYSLOGD_PARAMS=/) { 
+      #on MN: make the syslogd be able to receive remote logs
+      awk  '{if ($0 ~ /^SYSLOGD_OPTIONS=|^SYSLOGD_PARAMS=/) {
             if ($0 !~ /-r/) {sub(/-/, "-r -", $0)}
             if (($0 !~ /-m0/) && ($0 !~/-m 0/)) { sub(/-/, "-m 0 -", $0)}
             print $0}
-          else { print $0}}'  $sysconfig > $sysconfig.tmp 
+          else { print $0}}'  $sysconfig > $sysconfig.tmp
     else
       if [ $isSN -eq 1 ]; then
         #on SN: make the syslog be able to receive and forward remote logs
@@ -373,18 +373,18 @@ if [ $isLinux -eq 1 ] && [ -e $sysconfig ]; then
               if ($0 !~ /-h/) {sub(/-/, "-h -", $0)}
               if (($0 !~ /-m0/) && ($0 !~/-m 0/)) { sub(/-/, "-m 0 -", $0)}
               print $0}
-            else { print $0}}'  $sysconfig > $sysconfig.tmp 
+            else { print $0}}'  $sysconfig > $sysconfig.tmp
       else
-        ##turn off the time marker on all 
+        ##turn off the time marker on all
         awk '{if($0 ~ /^SYSLOGD_OPTIONS=|^SYSLOGD_PARAMS=/) {
               if (($0 !~ /-m0/) && ($0 !~/-m 0/)) { sub(/-/, "-m 0 -", $0)}
               print $0}
-            else {print $0}}' $sysconfig > $sysconfig.tmp 
+            else {print $0}}' $sysconfig > $sysconfig.tmp
       fi
     fi
-    mv -f $sysconfig.tmp $sysconfig   
+    mv -f $sysconfig.tmp $sysconfig
   fi
-fi  
+fi
 
 
 #syslog-ng has different way of enabling log forwarding
@@ -403,20 +403,20 @@ fi
 goLocal=0;
 if [ -f /etc/xCATMN ]; then
   goLocal=1
-else 
+else
   if [ $isSN -eq 1 ]; then
      if [ -n "$SVLOGLOCAL" ] && [ $SVLOGLOCAL -eq 1 ]; then
-       goLocal=1  
+       goLocal=1
      fi
   fi
 fi
 
-if [ $isC3 -eq 1 ]; then 
+if [ $isC3 -eq 1 ]; then
   config_Rsyslog_C3 $goLocal $conf_file
 else
   if [ $goLocal -eq 1 ]; then
     #making sure all the messages goes to /var/log/messages
-    touch  /var/log/messages 
+    touch  /var/log/messages
     if ( pmatch $OSVER "ubuntu*" ) || ( is_lsb_ubuntu ) || ( pmatch $OSVER "debian*" ); then
       chown --reference=/var/log /var/log/messages
       chown --reference=/var/log /var/log/xcat
@@ -437,13 +437,13 @@ else
       fi
     else
        #enable the settings that will log to local files in syslog-ng
-       sed -i '/destination messages/s/^#*//; 
-                      /destination(messages)/s/^#*//; 
-                      /destination warn/s/^#*//; 
+       sed -i '/destination messages/s/^#*//;
+                      /destination(messages)/s/^#*//;
+                      /destination warn/s/^#*//;
                       /destination(warn)/s/^#*//'  $conf_file
     fi
-    
-    #Ubuntu doesn't have sysconfig 
+
+    #Ubuntu doesn't have sysconfig
     # so configuring the MN to receive UDP connections here.
     if ( pmatch $OSVER "ubuntu*" ) || ( is_lsb_ubuntu ) || ( pmatch $OSVER "debian*" ); then
       egrep \('^\$UDPServerRun 514'\|'^\$ModLoad imudp'\) $conf_file > /dev/null 2>&1;
@@ -451,8 +451,8 @@ else
         echo "\$ModLoad imudp" >> $conf_file;
         echo "\$UDPServerRun 514" >> $conf_file;
       fi
-    fi 
-  else 
+    fi
+  else
     #now make the syslogd fowarding the messages to the the master
     if [ $ng -eq 1 ]; then
       if [ ! -f $conf_file.XCATORIG ]; then
@@ -465,16 +465,16 @@ else
       echo "# xCAT settings" >> $conf_file
       echo "destination loghost { udp(\"$master\"); };" >> $conf_file
       echo 'log { source(src); destination(loghost); };' >> $conf_file
- 
+
       # remove the settings that will log to local files
-      sed -i '/destination messages/s/^/#/; 
-                     /destination(messages)/s/^/#/; 
-                     /destination warn/s/^/#/; 
+      sed -i '/destination messages/s/^/#/;
+                     /destination(messages)/s/^/#/;
+                     /destination warn/s/^/#/;
                      /destination(warn)/s/^/#/;' $conf_file
-    else 
-      if [ -f $conf_file.XCATORIG ]; then 
-        rm -f $conf_file 
-      else 
+    else
+      if [ -f $conf_file.XCATORIG ]; then
+        rm -f $conf_file
+      else
         mv -f $conf_file $conf_file.XCATORIG
       fi
       echo "# xCAT settings" > $conf_file
@@ -486,7 +486,7 @@ else
           echo "*.* @$master" >> $conf_file
         else
           echo "*.* @$master" >> $conf_file
-        fi 
+        fi
       fi
     fi
   fi
@@ -499,7 +499,7 @@ if [ $isLinux -eq 0 ]; then
   if [ -n "$state" ] && [ "$state" = "active" ]; then
      stopsrc -s syslogd
   fi
-     
+
   #wait for syslogd to fully started
   RETRY_LIMIT=30          # number of 2 second retry intervals (60 second total)
   i=$RETRY_LIMIT
@@ -518,8 +518,8 @@ if [ $isLinux -eq 0 ]; then
       fi
   done
 else
-  #if [ $systemdEnabled -eq 1 ]; then 
-  #  systemctl restart $init.service 
+  #if [ $systemdEnabled -eq 1 ]; then
+  #  systemctl restart $init.service
   #else
   #  $init restart
   #fi
diff --git a/xCAT/postscripts/update_mlnx_adapter_firmware b/xCAT/postscripts/update_mlnx_adapter_firmware
index a8da0bdde..faa618963 100755
--- a/xCAT/postscripts/update_mlnx_adapter_firmware
+++ b/xCAT/postscripts/update_mlnx_adapter_firmware
@@ -1,34 +1,34 @@
 #!/bin/sh
-# 
-# Sample postscript that can be executed to help update the firmware level on 
+#
+# Sample postscript that can be executed to help update the firmware level on
 # Mellanox hardware adapters on the target nodes
 #
-# This script requires passing in the path of the Mellanox OFED ISO 
-# located on the xCAT Management node under the /install directory. 
+# This script requires passing in the path of the Mellanox OFED ISO
+# located on the xCAT Management node under the /install directory.
 #
-# If OFED file is located here: 
+# If OFED file is located here:
 # /install/mlnxofed/MLNX_OFED_LINUX-4.1-4.0.7.1-rhel7.4alternate-ppc64le.iso
 #
-# Call the script as follows: 
+# Call the script as follows:
 #    updatenode <noderange> -P "update_mlnx_adapter_firmware /install/mlnxofed/MLNX_OFED_LINUX-4.1-4.0.7.1-rhel7.4alternate-ppc64le.iso"
 #
 MLNX_OFED_PATH=${1}
 
-if [[ -z ${1} ]]; then 
-   echo "Error: you must provide the path of the MLNX OFED ISO file" 
+if [[ -z ${1} ]]; then
+   echo "Error: you must provide the path of the MLNX OFED ISO file"
    exit 1
-fi 
+fi
 
 WORKING_DIR="/"
 MLNX_ISO_FILE=`basename ${MLNX_OFED_PATH}`
 TARGET_ISO_FILE="${WORKING_DIR}/${MLNX_ISO_FILE}"
 
 echo "==> Mellanox OFED PATH: ${MLNX_OFED_PATH}"
-echo "==> Mellanox ODEF ISO: ${MLNX_ISO_FILE}" 
+echo "==> Mellanox ODEF ISO: ${MLNX_ISO_FILE}"
 
-if [[ -e ${TARGET_ISO_FILE} ]]; then 
+if [[ -e ${TARGET_ISO_FILE} ]]; then
    rm -f ${TARGET_ISO_FILE}
-fi 
+fi
 
 echo "==> Retrieving file from http://${MASTER}/${MLNX_OFED_PATH}"
 wget -q http://${MASTER}/${MLNX_OFED_PATH} -O ${TARGET_ISO_FILE}
diff --git a/xCAT/postscripts/update_nvme_firmware b/xCAT/postscripts/update_nvme_firmware
index 019551953..d09803ed2 100755
--- a/xCAT/postscripts/update_nvme_firmware
+++ b/xCAT/postscripts/update_nvme_firmware
@@ -1,34 +1,34 @@
 #!/bin/sh
-# 
-# If NVMe firmware file is located here: 
+#
+# If NVMe firmware file is located here:
 # /install/MN12MN12.img
 #
-# Call the script as follows to update firmware for device /dev/nvme0: 
+# Call the script as follows to update firmware for device /dev/nvme0:
 #    updatenode <noderange> -P "update_nvme_firmware /install/MN12MN12.img [/dev/nvme0]"
 #
 function usage() {
     echo "Usage: $0 </path_to/NVME.img> [nvme device]"
 }
-if [[ -z ${1} ]]; then 
-   echo "Error: you must provide the path of the NVMe Firmware file" 
+if [[ -z ${1} ]]; then
+   echo "Error: you must provide the path of the NVMe Firmware file"
    usage
    exit 1
 fi
 NVME_FILE_PATH=${1}
-if ! which nvme > /dev/null; then 
+if ! which nvme > /dev/null; then
     echo "Error: nvme utility not found, install 'nvme-cli' package and retry"
     exit 1
 fi
 if [[ -z ${2} ]]; then
-    if ! ls /dev/nvme* 2>1 >/dev/null; then 
+    if ! ls /dev/nvme* 2>1 >/dev/null; then
         echo "INFO: No NVMe device find, nothing to do"
         exit 0
-    else 
+    else
         TARGET_DEV=`ls /dev/nvme* | egrep "nvme[0-9]*$"`
     fi
 else
     TARGET_DEV=${2}
-    if ! ls $TARGET_DEV 2>1 >/dev/null; then 
+    if ! ls $TARGET_DEV 2>1 >/dev/null; then
         echo "Error: Could not find NVMe device: $TARGET_DEV"
         exit 1
     fi
@@ -40,11 +40,11 @@ NVME_FIRM_FILE=`basename ${NVME_FILE_PATH}`
 TARGET_FIRM_FILE="${WORKING_DIR}/${NVME_FIRM_FILE}"
 
 echo "==> NVMe Firmware File PATH: ${NVME_FILE_PATH}"
-echo "==> NVMe Firmware File: ${NVME_FIRM_FILE}" 
+echo "==> NVMe Firmware File: ${NVME_FIRM_FILE}"
 
-if [[ -e ${TARGET_FIRM_FILE} ]]; then 
+if [[ -e ${TARGET_FIRM_FILE} ]]; then
    rm -f ${TARGET_FIRM_FILE}
-fi 
+fi
 
 echo "==> Retrieving file from http://${MASTER}/${NVME_FILE_PATH}"
 wget -q http://${MASTER}/${NVME_FILE_PATH} -O ${TARGET_FIRM_FILE}
diff --git a/xCAT/postscripts/updateflag.awk b/xCAT/postscripts/updateflag.awk
index c36ab7d89..336d88ffd 100755
--- a/xCAT/postscripts/updateflag.awk
+++ b/xCAT/postscripts/updateflag.awk
@@ -5,7 +5,7 @@ BEGIN {
     xcatdhost = ARGV[1]
     xcatdport = ARGV[2]
     flag = ARGV[3]
-    
+
     if (!flag) flag = "next"
 
     ns = "/inet/tcp/0/" xcatdhost "/" xcatdport
@@ -20,7 +20,7 @@ BEGIN {
             close(ns)
             system("sleep 10")
             loop = loop + 1
-        }   
+        }
 
         if($0 == "ready")
             print flag |& ns
diff --git a/xCAT/postscripts/xcatclient b/xCAT/postscripts/xcatclient
index f79df9a4a..af699f7ff 100755
--- a/xCAT/postscripts/xcatclient
+++ b/xCAT/postscripts/xcatclient
@@ -4,9 +4,9 @@
 #
 # This routine transfers the client credentials from ~/.xcat on the MN
 # to the SN for Linux.
-# It only does something, if called with the -d flag. 
+# It only does something, if called with the -d flag.
 # The -d flag was implemented when the call to the routine was moved
-# from the postscript table into the servicenode postscript. 
+# from the postscript table into the servicenode postscript.
 #
 if [ ! $1 ]; then
    logger -t xcat -p local4.err "xcatclient call without -d, doing nothing."
diff --git a/xCAT/postscripts/xcatdsklspost b/xCAT/postscripts/xcatdsklspost
index c41577c12..430fc367e 100755
--- a/xCAT/postscripts/xcatdsklspost
+++ b/xCAT/postscripts/xcatdsklspost
@@ -12,9 +12,9 @@
 #      node deployment  --> xcatdsklspost
 #      statelite mode   --> xcatdsklspost 4
 #      update security  --> xcatdsklspost 5 -m/-M ...
-#      node reboot - xcatpostinit1  --> xcatdsklspost 6 
+#      node reboot - xcatpostinit1  --> xcatdsklspost 6
 # This script has a debug mode,  if XCATDEBUG env variable is set, then
-#   /xcatpost becomes /xcatpost.<nodename>.  This allow running multiple 
+#   /xcatpost becomes /xcatpost.<nodename>.  This allow running multiple
 #   instances of the script to simulate many node on one physical node
 #
 #####################################################
@@ -71,10 +71,10 @@ echolog()
             msgutil_r  "$MASTER_IP" "$msgtype" "$msgstr" "/var/log/xcat/xcat.log" "xcat.xcatdsklspost"
       fi
    else
-      echo "$msgstr"  
+      echo "$msgstr"
       msgutil_r "$MASTER_IP"  "$msgtype" "$msgstr" "/var/log/xcat/xcat.log" "xcat.xcatdsklspost"
    fi
-   
+
    #reload the functions defined in./xcatlib.sh
    if [ "$ismsgutil_r" = "0" ];then
        unset msgutil_r
@@ -123,7 +123,7 @@ download_postscripts()
     echolog "debug" "trying to download postscripts from http://$server$INSTALLDIR/postscripts/"
     max_retries=5
     retry=0
-    rc=1  # this is a fail return 
+    rc=1  # this is a fail return
     while [ 0 -eq 0 ]; do
         if [ -e "$xcatpost" ]; then
             rm -rf "$xcatpost"
@@ -175,7 +175,7 @@ download_mypostscript()
     fi
     retry=0
     rc=1
- 
+
 
     echolog "debug" "trying to download http://$server$TFTPDIR/mypostscripts/mypostscript.$node..."
     while [ 0 -eq 0 ]; do
@@ -188,7 +188,7 @@ download_mypostscript()
             return 0
         fi
 
-        
+
         retry=$(($retry+1))
         if [ $retry -eq $max_retries ]; then
             echolog "debug" "http://$server$TFTPDIR/mypostscripts/mypostscript.$node is not available."
@@ -211,7 +211,7 @@ pmatch ()
 
   return 1          # non-zero return code means string not matched by pattern
 }
-# Main 
+# Main
 # parse the arguments
 ARGNUM=$#;
 if [ -z $1 ]; then
@@ -237,35 +237,35 @@ else
       if [ $ARGNUM -gt 4 ]; then
         if [ $5 = "--tftp" ]; then
           TFTPDIR=$6
-        fi 
+        fi
       fi
       if [ $ARGNUM -gt 6 ]; then
         if [ $7 = "--installdir" ]; then
           INSTALLDIR=$8
-        fi 
+        fi
       fi
       if [ $ARGNUM -gt 8 ]; then
         if [ $9 = "--nfsv4" ]; then
           NFSV4=${10}
-        fi 
+        fi
       fi
       if [ $ARGNUM -gt 10 ]; then
         if [ ${11} = "-c" ]; then
           CFLAG=${11}
-        fi 
+        fi
       fi
       if [ $ARGNUM -gt 11 ]; then
         if [ ${12} = "-V" ]; then
-         export VERBOSE=1 
-        fi 
+         export VERBOSE=1
+        fi
         if [ ${12} = "-F" ]; then
-         export USEFLOWCONTROL=1 
-        fi 
+         export USEFLOWCONTROL=1
+        fi
       fi
       if [ $ARGNUM -gt 12 ]; then
         if [ ${13} = "-V" ]; then
-         export VERBOSE=1 
-        fi 
+         export VERBOSE=1
+        fi
       fi
       ;;
     3|4|6) MODE=$1;;
@@ -311,7 +311,7 @@ if [ ! `uname` = Linux ]; then
   logger -t xcat -p local4.err "Running xcataixpost $*"
   # note not supporting -F or -V on AIX
   echo "/$xcatpost/xcataixpost $1 $2 $3 '"$4"' $5 $6 $7 $8 $9 ${10} ${11}"
-  exec /$xcatpost/xcataixpost $1 $2 $3 "$4" $5 $6 $7 $8 $9 ${10} ${11} 
+  exec /$xcatpost/xcataixpost $1 $2 $3 "$4" $5 $6 $7 $8 $9 ${10} ${11}
   exit
 fi
 
@@ -319,7 +319,7 @@ fi
 #sleep $SLI
 
 if [ ! -d /$xcatpost ]; then
-    mkdir -p /$xcatpost; 
+    mkdir -p /$xcatpost;
 fi
 
 if [ ! -d /tmp/postage ]; then
@@ -389,7 +389,7 @@ else # for common mode  MODE=1,2,3,5 (updatenode,moncfg,node deployment)
     # try the -m/-M input (P_SIP) if it is specified,
     # -m/-M is passed in the updatenode command
     # and is the address of the xcatmaster for this node.  Using -M just means
-    # also update the XCATSERVER in the /etc/xcat/xcatinfo file with this 
+    # also update the XCATSERVER in the /etc/xcat/xcatinfo file with this
     # address
     if [ -n "$P_SIP" ]; then   # passed in with updatenode on -M/-m
         SIP=$P_SIP
@@ -398,20 +398,20 @@ else # for common mode  MODE=1,2,3,5 (updatenode,moncfg,node deployment)
             downloaded=1
         fi
     fi
-    # if the download failed then, if not updatenode 
+    # if the download failed then, if not updatenode
     # open the xcatinfo file to look for an XCATSERVER address to try
     # if the address if not the same as the one on the -m/M flag then
     # try it
     if [ $downloaded -eq 0 ]; then
 
-        # if this is an updatenode call, then stop trying and 
+        # if this is an updatenode call, then stop trying and
         # return an error
-        if [ "$MODE" = "1" ] || [ "$MODE" = "2" ] || [ "$MODE" = "5" ]; then # updatenode 
+        if [ "$MODE" = "1" ] || [ "$MODE" = "2" ] || [ "$MODE" = "5" ]; then # updatenode
             hn=`hostname`
             #echo "Cannot download the postscripts from $SIP  for $hn check /tmp/wget.log on the node."
             #logger -t xCAT -p local4.err "xcatdsklspost:Cannot download the postscripts from the xCAT server $SIP for node $hn check /tmp/wget.log on the node."
             echolog "err" "cannot download the postscripts from the xCAT server $SIP for node $hn check /tmp/wget.log on the node."
-            exit  
+            exit
         fi
 
         # if not updatenode, then look in xcatinfo for the xcatmaster
@@ -426,7 +426,7 @@ else # for common mode  MODE=1,2,3,5 (updatenode,moncfg,node deployment)
         fi
     fi
 
-    # download postscripts has not worked yet 
+    # download postscripts has not worked yet
     if [ $downloaded -eq 0 ]; then
 
          # for the non-updatenode calls try the host in the XCAT kernel param.
@@ -446,7 +446,7 @@ else # for common mode  MODE=1,2,3,5 (updatenode,moncfg,node deployment)
           done
     fi
 
-    # download poscripts has not worked yet 
+    # download poscripts has not worked yet
     #try the dhcp server, this is used for initial boot for the node.
     if [ $downloaded -eq 0 ]; then
         #setup $OSVER ,for SLES11
@@ -463,7 +463,7 @@ else # for common mode  MODE=1,2,3,5 (updatenode,moncfg,node deployment)
         SIP=`echo $SIPS|awk '{printf $NF}' | tail -n 1` #Pick one for wget
         if [ -n "$SIP" ]; then
             download_postscripts $SIP
-            if [ $? -eq 0 ]; then 
+            if [ $? -eq 0 ]; then
                 downloaded=1
             fi
         elif [ -x "/sbin/dhcpcd" ]; then
@@ -483,7 +483,7 @@ else # for common mode  MODE=1,2,3,5 (updatenode,moncfg,node deployment)
             done
         fi
     fi
-    
+
     #no hope to download postscripts, now let's get out of here.
     if [ $downloaded -eq 0 ]; then
         hn=`hostname`
@@ -501,15 +501,15 @@ fi # finish the postscripts download
 rm -rf /$xcatpost/mypostscript
 
 # if NODE is exported ( updatenode call or from kernel parameter)
-# use it as the nodename to get the mypostscript file. 
+# use it as the nodename to get the mypostscript file.
 if [ -n "$NODE" ]; then
   node_short=$NODE
 else
   #get node name and download the mypostscript.$node file
   #try to get the node ip address that connects to the server.
   #then resolve the name of the ip
-  real_SIP=`getent hosts $SIP |awk {'print $1'}` 
-  if [ $? -ne 0 ]; then 
+  real_SIP=`getent hosts $SIP |awk {'print $1'}`
+  if [ $? -ne 0 ]; then
     real_SIP=$SIP
   fi
 
@@ -530,7 +530,7 @@ else
       if [ -z "$node_short" ]; then
         node_short=`echo $node |awk -F. {'print $1'}`
       fi
-    else 
+    else
       if [ -z "$node" ]; then
         node=`hostname`
         node_short=`hostname -s`
@@ -545,10 +545,10 @@ fi
 echolog "info" "trying to get mypostscript from $SIP..."
 max_retries=2
 # try short hostname first
-if [ -n "$node_short" ]; then 
+if [ -n "$node_short" ]; then
     download_mypostscript $SIP $node_short $max_retries $TFTPDIR
     if [ $? -ne 0 ]; then
-        # try long hostname 
+        # try long hostname
         if [ "$node" != "$node_short" ]; then
           download_mypostscript $SIP $node $postfix $max_retries $TFTPDIR
         fi
@@ -566,10 +566,10 @@ if grep 'rw /rw tmpfs ' /proc/mounts  >/dev/null 2>&1; then
 fi
 
 # To support the postscripts in the subdirectories under /install/postscripts
-#chmod +x /$xcatpost/*; 
+#chmod +x /$xcatpost/*;
 chmod -R +x `find $xcatpost/ -maxdepth 1 -print | grep -E -v "^($xcatpost/|$xcatpost/_xcat|$xcatpost/_ssh|$xcatpost/ca|$xcatpost/hostkeys)$"`
 
-cd /$xcatpost; 
+cd /$xcatpost;
 PATH=/$xcatpost:$PATH
 export PATH
 
@@ -580,7 +580,7 @@ if [ -x /usr/bin/openssl ]; then
      export USEOPENSSLFORXCAT
 fi
 
-# if download of postscript failed, 
+# if download of postscript failed,
 # probably  the /tftpboot/mypostcript/mypostscript.<nodename> does not exist.
 # We need to call getpostscript.awk .
 
@@ -632,7 +632,7 @@ if [ ! -x /$xcatpost/mypostscript ]; then
         #logger -t xCAT -p local4.info "xcatdsklspost: error from xcatflowrequest, will not use flow control"
         echolog "debug" "error from xcatflowrequest, will not use flow control"
         useflowcontrol=0
-      fi 
+      fi
     fi
     /$xcatpost/getpostscript.awk | egrep  '<data>' | sed  -e 's/<[^>]*>//g'|egrep -v '^ *$'|sed -e 's/^ *//' | sed -e 's/&lt;/</g' -e 's/&gt;/>/g' -e 's/&amp;/\&/g' -e 's/&quot;/"/g' -e "s/&apos;/'/g" >  /$xcatpost/mypostscript;
     MYCONT=`grep MASTER /$xcatpost/mypostscript`
@@ -640,9 +640,9 @@ if [ ! -x /$xcatpost/mypostscript ]; then
         break;
     fi
  done
-fi 
+fi
 
-#save the MASTER into the xcatinfo file for node deployment case, 
+#save the MASTER into the xcatinfo file for node deployment case,
 #for updatenode case, only save it when -M is specified
 if [ $NODE_DEPLOYMENT -eq 1 ] || [ "$MODE" = "4" ]; then
     new_ms=`grep '^MASTER' /$xcatpost/mypostscript |head -n 1 |cut -d= -f2`
@@ -660,8 +660,8 @@ if [ -n "$new_ms" ]; then
     fi
 fi
 
-#save the USEFLOWCONTROL into the xcatinfo file  
-#for updatenode case, passwd in with the -f flag 
+#save the USEFLOWCONTROL into the xcatinfo file
+#for updatenode case, passwd in with the -f flag
 if [ $NODE_DEPLOYMENT -eq 1 ] || [ "$MODE" = "4" ]; then
     useflowcontrol=`grep '^USEFLOWCONTROL' /$xcatpost/mypostscript |cut -d= -f2 | tr -d \'\" | tr A-Z a-z`
 fi
@@ -673,7 +673,7 @@ if [ -n "$useflowcontrol" ]; then
     # lets just put YES or NO in xcatinfo
     if [[ "$useflowcontrol" =~ ^(1|yes|y)$ ]]; then
        new_fc="YES"
-    else 
+    else
        new_fc="NO"
     fi
 # no setting means do not use flowcontrol
@@ -719,7 +719,7 @@ fi
 # when called by the updatenode command  MODE=1,2
 # the nodename is passed in by xdsh in the NODE environment variable by xdsh.
 
-#modify the UPDATENODE flag to 1 
+#modify the UPDATENODE flag to 1
 # put NODE in /opt/xcat/xcatinfo
 if [ "$MODE" = "1" ] || [ "$MODE" = "2" ]; then
   TMP=`sed -e 's/UPDATENODE=0/UPDATENODE=1/g' /$xcatpost/mypostscript`;
@@ -744,7 +744,7 @@ if [ "$MODE" = "5" ]; then
   echo "$TMP" > /$xcatpost/mypostscript;
 fi
 
-#when a diskfull reboot mode 
+#when a diskfull reboot mode
 if [ "$MODE" = "6" ]; then
   # remove the post scripts so that they are not run on reboot
   TMP=`sed "/# postscripts-start-here/,/# postscripts-end-here/ d" /$xcatpost/mypostscript`
@@ -759,7 +759,7 @@ if [ "$MODE" = "6" ]; then
   #remove all the postscripts
   TMP=`sed "/# postbootscripts-start-here/,/# postbootscripts-end-here/ d" /$xcatpost/mypostscript`
   echo "$TMP" > /$xcatpost/mypostscript
- 
+
   #TMP=`sed "/postbootscripts-start-here/,/postbootscripts-end-here/ d" /$xcatpost/mypostscript.post`
   #echo "$TMP" > /$xcatpost/mypostscript.post
   fi
@@ -768,7 +768,7 @@ fi
 # postscript name is specified with the updatenode
 #cp /$xcatpost/mypostscript /$xcatpost/mypostscript.backup
 # if the list has a postscript named *start-here* then we must rebuild the
-# mypostscript file with only the matching *start-here stanza. 
+# mypostscript file with only the matching *start-here stanza.
 
 
 if ( pmatch $POSTSCRIPTS  "*start-here*" ); then
@@ -782,15 +782,15 @@ if ( pmatch $POSTSCRIPTS  "*start-here*" ); then
     echo "$TMP" > /$xcatpost/mypostscript
   fi
   if ( pmatch $POSTSCRIPTS  "*postscripts-start-here" ); then
-    #remove all the postbootscripts 
+    #remove all the postbootscripts
     TMP=`sed "/# postbootscripts-start-here/,/# postbootscripts-end-here/ d" /$xcatpost/mypostscript`
     echo "$TMP" > /$xcatpost/mypostscript
   fi
   if ( pmatch $POSTSCRIPTS  "*postbootscripts-start-here" ); then
-    #remove all the postscripts 
+    #remove all the postscripts
     TMP=`sed "/# postscripts-start-here/,/# postscripts-end-here/ d" /$xcatpost/mypostscript`
     echo "$TMP" > /$xcatpost/mypostscript
-    
+
   fi
   if ( pmatch $POSTSCRIPTS  "*defaults-postscripts-start-here" ); then
   # remove all sections but the defaults-postscripts section
@@ -801,7 +801,7 @@ if ( pmatch $POSTSCRIPTS  "*start-here*" ); then
     TMP=`sed "/# postbootscripts-start-here/,/# postbootscripts-end-here/ d" /$xcatpost/mypostscript`
     echo "$TMP" > /$xcatpost/mypostscript
   fi
-  
+
   if ( pmatch $POSTSCRIPTS  "*node-postscripts-start-here" ); then
   # remove all sections but the node-postscripts section
     TMP=`sed "/# osimage-postscripts-start-here/,/# osimage-postscripts-end-here/ d" /$xcatpost/mypostscript`
@@ -821,8 +821,8 @@ if ( pmatch $POSTSCRIPTS  "*start-here*" ); then
     TMP=`sed "/# postscripts-start-here/,/# postscripts-end-here/ d" /$xcatpost/mypostscript`
     echo "$TMP" > /$xcatpost/mypostscript
   fi
-  
-  
+
+
   if ( pmatch $POSTSCRIPTS  "*node-postbootscripts-start-here" ); then
   # remove all sections but the node-postbootscripts section
     TMP=`sed "/# osimage-postbootscripts-start-here/,/# osimage-postbootscripts-end-here/ d" /$xcatpost/mypostscript`
@@ -832,13 +832,13 @@ if ( pmatch $POSTSCRIPTS  "*start-here*" ); then
     TMP=`sed "/# postscripts-start-here/,/# postscripts-end-here/ d" /$xcatpost/mypostscript`
     echo "$TMP" > /$xcatpost/mypostscript
   fi
-   
-   
+
+
 # check to see if input postscript list is not empty. If there is a list
 # remove the built postscripts and only add the ones for the list.
 else
    if [ -n "$POSTSCRIPTS" ]; then
-    #remove all the postbootscripts, and replace with list provided 
+    #remove all the postbootscripts, and replace with list provided
     TMP=`sed "/# postbootscripts-start-here/,/# postbootscripts-end-here/ d" /$xcatpost/mypostscript`
     echo "$TMP" > /$xcatpost/mypostscript
     #remove all the postscripts
@@ -848,7 +848,7 @@ else
     #add requested postscripts in
     echo "$POSTSCRIPTS" | tr "," "\n" >> /$xcatpost/mypostscript
     echo "# postscripts-end-here" >> /$xcatpost/mypostscript
-  
+
   fi
 fi
 
@@ -886,7 +886,7 @@ run_ps () {
   scriptype=\"postscript\"
  fi
 
- if [ -f \$1 ]; then 
+ if [ -f \$1 ]; then
   echo \"Running \$scriptype: \$1\"
   msgutil_r \"\$MASTER_IP\" \"info\" "\"Running \$scriptype: \$1\"" \"\$logfile\" \"xcat.mypostscript\"
   if [ \"\$XCATDEBUGMODE\" = \"1\" ] || [ \"\$XCATDEBUGMODE\" = \"2\" ]; then
@@ -896,7 +896,7 @@ run_ps () {
         bash -x ./\$@ 2>&1 | tee -a \$logfile | tee >(logger -t xcat.mypostscript -p debug)
         ret_local=\${PIPESTATUS[0]}
      else
-        ./\$@ 2>&1 | tee -a \$logfile | logger -t xcat.mypostscript -p debug
+        ./\$@ 2>&1 | tee -a \$logfile | tee >(logger -t xcat.mypostscript -p debug)
         ret_local=\${PIPESTATUS[0]}
      fi
   else
@@ -926,7 +926,7 @@ if [ "$MODE" = "1" ] || [ "$MODE" = "2" ]  || [ "$MODE" = "3" ] || [ "$MODE" = "
 else
     TMP=`sed "/# postbootscripts-start-here/,/# postbootscripts-end-here/ s/\(.*\)/run_ps postbootscript \1/;s/run_ps postbootscript\s*#/#/;s/run_ps postbootscript\s*$//" /$xcatpost/mypostscript`
 fi
-echo "$TMP" > /$xcatpost/mypostscript 
+echo "$TMP" > /$xcatpost/mypostscript
 
 if [ $NODE_DEPLOYMENT -eq 1 ] || [ "$MODE" = "4" ] || [ "$MODE" = "6" ]; then
   #notify the server that we are done with netbooting
@@ -963,7 +963,7 @@ fi
 DHCP_TMP=`sed 's/\(DHCPINTERFACES=\)\(.*\)$/\1"\2"/' /$xcatpost/mypostscript`
 echo "$DHCP_TMP" > /$xcatpost/mypostscript
 
-CLEANUPXCATPOST=`grep CLEANUPXCATPOST= /$xcatpost/mypostscript |awk -F = '{print $2}' | tr -d \'\" | tr A-Z a-z` 
+CLEANUPXCATPOST=`grep CLEANUPXCATPOST= /$xcatpost/mypostscript |awk -F = '{print $2}' | tr -d \'\" | tr A-Z a-z`
 if [[ "$CLEANUPXCATPOST" =~ ^(1|yes|y)$ ]]; then
   echo "cd /" >> /$xcatpost/mypostscript
   # /xcatpost might be read-only for statelite nodes
diff --git a/xCAT/postscripts/xcatflowrequest b/xCAT/postscripts/xcatflowrequest
index b8dd84ea1..292654327 100644
--- a/xCAT/postscripts/xcatflowrequest
+++ b/xCAT/postscripts/xcatflowrequest
@@ -74,7 +74,7 @@ while ! grep 'resourcerequest: ok' /tmp/goahead.$parpid > /dev/null; do
     if [ $RETRY -eq $MAX_RETRIES ]
     then
        cleanup
-       exit 2 
+       exit 2
     fi
 	
 done
diff --git a/xCAT/postscripts/xcatinstallpost b/xCAT/postscripts/xcatinstallpost
index 26d5f27f8..9e485818c 100755
--- a/xCAT/postscripts/xcatinstallpost
+++ b/xCAT/postscripts/xcatinstallpost
@@ -29,12 +29,12 @@ INSTALLNIC=`ip -o link|grep -i $MACADDR|awk  '{print $2}'|sed s/://`
 
 
 # the network between the node and MASTER might be not well configured and activated when running the PBS sometimes
-# need to make sure... 
+# need to make sure...
 RETRY=0
 while true; do
     #check whether the network access between MN/CN and the node is ready
-    ping $MASTER_IP -c 1 >/dev/null && break 
-    
+    ping $MASTER_IP -c 1 >/dev/null && break
+
     RETRY=$[ $RETRY + 1 ]
 
     if [ $RETRY -eq 90 ];then
@@ -42,13 +42,13 @@ while true; do
        msgutil_r "$MASTER_IP" "error" "the network between the node and $MASTER_IP is not ready, please check[retry=$RETRY]..." "/var/log/xcat/xcat.log" "$log_label"
        exit 1
     fi
-    
-    #sleep sometime before the next scan  
+
+    #sleep sometime before the next scan
     sleep 2
 done
 
 
-cd /xcatpost; 
+cd /xcatpost;
 PATH=/xcatpost:$PATH
 export PATH
 # To support the postscripts in the subdirectories under /install/postscripts
@@ -71,7 +71,7 @@ DHCP_TMP=`sed 's/\(DHCPINTERFACES=\)\(.*\)$/\1"\2"/' /xcatpost/mypostscript.post
 echo "$DHCP_TMP" > /xcatpost/mypostscript.post
 
 #mark that the first reboot after installation is finished
-grep 'REBOOT' /opt/xcat/xcatinfo > /dev/null 2>&1 
+grep 'REBOOT' /opt/xcat/xcatinfo > /dev/null 2>&1
 if [ $? -eq 0 ]; then
     sed -i "s/REBOOT=.*/REBOOT=TRUE/" /opt/xcat/xcatinfo
 else
@@ -79,7 +79,7 @@ else
 fi
 
 #add node name to xcatinfo
-grep 'NODE' /opt/xcat/xcatinfo > /dev/null 2>&1 
+grep 'NODE' /opt/xcat/xcatinfo > /dev/null 2>&1
 if [ $? -eq 0 ]; then
     sed -i "s/NODE=.*/NODE=$NODE/" /opt/xcat/xcatinfo
 else
@@ -87,7 +87,7 @@ else
 fi
 
 #add image name to xcatinfo
-grep 'IMAGENAME' /opt/xcat/xcatinfo > /dev/null 2>&1 
+grep 'IMAGENAME' /opt/xcat/xcatinfo > /dev/null 2>&1
 if [ $? -eq 0 ]; then
     sed -i "s/IMAGENAME=.*/IMAGENAME=$IMAGE/" /opt/xcat/xcatinfo
 else
diff --git a/xCAT/postscripts/xcatlib.sh b/xCAT/postscripts/xcatlib.sh
index f68d72dbc..554e00066 100755
--- a/xCAT/postscripts/xcatlib.sh
+++ b/xCAT/postscripts/xcatlib.sh
@@ -208,7 +208,7 @@ function v6expand(){
         str_temp=$str_temp":0"
         num_index=$((num_index+1))
     done
-    
+
     str_v6address=`echo $str_v6address | sed "s/::/:$str_temp:/" | sed 's/^:/0:/' | sed 's/:$/:0/'`
     echo "$str_v6address"
 }
@@ -276,13 +276,13 @@ function v6calcnet(){
 function servicemap {
    local svcname=$1
    local svcmgrtype=$2
-   local svclistname=   
+   local svclistname=
 
-   # if there are more than 1 possible service names for a service among 
-   # different os distributions and os releases, the service should be 
-   # specified with structure 
+   # if there are more than 1 possible service names for a service among
+   # different os distributions and os releases, the service should be
+   # specified with structure
    # INIT_(general service name) = "list of possible service names"
-   #  
+   #
    INIT_dhcp="dhcp3-server dhcpd isc-dhcp-server";
 
    INIT_nfs="nfsserver nfs-server nfs nfs-kernel-server";
@@ -290,7 +290,7 @@ function servicemap {
    INIT_named="named bind9";
 
    INIT_syslog="syslog syslogd rsyslog";
- 
+
    INIT_firewall="iptables firewalld ufw";
 
    INIT_http="apache2 httpd";
@@ -313,7 +313,7 @@ function servicemap {
    elif [ "$svcmgrtype" = "1"  ];then
       #for systemd
       #retdefault=$svcname.service
-      #ubuntu 16.04 replace upstart with systemd, 
+      #ubuntu 16.04 replace upstart with systemd,
       #all the service unit files are placed under /lib/systemd/system/ on ubuntu
       #all the service unit files are placed under /usr/lib/systemd/system/ on redhat and sles
       #path should be delimited with space
@@ -333,9 +333,9 @@ function servicemap {
        echo ""
        return
    fi
- 
+
    svclistname=INIT_$svcvar
-   local svclist=$(eval echo \$$svclistname)      
+   local svclist=$(eval echo \$$svclistname)
 
    if [ -z "$svclist" ];then
       svclist="$retdefault"
@@ -350,13 +350,13 @@ function servicemap {
            fi
        done
    done
-  
+
    echo ""
 }
 
 #some special services cannot be processed in sysVinit, upstart and systemd framework, should be process here...
 #Notice:
-# return value: 
+# return value:
 # 127 :         if the service $svcname cannot be processed in this function
 # otherwise:    the return value of the service action
 
@@ -385,7 +385,7 @@ function specialservicemgr {
               service SuSEfirewall2_setup status
               ;;
               *)
-              return 127 
+              return 127
               ;;
          esac
          return $?
@@ -399,7 +399,7 @@ function startservice {
    local svcname=$1
 
    local retval
-   specialservicemgr "$svcname" start 
+   specialservicemgr "$svcname" start
    retval=$?
    if [ "$retval" != "127"  ]; then
       return $retval
@@ -410,7 +410,7 @@ function startservice {
    local svcunit=`servicemap $svcname 1`
    local svcjob=`servicemap $svcname 2`
    local svcd=`servicemap $svcname 0`
-  
+
    if [ -n "$svcunit"  ];then
       cmd="systemctl start $svcunit"
    elif [ -n "$svcjob"  ];then
@@ -422,16 +422,16 @@ function startservice {
    if [ -z "$cmd"  ];then
       return 127
    fi
-   
+
    #for the linux distributions with systemd support
    #In the chrooted env, the system management commands(start/stop/restart) will be ignored and the return code is 0
-   #need to return the proper code in the chrooted scenario 
+   #need to return the proper code in the chrooted scenario
    local retmsg
    retmsg=`$cmd 2>&1`
    retval=$?
    [ "$retval" = "0" ] && (echo "$retmsg" | grep -i "Running in chroot,\s*ignoring request.*" >/dev/null 2>&1)   && retval=1
 
-   return $retval   
+   return $retval
 }
 
 
@@ -440,7 +440,7 @@ function stopservice {
    local svcname=$1
 
    local retval
-   specialservicemgr "$svcname" stop 
+   specialservicemgr "$svcname" stop
    retval=$?
    if [ "$retval" != "127"  ]; then
       return $retval
@@ -450,7 +450,7 @@ function stopservice {
    local svcunit=`servicemap $svcname 1`
    local svcjob=`servicemap $svcname 2`
    local svcd=`servicemap $svcname 0`
-  
+
    if [ -n "$svcunit"  ];then
       cmd="systemctl stop $svcunit"
    elif [ -n "$svcjob"  ];then
@@ -458,12 +458,12 @@ function stopservice {
       if [ "$?" = "0" ] ; then
          return 0
       else
-         cmd="initctl stop $svcjob"       
+         cmd="initctl stop $svcjob"
       fi
    elif [ -n "$svcd"  ];then
       cmd="service $svcd stop"
    fi
-    
+
    echo $cmd
 
    if [ -z "$cmd"  ];then
@@ -486,7 +486,7 @@ function restartservice {
    local svcname=$1
 
    local retval
-   specialservicemgr "$svcname" restart 
+   specialservicemgr "$svcname" restart
    retval=$?
    if [ "$retval" != "127"  ]; then
       return $retval
@@ -497,16 +497,16 @@ function restartservice {
    local svcunit=`servicemap $svcname 1`
    local svcjob=`servicemap $svcname 2`
    local svcd=`servicemap $svcname 0`
-  
+
    if [ -n "$svcunit"  ];then
       cmd="systemctl restart $svcunit"
    elif [ -n "$svcjob"  ];then
       initctl status $svcjob | grep stop
-      if [ "$?" = "0" ];then 
+      if [ "$?" = "0" ];then
          cmd="initctl start $svcjob"
       else
          cmd="initctl restart $svcjob"
-      fi 
+      fi
    elif [ -n "$svcd"  ];then
       cmd="service $svcd restart"
    fi
@@ -514,7 +514,7 @@ function restartservice {
    if [ -z "$cmd"  ];then
       return 127
    fi
-   
+
    #for the linux distributions with systemd support
    #In the chrooted env, the system management commands(start/stop/restart) will be ignored and the return code is 0
    #need to return the proper code in the chrooted scenario
@@ -531,7 +531,7 @@ function checkservicestatus {
    local svcname=$1
 
    local retval
-   specialservicemgr "$svcname" status 
+   specialservicemgr "$svcname" status
    retval=$?
    if [ "$retval" != "127"  ]; then
       return $retval
@@ -541,9 +541,9 @@ function checkservicestatus {
    local svcunit=`servicemap $svcname 1`
    local svcjob=`servicemap $svcname 2`
    local svcd=`servicemap $svcname 0`
- 
-   local output= 
-   local retcode=3  
+
+   local output=
+   local retcode=3
 
    if [ -n "$svcunit"  ];then
       output=$(systemctl show --property=ActiveState $svcunit|awk -F '=' '{print $2}')
@@ -558,13 +558,13 @@ function checkservicestatus {
       output=$(initctl status $svcjob)
       if echo $output|grep -i "waiting";then
          retcode=2
-      elif echo $output|grep -i "running";then 
+      elif echo $output|grep -i "running";then
          retcode=0
-      fi 
+      fi
    elif [ -n "$svcd"  ];then
       output=$(service $svcd status)
       retcode=$?
-      echo $output 
+      echo $output
 #      if echo $output|grep -E -i "(stopped|not running)";then
 #         retcode=1
 #      elif echo $output|grep -E -i "running";then
@@ -573,16 +573,16 @@ function checkservicestatus {
    else
       retcode=127
    fi
-#echo $svcunit-----$svcd   
+#echo $svcunit-----$svcd
    return $retcode
-    
+
 }
 
 function enableservice {
    local svcname=$1
 
    local retval
-   specialservicemgr "$svcname" enable 
+   specialservicemgr "$svcname" enable
    retval=$?
    if [ "$retval" != "127"  ]; then
       return $retval
@@ -593,7 +593,7 @@ function enableservice {
    local svcunit=`servicemap $svcname 1`
    local svcjob=`servicemap $svcname 2`
    local svcd=`servicemap $svcname 0`
-  
+
    if [ -n "$svcunit"  ];then
       cmd="systemctl enable  $svcunit"
    elif [ -n "$svcjob"  ];then
@@ -606,7 +606,7 @@ function enableservice {
         command -v update-rc.d >/dev/null 2>&1
         if [ $? -eq 0 ];then
            cmd="update-rc.d $svcd defaults"
-        fi  
+        fi
      fi
    fi
 
@@ -622,7 +622,7 @@ function disableservice {
    local svcname=$1
 
    local retval
-   specialservicemgr "$svcname" disable 
+   specialservicemgr "$svcname" disable
    retval=$?
    if [ "$retval" != "127"  ]; then
       return $retval
@@ -632,7 +632,7 @@ function disableservice {
    local svcunit=`servicemap $svcname 1`
    local svcjob=`servicemap $svcname 2`
    local svcd=`servicemap $svcname 0`
-  
+
    if [ -n "$svcunit"  ];then
       cmd="systemctl disable  $svcunit"
    elif [ -n "$svcjob"  ];then
@@ -645,7 +645,7 @@ function disableservice {
         command -v update-rc.d >/dev/null 2>&1
         if [ $? -eq 0 ];then
            cmd="update-rc.d -f $svcd remove"
-        fi  
+        fi
      fi
    fi
 
@@ -660,10 +660,10 @@ declare -a array_nic_params
 declare -a array_extra_param_names
 declare -a array_extra_param_values
 
-# This function parse the NICEXTRAPARAMS into an array. 
+# This function parse the NICEXTRAPARAMS into an array.
 # Each arry element contains all the extra params for an ip
 # For example:
-#    
+#
 #    NICEXTRAPARAMS="eth0!MTU=1500 sonething=x|MTU=1460,ib0!MTU=65520 CONNECTED_MODE=yes"
 #    get_nic_extra_params $eth0 $NICEXTRAPARAMS
 #  After the function is called:
@@ -714,13 +714,13 @@ function get_nic_extra_params() {
 #     MTU=65520 something=yes
 # After the function is called:
 #     array_extra_param_names[0]="MTU"
-#     array_extra_param_values[0]="65520" 
+#     array_extra_param_values[0]="65520"
 #     array_extra_param_names[1]="something"
-#     array_extra_param_values[0]="yes" 
-#     
+#     array_extra_param_values[0]="yes"
+#
 function parse_nic_extra_params() {
     str_extra=$1
-   
+
     unset array_extra_param_names
     unset array_extra_param_values
 
@@ -741,10 +741,10 @@ function parse_nic_extra_params() {
 #####################################################################
 #msgutil_r    : process messages from xcat postscripts
 #description  : for a specified message, call this function to echo,
-#               append to specified log file and log it remotely       
+#               append to specified log file and log it remotely
 #args         :
-#               logserver: the hostname or ip addr of log server               
-#               msgtype:   the type of the message, 
+#               logserver: the hostname or ip addr of log server
+#               msgtype:   the type of the message,
 #                          valid values(debug,info,warning,err)
 #               msgstr:    the string of the message  to process
 #               logfile:   the path of the file to append the log
@@ -764,7 +764,7 @@ function msgutil_r {
    fi
 
    if [ -n "$logserver" ];then
-       #In Ubuntu, there is a bug in some logger version that "-n" is ignored. The workaround is to specify the 
+       #In Ubuntu, there is a bug in some logger version that "-n" is ignored. The workaround is to specify the
        #"-u <some dummy file>"  option together with "-n"  option.
        #So far as we know, this bug exists in logger 2.20 shipped in ubuntu 14.04.4 and
        #has been fixed in logger 2.25 shipped in ubuntu 15.04. Since "-u" option won't break anything,
@@ -811,13 +811,13 @@ function msgutil_r {
 
 #####################################################################
 #msgutil      : process messages from xcat postscripts
-#description  : for a specified message, call this function to 
-#               echo,append to the specified file and log it        
-#args         : 
-#               msgtype:  the type of the message, 
+#description  : for a specified message, call this function to
+#               echo,append to the specified file and log it
+#args         :
+#               msgtype:  the type of the message,
 #                         valid values(debug,info,warning,err)
 #               msgstr:   the string of the message  to process
-#               logfile:  the path of the file to append the log 
+#               logfile:  the path of the file to append the log
 ####################################################################
 function msgutil {
    msgutil_r "" "$@"
diff --git a/xCAT/postscripts/xcatpostinit1 b/xCAT/postscripts/xcatpostinit1
index 2af370840..b9f1b1002 100755
--- a/xCAT/postscripts/xcatpostinit1
+++ b/xCAT/postscripts/xcatpostinit1
@@ -1,6 +1,6 @@
 #!/bin/bash
 # IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html
-# This script is deprecated, please use xcatpostinit1.install instead 
+# This script is deprecated, please use xcatpostinit1.install instead
 # chkconfig: 345 84 59
 # description: service node postboot script hack
 # processname: xcatpostinit
@@ -33,7 +33,7 @@ stop)
   echo -n "nothing to stop "
   ;;
 start)
-  # check for the REBOOT specified in xcatinfo to run post boot scripts on reboot 
+  # check for the REBOOT specified in xcatinfo to run post boot scripts on reboot
   if [ -f /opt/xcat/xcatinfo ]; then
     REBOOT=`grep 'REBOOT' /opt/xcat/xcatinfo |cut -d= -f2`
   fi
diff --git a/xCAT/postscripts/xcatpostinit1.install b/xCAT/postscripts/xcatpostinit1.install
index 21bf77392..04b5db680 100755
--- a/xCAT/postscripts/xcatpostinit1.install
+++ b/xCAT/postscripts/xcatpostinit1.install
@@ -1,7 +1,7 @@
 #!/bin/bash
 # IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html
 # chkconfig: 345 84 59
-# description: the hook for systemd service unit to run PB and report node status on diskful node 
+# description: the hook for systemd service unit to run PB and report node status on diskful node
 # processname: xcatpostinit1
 
 ### BEGIN INIT INFO
@@ -31,7 +31,7 @@ stop)
   [ "$NODESTATUS" != "n" ] &&  /xcatpost/updateflag.awk $XCATSERVER 3002 "installstatus powering-off"
   ;;
 start)
-  # check for the REBOOT specified in xcatinfo to run post boot scripts on reboot 
+  # check for the REBOOT specified in xcatinfo to run post boot scripts on reboot
   if [ -f /opt/xcat/xcatinfo ]; then
     REBOOT=`grep 'REBOOT' /opt/xcat/xcatinfo |cut -d= -f2 | tr -d \'\"`
   fi
@@ -48,6 +48,10 @@ start)
     if [ -r /opt/xcat/xcatinstallpost ]; then
       /opt/xcat/xcatinstallpost
     fi
+    if [ -f /opt/xcat/xcatpostinit1.service.sles ]; then
+        rm -rf /etc/systemd/system/xcatpostinit1.service
+        mv /opt/xcat/xcatpostinit1.service.sles /etc/systemd/system/xcatpostinit1.service
+    fi
   fi
 
   ;;
diff --git a/xCAT/postscripts/xcatpostinit1.service b/xCAT/postscripts/xcatpostinit1.service
index 502a85e1d..99ec0353f 100644
--- a/xCAT/postscripts/xcatpostinit1.service
+++ b/xCAT/postscripts/xcatpostinit1.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=xcat service on compute node, the framework to run postbootscript and update node status 
+Description=xcat service on compute node, the framework to run postbootscript and update node status
 After=network.target rsyslog.service
 
 [Service]
diff --git a/xCAT/postscripts/xcatpostinit1.service.yast2 b/xCAT/postscripts/xcatpostinit1.service.yast2
new file mode 100644
index 000000000..ca6494ac1
--- /dev/null
+++ b/xCAT/postscripts/xcatpostinit1.service.yast2
@@ -0,0 +1,12 @@
+[Unit]
+Description=xcat service on compute node, the framework to run postbootscript during OS provision
+After=network.target rsyslog.service YaST2-Firstboot.service
+
+[Service]
+Type=oneshot
+ExecStart=/opt/xcat/xcatpostinit1 start
+ExecStop=/opt/xcat/xcatpostinit1 stop
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/xCAT/postscripts/xcatserver b/xCAT/postscripts/xcatserver
index d4ba3909c..7f6deb300 100755
--- a/xCAT/postscripts/xcatserver
+++ b/xCAT/postscripts/xcatserver
@@ -3,9 +3,9 @@
 #(C)IBM Corp
 # This scripts transfers the cfgloc files and the xCAT credentials from
 # the Management Node to the Service Node on Linux.
-# It only does something, if called with the -d flag. 
+# It only does something, if called with the -d flag.
 # The -d flag was implemented when the call to the routine was moved
-# from the postscript table into the servicenode postscript. 
+# from the postscript table into the servicenode postscript.
 #
 if [ ! $1 ]; then
    logger -t xcat -p local4.err "xcatserver call without -d, doing nothing."
@@ -67,8 +67,8 @@ if [ $? -ne 0 ]; then
    logger -t xcat -p local4.info "xcatserver: getting server-cred.pem"
     MAX_RETRIES=10
     RETRY=0
-    MYCONT=`cat /etc/xcat/cert/server-cred.pem` 
-    
+    MYCONT=`cat /etc/xcat/cert/server-cred.pem`
+
     while [ -z "$MYCONT" ]; do
               # not using flow control , need to sleep
               if [ $useflowcontrol = "0" ]; then
@@ -94,7 +94,7 @@ if [ $? -ne 0 ]; then
                   fi
                 fi
                 getcredentials.awk xcat_server_cred | grep -v '<'|sed -e 's/&lt;/</' -e 's/&gt;/>/' -e 's/&amp;/&/' -e 's/&quot/"/' -e "s/&apos;/'/" > /etc/xcat/cert/server-cred.pem
-                MYCONT=`cat /etc/xcat/cert/server-cred.pem` 
+                MYCONT=`cat /etc/xcat/cert/server-cred.pem`
     done
 
    chmod 600 /etc/xcat/cert/*
@@ -104,7 +104,7 @@ else  # error from first getcredential call
         #the message received is an error from credentials.pm, so parse it
         ERR_MSG=`sed -n 's%.*<error>\(.*\)</error>.*%\1%p' /etc/xcat/cert/server-cred.pem`
         logger -t xcat -p local4.err xcatserver: $ERR_MSG
-        rm /etc/xcat/cert/server-cred.pem 
+        rm /etc/xcat/cert/server-cred.pem
 fi
 
 # get the xcat cfgloc file
@@ -130,8 +130,8 @@ if [ $? -ne 0 ]; then
    logger -t xcat -p local4.info "xcatserver: getting cfgloc"
     MAX_RETRIES=10
     RETRY=0
-    MYCONT=`cat /etc/xcat/cfgloc` 
-    
+    MYCONT=`cat /etc/xcat/cfgloc`
+
     while [ -z "$MYCONT" ]; do
       # not using flow control , need to sleep
       if [ $useflowcontrol = "0" ]; then
@@ -157,9 +157,9 @@ if [ $? -ne 0 ]; then
          fi
       fi
       getcredentials.awk xcat_cfgloc | grep -v '<'|sed -e 's/&lt;/</' -e 's/&gt;/>/' -e 's/&amp;/&/' -e 's/&quot/"/' -e "s/&apos;/'/" > /etc/xcat/cfgloc
-      MYCONT=`cat /etc/xcat/cfgloc` 
+      MYCONT=`cat /etc/xcat/cfgloc`
     done
-    # if we successfully got cfgloc 
+    # if we successfully got cfgloc
     if [ -f /etc/xcat/cfgloc ]; then
       # if not DB2
       grep "DB2" /etc/xcat/cfgloc  2>&1 1> /dev/null
diff --git a/xCAT/prescripts/setupdhcp b/xCAT/prescripts/setupdhcp
index 64cdbe344..5ea7a850a 100644
--- a/xCAT/prescripts/setupdhcp
+++ b/xCAT/prescripts/setupdhcp
@@ -3,8 +3,8 @@
 
 #-------------------------------------------------------------------------------
 #=head1  setupdhcp
-#=head2  setupdhcp command is called by nodeset command as a end script.  
-#   It configures the local dhcp lease file. 
+#=head2  setupdhcp command is called by nodeset command as a end script.
+#   It configures the local dhcp lease file.
 #=cut
 #-------------------------------------------------------------------------------
 #the following 3 variables are set in yahoo.pm and pxe.pm.
@@ -16,9 +16,9 @@ fi
 
 normalnodeset=$2
 breaknetboot=$3
-if [ $normalnodeset != "NONE" ]; then  
+if [ $normalnodeset != "NONE" ]; then
     TMP=`XCATBYPASS=Y $XCATROOT/sbin/makedhcp $normalnodeset -l`
-    echo $TMP 
+    echo $TMP
 fi
 if [ $breaknetboot != "NONE" ]; then
     TMP=`XCATBYPASS=Y $XCATROOT/sbin/makedhcp $breaknetboot -l -s 'filename = \"xcat/nonexistant_file_to_intentionally_break_netboot_for_localboot_to_work\";'`
diff --git a/xCAT/templates/e1350/README b/xCAT/templates/e1350/README
index 75a657a57..1cfec57a3 100644
--- a/xCAT/templates/e1350/README
+++ b/xCAT/templates/e1350/README
@@ -5,7 +5,7 @@ The set of *.csv files in this directory are sample xCAT table values that
 you may wish to use as templates for defining your xCAT cluster.
 The data is based on defining a cluster using the address scheme given in:
 http://download.boulder.ibm.com/ibmdl/pub/systems/support/system_x_pdf/intelligent_cluster_factory_settings_05.24.12b.pdf.
-Additional information on using xCAT 2.0 can be found at 
+Additional information on using xCAT 2.0 can be found at
 http://sourceforge.net/apps/mediawiki/xcat/index.php?title=XCAT_iDataPlex_Cluster_Quick_Start.
 
 Check the 1350 default templates to see if they apply to your environment.
@@ -13,21 +13,21 @@ If you decide to use some of these templates, modify them, or create your own,
 you can first edit the files and then load them into the database, or load the
 files first and then edit the database once they are loaded.
 
-To load a file, use the tabrestore command on each template to load the tables 
+To load a file, use the tabrestore command on each template to load the tables
 in the database.
 
 To load the database tables:
    for i in *.csv; do tabrestore $i; done
 
-To verify that a table has been correctly loaded, run "tabdump <tablename>".   
-For example: 
-   tabdump nodetype 
+To verify that a table has been correctly loaded, run "tabdump <tablename>".
+For example:
+   tabdump nodetype
 
 
-You can add nodes to the database by using the nodeadd command. 
-See the example below and details in http://sourceforge.net/apps/mediawiki/xcat/index.php?title=XCAT_iDataPlex_Cluster_Quick_Start.  
+You can add nodes to the database by using the nodeadd command.
+See the example below and details in http://sourceforge.net/apps/mediawiki/xcat/index.php?title=XCAT_iDataPlex_Cluster_Quick_Start.
 
-For example, to add 2048 IPMI rackmount nodes which happen to start 
+For example, to add 2048 IPMI rackmount nodes which happen to start
 at the first U of the first rack, with each rack having a 1U switch
 and 41 servers plugged into that switch, numbered 1-41 in order,
 with the nodes named node1-node2048, and members of groups named
diff --git a/xCAT/templates/e1350/servicenode.csv b/xCAT/templates/e1350/servicenode.csv
index 6a97c4eda..70b9b0f5b 100644
--- a/xCAT/templates/e1350/servicenode.csv
+++ b/xCAT/templates/e1350/servicenode.csv
@@ -1,2 +1,2 @@
 #node,nameserver,dhcpserver,tftpserver,nfsserver,conserver,monserver,ldapserver,ntpserver,ftpserver,nimserver,ipforward,comments,disable
-"service","1","1","1","1","1"
\ No newline at end of file
+"service","1","1","1","1","1"
diff --git a/xCAT/templates/objects/node/hmc.stanza b/xCAT/templates/objects/node/hmc.stanza
index 09eb8bfff..141f2ca6d 100644
--- a/xCAT/templates/objects/node/hmc.stanza
+++ b/xCAT/templates/objects/node/hmc.stanza
@@ -9,4 +9,4 @@ hmc-template:
     ip="MANDATORY:the ip address of the hmc"
     password="MANDATORY:the password of the hmc"
     username="MANDATORY:the username on the hmc"
-    usercomment="the template for hmc definition" 
+    usercomment="the template for hmc definition"
diff --git a/xCATsn/debian/copyright b/xCATsn/debian/copyright
index f61d34dfe..87e60f492 100644
--- a/xCATsn/debian/copyright
+++ b/xCATsn/debian/copyright
@@ -85,4 +85,4 @@ Everyone is permitted to copy and distribute copies of this Agreement, but in or
 
 This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
 
- 
+
diff --git a/xCATsn/debian/postinst b/xCATsn/debian/postinst
index 0c63fba66..08f9629fa 100644
--- a/xCATsn/debian/postinst
+++ b/xCATsn/debian/postinst
@@ -50,7 +50,7 @@ case "$1" in
 	then
 	   rm -rf /etc/apache2/conf-enabled/xcat.conf
 	   ln -s /etc/apache2/conf-available/xcat.conf.apach24 /etc/apache2/conf-enabled/xcat.conf
-	fi  
+	fi
 
       apachedaemon='apache2'
 
@@ -58,7 +58,7 @@ case "$1" in
 
       if [ -f "/proc/cmdline" ]; then   # prevent running it during install into chroot image
        	 XCATROOT=/opt/xcat /etc/init.d/xcatd start
- 	 /etc/init.d/$apachedaemon reload 
+ 	 /etc/init.d/$apachedaemon reload
       fi
       echo "xCATsn is now installed"