From d53f3251f1335f35315e9514bb2a438f9a779b4b Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Mon, 18 Mar 2013 16:37:12 +0100 Subject: fix plymouth theme path, fix stage3.1 vmware/uvesafb modprobing --- .../data/lib/plymouth/themes/default.plymouth | 8 -- .../plymouth/themes/unifr-rz/rz_banner_trans.png | Bin 15730 -> 0 bytes .../lib/plymouth/themes/unifr-rz/rz_logo_trans.png | Bin 4309 -> 0 bytes .../lib/plymouth/themes/unifr-rz/unifr-rz.plymouth | 9 -- .../lib/plymouth/themes/unifr-rz/unifr-rz.script | 116 --------------------- .../plymouth/themes/unifr-rz/white_dot_small.png | Bin 376 -> 0 bytes .../data/share/plymouth/themes/default.plymouth | 8 ++ .../plymouth/themes/unifr-rz/rz_banner_trans.png | Bin 0 -> 15730 bytes .../plymouth/themes/unifr-rz/rz_logo_trans.png | Bin 0 -> 4309 bytes .../plymouth/themes/unifr-rz/unifr-rz.plymouth | 9 ++ .../share/plymouth/themes/unifr-rz/unifr-rz.script | 116 +++++++++++++++++++++ .../plymouth/themes/unifr-rz/white_dot_small.png | Bin 0 -> 376 bytes remote/rootfs/rootfs-stage31/data/init | 10 +- remote/rootfs/rootfs-stage31/rootfs-stage31.build | 4 + remote/rootfs/rootfs-stage31/rootfs-stage31.conf | 1 + 15 files changed, 142 insertions(+), 139 deletions(-) delete mode 100644 remote/modules/plymouth/data/lib/plymouth/themes/default.plymouth delete mode 100644 remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/rz_banner_trans.png delete mode 100644 remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/rz_logo_trans.png delete mode 100644 remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/unifr-rz.plymouth delete mode 100644 remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/unifr-rz.script delete mode 100644 remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/white_dot_small.png create mode 100644 remote/modules/plymouth/data/share/plymouth/themes/default.plymouth create mode 100644 remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/rz_banner_trans.png create mode 100644 remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/rz_logo_trans.png create mode 100644 remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/unifr-rz.plymouth create mode 100644 remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/unifr-rz.script create mode 100644 remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/white_dot_small.png diff --git a/remote/modules/plymouth/data/lib/plymouth/themes/default.plymouth b/remote/modules/plymouth/data/lib/plymouth/themes/default.plymouth deleted file mode 100644 index bc669108..00000000 --- a/remote/modules/plymouth/data/lib/plymouth/themes/default.plymouth +++ /dev/null @@ -1,8 +0,0 @@ -[Plymouth Theme] -Name=Uni-Freiburg Basic Theme -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 diff --git a/remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/rz_banner_trans.png b/remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/rz_banner_trans.png deleted file mode 100644 index 9cb68040..00000000 Binary files a/remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/rz_banner_trans.png and /dev/null differ diff --git a/remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/rz_logo_trans.png b/remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/rz_logo_trans.png deleted file mode 100644 index 16b069cc..00000000 Binary files a/remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/rz_logo_trans.png and /dev/null differ diff --git a/remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/unifr-rz.plymouth b/remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/unifr-rz.plymouth deleted file mode 100644 index 0f300f6b..00000000 --- a/remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/unifr-rz.plymouth +++ /dev/null @@ -1,9 +0,0 @@ -[Plymouth Theme] -Name=Simple RZ Theme -Description=Simple blue RZ theme with progress bar. -ModuleName=script - -[script] -ImageDir=/lib/plymouth/themes/unifr-rz -ScriptFile=/lib/plymouth/themes/unifr-rz/unifr-rz.script - diff --git a/remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/unifr-rz.script b/remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/unifr-rz.script deleted file mode 100644 index f2d8bd28..00000000 --- a/remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/unifr-rz.script +++ /dev/null @@ -1,116 +0,0 @@ -Window.SetBackgroundTopColor(0.00, 0.21, 0.57); -#Window.SetBackgroundBottomColor(0.00, 0.17, 0.95); - -title_left_image = Image("rz_banner_trans.png"); -title_right_image = Image("rz_logo_trans.png"); -title_left_sprite = Sprite(title_left_image); -title_right_sprite = Sprite(title_right_image); - -title_right_sprite.SetX(Window.GetWidth() - title_right_image.GetWidth()); - -dot.image = Image("white_dot_small.png"); -dot.sprite1 = Sprite(dot.image); -dot.sprite2 = Sprite(dot.image); -dot.sprite3 = Sprite(dot.image); -dot.sprite4 = Sprite(dot.image); -dot.sprite5 = Sprite(dot.image); - -#----------------------------------------- Progress Dots -------------------------------- - -dot.x = Window.GetWidth() / 2 - dot.image.GetWidth() / 2; -dot.y = Window.GetHeight() * 0.75 - dot.image.GetHeight() / 2; -dot.spacing = Window.GetWidth() / 15; - -# place 5 centered dots -dot.sprite1.SetPosition(dot.x - 2 * dot.spacing, dot.y, 1); -dot.sprite2.SetPosition(dot.x - dot.spacing, dot.y, 1); -dot.sprite3.SetPosition(dot.x, dot.y, 1); -dot.sprite4.SetPosition(dot.x + dot.spacing, dot.y, 1); -dot.sprite5.SetPosition(dot.x + 2 * dot.spacing, dot.y, 1); - -# set opacity -dot.sprite1.SetOpacity(0.1); -dot.sprite2.SetOpacity(0.1); -dot.sprite3.SetOpacity(0.1); -dot.sprite4.SetOpacity(0.1); -dot.sprite5.SetOpacity(0.1); - -fun progress_callback (duration, progress) - { - phase = Math.Int(duration * 2) % 10; - - if ( phase == 1 ) - { - fade_out(dot.sprite5); - fade_in(dot.sprite1); - } - - if ( phase == 2 ) - { - fade_out(dot.sprite1); - fade_in(dot.sprite2); - } - - if ( phase == 3 ) - { - fade_out(dot.sprite2); - fade_in(dot.sprite3); - } - - if ( phase == 4 ) - { - fade_out(dot.sprite3); - fade_in(dot.sprite4); - } - - if ( phase == 5 ) - { - fade_out(dot.sprite4); - fade_in(dot.sprite5); - } - - if ( phase == 6 ) - { - fade_out(dot.sprite5); - fade_in(dot.sprite1); - } - - if ( phase == 7 ) - { - fade_out(dot.sprite1); - fade_in(dot.sprite2); - } - - if ( phase == 8 ) - { - fade_out(dot.sprite2); - fade_in(dot.sprite3); - } - - if ( phase == 9 ) - { - fade_out(dot.sprite3); - fade_in(dot.sprite4); - } - - if ( phase == 0 ) - { - fade_out(dot.sprite4); - if ( Math.Int(duration) > 0 ) - { fade_in(dot.sprite5); } - } - } - -fun fade_in(sprite) -{ - if ( sprite.GetOpacity() + 0.1 < 1 ) - { sprite.SetOpacity(sprite.GetOpacity() + 0.1);} -} - -fun fade_out(sprite) -{ - if ( sprite.GetOpacity() - 0.1 > 0.1 ) - { sprite.SetOpacity(sprite.GetOpacity() - 0.1);} -} - -Plymouth.SetBootProgressFunction(progress_callback); diff --git a/remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/white_dot_small.png b/remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/white_dot_small.png deleted file mode 100644 index 4fd4be30..00000000 Binary files a/remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/white_dot_small.png and /dev/null differ diff --git a/remote/modules/plymouth/data/share/plymouth/themes/default.plymouth b/remote/modules/plymouth/data/share/plymouth/themes/default.plymouth new file mode 100644 index 00000000..8499e451 --- /dev/null +++ b/remote/modules/plymouth/data/share/plymouth/themes/default.plymouth @@ -0,0 +1,8 @@ +[Plymouth Theme] +Name=Uni-Freiburg Basic Theme +Description=Uni-Freiburg simple blue-ish theme with simple progress bar +ModuleName=script + +[script] +ImageDir=/share/plymouth/themes/unifr-rz +ScriptFile=/share/plymouth/themes/unifr-rz/unifr-rz.script diff --git a/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/rz_banner_trans.png b/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/rz_banner_trans.png new file mode 100644 index 00000000..9cb68040 Binary files /dev/null and b/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/rz_banner_trans.png differ diff --git a/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/rz_logo_trans.png b/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/rz_logo_trans.png new file mode 100644 index 00000000..16b069cc Binary files /dev/null and b/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/rz_logo_trans.png differ diff --git a/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/unifr-rz.plymouth b/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/unifr-rz.plymouth new file mode 100644 index 00000000..0f300f6b --- /dev/null +++ b/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/unifr-rz.plymouth @@ -0,0 +1,9 @@ +[Plymouth Theme] +Name=Simple RZ Theme +Description=Simple blue RZ theme with progress bar. +ModuleName=script + +[script] +ImageDir=/lib/plymouth/themes/unifr-rz +ScriptFile=/lib/plymouth/themes/unifr-rz/unifr-rz.script + diff --git a/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/unifr-rz.script b/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/unifr-rz.script new file mode 100644 index 00000000..f2d8bd28 --- /dev/null +++ b/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/unifr-rz.script @@ -0,0 +1,116 @@ +Window.SetBackgroundTopColor(0.00, 0.21, 0.57); +#Window.SetBackgroundBottomColor(0.00, 0.17, 0.95); + +title_left_image = Image("rz_banner_trans.png"); +title_right_image = Image("rz_logo_trans.png"); +title_left_sprite = Sprite(title_left_image); +title_right_sprite = Sprite(title_right_image); + +title_right_sprite.SetX(Window.GetWidth() - title_right_image.GetWidth()); + +dot.image = Image("white_dot_small.png"); +dot.sprite1 = Sprite(dot.image); +dot.sprite2 = Sprite(dot.image); +dot.sprite3 = Sprite(dot.image); +dot.sprite4 = Sprite(dot.image); +dot.sprite5 = Sprite(dot.image); + +#----------------------------------------- Progress Dots -------------------------------- + +dot.x = Window.GetWidth() / 2 - dot.image.GetWidth() / 2; +dot.y = Window.GetHeight() * 0.75 - dot.image.GetHeight() / 2; +dot.spacing = Window.GetWidth() / 15; + +# place 5 centered dots +dot.sprite1.SetPosition(dot.x - 2 * dot.spacing, dot.y, 1); +dot.sprite2.SetPosition(dot.x - dot.spacing, dot.y, 1); +dot.sprite3.SetPosition(dot.x, dot.y, 1); +dot.sprite4.SetPosition(dot.x + dot.spacing, dot.y, 1); +dot.sprite5.SetPosition(dot.x + 2 * dot.spacing, dot.y, 1); + +# set opacity +dot.sprite1.SetOpacity(0.1); +dot.sprite2.SetOpacity(0.1); +dot.sprite3.SetOpacity(0.1); +dot.sprite4.SetOpacity(0.1); +dot.sprite5.SetOpacity(0.1); + +fun progress_callback (duration, progress) + { + phase = Math.Int(duration * 2) % 10; + + if ( phase == 1 ) + { + fade_out(dot.sprite5); + fade_in(dot.sprite1); + } + + if ( phase == 2 ) + { + fade_out(dot.sprite1); + fade_in(dot.sprite2); + } + + if ( phase == 3 ) + { + fade_out(dot.sprite2); + fade_in(dot.sprite3); + } + + if ( phase == 4 ) + { + fade_out(dot.sprite3); + fade_in(dot.sprite4); + } + + if ( phase == 5 ) + { + fade_out(dot.sprite4); + fade_in(dot.sprite5); + } + + if ( phase == 6 ) + { + fade_out(dot.sprite5); + fade_in(dot.sprite1); + } + + if ( phase == 7 ) + { + fade_out(dot.sprite1); + fade_in(dot.sprite2); + } + + if ( phase == 8 ) + { + fade_out(dot.sprite2); + fade_in(dot.sprite3); + } + + if ( phase == 9 ) + { + fade_out(dot.sprite3); + fade_in(dot.sprite4); + } + + if ( phase == 0 ) + { + fade_out(dot.sprite4); + if ( Math.Int(duration) > 0 ) + { fade_in(dot.sprite5); } + } + } + +fun fade_in(sprite) +{ + if ( sprite.GetOpacity() + 0.1 < 1 ) + { sprite.SetOpacity(sprite.GetOpacity() + 0.1);} +} + +fun fade_out(sprite) +{ + if ( sprite.GetOpacity() - 0.1 > 0.1 ) + { sprite.SetOpacity(sprite.GetOpacity() - 0.1);} +} + +Plymouth.SetBootProgressFunction(progress_callback); diff --git a/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/white_dot_small.png b/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/white_dot_small.png new file mode 100644 index 00000000..4fd4be30 Binary files /dev/null and b/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/white_dot_small.png differ 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 -- cgit v1.2.3-55-g7522