Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts

2 files changed, 6 insertions, 4 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
diff --git a/server/modules/plymouth-freiburg/usr/share/plymouth/themes/default.plymouth b/server/modules/plymouth-freiburg/usr/share/plymouth/themes/default.plymouth
index 1f4c10fa..dfbe0dab 100644
--- a/server/modules/plymouth-freiburg/usr/share/plymouth/themes/default.plymouth
+++ b/server/modules/plymouth-freiburg/usr/share/plymouth/themes/default.plymouth
@@ -1,6 +1,6 @@
 [Plymouth Theme]
-Name=Uni-Freiburg Basic Theme
-Description=Uni-Freiburg simple blue-ish theme with simple progress bar
+Name=Uni-Freiburg theme for the Rechenzentrum
+Description=Moving dot theme with gradient blue background
 ModuleName=script
 
 [script]