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

2 files changed, 23 insertions, 2 deletions

diff --git a/remote/rootfs/rootfs-stage31/data/inc/setup_stage32 b/remote/rootfs/rootfs-stage31/data/inc/setup_stage32
index 57ad09e1..df8b71fc 100755
--- a/remote/rootfs/rootfs-stage31/data/inc/setup_stage32
+++ b/remote/rootfs/rootfs-stage31/data/inc/setup_stage32
@@ -47,6 +47,15 @@ FUTURE_ROOT="/mnt"
 cp /etc/hostname /etc/hosts /etc/resolv.conf   "${FUTURE_ROOT}/etc/"
 [ -s "/run/config" ] && cat "/run/config" >> "${FUTURE_ROOT}/opt/openslx/config"
 
+# if booting with splash, suppress kernel output in stage32
+if grep -q "splash" /proc/cmdline; then
+	if grep -q -E "^\ kernel.printk" "${FUTURE_ROOT}/usr/lib/sysctl.d/50-default.conf"; then
+		sed -i 's/^\ *kernel\.printk.*/kernel\.printk\ =\ 0\ 0\ 0\ 0/g' "${FUTURE_ROOT}/usr/lib/sysctl.d/50-default.conf"
+	else
+		echo "kernel.printk = 0 0 0 0" >> "${FUTURE_ROOT}/usr/lib/sysctl.d/50-default.conf"
+	fi
+fi
+
 # "Delete" addon hook-script in aufs view
 touch "/mnt/opt/openslx/uniontmp/.wh.addon-init"
 
diff --git a/remote/rootfs/rootfs-stage31/data/init b/remote/rootfs/rootfs-stage31/data/init
index fe521ddb..ae6ddbe5 100755
--- a/remote/rootfs/rootfs-stage31/data/init
+++ b/remote/rootfs/rootfs-stage31/data/init
@@ -42,9 +42,19 @@ setup_gfx () {
 		modprobe "$DRM" 2>/dev/null
 	done
 	# start some kind of splash screen if activated
+	if grep -q -o "splash" /proc/cmdline; then
+		setsid fbsplash -c -s /etc/bootsplash.ppm
+	fi
 }
 
-setup_gfx &
+if grep -q -o "splash" /proc/cmdline; then 
+	exec 3>&1 4>&2 > /dev/null 2>&1
+	echo "0 0 0 0" > /proc/sys/kernel/printk
+	setup_gfx
+else
+	setup_gfx &
+fi
+
 
 # discover devices
 mdev -s
@@ -70,7 +80,9 @@ for opts in ${KCL}; do
 done
 
 # suppress kernel output if DEBUG is not set
-[ $DEBUG -ge 1 ] && echo "0" > /proc/sys/kernel/printk || echo "4 4 1 7" >/proc/sys/kernel/printk
+if grep -q -o "splash" /proc/cmdline; then
+	[ $DEBUG -ge 1 ] && echo "0 0 0 0" > /proc/sys/kernel/printk || echo "4 4 1 7" >/proc/sys/kernel/printk
+fi
 
 [ $DEBUG -ge 4 ] && drop_shell "Requested Debug Shell: before network."