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

Merge "Remove the mount points defined in skip_mount.cfg from ReadDefaultFstab()"

Browse source
This commit is contained in:
Treehugger Robot 2019-04-24 02:53:53 +00:00 committed by Gerrit Code Review
commit 74d84224ae
3 changed files with 36 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
fs_mgr/fs_mgr_fstab.cpp
View file

@ -38,6 +38,7 @@
using android::base::ParseByteCount;
using android::base::ParseInt;
using android::base::ReadFileToString;
using android::base::Split;
using android::base::StartsWith;
@ -660,6 +661,8 @@ bool ReadFstabFromFile(const std::string& path, Fstab* fstab) {
TransformFstabForGsi(fstab);
}
SkipMountingPartitions(fstab);
return true;
}
@ -687,6 +690,36 @@ bool ReadFstabFromDt(Fstab* fstab, bool log) {
return false;
}
SkipMountingPartitions(fstab);
return true;
}
// For GSI to skip mounting /product and /product_services, until there are
// well-defined interfaces between them and /system. Otherwise, the GSI flashed
// on /system might not be able to work with /product and /product_services.
// When they're skipped here, /system/product and /system/product_services in
// GSI will be used.
bool SkipMountingPartitions(Fstab* fstab) {
constexpr const char kSkipMountConfig[] = "/system/etc/init/config/skip_mount.cfg";
std::string skip_config;
if (!ReadFileToString(kSkipMountConfig, &skip_config)) {
return true;
}
for (const auto& skip_mount_point : Split(skip_config, "\n")) {
if (skip_mount_point.empty()) {
continue;
}
auto it = std::remove_if(fstab->begin(), fstab->end(),
[&skip_mount_point](const auto& entry) {
return entry.mount_point == skip_mount_point;
});
fstab->erase(it, fstab->end());
LOG(INFO) << "Skip mounting partition: " << skip_mount_point;
}
return true;
}

1
fs_mgr/include_fstab/fstab/fstab.h
View file

@ -99,6 +99,7 @@ using Fstab = std::vector<FstabEntry>;
bool ReadFstabFromFile(const std::string& path, Fstab* fstab);
bool ReadFstabFromDt(Fstab* fstab, bool log = true);
bool ReadDefaultFstab(Fstab* fstab);
bool SkipMountingPartitions(Fstab* fstab);
FstabEntry* GetEntryForMountPoint(Fstab* fstab, const std::string& path);

32
init/first_stage_mount.cpp
View file

@ -43,7 +43,6 @@
#include "uevent_listener.h"
#include "util.h"
using android::base::ReadFileToString;
using android::base::Split;
using android::base::Timer;
using android::fs_mgr::AvbHandle;
@ -55,6 +54,7 @@ using android::fs_mgr::Fstab;
using android::fs_mgr::FstabEntry;
using android::fs_mgr::ReadDefaultFstab;
using android::fs_mgr::ReadFstabFromDt;
using android::fs_mgr::SkipMountingPartitions;
using namespace std::literals;
@ -524,38 +524,10 @@ bool FirstStageMount::TrySwitchSystemAsRoot() {
return true;
}
// For GSI to skip mounting /product and /product_services, until there are
// well-defined interfaces between them and /system. Otherwise, the GSI flashed
// on /system might not be able to work with /product and /product_services.
// When they're skipped here, /system/product and /system/product_services in
// GSI will be used.
bool FirstStageMount::TrySkipMountingPartitions() {
constexpr const char kSkipMountConfig[] = "/system/etc/init/config/skip_mount.cfg";
std::string skip_config;
if (!ReadFileToString(kSkipMountConfig, &skip_config)) {
return true;
}
for (const auto& skip_mount_point : Split(skip_config, "\n")) {
if (skip_mount_point.empty()) {
continue;
}
auto it = std::remove_if(fstab_.begin(), fstab_.end(),
[&skip_mount_point](const auto& entry) {
return entry.mount_point == skip_mount_point;
});
fstab_.erase(it, fstab_.end());
LOG(INFO) << "Skip mounting partition: " << skip_mount_point;
}
return true;
}
bool FirstStageMount::MountPartitions() {
if (!TrySwitchSystemAsRoot()) return false;
if (!TrySkipMountingPartitions()) return false;
if (!SkipMountingPartitions(&fstab_)) return false;
for (auto current = fstab_.begin(); current != fstab_.end();) {
// We've already mounted /system above.