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

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

commit:     2fe6f9e78e9ee3693c4687afb7390896a7d0e6a2
Author:     Fernando Orocu <fernando <AT> gentooligans <DOT> com>
AuthorDate: Tue Mar  8 18:17:49 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=2fe6f9e7

stop xdm if X11 is not requested

Xdm is being started very early in the boot sequence, before autoconfig,
so we need to stop it if the user doesn't want X11.

---
 init.d/autoconfig |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/init.d/autoconfig b/init.d/autoconfig
index 4854cb8..51657c8 100755
--- a/init.d/autoconfig
+++ b/init.d/autoconfig
@@ -588,8 +588,9 @@ start() {
 	killall hwsetup 2>/dev/null
 	echo "6" > /proc/sys/kernel/printk
 
-	if yesno "${SPEAKUP}"
+	if ! yesno "${X11}"
 	then
+		rc-service xdm stop
 		splash_manager -c set -t livecd-10 -m v > /dev/null 2>&1
 		reset
 		chvt 1