commit 42484b7f1c4de326086a7eec19858314be3cb8c2
author Treehugger Robot <treehugger-gerrit@google.com> Tue Nov 13 15:27:27 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 13 15:27:27 2018 +0000
tree ff4c5827ecf62aa6a708d73a37f6164012cb1d1d
parent cc438ea3b1612e8835e466cb0b1faaaa2c061626
parent 7be8b9fc931b867e84f66ebae430bfa8d734ebd6

Merge "init: error log on by-name identical replacement"

init/first_stage_mount.cpp

diff --git a/init/first_stage_mount.cpp b/init/first_stage_mount.cpp
index a8b7862..1e434d2 100644
--- a/init/first_stage_mount.cpp
+++ b/init/first_stage_mount.cpp
@@ -560,7 +560,7 @@
         std::vector<std::string> links = device_handler_->GetBlockDeviceSymlinks(uevent);
         if (!links.empty()) {
             auto [it, inserted] = by_name_symlink_map_.emplace(uevent.partition_name, links[0]);
-            if (!inserted) {
+            if (!inserted && (links[0] != it->second)) {
                 LOG(ERROR) << "Partition '" << uevent.partition_name
                            << "' already existed in the by-name symlink map with a value of '"
                            << it->second << "', new value '" << links[0] << "' will be ignored.";