PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move some small users of fstab to new C++ Fstab

Browse Source 
Bug: 62292478
Test: tree-hugger
Change-Id: Ie2cc10e5168ef3b9dcc42f88e67a1ccd1175fcc5
This commit is contained in:
Tom Cherry
2018-12-04 09:37:39 -08:00
parent 8fc15c02bd
commit 772c93ca5c
2 changed files with 27 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
bootloader_message/bootloader_message.cpp
View File

@@ -27,21 +27,22 @@
#include <android-base/properties.h>
#include <android-base/stringprintf.h>
#include <android-base/unique_fd.h>
#include <fs_mgr.h>
#include <fstab/fstab.h>
static std::string get_misc_blk_device(std::string* err) {
std::unique_ptr<fstab, decltype(&fs_mgr_free_fstab)> fstab(fs_mgr_read_fstab_default(),
fs_mgr_free_fstab);
if (!fstab) {
Fstab fstab;
if (!ReadDefaultFstab(&fstab)) {
*err = "failed to read default fstab";
return "";
}
fstab_rec* record = fs_mgr_get_entry_for_mount_point(fstab.get(), "/misc");
if (record == nullptr) {
*err = "failed to find /misc partition";
return "";
for (const auto& entry : fstab) {
if (entry.mount_point == "/misc") {
return entry.blk_device;
}
}
return record->blk_device;
*err = "failed to find /misc partition";
return "";
}
// In recovery mode, recovery can get started and try to access the misc