Исправлен скрипт автовхода в X сессию

bin/xautologin

@@ -43,6 +43,30 @@ killXserver()
     [[ -d /proc/$KILLXPID ]] && kill -KILL $KILLXPID &>/dev/null
 }
 
+# function for waiting X server
+waitX() {
+    displaynum=${1#:}
+    usingvt="using VT number"
+    errorX="no screens found"
+    successX="evdev"
+    logfile=/var/log/Xorg.${displaynum}.log
+    for i in 0.1 0.2 0.5 1
+    do
+        sleep $i
+        if [[ -f $logfile ]]
+        then
+            for x in 0.5 1 2 4
+            do
+                grep -q "$errorX" $logfile && return 1
+                grep -q "$successX" $logfile && return 0
+                sleep $x
+            done
+            return 1
+        fi
+    done
+    return 1
+}
+
 trap killXserver SIGTERM SIGINT SIGQUIT
 
 # rerun x session for XUSER while not shutdown and bash not receivce TERM
@@ -68,6 +92,8 @@ do
     # perform user profile setting up
     X ${DISPLAYNUM} -auth $XAUTHORITY vt${TTYNUM} -noreset &
     XPID=$!
+    if waitX ${DISPLAYNUM}
+    then
         env USER=${XUSER} /usr/share/calculate/xdm/xdm --login || break
         # write pam enviroment for pam_ck_connector
         cat >/home/${XUSER}/.pam_environment <<EOF
@@ -79,9 +105,9 @@ EOF
         sessreg -a -l ${DISPLAYNUM} ${XUSER}
         # run x session for user XUSER in background
         su - ${XUSER} -c 'source /etc/profile
-                    # replace xinit for startx
-                    xinit()
-                    {
+# replace xinit for startx
+xinit()
+{
     # if file is script run it throught bash
     if file $1 | grep -1 "POSIX shell script"
     then
@@ -89,9 +115,9 @@ EOF
     else
         $*
     fi
-                    }
-                    # run script start xsession
-                    source /usr/bin/startx' &
+}
+# run script start xsession
+source /usr/bin/startx' &
         # wait for right work trap SIGTERM
         XSESSIONPID=$!
         while [[ -d /proc/$XSESSIONPID ]] &&
@@ -107,6 +133,7 @@ EOF
             sleep $WAITRELOGIN
         fi
         env USER=${XUSER} /usr/share/calculate/xdm/xdm --logout
+    fi
     [[ -n $XPID ]] && kill $XPID
     wait $XPID
 done