diff options
| -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 |