aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Kohler <bkohler@gentoo.org>2023-03-29 13:33:52 -0500
committerBen Kohler <bkohler@gentoo.org>2023-03-31 08:27:37 -0500
commitb66d5721d6da0bb14d5106e634e1544c53242bd9 (patch)
treee44869943cec63c949689c894c347125098f55bf /targets
parentremove gamecd motd file (diff)
downloadcatalyst-b66d5721d6da0bb14d5106e634e1544c53242bd9.tar.gz
catalyst-b66d5721d6da0bb14d5106e634e1544c53242bd9.tar.bz2
catalyst-b66d5721d6da0bb14d5106e634e1544c53242bd9.zip
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@gentoo.org>
Diffstat (limited to 'targets')
-rwxr-xr-xtargets/support/livecdfs-update.sh6
1 files changed, 2 insertions, 4 deletions
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