Merge "init: always initialize device-mapper" (8a3630e3) · Commits · e / os / android_system_core

init/first_stage_mount.cpp

+4 −12

Original line number	Diff line number	Diff line
		@@ -276,14 +276,12 @@ bool FirstStageMount::GetDmLinearMetadataDevice() {
		// required_devices_partition_names_. Found partitions will then be removed from it
		// for the subsequent member function to check which devices are NOT created.
		bool FirstStageMount::InitRequiredDevices() {
		if (required_devices_partition_names_.empty()) {
		return true;
		}

		if (IsDmLinearEnabled() \|\| need_dm_verity_) {
		if (!InitDeviceMapper()) {
		return false;
		}

		if (required_devices_partition_names_.empty()) {
		return true;
		}

		auto uevent_callback = [this](const Uevent& uevent) { return UeventCallback(uevent); };
		@@ -604,12 +602,6 @@ void FirstStageMount::UseGsiIfPresent() {
		return;
		}

		// Device-mapper might not be ready if the device doesn't use DAP or verity
		// (for example, hikey).
		if (access("/dev/device-mapper", F_OK) && !InitDeviceMapper()) {
		return;
		}

		// Find the name of the super partition for the GSI. It will either be
		// "userdata", or a block device such as an sdcard. There are no by-name
		// partitions other than userdata that we support installing GSIs to.