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 03146158020 for ; Tue, 15 Nov 2022 02:52:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B028FE097C; Tue, 15 Nov 2022 02:52:11 +0000 (UTC) Received: from mail-qk1-f178.google.com (mail-qk1-f178.google.com [209.85.222.178]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6F0AEE0976; Tue, 15 Nov 2022 02:52:11 +0000 (UTC) Received: by mail-qk1-f178.google.com with SMTP id x18so8746777qki.4; Mon, 14 Nov 2022 18:52:11 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EbGsa9CqwNHMZaO8is9y9nHfd4MzVy/CZcneUHogBVU=; b=jzGtkYuvuQncCjopXLk7Qw92fgh06FLY6eQtH+uRrILa35uTRdS0XjgrQNT8YWxCd6 hKXF3Mi1AMODmhucduuGHvSxpb3jZx+XwREyhYcq0nyF8G0iaZAgB/Yueb1m6OvNQaNP lut1RldUpg9MMy4cyWliP0LQjGlT5bWqgcKdUsxNXzMB8NSlk7VSaB+diOruB3INE/Hc KwCEpCXns6qCQgwNp3x91PrC+sX957PH6KCqkCzhTdlNmlsUyeeIn+brSKUyebmNgNI5 svvG/qAQ8yhoDU/tcpN53bVSEUveGXRMAOO/y7UekOjtxCSwhs4vDp6t43jxZ6OgKQTJ yEfA== X-Gm-Message-State: ANoB5plaukpGePMFdslBY9wLtS8XQVxvVa5+8kT3RSSqS6ypETHtzQaV 4nXHofVD1FffxiOGRMLdvPX9VGtSgb4= X-Google-Smtp-Source: AA0mqf7YFD9MFATeP0ugb/BBSs/cAJA0wie+wae8tAfxbdxLMloL7ZmQ4r2Jv1ysDMM3d2JZ8dhq/Q== X-Received: by 2002:a05:620a:2207:b0:6fa:40a4:68bd with SMTP id m7-20020a05620a220700b006fa40a468bdmr13756912qkh.355.1668480730528; Mon, 14 Nov 2022 18:52:10 -0800 (PST) Received: from localhost ([162.208.5.36]) by smtp.gmail.com with ESMTPSA id bs13-20020a05620a470d00b006b61b2cb1d2sm7668461qkb.46.2022.11.14.18.52.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Nov 2022 18:52:09 -0800 (PST) From: Matt Turner To: gentoo-dev@lists.gentoo.org, gentoo-catalyst@lists.gentoo.org Cc: Matt Turner Subject: [gentoo-dev] [PATCH 2/5] targets: Remove remnants of support for the installer Date: Mon, 14 Nov 2022 21:51:54 -0500 Message-Id: <20221115025157.1703859-2-mattst88@gentoo.org> X-Mailer: git-send-email 2.37.4 In-Reply-To: <20221115025157.1703859-1-mattst88@gentoo.org> References: <20221115025157.1703859-1-mattst88@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: daa3cfb2-eeb0-40fd-b53f-fe181342741c X-Archives-Hash: 4fd26be3d7ca1ade9b6365080c396dd2 Signed-off-by: Matt Turner --- 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 -- 2.37.4