From ae706e5ade317dce97a0719d6f70bf8434d06104 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Thu, 22 Aug 2013 18:04:34 +0200
Subject: [rootfs-stage31] use '--kernel-command-line' option of plymouthd to
 give it the required 'splash' parameter. Makes 'splash' in the kcl of
 pxe-menus obsolete

---
 remote/rootfs/rootfs-stage31/data/init | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/remote/rootfs/rootfs-stage31/data/init b/remote/rootfs/rootfs-stage31/data/init
index 21c7a1bc..cc552137 100755
--- a/remote/rootfs/rootfs-stage31/data/init
+++ b/remote/rootfs/rootfs-stage31/data/init
@@ -84,7 +84,9 @@ done
 # start plymouth if activated
 if [ "x$SPLASH" == "x1" -a "$DEBUG" -lt 1 ]; then
 	echo "Starting plymouth..."
-	plymouthd && plymouth show-splash
+	# link the theming directory from the config to the current root
+	ln -sf /mnt/usr/share /usr/share
+	plymouthd --kernel-command-line="splash" && plymouth show-splash
 fi
 
 [ $DEBUG -ge 2 ] && drop_shell "Requested Debug Shell: after configuration/before stage32."
@@ -100,7 +102,7 @@ tar -cp "/bin" "/sbin" "/usr/bin" "/usr/sbin" "/etc/functions.inc" | tar -xp -C
 [ $DEBUG -ge 1 ] && drop_shell "Requested Debug Shell: before switch_root."
 
 # tell plymouth about the immediate rootfs switch
-[ "x$SPLASH" == "x1" -a "x$DEBUG" != "x1" ] && plymouth update-root-fs --new-root-dir=/mnt
+[ "x$SPLASH" == "x1" -a $DEBUG -lt 1 ] && plymouth update-root-fs --new-root-dir=/mnt
 
 # unmount filesystems
 for mnt in proc sys run ; do
-- 
cgit v1.2.3-55-g7522