diff --git a/overlays/patches/startx.patch b/overlays/patches/startx.patch index da1cdea..aba345e 100644 --- a/overlays/patches/startx.patch +++ b/overlays/patches/startx.patch @@ -2,25 +2,12 @@ diff --git a/startx.cpp b/startx.cpp index 125c398..296b29f 100644 --- a/startx.cpp +++ b/startx.cpp -@@ -47,10 +47,10 @@ XCOMM so export the new PATH just in case the user changes the shell - export PATH - #endif - --userclientrc=$HOME/.xinitrc -+userclientrc="${XINITRC:-$HOME/.xinitrc}" - sysclientrc=XINITDIR/xinitrc - --userserverrc=$HOME/.xserverrc -+userserverrc="${XSERVERRC:-$HOME/.xserverrc}" - sysserverrc=XINITDIR/xserverrc - defaultclient=XTERM - defaultserver=XSERVER @@ -270,7 +270,7 @@ if [ x"$enable_xauth" = x1 ] ; then dummy=0 XCOMM create a file with auth information for the server. ':0' is a dummy. - xserverauthfile=$HOME/.serverauth.$$ + xserverauthfile=$XAUTHORITY - trap "rm -f '$xserverauthfile'" HUP INT QUIT ILL TRAP KILL BUS TERM + trap "rm -f '$xserverauthfile'" HUP INT QUIT ILL TRAP BUS TERM xauth -q -f "$xserverauthfile" << EOF add :$dummy . $mcookie