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 ABA321381F3 for ; Fri, 11 Oct 2013 22:10:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 531AAE0AF1; Fri, 11 Oct 2013 22:10:12 +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 9AAEBE0AF1 for ; Fri, 11 Oct 2013 22:10:11 +0000 (UTC) Received: from work-Thinkpad.mattst88.com (unknown [108.161.26.224]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: mattst88) by smtp.gentoo.org (Postfix) with ESMTPSA id 8ED9333EFA5; Fri, 11 Oct 2013 22:10:10 +0000 (UTC) From: Matt Turner To: gentoo-catalyst@lists.gentoo.org Cc: "W. Trevor King" Subject: [gentoo-catalyst] [PATCH 2/3] livecd-bashrc: Avoid a startx race by restricting to tty1 Date: Fri, 11 Oct 2013 15:09:41 -0700 Message-Id: <1381529382-18766-2-git-send-email-mattst88@gentoo.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1381529382-18766-1-git-send-email-mattst88@gentoo.org> References: <1381529382-18766-1-git-send-email-mattst88@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Archives-Salt: 1d6d3fe4-1930-484a-b3ec-7b6b5fbba94a X-Archives-Hash: 631c90a3bbc3f3e2232180c0cd454b15 From: "W. Trevor King" Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=481236 Reviewed-by: Matt Turner --- 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 -- 1.8.3.2