plymouth for stage3.1

1 files changed, 17 insertions, 5 deletions

diff --git a/remote/core/data/init b/remote/core/data/init
index 54044938..25508e66 100755
--- a/remote/core/data/init
+++ b/remote/core/data/init
@@ -34,6 +34,8 @@ for opts in ${KCL}; do
 	case ${opts} in
 		debug*)
 			DEBUG=1;;
+		splash*)
+			SPLASH=1;;
 		ip=*)
 			# process IP info
 			ipinfo=${opts#ip=};;
@@ -47,13 +49,16 @@ done
 
 while ps | grep -v grep | grep -q "  hwinfo --gfxcard" ; do usleep 10 ; done
 
+# always load framebuffer
+modprobe uvesafb  mode_option=1024x768-32 mtrr=3 scroll=ywrap
+
 case $(cat /etc/hwinfo) in
 	*i915*)
 	 	modprobe -a i915 2>/dev/null
 		;;
        *intel*|*Intel*)
 	        modprobe -a i810 i830 i915 2>/dev/null
-        	;;
+		;;
        *nvidia*|*NVidia*|*nouveau*)
 	        modprobe -q nouveau 2>/dev/null
         	;;
@@ -63,13 +68,19 @@ case $(cat /etc/hwinfo) in
        *mga*|*matrox*|*Matrox*)
 	        modprobe -q mga 2>/dev/null
 	        ;;
-       *VMWARE*)
-                ;;
-       *)
+	*VMWARE*)
+		modprove -q vmwgfx 2>/dev/null
+		;;
+	*)
 	        modprobe -qa r128 savage sis tdfx ttm via viafb
         	;;
 esac
-( modprobe -a drm fbcon; mdev -s ) &
+(modprobe -a drm; mdev -s ) &
+
+if [ "x$SPLASH" == "x1" ]; then
+	# start plymouth
+	plymouthd && plymouth show-splash
+fi
 
 # load required network and usb controller drivers, filter out wireless adaptors
 while ps | grep -v grep | grep -q "  hwinfo --netcard" ; do usleep 10 ; done
@@ -149,5 +160,6 @@ for mnt in proc sys run ; do
 done
 
 unset BOOT_IMAGE initrd
+[ "x$SPLASH" = "x1" ] && plymouth update-root-fs --new-root-dir=/mnt
 # new style of pivoting (switch_root or run-init)
 exec /sbin/switch_root -c /dev/console /mnt /usr/lib/systemd/systemd