Gentoo Archives: gentoo-catalyst

From:	Matt Turner <mattst88@g.o>
To:	gentoo-catalyst@l.g.o
Cc:	"W. Trevor King" <wking@×××××××.us>
Subject:	[gentoo-catalyst] [PATCH 2/3] livecd-bashrc: Avoid a startx race by restricting to tty1
Date:	Fri, 11 Oct 2013 22:10:17
Message-Id:	`1381529382-18766-2-git-send-email-mattst88@gentoo.org`
In Reply to:	[gentoo-catalyst] [PATCH 1/3] Revert "livecdfs-update.sh: Escape ampersands in STARTX sed expression" by Matt Turner

1	From: "W. Trevor King" <wking@×××××××.us>
2
3	Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=481236
4	Reviewed-by: Matt Turner <mattst88@×××××.com>
5	---
6	livecd/files/livecd-bashrc \| 2 +-
7	1 file changed, 1 insertion(+), 1 deletion(-)
8
9	diff --git a/livecd/files/livecd-bashrc b/livecd/files/livecd-bashrc
10	index 983e657..18b8f1d 100644
11	--- a/livecd/files/livecd-bashrc
12	+++ b/livecd/files/livecd-bashrc
13	@@ -4,7 +4,7 @@ if [ ! "$(grep nox /proc/cmdline)" ]
14	then
15	if [ -x /usr/bin/X ]
16	then
17	- if [ -e /etc/startx ]
18	+ if [ -e /etc/startx -a $(tty) = "/dev/tty1" ];
19	then
20	rm -f /etc/startx
21	##STARTX
22	--
23	1.8.3.2

Subject	Author
[gentoo-catalyst] Re: [PATCH 2/3] livecd-bashrc: Avoid a startx race by restricting to tty1	"W. Trevor King" <wking@×××××××.us>