Skip to content

Commit b445a01

Browse files
committed
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
1 parent 56850e1 commit b445a01

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

fs_mgr/fs_mgr_fstab.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -694,8 +694,11 @@ bool ReadFstabFromFile(const std::string& path, Fstab* fstab) {
694694
if (!is_proc_mounts && !access(android::gsi::kGsiBootedIndicatorFile, F_OK)) {
695695
std::string dsu_slot;
696696
if (!android::gsi::GetActiveDsu(&dsu_slot)) {
697-
PERROR << __FUNCTION__ << "(): failed to get active dsu slot";
698-
return false;
697+
// This is expected to fail if host is android Q, since Q doesn't
698+
// support DSU slotting.
699+
// In that case, just use the default slot name "dsu".
700+
PWARNING << __FUNCTION__ << "(): failed to get active dsu slot";
701+
dsu_slot = "dsu";
699702
}
700703
std::string lp_names;
701704
ReadFileToString(gsi::kGsiLpNamesFile, &lp_names);

0 commit comments

Comments
 (0)