Use default dsu slot name when host is Android Q
DSU slotting support is added in Android R, so android::gsi::GetActiveDsu() is guaranteed to fail if DSU guest system is S and host is Q. In that case, just assume the the DSU slot to be "dsu". Bug: 172541102 Bug: 168571434 Test: Boot GSI S on Q pixel with DSU Change-Id: I96e191907ce2fedf8c22b7887e930a7c455eb593
This commit is contained in:
parent
56850e12e3
commit
b445a01263
1 changed files with 5 additions and 2 deletions
|
@ -694,8 +694,11 @@ bool ReadFstabFromFile(const std::string& path, Fstab* fstab) {
|
|||
if (!is_proc_mounts && !access(android::gsi::kGsiBootedIndicatorFile, F_OK)) {
|
||||
std::string dsu_slot;
|
||||
if (!android::gsi::GetActiveDsu(&dsu_slot)) {
|
||||
PERROR << __FUNCTION__ << "(): failed to get active dsu slot";
|
||||
return false;
|
||||
// This is expected to fail if host is android Q, since Q doesn't
|
||||
// support DSU slotting.
|
||||
// In that case, just use the default slot name "dsu".
|
||||
PWARNING << __FUNCTION__ << "(): failed to get active dsu slot";
|
||||
dsu_slot = "dsu";
|
||||
}
|
||||
std::string lp_names;
|
||||
ReadFileToString(gsi::kGsiLpNamesFile, &lp_names);
|
||||
|
|
Loading…
Reference in a new issue