From: Ben Kohler <bkohler@gentoo.org>
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 [thread overview]
Message-ID: <20230329193100.2976079-8-bkohler@gentoo.org> (raw)
In-Reply-To: <20230329193100.2976079-1-bkohler@gentoo.org>
Signed-off-by: Ben Kohler <bkohler@gentoo.org>
---
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
next prev parent reply other threads:[~2023-03-29 19:31 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-29 19:30 [gentoo-catalyst] [PATCH 01/10] remove gamecd motd file Ben Kohler
2023-03-29 19:30 ` [gentoo-catalyst] [PATCH 02/10] reorganize motd files Ben Kohler
2023-03-29 19:30 ` [gentoo-catalyst] [PATCH 03/10] livecdfs-update.sh: remove code obsoleted by sys-apps/hwids package Ben Kohler
2023-03-29 19:30 ` [gentoo-catalyst] [PATCH 04/10] livecdfs-update.sh: remove old devfsd code Ben Kohler
2023-03-29 19:30 ` [gentoo-catalyst] [PATCH 05/10] livecdfs-update.sh: remove net.eth[1234] symlinks Ben Kohler
2023-03-29 19:40 ` Christian Iwata Nilsson
2023-03-29 19:51 ` Ben Kohler
2023-03-29 19:30 ` [gentoo-catalyst] [PATCH 06/10] livecdfs-update.sh: remove confusing "reduce tmpfs usage" hack Ben Kohler
2023-03-29 19:30 ` [gentoo-catalyst] [PATCH 07/10] livecdfs-update.sh: replace local handbook with wiki handbook Ben Kohler
2023-03-29 19:30 ` Ben Kohler [this message]
2023-03-29 19:30 ` [gentoo-catalyst] [PATCH 09/10] livecdfs-update: remove old evms code Ben Kohler
2023-03-29 19:31 ` [gentoo-catalyst] [PATCH 10/10] Remove obsolete universal cd target Ben Kohler
2023-03-30 12:54 ` Matt Turner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230329193100.2976079-8-bkohler@gentoo.org \
--to=bkohler@gentoo.org \
--cc=gentoo-catalyst@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox