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 5A9AF15802F for ; Wed, 29 Mar 2023 19:31:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CE4482BC03D; Wed, 29 Mar 2023 19:31:14 +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 B528B2BC03D for ; Wed, 29 Mar 2023 19:31:14 +0000 (UTC) From: Ben Kohler To: gentoo-catalyst@lists.gentoo.org Subject: [gentoo-catalyst] [PATCH 08/10] livecdfs-update, livecd-bashrc: remove archaic X autostarting setup Date: Wed, 29 Mar 2023 14:30:58 -0500 Message-Id: <20230329193100.2976079-8-bkohler@gentoo.org> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230329193100.2976079-1-bkohler@gentoo.org> References: <20230329193100.2976079-1-bkohler@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: e7205fb7-5e62-4917-af79-aa6123e799ac X-Archives-Hash: 55f32e05b0e398a3b9a3e3d9f746bb57 Signed-off-by: Ben Kohler --- livecd/files/livecd-bashrc | 13 ------------- targets/support/livecdfs-update.sh | 7 ------- 2 files changed, 20 deletions(-) diff --git a/livecd/files/livecd-bashrc b/livecd/files/livecd-bashrc index 18b8f1d8..a9bf588e 100644 --- a/livecd/files/livecd-bashrc +++ b/livecd/files/livecd-bashrc @@ -1,14 +1 @@ #!/bin/bash - -if [ ! "$(grep nox /proc/cmdline)" ] -then - if [ -x /usr/bin/X ] - then - if [ -e /etc/startx -a $(tty) = "/dev/tty1" ]; - then - rm -f /etc/startx - ##STARTX - [ -f /etc/motd ] && cat /etc/motd - fi - fi -fi diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh index bf19ccf5..d4548020 100755 --- a/targets/support/livecdfs-update.sh +++ b/targets/support/livecdfs-update.sh @@ -144,16 +144,9 @@ case ${clst_livecd_type} in fi ;; generic-livecd ) - touch /etc/startx ;; esac -# We want the first user to be used when auto-starting X -if [ -e /etc/startx ] -then - sed -i "s:##STARTX:echo startx | su - '${first_user}':" /root/.bashrc -fi - if [ -e /lib/rcscripts/addons/udev-start.sh ] then sed -i "s:\t\[\[ -x /sbin/evms_activate:\t\[\[ -x \${CDBOOT} \]\] \&\& \[\[ -x /sbin/evms_activate:" /lib/rcscripts/addons/udev-start.sh -- 2.40.0