tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "libbootloader_message: use different fstab paths for normal/recovery boot" am: 5f98326c1e

Browse source 
am: 85882b0779

Change-Id: Ie7f75589e4ec7a3da4bc8cb31f0630837cbea4f4
This commit is contained in:
Bowgo Tsai 2017-03-25 17:13:13 +00:00 committed by android-build-merger
commit ec96346b84
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
bootloader_message/bootloader_message.cpp
View file

@ -19,6 +19,7 @@
#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>
@ -30,8 +31,13 @@
#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(fs_mgr_read_fstab_default(), std::unique_ptr<fstab, decltype(&fs_mgr_free_fstab)> fstab(nullptr, fs_mgr_free_fstab);
fs_mgr_free_fstab); // Use different fstab paths for normal boot and recovery boot, respectively
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 "";