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 983e657d132f0c9c9ec712f073464d93db4c72ed..18b8f1d88da11d47e0465bed5cfc48448c2e9aab 100644 (file)
--- 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