Skip to content

Prevent $DISPLAY from being overridden in SSH (for X11 forwarding) #216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
InnovativeInventor wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Prevent $DISPLAY from being overridden in SSH (for X11 forwarding) #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions appvm-scripts/etc/profile.d/qubes-gui.csh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
setenv DISPLAY ":0"
setenv _JAVA_AWT_WM_NONREPARENTING "1"
if (! ($?SSH_CLIENT || $SSH_TTY)) ; then
setenv DISPLAY ":0"
setenv _JAVA_AWT_WM_NONREPARENTING "1"
endif
if ( -f /var/run/qubes-service/software-rendering )
setenv GSK_RENDERER "cairo"
setenv GDK_DEBUG "gl-disable vulkan-disable"
Expand Down
4 changes: 3 additions & 1 deletion appvm-scripts/etc/profile.d/qubes-gui.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
export DISPLAY=:0 _JAVA_AWT_WM_NONREPARENTING=1
if ! ([ -n "$SSH_CLIENT" ] || [ -n "$SSH_TTY" ] ]); then
export DISPLAY=:0 _JAVA_AWT_WM_NONREPARENTING=1
fi
Comment on lines +1 to +3
Copy link
Member

@marmarek marmarek Sep 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

First, this should apply only to DISPLAY, not the other variable.
But second, having it specifically for SSH isn't very elegant. Maybe better simply check if it's set already and not override it then? This can be done simpler:

: ${DISPLAY:=:0}
export DISPLAY

if test -f /var/run/qubes-service/software-rendering; then
export GSK_RENDERER="cairo" GDK_DEBUG="gl-disable vulkan-disable" \
LIBGL_ALWAYS_SOFTWARE=1
Expand Down