MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix overlay.d on SAR again

Browse Source
This commit is contained in:
topjohnwu 2020-05-07 02:30:43 -07:00
parent 87de0e7a0e
commit c113f854a2
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
native/jni/init/rootdir.cpp
View File

@ -316,8 +316,8 @@ void SARBase::patch_rootdir() {
// Handle overlay.d // Handle overlay.d
load_overlay_rc(ROOTOVL); load_overlay_rc(ROOTOVL);
if (access(ROOTOVL "/sbin", F_OK) == 0) { if (access(ROOTOVL "/sbin", F_OK) == 0) {
// Move files in overlay.d/sbin into Magisk's tmp_dir // Move files in overlay.d/sbin into tmp_dir
mv_path(ROOTOVL "/sbin", tmp_dir); mv_path(ROOTOVL "/sbin", ".");
} }
// Patch init.rc // Patch init.rc

12
native/jni/utils/files.cpp
View File

@ -86,11 +86,13 @@ void frm_rf(int dirfd) {
} }
void mv_path(const char *src, const char *dest) { void mv_path(const char *src, const char *dest) {
file_attr a; file_attr attr;
getattr(src, &a); getattr(src, &attr);
if (S_ISDIR(a.st.st_mode)) { if (S_ISDIR(attr.st.st_mode)) {
if (access(dest, F_OK) != 0) {
xmkdirs(dest, 0); xmkdirs(dest, 0);
setattr(dest, &a); setattr(dest, &attr);
}
mv_dir(xopen(src, O_RDONLY | O_CLOEXEC), xopen(dest, O_RDONLY | O_CLOEXEC)); mv_dir(xopen(src, O_RDONLY | O_CLOEXEC), xopen(dest, O_RDONLY | O_CLOEXEC));
} else{ } else{
xrename(src, dest); xrename(src, dest);
@ -100,7 +102,7 @@ void mv_path(const char *src, const char *dest) {
void mv_dir(int src, int dest) { void mv_dir(int src, int dest) {
auto dir = xopen_dir(src); auto dir = xopen_dir(src);
run_finally f([&]{ close(dest); }); run_finally f([=]{ close(dest); });
for (dirent *entry; (entry = xreaddir(dir.get()));) { for (dirent *entry; (entry = xreaddir(dir.get()));) {
switch (entry->d_type) { switch (entry->d_type) {
case DT_DIR: case DT_DIR: