Skip to content

Adapt code for vanilla Kata #154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 14, 2024
Merged

Adapt code for vanilla Kata #154

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5952d30
runtime: fix error when using the debug console
danmihai1 Sep 1, 2022
fb4c887
config: don't hardcode confidential_guest=true for clh
sprt Jan 23, 2024
b4ab11d
rootfs-builder: only look for AGENT_POLICY_FILE if AGENT_POLICY=yes
sprt Jan 30, 2024
ca1b9a7
runtime: make sev_snp_guest default to false
sprt Feb 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/runtime/config/configuration-clh.toml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ rootfs_type=@DEFROOTFSTYPE@
# * Intel TDX
#
# Default false
confidential_guest = true
#confidential_guest = true

# Enable running clh VMM as a non-root user.
# By default clh VMM run as root. When this is set to true, clh VMM process runs as
Expand Down
1 change: 1 addition & 0 deletions src/runtime/pkg/resourcecontrol/cgroups.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ func sandboxDevices() []specs.LinuxDeviceCgroup {
"/dev/zero",
"/dev/urandom",
"/dev/console",
"/dev/ptmx",
}

// Processes running in a device-cgroup are constrained, they have acccess
Expand Down
4 changes: 2 additions & 2 deletions tools/osbuilder/rootfs-builder/rootfs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ AGENT_POLICY_FILE=${AGENT_POLICY_FILE:-"allow-all.rego"}
lib_file="${script_dir}/../scripts/lib.sh"
source "$lib_file"

agent_policy_file="$(readlink -f "${script_dir}/../../../src/kata-opa/${AGENT_POLICY_FILE}")"
[ "${AGENT_POLICY}" == "yes" ] && agent_policy_file="$(readlink -f "${script_dir}/../../../src/kata-opa/${AGENT_POLICY_FILE}")"

#For cross build
CROSS_BUILD=${CROSS_BUILD:-false}
Expand Down Expand Up @@ -330,7 +330,7 @@ check_env_variables()

[ -n "${KERNEL_MODULES_DIR}" ] && [ ! -d "${KERNEL_MODULES_DIR}" ] && die "KERNEL_MODULES_DIR defined but is not an existing directory"

[ ! -f "${agent_policy_file}" ] && die "agent policy file not found in '${agent_policy_file}'"
[ "${AGENT_POLICY}" == "yes" ] && [ ! -f "${agent_policy_file}" ] && die "agent policy file not found in '${agent_policy_file}'"

[ -n "${OSBUILDER_VERSION}" ] || die "need osbuilder version"
}
Expand Down