From 105eda5b9ac7da7a0200da68a288a6de8603c4f2 Mon Sep 17 00:00:00 2001 From: Joana Pecholt Date: Fri, 12 Aug 2022 15:50:20 +0200 Subject: [PATCH] runtime: Initrd path option added to config Adds initrd configuration option to the configuration.toml that is generated for the setup using QEMU. Signed-off-by: Joana Pecholt --- src/runtime/Makefile | 4 ++++ src/runtime/config/configuration-qemu.toml.in | 1 + 2 files changed, 5 insertions(+) diff --git a/src/runtime/Makefile b/src/runtime/Makefile index b05106318b..7d97a679aa 100644 --- a/src/runtime/Makefile +++ b/src/runtime/Makefile @@ -56,6 +56,7 @@ BINLIBEXECLIST := BIN_PREFIX = $(PROJECT_TYPE) PROJECT_DIR = $(PROJECT_TAG) IMAGENAME = $(PROJECT_TAG).img +INITRDNAME = $(PROJECT_TAG)-initrd.img TARGET = $(BIN_PREFIX)-runtime RUNTIME_OUTPUT = $(CURDIR)/$(TARGET) @@ -110,6 +111,7 @@ PKGLIBEXECDIR := $(LIBEXECDIR)/$(PROJECT_DIR) KERNELDIR := $(PKGDATADIR) IMAGEPATH := $(PKGDATADIR)/$(IMAGENAME) +INITRDPATH := $(PKGDATADIR)/$(INITRDNAME) FIRMWAREPATH := FIRMWAREVOLUMEPATH := @@ -401,6 +403,8 @@ USER_VARS += FCVALIDJAILERPATHS USER_VARS += SYSCONFIG USER_VARS += IMAGENAME USER_VARS += IMAGEPATH +USER_VARS += INITRDNAME +USER_VARS += INITRDPATH USER_VARS += MACHINETYPE USER_VARS += KERNELDIR USER_VARS += KERNELTYPE diff --git a/src/runtime/config/configuration-qemu.toml.in b/src/runtime/config/configuration-qemu.toml.in index d0a711dcfe..73c30cc1f7 100644 --- a/src/runtime/config/configuration-qemu.toml.in +++ b/src/runtime/config/configuration-qemu.toml.in @@ -15,6 +15,7 @@ path = "@QEMUPATH@" kernel = "@KERNELPATH@" image = "@IMAGEPATH@" +# initrd = "@INITRDPATH@" machine_type = "@MACHINETYPE@" # Enable confidential guest support.