From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QGMl9-00083Q-KI for garchives@archives.gentoo.org; Sun, 01 May 2011 02:51:47 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4F0071C083; Sun, 1 May 2011 02:49:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 1967A1C083 for ; Sun, 1 May 2011 02:49:14 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C4B5E2AC026 for ; Sun, 1 May 2011 02:49:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 35AF480508 for ; Sun, 1 May 2011 02:49:13 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <2fe6f9e78e9ee3693c4687afb7390896a7d0e6a2.williamH@gentoo> Subject: [gentoo-commits] proj/livecd-tools:master commit in: init.d/ X-VCS-Repository: proj/livecd-tools X-VCS-Files: init.d/autoconfig X-VCS-Directories: init.d/ X-VCS-Committer: williamH X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 2fe6f9e78e9ee3693c4687afb7390896a7d0e6a2 Date: Sun, 1 May 2011 02:49:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: ae23801482e9b2fc44407e9cc99aec4d commit: 2fe6f9e78e9ee3693c4687afb7390896a7d0e6a2 Author: Fernando Orocu gentooligans com> AuthorDate: Tue Mar 8 18:17:49 2011 +0000 Commit: William Hubbs gentoo org> CommitDate: Sun May 1 02:46:14 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/livecd-tools.= git;a=3Dcommit;h=3D2fe6f9e7 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 =20 - 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