Merge "Remove the mount points defined in skip_mount.cfg from ReadDefaultFstab()" into qt-dev (ff9ac9e2) · Commits · e / os / android_system_core

fs_mgr/fs_mgr_fstab.cpp

+33 −0

Original line number	Diff line number	Diff line
		@@ -38,6 +38,7 @@

		using android::base::ParseByteCount;
		using android::base::ParseInt;
		using android::base::ReadFileToString;
		using android::base::Split;
		using android::base::StartsWith;

		@@ -660,6 +661,8 @@ bool ReadFstabFromFile(const std::string& path, Fstab* fstab) {
		TransformFstabForGsi(fstab);
		}

		SkipMountingPartitions(fstab);

		return true;
		}

		@@ -687,6 +690,36 @@ bool ReadFstabFromDt(Fstab* fstab, bool log) {
		return false;
		}

		SkipMountingPartitions(fstab);

		return true;
		}

		// For GSI to skip mounting /product and /product_services, until there are
		// well-defined interfaces between them and /system. Otherwise, the GSI flashed
		// on /system might not be able to work with /product and /product_services.
		// When they're skipped here, /system/product and /system/product_services in
		// GSI will be used.
		bool SkipMountingPartitions(Fstab* fstab) {
		constexpr const char kSkipMountConfig[] = "/system/etc/init/config/skip_mount.cfg";

		std::string skip_config;
		if (!ReadFileToString(kSkipMountConfig, &skip_config)) {
		return true;
		}

		for (const auto& skip_mount_point : Split(skip_config, "\n")) {
		if (skip_mount_point.empty()) {
		continue;
		}
		auto it = std::remove_if(fstab->begin(), fstab->end(),
		[&skip_mount_point](const auto& entry) {
		return entry.mount_point == skip_mount_point;
		});
		fstab->erase(it, fstab->end());
		LOG(INFO) << "Skip mounting partition: " << skip_mount_point;
		}

		return true;
		}

fs_mgr/include_fstab/fstab/fstab.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -99,6 +99,7 @@ using Fstab = std::vector<FstabEntry>;
		bool ReadFstabFromFile(const std::string& path, Fstab* fstab);
		bool ReadFstabFromDt(Fstab* fstab, bool log = true);
		bool ReadDefaultFstab(Fstab* fstab);
		bool SkipMountingPartitions(Fstab* fstab);

		FstabEntry* GetEntryForMountPoint(Fstab* fstab, const std::string& path);

init/first_stage_mount.cpp

+2 −30

Original line number	Diff line number	Diff line
		@@ -43,7 +43,6 @@
		#include "uevent_listener.h"
		#include "util.h"

		using android::base::ReadFileToString;
		using android::base::Split;
		using android::base::Timer;
		using android::fs_mgr::AvbHandle;
		@@ -55,6 +54,7 @@ using android::fs_mgr::Fstab;
		using android::fs_mgr::FstabEntry;
		using android::fs_mgr::ReadDefaultFstab;
		using android::fs_mgr::ReadFstabFromDt;
		using android::fs_mgr::SkipMountingPartitions;

		using namespace std::literals;

		@@ -524,38 +524,10 @@ bool FirstStageMount::TrySwitchSystemAsRoot() {
		return true;
		}

		// For GSI to skip mounting /product and /product_services, until there are
		// well-defined interfaces between them and /system. Otherwise, the GSI flashed
		// on /system might not be able to work with /product and /product_services.
		// When they're skipped here, /system/product and /system/product_services in
		// GSI will be used.
		bool FirstStageMount::TrySkipMountingPartitions() {
		constexpr const char kSkipMountConfig[] = "/system/etc/init/config/skip_mount.cfg";

		std::string skip_config;
		if (!ReadFileToString(kSkipMountConfig, &skip_config)) {
		return true;
		}

		for (const auto& skip_mount_point : Split(skip_config, "\n")) {
		if (skip_mount_point.empty()) {
		continue;
		}
		auto it = std::remove_if(fstab_.begin(), fstab_.end(),
		[&skip_mount_point](const auto& entry) {
		return entry.mount_point == skip_mount_point;
		});
		fstab_.erase(it, fstab_.end());
		LOG(INFO) << "Skip mounting partition: " << skip_mount_point;
		}

		return true;
		}

		bool FirstStageMount::MountPartitions() {
		if (!TrySwitchSystemAsRoot()) return false;

		if (!TrySkipMountingPartitions()) return false;
		if (!SkipMountingPartitions(&fstab_)) return false;

		for (auto current = fstab_.begin(); current != fstab_.end();) {
		// We've already mounted /system above.