Added support for the newer versions of splashutils which use fbcondecor as the init...

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 6fe9cebe607b6fb9e3b6a1e29fd361b78f4b671e..8b474c691b8efde7381cb31b7a5df7b578f3a008 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,15 @@
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  29 Aug 2007; Chris Gianelloni <wolf31o2@gentoo.org> 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 <wolf31o2@gentoo.org>
   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 <agaffney@gentoo.org>
   modules/generic_stage_target.py, modules/stage1_target.py,

diff --git a/catalyst b/catalyst
index e8f72b19ef16df4072889b13d0bad9203c9ed7c9..38c15c26299f82f4876e0b59f38711c42037b8c5 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -8,7 +8,7 @@ import os,sys,imp,string,getopt
 import pdb
 
 __maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>"
-__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 b35ebed2e84ea3152febd57eab98c96ee72cb188..2c837882eee6dc32fcc8766f4ea1a80e4c7f5ed8 100644 (file)
--- 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