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

Merge "Revert "libbootloader_message: use different fstab paths for normal/recovery boot"" am: 27c3e47853

Browse Source 
am: b0e768e269

Change-Id: I87d8040917dcd2fc6e233458c8b14f4cdb15e457
This commit is contained in:
Tao Bao
2017-03-27 19:32:06 +00:00
committed by android-build-merger
parent 334850c9fe b0e768e269
commit e65835d5ac
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bootloader_message/bootloader_message.cpp
+2 -8
View File
@@ -19,7 +19,6 @@
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <string.h> #include <string.h>
#include <unistd.h>
#include <string> #include <string>
#include <vector> #include <vector>
@@ -31,13 +30,8 @@
#include <fs_mgr.h> #include <fs_mgr.h>
static std::string get_misc_blk_device(std::string* err) { static std::string get_misc_blk_device(std::string* err) {
std::unique_ptr<fstab, decltype(&fs_mgr_free_fstab)> fstab(nullptr, fs_mgr_free_fstab); std::unique_ptr<fstab, decltype(&fs_mgr_free_fstab)> fstab(fs_mgr_read_fstab_default(),
// Use different fstab paths for normal boot and recovery boot, respectively fs_mgr_free_fstab);
if (access("/sbin/recovery", F_OK) == 0) {
fstab.reset(fs_mgr_read_fstab_with_dt("/etc/recovery.fstab"));
} else {
fstab.reset(fs_mgr_read_fstab_default());
}
if (!fstab) { if (!fstab) {
*err = "failed to read default fstab"; *err = "failed to read default fstab";
return ""; return "";