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
7668e458
Commit
7668e458
authored
Dec 17, 2019
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cleanup legacy code
parent
695c8bc5
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
33 deletions
+0
-33
bootstages.cpp
native/jni/core/bootstages.cpp
+0
-5
scripting.cpp
native/jni/core/scripting.cpp
+0
-27
daemon.h
native/jni/include/daemon.h
+0
-1
No files found.
native/jni/core/bootstages.cpp
View file @
7668e458
...
...
@@ -413,11 +413,6 @@ static bool magisk_env() {
}
static
void
prepare_modules
()
{
const
char
*
legacy_imgs
[]
=
{
SECURE_DIR
"/magisk.img"
,
SECURE_DIR
"/magisk_merge.img"
};
for
(
auto
img
:
legacy_imgs
)
{
if
(
access
(
img
,
F_OK
)
==
0
)
migrate_img
(
img
);
}
DIR
*
dir
;
struct
dirent
*
entry
;
if
((
dir
=
opendir
(
MODULEUPGRADE
)))
{
...
...
native/jni/core/scripting.cpp
View file @
7668e458
...
...
@@ -72,33 +72,6 @@ void exec_module_script(const char *stage, const vector<string> &module_list) {
}
}
constexpr
char
migrate_script
[]
=
"MODULEROOT="
MODULEROOT
R"EOF(
IMG=%s
MNT=/dev/img_mnt
e2fsck -yf $IMG
mkdir -p $MNT
for num in 0 1 2 3 4 5 6 7; do
losetup /dev/block/loop${num} $IMG || continue
mount -t ext4 /dev/block/loop${num} $MNT
rm -rf $MNT/lost+found $MNT/.core
magisk --clone $MNT $MODULEROOT
umount $MNT
rm -rf $MNT
losetup -d /dev/block/loop${num}
break
done
rm -rf $IMG
)EOF"
;
void
migrate_img
(
const
char
*
img
)
{
LOGI
(
"* Migrating %s
\n
"
,
img
);
exec_t
exec
{
.
pre_exec
=
set_path
};
char
cmds
[
sizeof
(
migrate_script
)
+
128
];
sprintf
(
cmds
,
migrate_script
,
img
);
exec_command_sync
(
exec
,
"/system/bin/sh"
,
"-c"
,
cmds
);
}
constexpr
char
install_script
[]
=
R"EOF(
APK=%s
log -t Magisk "apk_install: $APK"
...
...
native/jni/include/daemon.h
View file @
7668e458
...
...
@@ -68,7 +68,6 @@ void remove_modules();
void
exec_script
(
const
char
*
script
);
void
exec_common_script
(
const
char
*
stage
);
void
exec_module_script
(
const
char
*
stage
,
const
std
::
vector
<
std
::
string
>
&
module_list
);
void
migrate_img
(
const
char
*
img
);
void
install_apk
(
const
char
*
apk
);
/**************
...
...
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