--- trunk/magellan-initscripts/etc/X11/startxdm 2004/12/31 18:41:48 21 +++ trunk/magellan-initscripts/etc/X11/startxdm 2004/12/31 18:46:13 22 @@ -4,7 +4,7 @@ source /etc/rc.config get_login() { - case "$GLOGIN" in + case "${GLOGIN}" in kdm|KDM) GLOGINCMD="$(which kdm 2> /dev/null)" if [ ! -f "${GLOGINCMD}" ] @@ -13,6 +13,7 @@ exit 1 fi ;; + xdm|XDM) GLOGINCMD="$(which xdm 2> /dev/null)" if [ ! -f "${GLOGINCMD}" ] @@ -21,6 +22,7 @@ exit 1 fi ;; + *) GLOGINCMD="$(which ${GLOGIN} 2> /dev/null)" if [ ! -e "${GLOGINCMD}" ] @@ -29,16 +31,17 @@ exit 1 fi ;; + esac } -if [ -n "$GLOGIN" ] +if [ -n "${GLOGIN}" ] then get_login /sbin/start-stop-daemon --start --quiet --exec ${GLOGINCMD} retval="$?" - sleep 5 + wait; sleep 2 if [ "${retval}" -ne 0 ] then