ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "adb: enable/disable verity expected overlayfs errors."

Browse source
This commit is contained in:
Treehugger Robot 2019-05-06 14:36:51 +00:00 • committed by Gerrit Code Review
commit be9c2c0310
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
adb/daemon/set_verity_enable_state_service.cpp
View file

@ -111,8 +111,11 @@ static bool set_verity_enabled_state(int fd, const char* block_device, const cha
WriteFdFmt(fd, "%s overlayfs for %s\n", enable ? "disabling" : "using", mount_point); WriteFdFmt(fd, "%s overlayfs for %s\n", enable ? "disabling" : "using", mount_point);
} }
} else if (errno) { } else if (errno) {
WriteFdFmt(fd, "Overlayfs %s for %s failed with error %s\n", enable ? "teardown" : "setup", int expected_errno = enable ? EBUSY : ENOENT;
mount_point, strerror(errno)); if (errno != expected_errno) {
WriteFdFmt(fd, "Overlayfs %s for %s failed with error %s\n",
enable ? "teardown" : "setup", mount_point, strerror(errno));
}
} }
WriteFdFmt(fd, "Verity %s on %s\n", enable ? "enabled" : "disabled", mount_point); WriteFdFmt(fd, "Verity %s on %s\n", enable ? "enabled" : "disabled", mount_point);
return true; return true;