Resolve uprev conflict Change-Id: Ib311c0a6651377f73f1d9a0d455746240e9c0070
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