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

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

[Ben Kohler]

commit:     b66d5721d6da0bb14d5106e634e1544c53242bd9
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 29 18:33:52 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=b66d5721

reorganize motd files

Having all 3 livecd targets inherit generic.motd.txt AND
minimal.motd.txt was causing some duplication of messages.  Now all 3
targets inherit generic and their own single motd file.

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

 livecd/files/livecd.motd.txt       |  8 +++++++-
 livecd/files/minimal.motd.txt      |  2 +-
 livecd/files/universal.motd.txt    | 12 ++++++++++--
 targets/support/livecdfs-update.sh |  6 ++----
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/livecd/files/livecd.motd.txt b/livecd/files/livecd.motd.txt
index a37f53cb..029c2f6e 100644
--- a/livecd/files/livecd.motd.txt
+++ b/livecd/files/livecd.motd.txt
@@ -1,5 +1,11 @@
+The latest version of the Handbook is always available from the Gentoo web
+site by typing "links https://wiki.gentoo.org/wiki/Handbook".
+
+To start an ssh server on this system, type "/etc/init.d/sshd start".  If you
+need to log in remotely as root, type "passwd root" to reset root's password
+to a known value.
+
 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!
-

diff --git a/livecd/files/minimal.motd.txt b/livecd/files/minimal.motd.txt
index 3058b854..029c2f6e 100644
--- a/livecd/files/minimal.motd.txt
+++ b/livecd/files/minimal.motd.txt
@@ -7,5 +7,5 @@ to a known value.
 
 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!
 
+Thank you for using Gentoo Linux!

diff --git a/livecd/files/universal.motd.txt b/livecd/files/universal.motd.txt
index 403b8729..416d59d8 100644
--- a/livecd/files/universal.motd.txt
+++ b/livecd/files/universal.motd.txt
@@ -1,5 +1,13 @@
+The latest version of the Handbook is always available from the Gentoo web
+site by typing "links https://wiki.gentoo.org/wiki/Handbook".
 
 Stage tarball(s), distfiles and packages can be found in /mnt/cdrom/.
 
-You can view the networkless installation instructions for this release by
-typing "links /mnt/cdrom/docs/handbook/html".
+To start an ssh server on this system, type "/etc/init.d/sshd start".  If you
+need to log in remotely as root, type "passwd root" to reset root's password
+to a known value.
+
+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!

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index dafe4c3a..1be4baea 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -128,8 +128,7 @@ fi
 # Tweak the MOTD for Gentoo releases
 case ${clst_livecd_type} in
 	gentoo-release-universal)
-		cat /etc/generic.motd.txt /etc/universal.motd.txt \
-			/etc/minimal.motd.txt > /etc/motd
+		cat /etc/generic.motd.txt /etc/universal.motd.txt > /etc/motd
 		sed -i 's:^##GREETING:Welcome to the Gentoo Linux Universal Installation CD!:' /etc/motd
 	;;
 	gentoo-release-minimal)
@@ -137,8 +136,7 @@ case ${clst_livecd_type} in
 		sed -i 's:^##GREETING:Welcome to the Gentoo Linux Minimal Installation CD!:' /etc/motd
 	;;
 	gentoo-release-live*)
-		cat /etc/generic.motd.txt \
-			/etc/minimal.motd.txt /etc/livecd.motd.txt > /etc/motd
+		cat /etc/generic.motd.txt /etc/livecd.motd.txt > /etc/motd
 		sed -i -e 's:^##GREETING:Welcome to the Gentoo Linux LiveCD!:' /etc/motd
 	;;
 esac

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

[Ben Kohler]

commit:     863f2c97df61729d3041fb85a4c720756c2158fc
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 29 19:09:44 2023 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri Mar 31 13:27:38 2023 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=863f2c97

livecdfs-update, livecd-bashrc: remove archaic X autostarting setup

This was used by gamecd targets many many years ago to autostart X with
a game on tty1 for this cd type.  It was then still being "used" by
generic targets by mistake, but some of the code is in ALL targets'
bashrc, and causing some errors on login.

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

 livecd/files/livecd-bashrc         | 13 -------------
 targets/support/livecdfs-update.sh |  7 -------
 2 files changed, 20 deletions(-)

diff --git a/livecd/files/livecd-bashrc b/livecd/files/livecd-bashrc
index 18b8f1d8..a9bf588e 100644
--- a/livecd/files/livecd-bashrc
+++ b/livecd/files/livecd-bashrc
@@ -1,14 +1 @@
 #!/bin/bash
-
-if [ ! "$(grep nox /proc/cmdline)" ]
-then
-	if [ -x /usr/bin/X ]
-	then
-		if [ -e /etc/startx -a $(tty) = "/dev/tty1" ];
-		then
-			rm -f /etc/startx
-			##STARTX
-			[ -f /etc/motd ] && cat /etc/motd
-		fi
-	fi
-fi

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index bf19ccf5..d4548020 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -144,16 +144,9 @@ case ${clst_livecd_type} in
 		fi
 		;;
 	generic-livecd )
-		touch /etc/startx
 		;;
 esac
 
-# We want the first user to be used when auto-starting X
-if [ -e /etc/startx ]
-then
-	sed -i "s:##STARTX:echo startx | su - '${first_user}':" /root/.bashrc
-fi
-
 if [ -e /lib/rcscripts/addons/udev-start.sh ]
 then
 	sed -i "s:\t\[\[ -x /sbin/evms_activate:\t\[\[ -x \${CDBOOT} \]\] \&\& \[\[ -x /sbin/evms_activate:" /lib/rcscripts/addons/udev-start.sh