Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 524d0da3 authored by Bowgo Tsai's avatar Bowgo Tsai Committed by android-build-merger
Browse files

Merge "libbootloader_message: use different fstab paths for normal/recovery...

Merge "libbootloader_message: use different fstab paths for normal/recovery boot" am: 5f98326c am: 85882b07
am: ec96346b

Change-Id: I7d1750e6031e42fb331974cc21b2a6f71e799584
parents eb7c0dc6 ec96346b
Loading
Loading
Loading
Loading
+8 −2
Original line number Diff line number Diff line
@@ -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 "";