aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-07-23 20:11:52 +0000
committerOlivier Blin <oblin@mandriva.com>2008-07-23 20:11:52 +0000
commit27dc13bccfd425a35ccd42fa340c38c3e2c7044e (patch)
tree2b3b0a9137193914256fb6cb01e9fc92b5e22ac4
parent6bc66a5589849567e0a1318cbec7f8e03ed9d3f2 (diff)
downloadbootsplash-27dc13bccfd425a35ccd42fa340c38c3e2c7044e.tar
bootsplash-27dc13bccfd425a35ccd42fa340c38c3e2c7044e.tar.gz
bootsplash-27dc13bccfd425a35ccd42fa340c38c3e2c7044e.tar.bz2
bootsplash-27dc13bccfd425a35ccd42fa340c38c3e2c7044e.tar.xz
bootsplash-27dc13bccfd425a35ccd42fa340c38c3e2c7044e.zip
wrap with some bootsplash tests
-rw-r--r--scripts/splash.sh16
1 files 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