Skip to content

fix(boot_patch): flash guard precedence allows flash on missing new-boot.img #1483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Zhanfg wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −6
Open

fix(boot_patch): flash guard precedence allows flash on missing new-boot.img #1483

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 19 additions & 6 deletions app/src/main/assets/boot_patch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,12 +97,25 @@ fi

if [ "$FLASH_TO_DEVICE" = "true" ]; then
# flash
if [ -b "$BOOTIMAGE" ] || [ -c "$BOOTIMAGE" ] && [ -f "new-boot.img" ]; then
echo "- Flashing new boot image"
flash_image new-boot.img "$BOOTIMAGE"
if [ $? -ne 0 ]; then
>&2 echo "- Flash error: $?"
exit $?
# Note: `[ -b X ] || [ -c X ] && [ -f Y ]` is parsed as
# `[ -b X ] || ( [ -c X ] && [ -f Y ] )`
# by every POSIX sh on Android (ash, mksh, toybox). When BOOTIMAGE
# was a block device the `[ -f "new-boot.img" ]` check was therefore
# never evaluated, and the script would attempt to flash even when
# the repack step had silently failed and new-boot.img was missing.
# The nested if makes both conditions required and produces a clear
# error when the output file is absent.
if [ -b "$BOOTIMAGE" ] || [ -c "$BOOTIMAGE" ]; then
if [ -f "new-boot.img" ]; then
echo "- Flashing new boot image"
flash_image new-boot.img "$BOOTIMAGE"
if [ $? -ne 0 ]; then
>&2 echo "- Flash error: $?"
exit $?
fi
else
>&2 echo "- new-boot.img missing - refusing to flash"
exit 1
fi
fi

Expand Down
Loading