[patch] patch 2

0002-livecd-bashrc-Avoid-a-startx-race-by-restricting-to-.patch (text/plain), 806 bytes, created by Matt Turner on 2013-10-11 22:08:52 UTC

From 997798ccf9a9d9be7d60101c18b25facaeaed5ff Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <[e-mail]>
Date: Wed, 25 Sep 2013 15:26:06 -0700
Subject: [PATCH 2/3] livecd-bashrc: Avoid a startx race by restricting to tty1

Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=481236
Reviewed-by: Matt Turner <[e-mail]>
---
 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