diff options
author | Frederic Crozat <fcrozat@mandriva.com> | 2009-04-21 16:19:37 +0000 |
---|---|---|
committer | Frederic Crozat <fcrozat@mandriva.com> | 2009-04-21 16:19:37 +0000 |
commit | 7f57b3c04242e3ecbabdaca89c08811dafea867b (patch) | |
tree | 00e5d8ff5747b9681e3f73a60ed686d5356d6ed0 | |
parent | 4b0e85db5019fef32ba42faaa97e408381883297 (diff) | |
download | bootsplash-7f57b3c04242e3ecbabdaca89c08811dafea867b.tar bootsplash-7f57b3c04242e3ecbabdaca89c08811dafea867b.tar.gz bootsplash-7f57b3c04242e3ecbabdaca89c08811dafea867b.tar.bz2 bootsplash-7f57b3c04242e3ecbabdaca89c08811dafea867b.tar.xz bootsplash-7f57b3c04242e3ecbabdaca89c08811dafea867b.zip |
- Fix chvt deadlock in speedboot mode (Mdv bug #49946)
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | scripts/splash.sh | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -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 } |