From 917baa7b28a0d34d0868ce15baba5a73ff8f3cec Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Sat, 5 Jul 2014 17:25:01 +0200
Subject: Fix new splash screen...

---
 remote/rootfs/rootfs-stage31/data/inc/parse_kcl | 2 +-
 remote/rootfs/rootfs-stage31/data/init          | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/remote/rootfs/rootfs-stage31/data/inc/parse_kcl b/remote/rootfs/rootfs-stage31/data/inc/parse_kcl
index 485e5f87..13f9c467 100644
--- a/remote/rootfs/rootfs-stage31/data/inc/parse_kcl
+++ b/remote/rootfs/rootfs-stage31/data/inc/parse_kcl
@@ -38,7 +38,7 @@ for opts in ${KCL}; do
 		slxbase=*)
 			SLX_BASE_PATH=${opts#slxbase=} ;;
 		splash)
-			[ -e "/etc/splash.ppm" ] && SPLASH=1 ;;
+			SPLASH=1 ;;
 		nvidia)
 			GFX=nvidia ;;
 		ati|amd)
diff --git a/remote/rootfs/rootfs-stage31/data/init b/remote/rootfs/rootfs-stage31/data/init
index 91ae5d43..f6a99cf6 100755
--- a/remote/rootfs/rootfs-stage31/data/init
+++ b/remote/rootfs/rootfs-stage31/data/init
@@ -54,9 +54,12 @@ if [ "$SPLASH" -eq 1 ]; then
 		clear
 		if [ -e "/etc/splash.ppm.gz" ]; then
 			fbsplash -x -b -c -s "/etc/splash.ppm.gz" &
-		else
+		elif [ -e "/etc/splash.ppm" ]; then
 			fbsplash -x -b -c -s "/etc/splash.ppm" &
+		else
+			echo "Splash screen requested, but not found in initramfs..." >&4
 		fi
+		echo -e "\033[?25l"
 	fi
 else
 	setup_gfx
-- 
cgit v1.2.3-55-g7522