From 403aa83b5cbf8df7121780058e0b0e02d2072718 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Thu, 5 Apr 2007 14:10:35 +0000 Subject: [PATCH] Added a patch from Daniel Drake to fix splash problems for bug #172562. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@503 67a159dc-881f-0410-a524-ba9dfbe2cb84 --- ChangeLog | 5 +++++ generic/initrd.scripts | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b2a6265..e275cf4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,11 @@ # Copyright 2006-2007 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 05 Apr 2007; Chris Gianelloni + generic/initrd.scripts: + Added a patch from Daniel Drake to fix splash problems for + bug #172562. + 03 Apr 2007; Chris Gianelloni genkernel.conf: Some minor config file cleanup. diff --git a/generic/initrd.scripts b/generic/initrd.scripts index f1caef6..b5c040d 100644 --- 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 -- 2.26.2