Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit 3c426b6

Browse files
author
Mark Salyzyn
committed
init: error log on by-name identical replacement
The following message creates unnecessary alarm: init: Partition system_a already existed in the by-name symlink map \ with a value of \ /dev/block/platform/soc/1d84000.ufshc/by-name/system_a, new value \ /dev/block/platform/soc/1d84000.ufshc/by-name/system_a will be \ ignored. and in the code is cited as an ERROR. The message admittedly does point out an inefficiency by reporting multiple updates. Test: compile Change-Id: I388a76fa078cf9de5840930247f732d16ccb0719
1 parent 13856a0 commit 3c426b6

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

init/first_stage_mount.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,7 @@ ListenerAction FirstStageMountVBootV2::UeventCallback(const Uevent& uevent) {
560560
std::vector<std::string> links = device_handler_->GetBlockDeviceSymlinks(uevent);
561561
if (!links.empty()) {
562562
auto [it, inserted] = by_name_symlink_map_.emplace(uevent.partition_name, links[0]);
563-
if (!inserted) {
563+
if (!inserted && (links[0] != it->second)) {
564564
LOG(ERROR) << "Partition '" << uevent.partition_name
565565
<< "' already existed in the by-name symlink map with a value of '"
566566
<< it->second << "', new value '" << links[0] << "' will be ignored.";

0 commit comments

Comments
 (0)