| 1 |
commit: 3ca14c1c816e098e0ce8719ab962a01d51e8462a |
| 2 |
Author: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 13 19:22:31 2011 +0000 |
| 4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 1 02:46:14 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=3ca14c1c |
| 7 |
|
| 8 |
start xdm from autoconfig |
| 9 |
|
| 10 |
We need to start xdm ourselves instead of allowing it to start in the |
| 11 |
default order. This allows us to not start it when X is not requested by |
| 12 |
the user or when speakup or brltty is requested. |
| 13 |
|
| 14 |
--- |
| 15 |
autoconfig | 6 +----- |
| 16 |
1 files changed, 1 insertions(+), 5 deletions(-) |
| 17 |
|
| 18 |
diff --git a/autoconfig b/autoconfig |
| 19 |
index 3d3c71f..9eec5ce 100755 |
| 20 |
--- a/autoconfig |
| 21 |
+++ b/autoconfig |
| 22 |
@@ -278,6 +278,7 @@ list_services() { |
| 23 |
svcs="${svcs} $(check_svc ${PASSWD} pwgen)" |
| 24 |
svcs="${svcs} $(check_svc ${PCMCIA} pcmcia)" |
| 25 |
svcs="${svcs} $(check_svc ${SSHD} sshd)" |
| 26 |
+ svcs="${svcs} $(check_svc ${X11} xdm)" |
| 27 |
|
| 28 |
### TODO: make this baselayout-2 compatible |
| 29 |
### TODO: make these checks accurate using service dependencies |
| 30 |
@@ -602,11 +603,6 @@ start() { |
| 31 |
|
| 32 |
[ -n "${XDESC}" ] && einfo "VideoCard: ${HILITE}${XDESC}${NORMAL}" |
| 33 |
|
| 34 |
- if ! yesno "${X11}" |
| 35 |
- then |
| 36 |
- touch /etc/.noxdm |
| 37 |
- fi |
| 38 |
- |
| 39 |
killall hwsetup 2>/dev/null |
| 40 |
echo "6" > /proc/sys/kernel/printk |
| 41 |
} |
Archives