rmoved the xdm/kdm and gdm init script (did not worked due to init decoupling

and asynchronous start anyway) and added a startxdm multiplexer incl. inittab
entry, xdm, kdm and gdm registrations and improvements to the xfree86 stone
module to select the manager.


git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2085 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc

package/base/sysfiles/etc_inittab.txt

@@ -76,3 +76,9 @@ ca:12345:ctrlaltdel:/sbin/shutdown -r now
 4:12345:respawn:/sbin/agetty -f /etc/issue.ansi 38400 vc/4 linux
 5:12345:respawn:/sbin/agetty -f /etc/issue.ansi 38400 vc/5 linux
 6:12345:respawn:/sbin/agetty -f /etc/issue.ansi 38400 vc/6 linux
+
+#
+# A X display manager (multiplexer)
+#
+X:5:respawn:/usr/X11/bin/startxdm
+

package/gnome24/gdm/gdm.conf

@@ -26,8 +26,7 @@ gdm_pm() {
 	# correct permissions
 	chown -R gdm:gdm $localstatedir/gdm
 	
-	# install init script
-	install_init gdm $confdir/gdm.init
+	register_xdm gdm 'GNOME dislay manager' $bindir/gdm
 
 	echo "Installing cron script ..."
 	rock_substitute $confdir/gdm.cron > $root/etc/cron.d/90-gdm

package/gnome24/gdm/gdm.init

@@ -1,42 +0,0 @@
-#!/bin/sh
-#
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/gnome24/gdm/gdm.init
-# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-#
-# ROCK Linux: /etc/rc.d/init.d/xdm
-#
-# Desc: X Display Manager
-# Runlevel: 80 rcX
-#
-
-main_begin
-
-    block_begin(start, `Starting gdm.')
-        check(`D_prefix/bin/gdm')
-    block_end
-
-    block_begin(stop, `Stopping gdm.')
-        check(`killall -15 D_prefix/bin/gdm-binary')
-    block_end
-
-main_end
-

package/kde31/kdebase31/kdebase31.conf

@@ -24,7 +24,7 @@
 
 kde_base_pi()
 {
-	install_init kdm $confdir/kdm.init
+	register_xdm kdm 'KDE display manager' $bindir/kdm
 	register_wm kde 'KDE v3.1' /$prefix/bin/startkde
 
 	cp -fv $confdir/kdm.cron $root/etc/cron.d/90-kdm

package/kde31/kdebase31/kdm.init

@@ -1,42 +0,0 @@
-#!/bin/sh
-#
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/kde31/kdebase31/kdm.init
-# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-#
-# ROCK Linux: /etc/rc.d/init.d/kdm
-#
-# Desc: KDE Display Manager
-# Runlevel: 80 rcX
-#
-
-main_begin
-
-    block_begin(start, `Starting kdm.')
-        check(`D_prefix/bin/kdm')
-    block_end
-
-    block_begin(stop, `Stopping kdm.')
-        check(`killall -15 D_prefix/bin/kdm')
-    block_end
-
-main_end
-

package/x11/xfree86/startxdm.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+XDM=/usr/X11/bin/xdm
+
+[ -e /etc/conf/xdm ] && . /etc/conf/xdm
+
+$XDM
+

package/x11/xfree86/stone_mod_xfree86.sh

@@ -26,6 +26,10 @@ set_wm() {
 	echo "export WINDOWMANAGER=$1" > /etc/profile.d/windowmanager
 }
 
+set_xdm() {
+	echo "export XDM=$1" > /etc/conf/xdm
+}
+
 main() {
 	while
 		WINDOWMANAGER=""
@@ -33,6 +37,11 @@ main() {
 			. /etc/profile.d/windowmanager
 		fi
 
+		XDM=""
+		if [ -f /etc/conf/xdm ]; then
+			. /etc/conf/xdm
+		fi
+
 		cmd="gui_menu xfree86 'XFree86 Configuration Menu'
 
 		'Run xf86cfg (recommended, new interactve config)'
@@ -46,6 +55,22 @@ main() {
 
 		cmd="$cmd '' ''"
 
+		for x in /usr/share/rock-registry/xdm/* ; do
+		  if [ -f $x ] ; then
+			. $x
+
+			if [ "$XDM" = "$exec" ]; then
+			pre='[*]' ; else
+			pre='[ ]' ; fi
+
+			cmd="$cmd
+			    '$pre Use $name in runlevel 5'
+			    'set_xdm $exec'"
+		  fi
+		done
+
+		cmd="$cmd '' ''"
+
 		for x in /usr/share/rock-registry/wm/* ; do
 		  if [ -f $x ] ; then
 			. $x

package/x11/xfree86/xdm.init

@@ -1,41 +0,0 @@
-#!/bin/sh
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/x11/xfree86/xdm.init
-# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-#
-# ROCK Linux: /etc/rc.d/init.d/xdm
-#
-# Desc: X Display Manager
-# Runlevel: 80 rcX
-#
-
-main_begin
-
-    block_begin(start, `Starting xdm.')
-        check(`/usr/X11/bin/xdm')
-    block_end
-
-    block_begin(stop, `Stopping xdm.')
-        check(`killall -15 /usr/X11/bin/xdm')
-    block_end
-
-main_end
-

package/x11/xfree86/xf_config.sh

@@ -121,9 +121,15 @@ xf_install() {
 	rm -rf $root/etc/X11/xkb/compiled
 	ln -sf ../../../var/lib/xkb $root/etc/X11/xkb/compiled
 
-	echo "Installing XFree86 Init Scripts ..."
+	echo "Installing xfs init script ..."
 	install_init xfs $base/package/x11/xfree86/xfs.init
-	install_init xdm $base/package/x11/xfree86/xdm.init
+
+	register_xdm xdm 'X11 dislay manager' /usr/X11R6/bin/xdm
+
+
+	echo "Installing the xdm start script (multiplexer) ..."
+	cp $confdir/startxdm.sh $root/usr/X11R6/bin/startxdm
+	chmod +x $root/usr/X11R6/bin/startxdm
 
 	echo "Installing XFree86 Setup Script ..."
 	cp -fv $base/package/x11/xfree86/stone_mod_xfree86.sh $root/etc/stone.d/mod_xfree86.sh