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

More friendly to obscure/outdated custom recoveries

Browse Source 
Close #1049
This commit is contained in:
topjohnwu 2019-02-24 04:45:47 -05:00
parent c84023bdc2
commit 3356d7b6ff
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
native/jni/core/bootstages.cpp
View File

@ -79,9 +79,6 @@ private:
int get_path(char *path); int get_path(char *path);
}; };
//char node_entry::buf[] = {};
//char node_entry::buf2[] = {};
node_entry::node_entry(const char *name, uint8_t status, uint8_t type) node_entry::node_entry(const char *name, uint8_t status, uint8_t type)
: name(name), type(type), status(status), parent(nullptr) {} : name(name), type(type), status(status), parent(nullptr) {}
@ -358,7 +355,8 @@ static bool magisk_env() {
} }
} }
// Remove legacy stuffs // Remove stuffs
rm_rf("/cache/data_adb");
unlink("/data/magisk.img"); unlink("/data/magisk.img");
unlink("/data/magisk_debug.log"); unlink("/data/magisk_debug.log");

3
scripts/util_functions.sh
View File

@ -177,6 +177,7 @@ mount_partitions() {
[ -z $SLOT ] || ui_print "- Current boot slot: $SLOT" [ -z $SLOT ] || ui_print "- Current boot slot: $SLOT"
ui_print "- Mounting /system, /vendor" ui_print "- Mounting /system, /vendor"
mkdir /system 2>/dev/null
[ -f /system/build.prop ] || is_mounted /system || mount -o ro /system 2>/dev/null [ -f /system/build.prop ] || is_mounted /system || mount -o ro /system 2>/dev/null
if ! is_mounted /system && ! [ -f /system/build.prop ]; then if ! is_mounted /system && ! [ -f /system/build.prop ]; then
SYSTEMBLOCK=`find_block system$SLOT` SYSTEMBLOCK=`find_block system$SLOT`
@ -191,7 +192,7 @@ mount_partitions() {
mount -o bind /system_root/system /system mount -o bind /system_root/system /system
fi fi
if [ -L /system/vendor ]; then if [ -L /system/vendor ]; then
# Seperate /vendor partition mkdir /vendor 2>/dev/null
is_mounted /vendor || mount -o ro /vendor 2>/dev/null is_mounted /vendor || mount -o ro /vendor 2>/dev/null
if ! is_mounted /vendor; then if ! is_mounted /vendor; then
VENDORBLOCK=`find_block vendor$SLOT` VENDORBLOCK=`find_block vendor$SLOT`