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
8d431b67
Commit
8d431b67
authored
Aug 11, 2017
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove IS_VENDOR flag (not needed)
parent
273849c0
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
6 deletions
+4
-6
bootstages.c
jni/daemon/bootstages.c
+4
-6
No files found.
jni/daemon/bootstages.c
View file @
8d431b67
...
@@ -39,8 +39,6 @@ static int debug_log_pid, debug_log_fd;
...
@@ -39,8 +39,6 @@ static int debug_log_pid, debug_log_fd;
#define IS_SKEL 0x04
/* mount from skeleton */
#define IS_SKEL 0x04
/* mount from skeleton */
#define IS_MODULE 0x08
/* mount from module */
#define IS_MODULE 0x08
/* mount from module */
#define IS_VENDOR 0x10
/* special vendor placeholder */
#define IS_DIR(n) (n->type == DT_DIR)
#define IS_DIR(n) (n->type == DT_DIR)
#define IS_LNK(n) (n->type == DT_LNK)
#define IS_LNK(n) (n->type == DT_LNK)
#define IS_REG(n) (n->type == DT_REG)
#define IS_REG(n) (n->type == DT_REG)
...
@@ -273,7 +271,7 @@ static void clone_skeleton(struct node_entry *node) {
...
@@ -273,7 +271,7 @@ static void clone_skeleton(struct node_entry *node) {
close
(
open_new
(
buf
));
close
(
open_new
(
buf
));
// Links will be handled later
// Links will be handled later
if
(
child
->
status
&
IS_VENDOR
)
{
if
(
child
->
parent
->
parent
==
NULL
&&
strcmp
(
child
->
name
,
"vendor"
)
==
0
)
{
if
(
IS_LNK
(
child
))
{
if
(
IS_LNK
(
child
))
{
cp_afc
(
MIRRDIR
"/system/vendor"
,
"/system/vendor"
);
cp_afc
(
MIRRDIR
"/system/vendor"
,
"/system/vendor"
);
LOGI
(
"cplink: %s -> %s
\n
"
,
MIRRDIR
"/system/vendor"
,
"/system/vendor"
);
LOGI
(
"cplink: %s -> %s
\n
"
,
MIRRDIR
"/system/vendor"
,
"/system/vendor"
);
...
@@ -611,10 +609,10 @@ void post_fs_data(int client) {
...
@@ -611,10 +609,10 @@ void post_fs_data(int client) {
child
=
xcalloc
(
sizeof
(
*
child
),
1
);
child
=
xcalloc
(
sizeof
(
*
child
),
1
);
child
->
type
=
seperate_vendor
?
DT_LNK
:
DT_DIR
;
child
->
type
=
seperate_vendor
?
DT_LNK
:
DT_DIR
;
child
->
parent
=
ven_root
->
parent
;
child
->
parent
=
ven_root
->
parent
;
child
->
name
=
ven_root
->
name
;
child
->
name
=
strdup
(
"vendor"
);
child
->
status
=
IS_VENDOR
;
child
->
status
=
0
;
// Swap!
vec_entry
(
sys_root
->
children
)[
_
]
=
child
;
vec_entry
(
sys_root
->
children
)[
_
]
=
child
;
ven_root
->
name
=
strdup
(
"vendor"
);
ven_root
->
parent
=
NULL
;
ven_root
->
parent
=
NULL
;
break
;
break
;
}
}
...
...
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