From 4613aa82ef5443d1d774d7ae54d6bad6e0e3490f Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 1 Mar 2022 13:28:15 +0100
Subject: [slx-splash] Fix splash.ppm path

---
 modules.d/slx-splash/module-setup.sh            | 2 +-
 modules.d/slx-splash/scripts/slx-splash-exam.sh | 2 +-
 modules.d/slx-splash/scripts/slx-splash-init.sh | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules.d/slx-splash/module-setup.sh b/modules.d/slx-splash/module-setup.sh
index 9f2abaaa..58fd9561 100755
--- a/modules.d/slx-splash/module-setup.sh
+++ b/modules.d/slx-splash/module-setup.sh
@@ -10,7 +10,7 @@ depends() {
 install() {
 	mkdir -p "${initdir}/opt/openslx"
 	cp -r "${moddir}/data/icons" "${initdir}/opt/openslx"
-	cp "${moddir}/data/splash.ppm" "${initdir}/opt/openslx/splash.ppm"
+	cp "${moddir}/data/splash.ppm" "${initdir}/etc/splash.ppm"
 	cp "${moddir}/scripts/splashtool" "${initdir}/usr/local/bin/splashtool"
 
 	inst_hook pre-trigger 10 "${moddir}/scripts/slx-splash-init.sh"
diff --git a/modules.d/slx-splash/scripts/slx-splash-exam.sh b/modules.d/slx-splash/scripts/slx-splash-exam.sh
index a8235a83..9ee4513d 100644
--- a/modules.d/slx-splash/scripts/slx-splash-exam.sh
+++ b/modules.d/slx-splash/scripts/slx-splash-exam.sh
@@ -5,7 +5,7 @@ type warn &>/dev/null || . /lib/dracut-lib.sh
 . /etc/openslx
 
 if [ -n "$SLX_EXAM" ]; then
-	splashtool --tl "/opt/openslx/splash.ppm" &
+	splashtool --tl "/etc/splash.ppm" &
 fi
 
 :
diff --git a/modules.d/slx-splash/scripts/slx-splash-init.sh b/modules.d/slx-splash/scripts/slx-splash-init.sh
index a7f27331..1c00c4a7 100644
--- a/modules.d/slx-splash/scripts/slx-splash-init.sh
+++ b/modules.d/slx-splash/scripts/slx-splash-init.sh
@@ -30,7 +30,7 @@ if grep -wqE 'splash' /proc/cmdline; then
 	# disable cursor
 	echo -e "\033[?25l" > /dev/console
 	# finally:
-	if splashtool --center /opt/openslx/splash.ppm -b; then
+	if splashtool --center /etc/splash.ppm -b; then
 		splashtool --reset /opt/openslx/icons
 	else
 		# fbsplash failed, most likely due to missing /dev/fb0
-- 
cgit v1.2.3-55-g7522