commit 48aadb7b138a7f317d598e2d97ce5d35da85b9a9
author Bowgo Tsai <bowgotsai@google.com> Thu May 17 18:27:39 2018 -0700
committer android-build-merger <android-build-merger@google.com> Thu May 17 18:27:39 2018 -0700
tree bf829d5b4a42f65922f6c136885dac6b5e091e81
parent 271c80d58c5f7a1e13dfe6b0bdc0f1daa535eb9a
parent 6a1e140ca587a2d4acde84522fa5ca9736bfc146

Merge "Removing block device by-num symlinks"
am: 6aaa3beb39

Change-Id: If37fe44b7eeaf45821caff21809b8173d23a5105

init/devices.cpp

diff --git a/init/devices.cpp b/init/devices.cpp
index 8d27f4f..688ad61 100644
--- a/init/devices.cpp
+++ b/init/devices.cpp
@@ -331,10 +331,6 @@
         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));
 

init/devices_test.cpp

diff --git a/init/devices_test.cpp b/init/devices_test.cpp
index eba00cb..d658f4d 100644
--- a/init/devices_test.cpp
+++ b/init/devices_test.cpp
@@ -84,7 +84,6 @@
     };
     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 @@
         .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",
     };
 

init/init_first_stage.cpp

diff --git a/init/init_first_stage.cpp b/init/init_first_stage.cpp
index a5ba647..28df696 100644
--- a/init/init_first_stage.cpp
+++ b/init/init_first_stage.cpp
@@ -468,7 +468,6 @@
         // 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()) {