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
78a3d36c
Commit
78a3d36c
authored
Oct 09, 2017
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow devices without separate vendor partition
parent
3942858c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
6 deletions
+13
-6
magiskinit.c
jni/magiskinit.c
+13
-6
No files found.
jni/magiskinit.c
View file @
78a3d36c
...
@@ -197,8 +197,6 @@ static void parse_device(struct device *dev, char *uevent) {
...
@@ -197,8 +197,6 @@ static void parse_device(struct device *dev, char *uevent) {
static
int
setup_block
(
struct
device
*
dev
,
const
char
*
partname
)
{
static
int
setup_block
(
struct
device
*
dev
,
const
char
*
partname
)
{
char
buffer
[
1024
],
path
[
128
];
char
buffer
[
1024
],
path
[
128
];
mkdir
(
"/sys"
,
0755
);
mount
(
"sysfs"
,
"/sys"
,
"sysfs"
,
0
,
NULL
);
struct
dirent
*
entry
;
struct
dirent
*
entry
;
DIR
*
dir
=
opendir
(
"/sys/dev/block"
);
DIR
*
dir
=
opendir
(
"/sys/dev/block"
);
if
(
dir
==
NULL
)
if
(
dir
==
NULL
)
...
@@ -266,7 +264,8 @@ static void patch_sepolicy() {
...
@@ -266,7 +264,8 @@ static void patch_sepolicy() {
if
(
sepolicy
==
NULL
&&
access
(
"/vendor/etc/selinux/precompiled_sepolicy"
,
R_OK
)
==
0
)
{
if
(
sepolicy
==
NULL
&&
access
(
"/vendor/etc/selinux/precompiled_sepolicy"
,
R_OK
)
==
0
)
{
void
*
sys_sha
=
NULL
,
*
ven_sha
=
NULL
;
void
*
sys_sha
=
NULL
,
*
ven_sha
=
NULL
;
size_t
sys_size
=
0
,
ven_size
=
0
;
size_t
sys_size
=
0
,
ven_size
=
0
;
dir
=
opendir
(
"/vendor/etc/selinux"
);
if
((
dir
=
opendir
(
"/vendor/etc/selinux"
))
==
NULL
)
goto
check_done
;
while
((
entry
=
readdir
(
dir
)))
{
while
((
entry
=
readdir
(
dir
)))
{
if
(
strcmp
(
entry
->
d_name
,
"."
)
==
0
||
strcmp
(
entry
->
d_name
,
".."
)
==
0
)
if
(
strcmp
(
entry
->
d_name
,
"."
)
==
0
||
strcmp
(
entry
->
d_name
,
".."
)
==
0
)
continue
;
continue
;
...
@@ -277,7 +276,8 @@ static void patch_sepolicy() {
...
@@ -277,7 +276,8 @@ static void patch_sepolicy() {
}
}
}
}
closedir
(
dir
);
closedir
(
dir
);
dir
=
opendir
(
"/system/etc/selinux"
);
if
((
dir
=
opendir
(
"/system/etc/selinux"
))
==
NULL
)
goto
check_done
;
while
((
entry
=
readdir
(
dir
)))
{
while
((
entry
=
readdir
(
dir
)))
{
if
(
strcmp
(
entry
->
d_name
,
"."
)
==
0
||
strcmp
(
entry
->
d_name
,
".."
)
==
0
)
if
(
strcmp
(
entry
->
d_name
,
"."
)
==
0
||
strcmp
(
entry
->
d_name
,
".."
)
==
0
)
continue
;
continue
;
...
@@ -294,6 +294,8 @@ static void patch_sepolicy() {
...
@@ -294,6 +294,8 @@ static void patch_sepolicy() {
munmap
(
ven_sha
,
ven_size
);
munmap
(
ven_sha
,
ven_size
);
}
}
check_done:
if
(
sepolicy
)
{
if
(
sepolicy
)
{
load_policydb
(
sepolicy
);
load_policydb
(
sepolicy
);
}
else
{
}
else
{
...
@@ -364,6 +366,9 @@ int main(int argc, char *argv[]) {
...
@@ -364,6 +366,9 @@ int main(int argc, char *argv[]) {
int
root
=
open
(
"/"
,
O_RDONLY
|
O_CLOEXEC
);
int
root
=
open
(
"/"
,
O_RDONLY
|
O_CLOEXEC
);
rm_rf
(
root
);
rm_rf
(
root
);
mkdir
(
"/sys"
,
0755
);
mount
(
"sysfs"
,
"/sys"
,
"sysfs"
,
0
,
NULL
);
char
partname
[
32
];
char
partname
[
32
];
snprintf
(
partname
,
sizeof
(
partname
),
"system%s"
,
cmd
.
slot
);
snprintf
(
partname
,
sizeof
(
partname
),
"system%s"
,
cmd
.
slot
);
...
@@ -381,8 +386,10 @@ int main(int argc, char *argv[]) {
...
@@ -381,8 +386,10 @@ int main(int argc, char *argv[]) {
mv_dir
(
overlay
,
root
);
mv_dir
(
overlay
,
root
);
snprintf
(
partname
,
sizeof
(
partname
),
"vendor%s"
,
cmd
.
slot
);
snprintf
(
partname
,
sizeof
(
partname
),
"vendor%s"
,
cmd
.
slot
);
setup_block
(
&
dev
,
partname
);
mount
(
dev
.
path
,
"/vendor"
,
"ext4"
,
MS_RDONLY
,
NULL
);
// We need to mount independent vendor partition
if
(
setup_block
(
&
dev
,
partname
)
==
0
)
mount
(
dev
.
path
,
"/vendor"
,
"ext4"
,
MS_RDONLY
,
NULL
);
patch_ramdisk
();
patch_ramdisk
();
patch_sepolicy
();
patch_sepolicy
();
...
...
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