Skip to content

Commit

Permalink
guivm: clean qrexec-service related environment in GUI session
Browse files Browse the repository at this point in the history
Xephyr server and the GUI (xfce) session running inside is started now
as a qrexec service. Do not let qrexec-related environment variables to
propagate to the actual session, to not confuse some utilities.
This specifically affects qvm-sync-appmenus which behaves differently
when called as a qrexec service. But could affect also
qrexec-fork-server (a service could see gui-session related variables if
for any reason qrexec-fork-server fails to set them to the
actual call values).
  • Loading branch information
marmarek committed Aug 4, 2020
1 parent 0ced677 commit 4dae9a8
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions appvm-scripts/usrbin/qubes-start-xephyr
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,15 @@ if [ $(whoami) == "root" ]; then
exit 1
fi

# do not let child processes believe they are running as qrexec service
# directly
unset QREXEC_REMOTE_DOMAIN
unset QREXEC_SERVICE_FULL_NAME
unset QREXEC_SERVICE_ARGUMENT
unset QREXEC_REQUESTED_TARGET
unset QREXEC_REQUESTED_TARGET_TYPE
unset QREXEC_AGENT_PID

DISPLAY_XORG=:1
DISPLAY_XEPHYR=:0

Expand Down

0 comments on commit 4dae9a8

Please sign in to comment.