From 27dc13bccfd425a35ccd42fa340c38c3e2c7044e Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Wed, 23 Jul 2008 20:11:52 +0000
Subject: wrap with some bootsplash tests

---
 scripts/splash.sh | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/scripts/splash.sh b/scripts/splash.sh
index e8ef1f3..789a0e7 100644
--- a/scripts/splash.sh
+++ b/scripts/splash.sh
@@ -210,14 +210,18 @@ if [ "$progress" == 1 -o "$1" == "start" -o "$1" == "suspend" ]; then
 
     if test "$_shutdown" == "yes"; then 
 	gprintf "Shutting down the system..."
-	[[ -f /etc/bootsplash/themes/$theme/config/bootsplash-$res.cfg ]] && bootsplash_run -s -u 0 /etc/bootsplash/themes/$theme/config/bootsplash-$res.cfg
-	bootsplash_write "silent"
-	chvt 1
+	if [ "$splash_mode" = "bootsplash" ]; then
+	    [[ -f /etc/bootsplash/themes/$theme/config/bootsplash-$res.cfg ]] && bootsplash_run -s -u 0 /etc/bootsplash/themes/$theme/config/bootsplash-$res.cfg
+	    bootsplash_write "silent"
+	    chvt 1
+	fi
     elif [ "$1" == "suspend" ]; then
 	gprintf "Suspending the system..."
-	[[ -f /etc/bootsplash/themes/$theme/config/hibernate-$res.cfg ]] && bootsplash_run -s -u 0 /etc/bootsplash/themes/$theme/config/hibernate-$res.cfg
-	bootsplash_write "silent"
-	chvt 1
+	if [ "$splash_mode" = "bootsplash" ]; then
+	    [[ -f /etc/bootsplash/themes/$theme/config/hibernate-$res.cfg ]] && bootsplash_run -s -u 0 /etc/bootsplash/themes/$theme/config/hibernate-$res.cfg
+	    bootsplash_write "silent"
+	    chvt 1
+	fi
     else 
 	if [ "$font" != "default" -a "$progress" != "1" -a -d /usr/share/bootsplash -a "$_silent" == "yes" ]; then
 	    if [[ -f /etc/bootsplash/themes/$theme/config/bootsplash-$res.cfg ]]; then
-- 
cgit v1.2.1