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
71b08379
Commit
71b08379
authored
Jan 15, 2021
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Maintain global mount list
parent
b100d0c5
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
5 deletions
+9
-5
getinfo.cpp
native/jni/init/getinfo.cpp
+6
-1
init.hpp
native/jni/init/init.hpp
+3
-4
No files found.
native/jni/init/getinfo.cpp
View file @
71b08379
...
@@ -11,6 +11,8 @@
...
@@ -11,6 +11,8 @@
using
namespace
std
;
using
namespace
std
;
vector
<
string
>
mount_list
;
template
<
typename
Func
>
template
<
typename
Func
>
static
void
parse_cmdline
(
const
Func
&
fn
)
{
static
void
parse_cmdline
(
const
Func
&
fn
)
{
char
cmdline
[
4096
];
char
cmdline
[
4096
];
...
@@ -147,10 +149,13 @@ void load_kernel_info(cmdline *cmd) {
...
@@ -147,10 +149,13 @@ void load_kernel_info(cmdline *cmd) {
xmkdir
(
"/sys"
,
0755
);
xmkdir
(
"/sys"
,
0755
);
xmount
(
"sysfs"
,
"/sys"
,
"sysfs"
,
0
,
nullptr
);
xmount
(
"sysfs"
,
"/sys"
,
"sysfs"
,
0
,
nullptr
);
mount_list
.
emplace_back
(
"/proc"
);
mount_list
.
emplace_back
(
"/sys"
);
// Log to kernel
// Log to kernel
setup_klog
();
setup_klog
();
parse_cmdline
([
=
](
string_view
key
,
const
char
*
value
)
->
void
{
parse_cmdline
([
=
](
string_view
key
,
const
char
*
value
)
{
if
(
key
==
"androidboot.slot_suffix"
)
{
if
(
key
==
"androidboot.slot_suffix"
)
{
strcpy
(
cmd
->
slot
,
value
);
strcpy
(
cmd
->
slot
,
value
);
}
else
if
(
key
==
"androidboot.slot"
)
{
}
else
if
(
key
==
"androidboot.slot"
)
{
...
...
native/jni/init/init.hpp
View file @
71b08379
...
@@ -29,6 +29,8 @@ struct fstab_entry {
...
@@ -29,6 +29,8 @@ struct fstab_entry {
#define INIT_SOCKET "MAGISKINIT"
#define INIT_SOCKET "MAGISKINIT"
#define DEFAULT_DT_DIR "/proc/device-tree/firmware/android"
#define DEFAULT_DT_DIR "/proc/device-tree/firmware/android"
extern
std
::
vector
<
std
::
string
>
mount_list
;
void
load_kernel_info
(
cmdline
*
cmd
);
void
load_kernel_info
(
cmdline
*
cmd
);
bool
check_two_stage
();
bool
check_two_stage
();
int
dump_magisk
(
const
char
*
path
,
mode_t
mode
);
int
dump_magisk
(
const
char
*
path
,
mode_t
mode
);
...
@@ -42,12 +44,11 @@ class BaseInit {
...
@@ -42,12 +44,11 @@ class BaseInit {
protected
:
protected
:
cmdline
*
cmd
;
cmdline
*
cmd
;
char
**
argv
;
char
**
argv
;
std
::
vector
<
std
::
string
>
mount_list
;
[[
noreturn
]]
void
exec_init
();
[[
noreturn
]]
void
exec_init
();
void
read_dt_fstab
(
std
::
vector
<
fstab_entry
>
&
fstab
);
void
read_dt_fstab
(
std
::
vector
<
fstab_entry
>
&
fstab
);
public
:
public
:
BaseInit
(
char
*
argv
[],
cmdline
*
cmd
)
:
cmd
(
cmd
),
argv
(
argv
)
,
mount_list
{
"/sys"
,
"/proc"
}
{}
BaseInit
(
char
*
argv
[],
cmdline
*
cmd
)
:
cmd
(
cmd
),
argv
(
argv
)
{}
virtual
~
BaseInit
()
=
default
;
virtual
~
BaseInit
()
=
default
;
virtual
void
start
()
=
0
;
virtual
void
start
()
=
0
;
};
};
...
@@ -100,8 +101,6 @@ private:
...
@@ -100,8 +101,6 @@ private:
public
:
public
:
SecondStageInit
(
char
*
argv
[])
:
SARBase
(
argv
,
nullptr
)
{
SecondStageInit
(
char
*
argv
[])
:
SARBase
(
argv
,
nullptr
)
{
LOGD
(
"%s
\n
"
,
__FUNCTION__
);
LOGD
(
"%s
\n
"
,
__FUNCTION__
);
// Do not unmount /sys and /proc
mount_list
.
clear
();
};
};
void
start
()
override
{
void
start
()
override
{
prepare
();
prepare
();
...
...
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