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

Tweak info when installing

Browse Source
This commit is contained in:
topjohnwu 2018-07-04 23:46:16 +08:00
parent e7a2144def
commit 4de51d93ef
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/addon.d.sh
View File

@ -40,9 +40,9 @@ show_logo() {
detection() { detection() {
find_boot_image find_boot_image
find_dtbo_image find_dtbo_image
[ -z $BOOTIMAGE ] && abort "! Unable to detect boot image" [ -z $BOOTIMAGE ] && abort "! Unable to detect target image"
ui_print "- Found boot/ramdisk image: $BOOTIMAGE" ui_print "- Target image: $BOOTIMAGE"
[ -z $DTBOIMAGE ] || ui_print "- Found dtbo image: $DTBOIMAGE" [ -z $DTBOIMAGE ] || ui_print "- DTBO image: $DTBOIMAGE"
get_flags get_flags
} }

4
scripts/boot_patch.sh
View File

@ -155,8 +155,8 @@ rm -f ramdisk.cpio.orig
########################################################################################## ##########################################################################################
if ! $KEEPVERITY; then if ! $KEEPVERITY; then
[ -f dtb ] && ./magiskboot --dtb-patch dtb && ui_print "- Removing dm(avb)-verity from fstab in dtb" [ -f dtb ] && ./magiskboot --dtb-patch dtb && ui_print "- Removing dm(avb)-verity in dtb"
[ -f extra ] && ./magiskboot --dtb-patch extra && ui_print "- Removing dm(avb)-verity from fstab in extra-dtb" [ -f extra ] && ./magiskboot --dtb-patch extra && ui_print "- Removing dm(avb)-verity in extra-dtb"
fi fi
if [ -f kernel ]; then if [ -f kernel ]; then

8
scripts/flash_script.sh
View File

@ -53,14 +53,14 @@ find_dtbo_image
get_flags get_flags
[ -z $BOOTIMAGE ] && abort "! Unable to detect boot image" [ -z $BOOTIMAGE ] && abort "! Unable to detect target image"
ui_print "- Found boot/ramdisk image: $BOOTIMAGE" ui_print "- Target image: $BOOTIMAGE"
[ -z $DTBOIMAGE ] || ui_print "- Found dtbo image: $DTBOIMAGE" [ -z $DTBOIMAGE ] || ui_print "- DTBO image: $DTBOIMAGE"
# Detect version and architecture # Detect version and architecture
api_level_arch_detect api_level_arch_detect
[ $API -lt 21 ] && abort "! Magisk is only for Android higher than Lollipop (5.0+) (SDK 21+)" [ $API -lt 21 ] && abort "! Magisk is only for Lollipop and above (5.0+) (SDK 21+)"
ui_print "- Device platform: $ARCH" ui_print "- Device platform: $ARCH"

4
scripts/util_functions.sh
View File

@ -219,9 +219,9 @@ find_dtbo_image() {
patch_dtbo_image() { patch_dtbo_image() {
if [ ! -z $DTBOIMAGE ]; then if [ ! -z $DTBOIMAGE ]; then
if $MAGISKBIN/magiskboot --dtb-test $DTBOIMAGE; then if $MAGISKBIN/magiskboot --dtb-test $DTBOIMAGE; then
ui_print "- Backing up stock dtbo image" ui_print "- Backing up stock DTBO image"
$MAGISKBIN/magiskboot --compress $DTBOIMAGE $MAGISKBIN/stock_dtbo.img.gz $MAGISKBIN/magiskboot --compress $DTBOIMAGE $MAGISKBIN/stock_dtbo.img.gz
ui_print "- Patching fstab in dtbo to remove avb-verity" ui_print "- Patching DTBO to remove avb-verity"
$MAGISKBIN/magiskboot --dtb-patch $DTBOIMAGE $MAGISKBIN/magiskboot --dtb-patch $DTBOIMAGE
return 0 return 0
fi fi