commit: 8431625598208202ce9c86816a641365cef1024c Author: Ben Kohler <bkohler <AT> gentoo <DOT> org> AuthorDate: Wed Mar 29 19:26:34 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=84316255
Remove obsolete universal cd target Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org> doc/catalyst-spec.5.txt | 1 - examples/livecd-stage2_template.spec | 1 - livecd/files/universal.motd.txt | 13 ------------- targets/livecd-stage2/controller.sh | 1 - targets/support/livecdfs-update.sh | 6 +----- 5 files changed, 1 insertion(+), 21 deletions(-) diff --git a/doc/catalyst-spec.5.txt b/doc/catalyst-spec.5.txt index fd2926fb..96f9f3bd 100644 --- a/doc/catalyst-spec.5.txt +++ b/doc/catalyst-spec.5.txt @@ -104,7 +104,6 @@ This option controls quite a bit of catalyst internals and sets up several defaults. Each type behaves slightly differently and is explained below. `gentoo-release-minimal`;; This creates an official minimal InstallCD. - `gentoo-release-universal`;; This creates an official universal InstallCD. `gentoo-release-livecd`;; This creates an official LiveCD environment. `generic-livecd`;; This should be used for all non-official media. diff --git a/examples/livecd-stage2_template.spec b/examples/livecd-stage2_template.spec index adf0acaf..b0d2ecd6 100644 --- a/examples/livecd-stage2_template.spec +++ b/examples/livecd-stage2_template.spec @@ -135,7 +135,6 @@ livecd/linuxrc: # This option controls quite a bit of catalyst internals and sets up several # defaults. Each type behaves slightly differently and is explained below. # gentoo-release-minimal - This creates an official minimal InstallCD. -# gentoo-release-universal - This creates an official universal InstallCD. # gentoo-release-livecd - This creates an official LiveCD environment. # generic-livecd - This should be used for all non-official media. # example: diff --git a/livecd/files/universal.motd.txt b/livecd/files/universal.motd.txt deleted file mode 100644 index 416d59d8..00000000 --- a/livecd/files/universal.motd.txt +++ /dev/null @@ -1,13 +0,0 @@ -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/. - -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/livecd-stage2/controller.sh b/targets/livecd-stage2/controller.sh index 9aba8167..cced07d2 100755 --- a/targets/livecd-stage2/controller.sh +++ b/targets/livecd-stage2/controller.sh @@ -64,7 +64,6 @@ case $1 in clean) if [ "${clst_livecd_type}" = "gentoo-release-minimal" ] \ - || [ "${clst_livecd_type}" = "gentoo-release-universal" ] then # Clean out man, info and doc files rm -rf ${clst_chroot_path}/usr/share/{man,doc,info}/* diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh index 05714c52..687b9d4e 100755 --- a/targets/support/livecdfs-update.sh +++ b/targets/support/livecdfs-update.sh @@ -94,10 +94,6 @@ EOF # Tweak the MOTD for Gentoo releases case ${clst_livecd_type} in - gentoo-release-universal) - 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) cat /etc/generic.motd.txt /etc/minimal.motd.txt > /etc/motd sed -i 's:^##GREETING:Welcome to the Gentoo Linux Minimal Installation CD!:' /etc/motd @@ -108,7 +104,7 @@ case ${clst_livecd_type} in ;; esac -rm -f /etc/generic.motd.txt /etc/universal.motd.txt /etc/minimal.motd.txt /etc/livecd.motd.txt +rm -f /etc/generic.motd.txt /etc/minimal.motd.txt /etc/livecd.motd.txt # Post configuration case ${clst_livecd_type} in
