Merge "fs_mgr: Allow commas in boot device paths." am: f9459a45eb am: e64cc297b6 (46f88817) · Commits · e / os / android_system_core

fs_mgr/fs_mgr_fstab.cpp

+14 −0

Original line number	Diff line number	Diff line
		@@ -829,6 +829,20 @@ std::set<std::string> GetBootDevices() {
		return std::set<std::string>(boot_devices.begin(), boot_devices.end());
		}

		std::string cmdline;
		if (android::base::ReadFileToString("/proc/cmdline", &cmdline)) {
		std::set<std::string> boot_devices;
		const std::string cmdline_key = "androidboot.boot_device";
		for (const auto& [key, value] : fs_mgr_parse_boot_config(cmdline)) {
		if (key == cmdline_key) {
		boot_devices.emplace(value);
		}
		}
		if (!boot_devices.empty()) {
		return boot_devices;
		}
		}

		// Fallback to extract boot devices from fstab.
		Fstab fstab;
		if (!ReadDefaultFstab(&fstab)) {