add patch boot image

Author: Takeda-senpai

README.md

@@ -1,7 +1,5 @@
 # Magisk BootloopSaver
 
-> WARNING: Most of bootloop can be prevented but not completely. The script can be killed by other process, another module or broken Magisk. 
-
 ## About
 Protect your system from bootloop caused by Magisk modules. In case the data partition is encrypted and you cannot access `/data/adb/modules`, or you don't want to turn off **force encryption** to protect your private data.
 
@@ -19,7 +17,7 @@ Usually, bootloop occurs because zygote doesn't start properly or stuck at resta
 ### Disable from Custom Recovery
 
 
-You can boot into **TWRP** and create a dummy file named `disable_magisk` in one of these location to tell the script disable all modules and reboot your device (if **Auto detect** is not working):
+You can boot into **TWRP** and create a dummy file named `disable_magisk` in one of these location and then reboot to system to boot into Safe Mode (if **Auto detect** is not working):
 - /cache
 - /data/unencrypted
 - /metadata

changelog.md

@@ -1,2 +1,2 @@
-### v1.5
-- Fix incorrect detection in case there are multiple zygote proccesses
+### v1.6
+- Add patch into boot image that allows you to trigger Safe Mode by using Custom Recovery

customize.sh

@@ -1,4 +1,45 @@
-ui_print "- Set up module..."
-unzip -o "$ZIPFILE" "saver.exec" -d "$MODPATH" &>/dev/null
-chmod 750 "$MODPATH/saver.exec"
+MAGISKTMP="$(magisk --path)"
+get_flags
+find_boot_image
+( if [ ! -z "$BOOTIMAGE" ]; then
+    ui_print "- Target boot image: $BOOTIMAGE"
+    mkdir "$TMPDIR/boot"
+    dd if=$BOOTIMAGE of="$TMPDIR/boot/boot.img"
+    ui_print "- Unpack boot image"
+    cd "$TMPDIR/boot" || exit 1
+    /data/adb/magisk/magiskboot unpack boot.img
+    ui_print "- Add bootloop protector script"
+    cat <<EOF > safemode.rc
+# safe mode trigger
+on post-fs
+    exec u:r:magisk:s0 root root -- /system/bin/sh \${MAGISKTMP}/safemode.sh
+
+EOF
+    cat <<EOF >safemode.sh
+for dir in /cache /data/unencrypted /metadata /persist /mnt/vendor/persist; do
+if [ -f "\$dir/disable_magisk" ]; then
+    DISABLE=true
+    rm -rf "\$dir/disable_magisk"
+fi
+done
+
+[ "\$DISABLE" == "true" ] && setprop persist.sys.safemode 1
+EOF
+     /data/adb/magisk/magiskboot cpio ramdisk.cpio \
+"mkdir 0750 overlay.d" \
+"mkdir 0750 overlay.d/sbin" \
+"rm overlay.d/safemode.rc" \
+"rm overlay.d/sbin/safemode.sh" \
+"add 0750 overlay.d/safemode.rc safemode.rc" \
+"add 0750 overlay.d/sbin/safemode.sh safemode.sh"
+     ui_print "- Repack boot image"
+     /data/adb/magisk/magiskboot repack boot.img
+     ui_print "- Flashing new boot image"
+     dd of=$BOOTIMAGE if="$TMPDIR/boot/new-boot.img"
+else
+     ui_print "! Cannot detect target boot image"
+fi )
+
+
+
 ui_print "- Module log is /cache/bootloop_saver.log"

module.json

@@ -1,6 +1,6 @@
 {
-  "versionCode": 10007,
-  "version": "v1.5",
-  "zipUrl": "https://github.com/Magisk-Modules-Alt-Repo/HuskyDG_BootloopSaver/releases/download/v1.5/bootloop_protector.zip",
-  "changelog": "https://raw.githubusercontent.com/Magisk-Modules-Alt-Repo/HuskyDG_BootloopSaver/v1.5/changelog.md"
+  "versionCode": 10008,
+  "version": "v1.6",
+  "zipUrl": "https://github.com/Magisk-Modules-Alt-Repo/HuskyDG_BootloopSaver/releases/download/v1.6/bootloop_protector.zip",
+  "changelog": "https://raw.githubusercontent.com/Magisk-Modules-Alt-Repo/HuskyDG_BootloopSaver/v1.6/changelog.md"
  }

module.prop

@@ -1,7 +1,7 @@
 id=huskydg_bootloopsaver
 name=Magisk Bootloop Protector
-version=v1.5
-versionCode=10007
+version=v1.6
+versionCode=10008
 author=HuskyDG
 description=Protect your system from bootloop caused by Magisk modules by turning off all your modules and restart your system if bootloop is detected.
 updateJson=https://raw.githubusercontent.com/Magisk-Modules-Alt-Repo/HuskyDG_BootloopSaver/master/module.json

uninstall.sh

@@ -0,0 +1,15 @@
+MAGISKTMP="$(magisk --path)"
+. /data/adb/magisk/util_functions.sh
+get_flags
+find_boot_image
+( if [ ! -z "$BOOTIMAGE" ]; then
+    mkdir -p "$TMPDIR/boot"
+    dd if=$BOOTIMAGE of="$TMPDIR/boot/boot.img""
+    cd "$TMPDIR/boot" || exit 1
+    /data/adb/magisk/magiskboot unpack boot.img"
+     /data/adb/magisk/magiskboot cpio ramdisk.cpio \
+"rm overlay.d/safemode.rc" \
+"rm overlay.d/sbin/safemode.sh"
+     /data/adb/magisk/magiskboot repack boot.img
+     dd of=$BOOTIMAGE if="$TMPDIR/boot/new-boot.img"
+fi )