Improve xautologin.

data/xautologin

@@ -1,4 +1,17 @@
 #!/bin/bash
+# Copyright 2010 Calculate Ltd. http://www.calculate-linux.org
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
 
 # first param - autologin user
 XUSER=${1:-guest}
@@ -6,29 +19,52 @@ XUSER=${1:-guest}
 TTYNUM=${2:-7}
 # number of virtual console
 DISPLAYNUM=${3:-\:0}
+MAINLOOP=1
+
 # write pid for init.d/xdm (detect X for this xautologin)
 echo $BASHPID >/var/run/bash.pid
 
-MAINLOOP=1
+# function for kill X server by TERM,INT,QUIT signals
 killXserver()
 {
-	KILLXPID=$XPID
-	XPID=
-	MAINLOOP=
-	kill -9 $KILLXPID &>/dev/null
+    KILLXPID=$XPID
+    XPID=
+    MAINLOOP=
+    # kill X by TERM
+    [[ -d /proc/$KILLXPID ]] && kill $KILLXPID &>/dev/null
+    # wait 5 sec
+    for i in {0..5}
+    do
+        [[ -d /proc/$KILLXPID ]] || break
+        sleep 1
+    done
+    # kill X by -KILL
+    [[ -d /proc/$KILLXPID ]] && kill -KILL $KILLXPID &>/dev/null
 }
 
 trap killXserver SIGTERM SIGINT SIGQUIT
 
 # rerun x session for XUSER while not shutdown and bash not receivce TERM
+HOMEDIR=`getent passwd $XUSER | awk -F: '{ print( $6 ); }'`
+# export display num
+export DISPLAY=${DISPLAYNUM}
+export XAUTHORITY=$HOMEDIR/.Xauthority
+
 while id $XUSER &>/dev/null && 
        [[ -n $MAINLOOP ]] &&
        [[ "$(rc-status -r)" != "shutdown" ]]
 do
+    # disable relogin by fourth param
+    if [[ "$4" != "off" ]];then
+        MAINLOOP=
+    fi
+    # prepare user xauthority
+    mcookie | sed -e "s/^/add ${DISPLAYNUM} . /" | xauth -f $XAUTHORITY -q
+    chown $XUSER. $XAUTHORITY
+    chmod 600 $XAUTHORITY
     # perform user profile setting up
-    X ${DISPLAYNUM} vt${TTYNUM} &
+    X ${DISPLAYNUM} -auth $XAUTHORITY vt${TTYNUM} -noreset &
     XPID=$!
-    export DISPLAY=${DISPLAYNUM}
     env USER=${XUSER} /usr/share/calculate/xdm/xdm --login || break
     # write pam enviroment for pam_ck_connector
     cat >/home/${XUSER}/.pam_environment <<EOF
@@ -59,7 +95,8 @@ EOF
     sessreg -d -l ${DISPLAYNUM} ${XUSER}
     # perform logout scripts for user
     env USER=${XUSER} /usr/share/calculate/xdm/xdm --logout
-    [[ -n $XPID ]] && kill -9 $XPID
+    [[ -n $XPID ]] && kill $XPID
+    wait $XPID
 done
 
 exit 0