commit a5a0da2efe15f65747b0b7267e9a0ad0ee8b2856
author Daniel Campello <campello@chromium.org> Fri Jun 25 15:33:36 2021 -0600
committer Commit Bot <commit-bot@chromium.org> Sat Jun 26 09:02:07 2021 +0000
tree ef431f21a86e1c110e2f43fc00140fb0e6c6eab2
parent b9eb606fa9ce3ab96813721d40a186b43d9af038

sys-apps/fwupd: Fix fwupd-at-boot.sh for multiple pending updates

This changes fixes the fwupd-at-boot.sh script to prevent the system
hanging during boot on the updating firmware splash screen when multiple
firmware updates are pending.

BUG=b:192101144
TEST=reboot with multiple files in /var/lib/fwupd/pending

Change-Id: Ia00083665f1d69cdaf379a0d1d2820fd10ca6364
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/chromiumos-overlay/+/2989317
Tested-by: Daniel Campello <campello@chromium.org>
Auto-Submit: Daniel Campello <campello@chromium.org>
Reviewed-by: Benson Leung <bleung@google.com>
Commit-Queue: Daniel Campello <campello@chromium.org>

sys-apps/fwupd/files/fwupd-at-boot.sh

diff --git a/sys-apps/fwupd/files/fwupd-at-boot.sh b/sys-apps/fwupd/files/fwupd-at-boot.sh
index 3b803e6..07b5e89 100755
--- a/sys-apps/fwupd/files/fwupd-at-boot.sh
+++ b/sys-apps/fwupd/files/fwupd-at-boot.sh
@@ -17,17 +17,16 @@
   fi
 
   local pending
-  pending="$(find /var/lib/fwupd/pending -type f -size -100c 2>/dev/null)"
+  read -ra pending < \
+    <(find /var/lib/fwupd/pending -type f -size -100c 2>/dev/null | xargs)
   if [ -z "${pending[*]}" ]; then
 	return "${ret}"
   fi
 
-  # Background process that shows boot alert.
-  chromeos-boot-alert update_fwupd_firmware &
-  local bg_pid=$!
+  # Show boot alert.
+  chromeos-boot-alert update_fwupd_firmware
 
   local i
-
   # Give it time for enumeration to detect devices.
   for i in "${pending[@]}"; do
     local seconds=0