From 7f57b3c04242e3ecbabdaca89c08811dafea867b Mon Sep 17 00:00:00 2001 From: Frederic Crozat Date: Tue, 21 Apr 2009 16:19:37 +0000 Subject: - Fix chvt deadlock in speedboot mode (Mdv bug #49946) --- Makefile | 2 +- scripts/splash.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index cb63219..fff052e 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ NAME=bootsplash -VERSION := 3.2.24 +VERSION := 3.2.25 SUBDIRS=scripts fb fbmngplay fbtruetype splash po FILES=$(SUBDIRS) Makefile ChangeLog README diff --git a/scripts/splash.sh b/scripts/splash.sh index ef8e5a1..0b34856 100644 --- a/scripts/splash.sh +++ b/scripts/splash.sh @@ -60,7 +60,7 @@ splashy_exit() { if [ "$splash_mode" = "splashy" ]; then splashy_is_running && /sbin/splashy_update exit 2>/dev/null clear >/dev/tty8 - [ "$runlevel" != "5" ] && chvt 1 + [ "$runlevel" != "5" ] && [ "x$SPEEDBOOT" != "xyes" ] && chvt 1 fi } -- cgit v1.2.1