Skip to content

Commit

Permalink
Do not run any X server on sys-gui-gpu
Browse files Browse the repository at this point in the history
On sys-gui-gpu we use lightdm for running X server, but we still need
guivm-gui-agent service
  • Loading branch information
cytadela8 committed May 13, 2020
1 parent 8ad8fbe commit 9fe4d09
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion appvm-scripts/usrbin/qubes-run-xorg
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,11 @@ if [ -x /bin/loginctl ]; then
loginctl attach "$XDG_SEAT" /sys/devices/platform/pcspkr/input/*
fi

if qsvc guivm-gui-agent; then
if qsvc lightdm; then
# case: sys-gui-gpu
exit
elif qsvc guivm-gui-agent; then
# case: sys-gui
DISPLAY_XORG=:1
DISPLAY_XEPHYR=:0

Expand All @@ -119,6 +123,7 @@ if qsvc guivm-gui-agent; then
# Run xsession into Xephyr
/usr/bin/qubes-gui-runuser "$DEFAULT_USER" /bin/sh -l -c "DISPLAY=$DISPLAY_XORG /usr/bin/xinit $XSESSION -- /usr/bin/qubes-run-xephyr $DISPLAY_XEPHYR > ~/.xsession-errors 2>&1"
else
# case: non-gui domain
# Use sh -l here to load all session startup scripts (/etc/profile, ~/.profile
# etc) to populate environment. This is the environment that will be used for
# all user applications and qrexec calls.
Expand Down

0 comments on commit 9fe4d09

Please sign in to comment.