aboutsummaryrefslogtreecommitdiff
path: root/volume_manager
diff options
context:
space:
mode:
authorAlessandro <ales.astone@gmail.com>2020-04-06 23:55:07 +0200
committerMichael Bestas <mkbestas@lineageos.org>2022-08-29 23:07:49 +0300
commit82fb0faa0f12ee8f970a31d74b5f71ffdf83977b (patch)
treec72baaf249d94fd2f4fd70a7e04117f387d7fc17 /volume_manager
parent0057c5f93dca57607e2793386de2729b1a9cb947 (diff)
recovery: Don't print mount errors when checking for encryption
Change-Id: Ibd57b8bdb9c942edb16fa5b9e4664ed66864b180
Diffstat (limited to 'volume_manager')
-rw-r--r--volume_manager/EmulatedVolume.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/volume_manager/EmulatedVolume.cpp b/volume_manager/EmulatedVolume.cpp
index d0e0dcf4..88eb7d98 100644
--- a/volume_manager/EmulatedVolume.cpp
+++ b/volume_manager/EmulatedVolume.cpp
@@ -25,6 +25,7 @@
#include <cutils/fs.h>
#include <private/android_filesystem_config.h>
+#include <iostream>
#include <fcntl.h>
#include <stdlib.h>
#include <sys/mount.h>
@@ -70,7 +71,9 @@ status_t EmulatedVolume::doMount() {
if (::mount(mDevPath.c_str(), kStagingPath.c_str(), mFsType.c_str(), mFlags,
mFsOptions.c_str()) != 0) {
- PLOG(ERROR) << getId() << " failed to mount " << mDevPath << " on " << kStagingPath;
+ // It's ok to fail mounting if we're encrytped, so avoid printing to recovery's UiLogger
+ std::cout << getId() << " failed to mount " << mDevPath << " on " << kStagingPath
+ << ": " << std::strerror(errno);
return -EIO;
}
if (BindMount(bindPath, getPath()) != OK) {