From 0ddaa1a9711e19848ff140c4714c66db31a2ed1f Mon Sep 17 00:00:00 2001 From: Kathryn Baldauf Date: Tue, 28 Jul 2026 10:07:44 -0700 Subject: [PATCH] Make nested virt optional for makefile linux_run helper function Signed-off-by: Kathryn Baldauf --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 194a3eda9..7b3a13733 100644 --- a/Makefile +++ b/Makefile @@ -99,7 +99,7 @@ define linux_run $(MAKE) linux-image; \ fi @mkdir -p $(ROOT_DIR)/.local/integration-cache - @container run --rm $(2) --memory 16gb --cpus 8 --virtualization \ + @container run --rm $(2) --memory 16gb --cpus 8 \ -v $(ROOT_DIR):/workspace \ -v $(ROOT_DIR)/.local/integration-cache:/root/.local/share/com.apple.containerization \ -w /workspace $(LINUX_DEV_IMAGE) \ @@ -245,7 +245,7 @@ ifeq (,$(wildcard bin/initfs.ext4)) @echo "missing bin/initfs.ext4; run 'make init' first (this also seeds the persistent imageStore at .local/integration-cache)" @exit 1 endif - $(call linux_run,CONTAINERIZATION_RELAXED_SANDBOX=1 ./bin/containerization-integration --kernel ./$(LINUX_INTEGRATION_KERNEL) --ch-binary ./bin/cloud-hypervisor --virtiofsd-binary ./bin/virtiofsd --max-concurrency 1 $(linux_integration_filter),--kernel $(LINUX_INTEGRATION_KERNEL)) + $(call linux_run,CONTAINERIZATION_RELAXED_SANDBOX=1 ./bin/containerization-integration --kernel ./$(LINUX_INTEGRATION_KERNEL) --ch-binary ./bin/cloud-hypervisor --virtiofsd-binary ./bin/virtiofsd --max-concurrency 1 $(linux_integration_filter),--kernel $(LINUX_INTEGRATION_KERNEL) --virtualization) # Builds the x86_64 deployment tarball. #