|
|
@ -21,6 +21,8 @@ TTYNUM=${2:-7}
|
|
|
|
DISPLAYNUM=${3:-\:0}
|
|
|
|
DISPLAYNUM=${3:-\:0}
|
|
|
|
MAINLOOP=1
|
|
|
|
MAINLOOP=1
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
XDMCMD=/usr/share/calculate/xdm/xdm
|
|
|
|
|
|
|
|
|
|
|
|
# write pid for init.d/xdm (detect X for this xautologin)
|
|
|
|
# write pid for init.d/xdm (detect X for this xautologin)
|
|
|
|
echo $BASHPID >/var/run/bash.pid
|
|
|
|
echo $BASHPID >/var/run/bash.pid
|
|
|
|
|
|
|
|
|
|
|
@ -94,7 +96,10 @@ do
|
|
|
|
XPID=$!
|
|
|
|
XPID=$!
|
|
|
|
if waitX ${DISPLAYNUM}
|
|
|
|
if waitX ${DISPLAYNUM}
|
|
|
|
then
|
|
|
|
then
|
|
|
|
env USER=${XUSER} /usr/share/calculate/xdm/xdm --login || break
|
|
|
|
if [[ -e ${XDMCMD} ]]
|
|
|
|
|
|
|
|
then
|
|
|
|
|
|
|
|
env USER=${XUSER} ${XDMCMD} --login || break
|
|
|
|
|
|
|
|
fi
|
|
|
|
# write pam enviroment for pam_ck_connector
|
|
|
|
# write pam enviroment for pam_ck_connector
|
|
|
|
cat >/home/${XUSER}/.pam_environment <<EOF
|
|
|
|
cat >/home/${XUSER}/.pam_environment <<EOF
|
|
|
|
CKCON_DISPLAY_DEVICE=
|
|
|
|
CKCON_DISPLAY_DEVICE=
|
|
|
@ -132,7 +137,10 @@ source /usr/bin/startx' &
|
|
|
|
then
|
|
|
|
then
|
|
|
|
sleep $WAITRELOGIN
|
|
|
|
sleep $WAITRELOGIN
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
env USER=${XUSER} /usr/share/calculate/xdm/xdm --logout
|
|
|
|
if [[ -e ${XDMCMD} ]]
|
|
|
|
|
|
|
|
then
|
|
|
|
|
|
|
|
env USER=${XUSER} ${XDMCMD} --logout
|
|
|
|
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
[[ -n $XPID ]] && kill $XPID
|
|
|
|
[[ -n $XPID ]] && kill $XPID
|
|
|
|
wait $XPID
|
|
|
|
wait $XPID
|
|
|
|