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
74da6e1d
Commit
74da6e1d
authored
Dec 25, 2017
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Support new 1500 template
parent
84ffdf0e
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
45 additions
and
9 deletions
+45
-9
bootstages.c
core/jni/core/bootstages.c
+9
-8
util_functions.sh
scripts/util_functions.sh
+36
-1
No files found.
core/jni/core/bootstages.c
View file @
74da6e1d
...
@@ -392,15 +392,16 @@ static void simple_mount(const char *path) {
...
@@ -392,15 +392,16 @@ static void simple_mount(const char *path) {
* Miscellaneous *
* Miscellaneous *
*****************/
*****************/
#define alt_img ((char *[]) \
{ "/cache/magisk.img", "/data/magisk_merge.img", "/data/adb/magisk_merge.img", NULL })
static
int
prepare_img
()
{
static
int
prepare_img
()
{
// First merge images
// Merge images
if
(
merge_img
(
"/cache/magisk.img"
,
MAINIMG
))
{
for
(
int
i
=
0
;
alt_img
[
i
];
++
i
)
{
LOGE
(
"Image merge /cache/magisk.img -> "
MAINIMG
" failed!
\n
"
);
if
(
merge_img
(
alt_img
[
i
],
MAINIMG
))
{
LOGE
(
"Image merge %s -> "
MAINIMG
" failed!
\n
"
,
alt_img
[
i
]);
return
1
;
return
1
;
}
}
if
(
merge_img
(
"/data/magisk_merge.img"
,
MAINIMG
))
{
LOGE
(
"Image merge /data/magisk_merge.img -> "
MAINIMG
" failed!
\n
"
);
return
1
;
}
}
if
(
access
(
MAINIMG
,
F_OK
)
==
-
1
)
{
if
(
access
(
MAINIMG
,
F_OK
)
==
-
1
)
{
...
...
scripts/util_functions.sh
View file @
74da6e1d
...
@@ -11,7 +11,9 @@
...
@@ -11,7 +11,9 @@
SCRIPT_VERSION
=
$MAGISK_VER_CODE
SCRIPT_VERSION
=
$MAGISK_VER_CODE
# Default location, will override if needed
# Default location, will override if needed
[
-d
/data/adb/magisk
]
&&
MAGISKBIN
=
/data/adb/magisk
||
MAGISKBIN
=
/data/magisk
MAGISKBIN
=
/data/adb/magisk
[
-z
$MAGISKBIN
]
&&
MOUNTPATH
=
/sbin/.core/img
[
-z
$IMG
]
&&
IMG
=
/data/adb/magisk.img
BOOTSIGNER
=
"/system/bin/dalvikvm -Xnodex2oat -Xnoimage-dex2oat -cp
\$
APK com.topjohnwu.magisk.utils.BootSigner"
BOOTSIGNER
=
"/system/bin/dalvikvm -Xnodex2oat -Xnoimage-dex2oat -cp
\$
APK com.topjohnwu.magisk.utils.BootSigner"
BOOTSIGNED
=
false
BOOTSIGNED
=
false
...
@@ -333,3 +335,36 @@ image_size_check() {
...
@@ -333,3 +335,36 @@ image_size_check() {
curFreeM
=
$((
curSizeM
-
curUsedM
))
curFreeM
=
$((
curSizeM
-
curUsedM
))
}
}
mount_magisk_img
()
{
[
-z
reqSizeM
]
&&
reqSizeM
=
0
if
[
-f
"
$IMG
"
]
;
then
ui_print
"- Found
$IMG
"
image_size_check
$IMG
if
[
"
$reqSizeM
"
-gt
"
$curFreeM
"
]
;
then
newSizeM
=
$((
(
reqSizeM
+
curUsedM
)
/
32
*
32
+
64
))
ui_print
"- Resizing
$IMG
to
${
newSizeM
}
M"
$MAGISKBIN
/magisk
--resizeimg
$IMG
$newSizeM
>
&2
fi
else
newSizeM
=
$((
reqSizeM
/
32
*
32
+
64
))
;
ui_print
"- Creating
$IMG
with size
${
newSizeM
}
M"
$MAGISKBIN
/magisk
--createimg
$IMG
$newSizeM
>
&2
fi
ui_print
"- Mounting
$IMG
to
$MOUNTPATH
"
MAGISKLOOP
=
`
$MAGISKBIN
/magisk
--mountimg
$IMG
$MOUNTPATH
`
is_mounted
$MOUNTPATH
||
abort
"!
$IMG
mount failed..."
}
unmount_magisk_img
()
{
$MAGISKBIN
/magisk
--umountimg
$MOUNTPATH
$MAGISKLOOP
# Shrink the image if possible
image_size_check
$IMG
newSizeM
=
$((
curUsedM
/
32
*
32
+
64
))
if
[
$curSizeM
-gt
$newSizeM
]
;
then
ui_print
"- Shrinking
$IMG
to
${
newSizeM
}
M"
$MAGISKBIN
/magisk
--resizeimg
$IMG
$newSizeM
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