Merge "adbd: fix check of remount -R."
This commit is contained in:
commit
d81c4f07fb
1 changed files with 1 additions and 1 deletions
|
|
@ -216,7 +216,7 @@ static void reboot_for_remount(int fd, bool need_fsck) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void remount_service(unique_fd fd, const std::string& cmd) {
|
void remount_service(unique_fd fd, const std::string& cmd) {
|
||||||
bool user_requested_reboot = cmd != "-R";
|
bool user_requested_reboot = cmd == "-R";
|
||||||
|
|
||||||
if (getuid() != 0) {
|
if (getuid() != 0) {
|
||||||
WriteFdExactly(fd.get(), "Not running as root. Try \"adb root\" first.\n");
|
WriteFdExactly(fd.get(), "Not running as root. Try \"adb root\" first.\n");
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue