From f6eaba6c75323eef12dd33c05bcd254a48ba63bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <ffidencio@nvidia.com>
Date: Thu, 11 Jun 2026 17:18:22 +0200
Subject: [PATCH] fixup! build: split NVIDIA rootfs into base-nvidia image +
 gpu addon

---
 tools/osbuilder/rootfs-builder/nvidia/nvidia_chroot.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tools/osbuilder/rootfs-builder/nvidia/nvidia_chroot.sh b/tools/osbuilder/rootfs-builder/nvidia/nvidia_chroot.sh
index 73056a4115..cf16fab53e 100644
--- a/tools/osbuilder/rootfs-builder/nvidia/nvidia_chroot.sh
+++ b/tools/osbuilder/rootfs-builder/nvidia/nvidia_chroot.sh
@@ -74,6 +74,13 @@ install_userspace_components() {
 
 	apt-mark hold cryptsetup-bin dmsetup libargon2-1     \
 		e2fsprogs libxml2
+
+	# NVRC loads the NVIDIA driver modules from the gpu addon's self-contained
+	# module tree via `modprobe --dirname <addon>`, a kmod feature the base
+	# busybox lacks. Install the real kmod here so the base-nvidia chisel can
+	# pull /usr/bin/kmod (and its libzstd/liblzma deps) from this stage.
+	eval "${APT_INSTALL}" kmod
+	apt-mark hold kmod
 }
 
 setup_apt_repositories() {