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
70d3b243
Commit
70d3b243
authored
Aug 29, 2018
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Keep dm/avb-verity when device is using system_root_image
Close #512
parent
8664e9d1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
11 deletions
+6
-11
util_functions.sh
scripts/util_functions.sh
+6
-11
No files found.
scripts/util_functions.sh
View file @
70d3b243
...
@@ -98,7 +98,6 @@ mount_partitions() {
...
@@ -98,7 +98,6 @@ mount_partitions() {
mount
--move
/system /system_root
mount
--move
/system /system_root
mount
-o
bind
/system_root/system /system
mount
-o
bind
/system_root/system /system
fi
fi
$SYSTEM_ROOT
&&
ui_print
"- Device using system_root_image"
if
[
-L
/system/vendor
]
;
then
if
[
-L
/system/vendor
]
;
then
# Seperate /vendor partition
# Seperate /vendor partition
is_mounted /vendor
||
mount
-o
ro /vendor 2>/dev/null
is_mounted /vendor
||
mount
-o
ro /vendor 2>/dev/null
...
@@ -114,17 +113,13 @@ get_flags() {
...
@@ -114,17 +113,13 @@ get_flags() {
# override variables
# override variables
getvar KEEPVERITY
getvar KEEPVERITY
getvar KEEPFORCEENCRYPT
getvar KEEPFORCEENCRYPT
HIGHCOMP
=
false
if
[
-z
$KEEPVERITY
]
;
then
if
[
-z
$KEEPVERITY
]
;
then
KEEPVERITY
=
false
if
$SYSTEM_ROOT
;
then
hardware
=
`
grep_cmdline androidboot.hardware
`
KEEPVERITY
=
true
for
hw
in
taimen walleye
;
do
ui_print
"- Using system_root_image, keep dm/avb-verity"
if
[
"
$hw
"
=
"
$hardware
"
]
;
then
else
KEEPVERITY
=
true
KEEPVERITY
=
false
ui_print
"- Device on whitelist, keep avb-verity"
fi
break
fi
done
fi
fi
if
[
-z
$KEEPFORCEENCRYPT
]
;
then
if
[
-z
$KEEPFORCEENCRYPT
]
;
then
if
[
"
`
getprop ro.crypto.state
`
"
=
"encrypted"
]
;
then
if
[
"
`
getprop ro.crypto.state
`
"
=
"encrypted"
]
;
then
...
...
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