Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
M
Magisk
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Magisk
Commits
3356d7b6
Commit
3356d7b6
authored
Feb 24, 2019
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
More friendly to obscure/outdated custom recoveries
Close #1049
parent
c84023bd
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
5 deletions
+4
-5
bootstages.cpp
native/jni/core/bootstages.cpp
+2
-4
util_functions.sh
scripts/util_functions.sh
+2
-1
No files found.
native/jni/core/bootstages.cpp
View file @
3356d7b6
...
...
@@ -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"
);
...
...
scripts/util_functions.sh
View file @
3356d7b6
...
...
@@ -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
`
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment