tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Removing block device by-num symlinks"

Browse source
This commit is contained in:
Treehugger Robot 2018-05-18 01:16:02 +00:00 committed by Gerrit Code Review
commit 6aaa3beb39
3 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
init/devices.cpp
View file

@ -331,10 +331,6 @@ std::vector<std::string> DeviceHandler::GetBlockDeviceSymlinks(const Uevent& uev
links.emplace_back(link_path + "/by-name/" + partition_name_sanitized);
}
if (uevent.partition_num >= 0) {
links.emplace_back(link_path + "/by-num/p" + std::to_string(uevent.partition_num));
}
auto last_slash = uevent.path.rfind('/');
links.emplace_back(link_path + "/" + uevent.path.substr(last_slash + 1));

2
init/devices_test.cpp
View file

@ -84,7 +84,6 @@ TEST(device_handler, get_block_device_symlinks_success_platform_with_partition)
};
std::vector<std::string> expected_result{
"/dev/block/platform/soc.0/f9824900.sdhci/by-name/modem",
"/dev/block/platform/soc.0/f9824900.sdhci/by-num/p1",
"/dev/block/platform/soc.0/f9824900.sdhci/mmcblk0p1",
};
@ -100,7 +99,6 @@ TEST(device_handler, get_block_device_symlinks_success_platform_with_partition_o
.partition_num = 1,
};
std::vector<std::string> expected_result{
"/dev/block/platform/soc.0/f9824900.sdhci/by-num/p1",
"/dev/block/platform/soc.0/f9824900.sdhci/mmcblk0p1",
};

1
init/init_first_stage.cpp
View file

@ -468,7 +468,6 @@ ListenerAction FirstStageMountVBootV2::UeventCallback(const Uevent& uevent) {
// the content of uevent. by-name symlink will be at [0] if uevent->partition_name
// is not empty. e.g.,
// - /dev/block/platform/soc.0/f9824900.sdhci/by-name/modem
// - /dev/block/platform/soc.0/f9824900.sdhci/by-num/p1
// - /dev/block/platform/soc.0/f9824900.sdhci/mmcblk0p1
std::vector<std::string> links = device_handler_.GetBlockDeviceSymlinks(uevent);
if (!links.empty()) {