aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-08-05 13:48:20 +0000
committerOlivier Blin <oblin@mandriva.com>2008-08-05 13:48:20 +0000
commit123a568e315b10ab0018086eee00c0376615e633 (patch)
tree9a1a25f4a1dc352a1ca3c467015dab0c5c478527 /scripts
parent9264b6857089904a4b0d129e5348fc3f3681cbba (diff)
downloadbootsplash-123a568e315b10ab0018086eee00c0376615e633.tar
bootsplash-123a568e315b10ab0018086eee00c0376615e633.tar.gz
bootsplash-123a568e315b10ab0018086eee00c0376615e633.tar.bz2
bootsplash-123a568e315b10ab0018086eee00c0376615e633.tar.xz
bootsplash-123a568e315b10ab0018086eee00c0376615e633.zip
do not warn about missing /proc/splash if in splashy mode (#42459)
Diffstat (limited to 'scripts')
-rw-r--r--scripts/splash.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/splash.sh b/scripts/splash.sh
index 0ef4a93..eaeaa15 100644
--- a/scripts/splash.sh
+++ b/scripts/splash.sh
@@ -96,7 +96,9 @@ fi
_shutdown="no"
_silent="no"
if grep -q silent /proc/cmdline; then
- if grep -q silent /proc/splash || [ "$splash_mode" = "splashy" ]; then
+ if [ "$splash_mode" = "splashy" ]; then
+ _silent="yes"
+ elif [ "$splash_mode" = "bootsplash" ] && grep -q silent /proc/splash; then
_silent="yes"
fi
fi