Update muvm
This commit is contained in:
parent
146430d8cd
commit
c4d462ea20
2 changed files with 5 additions and 6 deletions
9
munix
9
munix
|
|
@ -85,9 +85,6 @@ if [ "$GPU" -eq 1 ]; then
|
||||||
GPU_MODE=software
|
GPU_MODE=software
|
||||||
fi
|
fi
|
||||||
MUVM_ARGS+=("--gpu-mode=$GPU_MODE")
|
MUVM_ARGS+=("--gpu-mode=$GPU_MODE")
|
||||||
if [ "$GPU_MODE" = "venus" ]; then
|
|
||||||
MUVM_ARGS+=("-e" "MESA_LOADER_DRIVER_OVERRIDE=zink")
|
|
||||||
fi
|
|
||||||
else
|
else
|
||||||
BWRAP_ARGS+=("--dir" "/dev/dri")
|
BWRAP_ARGS+=("--dir" "/dev/dri")
|
||||||
MUVM_ARGS+=("--gpu-mode=software")
|
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" \
|
--setenv PATH "/run/munix/muvm:/run/munix/passt:$MICROVM_CLOSURE/sw/bin" \
|
||||||
"${BWRAP_ARGS[@]}" \
|
"${BWRAP_ARGS[@]}" \
|
||||||
muvm \
|
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[@]}" \
|
"${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[@]}" \
|
-i -t "${MICROVM_COMMAND[@]}" \
|
||||||
11< <(cat <<EOF
|
11< <(cat <<EOF
|
||||||
munix:x:$MICROVM_UID:$MICROVM_GID:Hypervisor:/:/run/current-system/sw/bin/nologin
|
munix:x:$MICROVM_UID:$MICROVM_GID:Hypervisor:/:/run/current-system/sw/bin/nologin
|
||||||
|
|
|
||||||
2
muvm
2
muvm
|
|
@ -1 +1 @@
|
||||||
Subproject commit 53d416fb3f96b04a5bd3dd40f94fa4d8fbf1d7f1
|
Subproject commit e2512d119e2d3959ed06afd5f586af65de1fe0a7
|
||||||
Loading…
Add table
Add a link
Reference in a new issue