aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Gianelloni <wolf31o2@gentoo.org>2007-04-05 14:10:35 +0000
committerChris Gianelloni <wolf31o2@gentoo.org>2007-04-05 14:10:35 +0000
commit403aa83b5cbf8df7121780058e0b0e02d2072718 (patch)
tree17aeb9ce0d698ae6d00a0d8a69f0123f3a490a14 /generic
parentSome minor config file cleanup. (diff)
downloadgenkernel-403aa83b5cbf8df7121780058e0b0e02d2072718.tar.gz
genkernel-403aa83b5cbf8df7121780058e0b0e02d2072718.tar.bz2
genkernel-403aa83b5cbf8df7121780058e0b0e02d2072718.zip
Added a patch from Daniel Drake <dsd@gentoo.org> 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
Diffstat (limited to 'generic')
-rw-r--r--generic/initrd.scripts3
1 files changed, 1 insertions, 2 deletions
diff --git a/generic/initrd.scripts b/generic/initrd.scripts
index f1caef6d..b5c040d9 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