PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "vintf_object_recovery_mount"

Browse Source 
* changes:
  roots.cpp: convert to C++ Fstab
  Move parts of roots.cpp to libfs_mgr
This commit is contained in:
Yifan Hong
2018-12-19 22:19:52 +00:00
committed by Gerrit Code Review
parent 2e7393dbde d81b8e3d77
commit 82fc6ae5b8
7 changed files with 61 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fsck_unshare_blocks.cpp
+1 -1
View File
@@ -121,7 +121,7 @@ bool do_fsck_unshare_blocks() {
// Temporarily mount system so we can copy e2fsck_static. // Temporarily mount system so we can copy e2fsck_static.
std::string system_root = get_system_root(); std::string system_root = get_system_root();
bool mounted = ensure_path_mounted_at(system_root.c_str(), "/mnt/system") != -1; bool mounted = ensure_path_mounted_at(system_root, "/mnt/system") != -1;
partitions.push_back(system_root); partitions.push_back(system_root);
if (!mounted) { if (!mounted) {
install.cpp
+2 -2
View File
@@ -595,9 +595,9 @@ static int really_install_package(const std::string& path, bool* wipe_cache, boo
if (needs_mount) { if (needs_mount) {
if (path[0] == '@') { if (path[0] == '@') {
ensure_path_mounted(path.substr(1).c_str()); ensure_path_mounted(path.substr(1));
} else { } else {
ensure_path_mounted(path.c_str()); ensure_path_mounted(path);
} }
} }
logging.cpp
+1 -1
View File
@@ -46,7 +46,7 @@ static const std::string LAST_LOG_FILTER = "recovery/last_log";
// fopen(3)'s the given file, by mounting volumes and making parent dirs as necessary. Returns the // fopen(3)'s the given file, by mounting volumes and making parent dirs as necessary. Returns the
// file pointer, or nullptr on error. // file pointer, or nullptr on error.
static FILE* fopen_path(const std::string& path, const char* mode) { static FILE* fopen_path(const std::string& path, const char* mode) {
if (ensure_path_mounted(path.c_str()) != 0) { if (ensure_path_mounted(path) != 0) {
LOG(ERROR) << "Can't mount " << path; LOG(ERROR) << "Can't mount " << path;
return nullptr; return nullptr;
} }
recovery.cpp
+3 -3
View File
@@ -294,7 +294,7 @@ bool SetUsbConfig(const std::string& state) {
// Returns the selected filename, or an empty string. // Returns the selected filename, or an empty string.
static std::string browse_directory(const std::string& path, Device* device) { static std::string browse_directory(const std::string& path, Device* device) {
ensure_path_mounted(path.c_str()); ensure_path_mounted(path);
std::unique_ptr<DIR, decltype(&closedir)> d(opendir(path.c_str()), closedir); std::unique_ptr<DIR, decltype(&closedir)> d(opendir(path.c_str()), closedir);
if (!d) { if (!d) {
@@ -578,7 +578,7 @@ static void choose_recovery_file(Device* device) {
log_file += "." + std::to_string(i); log_file += "." + std::to_string(i);
} }
if (ensure_path_mounted(log_file.c_str()) == 0 && access(log_file.c_str(), R_OK) == 0) { if (ensure_path_mounted(log_file) == 0 && access(log_file.c_str(), R_OK) == 0) {
entries.push_back(std::move(log_file)); entries.push_back(std::move(log_file));
} }
}; };
@@ -842,7 +842,7 @@ static Device::BuiltinAction prompt_and_wait(Device* device, int status) {
} }
case Device::MOUNT_SYSTEM: case Device::MOUNT_SYSTEM:
// the system partition is mounted at /mnt/system // the system partition is mounted at /mnt/system
if (ensure_path_mounted_at(get_system_root().c_str(), "/mnt/system") != -1) { if (ensure_path_mounted_at(get_system_root(), "/mnt/system") != -1) {
ui->Print("Mounted /system.\n"); ui->Print("Mounted /system.\n");
} }
break; break;
roots.cpp
+47 -168
View File
@@ -29,6 +29,7 @@
#include <unistd.h> #include <unistd.h>
#include <algorithm> #include <algorithm>
#include <iostream>
#include <string> #include <string>
#include <vector> #include <vector>
@@ -39,168 +40,53 @@
#include <cryptfs.h> #include <cryptfs.h>
#include <ext4_utils/wipe.h> #include <ext4_utils/wipe.h>
#include <fs_mgr.h> #include <fs_mgr.h>
#include <fs_mgr/roots.h>
#include <fs_mgr_dm_linear.h> #include <fs_mgr_dm_linear.h>
#include "otautil/mounts.h" #include "otautil/mounts.h"
static struct fstab* fstab = nullptr; static Fstab fstab;
static bool did_map_logical_partitions = false;
static constexpr const char* SYSTEM_ROOT = "/system";
extern struct selabel_handle* sehandle; extern struct selabel_handle* sehandle;
void load_volume_table() { void load_volume_table() {
fstab = fs_mgr_read_fstab_default(); if (!ReadDefaultFstab(&fstab)) {
if (!fstab) {
LOG(ERROR) << "Failed to read default fstab"; LOG(ERROR) << "Failed to read default fstab";
return; return;
} }
int ret = fs_mgr_add_entry(fstab, "/tmp", "ramdisk", "ramdisk"); fstab.emplace_back(FstabEntry{
if (ret == -1) { .mount_point = "/tmp", .fs_type = "ramdisk", .blk_device = "ramdisk", .length = 0 });
LOG(ERROR) << "Failed to add /tmp entry to fstab";
fs_mgr_free_fstab(fstab);
fstab = nullptr;
return;
}
printf("recovery filesystem table\n"); std::cout << "recovery filesystem table" << std::endl << "=========================" << std::endl;
printf("=========================\n"); for (size_t i = 0; i < fstab.size(); ++i) {
for (int i = 0; i < fstab->num_entries; ++i) { const auto& entry = fstab[i];
const Volume* v = &fstab->recs[i]; std::cout << " " << i << " " << entry.mount_point << " "
printf(" %d %s %s %s %" PRId64 "\n", i, v->mount_point, v->fs_type, v->blk_device, v->length); << " " << entry.fs_type << " " << entry.blk_device << " " << entry.length
<< std::endl;
} }
printf("\n"); std::cout << std::endl;
} }
Volume* volume_for_mount_point(const std::string& mount_point) { Volume* volume_for_mount_point(const std::string& mount_point) {
return fs_mgr_get_entry_for_mount_point(fstab, mount_point); auto it = std::find_if(fstab.begin(), fstab.end(), [&mount_point](const auto& entry) {
} return entry.mount_point == mount_point;
});
// Finds the volume specified by the given path. fs_mgr_get_entry_for_mount_point() does exact match return it == fstab.end() ? nullptr : &*it;
// only, so it attempts the prefixes recursively (e.g. "/cache/recovery/last_log",
// "/cache/recovery", "/cache", "/" for a given path of "/cache/recovery/last_log") and returns the
// first match or nullptr.
static Volume* volume_for_path(const char* path) {
if (path == nullptr || path[0] == '\0') return nullptr;
std::string str(path);
while (true) {
Volume* result = fs_mgr_get_entry_for_mount_point(fstab, str);
if (result != nullptr || str == "/") {
return result;
}
size_t slash = str.find_last_of('/');
if (slash == std::string::npos) return nullptr;
if (slash == 0) {
str = "/";
} else {
str = str.substr(0, slash);
}
}
return nullptr;
} }
// Mount the volume specified by path at the given mount_point. // Mount the volume specified by path at the given mount_point.
int ensure_path_mounted_at(const char* path, const char* mount_point) { int ensure_path_mounted_at(const std::string& path, const std::string& mount_point) {
Volume* v = volume_for_path(path); return android::fs_mgr::EnsurePathMounted(&fstab, path, mount_point) ? 0 : -1;
if (v == nullptr) {
LOG(ERROR) << "unknown volume for path [" << path << "]";
return -1;
}
if (strcmp(v->fs_type, "ramdisk") == 0) {
// The ramdisk is always mounted.
return 0;
}
if (!scan_mounted_volumes()) {
LOG(ERROR) << "Failed to scan mounted volumes";
return -1;
}
if (!mount_point) {
mount_point = v->mount_point;
}
// If we can't acquire the block device for a logical partition, it likely
// was never created. In that case we try to create it.
if (fs_mgr_is_logical(v) && !fs_mgr_update_logical_partition(v)) {
if (did_map_logical_partitions) {
LOG(ERROR) << "Failed to find block device for partition";
return -1;
}
std::string super_name = fs_mgr_get_super_partition_name();
if (!android::fs_mgr::CreateLogicalPartitions(super_name)) {
LOG(ERROR) << "Failed to create logical partitions";
return -1;
}
did_map_logical_partitions = true;
if (!fs_mgr_update_logical_partition(v)) {
LOG(ERROR) << "Failed to find block device for partition";
return -1;
}
}
const MountedVolume* mv = find_mounted_volume_by_mount_point(mount_point);
if (mv != nullptr) {
// Volume is already mounted.
return 0;
}
mkdir(mount_point, 0755); // in case it doesn't already exist
if (strcmp(v->fs_type, "ext4") == 0 || strcmp(v->fs_type, "squashfs") == 0 ||
strcmp(v->fs_type, "vfat") == 0 || strcmp(v->fs_type, "f2fs") == 0) {
int result = mount(v->blk_device, mount_point, v->fs_type, v->flags, v->fs_options);
if (result == -1 && fs_mgr_is_formattable(v)) {
PLOG(ERROR) << "Failed to mount " << mount_point << "; formatting";
bool crypt_footer = fs_mgr_is_encryptable(v) && !strcmp(v->key_loc, "footer");
if (fs_mgr_do_format(v, crypt_footer) == 0) {
result = mount(v->blk_device, mount_point, v->fs_type, v->flags, v->fs_options);
} else {
PLOG(ERROR) << "Failed to format " << mount_point;
return -1;
}
}
if (result == -1) {
PLOG(ERROR) << "Failed to mount " << mount_point;
return -1;
}
return 0;
}
LOG(ERROR) << "unknown fs_type \"" << v->fs_type << "\" for " << mount_point;
return -1;
} }
int ensure_path_mounted(const char* path) { int ensure_path_mounted(const std::string& path) {
// Mount at the default mount point. // Mount at the default mount point.
return ensure_path_mounted_at(path, nullptr); return android::fs_mgr::EnsurePathMounted(&fstab, path) ? 0 : -1;
} }
int ensure_path_unmounted(const char* path) { int ensure_path_unmounted(const std::string& path) {
const Volume* v = volume_for_path(path); return android::fs_mgr::EnsurePathUnmounted(&fstab, path) ? 0 : -1;
if (v == nullptr) {
LOG(ERROR) << "unknown volume for path [" << path << "]";
return -1;
}
if (strcmp(v->fs_type, "ramdisk") == 0) {
// The ramdisk is always mounted; you can't unmount it.
return -1;
}
if (!scan_mounted_volumes()) {
LOG(ERROR) << "Failed to scan mounted volumes";
return -1;
}
MountedVolume* mv = find_mounted_volume_by_mount_point(v->mount_point);
if (mv == nullptr) {
// Volume is already unmounted.
return 0;
}
return unmount_mounted_volume(mv);
} }
static int exec_cmd(const std::vector<std::string>& args) { static int exec_cmd(const std::vector<std::string>& args) {
@@ -248,17 +134,17 @@ static int64_t get_file_size(int fd, uint64_t reserve_len) {
return computed_size; return computed_size;
} }
int format_volume(const char* volume, const char* directory) { int format_volume(const std::string& volume, const std::string& directory) {
const Volume* v = volume_for_path(volume); const FstabEntry* v = android::fs_mgr::GetEntryForPath(&fstab, volume);
if (v == nullptr) { if (v == nullptr) {
LOG(ERROR) << "unknown volume \"" << volume << "\""; LOG(ERROR) << "unknown volume \"" << volume << "\"";
return -1; return -1;
} }
if (strcmp(v->fs_type, "ramdisk") == 0) { if (v->fs_type == "ramdisk") {
LOG(ERROR) << "can't format_volume \"" << volume << "\""; LOG(ERROR) << "can't format_volume \"" << volume << "\"";
return -1; return -1;
} }
if (strcmp(v->mount_point, volume) != 0) { if (v->mount_point != volume) {
LOG(ERROR) << "can't give path \"" << volume << "\" to format_volume"; LOG(ERROR) << "can't give path \"" << volume << "\" to format_volume";
return -1; return -1;
} }
@@ -266,16 +152,16 @@ int format_volume(const char* volume, const char* directory) {
LOG(ERROR) << "format_volume: Failed to unmount \"" << v->mount_point << "\""; LOG(ERROR) << "format_volume: Failed to unmount \"" << v->mount_point << "\"";
return -1; return -1;
} }
if (strcmp(v->fs_type, "ext4") != 0 && strcmp(v->fs_type, "f2fs") != 0) { if (v->fs_type != "ext4" && v->fs_type != "f2fs") {
LOG(ERROR) << "format_volume: fs_type \"" << v->fs_type << "\" unsupported"; LOG(ERROR) << "format_volume: fs_type \"" << v->fs_type << "\" unsupported";
return -1; return -1;
} }
// If there's a key_loc that looks like a path, it should be a block device for storing encryption // If there's a key_loc that looks like a path, it should be a block device for storing encryption
// metadata. Wipe it too. // metadata. Wipe it too.
if (v->key_loc != nullptr && v->key_loc[0] == '/') { if (!v->key_loc.empty() && v->key_loc[0] == '/') {
LOG(INFO) << "Wiping " << v->key_loc; LOG(INFO) << "Wiping " << v->key_loc;
int fd = open(v->key_loc, O_WRONLY | O_CREAT, 0644); int fd = open(v->key_loc.c_str(), O_WRONLY | O_CREAT, 0644);
if (fd == -1) { if (fd == -1) {
PLOG(ERROR) << "format_volume: Failed to open " << v->key_loc; PLOG(ERROR) << "format_volume: Failed to open " << v->key_loc;
return -1; return -1;
@@ -287,9 +173,8 @@ int format_volume(const char* volume, const char* directory) {
int64_t length = 0; int64_t length = 0;
if (v->length > 0) { if (v->length > 0) {
length = v->length; length = v->length;
} else if (v->length < 0 || } else if (v->length < 0 || v->key_loc == "footer") {
(v->key_loc != nullptr && strcmp(v->key_loc, "footer") == 0)) { android::base::unique_fd fd(open(v->blk_device.c_str(), O_RDONLY));
android::base::unique_fd fd(open(v->blk_device, O_RDONLY));
if (fd == -1) { if (fd == -1) {
PLOG(ERROR) << "format_volume: failed to open " << v->blk_device; PLOG(ERROR) << "format_volume: failed to open " << v->blk_device;
return -1; return -1;
@@ -303,7 +188,7 @@ int format_volume(const char* volume, const char* directory) {
} }
} }
if (strcmp(v->fs_type, "ext4") == 0) { if (v->fs_type == "ext4") {
static constexpr int kBlockSize = 4096; static constexpr int kBlockSize = 4096;
std::vector<std::string> mke2fs_args = { std::vector<std::string> mke2fs_args = {
"/system/bin/mke2fs", "-F", "-t", "ext4", "-b", std::to_string(kBlockSize), "/system/bin/mke2fs", "-F", "-t", "ext4", "-b", std::to_string(kBlockSize),
@@ -326,7 +211,7 @@ int format_volume(const char* volume, const char* directory) {
} }
int result = exec_cmd(mke2fs_args); int result = exec_cmd(mke2fs_args);
if (result == 0 && directory != nullptr) { if (result == 0 && !directory.empty()) {
std::vector<std::string> e2fsdroid_args = { std::vector<std::string> e2fsdroid_args = {
"/system/bin/e2fsdroid", "-e", "-f", directory, "-a", volume, v->blk_device, "/system/bin/e2fsdroid", "-e", "-f", directory, "-a", volume, v->blk_device,
}; };
@@ -355,7 +240,7 @@ int format_volume(const char* volume, const char* directory) {
} }
int result = exec_cmd(make_f2fs_cmd); int result = exec_cmd(make_f2fs_cmd);
if (result == 0 && directory != nullptr) { if (result == 0 && !directory.empty()) {
cmd = "/sbin/sload.f2fs"; cmd = "/sbin/sload.f2fs";
// clang-format off // clang-format off
std::vector<std::string> sload_f2fs_cmd = { std::vector<std::string> sload_f2fs_cmd = {
@@ -374,31 +259,29 @@ int format_volume(const char* volume, const char* directory) {
return 0; return 0;
} }
int format_volume(const char* volume) { int format_volume(const std::string& volume) {
return format_volume(volume, nullptr); return format_volume(volume, "");
} }
int setup_install_mounts() { int setup_install_mounts() {
if (fstab == nullptr) { if (fstab.empty()) {
LOG(ERROR) << "can't set up install mounts: no fstab loaded"; LOG(ERROR) << "can't set up install mounts: no fstab loaded";
return -1; return -1;
} }
for (int i = 0; i < fstab->num_entries; ++i) { for (const FstabEntry& entry : fstab) {
const Volume* v = fstab->recs + i;
// We don't want to do anything with "/". // We don't want to do anything with "/".
if (strcmp(v->mount_point, "/") == 0) { if (entry.mount_point == "/") {
continue; continue;
} }
if (strcmp(v->mount_point, "/tmp") == 0 || strcmp(v->mount_point, "/cache") == 0) { if (entry.mount_point == "/tmp" || entry.mount_point == "/cache") {
if (ensure_path_mounted(v->mount_point) != 0) { if (ensure_path_mounted(entry.mount_point) != 0) {
LOG(ERROR) << "Failed to mount " << v->mount_point; LOG(ERROR) << "Failed to mount " << entry.mount_point;
return -1; return -1;
} }
} else { } else {
if (ensure_path_unmounted(v->mount_point) != 0) { if (ensure_path_unmounted(entry.mount_point) != 0) {
LOG(ERROR) << "Failed to unmount " << v->mount_point; LOG(ERROR) << "Failed to unmount " << entry.mount_point;
return -1; return -1;
} }
} }
@@ -407,13 +290,9 @@ int setup_install_mounts() {
} }
bool logical_partitions_mapped() { bool logical_partitions_mapped() {
return did_map_logical_partitions; return android::fs_mgr::LogicalPartitionsMapped();
} }
std::string get_system_root() { std::string get_system_root() {
if (volume_for_mount_point(SYSTEM_ROOT) == nullptr) { return android::fs_mgr::GetSystemRoot();
return "/";
} else {
return SYSTEM_ROOT;
}
} }
roots.h
+6 -6
View File
@@ -19,7 +19,7 @@
#include <string> #include <string>
typedef struct fstab_rec Volume; typedef struct FstabEntry Volume;
// Load and parse volume data from /etc/recovery.fstab. // Load and parse volume data from /etc/recovery.fstab.
void load_volume_table(); void load_volume_table();
@@ -29,25 +29,25 @@ Volume* volume_for_mount_point(const std::string& mount_point);
// Make sure that the volume 'path' is on is mounted. Returns 0 on // Make sure that the volume 'path' is on is mounted. Returns 0 on
// success (volume is mounted). // success (volume is mounted).
int ensure_path_mounted(const char* path); int ensure_path_mounted(const std::string& path);
// Similar to ensure_path_mounted, but allows one to specify the mount_point. // Similar to ensure_path_mounted, but allows one to specify the mount_point.
int ensure_path_mounted_at(const char* path, const char* mount_point); int ensure_path_mounted_at(const std::string& path, const std::string& mount_point);
// Make sure that the volume 'path' is on is unmounted. Returns 0 on // Make sure that the volume 'path' is on is unmounted. Returns 0 on
// success (volume is unmounted); // success (volume is unmounted);
int ensure_path_unmounted(const char* path); int ensure_path_unmounted(const std::string& path);
// Reformat the given volume (must be the mount point only, eg // Reformat the given volume (must be the mount point only, eg
// "/cache"), no paths permitted. Attempts to unmount the volume if // "/cache"), no paths permitted. Attempts to unmount the volume if
// it is mounted. // it is mounted.
int format_volume(const char* volume); int format_volume(const std::string& volume);
// Reformat the given volume (must be the mount point only, eg // Reformat the given volume (must be the mount point only, eg
// "/cache"), no paths permitted. Attempts to unmount the volume if // "/cache"), no paths permitted. Attempts to unmount the volume if
// it is mounted. // it is mounted.
// Copies 'directory' to root of the newly formatted volume // Copies 'directory' to root of the newly formatted volume
int format_volume(const char* volume, const char* directory); int format_volume(const std::string& volume, const std::string& directory);
// Ensure that all and only the volumes that packages expect to find // Ensure that all and only the volumes that packages expect to find
// mounted (/tmp and /cache) are mounted. Returns 0 on success. // mounted (/tmp and /cache) are mounted. Returns 0 on success.
tests/Android.bp
+1
View File
@@ -94,6 +94,7 @@ librecovery_static_libs = [
"libhidltransport", "libhidltransport",
"libhwbinder_noltopgo", "libhwbinder_noltopgo",
"libbinderthreadstate", "libbinderthreadstate",
"liblp",
"libvndksupport", "libvndksupport",
"libtinyxml2", "libtinyxml2",
] ]