[Devel] [PATCH RHEL8 COMMIT] configs: provide kernel config via proc
Konstantin Khorenko
khorenko at virtuozzo.com
Fri Jun 11 15:48:30 MSK 2021
The commit is pushed to "branch-rh8-4.18.0-240.1.1.vz8.5.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh8-4.18.0-240.1.1.vz8.5.40
------>
commit e72a4f88ebec05543b85bcf53191f6601d8bff08
Author: Konstantin Khorenko <khorenko at virtuozzo.com>
Date: Fri Jun 11 15:41:59 2021 +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>
(cherry picked from vz7 commit 855d50d5a08b ("configs: provide kernel config via
proc"))
Rebase part https://jira.sw.ru/browse/PSBM-127850
Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn at virtuozzo.com>
---
configs/kernel-4.18.0-x86_64-KVM-minimal.config | 4 ++--
configs/kernel-4.18.0-x86_64-debug.config | 3 +++
configs/kernel-4.18.0-x86_64.config | 3 +++
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/configs/kernel-4.18.0-x86_64-KVM-minimal.config b/configs/kernel-4.18.0-x86_64-KVM-minimal.config
index ae35095467df..a6385bc8768c 100644
--- a/configs/kernel-4.18.0-x86_64-KVM-minimal.config
+++ b/configs/kernel-4.18.0-x86_64-KVM-minimal.config
@@ -153,8 +153,8 @@ CONFIG_CONTEXT_TRACKING=y
# CONFIG_CONTEXT_TRACKING_FORCE is not set
CONFIG_RCU_NOCB_CPU=y
CONFIG_BUILD_BIN2C=y
-CONFIG_IKCONFIG=m
-# CONFIG_IKCONFIG_PROC is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
CONFIG_LOG_BUF_SHIFT=20
CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
diff --git a/configs/kernel-4.18.0-x86_64-debug.config b/configs/kernel-4.18.0-x86_64-debug.config
index 1307ea8c5a91..5a9576372f75 100644
--- a/configs/kernel-4.18.0-x86_64-debug.config
+++ b/configs/kernel-4.18.0-x86_64-debug.config
@@ -7811,6 +7811,9 @@ CONFIG_OVERLAY_FS_NFS_EXPORT=y
CONFIG_PANIC_ON_OOPS=y
CONFIG_PANIC_ON_OOPS_VALUE=1
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+
#
# OpenVZ
#
diff --git a/configs/kernel-4.18.0-x86_64.config b/configs/kernel-4.18.0-x86_64.config
index f199c1d045bb..555d0e6f937c 100644
--- a/configs/kernel-4.18.0-x86_64.config
+++ b/configs/kernel-4.18.0-x86_64.config
@@ -7763,6 +7763,9 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=69632
CONFIG_OVERLAY_FS_INDEX=y
CONFIG_OVERLAY_FS_NFS_EXPORT=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+
#
# OpenVZ
#
More information about the Devel
mailing list