From 0238da31bc84aa0418c65dd3b247f3bc1a88e668 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Wed, 25 Sep 2013 15:26:06 -0700 Subject: [PATCH] livecd-bashrc: Avoid a startx race by restricting to tty1 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 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 -- 2.26.2