ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "fs_mgr_fstab: Remove legacy DSU logic for Q first_stage_init"

Browse source
This commit is contained in:
Yi-yo Chiang 2022-06-30 06:07:35 +00:00 • committed by Gerrit Code Review
commit fad8eabad7
1 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
fs_mgr/fs_mgr_fstab.cpp
View file

@ -742,22 +742,13 @@ bool ReadFstabFromFile(const std::string& path, Fstab* fstab_out) {
}
if (!is_proc_mounts) {
if (!access(android::gsi::kGsiBootedIndicatorFile, F_OK)) {
// This is expected to fail if host is android Q, since Q doesn't
// support DSU slotting. The DSU "active" indicator file would be
// non-existent or empty if DSU is enabled within the guest system.
// In that case, just use the default slot name "dsu".
std::string dsu_slot;
if (!android::gsi::GetActiveDsu(&dsu_slot) && errno != ENOENT) {
if (!android::gsi::GetActiveDsu(&dsu_slot)) {
PERROR << __FUNCTION__ << "(): failed to get active DSU slot";
return false;
}
if (dsu_slot.empty()) {
dsu_slot = "dsu";
LWARNING << __FUNCTION__ << "(): assuming default DSU slot: " << dsu_slot;
}
// This file is non-existent on Q vendor.
std::string lp_names;
if (!ReadFileToString(gsi::kGsiLpNamesFile, &lp_names) && errno != ENOENT) {
if (!ReadFileToString(gsi::kGsiLpNamesFile, &lp_names)) {
PERROR << __FUNCTION__ << "(): failed to read DSU LP names";
return false;
}