From 73b2928b9400ce679a1482fc072be9fa55d7a8cd Mon Sep 17 00:00:00 2001 From: Steve Muckle Date: Tue, 30 Jul 2019 16:03:44 -0700 Subject: [PATCH] libmodprobe: make name canonical in LoadWithAliases Make the module name canonical in LoadWithAliases so it may be used more easily from outside the class. Change-Id: I7ee496b77a2beea43a6b68daed7af42660747559 --- libmodprobe/libmodprobe.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libmodprobe/libmodprobe.cpp b/libmodprobe/libmodprobe.cpp index 01cf2e354..eb6c4ab26 100644 --- a/libmodprobe/libmodprobe.cpp +++ b/libmodprobe/libmodprobe.cpp @@ -256,11 +256,7 @@ bool Modprobe::InsmodWithDeps(const std::string& module_name) { // load module dependencies in reverse order for (auto dep = dependencies.rbegin(); dep != dependencies.rend() - 1; ++dep) { - const std::string& canonical_name = MakeCanonical(*dep); - if (canonical_name.empty()) { - return false; - } - if (!LoadWithAliases(canonical_name, true)) { + if (!LoadWithAliases(*dep, true)) { return false; } } @@ -288,7 +284,7 @@ bool Modprobe::InsmodWithDeps(const std::string& module_name) { } bool Modprobe::LoadWithAliases(const std::string& module_name, bool strict) { - std::set modules_to_load = {module_name}; + std::set modules_to_load = {MakeCanonical(module_name)}; bool module_loaded = false; // use aliases to expand list of modules to load (multiple modules