Fixing sed line for startx to auto-start X. Thanks to Christophe PEREZ <christophe...

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@778 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index 4edd838535d7cdecc7135bf504c69a6f06ebeff2..280879bd4a6e58ab5b4b0a09bad0d25ffd14f2e8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.305 2005/07/08 15:07:25 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.306 2005/07/08 18:57:39 wolf31o2 Exp $
+
+  08 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  livecd/files/livecd-bashrc, targets/support/livecdfs-update.sh:
+  Fixing sed line for startx to auto-start X. Thanks to Christophe PEREZ
+  <christophe.perez@novazur.com> on the gentoo-catalyst mailing list for
+  finding this bug.
 
   08 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/stage1/stage1-chroot.sh:

diff --git a/livecd/files/livecd-bashrc b/livecd/files/livecd-bashrc
index dc01009cc5ca4c80b31a89cd4dea27522aa65b21..16332ea9ac98caa5f385df14d1a23db0c622e0b0 100644 (file)
--- a/livecd/files/livecd-bashrc
+++ b/livecd/files/livecd-bashrc
@@ -3,7 +3,7 @@
 if [ -e /usr/bin/X ]; then
        if [ -e /etc/startx ]; then
                rm -f /etc/startx
-               startx
+               ##STARTX
                cat /etc/motd
        fi
 fi

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index 0176409ebb8a019f84bb8e0137cf538ef0999b88..e2fb925b64f40d6cd0ecc5a8b2b3131d003ea423 100755 (executable)
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -1,7 +1,7 @@
 #!/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.18 2005/07/05 21:53:41 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/livecdfs-update.sh,v 1.19 2005/07/08 18:57:39 wolf31o2 Exp $
 
 . /tmp/chroot-functions.sh
 update_env_settings
@@ -58,7 +58,7 @@ fi
 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
+       sed -i "s/##STARTX/su - $first_user -c startx/" /root/.bashrc
 fi
 
 # setup dhcp on all detected ethernet devices