From 359e942c7041ae759353da777e4acd2cc6c79147 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Thu, 13 Jan 2005 20:50:06 +0000 Subject: [PATCH] Possible local.start fix for beejay. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@520 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 8 ++++++-- livecd/files/livecd-local.start | 5 ++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 73a24a62..56c0afff 100644 --- 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 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 + livecd/files/livecd-local.start: + Possible local.start fix for beejay. 11 Jan 2005; Chris Gianelloni livecd/runscript-support/kmerge.sh: diff --git a/livecd/files/livecd-local.start b/livecd/files/livecd-local.start index bab5f9b4..52dc4220 100644 --- 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 -- 2.26.2