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
528634d7
Commit
528634d7
authored
Jun 26, 2018
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove unused code
parent
3283439f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
14 deletions
+1
-14
bootstages.c
native/jni/core/bootstages.c
+1
-13
magisk.h
native/jni/include/magisk.h
+0
-1
No files found.
native/jni/core/bootstages.c
View file @
528634d7
...
...
@@ -126,11 +126,6 @@ static void set_path(struct vector *v) {
vec_push_back
(
v
,
NULL
);
}
static
void
uninstall_env
(
struct
vector
*
v
)
{
vec_push_back
(
v
,
strdup
(
"BOOTMODE=true"
));
set_path
(
v
);
}
/***********
* Scripts *
***********/
...
...
@@ -500,7 +495,7 @@ void startup() {
}
// No uninstaller or core-only mode
if
(
access
(
UNINSTALLER
,
F_OK
)
!=
0
&&
access
(
DISABLEFILE
,
F_OK
)
!=
0
)
{
if
(
access
(
DISABLEFILE
,
F_OK
)
!=
0
)
{
// Allocate buffer
buf
=
xmalloc
(
PATH_MAX
);
buf2
=
xmalloc
(
PATH_MAX
);
...
...
@@ -665,13 +660,6 @@ void startup() {
xsymlink
(
MIRRDIR
"/bin/busybox"
,
BBPATH
"/busybox"
);
}
// uninstall
if
(
access
(
UNINSTALLER
,
F_OK
)
==
0
)
{
close
(
open
(
UNBLOCKFILE
,
O_RDONLY
|
O_CREAT
));
exec_command
(
0
,
NULL
,
uninstall_env
,
"sh"
,
UNINSTALLER
,
NULL
);
return
;
}
// Start post-fs-data mode
execl
(
"/sbin/magisk"
,
"magisk"
,
"--post-fs-data"
,
NULL
);
}
...
...
native/jni/include/magisk.h
View file @
528634d7
...
...
@@ -17,7 +17,6 @@
#define LOGFILE "/cache/magisk.log"
#define UNBLOCKFILE "/dev/.magisk.unblock"
#define DISABLEFILE "/cache/.disable_magisk"
#define UNINSTALLER "/cache/magisk_uninstaller.sh"
#define MAGISKTMP "/sbin/.core"
#define MIRRDIR MAGISKTMP "/mirror"
#define BBPATH MAGISKTMP "/busybox"
...
...
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