TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-12-24 18:17:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

scripts: add boot_patch unpack error catching

Browse Source 
- failure to unpack wasn't being caught so boot_patch would continue to build a new cpio out of nothing and attempt to repack it (identified in #4049)
This commit is contained in:
osm0sis 2021-03-21 19:56:29 -03:00 committed by John Wu
parent 93e1266ee7
commit 901d22cdfa
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/boot_patch.sh
View File

@ -86,6 +86,7 @@ ui_print "- Unpacking boot image"
./magiskboot unpack "$BOOTIMAGE" ./magiskboot unpack "$BOOTIMAGE"
case $? in case $? in
0 ) ;;
1 ) 1 )
abort "! Unsupported/Unknown image format" abort "! Unsupported/Unknown image format"
;; ;;
@ -93,6 +94,9 @@ case $? in
ui_print "- ChromeOS boot image detected" ui_print "- ChromeOS boot image detected"
CHROMEOS=true CHROMEOS=true
;; ;;
* )
abort "! Unable to unpack boot image"
;;
esac esac
[ -f recovery_dtbo ] && RECOVERYMODE=true [ -f recovery_dtbo ] && RECOVERYMODE=true
@ -191,7 +195,7 @@ fi
################# #################
ui_print "- Repacking boot image" ui_print "- Repacking boot image"
./magiskboot repack "$BOOTIMAGE" || abort "! Unable to repack boot image!" ./magiskboot repack "$BOOTIMAGE" || abort "! Unable to repack boot image"
# Sign chromeos boot # Sign chromeos boot
$CHROMEOS && sign_chromeos $CHROMEOS && sign_chromeos