Revert "init: Look for super partition only on a boot device"
This reverts commit 6f0ebcb5260a8e769e0e029596d21c0efabe361b.
Reason for revert: b/371393845 boot up failure of gcar emulator
Change-Id: I15e5bea609938cf5a1e347666b9a2abb287cb086
diff --git a/init/block_dev_initializer.cpp b/init/block_dev_initializer.cpp
index cabeb01..8f52158 100644
--- a/init/block_dev_initializer.cpp
+++ b/init/block_dev_initializer.cpp
@@ -98,11 +98,7 @@
LOG(VERBOSE) << __PRETTY_FUNCTION__ << ": found partition: " << name;
- // Remove partition from the list only if it was found on boot device
- if (device_handler_->IsBootDevice(uevent)) {
- devices->erase(iter);
- }
-
+ devices->erase(iter);
device_handler_->HandleUevent(uevent);
return devices->empty() ? ListenerAction::kStop : ListenerAction::kContinue;
}
diff --git a/init/devices.cpp b/init/devices.cpp
index 6a3a64d..f2bb9d2 100644
--- a/init/devices.cpp
+++ b/init/devices.cpp
@@ -188,28 +188,6 @@
}
}
-bool DeviceHandler::IsBootDevice(const Uevent& uevent) const {
- std::string device;
-
- if (FindPlatformDevice(uevent.path, &device)) {
- // Skip /devices/platform or /devices/ if present
- static constexpr std::string_view devices_platform_prefix = "/devices/platform/";
- static constexpr std::string_view devices_prefix = "/devices/";
-
- if (StartsWith(device, devices_platform_prefix)) {
- device = device.substr(devices_platform_prefix.length());
- } else if (StartsWith(device, devices_prefix)) {
- device = device.substr(devices_prefix.length());
- }
- } else if (FindPciDevicePrefix(uevent.path, &device)) {
- } else if (FindVbdDevicePrefix(uevent.path, &device)) {
- } else {
- return false;
- }
-
- return boot_devices_.find(device) != boot_devices_.end();
-}
-
std::string DeviceHandler::GetPartitionNameForDevice(const std::string& query_device) {
static const auto partition_map = [] {
std::vector<std::pair<std::string, std::string>> partition_map;
diff --git a/init/devices.h b/init/devices.h
index 4df604d..6da1232 100644
--- a/init/devices.h
+++ b/init/devices.h
@@ -133,7 +133,6 @@
// `androidboot.partition_map=vdb,metadata;vdc,userdata` maps `vdb` to `metadata` and `vdc` to
// `userdata`.
static std::string GetPartitionNameForDevice(const std::string& device);
- bool IsBootDevice(const Uevent& uevent) const;
private:
void ColdbootDone() override;