commit d23f84a5f5f4e17f5924442c824b5744e46a5d44
author chromeos-ci-prod <chromeos-ci-prod@chromeos-bot.iam.gserviceaccount.com> Sat Jun 26 02:08:36 2021 -0700
committer chromeos-ci-prod <chromeos-ci-prod@chromeos-bot.iam.gserviceaccount.com> Sat Jun 26 02:08:36 2021 -0700
tree 37e70289f2ff1893583a45d09c80f1834223b621
parent a5a0da2efe15f65747b0b7267e9a0ad0ee8b2856
parent c87d918705ad2de493a2aa6215ba710cc25c2ae7

Resolve uprev conflict

Change-Id: Ib311c0a6651377f73f1d9a0d455746240e9c0070

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