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

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

Browse source 
This reverts commit 37bd44174b.

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
This commit is contained in:
Bowgo Tsai 2017-03-27 17:47:21 +00:00
parent 37bd44174b
commit 4508f23884
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
bootloader_message/bootloader_message.cpp
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 "";