[gentoo-commits] proj/catalyst:master commit in: livecd/files/

[gentoo-commits] proj/catalyst:master commit in: livecd/files/

[Ben Kohler]

commit:     991ac4cbe370572840ef586db208c77157e7dfa4
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 27 16:52:12 2024 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Tue Feb 27 16:54:15 2024 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=991ac4cb

livecd/files/README.txt: adjust nox -> nogui

Bug: https://bugs.gentoo.org/853127

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 livecd/files/README.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/livecd/files/README.txt b/livecd/files/README.txt
index 1be3778d..ebf67691 100644
--- a/livecd/files/README.txt
+++ b/livecd/files/README.txt
@@ -99,9 +99,9 @@ passwd=foo      Sets whatever follows the equals as the root password, which
 noload=X        This causes the initial ramdisk to skip the loading of a
                 specific module that may be causing a problem.  Syntax matches
                 that of doload.
+nogui		This causes an X-enabled LiveCD to not automatically start X,
+		but rather, to drop to the command line instead.
 nonfs           Disables the starting of portmap/nfsmount on boot.
-nox             This causes an X-enabled LiveCD to not automatically start X,
-                but rather, to drop to the command line instead.
 scandelay       This causes the CD to pause for 10 seconds during certain
                 portions the boot process to allow for devices that are slow to
                 initialize to be ready for use.

[gentoo-commits] proj/catalyst:master commit in: livecd/files/

[Ben Kohler]

commit:     bb5b06ef4b0a82008f9ee7f5187912547333189b
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 29 18:29:37 2023 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri Mar 31 13:27:37 2023 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=bb5b06ef

remove gamecd motd file

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 livecd/files/gamecd.motd.txt | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/livecd/files/gamecd.motd.txt b/livecd/files/gamecd.motd.txt
deleted file mode 100644
index 7ee2d9c2..00000000
--- a/livecd/files/gamecd.motd.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-
-To (re)start ##GAME_NAME, please type "startx" at the prompt below.
-
-Please report any bugs you find to https://bugs.gentoo.org. Be sure to include
-detailed information about how to reproduce the bug you are reporting.
-
-Thank you for using Gentoo Linux!
-

[gentoo-commits] proj/catalyst:master commit in: livecd/files/

[Matt Turner]

commit:     0238da31bc84aa0418c65dd3b247f3bc1a88e668
Author:     W. Trevor King <wking <AT> tremily <DOT> us>
AuthorDate: Wed Sep 25 22:26:06 2013 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Oct 26 17:23:23 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=0238da31

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 <AT> 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