commit: 0c26863c06762bb954d283849777dcde1dc0f616
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 29 18:54:21 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=0c26863c
livecdfs-update.sh: replace local handbook with wiki handbook
Code to look for a local html handbook is obsolete. Link to the wiki
handbook instead, and install the entry unconditionally for gentoo
targets.
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
targets/support/livecdfs-update.sh | 32 +++++++++++++-------------------
1 file changed, 13 insertions(+), 19 deletions(-)
diff --git a/targets/support/livecdfs-update.sh
b/targets/support/livecdfs-update.sh
index 16e201d5..bf19ccf5 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -112,28 +112,22 @@ rm -f /etc/generic.motd.txt /etc/universal.motd.txt
/etc/minimal.motd.txt /etc/l
# Post configuration
case ${clst_livecd_type} in
- gentoo-release-live*)
+ gentoo-release-*)
# Clear out lastlog
rm -f /var/log/lastlog && touch /var/log/lastlog
- create_handbook_icon() {
- cat <<-EOF >
/usr/share/applications/gentoo-handbook.desktop
- [Desktop Entry]
- Encoding=UTF-8
- Version=1.0
- Type=Link
-
URL=file:///mnt/cdrom/docs/handbook/html/index.html
- Terminal=false
- Name=Gentoo Linux Handbook
- GenericName=Gentoo Linux Handbook
- Comment=This is a link to the local copy of the
Gentoo Linux Handbook.
- Icon=text-editor
- EOF
- }
-
- # Create our Handbook icon
- [ -e /docs/handbook/index.html ] && create_handbook_icon
- [ -n "${clst_livecd_overlay}" ] && [ -e
${clst_livecd_overlay}/docs/handbook/index.html ] && create_handbook_icon
+ cat <<-EOF > /usr/share/applications/gentoo-handbook.desktop
+ [Desktop Entry]
+ Encoding=UTF-8
+ Version=1.0
+ Type=Link
+ URL=https://wiki.gentoo.org/wiki/Handbook:Main_Page
+ Terminal=false
+ Name=Gentoo Linux Handbook
+ GenericName=Gentoo Linux Handbook
+ Comment=This is a link to Gentoo Linux Handbook.
+ Icon=text-editor
+ EOF
# Copy our icons into place and build home directories
if [ -n "${clst_livecd_users}" ]
