Fix the splash code so we have our splash theme on all 6 virtual consoles, as well...

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

diff --git a/ChangeLog b/ChangeLog
index 13a430cd630a679dd9ca041e4a80208f1c70a616..f57d984929eb1accdb8158bcf440c7e94cb26a49 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.648 2006/07/20 22:02:16 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.649 2006/07/21 16:16:39 wolf31o2 Exp $
+
+  21 Jul 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/support/livecdfs-update.sh:
+  Fix the splash code so we have our splash theme on all 6 virtual consoles,
+  as well as a possible fix for the read-only filesystem messages from
+  /sbin/splash-functions.sh
 
   20 Jul 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/support/chroot-functions.sh:

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index ad346ceb53b61df0091e1ff4e76400606f6c529e..260a30dc0e86bb44942dc2b739ac87686350d199 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.55 2006/07/19 21:39:46 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/livecdfs-update.sh,v 1.56 2006/07/21 16:16:39 wolf31o2 Exp $
 
 . /tmp/chroot-functions.sh
 
@@ -180,7 +180,13 @@ elif [ "${clst_livecd_splash_type}" == "gensplash" -a -n \
 then
        if [ -d /etc/splash/${clst_livecd_splash_theme} ]
        then
-               sed -i "s:# SPLASH_THEME=\"gentoo\":SPLASH_THEME=\"${clst_livecd_splash_theme}\":" /etc/conf.d/splash
+               sed -i \
+                       -e "s:# SPLASH_THEME=\"gentoo\":SPLASH_THEME=\"${clst_livecd_splash_theme}\":" \
+                       -e "/^# SPLASH_TTYS=/ s/^#//" \
+                       /etc/conf.d/splash
+               sed -i \
+                       -e 's/type" cachedir "${spl_/type" tmpfs "${spl_/' \
+                       /sbin/splash-functions.sh
                rm -f /etc/splash/default
                ln -s /etc/splash/${clst_livecd_splash_theme} /etc/splash/default
        else