Merging PE updates from 2.7 to trunk

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@12863 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd

xCAT-IBMhpc/share/xcat/IBMhpc/pe/ckpt.sh

@@ -0,0 +1,35 @@
+#! /bin/bash
+
+# Checkpoint/Restart related environment setup
+
+# virtualized pts support
+rm -f /dev/ptmx
+ln -s /dev/pts/ptmx /dev/ptmx
+chmod 666 /dev/ptmx
+
+# unlinked file support
+for fs in ext3 ext4 nfs gpfs tmpfs; do
+    FSROOTS=$(grep " $fs " /proc/mounts | cut -d ' ' -f 2)
+    if [ "$FSROOTS" ]; then
+        for rootfs in $FSROOTS; do
+            if [ -w $rootfs ]; then
+                CKPTDIR="$rootfs/lost+found"
+
+                [ -e $CKPTDIR ] && [ ! -d $CKPTDIR ] && rm -f $CKPTDIR
+
+                if [ ! -e $CKPTDIR ]; then
+                    mkdir -p $CKPTDIR
+                    [ "$?" -eq "0" ] && echo "made dir $CKPTDIR"
+                fi
+            fi
+        done
+    fi
+done
+
+
+# Read checkpoint key from rootfs which generated by xCAT postinstall script
+if [ -f /root/.ckpt.key ]; then
+    cat /root/.ckpt.key > /sys/kernel/checkpoint/checksum_key
+else
+    echo 'ERROR:  no checkpoint key found' 
+fi

xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe-1100.bnd

@@ -12,6 +12,5 @@ I:ppe.loc.license
 #I:ppedev.hpct
 
 # MetaCluster (checkpoint/restore)
-I:mcr.rte
 I:mdcr
 

xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe-1200.ppc64.pkglist

@@ -1,11 +1,4 @@
-
 # The following are for systems running InfiniBand networks
-##############
-#  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 
-#    these libibverbs packages.
-libibverbs.ppc
-libibverbs.ppc64
-
+libibverbs
+libibverbs-32bit

xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe-1200.rhels6.ppc64.otherpkgs.pkglist

@@ -1,4 +1,5 @@
 pe/src
+pe/libbsr
 
 #ENV:IBM_PPE_RTE_LICENSE_ACCEPT=yes#
 pe/ppe_rte_license*
@@ -12,3 +13,7 @@ pe/ppertesamples*
 #pe/ppedev_license*
 #pe/ppedev_hpct_*
 #pe/ppedev_runtime*
+
+# Checkpoint/restart function support
+#pe/user-cr
+#pe/lxc

xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe-1200.rhels6.ppc64.pkglist

@@ -0,0 +1,4 @@
+# The following are for RHEL6 systems running InfiniBand networks
+#    You should comment out these packages when running with HFI,
+libibverbs.ppc
+libibverbs.ppc64

xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe-1200.rhels6.x86_64.pkglist

@@ -0,0 +1,9 @@
+# The following are for systems running InfiniBand networks
+##############
+#  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 
+#    these libibverbs packages.
+libibverbs.i686
+libibverbs.x86_64

xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe-1200.sles11.ppc64.pkglist

@@ -0,0 +1,4 @@
+# The following are for SLES11 systems running InfiniBand networks
+#    You should comment out these packages when running with HFI,
+libibverbs
+libibverbs-32bit

xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe-1200.sles11.x86_64.pkglist

@@ -0,0 +1,9 @@
+# The following are for systems running InfiniBand networks
+##############
+#  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 
+#    these libibverbs packages.
+libibverbs
+libibverbs-32bit

xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe_install-1200

@@ -79,3 +79,28 @@ if [ "$OS" == "AIX" ]; then
   fi
   mount /proc
 fi
+
+# Generate mpi modules
+if [ "$OS" != "AIX" ]; then
+    gen_xlf=`grep PE_LATEST_LEVEL $installroot/etc/ppe.cfg | cut -f2 -d ' ' `/mpich2/sbin/xlf_gen_mpimod
+    if [ -x $installroot/$gen_xlf ] ; then
+          chroot $installroot $gen_xlf
+    fi
+fi
+
+#Generate checkpoint key and store it into the image, ckpt script could ust it after boot.
+if [ "$OS" != "AIX" ]; then
+    KEY=$(date | sha1sum | awk '{ print $1 }')
+    # KEY=$(dd if=/dev/random bs=1 | sha1sum | awk '{ print $1 }')
+    echo $KEY > $installroot/root/.ckpt.key
+    chmod 400  $installroot/root/.ckpt.key
+fi
+
+
+# BSR configuration, uncomment the following lines to enable BSR configuration on Power Linux cluter.  
+#if [ "$OS" != "AIX" ]; then
+#    chroot $installroot groupadd bsr
+#    chroot $installroot mkdir -p /var/lib/bsr
+#    chroot $installroot chown root:bsr /var/lib/bsr
+#    chroot $installroot chmod g+sw /var/lib/bsr
+#fi