[gentoo-commits] proj/livecd-tools:master commit in: /

["William Hubbs" <williamh@gentoo.org>]

commit:     3ca14c1c816e098e0ce8719ab962a01d51e8462a
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 13 19:22:31 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun May  1 02:46:14 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=3ca14c1c

start xdm from autoconfig

We need to start xdm ourselves instead of allowing it to start in the
default order. This allows us to not start it when X is not requested by
the user or when speakup or brltty is requested.

---
 autoconfig |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/autoconfig b/autoconfig
index 3d3c71f..9eec5ce 100755
--- a/autoconfig
+++ b/autoconfig
@@ -278,6 +278,7 @@ list_services() {
 	svcs="${svcs} $(check_svc ${PASSWD} pwgen)"
 	svcs="${svcs} $(check_svc ${PCMCIA} pcmcia)"
 	svcs="${svcs} $(check_svc ${SSHD} sshd)"
+	svcs="${svcs} $(check_svc ${X11} xdm)"
 
 	### TODO: make this baselayout-2 compatible
 	### TODO: make these checks accurate using service dependencies
@@ -602,11 +603,6 @@ start() {
 
 	[ -n "${XDESC}" ] && einfo "VideoCard:   ${HILITE}${XDESC}${NORMAL}"
 
-	if ! yesno "${X11}"
-	then
-		touch /etc/.noxdm
-	fi
-
 	killall hwsetup 2>/dev/null
 	echo "6" > /proc/sys/kernel/printk
 }