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
16b40096
Commit
16b40096
authored
Sep 22, 2019
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update vars for 2SI
parent
cf2d02c0
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
3 deletions
+4
-3
dtb.cpp
native/jni/magiskboot/dtb.cpp
+1
-1
main.cpp
native/jni/magiskboot/main.cpp
+1
-0
boot_patch.sh
scripts/boot_patch.sh
+2
-2
No files found.
native/jni/magiskboot/dtb.cpp
View file @
16b40096
...
@@ -125,7 +125,7 @@ static void dtb_print(const char *file, bool fstab) {
...
@@ -125,7 +125,7 @@ static void dtb_print(const char *file, bool fstab) {
static
void
dtb_patch
(
const
char
*
in
,
const
char
*
out
)
{
static
void
dtb_patch
(
const
char
*
in
,
const
char
*
out
)
{
bool
keepverity
=
check_env
(
"KEEPVERITY"
);
bool
keepverity
=
check_env
(
"KEEPVERITY"
);
bool
redirect
=
check_env
(
"
REDIRSYSMN
T"
);
bool
redirect
=
check_env
(
"
TWOSTAGEINI
T"
);
vector
<
uint8_t
*>
fdt_list
;
vector
<
uint8_t
*>
fdt_list
;
size_t
dtb_sz
;
size_t
dtb_sz
;
...
...
native/jni/magiskboot/main.cpp
View file @
16b40096
...
@@ -80,6 +80,7 @@ Supported actions:
...
@@ -80,6 +80,7 @@ Supported actions:
patch [OUT]
patch [OUT]
Search for fstab and remove verity/avb
Search for fstab and remove verity/avb
If [OUT] is not specified, it will directly output to <input>
If [OUT] is not specified, it will directly output to <input>
Configure with env variables: KEEPVERITY TWOSTAGEINIT
compress[=method] <infile> [outfile]
compress[=method] <infile> [outfile]
Compress <infile> with [method] (default: gzip), optionally to [outfile]
Compress <infile> with [method] (default: gzip), optionally to [outfile]
...
...
scripts/boot_patch.sh
View file @
16b40096
...
@@ -124,8 +124,8 @@ case $((STATUS & 3)) in
...
@@ -124,8 +124,8 @@ case $((STATUS & 3)) in
esac
esac
if
[
$((
STATUS
&
8
))
-ne
0
]
;
then
if
[
$((
STATUS
&
8
))
-ne
0
]
;
then
ui_print
"- 2 Stage Init ramdisk detected"
# Possibly using 2SI, export env var
export
REDIRSYSMN
T
=
true
export
TWOSTAGEINI
T
=
true
fi
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