TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-12-12 10:46:07 +00:00
Code Issues Packages 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
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;
}
private void outputBoot(File patched) throws IOException {
private boolean outputBoot(File patched) throws IOException {
switch (mode) {
case PATCH_MODE:
String fmt = mm.prefs.getString(Const.Key.BOOT_FORMAT, ".img");
@@ -278,13 +278,14 @@ public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
break;
case SECOND_SLOT_MODE:
case DIRECT_MODE:
Shell.Job job = Shell.su(Utils.fmt("direct_install %s %s %s", patched, mBoot, installDir))
.to(console, logs);
if (!Shell.su(Utils.fmt("direct_install %s %s %s", patched, mBoot, installDir))
.to(console, logs).exec().isSuccess())
return false;
if (!Data.keepVerity)
job.add("find_dtbo_image", "patch_dtbo_image");
job.exec();
Shell.su("find_dtbo_image", "patch_dtbo_image").to(console, logs).exec();
break;
}
return true;
}
private void postOTA() {
@@ -374,7 +375,8 @@ public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
File patched = patchBoot();
if (patched == null)
return false;
outputBoot(patched);
if (!outputBoot(patched))
return false;
if (mode == SECOND_SLOT_MODE)
postOTA();
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
echo "- Flashing new boot image"
flash_image $1 $2
if [ $? -ne 0 ]; then
echo "! Insufficient partition size"
return 1
fi
rm -f $1
rm -rf $3
return 0
}
mm_patch_dtbo() {