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
6698c189
Commit
6698c189
authored
Feb 02, 2019
by
Erfan Abdi
Committed by
John Wu
Feb 07, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Support non-ext4 filesystem for vendor and system
Signed-off-by:
Erfan Abdi
<
erfangplus@gmail.com
>
parent
f0639390
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
8 deletions
+16
-8
init.cpp
native/jni/core/init.cpp
+14
-6
util_functions.sh
scripts/util_functions.sh
+2
-2
No files found.
native/jni/core/init.cpp
View file @
6698c189
...
...
@@ -160,7 +160,7 @@ static bool setup_block(struct device *dev, const char *partname) {
return
true
;
}
static
bool
read_fstab_dt
(
const
struct
cmdline
*
cmd
,
const
char
*
mnt_point
,
char
*
partname
)
{
static
bool
read_fstab_dt
(
const
struct
cmdline
*
cmd
,
const
char
*
mnt_point
,
char
*
partname
,
char
*
partfs
)
{
char
buf
[
128
];
struct
stat
st
;
sprintf
(
buf
,
"/%s"
,
mnt_point
);
...
...
@@ -175,7 +175,14 @@ static bool read_fstab_dt(const struct cmdline *cmd, const char *mnt_point, char
close
(
fd
);
char
*
name
=
strrchr
(
buf
,
'/'
)
+
1
;
sprintf
(
partname
,
"%s%s"
,
name
,
strend
(
name
,
cmd
->
slot
)
?
cmd
->
slot
:
""
);
return
true
;
sprintf
(
buf
,
"%s/fstab/%s/type"
,
cmd
->
dt_dir
,
mnt_point
);
if
(
access
(
buf
,
F_OK
)
==
0
)
{
int
fd
=
open
(
buf
,
O_RDONLY
|
O_CLOEXEC
);
lstat
(
buf
,
&
st
);
read
(
fd
,
partfs
,
st
.
st_size
);
close
(
fd
);
return
true
;
}
}
return
false
;
}
...
...
@@ -419,6 +426,7 @@ int main(int argc, char *argv[]) {
struct
device
dev
;
char
partname
[
32
];
char
partfs
[
32
];
if
(
cmd
.
early_boot
)
{
sprintf
(
partname
,
"system%s"
,
cmd
.
slot
);
...
...
@@ -436,15 +444,15 @@ int main(int argc, char *argv[]) {
xmkdir
(
"/system"
,
0755
);
xmount
(
"/system_root/system"
,
"/system"
,
nullptr
,
MS_BIND
,
nullptr
);
}
else
if
(
read_fstab_dt
(
&
cmd
,
"system"
,
partname
))
{
}
else
if
(
read_fstab_dt
(
&
cmd
,
"system"
,
partname
,
partfs
))
{
setup_block
(
&
dev
,
partname
);
xmount
(
dev
.
path
,
"/system"
,
"ext4"
,
MS_RDONLY
,
nullptr
);
xmount
(
dev
.
path
,
"/system"
,
partfs
,
MS_RDONLY
,
nullptr
);
mnt_system
=
true
;
}
if
(
read_fstab_dt
(
&
cmd
,
"vendor"
,
partname
))
{
if
(
read_fstab_dt
(
&
cmd
,
"vendor"
,
partname
,
partfs
))
{
setup_block
(
&
dev
,
partname
);
xmount
(
dev
.
path
,
"/vendor"
,
"ext4"
,
MS_RDONLY
,
nullptr
);
xmount
(
dev
.
path
,
"/vendor"
,
partfs
,
MS_RDONLY
,
nullptr
);
mnt_vendor
=
true
;
}
...
...
scripts/util_functions.sh
View file @
6698c189
...
...
@@ -91,7 +91,7 @@ mount_partitions() {
[
-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
`
mount
-
t
ext4
-
o
ro
$SYSTEMBLOCK
/system
mount
-o
ro
$SYSTEMBLOCK
/system
fi
[
-f
/system/build.prop
]
||
is_mounted /system
||
abort
"! Cannot mount /system"
grep
-qE
'/dev/root|/system_root'
/proc/mounts
&&
SYSTEM_ROOT
=
true
||
SYSTEM_ROOT
=
false
...
...
@@ -106,7 +106,7 @@ mount_partitions() {
is_mounted /vendor
||
mount
-o
ro /vendor 2>/dev/null
if
!
is_mounted /vendor
;
then
VENDORBLOCK
=
`
find_block vendor
$SLOT
`
mount
-
t
ext4
-
o
ro
$VENDORBLOCK
/vendor
mount
-o
ro
$VENDORBLOCK
/vendor
fi
is_mounted /vendor
||
abort
"! Cannot mount /vendor"
fi
...
...
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