| 1 |
commit: 2fe6f9e78e9ee3693c4687afb7390896a7d0e6a2 |
| 2 |
Author: Fernando Orocu <fernando <AT> gentooligans <DOT> com> |
| 3 |
AuthorDate: Tue Mar 8 18:17:49 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=2fe6f9e7 |
| 7 |
|
| 8 |
stop xdm if X11 is not requested |
| 9 |
|
| 10 |
Xdm is being started very early in the boot sequence, before autoconfig, |
| 11 |
so we need to stop it if the user doesn't want X11. |
| 12 |
|
| 13 |
--- |
| 14 |
init.d/autoconfig | 3 ++- |
| 15 |
1 files changed, 2 insertions(+), 1 deletions(-) |
| 16 |
|
| 17 |
diff --git a/init.d/autoconfig b/init.d/autoconfig |
| 18 |
index 4854cb8..51657c8 100755 |
| 19 |
--- a/init.d/autoconfig |
| 20 |
+++ b/init.d/autoconfig |
| 21 |
@@ -588,8 +588,9 @@ start() { |
| 22 |
killall hwsetup 2>/dev/null |
| 23 |
echo "6" > /proc/sys/kernel/printk |
| 24 |
|
| 25 |
- if yesno "${SPEAKUP}" |
| 26 |
+ if ! yesno "${X11}" |
| 27 |
then |
| 28 |
+ rc-service xdm stop |
| 29 |
splash_manager -c set -t livecd-10 -m v > /dev/null 2>&1 |
| 30 |
reset |
| 31 |
chvt 1 |
Archives