br0kenpixel/Zygisk-Assistant
1
0
Fork 0
mirror of https://github.com/snake-4/Zygisk-Assistant.git synced 2025-09-06 06:37:02 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Respect default errors value on EXT FS

Browse Source
This commit is contained in:
snake-4
2025-02-23 01:00:04 +01:00
parent 60e1cc4e8f
commit 740dfc9b3d
3 changed files with 66 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
module/jni/modules.cpp
View File

@@ -93,28 +93,26 @@ void doRemount()
if (mount.getMountPoint() == "/data")
{
const auto &superOptions = mount.getSuperOptions();
if (!superOptions.contains("errors"))
break;
// Remount /data only if errors behavior is not the same as superblock's
const char *sb_errors = Utils::getExtErrorsBehavior(mount);
if (!sb_errors || superOptions.at("errors") == sb_errors)
break;
const auto &mountOptions = mount.getMountOptions();
// If errors=remount-ro, remount it with errors=continue
if (superOptions.contains("errors") && superOptions.at("errors") == "remount-ro")
unsigned long flags = MS_REMOUNT;
for (const auto &flagName : mount_flags_procfs)
{
unsigned long flags = MS_REMOUNT;
for (const auto &flagName : mount_flags_procfs)
{
if (mountOptions.contains(flagName.first))
flags |= flagName.second;
}
if (::mount(NULL, "/data", NULL, flags, "errors=continue") == 0)
{
LOGD("mount(NULL, \"/data\", NULL, 0x%lx, \"errors=continue\") returned 0", flags);
}
else
{
LOGW("mount(NULL, \"/data\", NULL, 0x%lx, \"errors=continue\") returned -1: %d (%s)", flags, errno, strerror(errno));
}
if (mountOptions.contains(flagName.first))
flags |= flagName.second;
}
if (::mount(NULL, "/data", NULL, flags, (std::string("errors=") + sb_errors).c_str()) == 0)
LOGD("mount(NULL, \"/data\", NULL, 0x%lx, ...) returned 0", flags);
else
LOGW("mount(NULL, \"/data\", NULL, 0x%lx, ...) returned -1: %d (%s)", flags, errno, strerror(errno));
break;
}
}