From c4d462ea20d3039e72891f7e61f79e7402eec72a Mon Sep 17 00:00:00 2001
From: Val Packett <val@invisiblethingslab.com>
Date: Fri, 3 Oct 2025 01:37:22 -0300
Subject: [PATCH] Update muvm

---
 munix | 9 ++++-----
 muvm  | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/munix b/munix
index 8249ce4..b15e3e0 100755
--- a/munix
+++ b/munix
@@ -85,9 +85,6 @@ if [ "$GPU" -eq 1 ]; then
     GPU_MODE=software
   fi
   MUVM_ARGS+=("--gpu-mode=$GPU_MODE")
-  if [ "$GPU_MODE" = "venus" ]; then
-    MUVM_ARGS+=("-e" "MESA_LOADER_DRIVER_OVERRIDE=zink")
-  fi
 else
   BWRAP_ARGS+=("--dir" "/dev/dri")
   MUVM_ARGS+=("--gpu-mode=software")
@@ -151,9 +148,11 @@ exec bwrap --unshare-all --share-net \
   --setenv PATH "/run/munix/muvm:/run/munix/passt:$MICROVM_CLOSURE/sw/bin" \
   "${BWRAP_ARGS[@]}" \
   muvm \
-    -x /usr/bin/munix-init-root -X /usr/bin/munix-init-user --udevd-path="$MICROVM_CLOSURE/sw/bin/true" \
+    -x /usr/bin/munix-init-root -X /usr/bin/munix-init-user \
     "${MUVM_ARGS[@]}" \
-    -e MICROVM_CLOSURE="$MICROVM_CLOSURE" -e MICROVM_UID="$MICROVM_UID" -e MICROVM_GID="$MICROVM_GID" \
+    -e MUVM_UDEVD_PATH="$MICROVM_CLOSURE/sw/bin/true" \
+    -e MICROVM_CLOSURE="$MICROVM_CLOSURE" \
+    -e MICROVM_UID="$MICROVM_UID" -e MICROVM_GID="$MICROVM_GID" \
     -i -t "${MICROVM_COMMAND[@]}" \
   11< <(cat <<EOF
 munix:x:$MICROVM_UID:$MICROVM_GID:Hypervisor:/:/run/current-system/sw/bin/nologin
diff --git a/muvm b/muvm
index 53d416f..e2512d1 160000
--- a/muvm
+++ b/muvm
@@ -1 +1 @@
-Subproject commit 53d416fb3f96b04a5bd3dd40f94fa4d8fbf1d7f1
+Subproject commit e2512d119e2d3959ed06afd5f586af65de1fe0a7