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 <bkoh...@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 -- 2.40.0
