Merge "init: Sort the list of flattened APEX folders to avoid variations" (0f2c5417) · Commits · e / os / android_system_core

init/mount_namespace.cpp

+18 −11

Original line number	Diff line number	Diff line
		@@ -115,10 +115,18 @@ static Result<void> ActivateFlattenedApexesFrom(const std::string& from_dir,
		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;
		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_manifest = GetApexManifest(apex_path);
		if (!apex_manifest.ok()) {
		LOG(ERROR) << apex_path << " is not an APEX directory: " << apex_manifest.error();
		@@ -130,7 +138,6 @@ static Result<void> ActivateFlattenedApexesFrom(const std::string& from_dir,
		}
		on_activate(apex_path, *apex_manifest);
		}
		}
		return {};
		}