github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-17 08:53:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6292 from fidencio/topic/runtime-rs-small-fixes

Browse Source 
runtime-rs: fix default kernel location and add more default config paths
This commit is contained in:
Fabiano Fidêncio 2023-03-13 16:53:30 +01:00 committed by GitHub
commit ab0bd7a1ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/runtime-rs/Makefile
View File

@ -203,7 +203,7 @@ ifneq (,$(DBCMD))
DEFNETWORKMODEL_DB := tcfilter DEFNETWORKMODEL_DB := tcfilter
KERNELPARAMS = console=ttyS1 agent.log_vport=1025 KERNELPARAMS = console=ttyS1 agent.log_vport=1025
KERNELTYPE_DB = uncompressed KERNELTYPE_DB = uncompressed
KERNEL_NAME_DB = $(call MAKE_KERNEL_NAME,$(KERNELTYPE_DB)) KERNEL_NAME_DB = $(call MAKE_KERNEL_NAME_DB,$(KERNELTYPE_DB))
KERNELPATH_DB = $(KERNELDIR)/$(KERNEL_NAME_DB) KERNELPATH_DB = $(KERNELDIR)/$(KERNEL_NAME_DB)
DEFSANDBOXCGROUPONLY = true DEFSANDBOXCGROUPONLY = true
RUNTIMENAME := virt_container RUNTIMENAME := virt_container
@ -371,8 +371,8 @@ endef
# Returns the name of the kernel file to use based on the provided KERNELTYPE. # Returns the name of the kernel file to use based on the provided KERNELTYPE.
# $1 : KERNELTYPE (compressed or uncompressed) # $1 : KERNELTYPE (compressed or uncompressed)
define MAKE_KERNEL_NAME define MAKE_KERNEL_NAME_DB
$(if $(findstring uncompressed,$1),vmlinux.container,vmlinuz.container) $(if $(findstring uncompressed,$1),vmlinux-dragonball-experimental.container,vmlinuz-dragonball-experimental.container)
endef endef
.DEFAULT_GOAL := default .DEFAULT_GOAL := default