Possible local.start fix for beejay.

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

diff --git a/ChangeLog b/ChangeLog
index 73a24a620fe9c88a836e5de0894f6370b7e36f9e..56c0afffb14637efc589d0db5af0c38107fa4a4e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,14 @@
 # ChangeLog for gentoo/src/catalyst 
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.146 2005/01/13 00:05:55 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.147 2005/01/13 20:50:06 wolf31o2 Exp $
 
 12 Jan 2005; John Davis <zhen@gentoo.org>
   modules/embedded.py:
-  kernel building patch for embedded from mutex@gentoo.org (bug #76542) 
+  kernel building patch for embedded from mutex@gentoo.org (bug #76542)
+
+  13 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  livecd/files/livecd-local.start:
+  Possible local.start fix for beejay.
 
   11 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   livecd/runscript-support/kmerge.sh:

diff --git a/livecd/files/livecd-local.start b/livecd/files/livecd-local.start
index bab5f9b4207211bb7adfa5fea47de7dbd3a4325b..52dc422045417216385db4e4cf522efffc6973de 100644 (file)
--- a/livecd/files/livecd-local.start
+++ b/livecd/files/livecd-local.start
@@ -3,4 +3,7 @@
 # This is a good place to load any misc.
 # programs on startup ( 1>&2 )
 
-[ -e /etc/startx ] && [ -x /usr/sbin/x-setup ] && /usr/sbin/x-setup
+if [ -e /etc/startx ] && [ -x /usr/sbin/x-setup ]
+then
+       /usr/sbin/x-setup
+fi