commit 4f67dac2061f5fafbae83aba9d44029b994275a7
author Ratan Gupta <ratagupt@in.ibm.com> Mon Aug 28 22:18:21 2017 +0530
committer Patrick Williams <patrick@stwcx.xyz> Thu Aug 31 15:37:22 2017 +0000
tree c525a39f31de3e828147f99e916c0d2867bf6194
parent e8d42112b94dbb8fb90cc90443cf99673935d2ae

DHCP value was not getting updated correctly

This commit fixes
=>Disable zeroconf.
=>Correct the network conf file path in factory reset.
=>Updating the DHCP value correctly.

Resolves openbmc/openbmc#2230
Resolves openbmc/openbmc#2215

Change-Id: I8f87c2afb53cc952755165d34bfb62b8aba80fe5
Signed-off-by: Ratan Gupta <ratagupt@in.ibm.com>

network_manager.cpp

diff --git a/network_manager.cpp b/network_manager.cpp
index dd9a319..b152026 100644
--- a/network_manager.cpp
+++ b/network_manager.cpp
@@ -135,12 +135,13 @@
 
         for (auto& intf : interfaces)
         {
-            std::string filename = networkConfig +
-                                   systemd::config::networkFilePrefix +
-                                   intf.first +
-                                   systemd::config::networkFileSuffix;
+            auto fileName = systemd::config::networkFilePrefix + intf.first +
+                            systemd::config::networkFileSuffix;
 
-            bmc::writeDHCPDefault(filename, intf.first);
+            fs::path  filePath = networkConfig;
+            filePath /= fileName;
+
+            bmc::writeDHCPDefault(filePath.string(), intf.first);
             interfacesMapped = true;
         }