Skip to content

Commit

Permalink
Support systemlessly deleting files or folders
Browse files Browse the repository at this point in the history
After we refactor the magic mount and always mount folder as tmpfs,
we can easily support deleting files or folders now. We recognize
dummy devices with major number 0 and minor number 0 as an indicator
for removing files and folders. This indicator is borrowed from
overlayfs.
  • Loading branch information
yujincheng08 committed Mar 13, 2023
1 parent fe6b658 commit 5edd8d9
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 4 deletions.
15 changes: 14 additions & 1 deletion docs/guides.md
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,8 @@ If you place a file named `.replace` in any of the folders, instead of merging i

If you want to replace files in `/vendor`, `/product`, or `/system_ext`, please place them under `system/vendor`, `system/product`, and `system/system_ext` respectively. Magisk will transparently handle whether these partitions are in a separate partition or not.

If you want to remove a specific file or folder, please place a dummy block device with major number 0 and minor number 0 in the same path. For example, if you want to remove `/system/app/GoogleCamera`, you can `mknod GoogleCamera b 0 0` in `$MODDIR/system/app`.

#### Zygisk

Zygisk is a feature of Magisk that allows advanced module developers to run code directly in every Android applications' processes before they are specialized and running. For more details about the Zygisk API and building a Zygisk module, please checkout the [Zygisk Module Sample](https://github.com/topjohnwu/zygisk-module-sample) project.
Expand Down Expand Up @@ -208,7 +210,7 @@ set_perm_recursive <directory> <owner> <group> <dirpermission> <filepermission>

For convenience, you can also declare a list of folders you want to replace in the variable name `REPLACE`. The module installer script will create the `.replace` file into the folders listed in `REPLACE`. For example:

```
```sh
REPLACE="
/system/app/YouTube
/system/app/Bloatware
Expand All @@ -217,6 +219,17 @@ REPLACE="

The list above will result in the following files being created: `$MODPATH/system/app/YouTube/.replace` and `$MODPATH/system/app/Bloatware/.replace`.

For convenience, you can also declare a list of files/folders you want to remove in the variable name `REMOVE`. The module installer script will create the corresponding dummy devices. For example:

```sh
REMOVE="
/system/app/YouTube
/system/fonts/Roboto
"
```

The list above will result in the following dummy devices being created: `$MODPATH/system/app/YouTube` and `$MODPATH/system/fonts/Roboto`.

#### Notes

- When your module is downloaded with the Magisk app, `update-binary` will be **forcefully** replaced with the latest [`module_installer.sh`](https://github.com/topjohnwu/Magisk/blob/master/scripts/module_installer.sh). **DO NOT** try to add any custom logic in `update-binary`.
Expand Down
17 changes: 14 additions & 3 deletions native/src/core/module.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,14 @@ bool dir_node::prepare() {
for (auto it = children.begin(); it != children.end();) {
// We also need to upgrade to tmpfs node if any child:
// - Target does not exist
// - Source or target is a symlink (since we cannot bind mount symlink)
// - Source or target is a symlink (since we cannot bind mount symlink) or whiteout
bool cannot_mnt;
if (struct stat st{}; lstat(it->second->node_path().data(), &st) != 0) {
cannot_mnt = true;
// if it's a whiteout, we don't care if the target doesn't exist
cannot_mnt = !it->second->is_wht();
} else {
it->second->set_exist(true);
cannot_mnt = it->second->is_lnk() || S_ISLNK(st.st_mode);
cannot_mnt = it->second->is_lnk() || S_ISLNK(st.st_mode) || it->second->is_wht();
}

if (cannot_mnt) {
Expand Down Expand Up @@ -116,6 +117,12 @@ void dir_node::collect_module_files(const char *module, int dfd) {
node->collect_module_files(module, dirfd(dir.get()));
}
} else {
if (struct stat st{}; (entry->d_type & DT_BLK) == DT_BLK &&
fstatat(dirfd(dir.get()), entry->d_name, &st,
AT_SYMLINK_NOFOLLOW) == 0 && st.st_rdev == 0) {
// if the file is a whiteout, mark it as such
entry->d_type = DT_WHT;
}
emplace<module_node>(entry->d_name, module, entry);
}
}
Expand Down Expand Up @@ -147,6 +154,10 @@ void mirror_node::mount() {

void module_node::mount() {
string src = module_mnt + module + parent()->root()->prefix + node_path();
if (is_wht()) {
VLOGD("rm", "null", node_path().data());
return;
}
if (exist())
clone_attr(mirror_path().data(), src.data());
if (isa<tmpfs_node>(parent()))
Expand Down
1 change: 1 addition & 0 deletions native/src/core/node.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ class node_entry {
bool is_dir() const { return file_type() == DT_DIR; }
bool is_lnk() const { return file_type() == DT_LNK; }
bool is_reg() const { return file_type() == DT_REG; }
bool is_wht() const { return file_type() == DT_WHT; }
const string &name() const { return _name; }
dir_node *parent() const { return _parent; }

Expand Down
5 changes: 5 additions & 0 deletions scripts/util_functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -784,6 +784,11 @@ install_module() {
mktouch $MODPATH$TARGET/.replace
done

for TARGET in $REMOVE; do
ui_print "- Remove target: $TARGET"
mknod $MODPATH$TARGET b 0 0
done

if $BOOTMODE; then
# Update info for Magisk app
mktouch $NVBASE/modules/$MODID/update
Expand Down

0 comments on commit 5edd8d9

Please sign in to comment.