github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-03 18:47:03 +00:00
Code Issues Projects Releases Wiki Activity

runtime-rs: Make default kernel params as empty

Browse Source 
The default kernel params passed to any hypervisor except dragonball is
empty.

Signed-off-by: Archana Shinde <archana.m.shinde@intel.com>
This commit is contained in:
Archana Shinde 2023-10-24 15:50:12 -07:00
parent a813012785
commit f99de4d5a1
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/runtime-rs/Makefile
View File

@ -178,6 +178,7 @@ MONITOR_OUTPUT = $(CURDIR)/$(MONITOR)
MONITOR_DIR = $(CLI_DIR)/kata-monitor MONITOR_DIR = $(CLI_DIR)/kata-monitor
SOURCES := $(shell find . 2>&1 | grep -E '.*\.(c|h|go)$$') SOURCES := $(shell find . 2>&1 | grep -E '.*\.(c|h|go)$$')
VERSION := ${shell cat ./VERSION} VERSION := ${shell cat ./VERSION}
KERNELPARAMS := ""
# List of configuration files to build and install # List of configuration files to build and install
CONFIGS = CONFIGS =
@ -212,7 +213,7 @@ ifneq (,$(DBCMD))
DEFMAXVCPUS_DB := 1 DEFMAXVCPUS_DB := 1
DEFBLOCKSTORAGEDRIVER_DB := virtio-blk-mmio DEFBLOCKSTORAGEDRIVER_DB := virtio-blk-mmio
DEFNETWORKMODEL_DB := tcfilter DEFNETWORKMODEL_DB := tcfilter
KERNELPARAMS = console=ttyS1 agent.log_vport=1025 KERNELPARAMS_DB = console=ttyS1 agent.log_vport=1025
KERNELTYPE_DB = uncompressed KERNELTYPE_DB = uncompressed
KERNEL_NAME_DB = $(call MAKE_KERNEL_NAME_DB,$(KERNELTYPE_DB)) KERNEL_NAME_DB = $(call MAKE_KERNEL_NAME_DB,$(KERNELTYPE_DB))
KERNELPATH_DB = $(KERNELDIR)/$(KERNEL_NAME_DB) KERNELPATH_DB = $(KERNELDIR)/$(KERNEL_NAME_DB)
@ -284,6 +285,7 @@ USER_VARS += MACHINEACCELERATORS
USER_VARS += CPUFEATURES USER_VARS += CPUFEATURES
USER_VARS += DEFMACHINETYPE_CLH USER_VARS += DEFMACHINETYPE_CLH
USER_VARS += KERNELPARAMS USER_VARS += KERNELPARAMS
USER_VARS += KERNELPARAMS_DB
USER_VARS += LIBEXECDIR USER_VARS += LIBEXECDIR
USER_VARS += LOCALSTATEDIR USER_VARS += LOCALSTATEDIR
USER_VARS += PKGDATADIR USER_VARS += PKGDATADIR

2
src/runtime-rs/config/configuration-dragonball.toml.in
View File

@ -54,7 +54,7 @@ valid_hypervisor_paths = @DBVALIDHYPERVISORPATHS@
# may stop the virtual machine from booting. # may stop the virtual machine from booting.
# To see the list of default parameters, enable hypervisor debug, create a # To see the list of default parameters, enable hypervisor debug, create a
# container and look for 'default-kernel-parameters' log entries. # container and look for 'default-kernel-parameters' log entries.
kernel_params = "@KERNELPARAMS@" kernel_params = "@KERNELPARAMS_DB@"
# Path to the firmware. # Path to the firmware.
# If you want that DB uses the default firmware leave this option empty # If you want that DB uses the default firmware leave this option empty