Detect insufficient partition size

Close #388
This commit is contained in:
topjohnwu
2018-08-11 15:56:12 +08:00
parent 5c1886c8f5
commit a46c6252c6
6 changed files with 20 additions and 9 deletions

View File

@ -65,7 +65,7 @@ installation() {
. ./boot_patch.sh "$BOOTIMAGE"
ui_print "- Flashing new boot image"
flash_image new-boot.img "$BOOTIMAGE"
flash_image new-boot.img "$BOOTIMAGE" || abort "! Insufficient partition size"
rm -f new-boot.img
if [ -f stock_boot* ]; then

View File

@ -115,7 +115,7 @@ cd $MAGISKBIN
. ./boot_patch.sh "$BOOTIMAGE"
ui_print "- Flashing new boot image"
flash_image new-boot.img "$BOOTIMAGE"
flash_image new-boot.img "$BOOTIMAGE" || abort "! Insufficient partition size"
rm -f new-boot.img
if [ -f stock_boot* ]; then

View File

@ -114,7 +114,7 @@ case $? in
# Sign chromeos boot
$CHROMEOS && sign_chromeos
ui_print "- Flashing restored boot image"
flash_image new-boot.img $BOOTIMAGE
flash_image new-boot.img $BOOTIMAGE || abort "! Insufficient partition size"
fi
;;
2 ) # Other patched

View File

@ -203,11 +203,15 @@ flash_image() {
COM2="cat -"
fi
if [ -b "$2" ]; then
local s_size=`stat -c '%s' "$1"`
local t_size=`blockdev --getsize64 "$2"`
[ $s_size -gt $t_size ] && return 1
eval $COM1 | eval $COM2 | cat - /dev/zero > "$2" 2>/dev/null
else
ui_print "- Not block device, storing image"
eval $COM1 | eval $COM2 > "$2" 2>/dev/null
fi
return 0
}
find_dtbo_image() {