From fbbd79375d06920bea0af7db67ebf335338fd31b Mon Sep 17 00:00:00 2001 From: Rene Rebe Date: Mon, 14 Jun 2004 21:54:48 +0000 Subject: [PATCH] Rene Rebe: * reverted r2986: * fixes the respawn issue * reimplemented r2986: * fixed the respawn issue in cleaner code [2004061423275422639] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@3214 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/x11/xfree86/startxdm.sh | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/package/x11/xfree86/startxdm.sh b/package/x11/xfree86/startxdm.sh index 301a2b1d7..f5c2d3a7b 100644 --- a/package/x11/xfree86/startxdm.sh +++ b/package/x11/xfree86/startxdm.sh @@ -4,15 +4,12 @@ XDM=/usr/X11/bin/xdm [ -e /etc/conf/xdm ] && . /etc/conf/xdm -function check_dm() { - echo $XDM | grep -q $1 -} - -if [ "$1" = "-nodaemon" ] && - ! check_dm gdm && ! check_dm kdm && ! check_dm xdm -then - shift -fi +[ "$1" = "-nodeamon" ] && case $XDM in + gdm*) ;; + kdm*) ;; + xdm*) ;; + *) shift ;; +esac $XDM "$@"