summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hubbs <williamh@gentoo.org>2011-02-13 13:22:31 -0600
committerWilliam Hubbs <williamh@gentoo.org>2011-02-13 13:22:31 -0600
commitdef73ce8ab55684c923b065e82208d7e70596f11 (patch)
tree3cdb08cf10be348894a6ed0f6474c9f84c32b07a
parentload speakup modules in depend function (diff)
downloadlivecd-tools-def73ce8ab55684c923b065e82208d7e70596f11.tar.gz
livecd-tools-def73ce8ab55684c923b065e82208d7e70596f11.tar.bz2
livecd-tools-def73ce8ab55684c923b065e82208d7e70596f11.zip
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.
-rwxr-xr-xautoconfig6
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
}