Commit 3356d7b6 authored by topjohnwu's avatar topjohnwu

More friendly to obscure/outdated custom recoveries

Close #1049
parent c84023bd
......@@ -79,9 +79,6 @@ private:
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)
: 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_debug.log");
......
......@@ -177,6 +177,7 @@ mount_partitions() {
[ -z $SLOT ] || ui_print "- Current boot slot: $SLOT"
ui_print "- Mounting /system, /vendor"
mkdir /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
SYSTEMBLOCK=`find_block system$SLOT`
......@@ -191,7 +192,7 @@ mount_partitions() {
mount -o bind /system_root/system /system
fi
if [ -L /system/vendor ]; then
# Seperate /vendor partition
mkdir /vendor 2>/dev/null
is_mounted /vendor || mount -o ro /vendor 2>/dev/null
if ! is_mounted /vendor; then
VENDORBLOCK=`find_block vendor$SLOT`
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment