diff options
| author | Jonathan Bauer | 2020-07-31 17:41:08 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2020-07-31 17:41:08 +0200 |
| commit | 43183623f824de88932be1ace50a4b7544550826 (patch) | |
| tree | a370ae56291b58e4b9f0e68cc6069e228f5960d8 /core/rootfs | |
| parent | [vbox-src] Disable cloud gateway network bullshit (diff) | |
| download | mltk-43183623f824de88932be1ace50a4b7544550826.tar.gz mltk-43183623f824de88932be1ace50a4b7544550826.tar.xz mltk-43183623f824de88932be1ace50a4b7544550826.zip | |
[busybox] update to 1.32.0
TODO:
* fix rtcwake patch, currently not applied in module.build
* refine fbsplash.cfg sanity checks when determining sizes of
screen/image
Diffstat (limited to 'core/rootfs')
| -rwxr-xr-x | core/rootfs/rootfs-stage31/data/init | 43 |
1 files changed, 33 insertions, 10 deletions
diff --git a/core/rootfs/rootfs-stage31/data/init b/core/rootfs/rootfs-stage31/data/init index 54102c8c..8d5baa0b 100755 --- a/core/rootfs/rootfs-stage31/data/init +++ b/core/rootfs/rootfs-stage31/data/init @@ -101,13 +101,38 @@ if [ "$SPLASH" -eq 1 ]; then MUTED_OUTPUT=1 clear echo -e "\033[?25l" >&4 - if [ -e "/etc/splash.ppm.gz" ]; then - fbsplash -x -b -s "/etc/splash.ppm.gz" || MUTED_OUTPUT= - elif [ -e "/etc/splash.ppm" ]; then - fbsplash -x -b -s "/etc/splash.ppm" || MUTED_OUTPUT= + screen_size="$(fbset | awk '$1 = /geometry/ {print $2" "$3}')" + screen_width="${screen_size%% *}" + screen_height="${screen_size#* }" + fbsplash_cfg="/etc/fbsplash.cfg" + fbsplash_ppm="/etc/splash.ppm.gz" + if [ -s "$fbsplash_ppm" ]; then + ppm_size="$(zcat "$fbsplash_ppm" | sed -n 2p)" else - echo "Splash screen requested, but not found in initramfs..." >&4 - MUTED_OUTPUT= + fbsplash_ppm="/etc/splash.ppm" + if [ -s "$fbsplash_ppm" ]; then + ppm_size="$(sed -n 2p "$fbsplash_ppm")" + else + echo "Splash screen requested, but not found in initramfs..." >&4 + MUTED_OUTPUT= + fi + fi + ppm_width="${ppm_size%% *}" + ppm_height="${ppm_size#* }" + ppm_height="${ppm_height%% *}" # make sure nothing weird is trailing + img_top="$(( ( screen_width - ppm_width ) / 2 ))" + img_left="$(( ( screen_height - ppm_height ) / 2 ))" + # just checking if nothing too weird is set + if [ -n "$img_left" ] && [ -n "$img_top" ] \ + && [ "$img_left" -ge 0 ] && [ "$img_left" -lt 8096 ] \ + && [ "$img_top" -ge 0 ] && [ "$img_top" -lt 8096 ]; then + printf "IMG_TOP=%d\nIMG_LEFT=%d\n" \ + "$img_top" "$img_left" + > "$fbsplash_cfg" + fbsplash -b -i "$fbsplash_cfg" -s "$fbsplash_ppm" || MUTED_OUTPUT= + else + # otherwise just use top left and be done with it + fbsplash -b -s "$fbsplash_ppm" || MUTED_OUTPUT= fi if [ -z "$MUTED_OUTPUT" ]; then exec 1>&4 2>&5 @@ -169,10 +194,8 @@ fi # Exam mode if [ -n "$SLX_EXAM" ]; then # Visual: Move splash screen to upper left corner - if [ -e "/etc/splash.ppm.gz" ]; then - fbsplash -b -s "/etc/splash.ppm.gz" & - elif [ -e "/etc/splash.ppm" ]; then - fbsplash -b -s "/etc/splash.ppm" & + if [ -s "$fbsplash_ppm" ]; then + fbsplash -b -s "$fbsplash_ppm" & fi fi |