summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBowgo Tsai <bowgotsai@google.com>2017-03-25 18:13:13 +0100
committerandroid-build-merger <android-build-merger@google.com>2017-03-25 18:13:13 +0100
commitec96346b847d44ec6051e995841f7b8cb821db5e (patch)
tree9064b5163df29917764fdc303d47b5b42e58f013
parentMerge "updater: Drop the support for BBOTA v1 and v2." am: 5479506c9c (diff)
parentMerge "libbootloader_message: use different fstab paths for normal/recovery boot" (diff)
downloadandroid_bootable_recovery-ec96346b847d44ec6051e995841f7b8cb821db5e.tar
android_bootable_recovery-ec96346b847d44ec6051e995841f7b8cb821db5e.tar.gz
android_bootable_recovery-ec96346b847d44ec6051e995841f7b8cb821db5e.tar.bz2
android_bootable_recovery-ec96346b847d44ec6051e995841f7b8cb821db5e.tar.lz
android_bootable_recovery-ec96346b847d44ec6051e995841f7b8cb821db5e.tar.xz
android_bootable_recovery-ec96346b847d44ec6051e995841f7b8cb821db5e.tar.zst
android_bootable_recovery-ec96346b847d44ec6051e995841f7b8cb821db5e.zip
Diffstat (limited to '')
-rw-r--r--bootloader_message/bootloader_message.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/bootloader_message/bootloader_message.cpp b/bootloader_message/bootloader_message.cpp
index d8086be28..d17e055bb 100644
--- a/bootloader_message/bootloader_message.cpp
+++ b/bootloader_message/bootloader_message.cpp
@@ -19,6 +19,7 @@
#include <errno.h>
#include <fcntl.h>
#include <string.h>
+#include <unistd.h>
#include <string>
#include <vector>
@@ -30,8 +31,13 @@
#include <fs_mgr.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);
+ std::unique_ptr<fstab, decltype(&fs_mgr_free_fstab)> fstab(nullptr, 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) {
*err = "failed to read default fstab";
return "";