From: Chris Gianelloni Date: Wed, 29 Aug 2007 18:03:21 +0000 (+0000) Subject: Added support for the newer versions of splashutils which use fbcondecor as the init... X-Git-Tag: CATALYST_2_0_6_916~255 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=34e83e71df3aeb7aa274f48fc9813e01e613cd9b;p=catalyst.git Added support for the newer versions of splashutils which use fbcondecor as the init script. This is catalyst 2.0.5_pre1 for testing. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1239 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index 6fe9cebe..8b474c69 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,15 @@ # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 29 Aug 2007; Chris Gianelloni catalyst, + targets/support/rc-update.sh: + Added support for the newer versions of splashutils which use fbcondecor as + the init script. This is catalyst 2.0.5_pre1 for testing. + 29 Aug 2007; Chris Gianelloni targets/livecd-stage2/livecd-stage2-controller.sh: - Make sure we mkdir on /etc/X11/xinit before we put files in it for bug #178289. + Make sure we mkdir on /etc/X11/xinit before we put files in it for bug + #178289. 22 Aug 2007; Andrew Gaffney modules/generic_stage_target.py, modules/stage1_target.py, diff --git a/catalyst b/catalyst index e8f72b19..38c15c26 100755 --- a/catalyst +++ b/catalyst @@ -8,7 +8,7 @@ import os,sys,imp,string,getopt import pdb __maintainer__="Chris Gianelloni " -__version__="2.0.4" +__version__="2.0.5_pre1" conf_values={} diff --git a/targets/support/rc-update.sh b/targets/support/rc-update.sh index b35ebed2..2c837882 100644 --- a/targets/support/rc-update.sh +++ b/targets/support/rc-update.sh @@ -11,11 +11,12 @@ then rc-update add autoconfig default rc-update add modules boot rc-update add pwgen default - [ -e /etc/init.d/bootsplash ] && rc-update add bootsplash default - [ -e /etc/init.d/splash ] && rc-update add splash default - [ -e /etc/init.d/sysklogd ] && rc-update add sysklogd default - [ -e /etc/init.d/metalog ] && rc-update add metalog default - [ -e /etc/init.d/syslog-ng ] && rc-update add syslog-ng default + [[ -e /etc/init.d/bootsplash ]] && rc-update add bootsplash default + [[ -e /etc/init.d/splash ]] && rc-update add splash default + [[ -e /etc/init.d/fbcondecor ]] && rc-update add fbcondecor default + [[ -e /etc/init.d/sysklogd ]] && rc-update add sysklogd default + [[ -e /etc/init.d/metalog ]] && rc-update add metalog default + [[ -e /etc/init.d/syslog-ng ]] && rc-update add syslog-ng default # Do some livecd_type specific rc-update changes case ${clst_livecd_type} in