From ae827aa73fcb68e4ac48733eb94bbe82e4fd4985 Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Fri, 30 Sep 2011 16:34:07 +0400 Subject: [PATCH] Fix xautologin (wait 7 second before relogin) --- data/xautologin | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/data/xautologin b/data/xautologin index d854e2f..5fb23bd 100644 --- a/data/xautologin +++ b/data/xautologin @@ -38,6 +38,7 @@ killXserver() [[ -d /proc/$KILLXPID ]] || break sleep 1 done + WAITRELOGIN= # kill X by -KILL [[ -d /proc/$KILLXPID ]] && kill -KILL $KILLXPID &>/dev/null } @@ -50,6 +51,7 @@ HOMEDIR=`getent passwd $XUSER | awk -F: '{ print( $6 ); }'` export DISPLAY=${DISPLAYNUM} export XAUTHORITY=$HOMEDIR/.Xauthority +WAITRELOGIN=7 while id $XUSER &>/dev/null && [[ -n $MAINLOOP ]] && [[ "$(rc-status -r)" != "shutdown" ]] @@ -99,8 +101,11 @@ EOF # remove user from utmp and wtmp sessreg -d -l ${DISPLAYNUM} ${XUSER} # perform logout scripts for user + if [[ -n $WAITRELOGIN ]] + then + sleep $WAITRELOGIN + fi env USER=${XUSER} /usr/share/calculate/xdm/xdm --logout - sleep 7 [[ -n $XPID ]] && kill $XPID wait $XPID done