Added a patch from Daniel Drake <dsd@gentoo.org> to fix splash problems for bug ...

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@503 67a159dc-881f-0410-a524-ba9dfbe2cb84

diff --git a/ChangeLog b/ChangeLog
index b2a626561a2459984e566aac387b001ded0e5ce3..e275cf400c5fe1718341e50bb8c20c339279cb08 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 2006-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  05 Apr 2007; Chris Gianelloni <wolf31o2@gentoo.org>
+  generic/initrd.scripts:
+  Added a patch from Daniel Drake <dsd@gentoo.org> to fix splash problems for
+  bug #172562.
+
   03 Apr 2007; Chris Gianelloni <wolf31o2@gentoo.org> genkernel.conf:
   Some minor config file cleanup.
 

diff --git a/generic/initrd.scripts b/generic/initrd.scripts
index f1caef6d2a8da7ab5bcef85e73b6dc8f0cb23b87..b5c040d914275c5549c67ec512ceb1112ea29dac 100644 (file)
--- a/generic/initrd.scripts
+++ b/generic/initrd.scripts
@@ -283,7 +283,6 @@ test_success() {
        # If last command failed send error message and fall back to a shell    
        if [ "$?" != '0' ]
        then
-               splash 'verbose'
                bad_msg 'Failed to $1; failing back to the shell...'
                run_shell
        fi
@@ -298,6 +297,7 @@ good_msg() {
 bad_msg() {
        msg_string=$1
        msg_string="${msg_string:-...}"
+       splash 'verbose' > /dev/null &
        echo -e "${BAD}!!${NORMAL}${BOLD} ${msg_string} ${NORMAL}"
 } 
 
@@ -708,7 +708,6 @@ cdupdate() {
                        ${NEW_ROOT}/mnt/cdrom/cdupdate.sh
                        if [ "$?" != '0' ]
                        then
-                               splash 'verbose'
                                bad_msg "Executing cdupdate.sh failed!"
                                run_shell
                        fi