Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qvm-run-vm: wait for X11 in DispVM case

Browse Source 
qvm-run-vm cannot make a separate qubes.WaitForSession call for a
DispVM. Instead, pass the new WaitForSession argument to qubes.VMShell,
which will do the equivalent.
This commit is contained in:
Rusty Bird 2018-01-14 19:21:01 +00:00
parent 72fef1ee4c
commit 6c2b9fd638
No known key found for this signature in database
GPG Key ID: 469D78F47AAF2ADF
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qubes-rpc/qvm-run-vm
View File

@ -49,4 +49,10 @@ elif [ "$VMNAME" = "" ] ; then
print_usage print_usage
exit 1 exit 1
fi fi
exec /usr/lib/qubes/qrexec-client-vm "$VMNAME" qubes.VMShell "/usr/lib/qubes/qrun-in-vm" "$@"
service="qubes.VMShell"
case "$VMNAME" in \$dispvm|\$dispvm:*)
service="$service+WaitForSession"
esac
exec /usr/lib/qubes/qrexec-client-vm "$VMNAME" "$service" "/usr/lib/qubes/qrun-in-vm" "$@"