[rootfs-stage31] unlink mount from busybox to avoid potential conflicts.

1 files changed, 8 insertions, 8 deletions

diff --git a/remote/rootfs/rootfs-stage31/data/init b/remote/rootfs/rootfs-stage31/data/init
index 005de611..0631d7c1 100755
--- a/remote/rootfs/rootfs-stage31/data/init
+++ b/remote/rootfs/rootfs-stage31/data/init
@@ -80,12 +80,12 @@ done
 [ $DEBUG -ge 3 ] && drop_shell "Requested Debug Shell: after network/before configuring."
 
 # start plymouth if activated
-#if [ $DEBUG -lt 1 ]; then
-#	echo "Starting plymouth..."
-#	# link the theming directory from the config to the current root
-#	ln -sf "${FUTURE_ROOT}/usr/share" /usr/share
-#	plymouthd --kernel-command-line="splash" && plymouth show-splash
-#fi
+if [ $DEBUG -lt 1 ]; then
+	echo "Starting plymouth..."
+    # link the theming directory from the config to the current root
+	ln -sf "${FUTURE_ROOT}/usr/share" /usr/share
+	plymouthd --kernel-command-line="splash" --tty=/dev/tty7 && plymouth show-splash
+fi
 
 [ $DEBUG -ge 2 ] && drop_shell "Requested Debug Shell: after configuration/before stage32."
 
@@ -94,7 +94,7 @@ done
 # copy files needed for stage3.2 to FUTURE_ROOT
 [ $DEBUG -ge 1 ] && echo "Copying busybox etc. to stage32..."
 tar -cp "/bin" "/sbin" "/usr/bin" "/usr/sbin" "/etc/functions.inc" | tar -xp -C "${FUTURE_ROOT}/opt/openslx/"
-#echo 'blacklist pcspkr' >> /mnt/etc/modprobe.d/blacklist.conf
+unlink "${FUTURE_ROOT}/opt/openslx/bin/mount"
 
 # set the SLX_ROOT_PASS if given in config
 if [ ! -z "$SLX_ROOT_PASS" ]; then
@@ -105,7 +105,7 @@ fi
 [ $DEBUG -ge 1 ] && drop_shell "Requested Debug Shell: before switch_root."
 
 # tell plymouth about the immediate rootfs switch
-#[ "x$SPLASH" == "x1" -a $DEBUG -lt 1 ] && plymouth update-root-fs --new-root-dir=/mnt
+[ $DEBUG -lt 1 ] && plymouth update-root-fs --new-root-dir=/mnt
 
 # unmount filesystems
 for mnt in proc sys run ; do