main/postmarketos-initramfs: wait for splash to exit before unlocking (MR 3952)

[ci:skip-build]: already built successfully in CI

main/postmarketos-initramfs/APKBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
 # Co-Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=postmarketos-initramfs
-pkgver=1.3.0
+pkgver=1.3.1
 pkgrel=0
 pkgdesc="Base files for the postmarketOS initramfs / initramfs-extra"
 url="https://postmarketos.org"
@@ -69,5 +69,5 @@ bed319179bcd0b894d6267c7e73f2890db07bc07df71542936947dfb3bdb17fade8a7b4e7b577f27
 3bc73f3a0d1de210444d9c45fab51fd4520e38b43ffbb76368f8ff854b990aa2f21c6356840c5a48eb9808e834eb885a6d581639a60707c26abf66fc20b70db9  00-initramfs-base.files
 e984cd3033ce8752ebc71127828b964b46259a5263c2ebfab32c1394b674bcff464862ff00b8e920d3d31386c54ca0b94f84bc77580d275ecfeea33e76c07ef4  00-initramfs-extra-base.files
 4e6f5b79b0bd6188bab9a96526f727780dda6be1c1e5fe04c3ce5a892bf0f92b7c7d0fc5809ac3eacc8121096a4815c6177a573f1b968752972f20460cc04ac6  init.sh
-d5570ce96f501d3a1cb39d803d81770abaa27b4692c455034a7d69e14ae226ee07f8bd61fdd0a738c8a10528e0a984c9e8ebe47427c4cb3a801097381d8adc36  init_functions.sh
+38416294fe58af8f687a85a3b20b285075cdb34da8aab6c96a778994ee3dd121d1bb29da71b8147b2a53f19b58eb3203f583ce261cbb05b4bd1987bc7c82b1d9  init_functions.sh
 "

main/postmarketos-initramfs/init_functions.sh

@@ -390,7 +390,7 @@ unlock_root_partition() {
 	partition="$(find_root_partition)"
 	if cryptsetup isLuks "$partition"; then
 		# Make sure the splash doesn't interfere
-		killall pbsplash 2>/dev/null
+		hide_splash
 		tried=0
 		until cryptsetup status root | grep -qwi active; do
 			fde-unlock "$partition" "$tried"
@@ -625,11 +625,7 @@ show_splash() {
 		return
 	fi
 
-	killall pbsplash 2>/dev/null
-
-	while pgrep pbsplash >/dev/null; do
-		sleep 0.01
-	done
+	hide_splash
 
 	# shellcheck disable=SC2154,SC2059
 	/usr/bin/pbsplash -s /usr/share/pbsplash/pmos-logo-text.svg \
@@ -637,6 +633,14 @@ show_splash() {
 		-m "$(printf "$1")" &
 }
 
+hide_splash() {
+	killall pbsplash 2>/dev/null
+
+	while pgrep pbsplash >/dev/null; do
+		sleep 0.01
+	done
+}
+
 set_framebuffer_mode() {
 	[ -e "/sys/class/graphics/fb0/modes" ] || return
 	[ -z "$(cat /sys/class/graphics/fb0/mode)" ] || return