--- gdm-40.beta/data/Xsession.in.XSession	2021-02-26 02:30:08.447392670 +0300

+++ gdm-40.beta/data/Xsession.in	2021-02-26 02:39:07.389571282 +0300

@@ -29,201 +29,18 @@

 # good for debugging where things went wrong

 echo "$0: Beginning session setup..."

-# First read /etc/profile (resp. /usr/etc/profile) and .profile

-if [ -f /etc/profile ]; then

-  . /etc/profile

-elif [ -f /usr/etc/profile ]; then

-  . /usr/etc/profile

-fi

-test -f "$HOME/.profile" && . "$HOME/.profile"

-# Second read /etc/xprofile (resp. /usr/etc/xprofile)  and .xprofile for X specific setup

-if [ -f /etc/xprofile ]; then

-  . /etc/xprofile

-elif [ -f /usr/etc/xprofile ]; then

-  . /usr/etc/xprofile

-

-fi

-test -f "$HOME/.xprofile" && . "$HOME/.xprofile"

-

-# Translation stuff

-if [ -x "@libexecdir@/gdmtranslate" ] ; then

-  gdmtranslate="@libexecdir@/gdmtranslate"

-else

-  gdmtranslate=

-fi

-

-# Note that this should only go to zenity dialogs which always expect utf8

-gettextfunc () {

-  if [ "x$gdmtranslate" != "x" ] ; then

-    "$gdmtranslate" --utf8 "$1"

-  else

-    echo "$1"

-  fi

-}

-

-OLD_IFS=$IFS

-

-gdmwhich () {

-  COMMAND="$1"

-  OUTPUT=

-  IFS=:

-  for dir in $PATH

-  do

-    if test -x "$dir/$COMMAND" ; then

-      if test "x$OUTPUT" = "x" ; then

-        OUTPUT="$dir/$COMMAND"

-      fi

-    fi

-  done

-  IFS=$OLD_IFS 

-  echo "$OUTPUT"

-}

-

-zenity=`gdmwhich zenity`

-

-# Note: ~/.xsession-errors is now done in the daemon so that it

-# works for ALL sessions (except ones named 'Failsafe')

-

-# clean up after xbanner

-freetemp=`gdmwhich freetemp`

-if [ -n "$freetemp" ] ; then

-	"$freetemp"

-fi

-

-userresources="$HOME/.Xresources"

-usermodmap="$HOME/.Xmodmap"

-userxkbmap="$HOME/.Xkbmap"

-

-if [ -f /etc/X11/Xresources ]; then

-    sysresources=/etc/X11/Xresources

-else

-    sysresources=/usr/etc/X11/Xresources

-fi

-

-if [ -f /etc/X11/Xmodmap ]; then

-    sysmodmap=/etc/X11/Xmodmap

-else

-    sysmodmap=/usr/etc/X11/Xmodmap

-fi

-

-if [ -f /etc/X11/Xkbmap ]; then

-    sysxkbmap=/etc/X11/Xkbmap

-else

-    sysxkbmap=/usr/etc/X11/Xkbmap

-fi

-

-rh6sysresources=/etc/X11/xinit/Xresources 

-rh6sysmodmap=/etc/X11/xinit/Xmodmap 

-

-# merge in defaults

-if [ -f "$rh6sysresources" ]; then

-    xrdb -nocpp -merge "$rh6sysresources"

-fi

-

-if [ -f "$sysresources" ]; then

-    xrdb -nocpp -merge "$sysresources"

-fi

-

-if [ -f "$userresources" ]; then

-    xrdb -nocpp -merge "$userresources"

-fi

+# read /etc/profile and .bash_profile

+test -f /etc/profile && . /etc/profile

+test -f "$HOME/.bash_profile" && . "$HOME/.bash_profile"

-# merge in keymaps

-if [ -f "$sysxkbmap" ]; then

-    setxkbmap `cat "$sysxkbmap"`

-    XKB_IN_USE=yes

-fi

-

-if [ -f "$userxkbmap" ]; then

-    setxkbmap `cat "$userxkbmap"`

-    XKB_IN_USE=yes

-fi

-

-#

-# Eeek, this seems like too much magic here

-#

-if [ -z "$XKB_IN_USE" -a ! -L /etc/X11/X ]; then

-    if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then

-       xkbsymbols=`sed -n -e 's/^[     ]*XkbSymbols[   ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config`

-       if [ -n "$xkbsymbols" ]; then

-           setxkbmap -symbols "$xkbsymbols"

-           XKB_IN_USE=yes

-       fi

-    fi

-fi

-

-# xkb and xmodmap don't play nice together

-if [ -z "$XKB_IN_USE" ]; then

-    if [ -f "$rh6sysmodmap" ]; then

-       xmodmap "$rh6sysmodmap"

-    fi

-

-    if [ -f "$sysmodmap" ]; then

-       xmodmap "$sysmodmap"

-    fi

-

-    if [ -f "$usermodmap" ]; then

-       xmodmap "$usermodmap"

-    fi

-fi

-

-unset XKB_IN_USE

-

-xhost +si:localuser:`id -un` || :

-

-# run all system xinitrc shell scripts.

-if [ -d /usr/etc/X11/xinit/xinitrc.d ]; then

-    for i in /usr/etc/X11/xinit/xinitrc.d/* ; do

-	sname=$(basename "$i")

-        test -x "/etc/X11/xinit/xinitrc.d/$sname" && continue

-        if [ -x "$i" -a ! -d "$i" ]; then

-            . "$i"

-        fi

-    done

-fi

-if [ -d /etc/X11/xinit/xinitrc.d ]; then

-    for i in /etc/X11/xinit/xinitrc.d/* ; do

-        if [ -x "$i" -a ! -d "$i" ]; then

-	    . "$i"

-        fi

-    done

-fi

-

-if [ "x$command" = "xdefault" ] ; then

-  if [ -x "$HOME/.Xclients" ]; then

-    command="$HOME/.Xclients"

-  elif [ -x /etc/X11/xinit/Xclients ]; then

-    command="/etc/X11/xinit/Xclients"

-  elif [ -x /etc/X11/Xclients ]; then

-    command="/etc/X11/Xclients"

-  else

-    if [ -n "$zenity" ] ; then

-	disptext=`gettextfunc "System has no Xclients file, so starting a failsafe xterm session.  Windows will have focus only if the mouse pointer is above them.  To get out of this mode type 'exit' in the window."`

-      "$zenity" --info --text "$disptext"

-    else

-      echo "$0: Cannot find Xclients"

-    fi

-    exec xterm -geometry 80x24+0+0

-  fi

-fi

+echo "$0: Setup done, will execute: $command"

-# add ssh-agent if found

-sshagent="`gdmwhich ssh-agent`"

-if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then

-    command="$sshagent -- $command"

-elif [ -z "$sshagent" ] ; then

-    echo "$0: ssh-agent not found!"

+if [ -z "$command" ] ; then

+	command=failsafe

 fi

-echo "$0: Setup done, will execute: $command"

-

 eval exec $command

 echo "$0: Executing $command failed, will run xterm"

-if [ -n "$zenity" ] ; then

-	disptext=`gettextfunc "Failed to start the session, so starting a failsafe xterm session.  Windows will have focus only if the mouse pointer is above them.  To get out of this mode type 'exit' in the window."`

-	"$zenity" --info --text "$disptext"

-fi

-

 exec xterm -geometry 80x24+0+0