startwm.sh: do not call pseudo shell code for /etc/X11/xdm/Xsession

Since /etc/X11/xdm/Xsession calls user's login shell, startwm.sh
should not execute the pseudo code; It causes to execute
~/.profile twice.
master
Fuminobu TAKEYAMA 8 years ago committed by metalefty
parent 5c668dc420
commit 1f27a4d850

@ -1,34 +1,5 @@
#!/bin/sh #!/bin/sh
#start the window manager
wm_start()
{
if [ -r /etc/default/locale ]; then
. /etc/default/locale
export LANG LANGUAGE
fi
# debian
if [ -r /etc/X11/Xsession ]; then
. /etc/X11/Xsession
exit 0
fi
# el
if [ -r /etc/X11/xinit/Xsession ]; then
. /etc/X11/xinit/Xsession
exit 0
fi
# suse
if [ -r /etc/X11/xdm/Xsession ]; then
. /etc/X11/xdm/Xsession
exit 0
fi
xterm
}
# Execution sequence for interactive login shell - pseudocode # Execution sequence for interactive login shell - pseudocode
# #
# IF /etc/profile is readable THEN # IF /etc/profile is readable THEN
@ -77,6 +48,43 @@ post_start()
return 0 return 0
} }
#start the window manager
wm_start()
{
if [ -r /etc/default/locale ]; then
. /etc/default/locale
export LANG LANGUAGE
fi
# debian
if [ -r /etc/X11/Xsession ]; then
pre_start
. /etc/X11/Xsession
post_start
exit 0
fi
# el
if [ -r /etc/X11/xinit/Xsession ]; then
pre_start
. /etc/X11/xinit/Xsession
post_start
exit 0
fi
# suse
if [ -r /etc/X11/xdm/Xsession ]; then
# since the following script run a user login shell,
# do not execute the pseudo login shell scripts
. /etc/X11/xdm/Xsession
exit 0
fi
pre_start
xterm
post_start
}
#. /etc/environment #. /etc/environment
#export PATH=$PATH #export PATH=$PATH
#export LANG=$LANG #export LANG=$LANG
@ -91,8 +99,6 @@ post_start()
# includes # includes
# auth required pam_env.so readenv=1 # auth required pam_env.so readenv=1
pre_start
wm_start wm_start
post_start
exit 1 exit 1

Loading…
Cancel
Save