From: W. Trevor King <wking@tremily.us>
Date: Wed, 25 Sep 2013 22:26:06 +0000 (-0700)
Subject: livecd-bashrc: Avoid a startx race by restricting to tty1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0238da31bc84aa0418c65dd3b247f3bc1a88e668;p=catalyst.git

livecd-bashrc: Avoid a startx race by restricting to tty1

Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=481236
Reviewed-by: Matt Turner <mattst88@gmail.com>
---

diff --git a/livecd/files/livecd-bashrc b/livecd/files/livecd-bashrc
index 983e657d..18b8f1d8 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