From: W. Trevor King <wking@tremily.us>
Date: Mon, 4 Mar 2013 02:33:02 +0000 (-0500)
Subject: livecd-bashrc: Avoid a startx race by restricting to tty1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=60261ce2886debc3f7e3e6a7e87cf618c879ebc4;p=catalyst.git

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

Otherwise several virtual consoles may notice the existence of
/etc/startx, and spawn simultaneous X servers.  This way we only spawn
a single X server, regardless of timing.

A better solution here is probably to add a "start" or "x-server"
service to /etc/init.d/, but that's more work than I'm up to at the
moment.
---

diff --git a/livecd/files/livecd-bashrc b/livecd/files/livecd-bashrc
index 983e657d..7abfbd4f 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 ] && [ "$(tty)" == /dev/tty1 ]
 		then
 			rm -f /etc/startx
 			##STARTX