From ecd210d8996ee3c9192b744edc114c03e03d8ccd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?=
 =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= <mh@calculate.ru>
Date: Tue, 2 May 2017 12:59:21 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=20=D1=81=D0=BA=D1=80=D0=B8=D0=BF=D1=82=20=D0=B0?=
 =?UTF-8?q?=D0=B2=D1=82=D0=BE=D0=B2=D1=85=D0=BE=D0=B4=D0=B0=20=D0=BF=D0=BE?=
 =?UTF-8?q?=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D1=8F=20?=
 =?UTF-8?q?=D0=B2=20Xorg=20=D1=81=D0=B5=D1=80=D0=B2=D0=B5=D1=80=D0=B5=20?=
 =?UTF-8?q?=D1=81=D0=B5=D0=B0=D0=BD=D1=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/xautologin | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

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