Loading bootloader_message/bootloader_message.cpp +8 −2 Original line number Diff line number Diff line Loading @@ -19,6 +19,7 @@ #include <errno.h> #include <fcntl.h> #include <string.h> #include <unistd.h> #include <string> #include <vector> Loading @@ -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 ""; Loading Loading
bootloader_message/bootloader_message.cpp +8 −2 Original line number Diff line number Diff line Loading @@ -19,6 +19,7 @@ #include <errno.h> #include <fcntl.h> #include <string.h> #include <unistd.h> #include <string> #include <vector> Loading @@ -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 ""; Loading