fix plymouth theme path, fix stage3.1 vmware/uvesafb modprobing

9 files changed, 11 insertions, 8 deletions

diff --git a/remote/modules/plymouth/data/lib/plymouth/themes/default.plymouth b/remote/modules/plymouth/data/share/plymouth/themes/default.plymouth
index bc669108..8499e451 100644
--- a/remote/modules/plymouth/data/lib/plymouth/themes/default.plymouth
+++ b/remote/modules/plymouth/data/share/plymouth/themes/default.plymouth
@@ -4,5 +4,5 @@ Description=Uni-Freiburg simple blue-ish theme with simple progress bar
 ModuleName=script
 
 [script]
-ImageDir=/lib/plymouth/themes/unifr-rz
-ScriptFile=/lib/plymouth/themes/unifr-rz/unifr-rz.script
+ImageDir=/share/plymouth/themes/unifr-rz
+ScriptFile=/share/plymouth/themes/unifr-rz/unifr-rz.script
diff --git a/remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/rz_banner_trans.png b/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/rz_banner_trans.png
index 9cb68040..9cb68040 100644
--- a/remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/rz_banner_trans.png
+++ b/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/rz_banner_trans.png
diff --git a/remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/rz_logo_trans.png b/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/rz_logo_trans.png
index 16b069cc..16b069cc 100644
--- a/remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/rz_logo_trans.png
+++ b/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/rz_logo_trans.png
diff --git a/remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/unifr-rz.plymouth b/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/unifr-rz.plymouth
index 0f300f6b..0f300f6b 100644
--- a/remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/unifr-rz.plymouth
+++ b/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/unifr-rz.plymouth
diff --git a/remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/unifr-rz.script b/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/unifr-rz.script
index f2d8bd28..f2d8bd28 100644
--- a/remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/unifr-rz.script
+++ b/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/unifr-rz.script
diff --git a/remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/white_dot_small.png b/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/white_dot_small.png
index 4fd4be30..4fd4be30 100644
--- a/remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/white_dot_small.png
+++ b/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/white_dot_small.png
diff --git a/remote/rootfs/rootfs-stage31/data/init b/remote/rootfs/rootfs-stage31/data/init
index ef9c32a7..0f522ef9 100755
--- a/remote/rootfs/rootfs-stage31/data/init
+++ b/remote/rootfs/rootfs-stage31/data/init
@@ -12,7 +12,7 @@
 # First script for initial ramfs for OpenSLX linux stateless clients
 #############################################################################
 
-export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/openslx/bin:/openslx/sbin
+export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 export LD_LIBRARY_PATH=/usr/lib64
 
 mount -n -t tmpfs -o 'mode=755' run "/run"
@@ -49,9 +49,6 @@ 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
@@ -69,6 +66,7 @@ case $(cat /etc/hwinfo) in
 	        modprobe -q mga 2>/dev/null
 	        ;;
 	*VMWARE*)
+		modprobe -q uvesafb mode_option=1024x768-32 mtrr=3 scroll=ywrap 2>/dev/null
 		modprove -q vmwgfx 2>/dev/null
 		;;
 	*)
@@ -77,7 +75,7 @@ case $(cat /etc/hwinfo) in
 esac
 (modprobe -a drm; mdev -s ) &
 
-if [ "x$SPLASH" == "x1" ]; then
+if [ "x$SPLASH" == "x1" -a "x$DEBUG" != "x1" ]; then
 	# start plymouth
 	plymouthd && plymouth show-splash
 fi
@@ -163,6 +161,6 @@ for mnt in proc sys run ; do
 done
 
 unset BOOT_IMAGE initrd
-[ "x$SPLASH" = "x1" ] && plymouth update-root-fs --new-root-dir=/mnt
+[ "x$SPLASH" == "x1" -a "x$DEBUG" != "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
diff --git a/remote/rootfs/rootfs-stage31/rootfs-stage31.build b/remote/rootfs/rootfs-stage31/rootfs-stage31.build
index e5e45312..e660b0ff 100644
--- a/remote/rootfs/rootfs-stage31/rootfs-stage31.build
+++ b/remote/rootfs/rootfs-stage31/rootfs-stage31.build
@@ -23,6 +23,10 @@ post_copy() {
         copy_kernel_modules
         generate_modules_map_files
         copy_firmware
+
+	# copy busybox that has been under /openslx back to /
+	cp -r "${TARGET_BUILD_DIR}"/openslx/* "${TARGET_BUILD_DIR}"
+	#rm -rf "${TARGET_BUILD_DIR}/openslx"
 }
 
 #
diff --git a/remote/rootfs/rootfs-stage31/rootfs-stage31.conf b/remote/rootfs/rootfs-stage31/rootfs-stage31.conf
index ea9fd580..422f9b43 100644
--- a/remote/rootfs/rootfs-stage31/rootfs-stage31.conf
+++ b/remote/rootfs/rootfs-stage31/rootfs-stage31.conf
@@ -1,3 +1,4 @@
+REQUIRED_MODULES="		busybox"
 REQUIRED_BINARIES="		v86d"
 REQUIRED_KERNEL_MODULES="	kernel/drivers/video/sis/sisfb.ko
 				kernel/drivers/video/via/viafb.ko