Skip to content

Commit 6d9fcdd

Browse files
committed
util/docker_shell: Don't hard-code DISPLAY for fetching auth info
The flow/util/docker_shell script looks up the X authorization information (magic cookie) for display :0 and exports it to the container, but sets DISPLAY to match DISPLAY of the host shell. There are no guarantees that the authorization information for :0 is the same as for $DISPLAY, if $DISPLAY != :0. This patch changes flow/util/docker_shell to always extract the authorization information for $DISPLAY. Signed-off-by: Frej Drejhammar <frej.drejhammar@gmail.com>
1 parent e05a2d1 commit 6d9fcdd

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

‎flow/util/docker_shell‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ KLAYOUT_CMD=${KLAYOUT_CMD:-/usr/bin/klayout}
3131

3232
XSOCK=/tmp/.X11-unix
3333
XAUTH=/tmp/.docker.xauth
34-
xauth nlist :0 | sed -e 's/^..../ffff/' | xauth -f $XAUTH nmerge -
34+
xauth nlist $DISPLAY | sed -e 's/^..../ffff/' | xauth -f $XAUTH nmerge -
3535
ARGUMENTS=$@
3636

3737
if test -t 0; then

0 commit comments

Comments
 (0)