public inbox for gentoo-catalyst@lists.gentoo.org
 help / color / mirror / Atom feed
From: Matt Turner <mattst88@gentoo.org>
To: gentoo-catalyst@lists.gentoo.org
Cc: "W. Trevor King" <wking@tremily.us>
Subject: [gentoo-catalyst] [PATCH 2/3] livecd-bashrc: Avoid a startx race by restricting to tty1
Date: Fri, 11 Oct 2013 15:09:41 -0700	[thread overview]
Message-ID: <1381529382-18766-2-git-send-email-mattst88@gentoo.org> (raw)
In-Reply-To: <1381529382-18766-1-git-send-email-mattst88@gentoo.org>

From: "W. Trevor King" <wking@tremily.us>

Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=481236
Reviewed-by: Matt Turner <mattst88@gmail.com>
---
 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



  reply	other threads:[~2013-10-11 22:10 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-11 22:09 [gentoo-catalyst] [PATCH 1/3] Revert "livecdfs-update.sh: Escape ampersands in STARTX sed expression" Matt Turner
2013-10-11 22:09 ` Matt Turner [this message]
2013-10-11 22:20   ` [gentoo-catalyst] Re: [PATCH 2/3] livecd-bashrc: Avoid a startx race by restricting to tty1 W. Trevor King
2013-10-11 22:43     ` Matt Turner
2013-10-11 22:47       ` W. Trevor King
2013-10-11 22:49         ` W. Trevor King
2013-10-11 22:09 ` [gentoo-catalyst] [PATCH 3/3] livecdfs-update.sh: Use `bash --login` to spawn startx Matt Turner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1381529382-18766-2-git-send-email-mattst88@gentoo.org \
    --to=mattst88@gentoo.org \
    --cc=gentoo-catalyst@lists.gentoo.org \
    --cc=wking@tremily.us \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox