From 4b724c72574c2cb128e33849f41f875b00449692 Mon Sep 17 00:00:00 2001 From: vvb2060 Date: Tue, 13 Aug 2024 02:49:27 +0800 Subject: [PATCH] find_boot_image: test previous kernels (<=4.19) --- scripts/util_functions.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/util_functions.sh b/scripts/util_functions.sh index 0a3c19178..8a0441f85 100644 --- a/scripts/util_functions.sh +++ b/scripts/util_functions.sh @@ -371,9 +371,9 @@ find_boot_image() { BOOTIMAGE= if $RECOVERYMODE; then BOOTIMAGE=$(find_block "recovery$SLOT" "sos") - elif [ -e "/dev/block/by-name/init_boot$SLOT" ] && uname -r | grep -vq "android12-"; then + elif [ -e "/dev/block/by-name/init_boot$SLOT" ] && [ "$(uname -r | cut -d. -f1)" -ge 5 ] && uname -r | grep -vq "android12-"; then # 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. + # partition still uses Android 12 GKI or previous kernels, so we need to explicitly detect that scenario. BOOTIMAGE="/dev/block/by-name/init_boot$SLOT" elif [ -e "/dev/block/by-name/boot$SLOT" ]; then # Standard location since AOSP Android 10+