From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1C29315802F for ; Fri, 31 Mar 2023 13:28:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 53F1BE0815; Fri, 31 Mar 2023 13:28:51 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3B756E0815 for ; Fri, 31 Mar 2023 13:28:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4BFBE340FB0 for ; Fri, 31 Mar 2023 13:28:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4F566A13 for ; Fri, 31 Mar 2023 13:28:47 +0000 (UTC) From: "Ben Kohler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ben Kohler" Message-ID: <1680269257.0c26863c06762bb954d283849777dcde1dc0f616.bkohler@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/support/livecdfs-update.sh X-VCS-Directories: targets/support/ X-VCS-Committer: bkohler X-VCS-Committer-Name: Ben Kohler X-VCS-Revision: 0c26863c06762bb954d283849777dcde1dc0f616 X-VCS-Branch: master Date: Fri, 31 Mar 2023 13:28:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a42a226b-3c98-4b60-918c-a79964d7bf20 X-Archives-Hash: 07bf96b852dbab885e16a73ac630e81a commit: 0c26863c06762bb954d283849777dcde1dc0f616 Author: Ben Kohler gentoo org> AuthorDate: Wed Mar 29 18:54:21 2023 +0000 Commit: Ben Kohler gentoo 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 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}" ]