From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 392C61382CA for ; Sat, 26 Oct 2013 20:10:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A3D19E0B77; Sat, 26 Oct 2013 20:10:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 22650E0B77 for ; Sat, 26 Oct 2013 20:10:39 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 38C9333EF38 for ; Sat, 26 Oct 2013 20:10:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id D38A1E5465 for ; Sat, 26 Oct 2013 20:10:35 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1382808203.0238da31bc84aa0418c65dd3b247f3bc1a88e668.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: livecd/files/ X-VCS-Repository: proj/catalyst X-VCS-Files: livecd/files/livecd-bashrc X-VCS-Directories: livecd/files/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 0238da31bc84aa0418c65dd3b247f3bc1a88e668 X-VCS-Branch: master Date: Sat, 26 Oct 2013 20:10:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 497a8f70-2746-41f5-9ec3-16e58e03f817 X-Archives-Hash: b3a91da60624abe7dcd88f773a30e33c commit: 0238da31bc84aa0418c65dd3b247f3bc1a88e668 Author: W. Trevor King tremily us> AuthorDate: Wed Sep 25 22:26:06 2013 +0000 Commit: Matt Turner gentoo org> CommitDate: Sat Oct 26 17:23:23 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=0238da31 livecd-bashrc: Avoid a startx race by restricting to tty1 Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=481236 Reviewed-by: Matt Turner gmail.com> --- livecd/files/livecd-bashrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/livecd/files/livecd-bashrc b/livecd/files/livecd-bashrc index 983e657..18b8f1d 100644 --- a/livecd/files/livecd-bashrc +++ b/livecd/files/livecd-bashrc @@ -4,7 +4,7 @@ if [ ! "$(grep nox /proc/cmdline)" ] then if [ -x /usr/bin/X ] then - if [ -e /etc/startx ] + if [ -e /etc/startx -a $(tty) = "/dev/tty1" ]; then rm -f /etc/startx ##STARTX