# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.595 2006/04/17 18:57:35 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.596 2006/04/17 19:01:02 wolf31o2 Exp $
+
+ 17 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+ targets/support/livecdfs-update.sh:
+ Moved sed line for ##STARTX to end of file, since we aren't touching
+ /etc/startx until the end.
17 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org>
targets/support/livecdfs-update.sh:
#!/bin/bash
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/livecdfs-update.sh,v 1.43 2006/04/17 18:57:35 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/livecdfs-update.sh,v 1.44 2006/04/17 19:01:02 wolf31o2 Exp $
. /tmp/chroot-functions.sh
sed -i '/NOPASSWD: ALL/ s/^# //' /etc/sudoers
fi
-# We want the first user to be used when auto-starting X
-if [ -n "${clst_livecd_users}" -a -e /etc/startx ]
-then
- first_user=$(echo ${clst_livecd_users} | cut -d' ' -f1)
- sed -i "s/##STARTX/su - $first_user -c startx/" /root/.bashrc
-fi
-
# Setup DHCP on all detected ethernet devices
echo "iface_eth0=\"dhcp\""> /etc/conf.d/net
echo "iface_eth1=\"dhcp\"" >> /etc/conf.d/net
;;
esac
+# We want the first user to be used when auto-starting X
+if [ -n "${clst_livecd_users}" -a -e /etc/startx ]
+then
+ first_user=$(echo ${clst_livecd_users} | cut -d' ' -f1)
+ sed -i "s/##STARTX/source /etc/profile && su - $first_user -c startx/" \
+ /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