main/postmarketos-initramfs: get to splash faster (MR 4204)
With full-fat mdev supporting by-partlabel lookups, there is a small delay during startup. As mdev and dynamic partitions aren't actually needed for the framebuffer device, move show_splash earlier. Furthermore, slightly rework setup_framebuffer to not dump the verbose message about waiting for the framebuffer unless the framebuffer isn't found. Signed-off-by: Caleb Connolly <caleb@connolly.tech>
This commit is contained in:
parent
97727c59cb
commit
9fb29079cd
2 changed files with 5 additions and 6 deletions
|
@ -18,10 +18,10 @@ setup_firmware_path
|
||||||
# shellcheck disable=SC2154
|
# shellcheck disable=SC2154
|
||||||
load_modules /lib/modules/initramfs.load "usb_f_rndis"
|
load_modules /lib/modules/initramfs.load "usb_f_rndis"
|
||||||
|
|
||||||
setup_mdev
|
|
||||||
setup_dynamic_partitions "${deviceinfo_super_partitions:=}"
|
|
||||||
setup_framebuffer
|
setup_framebuffer
|
||||||
show_splash "Loading..."
|
show_splash "Loading..."
|
||||||
|
setup_mdev
|
||||||
|
setup_dynamic_partitions "${deviceinfo_super_partitions:=}"
|
||||||
mount_subpartitions
|
mount_subpartitions
|
||||||
run_hooks /hooks
|
run_hooks /hooks
|
||||||
|
|
||||||
|
|
|
@ -703,15 +703,14 @@ setup_framebuffer() {
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Wait for /dev/fb0
|
# Wait for /dev/fb0
|
||||||
echo "NOTE: Waiting 10 seconds for the framebuffer /dev/fb0."
|
|
||||||
echo "If your device does not have a framebuffer, disable this with:"
|
|
||||||
echo "no_framebuffer=true in <https://postmarketos.org/deviceinfo>"
|
|
||||||
for _ in $(seq 1 100); do
|
for _ in $(seq 1 100); do
|
||||||
[ -e "/dev/fb0" ] && break
|
[ -e "/dev/fb0" ] && break
|
||||||
sleep 0.1
|
sleep 0.1
|
||||||
done
|
done
|
||||||
if ! [ -e "/dev/fb0" ]; then
|
if ! [ -e "/dev/fb0" ]; then
|
||||||
echo "ERROR: /dev/fb0 did not appear!"
|
echo "ERROR: /dev/fb0 did not appear after waiting 10 seconds!"
|
||||||
|
echo "If your device does not have a framebuffer, disable this with:"
|
||||||
|
echo "no_framebuffer=true in <https://postmarketos.org/deviceinfo>"
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue