Fix find_boot_image

Close #8255
This commit is contained in:
topjohnwu 2024-08-05 11:24:30 -07:00
parent 9ce998a6df
commit 09131aca89

View File

@ -370,14 +370,20 @@ get_flags() {
find_boot_image() { find_boot_image() {
BOOTIMAGE= BOOTIMAGE=
if $RECOVERYMODE; then if $RECOVERYMODE; then
BOOTIMAGE=$(find_block "recovery_ramdisk$SLOT" "recovery$SLOT" "sos") BOOTIMAGE=$(find_block "recovery$SLOT" "sos")
elif [ ! -z $SLOT ]; then elif [ -L "/dev/block/by-name/init_boot$SLOT" ] && uname -r | grep -vq "android12-"; then
BOOTIMAGE=$(find_block "ramdisk$SLOT" "recovery_ramdisk$SLOT" "init_boot$SLOT" "boot$SLOT") # init_boot is only used with GKI 13+. It is possible that some devices with init_boot
# partition still uses Android 12 GKI, so we need to explicitly detect that scenario.
BOOTIMAGE=$(readlink -f "/dev/block/by-name/init_boot$SLOT")
elif [ -L "/dev/block/by-name/boot$SLOT" ]
# Standard location since AOSP Android 10+
BOOTIMAGE=$(readlink -f "/dev/block/by-name/boot$SLOT")
elif [ -n "$SLOT" ]; then
# Fallback for A/B devices running < Android 10
BOOTIMAGE=$(find_block "ramdisk$SLOT" "boot$SLOT")
else else
BOOTIMAGE=$(find_block ramdisk recovery_ramdisk kern-a android_boot kernel bootimg init_boot boot lnx boot_a) # Fallback for all legacy and non-standard devices
fi BOOTIMAGE=$(find_block ramdisk kern-a android_boot kernel bootimg boot lnx boot_a)
if [ "$BOOTIMAGE" = "init_boot$SLOT" ]; then
uname -r | grep -q "android12-" && BOOTIMAGE="boot$SLOT"
fi fi
if [ -z $BOOTIMAGE ]; then if [ -z $BOOTIMAGE ]; then
# Lets see what fstabs tells me # Lets see what fstabs tells me