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 A1831158020 for ; Thu, 17 Nov 2022 23:42:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 513D9E0908; Thu, 17 Nov 2022 23:42:41 +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 359F5E0908 for ; Thu, 17 Nov 2022 23:42:41 +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 2C65A340FCD for ; Thu, 17 Nov 2022 23:42:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 98629622 for ; Thu, 17 Nov 2022 23:42:38 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1668728465.820fcbd2053ee21ea3024c723e31e282a7f70d6d.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: targets/support/, livecd/files/ X-VCS-Repository: proj/catalyst X-VCS-Files: livecd/files/livecd.motd.txt targets/support/livecdfs-update.sh X-VCS-Directories: targets/support/ livecd/files/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 820fcbd2053ee21ea3024c723e31e282a7f70d6d X-VCS-Branch: master Date: Thu, 17 Nov 2022 23:42:38 +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: 480f129d-ccb0-4d93-8bff-6cc84ce29d61 X-Archives-Hash: 1f406d63aa33710dd8ebd1ac482e1ace Message-ID: <20221117234238.0Fv16gw4aNLaeXLkKbqyKOYQo2qcIAqzRTc-C3it6Z0@z> commit: 820fcbd2053ee21ea3024c723e31e282a7f70d6d Author: Matt Turner gentoo org> AuthorDate: Tue Nov 15 02:11:30 2022 +0000 Commit: Matt Turner gentoo org> CommitDate: Thu Nov 17 23:41:05 2022 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=820fcbd2 targets: Remove remnants of support for the installer Signed-off-by: Matt Turner gentoo.org> livecd/files/livecd.motd.txt | 2 -- targets/support/livecdfs-update.sh | 16 +--------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/livecd/files/livecd.motd.txt b/livecd/files/livecd.motd.txt index fe4c0918..9f8e2396 100644 --- a/livecd/files/livecd.motd.txt +++ b/livecd/files/livecd.motd.txt @@ -1,8 +1,6 @@ To (re)start X Windows, please type "##DISPLAY_MANAGER" at the prompt below. There is also a rescue session for X using twm if you simply use "startx". -You can start the installer by typing "installer" at the prompt below. - 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. diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh index 3f47012b..cf2cf62f 100755 --- a/targets/support/livecdfs-update.sh +++ b/targets/support/livecdfs-update.sh @@ -228,12 +228,8 @@ case ${clst_livecd_type} in fi fi - # This gives us our list of system packages for the installer - mkdir -p /usr/livecd - ### XXX: Andrew says we don't need this anymore - USE="-* $(cat /var/db/pkg/sys-libs/glibc*/USE)" emerge -eqp @system | grep -e '^\[ebuild' | sed -e 's:^\[ebuild .\+\] ::' -e 's: .\+$::' > /usr/livecd/systempkgs.txt - # This is my hack to reduce tmpfs usage + mkdir -p /usr/livecd cp -r ${clst_repo_basedir}/${clst_repo_name}/{profiles,eclass} /usr/livecd rm -rf /usr/livecd/profiles/{co*,default-{1*,a*,b*,d*,h*,i*,m*,p*,s*,x*},g*,hardened-*,n*,x*} mv -f /etc/gconf /usr/livecd @@ -273,16 +269,6 @@ case ${clst_livecd_type} in [ -e /usr/share/applications/gentoo-handbook.desktop ] && \ cp -f /usr/share/applications/gentoo-handbook.desktop \ /home/${username}/Desktop - # Copy our installer icons - if [ -e /usr/share/applications/installer-gtk.desktop ] - then - cp -f /usr/share/applications/installer-{gtk,dialog}.desktop /home/${username}/Desktop - sed -i -e \ - 's:Exec=installer-dialog:Exec=sudo installer-dialog:' \ - /home/${username}/Desktop/installer-dialog.desktop - sed -i -e 's:Exec=installer-gtk:Exec=installer:' \ - /home/${username}/Desktop/installer-gtk.desktop - fi chown -R ${username}:100 /home/${username} done fi