MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Detect insufficient partition size

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/full/java/com/topjohnwu/magisk/asyncs/InstallMagisk.java
View File

@ -248,7 +248,7 @@ public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
return patched; return patched;
} }
private void outputBoot(File patched) throws IOException { private boolean outputBoot(File patched) throws IOException {
switch (mode) { switch (mode) {
case PATCH_MODE: case PATCH_MODE:
String fmt = mm.prefs.getString(Const.Key.BOOT_FORMAT, ".img"); String fmt = mm.prefs.getString(Const.Key.BOOT_FORMAT, ".img");
@ -278,13 +278,14 @@ public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
break; break;
case SECOND_SLOT_MODE: case SECOND_SLOT_MODE:
case DIRECT_MODE: case DIRECT_MODE:
Shell.Job job = Shell.su(Utils.fmt("direct_install %s %s %s", patched, mBoot, installDir)) if (!Shell.su(Utils.fmt("direct_install %s %s %s", patched, mBoot, installDir))
.to(console, logs); .to(console, logs).exec().isSuccess())
return false;
if (!Data.keepVerity) if (!Data.keepVerity)
job.add("find_dtbo_image", "patch_dtbo_image"); Shell.su("find_dtbo_image", "patch_dtbo_image").to(console, logs).exec();
job.exec();
break; break;
} }
return true;
} }
private void postOTA() { private void postOTA() {
@ -374,7 +375,8 @@ public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
File patched = patchBoot(); File patched = patchBoot();
if (patched == null) if (patched == null)
return false; return false;
outputBoot(patched); if (!outputBoot(patched))
return false;
if (mode == SECOND_SLOT_MODE) if (mode == SECOND_SLOT_MODE)
postOTA(); postOTA();
console.add("- All done!"); console.add("- All done!");

5
app/src/full/res/raw/utils.sh
View File

@ -60,8 +60,13 @@ direct_install() {
cp -rf $3/* /data/adb/magisk cp -rf $3/* /data/adb/magisk
echo "- Flashing new boot image" echo "- Flashing new boot image"
flash_image $1 $2 flash_image $1 $2
if [ $? -ne 0 ]; then
echo "! Insufficient partition size"
return 1
fi
rm -f $1 rm -f $1
rm -rf $3 rm -rf $3
return 0
} }
mm_patch_dtbo() { mm_patch_dtbo() {

2
scripts/addon.d.sh
View File

@ -65,7 +65,7 @@ installation() {
. ./boot_patch.sh "$BOOTIMAGE" . ./boot_patch.sh "$BOOTIMAGE"
ui_print "- Flashing new boot image" 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 rm -f new-boot.img
if [ -f stock_boot* ]; then if [ -f stock_boot* ]; then

2
scripts/flash_script.sh
View File

@ -115,7 +115,7 @@ cd $MAGISKBIN
. ./boot_patch.sh "$BOOTIMAGE" . ./boot_patch.sh "$BOOTIMAGE"
ui_print "- Flashing new boot image" 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 rm -f new-boot.img
if [ -f stock_boot* ]; then if [ -f stock_boot* ]; then

2
scripts/magisk_uninstaller.sh
View File

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

4
scripts/util_functions.sh
View File

@ -203,11 +203,15 @@ flash_image() {
COM2="cat -" COM2="cat -"
fi fi
if [ -b "$2" ]; then 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 eval $COM1 | eval $COM2 | cat - /dev/zero > "$2" 2>/dev/null
else else
ui_print "- Not block device, storing image" ui_print "- Not block device, storing image"
eval $COM1 | eval $COM2 > "$2" 2>/dev/null eval $COM1 | eval $COM2 > "$2" 2>/dev/null
fi fi
return 0
} }
find_dtbo_image() { find_dtbo_image() {