summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFernando Orocu <fernando@gentooligans.com>2011-03-08 12:17:49 -0600
committerWilliam Hubbs <williamh@gentoo.org>2011-04-30 21:46:14 -0500
commit2fe6f9e78e9ee3693c4687afb7390896a7d0e6a2 (patch)
tree9ab88c50ceea0966ecad60c73746563722736c43
parentadd check to be sure splash is only reset for speakup users (diff)
downloadlivecd-tools-2fe6f9e78e9ee3693c4687afb7390896a7d0e6a2.tar.gz
livecd-tools-2fe6f9e78e9ee3693c4687afb7390896a7d0e6a2.tar.bz2
livecd-tools-2fe6f9e78e9ee3693c4687afb7390896a7d0e6a2.zip
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.
-rwxr-xr-xinit.d/autoconfig3
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