diff options
| author |   Ben Kohler <bkohler@gentoo.org> | 2023-03-29 14:09:44 -0500 |
|---|---|---|
| committer | Ben Kohler <bkohler@gentoo.org> | 2023-03-31 08:27:38 -0500 |
| commit | 863f2c97df61729d3041fb85a4c720756c2158fc (patch) | |
| tree | f48783eb19bbd3f82671c374762681aa841f3784 | |
| parent | livecdfs-update.sh: replace local handbook with wiki handbook (diff) | |
| download | catalyst-863f2c97df61729d3041fb85a4c720756c2158fc.tar.gz catalyst-863f2c97df61729d3041fb85a4c720756c2158fc.tar.bz2 catalyst-863f2c97df61729d3041fb85a4c720756c2158fc.zip | |
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@gentoo.org>
| -rw-r--r-- | livecd/files/livecd-bashrc | 13 | ||||
| -rwxr-xr-x | targets/support/livecdfs-update.sh | 7 |
2 files changed, 0 insertions, 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 |