[Devel] [PATCH RHEL7 COMMIT] configs: provide kernel config via proc

Konstantin Khorenko khorenko at virtuozzo.com
Fri Feb 28 13:05:27 MSK 2020


The commit is pushed to "branch-rh7-3.10.0-1062.12.1.vz7.131.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-1062.12.1.vz7.131.5
------>
commit 71250dd88cf68521ad30b510cac116810284990d
Author: Konstantin Khorenko <khorenko at virtuozzo.com>
Date:   Fri Feb 28 13:05:27 2020 +0300

    configs: provide kernel config via proc
    
    Kubernetes checks kernel version via its config,
    in Containers kernel package usually is not installed,
    so most convenient place for k8s is /proc/config.gz.
    
    https://jira.sw.ru/browse/PSBM-92107
    
    Signed-off-by: Konstantin Khorenko <khorenko at virtuozzo.com>
---
 configs/kernel-3.10.0-x86_64-debug-minimal.config | 2 +-
 configs/kernel-3.10.0-x86_64-debug.config         | 3 +++
 configs/kernel-3.10.0-x86_64-minimal.config       | 2 +-
 configs/kernel-3.10.0-x86_64.config               | 3 +++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/configs/kernel-3.10.0-x86_64-debug-minimal.config b/configs/kernel-3.10.0-x86_64-debug-minimal.config
index 8f22c58ae7307..713fd3d0d3b5a 100644
--- a/configs/kernel-3.10.0-x86_64-debug-minimal.config
+++ b/configs/kernel-3.10.0-x86_64-debug-minimal.config
@@ -147,7 +147,7 @@ CONFIG_RCU_NOCB_CPU_NONE=y
 # CONFIG_RCU_NOCB_CPU_ALL is not set
 CONFIG_BUILD_BIN2C=y
 CONFIG_IKCONFIG=y
-# CONFIG_IKCONFIG_PROC is not set
+CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=20
 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
 CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
diff --git a/configs/kernel-3.10.0-x86_64-debug.config b/configs/kernel-3.10.0-x86_64-debug.config
index 2a86d90a13050..a528e28302d33 100644
--- a/configs/kernel-3.10.0-x86_64-debug.config
+++ b/configs/kernel-3.10.0-x86_64-debug.config
@@ -6602,6 +6602,9 @@ CONFIG_DOUBLEFAULT=y
 # CONFIG_DRM_I915_DEBUG_GUC is not set
 # CONFIG_DRM_I915_DEBUG_RUNTIME_PM is not set
 
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+
 #
 # OpenVZ
 #
diff --git a/configs/kernel-3.10.0-x86_64-minimal.config b/configs/kernel-3.10.0-x86_64-minimal.config
index d4d441b8f0023..0c34694f7d7ff 100644
--- a/configs/kernel-3.10.0-x86_64-minimal.config
+++ b/configs/kernel-3.10.0-x86_64-minimal.config
@@ -146,7 +146,7 @@ CONFIG_RCU_NOCB_CPU_NONE=y
 # CONFIG_RCU_NOCB_CPU_ALL is not set
 CONFIG_BUILD_BIN2C=y
 CONFIG_IKCONFIG=y
-# CONFIG_IKCONFIG_PROC is not set
+CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=20
 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
 CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
diff --git a/configs/kernel-3.10.0-x86_64.config b/configs/kernel-3.10.0-x86_64.config
index 26f5d55eea38f..9aa55316d1598 100644
--- a/configs/kernel-3.10.0-x86_64.config
+++ b/configs/kernel-3.10.0-x86_64.config
@@ -6571,6 +6571,9 @@ CONFIG_TCM_QLA2XXX=m
 # CONFIG_DRM_I915_DEBUG_RUNTIME_PM is not set
 CONFIG_DOUBLEFAULT=y
 
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+
 #
 # OpenVZ
 #


More information about the Devel mailing list