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

Commit 4508f238 authored by Bowgo Tsai's avatar Bowgo Tsai
Browse files

Revert "libbootloader_message: use different fstab paths for normal/recovery boot" 

This reverts commit 37bd4417.

The logic here is better to be moved into fs_mgr, not fs_mgr clients.

Bug: 35811655
Bug: 36502022

Change-Id: Iae79bd8f7131516ad223f3323f1bc1d805206d51
Test: normal boot sailfish, go to Settings > System & tap 
      on "Factory Data reset"
Test: recovery boot sailfish
parent 37bd4417

bootloader_message/bootloader_message.cpp

+2 −8
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <errno.h>

#include <fcntl.h>

#include <string.h>

#include <unistd.h>



#include <string>

#include <vector>
@@ -31,13 +30,8 @@ 
#include <fs_mgr.h>



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);

  // 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());

  }

  std::unique_ptr<fstab, decltype(&fs_mgr_free_fstab)> fstab(fs_mgr_read_fstab_default(),

                                                             fs_mgr_free_fstab);

  if (!fstab) {

    *err = "failed to read default fstab";

    return "";