Merge pull request #4738 from xcat2/master

Merge master to 2.13 branch for 2.13.10 release(4, document update)
xcat2 · Jan 26, 2018 · d179981 · d179981
2 parents 4fe63ec + a3004d2
commit d179981
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/...ce/guides/admin-guides/manage_clusters/common/deployment/install_new_kernel.rst b/...ce/guides/admin-guides/manage_clusters/common/deployment/install_new_kernel.rst
@@ -20,6 +20,7 @@ For example, kernel-3.10.0-229.ael7b.ppc64le.rpm means kernelver=3.10.0-229.ael7
         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. 
 Note: If downgrading the kernel, you may need to first remove the rootimg directory. ::
@@ -44,7 +45,7 @@ The "4.6.ppc64le" is replaced with "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-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. 
 Note: If downgrading the kernel, you may need to first remove the rootimg directory.

diff --git a/docs/source/references/coral/known_issues/genesis_base.rst b/docs/source/references/coral/known_issues/genesis_base.rst
@@ -1,6 +1,8 @@
 xCAT Genesis Base
 =================
 
+*Note*: Please rebuild ``xCAT-genesis-base`` with ``xCAT-genesis-builder`` version equal and newer than *2.13.10* before updating xCAT *2.13.10* and higher.
+
 xCAT ships a ``xCAT-genesis-base`` package as part of xcat-deps.  This is a light-weight diskless linux image based on Fedora (Fedora26, currently) that is used by xCAT to do hardware discovery.
 
 To support the Power9 hardware, changes are made to the kernel in the Red Hat Enterprise distribution that are not yet available in the Fedora kernels.  Without that support, running the scripts in xCAT discovery caused segmentation faults described in this issue: https://github.com/xcat2/xcat-core/issues/3870