init: Sort the list of flattened APEX folders to avoid variations
* In 'ActivateFlattenedApexesFrom', the 'readdir' detects
the APEX folders in a random way that depends on filesystems,
built packages and order of the chain
* In normal cases, this is not an issue, however when building
with Go configurations, we have a case where the package
'com.android.tethering.inprocess' is built along the
'com.android.tethering' overriden binary, and depending on
the 'readdir' output, the mounts break the Tethering service
Change-Id: I8ac4a0284d8d885f732c71e846933869cf16a0bd
Signed-off-by: Adrian DC <radian.dc@gmail.com>
diff --git a/init/mount_namespace.cpp b/init/mount_namespace.cpp
index f3b584c..700f977 100644
--- a/init/mount_namespace.cpp
+++ b/init/mount_namespace.cpp
@@ -136,19 +136,26 @@
return {};
}
dirent* entry;
+ std::vector<std::string> entries;
+
while ((entry = readdir(dir.get())) != nullptr) {
if (entry->d_name[0] == '.') continue;
if (entry->d_type == DT_DIR) {
- const std::string apex_path = from_dir + "/" + entry->d_name;
- const auto apex_name = GetApexName(apex_path);
- if (!apex_name.ok()) {
- LOG(ERROR) << apex_path << " is not an APEX directory: " << apex_name.error();
- continue;
- }
- const std::string mount_path = to_dir + "/" + (*apex_name);
- if (auto result = MountDir(apex_path, mount_path); !result.ok()) {
- return result;
- }
+ entries.push_back(entry->d_name);
+ }
+ }
+
+ std::sort(entries.begin(), entries.end());
+ for (const auto& name : entries) {
+ const std::string apex_path = from_dir + "/" + name;
+ const auto apex_name = GetApexName(apex_path);
+ if (!apex_name.ok()) {
+ LOG(ERROR) << apex_path << " is not an APEX directory: " << apex_name.error();
+ continue;
+ }
+ const std::string mount_path = to_dir + "/" + (*apex_name);
+ if (auto result = MountDir(apex_path, mount_path); !result.ok()) {
+ return result;
}
}
return {};