commit: 863f2c97df61729d3041fb85a4c720756c2158fc
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 29 19:09:44 2023 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Mar 31 13:27:38 2023 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=863f2c97
livecdfs-update, livecd-bashrc: remove archaic X autostarting setup
This was used by gamecd targets many many years ago to autostart X with
a game on tty1 for this cd type. It was then still being "used" by
generic targets by mistake, but some of the code is in ALL targets'
bashrc, and causing some errors on login.
Signed-off-by: Ben Kohler <bkohler <AT> 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
